From 689d8349aab7fb0d44ad459f27cd231b7b784ce1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 17 Dec 2016 10:36:56 +0000
Subject: [PATCH 0001/1744] amd-hybrid-graphics: fix race condition

---
 .../services/hardware/amd-hybrid-graphics.nix     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix
index 087bd0e0409..b0f9ff56d1b 100644
--- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix
+++ b/nixos/modules/services/hardware/amd-hybrid-graphics.nix
@@ -25,15 +25,22 @@
       path = [ pkgs.bash ];
       description = "Disable AMD Card";
       after = [ "sys-kernel-debug.mount" ];
-      requires = [ "sys-kernel-debug.mount" ];
-      wantedBy = [ "multi-user.target" ];
+      before = [ "systemd-vconsole-setup.service" "display-manager.service" ];
+      requires = [ "sys-kernel-debug.mount" "vgaswitcheroo.path" ];
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
-        ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch; exit 0'";
-        ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch; exit 0'";
+        ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch'";
+        ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch'";
       };
     };
+    systemd.paths."vgaswitcheroo" = {
+      pathConfig = {
+        PathExists = "/sys/kernel/debug/vgaswitcheroo/switch";
+        Unit = "amd-hybrid-graphics.service";
+      };
+      wantedBy = ["multi-user.target"];
+    };
   };
 
 }

From b23452d517bde87aec3c3a2310c089472072ebd6 Mon Sep 17 00:00:00 2001
From: Test <test@test.com>
Date: Fri, 3 Feb 2017 11:03:30 -0600
Subject: [PATCH 0002/1744] wrap upstart binaries and patch hard-coded paths

---
 .../linux/upstart/check-config.nix            | 43 +++++++++++++++++++
 pkgs/os-specific/linux/upstart/default.nix    | 29 ++++++++++---
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/upstart/check-config.nix

diff --git a/pkgs/os-specific/linux/upstart/check-config.nix b/pkgs/os-specific/linux/upstart/check-config.nix
new file mode 100644
index 00000000000..5803b4ed833
--- /dev/null
+++ b/pkgs/os-specific/linux/upstart/check-config.nix
@@ -0,0 +1,43 @@
+# Useful tool to check syntax of a config file. Upstart needs a dbus
+# session, so this script wraps one up and makes the operation not
+# require any prior state.
+#
+# See: http://mwhiteley.com/scripts/2012/12/11/dbus-init-checkconf.html
+{stdenv, coreutils, upstart, writeScript, dbus}:
+
+writeScript "upstart-check-config" ''
+  #!${stdenv.shell}
+
+  set -o errexit
+  set -o nounset
+
+  export PATH=${stdenv.lib.makeBinPath [dbus.out upstart coreutils]}:$PATH
+
+  if [[ $# -ne 1 ]]
+  then
+    echo "Usage: $0 upstart-conf-file" >&2
+    exit 1
+  fi
+  config=$1 && shift
+
+  dbus_pid_file=$(mktemp)
+  exec 4<> $dbus_pid_file
+
+  dbus_add_file=$(mktemp)
+  exec 6<> $dbus_add_file
+
+  dbus-daemon --fork --print-pid 4 --print-address 6 --session
+
+  function clean {
+    dbus_pid=$(cat $dbus_pid_file)
+    if [[ -n $dbus_pid ]]; then
+      kill $dbus_pid
+    fi
+    rm -f $dbus_pid_file $dbus_add_file
+  }
+  trap "{ clean; }" EXIT
+
+  export DBUS_SESSION_BUS_ADDRESS=$(cat $dbus_add_file)
+
+  init-checkconf $config
+''
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index 938f4edd2fb..d5b9be34d9c 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libnih }:
+{ stdenv, fetchurl, pkgconfig, dbus, libnih, python, makeWrapper, utillinux
+, writeScript }:
 
-let version = "1.5"; in
+let
+  inherit (stdenv.lib) makeBinPath;
+  version = "1.5";
 
-stdenv.mkDerivation rec {
+  upstart = stdenv.mkDerivation rec {
   name = "upstart-${version}";
-  
+
   src = fetchurl {
     url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz";
     sha256 = "01w4ab6nlisz5blb0an1sxjkndwikr7sjp0cmz4lg00g3n7gahmx";
   };
 
-  buildInputs = [ pkgconfig dbus libnih ];
-  
+  buildInputs = [ pkgconfig dbus libnih python makeWrapper];
+
   NIX_CFLAGS_COMPILE =
     ''
       -DSHELL="${stdenv.shell}"
@@ -33,6 +36,16 @@ stdenv.mkDerivation rec {
       t=$out/etc/bash_completion.d
       mkdir -p $t
       cp ${./upstart-bash-completion} $t/upstart
+
+      # Patch some binaries to refer to the correct binary location.
+      sed -i "s,/sbin/init,$out/bin/init,g" $out/bin/init-checkconf
+      sed -i "s,initctl,$out/bin/initctl," $out/bin/initctl2dot
+
+      # Add some missing executable permissions, and wrap binaries.
+      chmod +x $out/bin/init-checkconf $out/bin/init-checkconf
+      wrapProgram $out/bin/init-checkconf \
+        --prefix PATH : $out/bin:${makeBinPath [utillinux dbus]}
+      wrapProgram $out/bin/initctl2dot --prefix PATH : $out/bin
     '';
 
   meta = {
@@ -40,4 +53,6 @@ stdenv.mkDerivation rec {
     description = "An event-based replacement for the /sbin/init daemon";
     platforms = stdenv.lib.platforms.linux;
   };
-}
+};
+
+in upstart
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ae2343e23..cf5a17f0e68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11852,6 +11852,8 @@ with pkgs;
 
   upstart = callPackage ../os-specific/linux/upstart { };
 
+  upstart-check-config = callPackage ../os-specific/linux/upstart/check-config.nix {};
+
   usbutils = callPackage ../os-specific/linux/usbutils { };
 
   usermount = callPackage ../os-specific/linux/usermount { };

From 2c54fa04be3fe64f7934a31d3469773b13bd3a5d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 2 Feb 2017 08:58:32 +0200
Subject: [PATCH 0003/1744] nixos:  allow supply customized locale package

Overriding ``glibcLocales`` via nixpkgs.overlays not works,
so I added i18n.glibcLocales parameter, defaulted with
old override, using i18n.supportedLocales.
---
 nixos/modules/config/i18n.nix | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 799f0793c74..65ef9512780 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -2,21 +2,27 @@
 
 with lib;
 
-let
-
-  glibcLocales = pkgs.glibcLocales.override {
-    allLocales = any (x: x == "all") config.i18n.supportedLocales;
-    locales = config.i18n.supportedLocales;
-  };
-
-in
-
 {
   ###### interface
 
   options = {
 
     i18n = {
+      glibcLocales = mkOption {
+        type = types.path;
+        default = pkgs.glibcLocales.override {
+          allLocales = any (x: x == "all") config.i18n.supportedLocales;
+          locales = config.i18n.supportedLocales;
+        };
+        example = literalExample "pkgs.glibcLocales";
+        description = ''
+          Customized pkg.glibcLocales package.
+
+          Changing this option can disable handling of i18n.defaultLocale
+          and supportedLocale.
+        '';
+      };
+
       defaultLocale = mkOption {
         type = types.str;
         default = "en_US.UTF-8";
@@ -118,7 +124,7 @@ in
         '');
 
     environment.systemPackages =
-      optional (config.i18n.supportedLocales != []) glibcLocales;
+      optional (config.i18n.supportedLocales != []) config.i18n.glibcLocales;
 
     environment.sessionVariables =
       { LANG = config.i18n.defaultLocale;
@@ -126,7 +132,7 @@ in
       };
 
     systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) {
-      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
     };
 
     # ‘/etc/locale.conf’ is used by systemd.

From bd8654f45d92b183721e684ca74f431d2005f303 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 12 Feb 2017 18:45:44 -0600
Subject: [PATCH 0004/1744] openblas: disable static libs

Disable static on openblas. This should save about 57M from closure sizes.
---
 pkgs/development/libraries/science/math/openblas/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index fbe11db165f..6f3f78e5501 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation {
       ''PREFIX="''$(out)"''
       "NUM_THREADS=64"
       "INTERFACE64=${if blas64 then "1" else "0"}"
+      "NO_STATIC=1"
     ]
     ++ mapAttrsToList (var: val: var + "=" + val) config;
 

From 4cd7b284e8b122bec155bc98454817b18ca9bea3 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Wed, 1 Feb 2017 14:59:35 +0100
Subject: [PATCH 0005/1744] fontforge-gtk: Add support for libspiro.

Add Spiro toolkit in fontforge-gtk for designing fonts.
libspiro: Init at c26afeb.
---
 .../development/libraries/libspiro/default.nix | 18 ++++++++++++++++++
 pkgs/tools/misc/fontforge/default.nix          |  2 ++
 pkgs/top-level/all-packages.nix                |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libspiro/default.nix

diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
new file mode 100644
index 00000000000..dcec6b058fc
--- /dev/null
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -0,0 +1,18 @@
+{stdenv, pkgconfig, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "libspiro-${version}";
+  version = "0.5.20150702";
+  src = fetchurl {
+    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
+  };
+
+  nativeBuildInputs = [pkgconfig];
+
+  meta = with stdenv.lib; {
+    description = "A library that simplifies the drawing of beautiful curves";
+    homepage = "https://github.com/fontforge/libspiro";
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 2cccee0a4e3..90d17ba5281 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
+, withSpiro ? false, libspiro
 , withGTK ? false, gtk2
 , withPython ? true
 , Carbon ? null, Cocoa ? null
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     autoconf automake gnum4 libtool perl pkgconfig gettext uthash
     python freetype zlib glib libungif libpng libjpeg libtiff libxml2
   ]
+    ++ lib.optionals withSpiro [libspiro]
     ++ lib.optionals withGTK [ gtk2 pango ]
     ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e44c9819a..f246df2874f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1738,6 +1738,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   });
   fontforge-gtk = callPackage ../tools/misc/fontforge {
+    withSpiro = true;
     withGTK = true;
     gtk2 = gtk2-x11;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
@@ -8495,6 +8496,8 @@ with pkgs;
 
   libsoup = callPackage ../development/libraries/libsoup { };
 
+  libspiro = callPackage ../development/libraries/libspiro {};
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };

From 8a534d53281c5aead91a67ca526d8cb7f27a14c5 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Sun, 12 Feb 2017 16:32:14 +0100
Subject: [PATCH 0006/1744] pdf2htmlEX: Switch from fontforge-gtk to fontforge.

---
 pkgs/tools/typesetting/pdf2htmlEX/default.nix | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/tools/typesetting/pdf2htmlEX/default.nix

diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
new file mode 100644
index 00000000000..299f075115a
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8
+}:
+
+stdenv.mkDerivation rec {
+  name = "pdf2htmlEX-0.14.6";
+
+  src = fetchFromGitHub {
+    repo   = "pdf2htmlEX";
+    owner  = "coolwanglu";
+    rev    = "v0.14.6";
+    sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78";
+  };
+
+  patches = [ ./add-glib-cmake.patch ];
+
+  cmakeFlags = [ "-DENABLE_SVG=ON" ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
+
+  buildInputs = [
+    xlibs.libpthreadstubs
+    xlibs.libXdmcp
+    pcre
+    python
+    glib
+    cairo
+    pango
+    (poppler.override { withData = true; })
+    fontforge
+    openjdk8
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Render PDF files to beautiful HTML";
+    homepage    = "https://github.com/coolwanglu/pdf2htmlEX";
+    license     = licenses.gpl3Plus;
+    maintainers = [ maintainers.taktoa ];
+    platforms   = with platforms; linux;
+  };
+}

From ab22a0803996c40eee80aa0f81d151090ab15b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Sat, 11 Feb 2017 04:57:57 +0000
Subject: [PATCH 0007/1744] test all postgresql versions, test server restart
 (#1735)

---
 nixos/release.nix          |  2 +-
 nixos/tests/postgresql.nix | 70 ++++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0f298188c6c..a8c7d9fd0c3 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -286,7 +286,7 @@ in rec {
   tests.openssh = callTest tests/openssh.nix {};
   #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
-  tests.postgresql = callTest tests/postgresql.nix {};
+  tests.postgresql = callSubTests tests/postgresql.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   tests.pumpio = callTest tests/pump.io.nix {};
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index f17384b44ba..1f4f43a2666 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -1,26 +1,46 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "postgresql";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ zagy ];
-  };
-
-  nodes = {
-    master =
-      { pkgs, config, ... }:
-
-      {
-        services.postgresql.enable = true;
-        services.postgresql.initialScript =  pkgs.writeText "postgresql-init.sql"
-          ''
-          CREATE ROLE postgres WITH superuser login createdb;
-          '';
-      };
-  };
-
-  testScript = ''
-    startAll;
-    $master->waitForUnit("postgresql");
-    $master->sleep(10); # Hopefully this is long enough!!
-    $master->succeed("echo 'select 1' | sudo -u postgres psql");
+{ system ? builtins.currentSystem }:
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+let
+  postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { };
+  test-sql = pkgs.writeText "postgresql-test" ''
+    CREATE EXTENSION pgcrypto; -- just to check if lib loading works
+    CREATE TABLE sth (
+      id int
+    );
+    INSERT INTO sth (id) VALUES (1);
+    INSERT INTO sth (id) VALUES (1);
+    INSERT INTO sth (id) VALUES (1);
+    INSERT INTO sth (id) VALUES (1);
+    INSERT INTO sth (id) VALUES (1);
   '';
-})
+  make-postgresql-test = postgresql-name: postgresql-package: {
+    name = postgresql-name;
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ zagy ];
+    };
+
+    machine = {pkgs, config, ...}:
+      {
+        services.postgresql.package=postgresql-package;
+        services.postgresql.enable = true;
+      };
+
+    testScript = ''
+      $machine->start;
+      $machine->waitForUnit("postgresql");
+      # postgresql should be available just after unit start
+      $machine->succeed("cat ${test-sql} | psql postgres");
+      $machine->shutdown; # make sure that postgresql survive restart (bug #1735)
+      sleep(2);
+      $machine->start;
+      $machine->waitForUnit("postgresql");
+      $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3');
+      $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5');
+      $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4');
+      $machine->shutdown;
+    '';
+
+  };
+in
+  mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions

From 4313c44de358022cc7adf69fc8e0104edb50e3cd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 18:01:42 -0600
Subject: [PATCH 0008/1744] pcapc: 2015-03.06 -> 1.0.0

---
 pkgs/tools/networking/pcapc/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 66028a973b3..552cda93bcc 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, libpcap }:
+{ stdenv, fetchFromGitHub, libpcap, cmake }:
 
 stdenv.mkDerivation rec {
   name = "pcapc-${version}";
-  version = "2015-03-06";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
-    sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027";
-    rev = "9dddf52e65c8cff72c7c11758a951b31bf083436";
+    sha256 = "137crs0bb7kh9a8p9g168yj2jrp0h3j3073nwh31jy4nk0g5hlfp";
+    rev = "v${version}";
     repo = "pcapc";
     owner = "pfactum";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ libpcap ];
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -19,12 +20,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  postInstall = ''
-    install -Dm644 {.,$out/share/doc/pcapc}/README.md
-  '';
-
   meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/pfactum/pcapc";
     description = "Compile libpcap filter expressions into BPF opcodes";
     license = licenses.gpl3;
     platforms = platforms.linux;

From ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 1 Mar 2017 16:09:18 +0200
Subject: [PATCH 0009/1744] mkDerivation: Don't pass buildInputs to stdenv
 builder in nativeBuildInputs

When not cross compiling, nativeBuildInputs and buildInputs have
identical behaviour. Currently that is implemented by having
mkDerivation do a concatenation of those variables in Nix code and pass
that to the builder via the nativeBuildInputs attribute.

However, that has some annoying side effects, like `foo.buildInputs`
evaluating to `[ ]` even if buildInputs were specified in the nix
expression for foo.

Instead, pass buildInputs and nativeBuildInputs in separate variables as
usual, and move the logic of cross compilation vs. native compilation to
the stdenv builder script. This is probably a tiny bit uglier but
fixes the previous problem.

Issue #4855.
---
 pkgs/stdenv/generic/default.nix |  8 ++---
 pkgs/stdenv/generic/setup.sh    | 53 +++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index cb94db48f4b..69bcd649059 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -264,18 +264,16 @@ let
           __ignoreNulls = true;
 
           # Inputs built by the cross compiler.
-          buildInputs = if crossConfig != null then buildInputs' else [];
-          propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs' else [];
+          buildInputs = buildInputs';
+          propagatedBuildInputs = propagatedBuildInputs';
           # Inputs built by the usual native compiler.
           nativeBuildInputs = nativeBuildInputs'
-            ++ lib.optionals (crossConfig == null) buildInputs'
             ++ lib.optional
                 (result.isCygwin
                   || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig))
                 ../../build-support/setup-hooks/win-dll-link.sh
             ;
-          propagatedNativeBuildInputs = propagatedNativeBuildInputs' ++
-            (if crossConfig == null then propagatedBuildInputs' else []);
+          propagatedNativeBuildInputs = propagatedNativeBuildInputs';
         } // ifDarwin {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 154fdefd789..de33ab56598 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -290,15 +290,26 @@ findInputs() {
     fi
 }
 
-crossPkgs=""
-for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
-    findInputs $i crossPkgs propagated-build-inputs
-done
+if [ -z "$crossConfig" ]; then
+    # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
+    # are handled identically to nativeBuildInputs
+    nativePkgs=""
+    for i in $nativeBuildInputs $buildInputs \
+             $defaultNativeBuildInputs $defaultBuildInputs \
+             $propagatedNativeBuildInputs $propagatedBuildInputs; do
+        findInputs $i nativePkgs propagated-native-build-inputs
+    done
+else
+    crossPkgs=""
+    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+        findInputs $i crossPkgs propagated-build-inputs
+    done
 
-nativePkgs=""
-for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
-    findInputs $i nativePkgs propagated-native-build-inputs
-done
+    nativePkgs=""
+    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+        findInputs $i nativePkgs propagated-native-build-inputs
+    done
+fi
 
 
 # Set the relevant environment variables to point to the build inputs
@@ -759,14 +770,26 @@ fixupPhase() {
 
     # Propagate build inputs and setup hook into the development output.
 
-    if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "${!outputDev}/nix-support"
-        echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
-    fi
+    if [ -z "$crossConfig" ]; then
+        # Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs
+        local propagated="$propagatedNativeBuildInputs"
+        if [ -n "$propagatedBuildInputs" ]; then
+            propagated+="${propagated:+ }$propagatedBuildInputs"
+        fi
+        if [ -n "$propagated" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        fi
+    else
+        if [ -n "$propagatedBuildInputs" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
+        fi
 
-    if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "${!outputDev}/nix-support"
-        echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        if [ -n "$propagatedNativeBuildInputs" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        fi
     fi
 
     if [ -n "$setupHook" ]; then

From 518e5c09a85345512d712ee964f367adb6401803 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Tue, 28 Feb 2017 14:10:52 +0100
Subject: [PATCH 0010/1744] avahi-daemon service: Add option to enable
 point-to-point interfaces.

---
 nixos/modules/services/networking/avahi-daemon.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 6a786e75bbc..e7ef68c90b2 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -21,6 +21,7 @@ let
     use-ipv6=${if ipv6 then "yes" else "no"}
     ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
     ${optionalString (domainName!=null) "domain-name=${domainName}"}
+    allow-point-to-point=${if allowPointToPoint then "yes" else "no"}
 
     [wide-area]
     enable-wide-area=${if wideArea then "yes" else "no"}
@@ -98,6 +99,15 @@ in
         '';
       };
 
+      allowPointToPoint = mkOption {
+        default = false;
+        description= ''
+          Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large
+          latencies with such links and opens a potential security hole by allowing mDNS access from Internet
+          connections. Use with care and YMMV!
+        '';
+      };
+
       wideArea = mkOption {
         default = true;
         description = ''Whether to enable wide-area service discovery.'';

From 171130e09a3f18a166c76df48a71ccf15e99a1c6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 3 Mar 2017 20:08:53 -0500
Subject: [PATCH 0011/1744] jekyll: 3.0.1 -> 3.4.1

---
 pkgs/applications/misc/jekyll/Gemfile.lock |  49 +++--
 pkgs/applications/misc/jekyll/default.nix  |  10 +-
 pkgs/applications/misc/jekyll/gemset.nix   | 218 ++++++++++++---------
 3 files changed, 155 insertions(+), 122 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index c2d82181be2..fffc3316527 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -1,36 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    colorator (0.1)
-    ffi (1.9.10)
-    jekyll (3.0.1)
-      colorator (~> 0.1)
+    RedCloth (4.3.2)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    colorator (1.1.0)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    jekyll (3.4.1)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
       liquid (~> 3.0)
       mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.4.0)
-      sass (~> 3.4)
-    jekyll-watch (1.3.0)
-      listen (~> 3.0)
     jekyll-paginate (1.1.0)
-    kramdown (1.9.0)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.13.2)
     liquid (3.0.6)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mercenary (0.3.5)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    rouge (1.10.1)
+    rdiscount (2.2.0.1)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.20)
+    sass (3.4.23)
 
 PLATFORMS
   ruby
@@ -38,7 +46,8 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   jekyll
+  jekyll-paginate
   rdiscount
 
 BUNDLED WITH
-   1.10.6
+   1.14.4
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index b06a28513b8..f3661030a2b 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
+{ stdenv, lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = "jekyll-${version}";
-  version = "3.0.1";
 
-  ruby = ruby_2_2;
-  gemdir = ./.;
+  version = (import gemset).jekyll.version;
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Simple, blog aware, static site generator";
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index a5c72d09385..0811f356582 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -1,145 +1,167 @@
 {
-  "RedCloth" = {
-    version = "4.2.9";
+  addressable = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
       type = "gem";
-      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
+    version = "2.5.0";
   };
-  "colorator" = {
-    version = "0.1";
+  colorator = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
       type = "gem";
-      sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs";
     };
-  };
-  "ffi" = {
-    version = "1.9.10";
-    source = {
-      type = "gem";
-      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
-    };
-  };
-  "jekyll" = {
-    version = "3.0.1";
-    source = {
-      type = "gem";
-      sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a";
-    };
-    dependencies = [
-      "colorator"
-      "jekyll-sass-converter"
-      "jekyll-watch"
-      "jekyll-paginate"
-      "kramdown"
-      "liquid"
-      "mercenary"
-      "rouge"
-      "safe_yaml"
-    ];
-  };
-  "jekyll-sass-converter" = {
-    version = "1.4.0";
-    source = {
-      type = "gem";
-      sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8";
-    };
-    dependencies = [
-      "sass"
-    ];
-  };
-  "jekyll-watch" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg";
-    };
-    dependencies = [
-      "listen"
-    ];
-  };
-  "jekyll-paginate" = {
     version = "1.1.0";
+  };
+  ffi = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
       type = "gem";
+    };
+    version = "1.9.18";
+  };
+  forwardable-extended = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  jekyll = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qbnjx7bpshbcam6p9ss2g6gpd3gxz6h4w9yszphj3ip335yhawb";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
+  jekyll-paginate = {
+    source = {
       sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
-    };
-  };
-  "kramdown" = {
-    version = "1.9.0";
-    source = {
       type = "gem";
-      sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
     };
+    version = "1.1.0";
   };
-  "liquid" = {
-    version = "3.0.6";
+  jekyll-sass-converter = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01m921763yfgx1gc33k5ixqz623f4c4azgnpqhgsc2q61fyfk3q1";
       type = "gem";
+    };
+    version = "1.5.0";
+  };
+  jekyll-watch = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02rg3wi95w2l0bg1igl5k6pza723vn2b2gj975gycz1cpmhdjn6z";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  kramdown = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1isiqc40q44zg57bd6cfnw1a2l0s2j5skw2awn2cz3gcm7wsf49d";
+      type = "gem";
+    };
+    version = "1.13.2";
+  };
+  liquid = {
+    source = {
       sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2";
-    };
-  };
-  "listen" = {
-    version = "3.0.5";
-    source = {
       type = "gem";
-      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
     };
-    dependencies = [
-      "rb-fsevent"
-      "rb-inotify"
-    ];
+    version = "3.0.6";
   };
-  "mercenary" = {
-    version = "0.3.5";
+  listen = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i";
       type = "gem";
-      sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb";
     };
+    version = "3.0.8";
   };
-  "rb-fsevent" = {
-    version = "0.9.7";
+  mercenary = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
       type = "gem";
-      sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v";
     };
+    version = "0.3.6";
   };
-  "rb-inotify" = {
-    version = "0.9.5";
+  pathutil = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f444wx6vjd30lkkb2zn1k5a6g33lidrpyy7lmgy66n1gsiipzn7";
       type = "gem";
-      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
     };
-    dependencies = [
-      "ffi"
-    ];
+    version = "0.14.0";
   };
-  "rdiscount" = {
-    version = "2.1.8";
+  public_suffix = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
       type = "gem";
-      sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
     };
+    version = "2.0.5";
   };
-  "rouge" = {
-    version = "1.10.1";
+  rb-fsevent = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pdiasp9zlr306yld19szapi6kdjk38rpv1hih9x0ry40x6mb63n";
       type = "gem";
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
     };
+    version = "0.9.8";
   };
-  "safe_yaml" = {
-    version = "1.0.4";
+  rb-inotify = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bq14f3md5nm00kgxgf0r9lcbn0vgbwljgajif0slxcwv622fjg9";
       type = "gem";
+    };
+    version = "0.9.8";
+  };
+  rdiscount = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
+      type = "gem";
+    };
+    version = "2.2.0.1";
+  };
+  RedCloth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
+  rouge = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8";
+      type = "gem";
+    };
+    version = "1.11.1";
+  };
+  safe_yaml = {
+    source = {
       sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sass" = {
-    version = "3.4.20";
-    source = {
       type = "gem";
-      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
     };
+    version = "1.0.4";
   };
-}
+  sass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0da4mn3n60cm1ss1pw1rrpa7fxagglxiwcgvz1asf1qgf4mvcwyr";
+      type = "gem";
+    };
+    version = "3.4.23";
+  };
+}
\ No newline at end of file

From 0832addf6798207cb1f60a8b96389424aa68b630 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 3 Mar 2017 21:09:04 -0500
Subject: [PATCH 0012/1744] jekyll: fix 'jekyll new'

Original error:

$ nix-shell -p jekyll --command "jekyll new test"
Running bundle install in /private/tmp/test...
  Bundler: There was an error while trying to write to
  Bundler:
`/nix/store/l67429rhvrmr7c4c1msb7s8zjq4fx7ad-gemfile-and-lockfile/.bundle/config`.
  Bundler: It is likely that you need to grant write permissions for
that path.
---
 pkgs/development/ruby-modules/gem-config/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 20dc23979f5..6a83e079916 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -78,6 +78,15 @@ in
         [ darwin.apple_sdk.frameworks.CoreServices ];
   };
 
+  # disable bundle install as it can't install anything in addition to what is
+  # specified in pkgs/applications/misc/jekyll/Gemfile anyway
+  jekyll = attrs: {
+    postInstall = ''
+      installPath=$(cat $out/nix-support/gem-meta/install-path)
+      sed -i $installPath/lib/jekyll/commands/new.rb -e 's@Exec.run("bundle", "install"@Exec.run("true"@'
+    '';
+  };
+
   # note that you need version >= v3.16.14.8,
   # otherwise the gem will fail to link to the libv8 binary.
   # see: https://github.com/cowboyd/libv8/pull/161

From 3400c3575e7cad0fd8053a0ecd63962012af4773 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 3 Mar 2017 21:23:34 -0500
Subject: [PATCH 0013/1744] jekyll: add gems needed to run default site

---
 pkgs/applications/misc/jekyll/Gemfile      |  2 ++
 pkgs/applications/misc/jekyll/Gemfile.lock |  6 ++++++
 pkgs/applications/misc/jekyll/gemset.nix   | 16 ++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
index 4074421fca3..97ebb9705bd 100644
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 gem 'jekyll'
+gem 'jekyll-feed'
 gem 'jekyll-paginate'
 gem 'rdiscount'
 gem 'RedCloth'
+gem 'minima'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index fffc3316527..da4be83382f 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -18,6 +18,8 @@ GEM
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
+    jekyll-feed (0.9.1)
+      jekyll (~> 3.3)
     jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
@@ -29,6 +31,8 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
+    minima (2.1.0)
+      jekyll (~> 3.3)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
     public_suffix (2.0.5)
@@ -46,7 +50,9 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   jekyll
+  jekyll-feed
   jekyll-paginate
+  minima
   rdiscount
 
 BUNDLED WITH
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index 0811f356582..5b1a35209ae 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -39,6 +39,14 @@
     };
     version = "3.4.1";
   };
+  jekyll-feed = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dj62gy1jskkn703mi5h0bkg1psbpkdm2qqdw3bhjfid9358qvay";
+      type = "gem";
+    };
+    version = "0.9.1";
+  };
   jekyll-paginate = {
     source = {
       sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
@@ -93,6 +101,14 @@
     };
     version = "0.3.6";
   };
+  minima = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s7ks9fqfvqx7qicnkrg76wavg9mjas52f7iyhr89lz9mqiy7p39";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
   pathutil = {
     source = {
       remotes = ["https://rubygems.org"];

From 212340bc6b893a9b947cb0ce68531dad75749ce8 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 3 Mar 2017 23:05:37 -0500
Subject: [PATCH 0014/1744] jekyll: set proper permissions on new site

Fixes #22858
---
 pkgs/development/ruby-modules/gem-config/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 6a83e079916..5f1c29f164c 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -79,11 +79,14 @@ in
   };
 
   # disable bundle install as it can't install anything in addition to what is
-  # specified in pkgs/applications/misc/jekyll/Gemfile anyway
+  # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R
+  # to compensate for read-only files in site_template in nix store.
   jekyll = attrs: {
     postInstall = ''
       installPath=$(cat $out/nix-support/gem-meta/install-path)
-      sed -i $installPath/lib/jekyll/commands/new.rb -e 's@Exec.run("bundle", "install"@Exec.run("true"@'
+      sed -i $installPath/lib/jekyll/commands/new.rb \
+          -e 's@Exec.run("bundle", "install"@Exec.run("true"@' \
+          -e 's@FileUtils.cp_r site_template + "/.", path@FileUtils.cp_r site_template + "/.", path; FileUtils.chmod_R "u+w", path@'
     '';
   };
 

From 62be972de9b341d374cf65cc4d0cb0ecb167a972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Wed, 8 Feb 2017 13:21:03 +0000
Subject: [PATCH 0015/1744] google-play-music-desktop-player: init at 4.2.0

---
 lib/maintainers.nix                           |  1 +
 .../default.nix                               | 79 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/applications/audio/google-play-music-desktop-player/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 552f273a2ca..b479f4cbb62 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -474,6 +474,7 @@
   sternenseemann = "Lukas Epple <post@lukasepple.de>";
   stesie = "Stefan Siegl <stesie@brokenpipe.de>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
+  SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
   swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
   szczyp = "Szczyp <qb@szczyp.com>";
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
new file mode 100644
index 00000000000..12e9b88880d
--- /dev/null
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
+, fetchurl, GConf, gdk_pixbuf, glib, gtk2, libpulseaudio, makeWrapper, nspr
+, nss, pango, udev, xorg
+}:
+
+let
+  version = "4.2.0";
+
+  deps = [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    GConf
+    gdk_pixbuf
+    glib
+    gtk2
+    libpulseaudio
+    nspr
+    nss
+    pango
+    stdenv.cc.cc
+    udev
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXtst
+  ];
+
+in
+
+stdenv.mkDerivation {
+  name = "google-play-music-desktop-player-${version}";
+
+  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 = "0n59b73jc6b86p5063xz7n0z48wy9mzqcx0l34av2hqkx6wcb2h8";
+  };
+
+  dontBuild = true;
+  buildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = ''
+    dpkg -x $src .
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r ./usr/share $out
+    cp -r ./usr/bin $out
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
+
+    wrapProgram $out/bin/google-play-music-desktop-player \
+      --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath deps}"
+  '';
+
+  meta = {
+    homepage = https://www.googleplaymusicdesktopplayer.com/;
+    description = "A beautiful cross platform Desktop Player for Google Play Music";
+    license = stdenv.lib.licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = stdenv.lib.maintainers.SuprDewd;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fdaf8e4d10..6373b453c58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13805,6 +13805,10 @@ with pkgs;
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
+  google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
+    inherit (gnome2) GConf;
+  };
+
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
     libpng = libpng12;
   };

From 78ede3ab1f3a64cc39d9ee2986322d3aa6b58407 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Mon, 27 Feb 2017 23:09:24 +0100
Subject: [PATCH 0016/1744] hieroglyph: init at 0.7.1

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

diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
new file mode 100644
index 00000000000..e79cdede092
--- /dev/null
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -0,0 +1,26 @@
+{ stdenv , fetchurl , buildPythonPackage , sphinx }:
+
+buildPythonPackage rec {
+  version = "0.7.1";
+  name = "hieroglyph-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
+    sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb";
+  };
+
+  propagatedBuildInputs = [ sphinx ];
+
+  # all tests fail; don't know why:
+  # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate HTML presentations from plain text sources";
+    homepage = https://github.com/nyergler/hieroglyph/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ juliendehos ];
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a51e40d123..1d534bd452b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24675,6 +24675,8 @@ in {
     doCheck = false;
   };
 
+  hieroglyph = callPackage ../development/python-modules/hieroglyph { };
+
   sphinx_rtd_theme = buildPythonPackage (rec {
     name = "sphinx_rtd_theme-0.1.9";
 

From b9c7d291bc38c41f0c389c8615f42eb9c33ddd23 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Sun, 5 Mar 2017 17:13:27 +0100
Subject: [PATCH 0017/1744] haskellPackages: apply GHC specific overrides
 before GHCJS

GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 --
 pkgs/top-level/haskell-packages.nix                      | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e4a4f74907a..6bbcb716051 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -180,8 +180,6 @@ self: super:
       ] drv.libraryHaskellDepends;
   });
 
-  semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
-
   transformers-compat = overrideCabal super.transformers-compat (drv: {
     configureFlags = [];
   });
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b4226e656fd..0cb2ce64050 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -161,11 +161,13 @@ in rec {
     };
     ghcjs = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjs;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
     ghcjsHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjsHEAD;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers

From 65592837b6e62fb555d6e8c891f347428886c4f2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 5 Mar 2017 17:39:38 -0600
Subject: [PATCH 0018/1744] freetype: 2.6.5 -> 2.7.1

The Infinality bytecode interpreter is removed in favor of the new v40 TrueType
interpreter. In the past, the Infinality interpreter provided support for
ClearType-style hinting instructions while the default interpreter (then v35)
provided support only for original TrueType-style instructions. The v40
interpreter corrects this deficiency, so the Infinality interpreter is no longer
necessary.

To understand why the Infinality interpreter is no longer necessary, we should
understand how ClearType differs from TrueType and how the v40 interpreter
works. The following is a summary of information available on the FreeType
website [1] mixed with my own editorializing.

TrueType instructions use horizontal and vertical hints to improve glyph
rendering. Before TrueType, fonts were only vertically hinted; horizontal hints
improved rendering by snapping stems to pixel boundaries. Horizontal hinting is
a risk because it can significantly distort glyph shapes and kerning. Extensive
testing at different resolutions is needed to perfect the TrueType
hints. Microsoft invested significant effort to do this with its "Core fonts for
the Web" project, but few other typefaces have seen this level of attention.

With the advent of subpixel rendering, the effective horizontal resolution of
most displays increased significantly. ClearType eschews horizontal hinting in
favor of horizontal supersampling. Most fonts are designed for the Microsoft
bytecode interpreter, which implements a compatibility mode with
TrueType-style (horizontal and vertical) instructions. However, applying the
full horizontal hints to subpixel-rendered fonts leads to color fringes and
inconsistent stem widths. The Infinality interpreter implements several
techniques to mitigate these problems, going so far as to embed font- and
glyph-specific hacks in the interpreter. On the other hand, the v40 interpreter
ignores the horizontal hinting instructions so that glyphs render as they are
intended to on the Microsoft interpreter. Without the horizontal hints, the
problems of glyph and kerning distortion, color fringes, and inconsistent stem
widths--the problems the Infinality interpreter was created to solve--simply
don't occur in the first place.

There are also security concerns which motivate removing the Infinality patches.
Although there is an updated version of the Infinality interpreter for FreeType
2.7, the lack of a consistent upstream maintainer is a security concern. The
interpreter is a Turing-complete virtual machine which has had security
vulnerabilities in the past. While the default interpreter is used in billions
of devices and is maintained by an active developer, the Infinality interpreter
is neither scrutinized nor maintained. We will probably never know if there are
defects in the Infinality interpreter, and if they were discovered they would
likely never be fixed. I do not think that is an acceptable situtation for a
core library like FreeType.

Dropping the Infinality patches means that font rendering will be less
customizable. I think this is an acceptable trade-off. The Infinality
interpreter made many compromises to mitigate the problems with horizontal
hinting; the main purpose of customization is to tailor these compromises to the
user's preferences. The new interpreter does not have to make these compromises
because it renders fonts as their designers intended, so this level of
customization is not necessary.

The Infinality-associated patches are also removed from cairo. These patches
only set the default rendering options in case they aren't set though
Fontconfig. On NixOS, the rendering options are always set in Fontconfig, so
these patches never actually did anything for us!

The Fontconfig test suite is patched to account for a quirk in the way PCF fonts
are named.

The fontconfig option `hintstyle` is no longer configurable in NixOS. This
option selects the TrueType interpreter; the v40 interpreter is `hintslight` and
the older v35 interpreter is `hintmedium` or `hintfull` (which have actually
always been the same thing). The setting may still be changed through the
`localConf` option or by creating a user Fontconfig file.

Users with HiDPI displays should probably disable hinting and antialiasing: at
best they have no visible effect.

The fontconfig-ultimate settings are still available in NixOS, but they are no
longer the default. They still work, but their main purpose is to set rendering
quirks which are no longer necessary and may actually be
detrimental (e.g. setting `hintfull` for some fonts). Also, the vast array of
font substitutions provided is not an appropriate default; the default setting
should be to give the user the font they asked for.

[1]. https://www.freetype.org/freetype2/docs/subpixel-hinting.html
---
 .../config/fonts/fontconfig-ultimate.nix      | 12 +--
 nixos/modules/config/fonts/fontconfig.nix     | 41 ++++----
 nixos/modules/rename.nix                      |  4 +-
 .../services/x11/display-managers/default.nix |  2 +-
 pkgs/development/libraries/cairo/default.nix  | 11 ---
 .../development/libraries/fontconfig/2.10.nix | 16 +---
 .../libraries/fontconfig/default.nix          |  4 +
 .../test-pcf-family-names-freetype-2.7.patch  | 18 ++++
 .../libraries/freetype/default.nix            | 96 +++++++------------
 .../freetype/enable-subpixel-rendering.patch  | 13 +++
 .../freetype/enable-table-validation.patch    | 22 +++++
 11 files changed, 125 insertions(+), 114 deletions(-)
 create mode 100644 pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
 create mode 100644 pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
 create mode 100644 pkgs/development/libraries/freetype/enable-table-validation.patch

diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index a3f52fbd919..acfdcbd2657 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -104,7 +104,7 @@ in
         ultimate = {
           enable = mkOption {
             type = types.bool;
-            default = true;
+            default = false;
             description = ''
               Enable fontconfig-ultimate settings (formerly known as
               Infinality). Besides the customizable settings in this NixOS
@@ -163,15 +163,6 @@ in
               <literal>none</literal> disables the substitutions.
             '';
           };
-
-          preset = mkOption {
-            type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];
-            default = "ultimate3";
-            description = ''
-              FreeType rendering settings preset. Any of the presets may be
-              customized by setting environment variables.
-            '';
-          };
         };
       };
     };
@@ -181,7 +172,6 @@ in
   config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
 
     fonts.fontconfig.confPackages = [ confPkg ];
-    environment.variables."INFINALITY_FT" = cfg.preset;
 
   };
 
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 52ad1e714fb..aa9c59ec551 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -83,7 +83,7 @@ let cfg = config.fonts.fontconfig;
             ${fcBool cfg.hinting.autohint}
           </edit>
           <edit mode="assign" name="hintstyle">
-            <const>hint${cfg.hinting.style}</const>
+            <const>hintslight</const>
           </edit>
           <edit mode="assign" name="antialias">
             ${fcBool cfg.antialias}
@@ -233,7 +233,11 @@ in
         antialias = mkOption {
           type = types.bool;
           default = true;
-          description = "Enable font antialiasing.";
+          description = ''
+            Enable font antialiasing. At high resolution (> 200 DPI),
+            antialiasing has no visible effect; users of such displays may want
+            to disable this option.
+          '';
         };
 
         dpi = mkOption {
@@ -249,7 +253,7 @@ in
           type = types.lines;
           default = "";
           description = ''
-            System-wide customization file contents, has higher priority than 
+            System-wide customization file contents, has higher priority than
             <literal>defaultFonts</literal> settings.
           '';
         };
@@ -287,7 +291,12 @@ in
           enable = mkOption {
             type = types.bool;
             default = true;
-            description = "Enable TrueType hinting.";
+            description = ''
+              Enable font hinting. Hinting aligns glyphs to pixel boundaries to
+              improve rendering sharpness at low resolution. At high resolution
+              (> 200 dpi) hinting will do nothing (at best); users of such
+              displays may want to disable this option.
+            '';
           };
 
           autohint = mkOption {
@@ -299,16 +308,6 @@ in
               correctly-hinted fonts.
             '';
           };
-
-          style = mkOption {
-            type = types.enum ["none" "slight" "medium" "full"];
-            default = "full";
-            description = ''
-              TrueType hinting style, one of <literal>none</literal>,
-              <literal>slight</literal>, <literal>medium</literal>, or
-              <literal>full</literal>.
-            '';
-          };
         };
 
         includeUserConf = mkOption {
@@ -327,7 +326,15 @@ in
             default = "rgb";
             type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"];
             description = ''
-              Subpixel order.
+              Subpixel order. The overwhelming majority of displays are
+              <literal>rgb</literal> in their normal orientation. Select
+              <literal>vrgb</literal> for mounting such a display 90 degrees
+              clockwise from its normal orientation or <literal>vbgr</literal>
+              for mounting 90 degrees counter-clockwise. Select
+              <literal>bgr</literal> in the unlikely event of mounting 180
+              degrees from the normal orientation. Reverse these directions in
+              the improbable event that the display's native subpixel order is
+              <literal>bgr</literal>.
             '';
           };
 
@@ -335,7 +342,9 @@ in
             default = "default";
             type = types.enum ["none" "default" "light" "legacy"];
             description = ''
-              FreeType LCD filter.
+              FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering
+              has no visible effect; users of such displays may want to select
+              <literal>none</literal>.
             '';
           };
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ff3654737af..02d875b2674 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -141,9 +141,6 @@ with lib;
     # Unity3D
     (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
 
-    # fontconfig-ultimate
-    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ])
-
     # murmur
     (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
 
@@ -195,5 +192,6 @@ with lib;
       "See the 16.09 release notes for more information.")
     (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
     (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+    (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
   ];
 }
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index e8b897fb605..4e2c0e01ca0 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -24,7 +24,7 @@ let
     Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter}
     Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"}
     Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"}
-    Xft.hintstyle: hint${fontconfig.hinting.style}
+    Xft.hintstyle: hintslight
   '';
 
   # file provided by services.xserver.displayManager.session.script
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7df72bc0560..e1b87fafd8e 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -19,13 +19,6 @@ stdenv.mkDerivation rec {
     sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e";
   };
 
-  infinality = fetchFromGitHub {
-    owner = "bohoomil";
-    repo = "fontconfig-ultimate";
-    rev = "730f5e77580677e86522c1f2119aa78803741759";
-    sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7";
-  };
-
   patches = [
     # from https://bugs.freedesktop.org/show_bug.cgi?id=98165
     (fetchpatch {
@@ -35,10 +28,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  prePatch = ''
-    patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
-  '';
-
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # very small
 
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 2705339adbf..222dfc27256 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -8,13 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
   };
 
-  infinality_patch =
-    let subvers = "1";
-      in fetchurl {
-        url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
-        sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
-      }
-    ;
+  patches = [
+    # FreeType 2.7 prefixes PCF font family names with the foundry name.
+    # The output of fc-list and fc-query change which breaks the tests.
+    ./test-pcf-family-names-freetype-2.7.patch
+  ];
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
@@ -44,10 +42,6 @@ stdenv.mkDerivation rec {
   # Don't try to write to /var/cache/fontconfig at install time.
   installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
 
-  postInstall = ''
-    cd "$out/etc/fonts" && tar xvf ${infinality_patch}
-  '';
-
   passthru = {
     # Empty for backward compatibility, there was no versioning before 2.11
     configVersion = "";
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 14983b744df..c44373625e0 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
       url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
       sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
     })
+
+    # FreeType 2.7 prefixes PCF font family names with the foundry name.
+    # The output of fc-list and fc-query change which breaks the tests.
+    ./test-pcf-family-names-freetype-2.7.patch
   ];
   # additionally required for the glibc-2.25 patch; avoid requiring gperf
   postPatch = ''
diff --git a/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch b/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
new file mode 100644
index 00000000000..24aa6e5aaa1
--- /dev/null
+++ b/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
@@ -0,0 +1,18 @@
+diff -Nuar fontconfig-2.10.2-orig/test/out.expected fontconfig-2.10.2/test/out.expected
+--- fontconfig-2.10.2-orig/test/out.expected	2017-03-06 06:45:50.876053093 -0600
++++ fontconfig-2.10.2/test/out.expected	2017-03-06 06:48:18.012514337 -0600
+@@ -1,8 +1,8 @@
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index adf48df2494..f966965fa5f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,64 +1,53 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, which, zlib, bzip2, libpng, gnumake
-, glib /* passthru only */
+{
+  stdenv, lib, fetchurl, copyPathsToStore,
+  pkgconfig, which,
+  zlib, bzip2, libpng, gnumake, glib,
 
-  # FreeType supports sub-pixel rendering.  This is patented by
-  # Microsoft, so it is disabled by default.  This option allows it to
-  # be enabled.  See http://www.freetype.org/patents.html.
-, useEncumberedCode ? true
-, useInfinality ? true
+  # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
+  # LCD filtering is also known as ClearType and covered by several Microsoft patents.
+  # This option allows it to be disabled. See http://www.freetype.org/patents.html.
+  useEncumberedCode ? true,
 }:
 
-assert useInfinality -> useEncumberedCode;
-
-let
-  version = "2.6.5";
-
-  infinality = fetchFromGitHub {
-    owner = "archfan";
-    repo = "infinality_bundle";
-    rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee";
-    sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l";
-  };
-
-in
 with { inherit (stdenv.lib) optional optionals optionalString; };
-stdenv.mkDerivation rec {
-  name = "freetype-${version}";
+
+let version = "2.7.1"; name = "freetype-" + version; in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  meta = with stdenv.lib; {
+    description = "A font rendering engine";
+    longDescription = ''
+      FreeType is a portable and efficient library for rendering fonts. It
+      supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR
+      fonts. It has a bytecode interpreter and has an automatic hinter called
+      autofit which can be used instead of hinting instructions included in
+      fonts.
+    '';
+    homepage = https://www.freetype.org/;
+    license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ttuegel ];
+  };
 
   src = fetchurl {
     url = "mirror://savannah/freetype/${name}.tar.bz2";
-    sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2";
+    sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs";
   };
 
-  patches = [
-    # Patch for validation of OpenType and GX/AAT tables.
-    (fetchurl {
-      name = "freetype-2.2.1-enable-valid.patch";
-      url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990";
-      sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l";
-    })
-  ] ++ optionals (!useInfinality && useEncumberedCode) [
-    # Patch to enable subpixel rendering.
-    # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html.
-    (fetchurl {
-      name = "freetype-2.3.0-enable-spr.patch";
-      url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990;
-      sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd";
-    })
-  ];
-
-  prePatch = optionalString useInfinality ''
-    patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)"
-  '';
-
-  outputs = [ "out" "dev" ];
-
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
   # dependence on harfbuzz is looser than the reverse dependence
   nativeBuildInputs = [ pkgconfig which ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
+  patches =
+    [ ./enable-table-validation.patch ]
+    ++ optional useEncumberedCode ./enable-subpixel-rendering.patch;
+
+  outputs = [ "out" "dev" ];
+
   configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
 
   # The asm for armel is written with the 'asm' keyword.
@@ -76,19 +65,4 @@ stdenv.mkDerivation rec {
     # know why it's on the PATH.
     configureFlags = "--disable-static CC_BUILD=gcc";
   };
-
-  meta = with stdenv.lib; {
-    description = "A font rendering engine";
-    longDescription = ''
-      FreeType is a portable and efficient library for rendering fonts. It
-      supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR
-      fonts. It has a bytecode interpreter and has an automatic hinter called
-      autofit which can be used instead of hinting instructions included in
-      fonts.
-    '';
-    homepage = https://www.freetype.org/;
-    license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
-    #ToDo: encumbered = useEncumberedCode;
-    platforms = platforms.all;
-  };
 }
diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
new file mode 100644
index 00000000000..4f908343e8c
--- /dev/null
+++ b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
@@ -0,0 +1,13 @@
+Index: freetype-2.7.1/include/freetype/config/ftoption.h
+===================================================================
+--- freetype-2.7.1.orig/include/freetype/config/ftoption.h
++++ freetype-2.7.1/include/freetype/config/ftoption.h
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
+   /* This is done to allow FreeType clients to run unmodified, forcing     */
+   /* them to display normal gray-level anti-aliased glyphs.                */
+   /*                                                                       */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /*************************************************************************/
diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/development/libraries/freetype/enable-table-validation.patch
new file mode 100644
index 00000000000..37419f14f40
--- /dev/null
+++ b/pkgs/development/libraries/freetype/enable-table-validation.patch
@@ -0,0 +1,22 @@
+Index: freetype-2.7.1/modules.cfg
+===================================================================
+--- freetype-2.7.1.orig/modules.cfg
++++ freetype-2.7.1/modules.cfg
+@@ -120,7 +120,7 @@ AUX_MODULES += cache
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #

From 37794d7101539369af0cf6c1330ac5d6cf947abd Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 13 Mar 2017 09:20:47 +0100
Subject: [PATCH 0019/1744] gdbm: 1.12 -> 1.13

See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00005.html
for release anouncement
---
 pkgs/development/libraries/gdbm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 71b65131015..de77b4c99b8 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.12";
+  name = "gdbm-1.13";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr";
+    sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
   };
 
   doCheck = true;

From 22d9f53ee26939866a4b321b67a86599aadf55e9 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 2 Mar 2017 20:37:13 +0100
Subject: [PATCH 0020/1744] Init Perl AduioScan

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index db37a83154e..e68d7aa397a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -459,6 +459,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  AudioScan = buildPerlPackage rec {
+    name = "Audio-Scan-0.96";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
+      sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7";
+    };
+    buildInputs = [ ModuleBuild TestWarn ScalarString DigestCRC DataInteger ];
+    meta = {
+      description = "Fast C metadata and tag reader for all common audio file formats";
+      license = stdenv.lib.licenses.gpl2;
+    };
+  };
+
   AuthenDecHpwd = buildPerlPackage rec {
     name = "Authen-DecHpwd-2.006";
     src = fetchurl {

From 718f3ba198de50970f09832dfa84caa8bba58d51 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 2 Mar 2017 20:37:27 +0100
Subject: [PATCH 0021/1744] Init Perl ImageScale

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e68d7aa397a..2426a3d155f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6541,6 +6541,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ImageScale = buildPerlPackage rec {
+    name = "Image-Scale-0.13";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGRUNDMAN/${name}.tar.gz";
+      sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc";
+    };
+    buildInputs = [ ModuleBuild TestNoWarnings ];
+    meta = {
+      description = "Fast, high-quality fixed-point image resizing";
+      license = stdenv.lib.licenses.gpl2;
+    };
+  };
+
   ImageSize = buildPerlPackage rec {
     name = "Image-Size-3.232";
     src = fetchurl {

From ffa3dbeee1238729af81c4d41fa083007ca39923 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 2 Mar 2017 20:38:06 +0100
Subject: [PATCH 0022/1744] init slimserver

---
 pkgs/servers/slimserver/default.nix | 47 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/servers/slimserver/default.nix

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
new file mode 100644
index 00000000000..f455db2abb0
--- /dev/null
+++ b/pkgs/servers/slimserver/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub
+, makeWrapper
+#, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
+, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "slimserver-${version}";
+  version = "7.9";
+
+  src = fetchFromGitHub {
+    owner  = "Logitech";
+    repo   = "slimserver";
+    rev    = "095dd886a01e56a1ffe1b2ea31bb290d17c83948";
+    sha256 = "06s945spxh6j4g0l1k6cxpq04011ad4swgqd2in87c86sf6bm445";
+  };
+
+  buildInputs = [
+    makeWrapper
+    perl
+    perlPackages.Log4Perl
+    perlPackages.AudioScan
+    perlPackages.ImageScale
+  ];
+
+  buildPhase = ''
+  '';
+
+  installPhase = ''
+    cp -r . $out
+  '';
+  
+  postFixup = ''
+    wrapProgram $out/slimserver.pl \
+      --set PERL5LIB "${with perlPackages; stdenv.lib.makePerlPath [
+      Log4Perl
+      ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Logitech/slimserver;
+    description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server";
+    # TODO: not all source code is under gpl2!
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phile314 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c3a78d44f6..e32e36a18f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10896,6 +10896,8 @@ with pkgs;
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
+  slimserver = callPackage ../servers/slimserver { };
+
   smcroute = callPackage ../servers/smcroute { };
 
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };

From de5465d813e3192f2f14187269201f084e28a76a Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 2 Mar 2017 21:46:08 +0100
Subject: [PATCH 0023/1744] WIP

---
 pkgs/servers/slimserver/default.nix |  2 ++
 pkgs/top-level/perl-packages.nix    | 17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index f455db2abb0..7b9ea6b23f8 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     wrapProgram $out/slimserver.pl \
       --set PERL5LIB "${with perlPackages; stdenv.lib.makePerlPath [
       Log4Perl
+      AudioScan
+      ImageScale
       ]}"
   '';
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2426a3d155f..04e63206105 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -463,9 +463,12 @@ let self = _self // overrides; _self = with self; {
     name = "Audio-Scan-0.96";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
-      sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7";
+      sha256 = "d68bb3598bb3c925f4753cc9e73f5e357bf249a36e16da57c54c205de4bbb426";
     };
-    buildInputs = [ ModuleBuild TestWarn ScalarString DigestCRC DataInteger ];
+    buildInputs = [ pkgs.zlib ModuleBuild ModuleBuildPluggablePPPort ];
+    propagatedBuildInputs = [ TestWarn ];
+    NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz";
     meta = {
       description = "Fast C metadata and tag reader for all common audio file formats";
       license = stdenv.lib.licenses.gpl2;
@@ -6544,13 +6547,15 @@ let self = _self // overrides; _self = with self; {
   ImageScale = buildPerlPackage rec {
     name = "Image-Scale-0.13";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AG/AGRUNDMAN/${name}.tar.gz";
-      sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc";
+      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
+      sha256 = "5b2c92dc2dd635b488879461760cd251aa2b1feef41b64f17914a6e4bbe3e442";
     };
-    buildInputs = [ ModuleBuild TestNoWarnings ];
+    buildInputs = [ pkgs.libpng pkgs.libjpeg ];
+    propagatedBuildInputs = [ TestNoWarnings pkgs.zlib ];
+    makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib";
     meta = {
       description = "Fast, high-quality fixed-point image resizing";
-      license = stdenv.lib.licenses.gpl2;
+      license = stdenv.lib.licenses.gpl2Plus;
     };
   };
 

From 9bfd273aa4b61f632d7023f0a9fb3bdbb9f2031b Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 21:20:13 +0100
Subject: [PATCH 0024/1744] Add perl packages (EV, CanaryStability,
 JSONXSVersionOneAndTwo)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 04e63206105..873df971f71 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -881,6 +881,17 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestMore ];
   };
 
+  CanaryStability = buildPerlPackage rec {
+    name = "Canary-Stability-2012";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
+      sha256 = "fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107";
+    };
+    meta = {
+      license = stdenv.lib.licenses.gpl1Plus;
+    };
+  };
+
   CaptchaReCAPTCHA = buildPerlPackage rec {
     name = "Captcha-reCAPTCHA-0.97";
     src = fetchurl {
@@ -4663,6 +4674,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EV = buildPerlPackage rec {
+    name = "EV-4.22";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
+      sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991";
+    };
+    buildInputs = [ CanaryStability ];
+    propagatedBuildInputs = [ CommonSense ];
+    meta = {
+      license = stdenv.lib.licenses.gpl1Plus;
+    };
+  };
+
   EvalClosure = buildPerlPackage {
     name = "Eval-Closure-0.11";
     src = fetchurl {
@@ -7113,6 +7137,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  JSONXSVersionOneAndTwo = buildPerlPackage rec {
+    name = "JSON-XS-VersionOneAndTwo-0.31";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
+      sha256 = "e6092c4d961fae777acf7fe99fb3cd6e5b710fec85765a6b90417480e4c94a34";
+    };
+    propagatedBuildInputs = [ JSONXS ];
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   Later = buildPerlPackage rec {
     version = "0.19";
     name = "Object-Realize-Later-${version}";

From 6e0e27854f5249b561c7d33e7f60ea48bca7a097 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 21:20:55 +0100
Subject: [PATCH 0025/1744] Add some more perl dependencies

---
 pkgs/servers/slimserver/default.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 7b9ea6b23f8..85ee49fa7bc 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -17,9 +17,19 @@ stdenv.mkDerivation rec {
   buildInputs = [
     makeWrapper
     perl
-    perlPackages.Log4Perl
     perlPackages.AudioScan
+    perlPackages.DBI
+    perlPackages.DigestSHA1
+    perlPackages.EV
+    perlPackages.HTMLParser
     perlPackages.ImageScale
+    # why do
+    perlPackages.JSONXS
+    perlPackages.JSONXSVersionOneAndTwo
+    perlPackages.Log4Perl
+    perlPackages.SubName
+    perlPackages.XMLParser
+    perlPackages.YAML
   ];
 
   buildPhase = ''
@@ -32,9 +42,18 @@ stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram $out/slimserver.pl \
       --set PERL5LIB "${with perlPackages; stdenv.lib.makePerlPath [
-      Log4Perl
       AudioScan
+      DBI
+      DigestSHA1
+      EV
+      HTMLParser
       ImageScale
+      JSONXS
+      JSONXSVersionOneAndTwo
+      Log4Perl
+      SubName
+      XMLParser
+      YAML
       ]}"
   '';
 

From 38f315623ed61040197b878760b21527428170da Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 21:21:02 +0100
Subject: [PATCH 0026/1744] Remove unused binary files

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

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 85ee49fa7bc..78c0270589d 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
+    rm -Rf CPAN
+    rm -Rf Bin
   '';
 
   installPhase = ''

From ac8596ca27e39dec98d5478adf17c008476ad209 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 22:34:12 +0100
Subject: [PATCH 0027/1744] Use buildPerlPackage instead of standard builder

---
 pkgs/servers/slimserver/default.nix | 74 ++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 78c0270589d..c487aa2046b 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub
-, makeWrapper
+{ stdenv, buildPerlPackage, fetchFromGitHub
 #, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
 , perl, perlPackages }:
 
-stdenv.mkDerivation rec {
+buildPerlPackage rec {
   name = "slimserver-${version}";
   version = "7.9";
 
@@ -15,49 +14,66 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    makeWrapper
     perl
+    perlPackages.AnyEvent
     perlPackages.AudioScan
+    perlPackages.CarpClan
+    perlPackages.CGI
+    perlPackages.DataURIEncode
+    perlPackages.DBDSQLite
     perlPackages.DBI
+    perlPackages.DBIxClass
     perlPackages.DigestSHA1
     perlPackages.EV
+    perlPackages.ExporterLite
+    perlPackages.FileBOM
+    perlPackages.FileNext
+    perlPackages.FileSlurp
+    perlPackages.FileWhich
     perlPackages.HTMLParser
+    perlPackages.HTTPCookies
+    perlPackages.HTTPMessage
     perlPackages.ImageScale
-    # why do
-    perlPackages.JSONXS
+    perlPackages.IOSocketSSL
+    perlPackages.IOString
     perlPackages.JSONXSVersionOneAndTwo
     perlPackages.Log4Perl
+    perlPackages.NetHTTP
+    perlPackages.ProcBackground
     perlPackages.SubName
+    perlPackages.TextUnidecode
+    perlPackages.TieCacheLRU
+    perlPackages.TieCacheLRUExpires
+    perlPackages.TieRegexpHash
+    perlPackages.TimeDate
+    perlPackages.URI
     perlPackages.XMLParser
-    perlPackages.YAML
+    perlPackages.XMLSimple
+    perlPackages.YAMLLibYAML
   ];
 
-  buildPhase = ''
-    rm -Rf CPAN
-    rm -Rf Bin
-  '';
+
+  prePatch = ''
+    rm -rf CPAN
+    rm -rf Bin
+    touch Makefile.PL
+    '';
+
+  preConfigurePhase = "";
+
+  buildPhase = "
+    mv lib tmp
+    mkdir -p lib/perl5/
+    mv tmp lib/perl5/site_perl
+  ";
+
+  doCheck = false;
 
   installPhase = ''
     cp -r . $out
   '';
-  
-  postFixup = ''
-    wrapProgram $out/slimserver.pl \
-      --set PERL5LIB "${with perlPackages; stdenv.lib.makePerlPath [
-      AudioScan
-      DBI
-      DigestSHA1
-      EV
-      HTMLParser
-      ImageScale
-      JSONXS
-      JSONXSVersionOneAndTwo
-      Log4Perl
-      SubName
-      XMLParser
-      YAML
-      ]}"
-  '';
+
+  outputs = [ "out" ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/Logitech/slimserver;

From 7235dab8ef2ba1fcf64bcc755b778263e654512a Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 22:34:29 +0100
Subject: [PATCH 0028/1744] Add some more perl packages.

---
 pkgs/top-level/perl-packages.nix | 112 ++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 873df971f71..3d82938c030 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -460,10 +460,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AudioScan = buildPerlPackage rec {
-    name = "Audio-Scan-0.96";
+    name = "Audio-Scan-0.93";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
-      sha256 = "d68bb3598bb3c925f4753cc9e73f5e357bf249a36e16da57c54c205de4bbb426";
+      sha256 = "03nwcm234y76jb1p20rlcky6vzv68i46s9mjfr7kzp65w3yg94js";
     };
     buildInputs = [ pkgs.zlib ModuleBuild ModuleBuildPluggablePPPort ];
     propagatedBuildInputs = [ TestWarn ];
@@ -2067,6 +2067,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassInspector ];
   };
 
+  ClassVirtual = buildPerlPackage rec {
+    name = "Class-Virtual-0.08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz";
+      sha256 = "c6499b42d3b4e5c6488a5e82fbc28698e6c9860165072dddfa6749355a9cfbb2";
+    };
+    propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ];
+    meta = {
+      homepage = https://metacpan.org/release/Class-Virtual;
+      description = "Base class for virtual base classes";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ClassXSAccessor = buildPerlPackage {
     name = "Class-XSAccessor-1.19";
     src = fetchurl {
@@ -3077,6 +3091,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataURIEncode = buildPerlPackage rec {
+    name = "Data-URIEncode-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
+      sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360";
+    };
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   DataUUID = buildPerlPackage rec {
     name = "Data-UUID-1.220";
     src = fetchurl {
@@ -4641,6 +4666,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  enum = buildPerlPackage rec {
+    name = "enum-1.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35";
+    };
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   Env = buildPerlPackage {
     name = "Env-1.04";
     src = fetchurl {
@@ -5113,6 +5149,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleBuild ];
   };
 
+  FileBOM = buildPerlPackage rec {
+    name = "File-BOM-0.15";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz";
+      sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1";
+    };
+    buildInputs = [ ModuleBuild TestException ];
+    propagatedBuildInputs = [ Readonly ];
+    meta = {
+      description = "Utilities for handling Byte Order Marks";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   FileCheckTree = buildPerlPackage {
     name = "File-CheckTree-4.42";
     src = fetchurl {
@@ -10628,6 +10678,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ProcBackground = buildPerlPackage rec {
+    name = "Proc-Background-1.10";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BZ/BZAJAC/${name}.tar.gz";
+      sha256 = "1ce0dd78c0bb8393a2431b385a27b99fcc623a41ebec57b3cc09cc38cdb708ee";
+    };
+    meta = {
+    };
+  };
+
   ProcProcessTable = buildPerlPackage {
     name = "Proc-ProcessTable-0.51";
     src = fetchurl {
@@ -14000,6 +14060,31 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TieCacheLRU = buildPerlPackage rec {
+    name = "Tie-Cache-LRU-20150301";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz";
+      sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469";
+    };
+    propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassVirtual enum ];
+    meta = {
+      description = "A Least-Recently Used cache";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+  TieCacheLRUExpires = buildPerlPackage rec {
+    name = "Tie-Cache-LRU-Expires-0.55";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz";
+      sha256 = "b316d849acd25f24346d55a9950d281fee0746398767c601234122159573eb9a";
+    };
+    propagatedBuildInputs = [ TieCacheLRU ];
+    meta = {
+      license = stdenv.lib.licenses.artistic1;
+    };
+  };
+
   TieCycle = buildPerlPackage rec {
     name = "Tie-Cycle-1.21";
     src = fetchurl {
@@ -14055,6 +14140,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TieRegexpHash = buildPerlPackage rec {
+    name = "Tie-RegexpHash-0.17";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AL/ALTREUS/${name}.tar.gz";
+      sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3";
+    };
+    meta = {
+      license = stdenv.lib.licenses.artistic1;
+    };
+  };
+
   TieToObject = buildPerlPackage {
     name = "Tie-ToObject-0.03";
     src = fetchurl {
@@ -14450,6 +14546,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  UUIDTiny = buildPerlPackage rec {
+    name = "UUID-Tiny-1.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CA/CAUGUSTIN/${name}.tar.gz";
+      sha256 = "6dcd92604d64e96cc6c188194ae16a9d3a46556224f77b6f3d1d1312b68f9a3d";
+    };
+    meta = {
+      description = "Pure Perl UUID Support With Functional Interface";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   VariableMagic = buildPerlPackage rec {
     name = "Variable-Magic-0.58";
     src = fetchurl {

From 19ebbde4729aa00bf4db6ed94dce3b66e969a4fb Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 22:54:58 +0100
Subject: [PATCH 0029/1744] Add some more deps

---
 pkgs/servers/slimserver/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index c487aa2046b..faaa7118a2c 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -19,6 +19,7 @@ buildPerlPackage rec {
     perlPackages.AudioScan
     perlPackages.CarpClan
     perlPackages.CGI
+    perlPackages.DataDump
     perlPackages.DataURIEncode
     perlPackages.DBDSQLite
     perlPackages.DBI
@@ -27,11 +28,13 @@ buildPerlPackage rec {
     perlPackages.EV
     perlPackages.ExporterLite
     perlPackages.FileBOM
+    perlPackages.FileCopyRecursive
     perlPackages.FileNext
     perlPackages.FileSlurp
     perlPackages.FileWhich
     perlPackages.HTMLParser
     perlPackages.HTTPCookies
+    perlPackages.HTTPDaemon
     perlPackages.HTTPMessage
     perlPackages.ImageScale
     perlPackages.IOSocketSSL
@@ -47,6 +50,8 @@ buildPerlPackage rec {
     perlPackages.TieRegexpHash
     perlPackages.TimeDate
     perlPackages.URI
+    perlPackages.URIFind
+    perlPackages.UUIDTiny
     perlPackages.XMLParser
     perlPackages.XMLSimple
     perlPackages.YAMLLibYAML

From 12de6bb2112178924401bc98bdef8664bbf96849 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Tue, 14 Mar 2017 22:55:04 +0100
Subject: [PATCH 0030/1744] Move slim folder

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

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index faaa7118a2c..212270b2af0 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -70,6 +70,7 @@ buildPerlPackage rec {
     mv lib tmp
     mkdir -p lib/perl5/
     mv tmp lib/perl5/site_perl
+    mv Slim lib/perl5/site_perl
   ";
 
   doCheck = false;

From b0115c2fac63d71eb83108106f2612bb47831497 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 16 Feb 2017 13:20:53 +0000
Subject: [PATCH 0031/1744] Logbook: 0.11.3 -> 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63fc33ed17e..6ae7d0c6391 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28965,14 +28965,14 @@ EOF
 
   Logbook = buildPythonPackage rec {
     name = "Logbook-${version}";
-    version = "0.11.3";
+    version = "1.0.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/L/Logbook/${name}.tar.gz";
-      sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc";
+      sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7";
     };
 
-    buildInputs = [ self.pytest ];
+    buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ];
 
     checkPhase = ''
       find tests -name \*.pyc -delete

From 5e31a7cca61286f90571432f6775d6a908361699 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 16 Feb 2017 16:05:10 +0000
Subject: [PATCH 0032/1744] pytables: 3.2.2 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 88a39400c77..e5de7c4e2a4 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, python, buildPythonPackage
-, cython, bzip2, lzo, numpy, numexpr, hdf5 }:
+, cython, bzip2, lzo, numpy, numexpr, hdf5, six }:
 
 buildPythonPackage rec {
-  version = "3.2.2";
+  version = "3.3.0";
   name = "tables-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/t/tables/${name}.tar.gz";
-    sha256 = "3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84";
+    sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3";
   };
 
   buildInputs = [ hdf5 cython bzip2 lzo ];
-  propagatedBuildInputs = [ numpy numexpr ];
+  propagatedBuildInputs = [ numpy numexpr six ];
 
   # The setup script complains about missing run-paths, but they are
   # actually set.

From 90223a9bbd7f44153bb7e45f5fc757c86d67cdd9 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Fri, 17 Feb 2017 08:52:45 +0000
Subject: [PATCH 0033/1744] vega: add pytest as a build-input.

It's unclear how this worked before but it clearly did because we
have vega running in production.
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ae7d0c6391..1ca0a76d6bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -456,6 +456,7 @@ in {
       sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
     };
 
+    buildInputs = [ self.pytest ];
     propagatedBuildInputs = with self; [ jupyter_core pandas ];
 
     meta = {

From 97f26ee39ae057022d060edd1c3c8b64e5e2b174 Mon Sep 17 00:00:00 2001
From: Maksim Bronsky <maks.bronsky@web.de>
Date: Mon, 13 Mar 2017 22:43:25 +0100
Subject: [PATCH 0034/1744] initial release: vulnix

---
 lib/maintainers.nix                         |   1 +
 pkgs/tools/security/vulnix/default.nix      |  56 +++
 pkgs/tools/security/vulnix/requirements.nix | 531 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix          |   2 +
 4 files changed, 590 insertions(+)
 create mode 100644 pkgs/tools/security/vulnix/default.nix
 create mode 100644 pkgs/tools/security/vulnix/requirements.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e7b8ff7bf10..f7c11b2029e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -392,6 +392,7 @@
   pjones = "Peter Jones <pjones@devalot.com>";
   pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
   plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
+  plumps = "Maksim Bronsky <maks.bronsky@web.de";
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
   pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
   polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>";
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
new file mode 100644
index 00000000000..afec616563c
--- /dev/null
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -0,0 +1,56 @@
+{ buildPythonPackage,
+  callPackage,
+  click,
+  colorama,
+  fetchurl,
+  flake8,
+  lxml,
+  nix,
+  python,
+  pytest,
+  pytestcov,
+  stdenv,
+  }:
+
+let
+  external = callPackage ./requirements.nix { inherit buildPythonPackage fetchurl stdenv; };
+in
+
+buildPythonPackage rec{
+  name = "${pname}-${version}";
+  pname = "vulnix";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/90/c9/ebef9243334a99edb8598061efae0f00d7a199b01bea574a84e31e06236d/vulnix-${version}.tar.gz";
+    sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12";
+  };
+
+  buildInputs = [
+    flake8
+    pytest
+    pytestcov
+  ];
+
+  propagatedBuildInputs = [
+    click
+    colorama
+    nix
+    external.lxml
+    external.PyYAML
+    external.requests
+    external.ZODB
+  ];
+
+  checkPhase = ''
+    export PYTHONPATH=src:$PYTHONPATH
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "NixOS vulnerability scanner";
+    homepage = https://github.com/flyingcircusio/vulnix;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ plumps ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
new file mode 100644
index 00000000000..df51a5e8cd6
--- /dev/null
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -0,0 +1,531 @@
+{ buildPythonPackage, commonDoCheck ? false, commonBuildInputs ? [], fetchurl, libxml2, libxslt, stdenv }:
+
+rec {
+
+  BTrees = buildPythonPackage {
+    name = "BTrees-4.3.1";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz";
+      sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      coverage
+      persistent
+      transaction
+      zope.interface
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Scalable persistent object containers";
+    };
+  };
+
+
+
+  PyYAML = buildPythonPackage {
+    name = "PyYAML-3.11";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/75/5e/b84feba55e20f8da46ead76f14a3943c8cb722d40360702b2365b91dec00/PyYAML-3.11.tar.gz";
+      sha256 = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "YAML parser and emitter for Python";
+    };
+  };
+
+
+
+  ZConfig = buildPythonPackage {
+    name = "ZConfig-3.1.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
+      sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Structured Configuration Library";
+    };
+  };
+
+
+
+  ZODB = buildPythonPackage {
+    name = "ZODB-5.1.1";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/08/67/62d42c704edd64bcecddc29442a70535ebc7af46e232a5efa9fc572953f0/ZODB-5.1.1.tar.gz";
+      sha256 = "b0bbe6dfe60e2bdcf842a87abcc53b5cd15ad88ae2824c0c526cbb01ca0b90e5";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      BTrees
+      ZConfig
+      persistent
+      six
+      transaction
+      zc.lockfile
+      zodbpickle
+      zope.interface
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Zope Object Database: object database and persistence";
+    };
+  };
+
+
+
+  click = buildPythonPackage {
+    name = "click-6.6";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
+      sha256 = "cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.bsdOriginal;
+      description = "A simple wrapper around optparse for powerful command line utilities.";
+    };
+  };
+
+
+
+  colorama = buildPythonPackage {
+    name = "colorama-0.3.7";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/f0/d0/21c6449df0ca9da74859edc40208b3a57df9aca7323118c913e58d442030/colorama-0.3.7.tar.gz";
+      sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.bsdOriginal;
+      description = "Cross-platform colored terminal text.";
+    };
+  };
+
+
+
+  coverage = buildPythonPackage {
+    name = "coverage-4.0.3";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/76/b4/3777a6bae434240b1fcbbda6cb30085bd897b3519acfffea498ee9f41038/coverage-4.0.3.tar.gz";
+      sha256 = "85b1275b6d7a61ccc8024a4e9a4c9e896394776edce1a5d075ec116f91925462";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.asl20;
+      description = "Code coverage measurement for Python";
+    };
+  };
+
+
+
+  flake8 = buildPythonPackage {
+    name = "flake8-2.5.4";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/60/4a/7b0ac4920af5673380b7079ba2f7580a8645790c7718881082c0d918b8b4/flake8-2.5.4.tar.gz";
+      sha256 = "cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "mccabe"
+      "pep8"
+      "pyflakes"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "the modular source code checker: pep8, pyflakes and co";
+    };
+  };
+
+
+
+  lxml = buildPythonPackage {
+    name = "lxml-3.7.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/14/51/61462e59ab58575fe0d679ab2d31ec73cd49b26182c6ece3d9379faccfd7/lxml-3.7.0.tar.gz";
+      sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ libxml2 libxslt ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.bsdOriginal;
+      description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.";
+    };
+  };
+
+
+
+  mccabe = buildPythonPackage {
+    name = "mccabe-0.4.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/f6/e7/54461a958bb8b16f8db5f849d5d08b7d74153e064ac385fb68ff09f0bd27/mccabe-0.4.0.tar.gz";
+      sha256 = "9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "McCabe checker, plugin for flake8";
+    };
+  };
+
+
+
+  pep8 = buildPythonPackage {
+    name = "pep8-1.7.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/3e/b5/1f717b85fbf5d43d81e3c603a7a2f64c9f1dabc69a1e7745bd394cc06404/pep8-1.7.0.tar.gz";
+      sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "Python style guide checker";
+    };
+  };
+
+
+
+  persistent = buildPythonPackage {
+    name = "persistent-4.2.2";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz";
+      sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      coverage
+      zope.interface
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Translucent persistent objects";
+    };
+  };
+
+
+
+  py = buildPythonPackage {
+    name = "py-1.4.31";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/f4/9a/8dfda23f36600dd701c6722316ba8a3ab4b990261f83e7d3ffc6dfedf7ef/py-1.4.31.tar.gz";
+      sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "library with cross-python path, ini-parsing, io, code, log facilities";
+    };
+  };
+
+
+
+  pyflakes = buildPythonPackage {
+    name = "pyflakes-1.0.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/45/24/6bc038f3422bab08c24173c1990a56e9eb0c4582a9b202858a33f8aefeb8/pyflakes-1.0.0.tar.gz";
+      sha256 = "f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "passive checker of Python programs";
+    };
+  };
+
+
+
+  pytest = buildPythonPackage {
+    name = "pytest-2.9.1";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/5e/f0/75c5cee17575bef459c916b6276bd9ad56944836bb0d9e36dd05704e7f35/pytest-2.9.1.tar.gz";
+      sha256 = "0d48d27a127644fbe7c8158157e08b35f8255045d4476df694b91eb3a8147e65";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "colorama"
+      "py"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "pytest: simple powerful testing with Python";
+    };
+  };
+
+
+
+  pytest-capturelog = buildPythonPackage {
+    name = "pytest-capturelog-0.7";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/35/e9/6051b5bb65ad5049d5eb60127d34c63ba724e17acf8b1f2f2e0755131b6c/pytest-capturelog-0.7.tar.gz";
+      sha256 = "b6e8d5189b39462109c2188e6b512d6cc7e66d62bb5be65389ed50e96d22000d";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "py"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "py.test plugin to capture log messages";
+    };
+  };
+
+
+
+  pytest-codecheckers = buildPythonPackage {
+    name = "pytest-codecheckers-0.2";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/53/09/263669db13955496e77017f389693c1e1dd77d98fd4afd51b133162e858f/pytest-codecheckers-0.2.tar.gz";
+      sha256 = "853de10f204865140da2bc173f791c9e13794fc43656e02fffcce23c9999e748";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "pep8"
+      "py"
+      "pyflakes"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = "";
+      description = "pytest plugin to add source code sanity checks (pep8 and friends)";
+    };
+  };
+
+
+
+  pytest-cov = buildPythonPackage {
+    name = "pytest-cov-2.2.1";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/39/07/bdd2d985ae7ac726cc5e7a6a343b585570bf1f9f7cb297a9cd58a60c7c89/pytest-cov-2.2.1.tar.gz";
+      sha256 = "a8b22e53e7f3b971454c35df99dffe21f4749f539491e935c55d3ff7e1b284fa";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "coverage"
+      "pytest"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.bsdOriginal;
+      description = "Pytest plugin for measuring coverage.";
+    };
+  };
+
+
+
+  pytest-runner = buildPythonPackage {
+    name = "pytest-runner-2.9";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/11/d4/c335ddf94463e451109e3494e909765c3e5205787b772e3b25ee8601b86a/pytest-runner-2.9.tar.gz";
+      sha256 = "50378de59b02f51f64796d3904dfe71b9dc6f06d88fc6bfbd5c8e8366ae1d131";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "Invoke py.test as distutils command with dependency resolution";
+    };
+  };
+
+
+
+  pytest-timeout = buildPythonPackage {
+    name = "pytest-timeout-1.0.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/cf/92/ab29b9baa54d47dfd50e43be35577de9af4e7ebf27d29f546ddeb6c3b6f5/pytest-timeout-1.0.0.tar.gz";
+      sha256 = "1465096be73e16df1e15d1b1453692428a7e15b997d756bc565aee0d12798ce1";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      "pytest"
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "py.test plugin to abort hanging tests";
+    };
+  };
+
+
+
+  requests = buildPythonPackage {
+    name = "requests-2.10.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-2.10.0.tar.gz";
+      sha256 = "63f1815788157130cee16a933b2ee184038e975f0017306d723ac326b5525b54";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.asl20;
+      description = "Python HTTP for Humans.";
+    };
+  };
+
+
+
+  setuptools-scm = buildPythonPackage {
+    name = "setuptools-scm-1.15.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc/setuptools_scm-1.15.0.tar.gz";
+      sha256 = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "the blessed package to manage your versions by scm tags";
+    };
+  };
+
+
+
+  six = buildPythonPackage {
+    name = "six-1.10.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz";
+      sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.mit;
+      description = "Python 2 and 3 compatibility utilities";
+    };
+  };
+
+
+
+  transaction = buildPythonPackage {
+    name = "transaction-2.0.3";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
+      sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      coverage
+      zope.interface
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Transaction management for Python";
+    };
+  };
+
+
+
+  zc.lockfile = buildPythonPackage {
+    name = "zc.lockfile-1.2.1";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz";
+      sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Basic inter-process locks";
+    };
+  };
+
+
+
+  zodbpickle = buildPythonPackage {
+    name = "zodbpickle-0.6.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz";
+      sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      coverage
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Fork of Python 3 pickle module.";
+    };
+  };
+
+
+
+  zope.interface = buildPythonPackage {
+    name = "zope.interface-4.3.3";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz";
+      sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88";
+    };
+    doCheck = commonDoCheck;
+    buildInputs = commonBuildInputs;
+    propagatedBuildInputs = [
+      coverage
+    ];
+    meta = with stdenv.lib; {
+      homepage = "";
+      license = licenses.zpt21;
+      description = "Interfaces for Python";
+    };
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a797ea509..9bcdeb3c1ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31999,6 +31999,8 @@ EOF
     };
   };
 
+  vulnix = callPackage ../tools/security/vulnix { };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From 5a9e14ee16374313bad0cbac4f3969d132ca2f19 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Fri, 17 Feb 2017 09:14:18 +0000
Subject: [PATCH 0035/1744] altair: 1.0.0 -> 1.2.0

Also disabling tests because the test runner picks up too much and
then fails.
---
 pkgs/top-level/python-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ca0a76d6bb..15c1b2bbb28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -431,15 +431,19 @@ in {
   };
 
   altair = buildPythonPackage rec {
-    name = "altair-1.0.0";
+    name = "altair-1.2.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/altair/${name}.tar.gz";
-      sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r";
+      sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n";
     };
+    buildInputs = [ self.pytest ];
 
+    checkPhase = ''
+      export LANG=en_US.UTF-8
+      py.test altair --doctest-modules
+    '';
     propagatedBuildInputs = with self; [ vega pandas ipython traitlets ];
-
     meta = {
       description = "A declarative statistical visualization library for Python.";
       homepage = https://github.com/altair-viz/altair;

From cad54958c048bc67df23c4fff6ffaba9a08aff40 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 15 Mar 2017 22:34:10 +0100
Subject: [PATCH 0036/1744] Server at least starts now

---
 pkgs/servers/slimserver/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 212270b2af0..5a3d7d3fb13 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -19,6 +19,7 @@ buildPerlPackage rec {
     perlPackages.AudioScan
     perlPackages.CarpClan
     perlPackages.CGI
+    perlPackages.ClassXSAccessor
     perlPackages.DataDump
     perlPackages.DataURIEncode
     perlPackages.DBDSQLite
@@ -30,6 +31,7 @@ buildPerlPackage rec {
     perlPackages.FileBOM
     perlPackages.FileCopyRecursive
     perlPackages.FileNext
+    perlPackages.FileReadBackwards
     perlPackages.FileSlurp
     perlPackages.FileWhich
     perlPackages.HTMLParser
@@ -41,6 +43,7 @@ buildPerlPackage rec {
     perlPackages.IOString
     perlPackages.JSONXSVersionOneAndTwo
     perlPackages.Log4Perl
+    perlPackages.LWPUserAgent
     perlPackages.NetHTTP
     perlPackages.ProcBackground
     perlPackages.SubName
@@ -59,6 +62,8 @@ buildPerlPackage rec {
 
 
   prePatch = ''
+    mkdir CPAN_used
+    mv CPAN/DBIx CPAN/SQL CPAN/Template* CPAN_used
     rm -rf CPAN
     rm -rf Bin
     touch Makefile.PL
@@ -68,8 +73,9 @@ buildPerlPackage rec {
 
   buildPhase = "
     mv lib tmp
-    mkdir -p lib/perl5/
-    mv tmp lib/perl5/site_perl
+    mkdir -p lib/perl5/site_perl
+    mv CPAN_used/* lib/perl5/site_perl
+    cp -rf tmp/* lib/perl5/site_perl
     mv Slim lib/perl5/site_perl
   ";
 

From 588c7738807f8db2916c8cc7c3a811c529139b34 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 15 Mar 2017 22:39:03 +0100
Subject: [PATCH 0037/1744] Web interface starts up!

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

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 5a3d7d3fb13..8f11fe0afca 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -47,6 +47,7 @@ buildPerlPackage rec {
     perlPackages.NetHTTP
     perlPackages.ProcBackground
     perlPackages.SubName
+    perlPackages.TemplateToolkit
     perlPackages.TextUnidecode
     perlPackages.TieCacheLRU
     perlPackages.TieCacheLRUExpires
@@ -63,7 +64,7 @@ buildPerlPackage rec {
 
   prePatch = ''
     mkdir CPAN_used
-    mv CPAN/DBIx CPAN/SQL CPAN/Template* CPAN_used
+    mv CPAN/DBIx CPAN/SQL CPAN_used
     rm -rf CPAN
     rm -rf Bin
     touch Makefile.PL

From ad88df249c8d0054106bf680ad5237ce19770276 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 16 Mar 2017 19:54:27 +0100
Subject: [PATCH 0038/1744] Use 7.9.0 tarball

---
 pkgs/servers/slimserver/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 8f11fe0afca..1d9a16656a7 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, buildPerlPackage, fetchFromGitHub
+{ stdenv, buildPerlPackage, fetchurl
 #, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
 , perl, perlPackages }:
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
-  version = "7.9";
+  version = "7.9.0";
 
-  src = fetchFromGitHub {
-    owner  = "Logitech";
-    repo   = "slimserver";
-    rev    = "095dd886a01e56a1ffe1b2ea31bb290d17c83948";
-    sha256 = "06s945spxh6j4g0l1k6cxpq04011ad4swgqd2in87c86sf6bm445";
+  src = fetchurl {
+    url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
+    sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44";
   };
 
   buildInputs = [

From 45d8d6ebeb92f3a721993b49bb96b0fdd4c97d62 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 16 Mar 2017 20:42:49 +0100
Subject: [PATCH 0039/1744] Add slimserver nixos module

---
 nixos/modules/misc/ids.nix                  |  2 +
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/audio/slimserver.nix | 95 +++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 nixos/modules/services/audio/slimserver.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d51b29b99da..09b4c5002eb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -288,6 +288,7 @@
       kresd = 270;
       rpc = 271;
       geoip = 272;
+      slimserver = 273;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -545,6 +546,7 @@
       kresd = 270;
       #rpc = 271; # unused
       #geoip = 272; # unused
+      slimserver = 273;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7d2ae4a571c..9db688f87dc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -128,6 +128,7 @@
   ./services/audio/liquidsoap.nix
   ./services/audio/mpd.nix
   ./services/audio/mopidy.nix
+  ./services/audio/slimserver.nix
   ./services/audio/squeezelite.nix
   ./services/audio/ympd.nix
   ./services/backup/almir.nix
diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
new file mode 100644
index 00000000000..41422c307e9
--- /dev/null
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -0,0 +1,95 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.slimserver;
+
+in {
+  options = {
+
+    services.slimserver = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable slimserver.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+	default = pkgs.slimserver;
+	defaultText = "pkgs.slimserver";
+	description = "Slimserver package to use.";
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/slimserver";
+        description = ''
+          The directory where slimserver stores its state, tag cache,
+          playlists etc.
+        '';
+      };
+
+      network = {
+
+        listenAddress = mkOption {
+          type = types.str;
+          default = "127.0.0.1";
+          example = "any";
+          description = ''
+            The address for the daemon to listen on.
+            Use <literal>any</literal> to listen on all addresses.
+          '';
+        };
+
+        port = mkOption {
+          type = types.int;
+          default = 6600;
+          description = ''
+            This setting is the TCP port that is desired for the daemon to get assigned
+            to.
+          '';
+        };
+
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.slimserver = {
+      after = [ "network.target" ];
+      description = "Slim Server for Logitech Squeezebox Players";
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = "mkdir -p ${cfg.dataDir} && chown -R slimserver:slimserver ${cfg.dataDir}";
+      serviceConfig = {
+        User = "slimserver";
+        PermissionsStartOnly = true;
+        ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache";
+      };
+    };
+
+    users = {
+      groups.slimserver.gid = config.ids.gids.slimserver;
+      users.slimserver = {
+        uid = config.ids.uids.slimserver;
+	description = "Slimserver daemon user";
+	home = cfg.dataDir;
+	group = "slimserver";
+      };
+    };
+  };
+
+}
+

From 0bd6fdcfc462752207ce6bfeca5d3c8f1ba6866e Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 16 Mar 2017 20:50:10 +0100
Subject: [PATCH 0040/1744] Cosmetics

---
 nixos/modules/services/audio/slimserver.nix | 12 ++++++------
 pkgs/servers/slimserver/default.nix         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 41422c307e9..2f492833538 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -21,9 +21,9 @@ in {
 
       package = mkOption {
         type = types.package;
-	default = pkgs.slimserver;
-	defaultText = "pkgs.slimserver";
-	description = "Slimserver package to use.";
+        default = pkgs.slimserver;
+        defaultText = "pkgs.slimserver";
+        description = "Slimserver package to use.";
       };
 
       dataDir = mkOption {
@@ -84,9 +84,9 @@ in {
       groups.slimserver.gid = config.ids.gids.slimserver;
       users.slimserver = {
         uid = config.ids.uids.slimserver;
-	description = "Slimserver daemon user";
-	home = cfg.dataDir;
-	group = "slimserver";
+        description = "Slimserver daemon user";
+        home = cfg.dataDir;
+        group = "slimserver";
       };
     };
   };
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 1d9a16656a7..bef55294424 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,5 +1,4 @@
 { stdenv, buildPerlPackage, fetchurl
-#, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
 , perl, perlPackages }:
 
 buildPerlPackage rec {
@@ -62,6 +61,7 @@ buildPerlPackage rec {
 
   prePatch = ''
     mkdir CPAN_used
+    # slimserver doesn't work with current DBIx/SQL versions, use bundled copies
     mv CPAN/DBIx CPAN/SQL CPAN_used
     rm -rf CPAN
     rm -rf Bin

From ffa0a877749eb42e2a6686542d3a93421e451347 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 16 Mar 2017 20:51:06 +0100
Subject: [PATCH 0041/1744] Remove unused options

---
 nixos/modules/services/audio/slimserver.nix | 25 ---------------------
 1 file changed, 25 deletions(-)

diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 2f492833538..024c91349e6 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -34,32 +34,7 @@ in {
           playlists etc.
         '';
       };
-
-      network = {
-
-        listenAddress = mkOption {
-          type = types.str;
-          default = "127.0.0.1";
-          example = "any";
-          description = ''
-            The address for the daemon to listen on.
-            Use <literal>any</literal> to listen on all addresses.
-          '';
-        };
-
-        port = mkOption {
-          type = types.int;
-          default = 6600;
-          description = ''
-            This setting is the TCP port that is desired for the daemon to get assigned
-            to.
-          '';
-        };
-
-      };
-
     };
-
   };
 
 

From b0e518c6e5c969f42a69f5ef0616ace3271948e9 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Thu, 16 Mar 2017 20:59:12 +0100
Subject: [PATCH 0042/1744] Mark slimserver as unfree

---
 pkgs/servers/slimserver/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index bef55294424..ede8cf317ac 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -89,8 +89,9 @@ buildPerlPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/Logitech/slimserver;
     description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server";
-    # TODO: not all source code is under gpl2!
-    license = licenses.gpl2;
+    # the firmware is not under a free license!
+    # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt
+    license = licenses.unfree;
     maintainers = [ maintainers.phile314 ];
     platforms = platforms.linux;
   };

From 5f89c9e92df754c108a57c5b691e7a00bfd37482 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 16 Mar 2017 00:55:13 +0100
Subject: [PATCH 0043/1744] nghttp2: 1.19.0 -> 1.20.0

Corrected c-ares attribute name

Full changelog : https://nghttp2.org/blog/2017/02/26/nghttp2-v1-20-0/
---
 pkgs/development/libraries/nghttp2/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index aee0b3d7116..5fb9cc36e96 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig
 
 # Optional Dependencies
-, openssl ? null, libev ? null, zlib ? null, libcares ? null
+, openssl ? null, libev ? null, zlib ? null, c-ares ? null
 , enableHpack ? false, jansson ? null
 , enableAsioLib ? false, boost ? null
 , enableGetAssets ? false, libxml2 ? null
@@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; };
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.19.0";
+  version = "1.20.0";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";
+    sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b";
   };
 
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libev zlib libcares ]
+  buildInputs = [ openssl libev zlib c-ares ]
     ++ optional enableHpack jansson
     ++ optional enableAsioLib boost
     ++ optional enableGetAssets libxml2
@@ -36,8 +36,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ]
+    ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
+
+  #doCheck = true;  # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
+
+
   meta = with stdenv.lib; {
-    homepage = http://nghttp2.org/;
+    homepage = https://nghttp2.org/;
     description = "A C implementation of HTTP/2";
     license = licenses.mit;
     platforms = platforms.all;

From a4c68ace9cae9948ddd1a7ab7ef20e12ac8bb48e Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 15 Mar 2017 23:23:57 +0100
Subject: [PATCH 0044/1744] jemalloc: 4.3.1 -> 4.5.0

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

diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 84638bc01ea..8c8c181409d 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jemalloc-${version}";
-  version = "4.3.1";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp";
+    sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780";
   };
 
   # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
   # option should remove the prefix and give us a working jemalloc.
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
 
+  doCheck = true;
+
+
   meta = with stdenv.lib; {
     homepage = http://jemalloc.net;
     description = "General purpose malloc(3) implementation";

From 354ea69ae42d2a1b691a4f3cb771e59141bd0dcd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 12 Mar 2017 17:06:44 -0500
Subject: [PATCH 0045/1744] fontconfig-penultimate: init at 0.2

Also provides a NixOS module.
---
 .../config/fonts/fontconfig-penultimate.nix   | 57 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  3 +-
 .../fonts/fontconfig-penultimate/default.nix  | 18 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/config/fonts/fontconfig-penultimate.nix
 create mode 100644 pkgs/data/fonts/fontconfig-penultimate/default.nix

diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
new file mode 100644
index 00000000000..8e41d342117
--- /dev/null
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -0,0 +1,57 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.fonts.fontconfig.penultimate;
+
+  latestVersion  = pkgs.fontconfig.configVersion;
+
+  # The configuration to be included in /etc/font/
+  confPkg = pkgs.runCommand "font-penultimate-conf" {} ''
+    support_folder=$out/etc/fonts/conf.d
+    latest_folder=$out/etc/fonts/${latestVersion}/conf.d
+
+    mkdir -p $support_folder
+    mkdir -p $latest_folder
+
+    # fontconfig ultimate various configuration files
+    ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
+          $support_folder
+    ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
+          $latest_folder
+  '';
+
+in
+{
+
+  options = {
+
+    fonts = {
+
+      fontconfig = {
+
+        penultimate = {
+          enable = mkOption {
+            type = types.bool;
+            default = true;
+            description = ''
+              Enable fontconfig-penultimate settings to supplement the
+              NixOS defaults by providing per-font rendering defaults and
+              metric aliases.
+            '';
+          };
+        };
+
+      };
+    };
+
+  };
+
+  config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
+
+    fonts.fontconfig.confPackages = [ confPkg ];
+
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7d2ae4a571c..a938ba6d006 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,8 +1,9 @@
 [
   ./config/debug-info.nix
   ./config/fonts/corefonts.nix
-  ./config/fonts/fontconfig-ultimate.nix
   ./config/fonts/fontconfig.nix
+  ./config/fonts/fontconfig-penultimate.nix
+  ./config/fonts/fontconfig-ultimate.nix
   ./config/fonts/fontdir.nix
   ./config/fonts/fonts.nix
   ./config/fonts/ghostscript.nix
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
new file mode 100644
index 00000000000..aea3365aba4
--- /dev/null
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchFromGitHub }:
+
+let version = "0.2"; in
+stdenv.mkDerivation {
+  name = "fontconfig-penultimate-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ttuegel";
+    repo = "fontconfig-penultimate";
+    rev = version;
+    sha256 = "106sjfmxdn2cachgsg0ky3wi676x6nd14y5fcl16n82kghi3d9yf";
+  };
+
+  installPhase = ''
+    mkdir -p $out/etc/fonts/conf.d
+    cp *.conf $out/etc/fonts/conf.d
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2eb80ec01d..962506444fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7330,6 +7330,8 @@ with pkgs;
 
   fontconfig = callPackage ../development/libraries/fontconfig { };
 
+  fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {};
+
   fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};
 
   folly = callPackage ../development/libraries/folly { };

From a6fce585e4c7acbd3fbb045199ef39a2f71df4ec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 12 Mar 2017 17:08:02 -0500
Subject: [PATCH 0046/1744] nixos/fontconfig: set rendering defaults, not
 overrides

---
 nixos/modules/config/fonts/fontconfig.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index aa9c59ec551..a137eab3534 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -75,23 +75,23 @@ let cfg = config.fonts.fontconfig;
       <fontconfig>
 
         <!-- Default rendering settings -->
-        <match target="font">
-          <edit mode="assign" name="hinting">
+        <match target="pattern">
+          <edit mode="append" name="hinting">
             ${fcBool cfg.hinting.enable}
           </edit>
-          <edit mode="assign" name="autohint">
+          <edit mode="append" name="autohint">
             ${fcBool cfg.hinting.autohint}
           </edit>
-          <edit mode="assign" name="hintstyle">
+          <edit mode="append" name="hintstyle">
             <const>hintslight</const>
           </edit>
-          <edit mode="assign" name="antialias">
+          <edit mode="append" name="antialias">
             ${fcBool cfg.antialias}
           </edit>
-          <edit mode="assign" name="rgba">
+          <edit mode="append" name="rgba">
             <const>${cfg.subpixel.rgba}</const>
           </edit>
-          <edit mode="assign" name="lcdfilter">
+          <edit mode="append" name="lcdfilter">
             <const>lcd${cfg.subpixel.lcdfilter}</const>
           </edit>
         </match>

From 975d040f07eff23289e7698cb4bf02461c3fdd19 Mon Sep 17 00:00:00 2001
From: rht <rhtbot@gmail.com>
Date: Thu, 12 Jan 2017 04:31:36 +0400
Subject: [PATCH 0047/1744] coq_HEAD: Update to the latest commit

---
 pkgs/applications/science/logic/coq/HEAD.nix | 8 ++++----
 pkgs/top-level/all-packages.nix              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index f6837397e21..e02170793ea 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -6,7 +6,7 @@
 {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
-  version = "8.6pre-0c999f02";
+  version = "2017-01-22";
   coq-version = "8.6";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -17,15 +17,15 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "coq-${version}";
+  name = "coq-unstable-${version}";
 
   inherit coq-version;
   inherit ocaml camlp5;
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
-    rev = "ad768e435a736ca51ac79a575967b388b34918c7";
-    sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j";
+    rev = "d6bcc6ebe4f65d0555414851f7e4fb6fa1fb22a4";
+    sha256 = "1k5wkwlis836iwy1s8hfjw9gwdk8vp405hp09s6d44ijb2ihr356";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fe47cdf560..f8d0ac7ce67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17222,8 +17222,8 @@ with pkgs;
   };
   coq_8_6 = callPackage ../applications/science/logic/coq {};
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
+    inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_02.camlp5_transitional;
   };
   coq = coq_8_6;
 

From 7264efb5cb387ada5e739ec35d4b48db1904705b Mon Sep 17 00:00:00 2001
From: rht <rhtbot@gmail.com>
Date: Sun, 15 Jan 2017 18:21:57 +0400
Subject: [PATCH 0048/1744] Fold in specific ocaml version choice into let

---
 pkgs/applications/science/logic/coq/HEAD.nix | 13 ++++++++-----
 pkgs/top-level/all-packages.nix              |  5 +----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index e02170793ea..79893c38997 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -1,26 +1,29 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
+# - coqide compilation can be disabled by setting buildIde to false;
 # - The csdp program used for the Micromega tactic is statically referenced.
 #   However, coq can build without csdp by setting it to null.
 #   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
+{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}:
 
 let
   version = "2017-01-22";
   coq-version = "8.6";
-  buildIde = lablgtk != null;
-  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
     substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
     substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
   '' else "";
+  ocaml = ocamlPackages_4_02.ocaml;
+  findlib = ocamlPackages_4_02.findlib;
+  lablgtk = ocamlPackages_4_02.lablgtk;
+  camlp5 = ocamlPackages_4_02.camlp5_transitional;
 in
 
 stdenv.mkDerivation {
   name = "coq-unstable-${version}";
 
   inherit coq-version;
-  inherit ocaml camlp5;
+  inherit ocaml camlp5 findlib;
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8d0ac7ce67..75c817782f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17221,10 +17221,7 @@ with pkgs;
     version = "8.5pl3";
   };
   coq_8_6 = callPackage ../applications/science/logic/coq {};
-  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
-    inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_02.camlp5_transitional;
-  };
+  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
   coq = coq_8_6;
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {

From bbd1c3d58a8652f3712348c4683c7c02738994d6 Mon Sep 17 00:00:00 2001
From: rht <rhtbot@gmail.com>
Date: Mon, 6 Feb 2017 16:27:13 +0400
Subject: [PATCH 0049/1744] coq_HEAD: Update once more

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

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 79893c38997..8d3fb19b263 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -6,7 +6,7 @@
 {stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}:
 
 let
-  version = "2017-01-22";
+  version = "2017-02-03";
   coq-version = "8.6";
   ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
-    rev = "d6bcc6ebe4f65d0555414851f7e4fb6fa1fb22a4";
-    sha256 = "1k5wkwlis836iwy1s8hfjw9gwdk8vp405hp09s6d44ijb2ihr356";
+    rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06";
+    sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

From 136ad2a0561f79ab8f1f2007debcd246984eddf7 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 18 Mar 2017 13:53:42 +0300
Subject: [PATCH 0050/1744] mytetra: init at 1.42.2

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

diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
new file mode 100644
index 00000000000..b35e60cf2d6
--- /dev/null
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qmakeHook, makeQtWrapper, qtsvg }:
+
+let
+  version = "1.42.2";
+in stdenv.mkDerivation rec {
+  name = "mytetra-${version}";
+  src = fetchurl {
+    url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
+    sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
+  };
+
+  buildInputs = [ qmakeHook makeQtWrapper qtsvg ];
+
+  hardeningDisable = [ "format" ];
+
+  preBuild = ''
+    substituteInPlace mytetra.pro \
+      --replace /usr/local/bin $out/bin \
+      --replace /usr/share $out/share
+
+    substituteInPlace src/views/mainWindow/MainWindow.cpp \
+      --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
+  '';
+
+  postInstall = "wrapQtProgram $out/bin/mytetra";
+
+  meta = with stdenv.lib; {
+    description = "Smart manager for information collecting";
+    homepage = http://webhamster.ru/site/page/index/articles/projectcode/138;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b580dfc042e..ec9eecc699b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3008,6 +3008,8 @@ with pkgs;
 
   mysqltuner = callPackage ../tools/misc/mysqltuner { };
 
+  mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
+
   nabi = callPackage ../tools/inputmethods/nabi { };
 
   namazu = callPackage ../tools/text/namazu { };

From f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sat, 18 Mar 2017 11:49:43 +0100
Subject: [PATCH 0051/1744] nixos: Define XCURSOR_PATH environment variable.

In the absence of XCURSOR_PATH, the function XcursorLibraryPath
in libXcursor will return a hardcoded value unsuitable for NixOS.
Some desktops as well as display managers in NixOS currently do
set XCURSOR_PATH, but there are combinations where neither does
(e.g. SDDM+XFCE), resulting in no cursor themes being available.

The new definition if XCURSOR_PATH is effectively the same as what
KDE's startkde currently does.

Fixes issue #21442.
---
 nixos/modules/programs/environment.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index a1615c920c0..48a1e2a0a88 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -20,6 +20,7 @@ in
       { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
         PAGER = mkDefault "less -R";
         EDITOR = mkDefault "nano";
+        XCURSOR_PATH = "$HOME/.icons";
       };
 
     environment.profiles =
@@ -42,6 +43,7 @@ in
         GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ];
         XDG_DATA_DIRS = [ "/share" ];
+        XCURSOR_PATH = [ "/share/icons" ];
         MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
         LIBEXEC_PATH = [ "/lib/libexec" ];
       };

From a44cea1158aaa4cf035a066762437352a8e28e2f Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sat, 18 Mar 2017 13:01:36 +0100
Subject: [PATCH 0052/1744] Fix plugins by not moving Slim folder

---
 pkgs/servers/slimserver/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index ede8cf317ac..18dbed4d1f3 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -75,7 +75,6 @@ buildPerlPackage rec {
     mkdir -p lib/perl5/site_perl
     mv CPAN_used/* lib/perl5/site_perl
     cp -rf tmp/* lib/perl5/site_perl
-    mv Slim lib/perl5/site_perl
   ";
 
   doCheck = false;

From c904e68e53f241e395575acd4276844329102068 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sat, 18 Mar 2017 13:54:39 +0100
Subject: [PATCH 0053/1744] Remove static uid/gid

---
 nixos/modules/misc/ids.nix                  | 2 --
 nixos/modules/services/audio/slimserver.nix | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 09b4c5002eb..d51b29b99da 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -288,7 +288,6 @@
       kresd = 270;
       rpc = 271;
       geoip = 272;
-      slimserver = 273;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -546,7 +545,6 @@
       kresd = 270;
       #rpc = 271; # unused
       #geoip = 272; # unused
-      slimserver = 273;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 024c91349e6..7d661dd6040 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -56,13 +56,12 @@ in {
     };
 
     users = {
-      groups.slimserver.gid = config.ids.gids.slimserver;
       users.slimserver = {
-        uid = config.ids.uids.slimserver;
         description = "Slimserver daemon user";
         home = cfg.dataDir;
         group = "slimserver";
       };
+      groups.slimserver = {};
     };
   };
 

From f3aeb3b0ab3e8da1dcdce567e1e608e4268f49a2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 18 Mar 2017 15:05:55 -0400
Subject: [PATCH 0054/1744] llvm-39: a couple of improvements

Splits outputs in clang like we do in 3.8 and 4.0 to avoid runtime
dependency on Python in the main derivation.

I also disable TSAN on Darwin to maintain consistency with 4.0, which
disables it because it forces an unfree dependency in the stdenv.
---
 .../compilers/llvm/3.9/clang/default.nix         | 11 +++++++++++
 pkgs/development/compilers/llvm/3.9/llvm.nix     | 16 +++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 677c4a526ea..55938ca016e 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -29,12 +29,23 @@ let
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
     '';
 
+    outputs = [ "out" "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/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
+
+      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;
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 62f1514e231..2c47ec5127f 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -40,8 +40,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
 
   buildInputs = [ perl groff cmake libxml2 python libffi ]
-    ++ stdenv.lib.optionals stdenv.isDarwin
-         [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -53,11 +52,15 @@ in stdenv.mkDerivation rec {
       sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf";
     }}
   ''
-  # hacky fix: New LLVM releases require a newer OS X SDK than
-  # 10.9. This is a temporary measure until nixpkgs darwin support is
-  # updated.
+  # 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. I realize that this LLVM isn't used in the stdenv but I want to
+  # keep it consistent with 4.0. We really shouldn't be copying and pasting all this code around...
   + stdenv.lib.optionalString stdenv.isDarwin ''
-        sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+    substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
   ''
   # Patch llvm-config to return correct library path based on --link-{shared,static}.
   + stdenv.lib.optionalString (enableSharedLibraries) ''
@@ -85,7 +88,6 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
-    "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool"
   ];
 
   postBuild = ''

From f36f21c650538dbecd6e4c723f601b8b43176ffb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 18 Mar 2017 19:38:43 +0100
Subject: [PATCH 0055/1744] go: Respect $NIX_SSL_CERT_FILE

---
 pkgs/development/compilers/go/1.7.nix                       | 4 ++--
 pkgs/development/compilers/go/1.8.nix                       | 4 ++--
 .../go/{cacert-1.7.patch => ssl-cert-file-1.7.patch}        | 6 +++---
 .../go/{cacert-1.8.patch => ssl-cert-file-1.8.patch}        | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/development/compilers/go/{cacert-1.7.patch => ssl-cert-file-1.7.patch} (92%)
 rename pkgs/development/compilers/go/{cacert-1.8.patch => ssl-cert-file-1.8.patch} (92%)

diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 7fa35e1fcac..6c1b868beba 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
 
   patches =
     [ ./remove-tools-1.7.patch
-      ./cacert-1.7.patch
+      ./ssl-cert-file-1.7.patch
       ./creds-test.patch
 
       # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
       })
     ];
 
-  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
   GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 6d9ee3de550..32e95c3c049 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
 
   patches =
     [ ./remove-tools-1.8.patch
-      ./cacert-1.8.patch
+      ./ssl-cert-file-1.8.patch
       ./creds-test.patch
       ./remove-test-pie-1.8.patch
 
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
       })
     ];
 
-  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
   GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
similarity index 92%
rename from pkgs/development/compilers/go/cacert-1.7.patch
rename to pkgs/development/compilers/go/ssl-cert-file-1.7.patch
index 57f09c975d9..e35ad9e4b75 100644
--- a/pkgs/development/compilers/go/cacert-1.7.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
@@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644
  
  func loadSystemRoots() (*CertPool, error) {
  	roots := NewCertPool()
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)
@@ -36,7 +36,7 @@ index 59b303d..d4a34ac 100644
 +		roots = NewCertPool()
 +	)
 +
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)
@@ -65,7 +65,7 @@ index 7bcb3d6..3986e1a 100644
  
  func loadSystemRoots() (*CertPool, error) {
  	roots := NewCertPool()
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)
diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
similarity index 92%
rename from pkgs/development/compilers/go/cacert-1.8.patch
rename to pkgs/development/compilers/go/ssl-cert-file-1.8.patch
index bf44e123711..052655eed52 100644
--- a/pkgs/development/compilers/go/cacert-1.8.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
@@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644
  
  func loadSystemRoots() (*CertPool, error) {
  	roots := NewCertPool()
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)
@@ -43,7 +43,7 @@ index 66cdb5e..bb28036 100644
  		numVerified int // number of execs of 'security verify-cert', for debug stats
  	)
 
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)
@@ -67,7 +67,7 @@ index 7bcb3d6..3986e1a 100644
  
  func loadSystemRoots() (*CertPool, error) {
  	roots := NewCertPool()
-+	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
 +			roots.AppendCertsFromPEM(data)

From ef0eb3866071b5fa61e70f92577cd7b84e3d1882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Mar 2017 20:41:19 +0100
Subject: [PATCH 0056/1744] autogen: 5.18.7 -> 5.18.12

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

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 251387e7bd5..28034f9d549 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "autogen-${version}";
-  version = "5.18.7";
+  version = "5.18.12";
 
   src = fetchurl {
-    url = "mirror://gnu/autogen/autogen-${version}.tar.xz";
-    sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7";
+    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
+    sha256 = "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy";
   };
 
   outputs = [ "bin" "dev" "lib" "out" "man" "info" ];

From c34aa75d30ce5d74d773210f97e0d43daf5c3a6b Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Sun, 19 Mar 2017 18:44:02 -0400
Subject: [PATCH 0057/1744] vim-utils: Handle overriding knownPlugins betters.

---
 pkgs/misc/vim-plugins/vim-utils.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 22098b68a55..87b2f9d3e18 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -412,11 +412,16 @@ rec {
   } // a);
 
   requiredPlugins = {
-    knownPlugins ? vimPlugins,
+    givenKnownPlugins ? null,
     vam ? null,
     pathogen ? null, ...
   }:
     let
+      # This is probably overcomplicated, but I don't understand this well enough to know what's necessary.
+      knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else
+                     if vam != null && vam ? knownPlugins then vam.knownPlugins else
+                     if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
+                     vimPlugins;
       pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
       vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
       names = (lib.optionals (pathogen != null) pathogenNames) ++

From 972f51a2daadfaff74db08cb1ac2061da31b9b3f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 19 Mar 2017 17:37:03 -0400
Subject: [PATCH 0058/1744] llvmPackages_37.libcxxabi: fix with more recent
 versions of libc++

The build breaks on libc++ 3.8 and above, which hinders our upgrade to
LLVM 4 for the Darwin stdenv.
---
 .../compilers/llvm/3.7/libc++abi.nix            | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index 6a62a6256b4..d2be57b1a5f 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -1,6 +1,12 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }:
 
-stdenv.mkDerivation {
+let
+  # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version
+  llvm38-and-above = fetchpatch {
+    url    = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch";
+    sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr";
+  };
+in stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
   src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";
@@ -16,6 +22,13 @@ stdenv.mkDerivation {
     export TRIPLE=x86_64-apple-darwin
   '';
 
+  # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract
+  # into the libc++abi build environment above.
+  prePatch = ''(
+    cd ../libcxx-*
+    patch -p1 < ${llvm38-and-above}
+  )'';
+
   installPhase = if stdenv.isDarwin
     then ''
       for file in lib/*.dylib; do

From c3c9412c7d6513091295f4e253d416ddbd17fe55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 20 Mar 2017 14:11:20 +0100
Subject: [PATCH 0059/1744] git, openssl, curl: Respect $NIX_SSL_CERT_FILE

Slightly modified version of 942dbf89c6120cb5b52fb2ab456855d1fbf2994e
---
 .../git-and-tools/git/ssl-cert-file.patch          |  7 +++++--
 pkgs/development/libraries/openssl/default.nix     |  1 +
 .../libraries/openssl/nix-ssl-cert-file.patch      | 14 ++++++++++++++
 pkgs/tools/networking/curl/default.nix             |  2 +-
 pkgs/tools/networking/curl/nix-ssl-cert-file.patch | 14 ++++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
 create mode 100644 pkgs/tools/networking/curl/nix-ssl-cert-file.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
index bafd65e8c93..0e0697dfb21 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
@@ -1,11 +1,14 @@
 diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c
 --- git-2.7.4-orig/http.c	2016-03-17 21:47:59.000000000 +0100
 +++ git-2.7.4/http.c	2016-04-12 11:38:33.187070848 +0200
-@@ -544,6 +544,7 @@
+@@ -544,6 +544,10 @@
  #if LIBCURL_VERSION_NUM >= 0x070908
  	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
  #endif
-+	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
++	if (getenv("NIX_SSL_CERT_FILE"))
++	  set_from_env(&ssl_cainfo, "NIX_SSL_CERT_FILE");
++	else
++	  set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
  	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
  
  	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2591a43f1d4..947c0e30f99 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -19,6 +19,7 @@ let
 
     patches =
       (args.patches or [])
+      ++ [ ./nix-ssl-cert-file.patch ]
       ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
       ++ optional
diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
new file mode 100644
index 00000000000..b615f1482b7
--- /dev/null
+++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
+--- openssl-1.0.2j-orig/crypto/x509/by_file.c	2016-09-26 11:49:07.000000000 +0200
++++ openssl-1.0.2j/crypto/x509/by_file.c	2016-10-13 16:54:31.400288302 +0200
+@@ -97,7 +97,9 @@
+     switch (cmd) {
+     case X509_L_FILE_LOAD:
+         if (argl == X509_FILETYPE_DEFAULT) {
+-            file = (char *)getenv(X509_get_default_cert_file_env());
++            file = (char *)getenv("NIX_SSL_CERT_FILE");
++            if (!file)
++                file = (char *)getenv(X509_get_default_cert_file_env());
+             if (file)
+                 ok = (X509_load_cert_crl_file(ctx, file,
+                                               X509_FILETYPE_PEM) != 0);
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index bb9316512ec..f8d1506cca3 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";
   };
 
-  patches = [ ];
+  patches = [ ./nix-ssl-cert-file.patch ];
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
new file mode 100644
index 00000000000..20c408bfae2
--- /dev/null
+++ b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' curl-7.50.3-orig/src/tool_operate.c curl-7.50.3/src/tool_operate.c
+--- curl-7.50.3-orig/src/tool_operate.c	2016-09-06 23:25:06.000000000 +0200
++++ curl-7.50.3/src/tool_operate.c	2016-10-14 11:51:48.999943142 +0200
+@@ -269,7 +269,9 @@
+         capath_from_env = true;
+       }
+       else {
+-        env = curlx_getenv("SSL_CERT_FILE");
++        env = curlx_getenv("NIX_SSL_CERT_FILE");
++        if(!env)
++          env = curlx_getenv("SSL_CERT_FILE");
+         if(env) {
+           config->cacert = strdup(env);
+           if(!config->cacert) {

From d458b5401a36dd87cfd2bd071f634330f095cf5d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 20 Mar 2017 10:34:52 -0500
Subject: [PATCH 0060/1744] nixos/fontconfig: add Changelog message about
 FreeType update

---
 nixos/doc/manual/release-notes/rl-1709.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 3705fd468f6..66b88eab09b 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -49,6 +49,18 @@ following incompatible changes:</para>
       rest of the system on a stable release.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      Updated to FreeType 2.7.1, including a new TrueType engine.
+      The new engine replaces the Infinality engine which was the default in
+      NixOS. The default font rendering settings are now provided by
+      fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults
+      are less invasive and provide rendering that is more consistent with
+      other systems and hopefully with each font designer's intent. Some
+      system-wide configuration has been removed from the Fontconfig NixOS
+      module where user Fontconfig settings are available.
+    </para>
+  </listitem>
 
 </itemizedlist>
 

From 48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 16:47:13 +0100
Subject: [PATCH 0061/1744] bash: 4.4p5 -> 4.4p12

---
 pkgs/shells/bash/4.4.nix              | 7 -------
 pkgs/shells/bash/bash-4.4-patches.nix | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 682123d924e..988b4f711cb 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -52,13 +52,6 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   patches = upstreamPatches
-      ++ [ (fetchurl {
-              # https://security.gentoo.org/glsa/201701-02
-              url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"
-                  + "/bash/files/bash-4.4-popd-offset-overflow.patch"
-                  + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";
-              sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";
-          }) ]
       ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   crossAttrs = {
diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix
index c3ef5470aeb..741fb675d61 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/pkgs/shells/bash/bash-4.4-patches.nix
@@ -6,4 +6,11 @@ patch: [
 (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi")
 (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d")
 (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2")
+(patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka")
+(patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y")
+(patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546")
+(patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb")
+(patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")
+(patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")
+(patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")
 ]

From 3760c8c7fde6e8b15d19b063579d05018fc2d8b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 21 Mar 2017 13:01:17 +0100
Subject: [PATCH 0062/1744] Python: replace mkPythonDerivation with
 buildPythonPackage and format="other";

This way all Python packages use the same function,
`buildPythonPackage`.
---
 .../version-management/mercurial/default.nix      |  3 ++-
 pkgs/development/python-modules/dbus/default.nix  |  5 +++--
 pkgs/development/python-modules/koji/default.nix  |  5 +++--
 .../python-modules/libsexy/default.nix            |  5 +++--
 .../python-modules/pycairo/default.nix            |  5 +++--
 pkgs/development/python-modules/pygobject/3.nix   |  5 +++--
 .../python-modules/pygobject/default.nix          |  4 ++--
 .../python-modules/pygtksourceview/default.nix    |  5 +++--
 pkgs/development/python-modules/pyqt/4.x.nix      |  5 +++--
 pkgs/development/python-modules/pyqt/5.x.nix      |  5 +++--
 .../development/python-modules/pyside/default.nix |  5 +++--
 pkgs/development/python-modules/pyxml/default.nix |  5 +++--
 pkgs/development/python-modules/sip/default.nix   |  5 +++--
 .../documentation/gnome-doc-utils/default.nix     |  3 ++-
 pkgs/development/tools/misc/d-feet/default.nix    |  4 ++--
 pkgs/misc/drivers/hplip/default.nix               |  3 ++-
 pkgs/os-specific/linux/dstat/default.nix          |  3 ++-
 pkgs/top-level/python-packages.nix                | 15 ++++++++++-----
 18 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 034eb534423..1c97f7252f5 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -7,8 +7,9 @@ let
   version = "3.9.2";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
-in python2Packages.mkPythonDerivation {
+in python2Packages.buildPythonApplication {
   inherit name;
+  format = "other";
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index f3f897ac9e7..d2e1d2dc86f 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,8 +1,9 @@
-{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy
+{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy
 , ncurses, pygobject3 }:
 
-if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
+if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   name = "dbus-python-1.2.4";
+  format = "other";
 
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index 262ea74d4a3..28b5e11223f 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, mkPythonDerivation, pycurl }:
+{ stdenv, fetchurl, buildPythonPackage, pycurl }:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   name = "koji-1.8";
+  format = "other";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index fa79cfa3be5..79eb8ab2f83 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   name = "libsexy-${version}";
   version = "0.1.9";
+  format = "other";
 
   src = fetchurl {
     url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index e7cf3b4c448..5d002c09623 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,8 +1,9 @@
-{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:
+{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:
 
-if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
+if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   version = "1.10.0";
   name = "pycairo-${version}";
+  format = "other";
   src = if isPy3k
     then fetchurl {
       url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 33bb1d5a4ca..984b1184434 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
+{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   major = "3.22";
   minor = "0";
   name = "pygobject-${major}.${minor}";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 6723ba6b6a5..a3658a96bf3 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }:
+{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   name = "pygobject-${version}";
   version = "2.28.6";
 
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
index 133cbdb34fd..499634236ac 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -1,9 +1,10 @@
-{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
+{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
 
 let version = "2.10.1"; in
 
-mkPythonDerivation {
+buildPythonPackage {
   name = "pygtksourceview-${version}";
+  format = "other";
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index dc3dd69ac02..a5ae0aaa137 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -2,9 +2,10 @@
 
 let
   version = "4.12";
-  inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
-in mkPythonDerivation {
+  inherit (pythonPackages) buildPythonPackage python dbus-python sip;
+in buildPythonPackage {
   name = "PyQt-x11-gpl-${version}";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index ee3419eed0e..880edfbab07 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -3,9 +3,10 @@
 
 let
   version = "5.8.1";
-  inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
-in mkPythonDerivation {
+  inherit (pythonPackages) buildPythonPackage python dbus-python sip;
+in buildPythonPackage {
   name = "PyQt-${version}";
+  format = "other";
 
   meta = with lib; {
     description = "Python bindings for Qt5";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 6473ebf22b1..4aff09b8f8f 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,8 +1,9 @@
-{ lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }:
+{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   name = "pyside-${version}";
   version = "1.2.4";
+  format = "other";
 
   src = fetchurl {
     url = "https://github.com/PySide/PySide/archive/${version}.tar.gz";
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index abea143d11d..b85b2042369 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -1,7 +1,8 @@
-{lib, fetchurl, python, mkPythonDerivation, makeWrapper}:
+{lib, fetchurl, python, buildPythonPackage, makeWrapper}:
 
-mkPythonDerivation rec {
+buildPythonPackage rec {
   name = "PyXML-0.8.4";
+  format = "other";
   src = fetchurl {
     url = "mirror://sourceforge/pyxml/${name}.tar.gz";
     sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 99d3c89e1f9..29295de66b7 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,7 +1,8 @@
-{ lib, fetchurl, mkPythonDerivation, python, isPyPy }:
+{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
 
-if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
+if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   name = "sip-4.19.1";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 18933426db0..ef339d47ea0 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,8 +1,9 @@
 {stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
 , makeWrapper, python2Packages }:
 
-python2Packages.mkPythonDerivation {
+python2Packages.buildPythonApplication {
   name = "gnome-doc-utils-0.20.10";
+  format = "other";
 
   src = fetchurl {
     url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 2ada782563e..4fec00a2fd7 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -4,9 +4,9 @@
 let
   version = "${major}.11";
   major = "0.3";
-in pythonPackages.mkPythonDerivation rec {
+in pythonPackages.buildPythonApplication rec {
   name = "d-feet-${version}";
-  namePrefix = "";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c0a6c0a9baa..1c40493e4ae 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -47,8 +47,9 @@ in
 assert withPlugin -> builtins.elem hplipArch pluginArches
   || throw "HPLIP plugin not supported on ${stdenv.system}";
 
-pythonPackages.mkPythonDerivation {
+pythonPackages.buildPythonApplication {
   inherit name src;
+  format = "other";
 
   buildInputs = [
     libjpeg
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index ccedc381504..366cc9787f2 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, python2Packages }:
 
-python2Packages.mkPythonDerivation rec {
+python2Packages.buildPythonApplication rec {
   name = "dstat-${version}";
+  format = "other";
   version = "0.7.3";
 
   src = fetchurl {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf06f64421e..d80c3684235 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7035,9 +7035,10 @@ in {
     buildInputs = with self; [ fudge_9 nose ];
   };
 
-  fedora_cert = mkPythonDerivation rec {
+  fedora_cert = buildPythonPackage rec {
     name = "fedora-cert-0.5.9.2";
     meta.maintainers = with maintainers; [ mornfall ];
+    format = "other";
 
     src = pkgs.fetchurl {
       url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
@@ -21809,8 +21810,9 @@ in {
   };
 
 
-  pysvn = mkPythonDerivation rec {
+  pysvn = buildPythonPackage rec {
     name = "pysvn-1.8.0";
+    format = "other";
 
     src = pkgs.fetchurl {
       url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz";
@@ -21965,9 +21967,10 @@ in {
   });
 
 
-  pywebkitgtk = mkPythonDerivation rec {
+  pywebkitgtk = buildPythonPackage rec {
     name = "pywebkitgtk-${version}";
     version = "1.1.8";
+    format = "other";
 
     src = pkgs.fetchurl {
       url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2";
@@ -22300,10 +22303,11 @@ in {
 
   qscintilla = if isPy3k || isPyPy
     then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
-    else mkPythonDerivation rec {
+    else buildPythonPackage rec {
       # TODO: Qt5 support
       name = "qscintilla-${version}";
       version = pkgs.qscintilla.version;
+      format = "other";
 
       src = pkgs.qscintilla.src;
 
@@ -25833,9 +25837,10 @@ in {
   # Python package.
   tkinter = let
     py = python.override{x11Support=true;};
-  in mkPythonDerivation rec {
+  in buildPythonPackage rec {
     name = "tkinter-${python.version}";
     src = py;
+    format = "other";
 
     disabled = isPy26 || isPyPy;
 

From 261d7caed794c4e7e8346455e53a2f3a464e7935 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 15:51:35 +0300
Subject: [PATCH 0063/1744] mesa: enable texture floats by default

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1987bbd323e..d79d9b2859e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -5,7 +5,8 @@
 , libelf, libvdpau, python2
 , grsecEnabled ? false
 , enableRadv ? false
-, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
+# Texture floats are patented, see docs/patents.txt, but Debian enables them.
+, enableTextureFloats ? true
 , galliumDrivers ? null
 , driDrivers ? null
 , vulkanDrivers ? null

From 7299db431a700768d0b5a6c80ae6e82b748ad0db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 21 Mar 2017 11:22:07 -0500
Subject: [PATCH 0064/1744] fontconfig-penultimate: 0.2 -> 0.2.1

Added package metadata, including license.
---
 pkgs/data/fonts/fontconfig-penultimate/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index aea3365aba4..f9d60d6600d 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "0.2"; in
+let version = "0.2.1"; in
 stdenv.mkDerivation {
   name = "fontconfig-penultimate-${version}";
 
@@ -8,11 +8,19 @@ stdenv.mkDerivation {
     owner = "ttuegel";
     repo = "fontconfig-penultimate";
     rev = version;
-    sha256 = "106sjfmxdn2cachgsg0ky3wi676x6nd14y5fcl16n82kghi3d9yf";
+    sha256 = "14arpalmpn7ig2myxslk4jdg6lm0cnmwsxy7zl0j7yr417k1kprf";
   };
 
   installPhase = ''
     mkdir -p $out/etc/fonts/conf.d
     cp *.conf $out/etc/fonts/conf.d
   '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ttuegel/fontconfig-penultimate;
+    description = "Sensible defaults for Fontconfig";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.all;
+  };
 }

From 328bcdae252319bacdac9e9e20d0125af9969e20 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 21:56:40 +0300
Subject: [PATCH 0065/1744] mesa: enable texture floats only for drivers

To be on more safe side. This shouldn't matter theoretically as nothing in core
Mesa depends on them.
---
 pkgs/development/libraries/mesa/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index d79d9b2859e..6a5c72f04c3 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -5,8 +5,9 @@
 , libelf, libvdpau, python2
 , grsecEnabled ? false
 , enableRadv ? false
-# Texture floats are patented, see docs/patents.txt, but Debian enables them.
-, enableTextureFloats ? true
+# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
+# It's overridden for mesa_drivers.
+, enableTextureFloats ? false
 , galliumDrivers ? null
 , driDrivers ? null
 , vulkanDrivers ? null
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 458858cfeb0..fcfdd22630c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8991,6 +8991,7 @@ with pkgs;
   mesa_drivers = mesaDarwinOr (
     let mo = mesa_noglu.override {
       grsecEnabled = config.grsecurity or false;
+      enableTextureFloats = true;
     };
     in mo.drivers
   );

From 39eda57d2a2abd0d80828ff94541ff342764aad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Mar 2017 20:11:31 +0100
Subject: [PATCH 0066/1744] mesa: maintenance 17.0.1 -> 17.0.2

---
 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 6a5c72f04c3..eac07ddbfb1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -65,7 +65,7 @@ let
 in
 
 let
-  version = "17.0.1";
+  version = "17.0.2";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c";
+    sha256 = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4";
   };
 
   prePatch = "patchShebangs .";

From 8143413e590cf249b50047906d61eab2ce983c12 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 21 Mar 2017 21:58:57 +0100
Subject: [PATCH 0067/1744] pythonPackages.pygobject2: fixup conversation to
 buildPythonPackage

---
 pkgs/development/python-modules/pygobject/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index a3658a96bf3..b72bd8b9b52 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -3,6 +3,7 @@
 buildPythonPackage rec {
   name = "pygobject-${version}";
   version = "2.28.6";
+  format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";

From 15d43bb0c1141e4d0f9e901d347b465314a17e50 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Tue, 20 Dec 2016 18:19:04 -0200
Subject: [PATCH 0068/1744] pythonPackages.noise: init at 1.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1d2a398300..da6313d9fdc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1610,6 +1610,23 @@ in {
     };
   };
 
+  noise = buildPythonPackage rec {
+    name = "noise-${version}";
+    version = "1.2.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/n/noise/${name}.tar.gz";
+      sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/caseman/noise";
+      description = "Native-code and shader implementations of Perlin noise";
+      license = licenses.mit;
+      platforms = platforms.all;
+    };
+  };
+
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
     version = "1.11.45";

From 47d1e698a934efc6399859ec01bf9a8c25e7643c Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Tue, 20 Dec 2016 18:41:49 -0200
Subject: [PATCH 0069/1744] pythonPackages.pyplatec: init at 1.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da6313d9fdc..a445fe9bbbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21481,6 +21481,22 @@ in {
     };
   };
 
+  pyplatec = buildPythonPackage rec {
+    name = "PyPlatec-${version}";
+    version = "1.4.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/P/PyPlatec/${name}.tar.gz";
+      sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg";
+    };
+
+    meta = {
+      description = "Library to simulate plate tectonics with Python bindings";
+      homepage    = https://github.com/Mindwerks/plate-tectonics;
+      license     = licenses.lgpl3;
+    };
+  };
+
   pymaging = buildPythonPackage rec {
     name = "pymaging-unstable-2016-11-16";
 

From 311da64a0bdfefc5db577b1aa7a71750b5d8bdf3 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Tue, 20 Dec 2016 18:43:46 -0200
Subject: [PATCH 0070/1744] pythonPackages.purepng: init at 0.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a445fe9bbbc..18706001b21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21497,6 +21497,22 @@ in {
     };
   };
 
+  purepng = buildPythonPackage rec {
+    name = "purepng-${version}";
+    version = "0.2.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/purepng/${name}.tar.gz";
+      sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d";
+    };
+
+    meta = {
+      description = "Pure Python library for PNG image encoding/decoding";
+      homepage    = https://github.com/scondo/purepng;
+      license     = licenses.mit;
+    };
+  };
+
   pymaging = buildPythonPackage rec {
     name = "pymaging-unstable-2016-11-16";
 

From a431dd265cbc271eda6567095e1e2c1366e3e567 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Tue, 20 Dec 2016 20:30:22 -0200
Subject: [PATCH 0071/1744] pythonPackages.worldengine: init at 0.19.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18706001b21..e62fb2fb659 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28601,6 +28601,35 @@ EOF
     };
   };
 
+  worldengine = buildPythonPackage rec {
+    name = "worldengine-${version}";
+    version = "0.19.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/w/worldengine/${name}.tar.gz";
+      sha256 = "0wnpp0zm4idc4242a970yf1blf8y2f1ikwha0q781wfz1dg4z0i6";
+    };
+
+    propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ];
+
+    prePatch = ''
+      substituteInPlace setup.py \
+        --replace pypng>=0.0.18 purepng \
+        --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \
+        --replace 'argparse==1.2.1' 'argparse' \
+        --replace 'protobuf==3.0.0a3' 'protobuf' \
+        --replace 'noise==1.2.2' 'noise' \
+        --replace 'PyPlatec==1.4.0' 'PyPlatec' \
+    '';
+
+    meta = {
+      homepage = http://world-engine.org;
+      description = "World generator using simulation of plates, rain shadow, erosion, etc";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ rardiol ];
+    };
+  };
+
   carbon = buildPythonPackage rec {
     name = "carbon-${version}";
     version = graphiteVersion;

From 525a6631747597cd108bed21c26286637038b6a6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Tue, 21 Mar 2017 10:28:44 +0100
Subject: [PATCH 0072/1744] curl, git: Fix curl default CA, let git use it

Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
---
 .../git-and-tools/git/default.nix             |  1 -
 .../git-and-tools/git/ssl-cert-file.patch     | 14 ---------
 .../networking/curl/nix-ssl-cert-file.patch   | 31 ++++++++++++++++---
 3 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index af5fc8a8be4..d6cc205bbae 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation {
     ./symlinks-in-bin.patch
     ./git-sh-i18n.patch
     ./ssh-path.patch
-    ./ssl-cert-file.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
deleted file mode 100644
index 0e0697dfb21..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c
---- git-2.7.4-orig/http.c	2016-03-17 21:47:59.000000000 +0100
-+++ git-2.7.4/http.c	2016-04-12 11:38:33.187070848 +0200
-@@ -544,6 +544,10 @@
- #if LIBCURL_VERSION_NUM >= 0x070908
- 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
- #endif
-+	if (getenv("NIX_SSL_CERT_FILE"))
-+	  set_from_env(&ssl_cainfo, "NIX_SSL_CERT_FILE");
-+	else
-+	  set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
- 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
- 
- 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
index 20c408bfae2..14eaea7071b 100644
--- a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
+++ b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
@@ -1,7 +1,30 @@
-diff -ru -x '*~' curl-7.50.3-orig/src/tool_operate.c curl-7.50.3/src/tool_operate.c
---- curl-7.50.3-orig/src/tool_operate.c	2016-09-06 23:25:06.000000000 +0200
-+++ curl-7.50.3/src/tool_operate.c	2016-10-14 11:51:48.999943142 +0200
-@@ -269,7 +269,9 @@
+diff --git a/lib/url.c b/lib/url.c
+index 03feaa20f..43d3baa80 100644
+--- a/lib/url.c
++++ b/lib/url.c
+@@ -574,11 +574,15 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
+ 
+   /* This is our preferred CA cert bundle/path since install time */
+ #if defined(CURL_CA_BUNDLE)
+-  result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], CURL_CA_BUNDLE);
++  char* env = curl_getenv("NIX_SSL_CERT_FILE");
++  if (!env)
++      env = CURL_CA_BUNDLE;
++
++  result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], env);
+   if(result)
+     return result;
+ 
+-  result = setstropt(&set->str[STRING_SSL_CAFILE_PROXY], CURL_CA_BUNDLE);
++  result = setstropt(&set->str[STRING_SSL_CAFILE_PROXY], env);
+   if(result)
+     return result;
+ #endif
+diff --git a/src/tool_operate.c b/src/tool_operate.c
+index 572c8d0cc..ca4fb31cb 100644
+--- a/src/tool_operate.c
++++ b/src/tool_operate.c
+@@ -265,7 +265,9 @@ static CURLcode operate_do(struct GlobalConfig *global,
          capath_from_env = true;
        }
        else {

From 8ecb94bb97842f95ca3fb780fc2977ee43b7d554 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Wed, 22 Mar 2017 11:48:06 +0100
Subject: [PATCH 0073/1744] curl: Use default trust store of TLS backend

Having curl fall back to openssl's CA means that we need not patch curl
to respect NIX_SSL_CERT_FILE. It will work in all the cases.

This reverts commit fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f "curl: Use CA bundle in nix default profile by default"
If we want to reintroduce that feature, this needs to go inside openssl
---
 pkgs/tools/networking/curl/default.nix        |  6 +--
 .../networking/curl/nix-ssl-cert-file.patch   | 37 -------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/tools/networking/curl/nix-ssl-cert-file.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f8d1506cca3..4f8daf38d46 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
     sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";
   };
 
-  patches = [ ./nix-ssl-cert-file.patch ];
-
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
   enableParallelBuilding = true;
@@ -57,9 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-      # OS X does not have a default system bundle, so we assume cacerts is installed in the default nix-env profile
-      # This sucks. We should probably just include the latest cacerts in the darwin bootstrap.
-      "--with-ca-bundle=${if stdenv.isDarwin then "/nix/var/nix/profiles/default" else ""}/etc/ssl/certs/ca-${if stdenv.isDarwin then "bundle" else "certificates"}.crt"
+      "--with-ca-fallback"
       "--disable-manual"
       ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
       ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )
diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
deleted file mode 100644
index 14eaea7071b..00000000000
--- a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/lib/url.c b/lib/url.c
-index 03feaa20f..43d3baa80 100644
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -574,11 +574,15 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
- 
-   /* This is our preferred CA cert bundle/path since install time */
- #if defined(CURL_CA_BUNDLE)
--  result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], CURL_CA_BUNDLE);
-+  char* env = curl_getenv("NIX_SSL_CERT_FILE");
-+  if (!env)
-+      env = CURL_CA_BUNDLE;
-+
-+  result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], env);
-   if(result)
-     return result;
- 
--  result = setstropt(&set->str[STRING_SSL_CAFILE_PROXY], CURL_CA_BUNDLE);
-+  result = setstropt(&set->str[STRING_SSL_CAFILE_PROXY], env);
-   if(result)
-     return result;
- #endif
-diff --git a/src/tool_operate.c b/src/tool_operate.c
-index 572c8d0cc..ca4fb31cb 100644
---- a/src/tool_operate.c
-+++ b/src/tool_operate.c
-@@ -265,7 +265,9 @@ static CURLcode operate_do(struct GlobalConfig *global,
-         capath_from_env = true;
-       }
-       else {
--        env = curlx_getenv("SSL_CERT_FILE");
-+        env = curlx_getenv("NIX_SSL_CERT_FILE");
-+        if(!env)
-+          env = curlx_getenv("SSL_CERT_FILE");
-         if(env) {
-           config->cacert = strdup(env);
-           if(!config->cacert) {

From c86f05e7ce13e64238960ebf3ee9706142db961b Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Wed, 22 Mar 2017 12:09:09 +0100
Subject: [PATCH 0074/1744] openssl: default to default profile CA on darwin

---
 pkgs/development/libraries/openssl/default.nix      |  3 ++-
 .../openssl/use-etc-ssl-certs-darwin.patch          | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 947c0e30f99..a9f8c32dde9 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -20,7 +20,8 @@ let
     patches =
       (args.patches or [])
       ++ [ ./nix-ssl-cert-file.patch ]
-      ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch
+      ++ optional (versionOlder version "1.1.0")
+          (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
       ++ optional
            (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch
new file mode 100644
index 00000000000..3d9ee7e6a82
--- /dev/null
+++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
+--- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
++++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
+@@ -81,8 +81,8 @@
+ 
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ # else
+ #  define X509_CERT_AREA          "SSLROOT:[000000]"

From d284e37a59ef759b1bdca7f92f8b0278d6a70ad0 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 22 Mar 2017 15:48:13 +0100
Subject: [PATCH 0075/1744] pythonPackages.django: 1.10.5 -> 1.10.6

This is a bugfix release.
---
 .../python-modules/django/1_10.nix            | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 32 ++---------------
 2 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/python-modules/django/1_10.nix

diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
new file mode 100644
index 00000000000..271f8a5467b
--- /dev/null
+++ b/pkgs/development/python-modules/django/1_10.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchurl, substituteAll,
+  pythonOlder,
+  geos, gdal
+}:
+buildPythonPackage rec {
+  name = "Django-${version}";
+  version = "1.10.6";
+  disabled = pythonOlder "2.7";
+
+  src = fetchurl {
+    url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
+    sha256 = "0q9c7hx720vc0jzq4xlxwhnxmmm8kh0qsqj3l46m29mi98jvwvks";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./1.10-gis-libs.template.patch;
+      geos = geos;
+      gdal = gdal;
+    })
+  ];
+
+  # patch only $out/bin to avoid problems with starter templates (see #3134)
+  postFixup = ''
+    wrapPythonProgramsIn $out/bin "$out $pythonPath"
+  '';
+
+  # too complicated to setup
+  doCheck = false;
+
+  meta = {
+    description = "A high-level Python Web framework";
+    homepage = https://www.djangoproject.com/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1d2a398300..0fb356ee1db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10315,36 +10315,8 @@ in {
 
   django = self.django_1_10;
 
-  django_1_10 = buildPythonPackage rec {
-    name = "Django-${version}";
-    version = "1.10.5";
-    disabled = pythonOlder "2.7";
-
-    src = pkgs.fetchurl {
-      url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-      sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d";
-    };
-
-    patches = [
-      (pkgs.substituteAll {
-        src = ../development/python-modules/django/1.10-gis-libs.template.patch;
-        geos = pkgs.geos;
-        gdal = self.gdal;
-      })
-    ];
-
-    # patch only $out/bin to avoid problems with starter templates (see #3134)
-    postFixup = ''
-      wrapPythonProgramsIn $out/bin "$out $pythonPath"
-    '';
-
-    # too complicated to setup
-    doCheck = false;
-
-    meta = {
-      description = "A high-level Python Web framework";
-      homepage = https://www.djangoproject.com/;
-    };
+  django_1_10 = callPackage ../development/python-modules/django/1_10.nix {
+    gdal = self.gdal;
   };
 
   django_1_9 = buildPythonPackage rec {

From f13517433db5e42570d8b0cfe698a4c9b44d0bcb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 20:15:54 +0300
Subject: [PATCH 0076/1744] dconf: split outputs

---
 pkgs/desktops/gnome-3/3.22/core/dconf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
index 02c60256e15..f67dc7e32ae 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6";
   };
 
+  outputs = [ "out" "lib" "dev" ];
+
   buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
                   intltool docbook_xsl docbook_xsl_ns makeWrapper ];
 

From 670744e1fa90a7497de8163d15fdfb95aac6d83d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 20:16:11 +0300
Subject: [PATCH 0077/1744] wrapGAppsHook: propagate dconf

It's effectively required for GTK3 applications because various parts of the library use GIO to store settings.

Also propagate GTK for clarity (it should be there anyway).
---
 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 e086fd0b153..4b209fb0f0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -321,7 +321,7 @@ with pkgs;
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
   wrapGAppsHook = makeSetupHook {
-    deps = [ makeWrapper ];
+    deps = [ gnome3.dconf.lib gnome3.gtk makeWrapper ];
   } ../build-support/setup-hooks/wrap-gapps-hook.sh;
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;

From a40b7d07e9013fcc21d54cbb4a01bcfc9c6e68cb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 20:18:47 +0300
Subject: [PATCH 0078/1744] makeQtWrapper, kdeWrapper: add GTK3 dependencies

---
 pkgs/build-support/kde/wrapper.nix                 |  7 ++++---
 pkgs/development/libraries/qt-5/5.7/default.nix    |  4 ++--
 pkgs/development/libraries/qt-5/5.8/default.nix    |  4 ++--
 pkgs/development/libraries/qt-5/make-qt-wrapper.sh | 12 +++++++++++-
 pkgs/top-level/all-packages.nix                    |  6 ++++--
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix
index f5add12e8ec..228eb696bd9 100644
--- a/pkgs/build-support/kde/wrapper.nix
+++ b/pkgs/build-support/kde/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, buildEnv }:
+{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
 
 packages:
 
@@ -47,10 +47,11 @@ stdenv.mkDerivation {
                     --argv0 '"$0"' \
                     --suffix PATH : "$env/bin" \
                     --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
-                    --prefix XDG_DATA_DIRS : "$env/share" \
+                    --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
                     --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
                     --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
-                    --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+                    --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" \
+                    --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
                 good="1"
                 break
             fi
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index f387a242101..91364dd65bb 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
   newScope,
   stdenv, fetchurl, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, mesa, perl,
-  gstreamer, gst-plugins-base,
+  gstreamer, gst-plugins-base, gtk3, dconf,
 
   # options
   developerBuild ? false,
@@ -107,7 +107,7 @@ let
 
       makeQtWrapper =
         makeSetupHook
-        { deps = [ makeWrapper ]; }
+        { deps = [ makeWrapper dconf.lib gtk ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
       qmakeHook =
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 85b38c6fc6c..f02b8070638 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
   newScope,
   stdenv, fetchurl, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, mesa, perl,
-  gstreamer, gst-plugins-base,
+  gstreamer, gst-plugins-base, gtk3, dconf,
 
   # options
   developerBuild ? false,
@@ -106,7 +106,7 @@ let
 
       makeQtWrapper =
         makeSetupHook
-        { deps = [ makeWrapper ]; }
+        { deps = [ makeWrapper dconf.lib gtk3 ]; }
         ../make-qt-wrapper.sh;
 
       qmakeHook =
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index d716a876526..8f42682fa23 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -7,6 +7,7 @@ wrapQtProgram() {
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
+        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
         "$@"
 }
 
@@ -21,6 +22,7 @@ makeQtWrapper() {
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
+        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
         "$@"
 }
 
@@ -29,8 +31,16 @@ _makeQtWrapperSetup() {
     export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
     export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
     export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
-    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
+    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
     export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
 
 prePhases+=(_makeQtWrapperSetup)
+
+_findGioModules() {
+    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
+        export GIO_EXTRA_MODULES="$GIO_EXTRA_MODULES${GIO_EXTRA_MODULES:+:}$1/lib/gio/modules"
+    fi
+}
+
+envHooks+=(_findGioModules)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b209fb0f0a..a929c2b8575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -271,8 +271,8 @@ with pkgs;
 
   kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; };
 
-  kdeWrapper = import ../build-support/kde/wrapper.nix {
-    inherit stdenv lib makeWrapper buildEnv;
+  kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
+    inherit (gnome3) dconf;
   };
 
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
@@ -9454,6 +9454,7 @@ with pkgs;
     mesa = mesa_noglu;
     inherit perl;
     inherit (gst_all_1) gstreamer gst-plugins-base;
+    inherit (gnome3) gtk3 dconf;
   });
 
   libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
@@ -9467,6 +9468,7 @@ with pkgs;
     mesa = mesa_noglu;
     inherit perl;
     inherit (gst_all_1) gstreamer gst-plugins-base;
+    inherit (gnome3) gtk3 dconf;
   });
 
   libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);

From 82f7f8ad9a0344384a1f41e60c6665e721065242 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 23:33:40 +0300
Subject: [PATCH 0079/1744] antimicro: wrap Qt application

---
 pkgs/tools/misc/antimicro/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 710641281e5..02d65597f74 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
+{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "antimicro-${version}";
@@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake pkgconfig SDL2 qtbase qttools xorg.libXtst
+    cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper
   ];
 
+  postInstall = ''
+    wrapQtProgram $out/bin/antimicro
+  '';
+
   meta = with stdenv.lib; {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
     inherit (src.meta) homepage;

From a185b1267fdbc3523fdb0d000a3d232b436467cb Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Wed, 22 Mar 2017 18:03:38 +0000
Subject: [PATCH 0080/1744] proselint: disable tests and put in correct scope

---
 pkgs/tools/text/proselint/default.nix | 2 ++
 pkgs/top-level/all-packages.nix       | 5 +++++
 pkgs/top-level/python-packages.nix    | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index 69c0600359f..6b499f3db18 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -4,6 +4,8 @@ buildPythonApplication rec {
   name = "proselint-${version}";
   version = "0.8.0";
 
+  doCheck = false; # fails to pass because it tries to run in home directory
+
   src = fetchurl {
     url = "mirror://pypi/p/proselint/${name}.tar.gz";
     sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e086fd0b153..17beb5179c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9351,6 +9351,11 @@ with pkgs;
 
   proj = callPackage ../development/libraries/proj { };
 
+  proselint = callPackage ../tools/text/proselint {
+    inherit (python3Packages)
+    buildPythonApplication click future six;
+  };
+
   postgis = callPackage ../development/libraries/postgis { };
 
   protobuf = protobuf2_6;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2283847ddef..cf3eac5e93f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19004,8 +19004,6 @@ in {
      };
   };
 
-  proselint = callPackage ../tools/text/proselint { };
-
   pylibconfig2 = buildPythonPackage rec {
     name = "pylibconfig2-${version}";
     version = "0.2.4";

From fbc9a4d7dce249963797d82a788ee9f2acaa21cf Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 19 Mar 2017 18:54:37 -0400
Subject: [PATCH 0081/1744] ants: set $ANTSPATH variable in shell scripts

---
 pkgs/applications/science/biology/ants/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index fa40e53aa0a..24ab2ee9ac5 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, itk, vtk }:
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }:
 
 stdenv.mkDerivation rec {
   _name    = "ANTs";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gyys1lf69bl3569cskxc8r5llwcr0dsyzvlby5skhfpsyw0dh8r";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeWrapper ];
   buildInputs = [ itk vtk ];
 
   cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
   checkPhase = "ctest";
   doCheck = false;
 
+  postInstall = ''
+    for file in $out/bin/*; do
+      wrapProgram $file --set ANTSPATH "$out/bin"
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/stnava/ANTs;
     description = "Advanced normalization toolkit for medical image registration and other processing";

From bab3594b54dc51d340a8780a53dcb851ea77ad6b Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 16:52:52 -0500
Subject: [PATCH 0082/1744] gogs: 0.9.113 -> 0.10.18

---
 .../version-management/gogs/default.nix       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index b9a1f2e7a84..4ab97cc06d2 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -3,25 +3,26 @@
 , sqliteSupport ? true
 }:
 
+with stdenv.lib;
+
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.9.113";
+  version = "0.10.18";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7";
+    sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y";
   };
 
   patchPhase = ''
-    substituteInPlace models/repo.go \
-      --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
-  '';
+    patchShebangs .
+    '';
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite";
+  buildFlags = optionalString sqliteSupport "-tags sqlite";
 
   outputs = [ "bin" "out" "data" ];
 
@@ -30,7 +31,7 @@ buildGoPackage rec {
     cp -R $src/{public,templates} $data
 
     wrapProgram $bin/bin/gogs \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \
+      --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \
       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
       --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
       --run "ln -fs $data/{public,templates} ."
@@ -42,7 +43,7 @@ buildGoPackage rec {
   meta = {
     description = "A painless self-hosted Git service";
     homepage = "https://gogs.io";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ schneefux ];
+    license = licenses.mit;
+    maintainers = [ maintainers.schneefux ];
   };
 }

From d9cf0256d4baffb578962f58c7c74445a3f58c09 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 22 Mar 2017 23:29:12 +0100
Subject: [PATCH 0083/1744] byacc: 1.9 -> 20170201

Version bump
+ source URLs and homepage are updated
---
 .../tools/parsing/byacc/default.nix           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index fdfac484bf1..c34eb9fc708 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,17 +1,23 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "byacc-1.9";
+stdenv.mkDerivation rec {
+  name = "byacc-${version}";
+  version = "20170201";
 
   src = fetchurl {
-    url = ftp://invisible-island.net/byacc/byacc-20140715.tgz;
-    sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c";
+    urls = [
+      "ftp://invisible-island.net/byacc/${name}.tgz"
+      "http://invisible-mirror.net/archives/byacc/${name}.tgz"
+    ];
+    sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91";
   };
 
-  meta = {
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     description = "Berkeley YACC";
-    homepage = http://dickey.his.com/byacc/byacc.html;
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://invisible-island.net/byacc/byacc.html;
+    license = licenses.publicDomain;
+    platforms = platforms.unix;
   };
 }

From d09ed00e2ded5fe545402d347669baee47da7e70 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Wed, 22 Mar 2017 22:44:19 +0000
Subject: [PATCH 0084/1744] cde: init at 0.1

---
 pkgs/tools/package-management/cde/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/package-management/cde/default.nix

diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
new file mode 100644
index 00000000000..8261cc9e4cf
--- /dev/null
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "cde-0.1";
+  src = fetchgit {
+    url = "https://github.com/pgbovine/CDE.git";
+    sha256 = "";
+    rev = "551e54d95eb3f8eefc698891f1b873fc4f02f360";
+  };
+
+  # The build is small, so there should be no problem
+  # running this locally. There is also a use case for
+  # older systems, where modern binaries might not be
+  # useful.
+  preferLocalBuild = true;
+
+  patchBuild = ''
+    sed '/install/d' $src/Makefile > $src/Makefile
+  '';
+  
+  installPhase = ''
+    mkdir -p $out/bin
+    cp cde $out/bin
+    cp cde-exec $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/pgbovine/CDE";
+    description = "A packaging tool for building portable packages";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.rlupton20 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e086fd0b153..489eddb0a15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -736,6 +736,8 @@ with pkgs;
 
   catclock = callPackage ../applications/misc/catclock { };
 
+  cde = callPackage ../tools/package-management/cde { };
+  
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
 
   cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };

From 375639518d0fcf7e8b73d8d3c9e072549b6bbc73 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 17:46:41 -0500
Subject: [PATCH 0085/1744] freicoin: 0.8.3-1 -> 0.8.6-2; Moved to correct
 category

---
 pkgs/applications/altcoins/default.nix      |  1 +
 pkgs/applications/altcoins/freicoin.nix     | 32 +++++++++++++++++++++
 pkgs/applications/misc/freicoin/default.nix | 28 ------------------
 pkgs/top-level/all-packages.nix             |  4 ---
 4 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/applications/altcoins/freicoin.nix
 delete mode 100644 pkgs/applications/misc/freicoin/default.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1d9b897188d..9c19be3cc52 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -16,6 +16,7 @@ rec {
   dogecoin  = callPackage ./dogecoin.nix { withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { withGui = false; };
 
+  freicoin = callPackage ../freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ./go-ethereum.nix { };
 
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
new file mode 100644
index 00000000000..f7cd04f1be4
--- /dev/null
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -0,0 +1,32 @@
+{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.6-2";
+  name = "freicoin-${version}";
+
+  src = fetchFromGitHub {
+    owner = "freicoin";
+    repo = "freicoin";
+    rev = "v${version}";
+    sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
+  };
+
+  # I think that openssl and zlib are required, but come through other
+  # packages
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp freicoin-qt $out/bin
+    '';
+
+  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ db boost gmp mpfr miniupnpc qt4 ];
+
+  meta = with stdenv.lib; {
+    description = "Peer-to-peer currency with demurrage fee";
+    homepage = http://freicoi.in/;
+    license = licenses.mit;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
deleted file mode 100644
index b4e71d4bbc7..00000000000
--- a/pkgs/applications/misc/freicoin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
-
-stdenv.mkDerivation rec {
-  version = "0.8.3-1";
-  name = "freicoin-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
-    sha256 = "0v3mh8a96nnb86mkyaylyjj7qfdrl7i9gvybh7f8w2hrl9paszfh";
-  };
-
-  # I think that openssl and zlib are required, but come through other
-  # packages
-  buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip qmake4Hook ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp freicoin-qt $out/bin
-  '';
-
-  meta = {
-    description = "Peer-to-peer currency with demurrage fee";
-    homepage = "http://freicoi.in/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e086fd0b153..6e5a2afa104 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13771,10 +13771,6 @@ with pkgs;
     ffmpeg = ffmpeg_1;
   };
 
-  freicoin = callPackage ../applications/misc/freicoin {
-    boost = boost155;
-  };
-
   fte = callPackage ../applications/editors/fte { };
 
   game-music-emu = callPackage ../applications/audio/game-music-emu { };

From 39c39f2cbf85f37101c1557ed6af83b8af8bac5d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 21:25:03 -0500
Subject: [PATCH 0086/1744] gpscorrelate: 1.6.0 -> 1.6.1

---
 .../misc/gpscorrelate/default.nix             | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 5026fea0e35..e691c79d85c 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,17 +1,22 @@
-{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2
+{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2
 , libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
-  name = "gpscorrelate-1.6.0";
+  name = "gpscorrelate-${version}";
+  version = "1.6.1";
 
-  src = fetchurl {
-    url = "http://freefoote.dview.net/linux/${name}.tar.gz";
-    sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0";
+  src = fetchFromGitHub {
+    owner = "freefoote";
+    repo = "gpscorrelate";
+    rev = version;
+    sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    pkgconfig exiv2 libxml2 gtk2
-    libxslt docbook_xsl docbook_xml_dtd_42
+    exiv2 libxml2 gtk2
+    libxslt docbook_xsl 
+    docbook_xml_dtd_42
   ];
 
   patchPhase = ''
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
         -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A GPS photo correlation tool, to add EXIF geotags";
 
     longDescription = ''
@@ -38,9 +43,8 @@ stdenv.mkDerivation rec {
       one takes the GPS data in a different format.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    homepage = http://freefoote.dview.net/linux_gpscorr.html;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    homepage = https://github.com/freefoote/gpscorrelate;
+    platforms = platforms.linux;
   };
 }

From ec9500793666395844a1409d702013f9e23b1291 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 23 Mar 2017 00:22:16 -0300
Subject: [PATCH 0087/1744] pythonPackages.worldengine: enable testing

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e62fb2fb659..94d667cba36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28605,11 +28605,25 @@ EOF
     name = "worldengine-${version}";
     version = "0.19.0";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/worldengine/${name}.tar.gz";
-      sha256 = "0wnpp0zm4idc4242a970yf1blf8y2f1ikwha0q781wfz1dg4z0i6";
+    src = pkgs.fetchFromGitHub {
+      owner = "Mindwerks";
+      repo = "worldengine";
+      rev = "v${version}";
+      sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
     };
 
+    src-data = pkgs.fetchFromGitHub {
+      owner = "Mindwerks";
+      repo = "worldengine-data";
+      rev = "029051e";
+      sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm";
+    };
+
+    postUnpack = ''
+      ln -s ${src-data} worldengine-data
+    '';
+
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ];
 
     prePatch = ''
@@ -28622,6 +28636,11 @@ EOF
         --replace 'PyPlatec==1.4.0' 'PyPlatec' \
     '';
 
+    doCheck = true;
+    postCheck = ''
+      nosetests tests
+    '';
+
     meta = {
       homepage = http://world-engine.org;
       description = "World generator using simulation of plates, rain shadow, erosion, etc";

From 56812b6c94b1fa9ac62706560d18205b3da1ea8c Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 23 Mar 2017 01:07:42 -0300
Subject: [PATCH 0088/1744] worldengine-cli: add to all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 385030188e9..b7f4a5eafce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16014,6 +16014,8 @@ with pkgs;
     inherit (python27Packages) cheetah;
   };
 
+  worldengine-cli = python3Packages.worldengine;
+
   wpsoffice = callPackage ../applications/office/wpsoffice {};
 
   wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };

From 88458c8697ce8c2d1c00a51a36093b02e88ec251 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 22 Mar 2017 20:29:40 +0100
Subject: [PATCH 0089/1744] clipster: 2017-02-17 -> 2017-02-27

---
 pkgs/tools/misc/clipster/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 05cc33f8bce..c65836c1ae0 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,18 +2,20 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-unstable-${version}";
-  version = "2017-02-17";
+  version = "2017-02-27";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "8c4732d7c26ddec6faac295d3ddb2278c6ed5647";
-    sha256 = "00ki3srdjh96ghan1z4zd8w5cahgvnpa8hccnxmn0im1xrgpkh3b";
+    rev = "dfa75b52ee3a41fff7534aca165dc0e6a24a3680";
+    sha256 = "0d7ak6wpvvgz7cwvfzy2shkfiw6gr8l703xyjpiayjbnr2s79k5j";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
 
-  buildInputs =  [ pythonEnv gtk3 libwnck3 makeWrapper ];
+  buildInputs =  [ pythonEnv gtk3 libwnck3 ];
+
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     sed -i 's/python/python3/g' clipster

From 50bd7a113db244ad8eb45dba38112b53e9ba20c3 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Thu, 23 Mar 2017 10:24:32 -0700
Subject: [PATCH 0090/1744] mercurial, tortoisehg: 3.9.2 -> 4.1.1

---
 pkgs/applications/version-management/mercurial/default.nix  | 4 ++--
 pkgs/applications/version-management/tortoisehg/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 034eb534423..26abd65d9a5 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "3.9.2";
+  version = "4.1.1";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
 in python2Packages.mkPythonDerivation {
@@ -12,7 +12,7 @@ in python2Packages.mkPythonDerivation {
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139";
+    sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index c4eed94017c..1a0c506a19d 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "3.9.2";
+    version = "4.1.1";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2";
+      sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From edf143c85484d50141a98a24502583d46f893552 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 23 Mar 2017 22:22:23 +0100
Subject: [PATCH 0091/1744] gitlab-runner: 1.11.0 -> 1.11.1

---
 .../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 5e46b079aaa..d49221d6e6a 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.11.0";
+  version = "1.11.1";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83";
+    sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64";
+    sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb";
+    sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47";
   };
 
   buildInputs = [ go-bindata ];

From 783e1ce4310a310a7ebd0f8ec217b5f1e84fbe38 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 23 Mar 2017 22:42:54 +0100
Subject: [PATCH 0092/1744] gitlab-runner: 1.11.1 -> 9.0.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 d49221d6e6a..97e195f592e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.11.1";
+  version = "9.0.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m";
+    sha256 = "1f170akb7j7imgr18m32fy6v3rk98inrjl5a4xymfpivwwqyv9p8";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw";
+    sha256 = "15mlix8j7bqjg5y07c439d7s197c16zxffknx42z1i3qxcz2mpa4";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47";
+    sha256 = "1csha30lcwm1mk6hqbh0j8bb25apyni23szw79l8xjhmiw2ch619";
   };
 
   buildInputs = [ go-bindata ];

From 5b5357ae1eec83f6e52d4f61298cf5cb86055cae Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 23 Mar 2017 22:53:46 +0100
Subject: [PATCH 0093/1744] khd: remove g++ patch

---
 pkgs/os-specific/darwin/khd/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 0768f5a12e0..8a2f4f46e03 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ Carbon Cocoa ];
 
-  prePatch = ''
-    substituteInPlace makefile \
-      --replace g++ clang++
-  '';
-
   buildPhase = ''
     make install
   '';

From 7444cad2f6e3ccfa27c70b52389621c13b6cbf1e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Thu, 23 Mar 2017 15:03:56 -0700
Subject: [PATCH 0094/1744] geda: fix build by using guile_2_0 instead of
 latest ver

gEDA is failing to build on unstable because of the recent upgrade of
guile.
---
 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 93d79b1e0ed..a6ec9a78465 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17515,7 +17515,9 @@ with pkgs;
 
   caneda = callPackage ../applications/science/electronics/caneda { };
 
-  geda = callPackage ../applications/science/electronics/geda { };
+  geda = callPackage ../applications/science/electronics/geda {
+    guile = guile_2_0;
+  };
 
   gerbv = callPackage ../applications/science/electronics/gerbv { };
 

From d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Mar 2017 22:57:51 +0100
Subject: [PATCH 0095/1744] mpd: fix i686-linux build

See upstream https://github.com/MaxKellermann/MPD/pull/24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.
---
 pkgs/servers/mpd/default.nix |  4 +++-
 pkgs/servers/mpd/x86.patch   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mpd/x86.patch

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e3938ec71a8..1883764e24f 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin
 , alsaSupport ? true, alsaLib
 , avahiSupport ? true, avahi, dbus
 , flacSupport ? true, flac
@@ -42,6 +42,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl";
   };
 
+  patches = [ ./x86.patch ];
+
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
diff --git a/pkgs/servers/mpd/x86.patch b/pkgs/servers/mpd/x86.patch
new file mode 100644
index 00000000000..3e4c036418d
--- /dev/null
+++ b/pkgs/servers/mpd/x86.patch
@@ -0,0 +1,12 @@
+--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+@@ -20,8 +20,8 @@
+ /* necessary because libavutil/common.h uses UINT64_C */
+ #define __STDC_CONSTANT_MACROS
+ 
+-#include "lib/ffmpeg/Time.hxx"
+ #include "config.h"
++#include "lib/ffmpeg/Time.hxx"
+ #include "FfmpegDecoderPlugin.hxx"
+ #include "lib/ffmpeg/Domain.hxx"
+ #include "lib/ffmpeg/Error.hxx"

From 16d2799af22320334332dd8049071d2a62a8711c Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 23 Mar 2017 18:04:36 -0500
Subject: [PATCH 0096/1744] Changed fetchgit to fetchFromGitHub

---
 pkgs/tools/package-management/cde/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index 8261cc9e4cf..17150c75466 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "cde-0.1";
-  src = fetchgit {
-    url = "https://github.com/pgbovine/CDE.git";
-    sha256 = "";
-    rev = "551e54d95eb3f8eefc698891f1b873fc4f02f360";
+stdenv.mkDerivation rec {
+  name = "cde-${version}";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "pgbovine";
+    repo = "CDE";
+    sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk";
+    rev = "v${version}";
   };
 
   # The build is small, so there should be no problem
@@ -25,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/pgbovine/CDE";
+    homepage = https://github.com/pgbovine/CDE;
     description = "A packaging tool for building portable packages";
     license = licenses.gpl3;
     maintainers = [ maintainers.rlupton20 ];

From 427d33bfaaa1b6536c5bb11d6eeda10900ae7ac9 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Fri, 24 Mar 2017 00:27:59 +0100
Subject: [PATCH 0097/1744] keepalived: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 6e18e1dba1d..0e4842ec24d 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "keepalived-${version}";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
     rev = "v${version}";
-    sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989";
+    sha256 = "0lbzbw5giddr4rrhppdpsswh88x86ywxrl01vm8z5am7acixn1zr";
   };
 
   buildInputs = [

From 7833436098a341c1296faba17a7839690aa0702a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 22 Mar 2017 14:16:39 +0800
Subject: [PATCH 0098/1744] kodi: 17.0 -> 17.1

---
 pkgs/applications/video/kodi/default.nix | 25 +++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index d7625b8ebac..9c421e0c828 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -44,12 +44,12 @@ let
     sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
   };
 in stdenv.mkDerivation rec {
-    name = "kodi-" + version;
-    version = "17.0";
+    name = "kodi-${version}";
+    version = "17.1";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb";
+      sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh";
     };
 
     buildInputs = [
@@ -97,9 +97,18 @@ in stdenv.mkDerivation rec {
     '';
 
     preConfigure = ''
+      patchShebangs .
       ./bootstrap
+      # tests here fail
+      sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt}
+      # tests here trigger a segfault in kodi.bin
+      sed -i '/TestWebServer.cpp/d'  xbmc/network/test/{Makefile,CMakeLists.txt}
     '';
 
+    enableParallelBuild = true;
+
+    doCheck = true;
+
     configureFlags = [ "--enable-libcec" ]
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
@@ -110,19 +119,17 @@ in stdenv.mkDerivation rec {
     postInstall = ''
       for p in $(ls $out/bin/) ; do
         wrapProgram $out/bin/$p \
-          --prefix PATH ":" "${python2}/bin" \
-          --prefix PATH ":" "${glxinfo}/bin" \
-          --prefix PATH ":" "${xdpyinfo}/bin" \
+          --prefix PATH ":" "${lib.makeBinPath
+              [ python2 glxinfo xdpyinfo ]}" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
-              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]
-            }"
+              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
       done
     '';
 
     meta = with stdenv.lib; {
       homepage = http://kodi.tv/;
       description = "Media center";
-      license = stdenv.lib.licenses.gpl2;
+      license = licenses.gpl2;
       platforms = platforms.linux;
       maintainers = with maintainers; [ domenkozar titanous edwtjo ];
     };

From 8e3d3b5328c0dbeeb1612f81efe051251c3c28c9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 23 Mar 2017 18:57:01 -0500
Subject: [PATCH 0099/1744] Revert "sddm: propagate qtbase input"

This reverts commit 3de6ccd5b21e391c4fa324c94dd150e331a8474e.
---
 .../display-managers/sddm/default.nix         | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 019d3e97a6f..9fd56a49b5f 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
+{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
@@ -28,13 +28,10 @@ let
     nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
     buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau pam systemd
-      qtbase qtdeclarative
+      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
     ];
 
-    propagatedUserEnvPkgs = builtins.map lib.getBin [
-      qtbase qtdeclarative
-    ];
+    propagatedBuildInputs = [ qtdeclarative ];
 
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
@@ -83,21 +80,6 @@ stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    propagated=
-    for i in $unwrapped $themes; do
-      findInputs $i propagated propagated-user-env-packages
-      if [ -z "$crossConfig" ]; then
-          findInputs $i propagated propagated-native-build-inputs
-      else
-          findInputs $i propagated propagated-build-inputs
-      fi
-    done
-
-    for pkg in $propagated; do
-      addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
-      addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
-    done
-
     makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
 
     mkdir -p "$out/share/sddm"

From ae1034ea965f9f86b6cbf1064071923650907618 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 23 Mar 2017 18:57:23 -0500
Subject: [PATCH 0100/1744] nixos/sddm: improve test

Disable SDDM auto-login to improve testing for SDDM themes. See #24246.
---
 nixos/tests/sddm.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 041d88fbeae..a1bd8f14d23 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -1,26 +1,24 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "sddm";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ttuegel ];
-  };
 
   machine = { lib, ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
-    services.xserver.displayManager.sddm = {
-      enable = true;
-      autoLogin = {
-        enable = true;
-        user = "alice";
-      };
-    };
+    services.xserver.displayManager.sddm.enable = true;
     services.xserver.windowManager.default = "icewm";
     services.xserver.windowManager.icewm.enable = true;
     services.xserver.desktopManager.default = "none";
   };
 
-  testScript = { nodes, ... }: ''
+  enableOCR = true;
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.config.users.extraUsers.alice;
+  in ''
     startAll;
+    $machine->waitForText(qr/ALICE/);
+    $machine->screenshot("sddm");
+    $machine->sendChars("${user.password}\n");
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
     $machine->waitForWindow("^IceWM ");

From 2822bacd60121b9305ed6244ec76f7be42fbbf5a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 23 Mar 2017 23:22:29 +0000
Subject: [PATCH 0101/1744] nixos: xen: condition default packages on `enable`

Closes #23690.
---
 nixos/modules/virtualisation/xen-dom0.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 57487f70451..1f5b6bd1d80 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -29,7 +29,6 @@ in
 
     virtualisation.xen.package = mkOption {
       type = types.package;
-      default = pkgs.xen;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.xen-light";
       description = ''
@@ -39,7 +38,6 @@ in
 
     virtualisation.xen.qemu = mkOption {
       type = types.path;
-      default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
       defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
       example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
       description = ''
@@ -49,7 +47,6 @@ in
 
     virtualisation.xen.qemu-package = mkOption {
       type = types.package;
-      default = pkgs.xen;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.qemu_xen-light";
       description = ''
@@ -136,6 +133,9 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
+    virtualisation.xen.package = mkDefault pkgs.xen;
+    virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+    virtualisation.xen.qemu-package = mkDefault pkgs.xen;
     virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
 
     environment.systemPackages = [ cfg.package ];

From e0e520a5191542ba6b204f1226bf97299b85b286 Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Fri, 24 Mar 2017 00:52:56 +0000
Subject: [PATCH 0102/1744] google-compute-image: copy store paths with rsync

In `nixos/modules/virtualisation/google-compute-image.nix`, copy store
paths with `rsync -a` rather than `cp -prd`, because `rsync` seems
better able to handle the hard-links that may be present in the store,
whereas `cp` may fail to copy them.

I have tested that the Google Compute Engine image builds successfully
for me with this patch, whereas it did not without this patch.

This is the same fix applied for Azure images in commit
097ef6e435d5b3fcde92e67abbaaaaaf05c0723d.

Fixes #23973.
---
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 556454c6b5f..a03c45bfeff 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -62,7 +62,7 @@ in
 
           mkdir -p /mnt/nix/store
           echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
+          ${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \

From 9512f6bb94b50243f14c1bd0868cec032915496d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 23 Mar 2017 20:15:14 -0500
Subject: [PATCH 0103/1744] mxt-app:1.26 -> 1.27

---
 pkgs/misc/mxt-app/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index 2873225b26f..735e73d5d49 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool }:
 
 stdenv.mkDerivation rec{
-  version="1.26";
+  version="1.27";
   name = "mxt-app-${version}";
 
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
     repo = "mxt-app";
     rev = "v${version}";
-    sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h";
+    sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h";
   };
 
-  buildInputs = [ autoconf automake libtool ];
-  preConfigure = "./autogen.sh";
-
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libtool ];
+ 
   hardeningDisable = [ "fortify" ];
 
   meta = with stdenv.lib; {

From 7b470cd57ad1cf3959e9499cc806e850b9aff28a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 23 Mar 2017 20:59:22 -0500
Subject: [PATCH 0104/1744] 915resolution: 0.5.2 -> 0.5.3

---
 .../linux/915resolution/default.nix            | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix
index 9bcfcf392f4..d1cb7221615 100644
--- a/pkgs/os-specific/linux/915resolution/default.nix
+++ b/pkgs/os-specific/linux/915resolution/default.nix
@@ -1,15 +1,19 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "915resolution-0.5.2";
+stdenv.mkDerivation rec {
+  name = "915resolution-0.5.3";
+  
   src = fetchurl {
-    url = http://www.geocities.com/stomljen/915resolution-0.5.2.tar.gz;
-    sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq";
+    url = "http://915resolution.mango-lang.org/${name}.tar.gz";
+    sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n";
   };
-  buildPhase = "rm *.o 915resolution; make";
+
+  patchPhase = "rm *.o";
   installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/";
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    homepage = http://915resolution.mango-lang.org/;
+    description = "A tool to modify Intel 800/900 video BIOS";
+    platforms = platforms.linux;
   };
 }

From 306f2c65fe06fe6a8538b8056b7455ade882c044 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 23 Mar 2017 22:41:45 -0400
Subject: [PATCH 0105/1744] zsnes: only build on Linux

It uses callPackage_i686 which forces Linux anyway, and the current setup
just means that we end up with a weird i686-linux job under Darwin.
---
 pkgs/misc/emulators/zsnes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 02f93eb931d..ae94c3de41b 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -57,6 +57,6 @@ in stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
     homepage = http://www.zsnes.com;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 76e095c6c5718d1266e485d07b6d7363cf06492d Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@spacekitteh.moe>
Date: Thu, 23 Mar 2017 13:22:44 +1000
Subject: [PATCH 0106/1744] fetchRepoProject: init.

Added to grab projects added by git-repo.

Contains some problems still reguarding purity and clone.bundle,
but good enough for now.
---
 .../fetchrepoproject/default.nix              | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/build-support/fetchrepoproject/default.nix

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
new file mode 100644
index 00000000000..f0bc02cf66d
--- /dev/null
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -0,0 +1,42 @@
+{stdenv, git, gitRepo, gnupg ? null, cacert}:
+
+{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "",
+localManifests ? [] }:
+
+assert repoRepoRev != "" -> repoRepoURL != "";
+
+stdenv.mkDerivation {
+  buildCommand = with stdenv.lib; ''
+    mkdir ./.repo
+    mkdir ./.repo/local_manifests
+    for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests}
+    do
+      cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
+    done
+
+    export HOME=.repo
+    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
+  + ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
+  + ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
+  + ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
+  + ''
+    repo sync --jobs=$NIX_BUILD_CORES --current-branch
+    rm -rf $out/.repo
+  '';
+
+  GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
+    "GIT_PROXY_COMMAND" "SOCKS_SERVER"
+  ];
+
+  buildInputs = [git gitRepo cacert] ++ stdenv.lib.optional (gnupg != null) [gnupg] ;
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = sha256;
+
+  preferLocalBuild = true;
+  enableParallelBuilding = true;
+  inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e086fd0b153..6a50aa3e07f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -170,6 +170,8 @@ with pkgs;
     inherit curl stdenv;
   };
 
+  fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
+
   # fetchurlBoot is used for curl and its dependencies in order to
   # prevent a cyclic dependency (curl depends on curl.tar.bz2,
   # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl).  It

From 59261f20f0ca18e761df342e1243e0a6ff3d3387 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 19 Mar 2017 22:21:36 +0800
Subject: [PATCH 0107/1744] msr-tools: init at 1.3

---
 pkgs/os-specific/linux/msr-tools/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/msr-tools/default.nix

diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
new file mode 100644
index 00000000000..128f3eac263
--- /dev/null
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "msr-tools-${version}";
+  version = "1.3";
+
+  src = fetchurl {
+    url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip";
+    sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
+  };
+
+  buildInputs = [ unzip ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+    substituteInPlace Makefile \
+      --replace /usr/sbin $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool to read/write from/to MSR CPU registers on Linux";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3cf517303d..dd127ea6a47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1032,6 +1032,8 @@ with pkgs;
 
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
+  msr-tools = callPackage ../os-specific/linux/msr-tools { };
+
   mstflint = callPackage ../tools/misc/mstflint { };
 
   mcelog = callPackage ../os-specific/linux/mcelog {

From 6948f79c16d8fe494dda1a25fdbe9d67f5de839e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 24 Mar 2017 05:13:33 +0100
Subject: [PATCH 0108/1744] wireguard: 0.0.20170320.1 -> 0.0.20170324

---
 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 435653c19fd..68966dd0399 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170320.1";
+  version = "0.0.20170324";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "19rcsmwcb9jp4lrfrkf1x78y4i6dcqx5p7kmcbjnbwl0nkc48vr8";
+    sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51";
   };
 
   meta = with stdenv.lib; {

From d69e9327806496090cb658e377f76b6fdadaaa9c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Mar 2017 06:36:41 +0000
Subject: [PATCH 0109/1744] ocamlPackages.ocaml-compiler-libs: init at 0.9.0

This packages exposes the OCaml compiler libraries repackages
under the toplevel names Ocaml_common, Ocaml_bytecomp, ...

Homepage: https://github.com/janestreet/ocaml-compiler-libs
---
 .../janestreet/ocaml-compiler-libs.nix        | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
new file mode 100644
index 00000000000..7d7e44ab9cc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0"; 
+	src = fetchurl {
+		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz;
+		sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz";
+	};
+
+	buildInputs = [ ocaml jbuilder findlib ];
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "OCaml compiler libraries repackaged";
+		homepage = https://github.com/janestreet/ocaml-compiler-libs;
+		license = stdenv.lib.licenses.asl20;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8471d1a1ced..12ddbfafa10 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -571,6 +571,8 @@ let
 
     buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
 
+    ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
+
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}

From 6414533391f7c042de2380e11fb53f41e8999e2c Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Thu, 23 Mar 2017 22:15:32 +0100
Subject: [PATCH 0110/1744] darwin: cleanup obsolete sdks

---
 pkgs/development/compilers/smlnj/default.nix  |  2 +-
 .../darwin/command-line-tools/default.nix     | 45 -------------------
 pkgs/os-specific/darwin/osx-sdk/default.nix   | 25 -----------
 pkgs/top-level/all-packages.nix               |  5 ---
 4 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/command-line-tools/default.nix
 delete mode 100644 pkgs/os-specific/darwin/osx-sdk/default.nix

diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 7f8580f058b..75daad36f76 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
   '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
     sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
 \  \*x86-darwin\*)\
-\    INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\
+\    INCLFILE=${apple_sdk.sdk}/include/unistd.h\
 \    ;;\
 \  \*) ;;
 ' base/runtime/config/gen-posix-names.sh
diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix
deleted file mode 100644
index 2d1eb7b6b3c..00000000000
--- a/pkgs/os-specific/darwin/command-line-tools/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, xar, gzip, cpio }:
-
-let
-  pkg = { name, sha256 }: stdenv.mkDerivation {
-    inherit name;
-
-    src = fetchurl {
-      # Magic url found in:
-      # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog
-      url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg";
-      inherit sha256;
-    };
-
-    buildInputs = [ xar gzip cpio ];
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    unpackPhase = ''
-      xar -x -f $src
-    '';
-
-    installPhase = ''
-      start="$(pwd)"
-      mkdir -p $out
-      cd $out
-      cat $start/Payload | gzip -d | cpio -idm
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Apple developer tools ${name}";
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.darwin;
-    };
-  };
-in rec {
-  tools = pkg {
-    name   = "CLTools_Executables_OSX109";
-    sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx";
-  };
-
-  sdk = pkg {
-    name   = "DevSDK_OSX109";
-    sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
-  };
-}
diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix
deleted file mode 100644
index 235eadfd255..00000000000
--- a/pkgs/os-specific/darwin/osx-sdk/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv }:
-
-let
-  version = "10.9";
-in stdenv.mkDerivation rec {
-  name = "MacOSX10.9.sdk";
-
-  src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
-
-  unpackPhase = "true";
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/Developer/SDKs/
-    echo "Source is: $src"
-    cp -r $src $out/Developer/SDKs/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "The Mac OS ${version} SDK";
-    maintainers = with maintainers; [ copumpkin ];
-    platforms   = platforms.darwin;
-    license     = licenses.unfree;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd127ea6a47..e07efc74838 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11236,7 +11236,6 @@ with pkgs;
   crda = callPackage ../os-specific/linux/crda { };
 
   darwin = let
-    cmdline = callPackage ../os-specific/darwin/command-line-tools {};
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
   in apple-source-releases // rec {
     cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
@@ -11269,7 +11268,6 @@ with pkgs;
 
     xcode = callPackage ../os-specific/darwin/xcode {};
 
-    osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
     osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
 
     security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
@@ -11278,9 +11276,6 @@ with pkgs;
 
     binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
 
-    cmdline_sdk   = cmdline.sdk;
-    cmdline_tools = cmdline.tools;
-
     apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
 
     libobjc = apple-source-releases.objc4;

From f6669da3cfcf328e573b5be9dde56a638c3a0c95 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 24 Mar 2017 08:40:16 +0100
Subject: [PATCH 0111/1744] fetchrepoproject: fix evaluation

---
 pkgs/build-support/fetchrepoproject/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index f0bc02cf66d..01d7fe1d0f5 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -15,11 +15,10 @@ stdenv.mkDerivation {
     done
 
     export HOME=.repo
-    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
-  + ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
-  + ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
-  + ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
-  + ''
+    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle
+    ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
+    ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
+    ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
     rm -rf $out/.repo
   '';

From fb292118f88e1681aa3cb3fac6780286b3e210be Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 24 Mar 2017 11:07:26 +0200
Subject: [PATCH 0112/1744] yadm: 1.05 -> 1.07

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

diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f87d81bd8fb..6587b25ef94 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub }:
 
-let version = "1.05"; in
+let version = "1.07"; in
 stdenv.mkDerivation {
   name = "yadm-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner  = "TheLocehiliosan";
     repo   = "yadm";
     rev    = "${version}";
-    sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd";
+    sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw";
   };
 
   buildCommand = ''

From 4e57e7f7c6db9a9c00f527eff80cb37890ba516d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 24 Mar 2017 10:34:40 +0100
Subject: [PATCH 0113/1744] Revert "gdm module: only make xserver args
 overrideable"

This reverts commit a5aa9269027d638b80fe1f23bcf8887ca80d034b.

This allows gdm to run again, the test is still failing.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857..1bf4fd3c089 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -99,8 +99,7 @@ in
     services.xserver.displayManager.job =
       {
         environment = {
-          GDM_X_SERVER_EXTRA_ARGS = toString
-            (filter (arg: arg != "-terminate") cfg.xserverArgs);
+          GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}";
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";

From 70322d8b870697059a14e22a733f3a8af84f6f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 15 Mar 2017 09:29:27 +0000
Subject: [PATCH 0114/1744] pythonPackages.BTrees: 4.1.4 -> 4.3.1

---
 .../python-modules/btrees-py35.patch          |  79 ---
 .../python-modules/btrees/default.nix         |  20 +
 pkgs/tools/security/vulnix/default.nix        |  56 +--
 pkgs/tools/security/vulnix/requirements.nix   | 452 +-----------------
 pkgs/top-level/all-packages.nix               |   4 +
 pkgs/top-level/python-packages.nix            |  22 +-
 6 files changed, 72 insertions(+), 561 deletions(-)
 delete mode 100644 pkgs/development/python-modules/btrees-py35.patch
 create mode 100644 pkgs/development/python-modules/btrees/default.nix

diff --git a/pkgs/development/python-modules/btrees-py35.patch b/pkgs/development/python-modules/btrees-py35.patch
deleted file mode 100644
index 77e47d670b9..00000000000
--- a/pkgs/development/python-modules/btrees-py35.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From eee0beef88d135640871050b40844272a3aee790 Mon Sep 17 00:00:00 2001
-From: Tres Seaver <tseaver@palladion.com>
-Date: Tue, 15 Sep 2015 17:20:18 -0400
-Subject: [PATCH 1/2] Ensure that we don't overlook errors in first
- PyObject_RichCompareBool call.
-
-Python 3.5 turns such cases into SystemErrors.
-
-See: https://bugs.python.org/issue23571
-
-Fixes #15.
----
- BTrees/_compat.h | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/BTrees/_compat.h b/BTrees/_compat.h
-index e004d54..19dd377 100644
---- a/BTrees/_compat.h
-+++ b/BTrees/_compat.h
-@@ -27,9 +27,25 @@
- #define TEXT_FROM_STRING PyUnicode_FromString
- #define TEXT_FORMAT PyUnicode_Format
- 
--#define COMPARE(lhs, rhs) \
--    PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \
--    (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1)
-+/* Emulate Python2's __cmp__,  wrapping PyObject_RichCompareBool(),
-+ * Return -2/-3 for errors, -1 for lhs<rhs, 0 for lhs==rhs, 1 for lhs>rhs.
-+ */
-+static inline
-+int __compare(PyObject *lhs, PyObject *rhs) {
-+    int less, equal;
-+
-+    less = PyObject_RichCompareBool(lhs, rhs, Py_LT);
-+    if ( less == -1 ) {
-+        return -2;
-+    }
-+    equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ);
-+    if ( equal == -1 ) {
-+        return -3;
-+    }
-+    return less ? -1 : (equal ? 0 : 1);
-+}
-+
-+#define COMPARE(lhs, rhs) __compare((lhs), (rhs))
- 
- 
- #else
-
-From ff4c3309fe471f2b9bdd642b8f7d1c2fe0f5e458 Mon Sep 17 00:00:00 2001
-From: Tres Seaver <tseaver@palladion.com>
-Date: Sun, 20 Sep 2015 11:07:10 -0400
-Subject: [PATCH 2/2] Avoid unnecessary comparison for 'Py_EQ' if 'Py_LT'
- returned True.
-
----
- BTrees/_compat.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/BTrees/_compat.h b/BTrees/_compat.h
-index 19dd377..ece2bf9 100644
---- a/BTrees/_compat.h
-+++ b/BTrees/_compat.h
-@@ -38,11 +38,14 @@ int __compare(PyObject *lhs, PyObject *rhs) {
-     if ( less == -1 ) {
-         return -2;
-     }
-+    if (less) {
-+        return -1;
-+    }
-     equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ);
-     if ( equal == -1 ) {
-         return -3;
-     }
--    return less ? -1 : (equal ? 0 : 1);
-+    return equal ? 0 : 1;
- }
- 
- #define COMPARE(lhs, rhs) __compare((lhs), (rhs))
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
new file mode 100644
index 00000000000..44e96b5ff30
--- /dev/null
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, persistent, zope_interface, transaction }:
+
+buildPythonPackage rec {
+  pname = "BTrees";
+  version = "4.3.1";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [ persistent zope_interface transaction ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Scalable persistent components";
+    homepage = http://packages.python.org/BTrees;
+    license = licenses.zpt21;
+  };
+}
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index afec616563c..55defd68090 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,51 +1,37 @@
-{ buildPythonPackage,
-  callPackage,
-  click,
-  colorama,
-  fetchurl,
-  flake8,
-  lxml,
-  nix,
-  python,
-  pytest,
-  pytestcov,
-  stdenv,
-  }:
+{ stdenv, pythonPackages, fetchurl, callPackage, nix, }:
 
 let
-  external = callPackage ./requirements.nix { inherit buildPythonPackage fetchurl stdenv; };
-in
-
-buildPythonPackage rec{
+  external = callPackage ./requirements.nix {
+    inherit pythonPackages;
+  };
+in pythonPackages.buildPythonApplication rec{
   name = "${pname}-${version}";
   pname = "vulnix";
   version = "1.2.2";
 
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/90/c9/ebef9243334a99edb8598061efae0f00d7a199b01bea574a84e31e06236d/vulnix-${version}.tar.gz";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
     sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12";
   };
 
-  buildInputs = [
-    flake8
-    pytest
-    pytestcov
-  ];
+  buildInputs = with pythonPackages; [ flake8 pytest pytestcov ];
+
+  postPatch = ''
+    sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py
+  '';
 
   propagatedBuildInputs = [
+    nix
+  ] ++ (with pythonPackages; [
     click
     colorama
-    nix
-    external.lxml
-    external.PyYAML
-    external.requests
-    external.ZODB
-  ];
+    lxml
+    pyyaml
+    requests2
+    external.zodb
+  ]);
 
-  checkPhase = ''
-    export PYTHONPATH=src:$PYTHONPATH
-    py.test
-  '';
+  checkPhase = "py.test";
 
   meta = with stdenv.lib; {
     description = "NixOS vulnerability scanner";
@@ -53,4 +39,4 @@ buildPythonPackage rec{
     license = licenses.bsd2;
     maintainers = with maintainers; [ plumps ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index df51a5e8cd6..952dc1ce652 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -1,21 +1,18 @@
-{ buildPythonPackage, commonDoCheck ? false, commonBuildInputs ? [], fetchurl, libxml2, libxslt, stdenv }:
+{ pythonPackages, fetchurl, stdenv }:
 
 rec {
-
-  BTrees = buildPythonPackage {
+  BTrees = pythonPackages.buildPythonPackage {
     name = "BTrees-4.3.1";
     src = fetchurl {
       url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz";
       sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
     propagatedBuildInputs = [
-      coverage
       persistent
       transaction
-      zope.interface
-    ];
+      zope_interface
+    ] ++ (with pythonPackages; [ coverage ]);
+
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -23,35 +20,12 @@ rec {
     };
   };
 
-
-
-  PyYAML = buildPythonPackage {
-    name = "PyYAML-3.11";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/75/5e/b84feba55e20f8da46ead76f14a3943c8cb722d40360702b2365b91dec00/PyYAML-3.11.tar.gz";
-      sha256 = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "YAML parser and emitter for Python";
-    };
-  };
-
-
-
-  ZConfig = buildPythonPackage {
+  ZConfig = pythonPackages.buildPythonPackage {
     name = "ZConfig-3.1.0";
     src = fetchurl {
       url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
       sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -59,26 +33,21 @@ rec {
     };
   };
 
-
-
-  ZODB = buildPythonPackage {
-    name = "ZODB-5.1.1";
+  zodb = pythonPackages.buildPythonPackage {
+    name = "ZODB-5.2.0";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/08/67/62d42c704edd64bcecddc29442a70535ebc7af46e232a5efa9fc572953f0/ZODB-5.1.1.tar.gz";
-      sha256 = "b0bbe6dfe60e2bdcf842a87abcc53b5cd15ad88ae2824c0c526cbb01ca0b90e5";
+      url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz";
+      sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
+    doCheck = false;
     propagatedBuildInputs = [
       BTrees
-      ZConfig
       persistent
-      six
       transaction
+      ZConfig
       zc.lockfile
       zodbpickle
-      zope.interface
-    ];
+    ] ++ (with pythonPackages; [ six wheel zope_interface ]);
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -86,150 +55,15 @@ rec {
     };
   };
 
-
-
-  click = buildPythonPackage {
-    name = "click-6.6";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-      sha256 = "cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.bsdOriginal;
-      description = "A simple wrapper around optparse for powerful command line utilities.";
-    };
-  };
-
-
-
-  colorama = buildPythonPackage {
-    name = "colorama-0.3.7";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f0/d0/21c6449df0ca9da74859edc40208b3a57df9aca7323118c913e58d442030/colorama-0.3.7.tar.gz";
-      sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.bsdOriginal;
-      description = "Cross-platform colored terminal text.";
-    };
-  };
-
-
-
-  coverage = buildPythonPackage {
-    name = "coverage-4.0.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/76/b4/3777a6bae434240b1fcbbda6cb30085bd897b3519acfffea498ee9f41038/coverage-4.0.3.tar.gz";
-      sha256 = "85b1275b6d7a61ccc8024a4e9a4c9e896394776edce1a5d075ec116f91925462";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.asl20;
-      description = "Code coverage measurement for Python";
-    };
-  };
-
-
-
-  flake8 = buildPythonPackage {
-    name = "flake8-2.5.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/60/4a/7b0ac4920af5673380b7079ba2f7580a8645790c7718881082c0d918b8b4/flake8-2.5.4.tar.gz";
-      sha256 = "cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "mccabe"
-      "pep8"
-      "pyflakes"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "the modular source code checker: pep8, pyflakes and co";
-    };
-  };
-
-
-
-  lxml = buildPythonPackage {
-    name = "lxml-3.7.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/14/51/61462e59ab58575fe0d679ab2d31ec73cd49b26182c6ece3d9379faccfd7/lxml-3.7.0.tar.gz";
-      sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ libxml2 libxslt ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.bsdOriginal;
-      description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.";
-    };
-  };
-
-
-
-  mccabe = buildPythonPackage {
-    name = "mccabe-0.4.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f6/e7/54461a958bb8b16f8db5f849d5d08b7d74153e064ac385fb68ff09f0bd27/mccabe-0.4.0.tar.gz";
-      sha256 = "9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "McCabe checker, plugin for flake8";
-    };
-  };
-
-
-
-  pep8 = buildPythonPackage {
-    name = "pep8-1.7.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/3e/b5/1f717b85fbf5d43d81e3c603a7a2f64c9f1dabc69a1e7745bd394cc06404/pep8-1.7.0.tar.gz";
-      sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "Python style guide checker";
-    };
-  };
-
-
-
-  persistent = buildPythonPackage {
+  persistent = pythonPackages.buildPythonPackage {
     name = "persistent-4.2.2";
     src = fetchurl {
       url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz";
       sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
     propagatedBuildInputs = [
-      coverage
-      zope.interface
-    ];
+      zope_interface
+    ] ++ (with pythonPackages; [ six wheel ]);
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -237,232 +71,15 @@ rec {
     };
   };
 
-
-
-  py = buildPythonPackage {
-    name = "py-1.4.31";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/9a/8dfda23f36600dd701c6722316ba8a3ab4b990261f83e7d3ffc6dfedf7ef/py-1.4.31.tar.gz";
-      sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "library with cross-python path, ini-parsing, io, code, log facilities";
-    };
-  };
-
-
-
-  pyflakes = buildPythonPackage {
-    name = "pyflakes-1.0.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/45/24/6bc038f3422bab08c24173c1990a56e9eb0c4582a9b202858a33f8aefeb8/pyflakes-1.0.0.tar.gz";
-      sha256 = "f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "passive checker of Python programs";
-    };
-  };
-
-
-
-  pytest = buildPythonPackage {
-    name = "pytest-2.9.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5e/f0/75c5cee17575bef459c916b6276bd9ad56944836bb0d9e36dd05704e7f35/pytest-2.9.1.tar.gz";
-      sha256 = "0d48d27a127644fbe7c8158157e08b35f8255045d4476df694b91eb3a8147e65";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "colorama"
-      "py"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "pytest: simple powerful testing with Python";
-    };
-  };
-
-
-
-  pytest-capturelog = buildPythonPackage {
-    name = "pytest-capturelog-0.7";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/35/e9/6051b5bb65ad5049d5eb60127d34c63ba724e17acf8b1f2f2e0755131b6c/pytest-capturelog-0.7.tar.gz";
-      sha256 = "b6e8d5189b39462109c2188e6b512d6cc7e66d62bb5be65389ed50e96d22000d";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "py"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "py.test plugin to capture log messages";
-    };
-  };
-
-
-
-  pytest-codecheckers = buildPythonPackage {
-    name = "pytest-codecheckers-0.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/53/09/263669db13955496e77017f389693c1e1dd77d98fd4afd51b133162e858f/pytest-codecheckers-0.2.tar.gz";
-      sha256 = "853de10f204865140da2bc173f791c9e13794fc43656e02fffcce23c9999e748";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "pep8"
-      "py"
-      "pyflakes"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = "";
-      description = "pytest plugin to add source code sanity checks (pep8 and friends)";
-    };
-  };
-
-
-
-  pytest-cov = buildPythonPackage {
-    name = "pytest-cov-2.2.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/39/07/bdd2d985ae7ac726cc5e7a6a343b585570bf1f9f7cb297a9cd58a60c7c89/pytest-cov-2.2.1.tar.gz";
-      sha256 = "a8b22e53e7f3b971454c35df99dffe21f4749f539491e935c55d3ff7e1b284fa";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "coverage"
-      "pytest"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.bsdOriginal;
-      description = "Pytest plugin for measuring coverage.";
-    };
-  };
-
-
-
-  pytest-runner = buildPythonPackage {
-    name = "pytest-runner-2.9";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/11/d4/c335ddf94463e451109e3494e909765c3e5205787b772e3b25ee8601b86a/pytest-runner-2.9.tar.gz";
-      sha256 = "50378de59b02f51f64796d3904dfe71b9dc6f06d88fc6bfbd5c8e8366ae1d131";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "Invoke py.test as distutils command with dependency resolution";
-    };
-  };
-
-
-
-  pytest-timeout = buildPythonPackage {
-    name = "pytest-timeout-1.0.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/cf/92/ab29b9baa54d47dfd50e43be35577de9af4e7ebf27d29f546ddeb6c3b6f5/pytest-timeout-1.0.0.tar.gz";
-      sha256 = "1465096be73e16df1e15d1b1453692428a7e15b997d756bc565aee0d12798ce1";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      "pytest"
-    ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "py.test plugin to abort hanging tests";
-    };
-  };
-
-
-
-  requests = buildPythonPackage {
-    name = "requests-2.10.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-2.10.0.tar.gz";
-      sha256 = "63f1815788157130cee16a933b2ee184038e975f0017306d723ac326b5525b54";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.asl20;
-      description = "Python HTTP for Humans.";
-    };
-  };
-
-
-
-  setuptools-scm = buildPythonPackage {
-    name = "setuptools-scm-1.15.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc/setuptools_scm-1.15.0.tar.gz";
-      sha256 = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "the blessed package to manage your versions by scm tags";
-    };
-  };
-
-
-
-  six = buildPythonPackage {
-    name = "six-1.10.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz";
-      sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a";
-    };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.mit;
-      description = "Python 2 and 3 compatibility utilities";
-    };
-  };
-
-
-
-  transaction = buildPythonPackage {
+  transaction = pythonPackages.buildPythonPackage {
     name = "transaction-2.0.3";
     src = fetchurl {
       url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
       sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
     propagatedBuildInputs = [
-      coverage
-      zope.interface
-    ];
+      zope_interface
+    ] ++ (with pythonPackages; [ six wheel ]);
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -470,17 +87,12 @@ rec {
     };
   };
 
-
-
-  zc.lockfile = buildPythonPackage {
+  zc.lockfile = pythonPackages.buildPythonPackage {
     name = "zc.lockfile-1.2.1";
     src = fetchurl {
       url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz";
       sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [ ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -488,19 +100,14 @@ rec {
     };
   };
 
-
-
-  zodbpickle = buildPythonPackage {
+  zodbpickle = pythonPackages.buildPythonPackage {
     name = "zodbpickle-0.6.0";
     src = fetchurl {
       url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz";
       sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      coverage
-    ];
+    doCheck = false;
+
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -508,24 +115,17 @@ rec {
     };
   };
 
-
-
-  zope.interface = buildPythonPackage {
+  zope_interface = pythonPackages.buildPythonPackage {
     name = "zope.interface-4.3.3";
     src = fetchurl {
       url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz";
       sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88";
     };
-    doCheck = commonDoCheck;
-    buildInputs = commonBuildInputs;
-    propagatedBuildInputs = [
-      coverage
-    ];
+    propagatedBuildInputs = [ ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
       description = "Interfaces for Python";
     };
   };
-
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533d1c1e7da..576746834af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6887,6 +6887,10 @@ with pkgs;
 
   vultr = callPackage ../development/tools/vultr { };
 
+  vulnix = callPackage ../tools/security/vulnix {
+    pythonPackages = python3Packages;
+  };
+
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
   xcbuild  = callPackage ../development/tools/xcbuild/wrapper.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9bcdeb3c1ca..1bf271838fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27406,25 +27406,7 @@ EOF
     };
   };
 
-
-  BTrees = self.buildPythonPackage rec {
-    name = "BTrees-4.1.4";
-
-    propagatedBuildInputs = with self; [ persistent zope_interface transaction ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/B/BTrees/${name}.tar.gz";
-      sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y";
-    };
-
-    patches = [ ../development/python-modules/btrees-py35.patch ];
-
-    meta = {
-      description = "Scalable persistent components";
-      homepage = http://packages.python.org/BTrees;
-    };
-  };
-
+  BTrees = callPackage ../development/python-modules/btrees {};
 
   persistent = self.buildPythonPackage rec {
     name = "persistent-4.0.8";
@@ -31999,8 +31981,6 @@ EOF
     };
   };
 
-  vulnix = callPackage ../tools/security/vulnix { };
-
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From f38c4ee775c7a485db3b3bcd86a59af84269f32b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 24 Mar 2017 17:48:00 +0800
Subject: [PATCH 0115/1744] duplicity: 0.7.07.1 -> 0.7.12

---
 pkgs/tools/backup/duplicity/default.nix | 48 ++++++++++++++-----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b08bb0768f2..313167b1ae2 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,37 +1,43 @@
-{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper
-}:
+{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }:
 
-let
-  version = "0.7.07.1";
-in python2Packages.buildPythonApplication {
+python2Packages.buildPythonApplication rec {
   name = "duplicity-${version}";
+  version = "0.7.12";
 
   src = fetchurl {
-    url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8";
+    url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz";
+    sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi";
   };
 
+  buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];
+  propagatedBuildInputs = with python2Packages; [
+    boto cffi cryptography ecdsa enum idna
+    ipaddress lockfile paramiko pyasn1 pycrypto six
+  ];
+  checkInputs = with python2Packages; [ lockfile mock pexpect ];
+
+  # lots of tests are failing, although we get a little further now with the bits in preCheck
+  doCheck = false;
+
   postInstall = ''
     wrapProgram $out/bin/duplicity \
       --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
+
+    wrapPythonPrograms
   '';
 
-  buildInputs = [ librsync makeWrapper ];
+  preCheck = ''
+    patchShebangs testing
 
-  # Inputs for tests. These are added to buildInputs when doCheck = true
-  checkInputs = with python2Packages; [ lockfile mock pexpect ];
+    substituteInPlace testing/__init__.py \
+      --replace 'mkdir testfiles' 'mkdir -p testfiles'
+  '';
 
-  # Many problematic tests
-  doCheck = false;
-
-  propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna
-    ipaddress lockfile paramiko pyasn1 pycrypto six ];
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
-    homepage = "http://www.nongnu.org/duplicity";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric peti];
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://www.nongnu.org/duplicity;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric peti ];
+    platforms = platforms.unix;
   };
 }

From da136195912aca4cf874fd849884226ebe8c79cd Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Fri, 24 Mar 2017 12:43:44 +0100
Subject: [PATCH 0116/1744] idea-community: 2016.3.5 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 6ea5590106b..02189206dc6 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -172,12 +172,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.3.5";
+    version = "2017.1";
     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 = "0v5wxjbzrax688knjsf7xd956i8pq5i4svkgnrrc4s390f0ixnl5";
+      sha256 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm";
     };
     wmClass = "jetbrains-idea-ce";
   };

From 8c98df01360c783567b012d57d3e9f547c5b69c3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 24 Mar 2017 15:35:34 +0300
Subject: [PATCH 0117/1744] octoprint-plugins.m33-fio: fix incompatibility with
 new OctoPrint

---
 pkgs/applications/misc/octoprint/plugins.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 2f894514c51..8bc4a22bc92 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }:
 
 let
   buildPlugin = args: pythonPackages.buildPythonApplication (args // {
@@ -23,6 +23,11 @@ let
 
       patches = [
         ./m33-fio-one-library.patch
+        # Fix incompatibility with new OctoPrint
+        (fetchpatch {
+          url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
+          sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
+        })
       ];
 
       postPatch = ''

From 67c44decc8605262605a9f2ac2c936706781e7d4 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Fri, 24 Mar 2017 01:39:45 +0300
Subject: [PATCH 0118/1744] travis: sudo: true, to gain 4G of RAM, as per
 @domenkozar suggestion to fix #24200

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bed82810d46..7474cce7272 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,10 @@
 language: nix
+sudo: true
+# 'sudo: false' == containers that start fast, but only get 4G ram;
+# 'sudo: true'  == VMs that start slow, but with 8G
+# ..as per:  https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
+# Nixpkgs PR tests OOM with 4G: https://github.com/NixOS/nixpkgs/issues/24200
+
 matrix:
     include:
         - os: linux

From f815a7697e09b0b72fe2d06fd29ae1aeee6cdb5a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 24 Mar 2017 14:36:54 +0100
Subject: [PATCH 0119/1744] dnscrypt-proxy service: systemd notification under
 apparmor

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index d382fa8c9cb..077aeca457e 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -220,6 +220,8 @@ in
         ${getLib pkgs.attr}/lib/libattr.so.* mr, # */
 
         ${resolverList} r,
+
+        /run/systemd/notify rw,
       }
     '');
     })

From 1c656d2f351275b1d620ad43355430078c0ab37a Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 23 Mar 2017 15:18:21 +0100
Subject: [PATCH 0120/1744] ghcjsHEAD: upgrade ghcjs-boot packages

Move them closer to the latest LTS Haskell.
---
 pkgs/development/compilers/ghcjs/head.nix     |  18 +-
 .../compilers/ghcjs/head_stage2.nix           | 330 ++++++++++--------
 2 files changed, 203 insertions(+), 145 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 1c347655ebe..e045dc67a50 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -1,22 +1,26 @@
 { fetchgit, fetchFromGitHub, bootPkgs }:
 
 bootPkgs.callPackage ./base.nix {
-  version = "0.2.020161101";
+  version = "0.2.020170323";
 
   # deprecated on HEAD, directly included in the distribution
   ghcjs-prim = null;
   inherit bootPkgs;
 
   ghcjsSrc = fetchFromGitHub {
-    owner = "ghcjs";
+    # TODO: switch back to the regular ghcjs repo
+    # when https://github.com/ghcjs/ghcjs/pull/573 is merged.
+    owner = "basvandijk";
     repo = "ghcjs";
-    rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6";
-    sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz";
+    rev = "e6cdc71964a1c2e4184416a493e9d384c408914c";
+    sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz";
   };
   ghcjsBootSrc = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
-    sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
+    # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git
+    # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged.
+    url = git://github.com/basvandijk/ghcjs-boot.git;
+    rev = "19a3b157ecb807c2224daffda5baecc92b76af35";
+    sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
index 765a384bf63..d4247f51b3e 100644
--- a/pkgs/development/compilers/ghcjs/head_stage2.nix
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -2,107 +2,117 @@
 
 {
   async = callPackage
-    ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
-      , test-framework-hunit
-      }:
-      mkDerivation {
-        pname = "async";
-        version = "2.1.0";
-        src = "${ghcjsBoot}/boot/async";
-        doCheck = false;
-        libraryHaskellDepends = [ base stm ];
-        testHaskellDepends = [
-          base HUnit test-framework test-framework-hunit
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/simonmar/async";
-        description = "Run IO operations asynchronously and wait for their results";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, stdenv
+     }:
+     mkDerivation {
+       pname = "async";
+       version = "2.1.1";
+       src = "${ghcjsBoot}/boot/async";
+       doCheck = false;
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/simonmar/async";
+       description = "Run IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   aeson = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-      , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
-      , stdenv, syb, tagged, template-haskell, test-framework
-      , test-framework-hunit, test-framework-quickcheck2, text, time
-      , transformers, unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "aeson";
-        version = "0.11.2.0";
-        src = "${ghcjsBoot}/boot/aeson";
-        doCheck = false;
-        libraryHaskellDepends = [
-          attoparsec base bytestring containers deepseq dlist fail ghc-prim
-          hashable mtl scientific syb tagged template-haskell text time transformers
-          unordered-containers vector
-        ];
-        testHaskellDepends = [
-          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-          template-haskell test-framework test-framework-hunit
-          test-framework-quickcheck2 text time unordered-containers vector
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/bos/aeson";
-        description = "Fast JSON parsing and encoding";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+     , base16-bytestring, bytestring, containers, deepseq, directory
+     , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, HUnit, integer-logarithms, QuickCheck
+     , quickcheck-instances, scientific, stdenv, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, time-locale-compat
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.1.1.0";
+       src = "${ghcjsBoot}/boot/aeson";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable scientific tagged template-haskell text 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
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   attoparsec = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-      , QuickCheck, quickcheck-unicode, scientific, stdenv
-      , test-framework, test-framework-quickcheck2, text, transformers
-      , vector
-      }:
-      mkDerivation {
-        pname = "attoparsec";
-        version = "0.13.0.2";
-        src = "${ghcjsBoot}/boot/attoparsec";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base bytestring containers deepseq scientific text
-          transformers
-        ];
-        testHaskellDepends = [
-          array base bytestring containers deepseq QuickCheck
-          quickcheck-unicode scientific test-framework
-          test-framework-quickcheck2 text transformers vector
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/bos/attoparsec";
-        description = "Fast combinator parsing for bytestrings and text";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, criterion, deepseq, directory, filepath, ghc-prim
+     , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+     , tasty, tasty-quickcheck, text, transformers, unordered-containers
+     , vector, stdenv
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.1.0";
+       src = "${ghcjsBoot}/boot/attoparsec";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion deepseq
+         directory filepath ghc-prim http-types parsec scientific text
+         transformers unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/bos/attoparsec";
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   case-insensitive = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
-      , test-framework, test-framework-hunit, text
-      }:
-      mkDerivation {
-        pname = "case-insensitive";
-        version = "1.2.0.6";
-        src = "${ghcjsBoot}/boot/case-insensitive";
-        doCheck = false;
-        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-        testHaskellDepends = [
-          base bytestring HUnit test-framework test-framework-hunit text
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/basvandijk/case-insensitive";
-        description = "Case insensitive string comparison";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text, stdenv
+     }:
+     mkDerivation {
+       pname = "case-insensitive";
+       version = "1.2.0.8";
+       src = "${ghcjsBoot}/boot/case-insensitive";
+       doCheck = false;
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+       jailbreak = true;
+       homepage = "https://github.com/basvandijk/case-insensitive";
+       description = "Case insensitive string comparison";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   dlist = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
-      mkDerivation {
-        pname = "dlist";
-        version = "0.7.1.2";
-        src = "${ghcjsBoot}/boot/dlist";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq ];
-        testHaskellDepends = [ base Cabal QuickCheck ];
-        jailbreak = true;
-        homepage = "https://github.com/spl/dlist";
-        description = "Difference lists";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+     mkDerivation {
+       pname = "dlist";
+       version = "0.8.0.2";
+       src = "${ghcjsBoot}/boot/dlist";
+       doCheck = false;
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/spl/dlist";
+       description = "Difference lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   extensible-exceptions = callPackage
     ({ mkDerivation, base, stdenv }:
       mkDerivation {
@@ -175,29 +185,29 @@
         license = stdenv.lib.licenses.bsd3;
       }) {};
   scientific = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim
-      , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
-      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-      , text, vector
-      }:
-      mkDerivation {
-        pname = "scientific";
-        version = "0.3.4.7";
-        src = "${ghcjsBoot}/boot/scientific";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base binary bytestring containers deepseq ghc-prim hashable
-          integer-gmp text vector
-        ];
-        testHaskellDepends = [
-          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
-          tasty-hunit tasty-quickcheck tasty-smallcheck text
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/basvandijk/scientific";
-        description = "Numbers represented using scientific notation";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, vector, stdenv
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.10";
+       src = "${ghcjsBoot}/boot/scientific";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp integer-logarithms text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       jailbreak = true;
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   stm = callPackage
     ({ mkDerivation, array, base, stdenv }:
       mkDerivation {
@@ -224,6 +234,23 @@
         description = "Scrap Your Boilerplate";
         license = stdenv.lib.licenses.bsd3;
       }) {};
+  tagged = callPackage
+    ({ mkDerivation, base, deepseq, template-haskell, transformers
+     , transformers-compat, stdenv
+     }:
+     mkDerivation {
+       pname = "tagged";
+       version = "0.8.5";
+       src = "${ghcjsBoot}/boot/tagged";
+       doCheck = false;
+       libraryHaskellDepends = [
+         base deepseq template-haskell transformers transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/tagged";
+       description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   text = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
       , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
@@ -249,25 +276,52 @@
         license = stdenv.lib.licenses.bsd3;
       }) {};
   unordered-containers = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
-      , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
-      , test-framework-quickcheck2
-      }:
-      mkDerivation {
-        pname = "unordered-containers";
-        version = "0.2.7.0";
-        src = "${ghcjsBoot}/boot/unordered-containers";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq hashable ];
-        testHaskellDepends = [
-          base ChasingBottoms containers hashable HUnit QuickCheck
-          test-framework test-framework-hunit test-framework-quickcheck2
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/tibbe/unordered-containers";
-        description = "Efficient hashing-based container types";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
+    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
+     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
+     , mtl, QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, stdenv
+     }:
+     mkDerivation {
+       pname = "unordered-containers";
+       version = "0.2.7.2";
+       src = "${ghcjsBoot}/boot/unordered-containers";
+       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
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/tibbe/unordered-containers";
+       description = "Efficient hashing-based container types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+  uuid-types = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
+     , tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "uuid-types";
+       version = "1.0.3";
+       src = "${ghcjsBoot}/boot/uuid/uuid-types";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable random text
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq random
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/aslatter/uuid";
+       description = "Type definitions for Universally Unique Identifiers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
   vector = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
       , random, stdenv, template-haskell, test-framework

From 53a402120115daef8a5661847b778035c344c47f Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Mar 2017 11:11:33 -0300
Subject: [PATCH 0121/1744] qt5ct: 0.24 -> 0.30

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

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dd94e379eed..4377b386d85 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.24";
+  version = "0.30";
 
   src = fetchurl {
     url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
-    sha256 = "0k62nd945pbgkshycijzrgdyrwj5kcswk33slaj7hr7d6r7bmb6p";
+    sha256 = "1k0ywd440qvf84chadjb4fnkn8dkfl56cc3a6wqg6a59drslvng6";
   };
 
   buildInputs = [ qtbase qtsvg ];
   nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins/platformthemes/"
+    qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins"
   '';
 
   preFixup = ''

From 27ba56f1e01e5015897be087fe25d5bbcfe13d70 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 08:02:24 -0500
Subject: [PATCH 0122/1744] nixos/plasma5: also test SDDM theme

---
 nixos/tests/plasma5.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index ca787e9c7b9..f561fc8c3c4 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -8,25 +8,27 @@ import ./make-test.nix ({ pkgs, ...} :
 
   machine = { lib, ... }: {
     imports = [ ./common/user-account.nix ];
-    virtualisation.memorySize = 1024;
     services.xserver.enable = true;
-    services.xserver.displayManager.sddm = {
-      enable = true;
-      autoLogin = {
-        enable = true;
-        user = "alice";
-      };
-    };
+    services.xserver.displayManager.sddm.enable = true;
     services.xserver.desktopManager.plasma5.enable = true;
     services.xserver.desktopManager.default = "plasma5";
-    virtualisation.writableStore = false; # FIXME
+    virtualisation.memorySize = 1024;
   };
 
-  testScript = { nodes, ... }:
-  let xdo = "${pkgs.xdotool}/bin/xdotool"; in
-   ''
+  enableOCR = true;
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.config.users.extraUsers.alice;
+    xdo = "${pkgs.xdotool}/bin/xdotool";
+  in ''
     startAll;
 
+    # Wait for display manager to start
+    $machine->waitForText(qr/${user.description}/);
+    $machine->screenshot("sddm");
+
+    # Log in
+    $machine->sendChars("${user.password}\n");
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
 

From e44cd00c2aae5d5e419e3207a571d402f95ec87a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 08:02:53 -0500
Subject: [PATCH 0123/1744] sddm: fix wrapper

When I reduced the closure size, I broke the built-in theme. When I reverted
that fix, the built-in theme worked but the Plasma theme was broken. Now the
wrapper is fixed so that both themes work.
---
 .../display-managers/sddm/default.nix         | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 9fd56a49b5f..f675febafb5 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
+{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
@@ -28,10 +28,12 @@ let
     nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
     buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
+      libxcb libpthreadstubs libXdmcp libXau pam systemd
     ];
 
-    propagatedBuildInputs = [ qtdeclarative ];
+    propagatedBuildInputs = [
+      qtbase qtdeclarative
+    ];
 
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
@@ -80,6 +82,22 @@ stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
 
+    propagated=
+    for i in $unwrapped $themes; do
+      findInputs $i propagated propagated-user-env-packages
+      if [ -z "$crossConfig" ]; then
+          findInputs $i propagated propagated-native-build-inputs
+      else
+          findInputs $i propagated propagated-build-inputs
+      fi
+    done
+
+    for pkg in $propagated; do
+      addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
+      addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
+    done
+
+    mkdir -p "$out/bin"
     makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
 
     mkdir -p "$out/share/sddm"

From 92a8c86647135502c6b48916b8403e7b83505020 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 24 Mar 2017 07:46:16 -0700
Subject: [PATCH 0124/1744] sox: added enableLibpulseaudio option

---
 pkgs/applications/misc/audio/sox/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index b4f01bc642b..2585b554548 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -9,6 +9,7 @@
 , enableLibsndfile ? true, libsndfile ? null
 # amrnb and amrwb are unfree, disabled by default
 , enableAMR ? false, amrnb ? null, amrwb ? null
+, enableLibpulseaudio ? true, libpulseaudio ? null
 }:
 
 with stdenv.lib;
@@ -30,7 +31,8 @@ stdenv.mkDerivation rec {
     optional enableFLAC flac ++
     optional enablePNG libpng ++
     optional enableLibsndfile libsndfile ++
-    optionals enableAMR [ amrnb amrwb ];
+    optionals enableAMR [ amrnb amrwb ] ++
+    optional enableLibpulseaudio libpulseaudio;
 
   meta = {
     description = "Sample Rate Converter for audio";

From 5dbbb60d4f11406467d2c3655c4fb35c951ee656 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 10:18:00 -0500
Subject: [PATCH 0125/1744] nixos/plasma5: re-enable test

Fixes #24240.

I do not know the cause of the test failures, but the tests pass now.
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 00abbcacf8c..63ca39a9b60 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -72,7 +72,7 @@ in rec {
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
-        #(all nixos.tests.plasma5) # temporarily, see #24240
+        (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)

From 352e335f3d643b84f34d5c102a4828712924a267 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 10:38:16 -0500
Subject: [PATCH 0126/1744] nixos/sddm: test automatic and manual login

---
 nixos/release-combined.nix |  2 +-
 nixos/release.nix          |  2 +-
 nixos/tests/sddm.nix       | 88 +++++++++++++++++++++++++++-----------
 3 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 63ca39a9b60..5c1112a1c6d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -92,7 +92,7 @@ in rec {
         (all nixos.tests.openssh)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
-        (all nixos.tests.sddm)
+        (all nixos.tests.sddm.default)
         (all nixos.tests.simple)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
diff --git a/nixos/release.nix b/nixos/release.nix
index cf7f0a63f4b..3535690a8e6 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -296,7 +296,7 @@ in rec {
   tests.quake3 = callTest tests/quake3.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.samba = callTest tests/samba.nix {};
-  tests.sddm = callTest tests/sddm.nix {};
+  tests.sddm = callSubTests tests/sddm.nix {};
   tests.simple = callTest tests/simple.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index a1bd8f14d23..82be9bc1d72 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -1,26 +1,66 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "sddm";
+{ system ? builtins.currentSystem }:
 
-  machine = { lib, ... }: {
-    imports = [ ./common/user-account.nix ];
-    services.xserver.enable = true;
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.windowManager.default = "icewm";
-    services.xserver.windowManager.icewm.enable = true;
-    services.xserver.desktopManager.default = "none";
+with import ../lib/testing.nix { inherit system; };
+
+let
+  inherit (pkgs) lib;
+
+  tests = {
+    default = {
+      name = "sddm";
+
+      machine = { lib, ... }: {
+        imports = [ ./common/user-account.nix ];
+        services.xserver.enable = true;
+        services.xserver.displayManager.sddm.enable = true;
+        services.xserver.windowManager.default = "icewm";
+        services.xserver.windowManager.icewm.enable = true;
+        services.xserver.desktopManager.default = "none";
+      };
+
+      enableOCR = true;
+
+      testScript = { nodes, ... }: let
+        user = nodes.machine.config.users.extraUsers.alice;
+      in ''
+        startAll;
+        $machine->waitForText(qr/ALICE/);
+        $machine->screenshot("sddm");
+        $machine->sendChars("${user.password}\n");
+        $machine->waitForFile("/home/alice/.Xauthority");
+        $machine->succeed("xauth merge ~alice/.Xauthority");
+        $machine->waitForWindow("^IceWM ");
+      '';
+    };
+
+    autoLogin = {
+      name = "sddm-autologin";
+      meta = with pkgs.stdenv.lib.maintainers; {
+        maintainers = [ ttuegel ];
+      };
+
+      machine = { lib, ... }: {
+        imports = [ ./common/user-account.nix ];
+        services.xserver.enable = true;
+        services.xserver.displayManager.sddm = {
+          enable = true;
+          autoLogin = {
+            enable = true;
+            user = "alice";
+          };
+        };
+        services.xserver.windowManager.default = "icewm";
+        services.xserver.windowManager.icewm.enable = true;
+        services.xserver.desktopManager.default = "none";
+      };
+
+      testScript = { nodes, ... }: ''
+        startAll;
+        $machine->waitForFile("/home/alice/.Xauthority");
+        $machine->succeed("xauth merge ~alice/.Xauthority");
+        $machine->waitForWindow("^IceWM ");
+      '';
+    };
   };
-
-  enableOCR = true;
-
-  testScript = { nodes, ... }: let
-    user = nodes.machine.config.users.extraUsers.alice;
-  in ''
-    startAll;
-    $machine->waitForText(qr/ALICE/);
-    $machine->screenshot("sddm");
-    $machine->sendChars("${user.password}\n");
-    $machine->waitForFile("/home/alice/.Xauthority");
-    $machine->succeed("xauth merge ~alice/.Xauthority");
-    $machine->waitForWindow("^IceWM ");
-  '';
-})
+in
+  lib.mapAttrs (lib.const makeTest) tests

From a23b18cfb863cb8cf14893324bef977dc4bdda08 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 6 Mar 2017 18:58:09 -0600
Subject: [PATCH 0127/1744] bitcoin-classic: 0.11.2.cl1.b1 -> 1.2.1

---
 .../applications/altcoins/bitcoin-classic.nix | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 0c875308502..60ef20177a3 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
-  version = "0.11.2.cl1.b1";
+  version = "1.2.1";
 
-  src = fetchurl {
-    url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz";
-    sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049";
+  src = fetchFromGitHub {
+    owner = "bitcoinclassic";
+    repo = "bitcoinclassic";
+    rev = "v${version}";
+    sha256 = "0ykblw6mb8bh2pa50iqgc5f07mmsz4m3yajsphqgiv5n2fwmkzng";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc utillinux protobuf libevent ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
       continue to release updates that are in line with Satoshi’s whitepaper &
       vision, and are agreed upon by the community.
     '';
-    homepage = "https://bitcoinclassic.com/";
+    homepage = https://bitcoinclassic.com/;
     maintainers = with maintainers; [ jefdaj ];
     license = licenses.mit;
     platforms = platforms.unix;

From a7cb6997aa411715c3b4bbfac79b154d2ec032c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 24 Mar 2017 16:58:15 +0100
Subject: [PATCH 0128/1744] bitcoin-classic: 1.2.1 -> 1.2.3

Update after #23577
---
 pkgs/applications/altcoins/bitcoin-classic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 60ef20177a3..50a011e0057 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.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "bitcoinclassic";
     repo = "bitcoinclassic";
     rev = "v${version}";
-    sha256 = "0ykblw6mb8bh2pa50iqgc5f07mmsz4m3yajsphqgiv5n2fwmkzng";
+    sha256 = "0y99c8zv42ps3pxp46p3fqj9sir580v7s5qyi3cxva12mq2z0cql";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From c86f005137cde36de457572eec99dca58ffff1be Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 21:02:01 -0500
Subject: [PATCH 0129/1744] direwolf: 1.2 -> 1.3

alaLib as optional

Remove extra stdenv.lib

(@7c6f434c) fixed a typo - pushing instead of #24105
---
 pkgs/applications/misc/direwolf/default.nix | 43 ++++++++++++---------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index 0341ffc64af..d4c8b1ada6c 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -1,38 +1,43 @@
-{ stdenv, fetchFromGitHub, unzip, alsaLib }:
-let
-  version = "1.2";
-in
+{ stdenv, fetchFromGitHub
+, espeak, alsaLib, perl
+, python }:
+
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "direwolf-${version}";
-  inherit version;
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "wb2osz";
     repo = "direwolf";
-    rev = "8b81a32";
-    sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs";
+    rev = version;
+    sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg";
   };
 
   buildInputs = [
-    unzip alsaLib
-  ];
+    espeak perl python
+  ] ++ (optional stdenv.isLinux alsaLib);
 
   patchPhase = ''
-    substituteInPlace Makefile.linux \
-      --replace "/usr/local" "$out" \
-      --replace "/usr/share" "$out/share"
-  '';
+        substituteInPlace Makefile.* \
+          --replace /usr/share $out/share
 
-  preInstall = ''
-    mkdir -p $out/bin
-  '';
+        substituteInPlace dwespeak.sh \
+          --replace espeak ${espeak}/bin/espeak
+        '';
 
-  meta = with stdenv.lib; {
+  installPhase = ''
+    mkdir -p $out/bin 
+    make INSTALLDIR=$out install
+    '';
+
+  meta = {
     description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
     # On the page: This page will be disappearing on October 8, 2015.
-    homepage = https://home.comcast.net/~wb2osz/site/;
+    homepage = https://github.com/wb2osz/direwolf/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.the-kenny ];
   };
 }

From 8d97ee2a97f7a588c731733bf84f398c8f74f96f Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <deepfire@users.noreply.github.com>
Date: Fri, 24 Mar 2017 16:38:42 +0000
Subject: [PATCH 0130/1744] Fix a missed `sudo: true` line

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7474cce7272..2bd784ed30a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ sudo: true
 matrix:
     include:
         - os: linux
-          sudo: false
+          sudo: required
           script:
               - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
               - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual

From 317734f99cc095c0158e071ccb3052fa91407723 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 24 Mar 2017 18:44:45 +0800
Subject: [PATCH 0131/1744] speedcrunch: stick to qt 5.7 as 5.8 is broken

---
 pkgs/applications/science/math/speedcrunch/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 334423660a0..33de9cd0d97 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = with maintainers; [ gebner ];
     platforms = platforms.all;
+    broken = builtins.compareVersions qtbase.version "5.8.0" >= 0;
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96e4840b35b..923676aa154 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17613,7 +17613,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
+  speedcrunch = libsForQt57.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC
 

From bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 15:40:11 -0500
Subject: [PATCH 0132/1744] codeblocks: 13.12 -> 16.01

(@7c6f434c) move the buildInputs missed in the initial version to
nativeBuildInputs, too.

Pushed instead of #24074
---
 .../applications/editors/codeblocks/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 9cab87e9ed2..8ee08f57655 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2
+{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2
 , contribPlugins ? false, hunspell, gamin, boost
 }:
 
+with stdenv.lib;
+
 with { inherit (stdenv.lib) optionalString optional optionals; };
 
 stdenv.mkDerivation rec {
   name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
-  version = "13.12";
+  version = "16.01";
   pname = "codeblocks";
 
   src = fetchurl {
-    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz";
-    sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
+    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz";
+    sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh";
   };
 
-  buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ]
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
+  buildInputs = [ wxGTK gtk2 ]
     ++ optionals contribPlugins [ hunspell gamin boost ];
   enableParallelBuilding = true;
   patches = [ ./writable-projects.patch ];
@@ -25,9 +28,9 @@ stdenv.mkDerivation rec {
 
   # Fix boost 1.59 compat
   # Try removing in the next version
-  CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+  #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
 
-  meta = with stdenv.lib; {
+  meta = {
     maintainers = [ maintainers.linquize ];
     platforms = platforms.all;
     description = "The open source, cross platform, free C, C++ and Fortran IDE";

From dd385d94684e7c09afd6ab3bd9ca19dd95bb5404 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 24 Mar 2017 18:20:01 +0100
Subject: [PATCH 0133/1744] qt57.makeQtWrapper: fix eval

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

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 91364dd65bb..3af342aad93 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -107,7 +107,7 @@ let
 
       makeQtWrapper =
         makeSetupHook
-        { deps = [ makeWrapper dconf.lib gtk ]; }
+        { deps = [ makeWrapper dconf.lib gtk3 ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
       qmakeHook =

From 75f5ed248901919786327d8d0d55a79b65e2cb3f Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Fri, 16 Dec 2016 21:58:57 -0700
Subject: [PATCH 0134/1744] ppsspp: 1.1.0 -> 1.3

---
 pkgs/misc/emulators/ppsspp/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 3f02304c0d4..611cc84325c 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -5,7 +5,7 @@
 assert withGamepads -> (SDL != null);
 
 let
-  version = "1.1.0";
+  version = "1.3";
   fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
 in
 with stdenv.lib;
@@ -14,14 +14,16 @@ stdenv.mkDerivation rec{
 
   src = fetchgit {
     url = "https://github.com/hrydgard/ppsspp.git";
-    rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241";
+    rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x";
+    sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g";
   };
 
-  buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
+  buildInputs = [ zlib libpng qt4 ]
                 ++ (if withGamepads then [ SDL ] else [ ]);
 
+  nativeBuildInputs = [ pkgconfig qmake4Hook ];
+
   qmakeFlags = [ "PPSSPPQt.pro" ];
 
   preConfigure = "cd Qt";
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec{
     homepage = "http://www.ppsspp.org/";
     description = "A PSP emulator, the Qt4 version";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ];
+    maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
     platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
   };
 }

From 6b6454f190960eff595e06305d0633c283ea55a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Oct 2016 19:43:04 +0200
Subject: [PATCH 0135/1744] perlPackages.OpenGL: 0.6703 -> 0.70

Fixes https://github.com/NixOS/nixpkgs/issues/19271 ("slic3r gui
fails").
---
 pkgs/development/perl-modules/perl-opengl.patch | 4 +++-
 pkgs/top-level/perl-packages.nix                | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch
index 77bba1efa41..a44dc4f2e42 100644
--- a/pkgs/development/perl-modules/perl-opengl.patch
+++ b/pkgs/development/perl-modules/perl-opengl.patch
@@ -2,12 +2,14 @@ diff --git a/Makefile.PL b/Makefile.PL
 index 55c485c..8501c02 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API)
+@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API)
  # Look for available libs
  our @libdirs = qw
  {
 -  -L/usr/lib
+-  -L/usr/lib/i386-linux-gnu
 -  -L/usr/X11R6/lib
+-  -L/opt/X11/lib
 -  -L/usr/local/lib
 -  -L/usr/openwin/lib
 -  -L/opt/csw/lib
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 72b80afebbb..f0414b1b1ae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9966,10 +9966,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   OpenGL = buildPerlPackage rec {
-    name = "OpenGL-0.6703";
+    name = "OpenGL-0.70";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz";
-      sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32";
+      sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj";
     };
 
     buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ];

From e3c1e37823976a712ec86ddc7bb78f9c6420131a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Mar 2017 19:09:00 +0000
Subject: [PATCH 0136/1744] ocamlPackages.ppx_ast: init at 0.9.0

Ppx_ast selects a specific version of the OCaml Abstract Syntax
Tree from the migrate-parsetree project that is not necessarily
the same one as the one being used by the compiler.

Homepage: https://github.com/janestreet/ppx_ast
---
 .../ocaml-modules/janestreet/ppx_ast.nix      | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_ast.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
new file mode 100644
index 00000000000..33f1766cb4a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib
+, ocaml-compiler-libs, ocaml-migrate-parsetree
+}:
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-ppx_ast-0.9.0";
+	src = fetchurl {
+		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz;
+		sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz";
+	};
+
+	buildInputs = [ ocaml jbuilder findlib ];
+	propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "OCaml AST used by Jane Street ppx rewriters";
+		homepage = https://github.com/janestreet/ppx_ast;
+		license = stdenv.lib.licenses.asl20;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 12ddbfafa10..54460f855db 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -573,6 +573,8 @@ let
 
     ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
 
+    ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {};
+
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}

From 9a777013d1d34acc4ea217a7f09bfab96c6be50f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 23 Mar 2017 08:56:12 -0400
Subject: [PATCH 0137/1744] Add setupSystemdUnits function.

Allows setting up and managing a set of systemd units on any systemd distribution.
---
 pkgs/build-support/setup-systemd-units.nix | 83 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 85 insertions(+)
 create mode 100644 pkgs/build-support/setup-systemd-units.nix

diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix
new file mode 100644
index 00000000000..4fa2f42c39d
--- /dev/null
+++ b/pkgs/build-support/setup-systemd-units.nix
@@ -0,0 +1,83 @@
+# | Build a script to install and start a set of systemd units on any
+# systemd-based system.
+#
+# Creates a symlink at /etc/systemd-static/${namespace} for slightly
+# improved atomicity.
+{ writeScriptBin
+, bash
+, coreutils
+, systemd
+, runCommand
+, lib
+}:
+  { units     # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] })
+              # ^ A set whose names are unit names and values are
+              # either paths to the corresponding unit files or a set
+              # containing the path and the list of units this unit
+              # should be wanted-by (none by default).
+              #
+              # The names should include the unit suffix
+              # (e.g. ".service")
+  , namespace # : String
+              # The namespace for the unit files, to allow for
+              # multiple independent unit sets managed by
+              # `setupSystemdUnits`.
+  }:
+    let static = runCommand "systemd-static" {}
+          ''
+            mkdir -p $out
+            ${lib.concatStringsSep "\n" (lib.mapAttrsToList (nm: file:
+                "ln -sv ${file.path or file} $out/${nm}"
+             ) units)}
+          '';
+        add-unit-snippet = name: file:
+          ''
+            oldUnit=$(readlink -f "$unitDir/${name}" || echo "$unitDir/${name}")
+            if [ -f "$oldUnit" -a "$oldUnit" != "${file.path or file}" ]; then
+              unitsToStop+=("${name}")
+            fi
+            ln -sf "/etc/systemd-static/${namespace}/${name}" \
+              "$unitDir/.${name}.tmp"
+            mv -T "$unitDir/.${name}.tmp" "$unitDir/${name}"
+            ${lib.concatStringsSep "\n" (map (unit:
+                ''
+                  mkdir -p "$unitDir/${unit}.wants"
+                  ln -sf "../${name}" \
+                    "$unitDir/${unit}.wants/.${name}.tmp"
+                  mv -T "$unitDir/${unit}.wants/.${name}.tmp" \
+                    "$unitDir/${unit}.wants/${name}"
+                ''
+              ) file.wanted-by or [])}
+            unitsToStart+=("${name}")
+          '';
+    in
+      writeScriptBin "setup-systemd-units"
+        ''
+          #!${bash}/bin/bash -e
+          export PATH=${coreutils}/bin:${systemd}/bin
+
+          unitDir=/etc/systemd/system
+          if [ ! -w "$unitDir" ]; then
+            unitDir=/etc/systemd-mutable/system
+            mkdir -p "$unitDir"
+          fi
+          declare -a unitsToStop unitsToStart
+
+          oldStatic=$(readlink -f /etc/systemd-static/${namespace} || true)
+          if [ "$oldStatic" != "${static}" ]; then
+            ${lib.concatStringsSep "\n"
+                (lib.mapAttrsToList add-unit-snippet units)}
+            if [ ''${#unitsToStop[@]} -ne 0 ]; then
+              echo "Stopping unit(s) ''${unitsToStop[@]}" >&2
+              systemctl stop "''${unitsToStop[@]}"
+            fi
+            mkdir -p /etc/systemd-static
+            ln -sfT ${static} /etc/systemd-static/.${namespace}.tmp
+            mv -T /etc/systemd-static/.${namespace}.tmp /etc/systemd-static/${namespace}
+            systemctl daemon-reload
+            echo "Starting unit(s) ''${unitsToStart[@]}" >&2
+            systemctl start "''${unitsToStart[@]}"
+          else
+            echo "Units unchanged, doing nothing" >&2
+          fi
+        ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 923676aa154..552f9d4158e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -281,6 +281,8 @@ with pkgs;
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 
+  setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
+
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
   srcOnly = args: callPackage ../build-support/src-only args;

From 1b4151b12f877d7ce532eb1621af05d311eb2815 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Fri, 24 Mar 2017 16:05:59 -0400
Subject: [PATCH 0138/1744] vscode: 1.10.0 -> 1.10.2

In addition to the version bump, this also fixes a broken install phase
on macOS. The install now completes properly on macOS 10.12 and
"bin/code" is now correctly linked to the binary within the bundle.
---
 pkgs/applications/editors/vscode/default.nix | 37 +++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index a92f8633c3a..3031fa1cb0c 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,24 +2,24 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.10.0";
-  rev = "49129d126e2c3c5592cfc8a509d872067b69d262";
+  version = "1.10.2";
+  rev = "8076a19fdcab7e1fc1707952d652f0bb6c6db331";
   channel = "stable";
 
   # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
   # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
 
-  sha256 = if stdenv.system == "i686-linux"    then "14ip00ysnn6daw7ws3vgnhib18pi7r1z1szfr7s996awbq12ir3i"
-      else if stdenv.system == "x86_64-linux"  then "1krrshsx2pjkr4pc1d6zad664f5khdbhwaq8lpx1aagxxd921mx6"
-      else if stdenv.system == "x86_64-darwin" then "1y574b4wpkk06a36clajx57ydj7a0scn2gms4070cqaf0afzy19f"
+  sha256 = if stdenv.system == "i686-linux"    then "1rhwrpv17c8j06qja7i58cggzka8jm9v9h27jy22z30yxjz0p241"
+      else if stdenv.system == "x86_64-linux"  then "1c1w7wc39a5vdap8j143ym976p9l9iwns1y28mcgjwrihdlb5wb8"
+      else if stdenv.system == "x86_64-darwin" then "1zznsn84k79lqirzv950q7caq7c88yh2gglwjc11y8k69awmlpva"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1488982317_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1488981323_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";
@@ -47,17 +47,22 @@ in
       then [ unzip makeWrapper libXScrnSaver ]
       else [ makeWrapper libXScrnSaver ];
 
-    installPhase = ''
-      mkdir -p $out/lib/vscode $out/bin
-      cp -r ./* $out/lib/vscode
-      ln -s $out/lib/vscode/code $out/bin
+    installPhase =
+      if stdenv.system == "x86_64-darwin" then ''
+        mkdir -p $out/lib/vscode $out/bin
+        cp -r ./* $out/lib/vscode
+        ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin
+      '' else ''
+        mkdir -p $out/lib/vscode $out/bin
+        cp -r ./* $out/lib/vscode
+        ln -s $out/lib/vscode/code $out/bin
 
-      mkdir -p $out/share/applications
-      cp $desktopItem/share/applications/* $out/share/applications
+        mkdir -p $out/share/applications
+        cp $desktopItem/share/applications/* $out/share/applications
 
-      mkdir -p $out/share/pixmaps
-      cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
-    '';
+        mkdir -p $out/share/pixmaps
+        cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
+      '';
 
     postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
       patchelf \

From 82adcd6cfb1c779b86c26e326a33728b316fa9c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 24 Mar 2017 22:01:31 +0100
Subject: [PATCH 0139/1744] pythonPackages.BTrees: fix evaluation; builds fine

---
 pkgs/development/python-modules/btrees/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 44e96b5ff30..8e69a207628 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, persistent, zope_interface, transaction }:
+{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }:
 
 buildPythonPackage rec {
   pname = "BTrees";

From 1e6fd6f901c3be2be68c55f81bb7080b65d6be25 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 24 Mar 2017 16:06:41 -0500
Subject: [PATCH 0140/1744] dar: 2.5.3 -> 2.5.9

---
 pkgs/tools/archivers/dar/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index 83a73eb388f..d75b50bca1a 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "dar-2.5.3";
+  name = "dar-2.5.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "0myakyfgv2mhazwvbbwwncn9j7c9b4g3szs0aqlclmp01naaqmj5";
+    sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ];
+    ++ optionals stdenv.isLinux [ attr e2fsprogs ];
 
   configureFlags = [ "--disable-dar-static" ];
 
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://dar.linux.free.fr/;
     description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.unix;
   };
 }

From 73edc1d5f8756f478052d67ec1f761ac3ac2cd0f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Mar 2017 12:44:02 +0100
Subject: [PATCH 0141/1744] phpPackages.composer: 1.3.2 -> 1.4.1

---
 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 e07930a94db..221427e0851 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,11 +235,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.3.2";
+    version = "1.4.1";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva";
+      sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb";
     };
 
     phases = [ "installPhase" ];

From bde3acbd2a253e61a1024a1dbde879cd43f19f74 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Mar 2017 12:12:50 +0100
Subject: [PATCH 0142/1744] idea.phpstorm: 2016.3.2 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 6ea5590106b..17cdd2276d7 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -280,12 +280,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2016.3.2";
+    version = "2017.1";
     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 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5";
+      sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
     };
     wmClass = "jetbrains-phpstorm";
   };

From 9787b2b808bb7255f78bc628b5314d1fb3609082 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Mar 2017 12:37:50 +0100
Subject: [PATCH 0143/1744] geogebra: 5-0-338-0 -> 5-0-346-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index aee4831034d..916f0dc360f 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-338-0";
+  version = "5-0-346-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "1namwib3912zjizgl9swan0fwgmq9kvfq5k5y8lz818vh4lv88kx";
+    sha256 = "13yiksdk5qwa7c5zp5l0h3czqq31qlf04ncgrh8mn7z70ng1f3l4";
   };
 
   srcIcon = fetchurl {

From 8c2f986ed1a2cbeb214533a125c75eae436c2fe2 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Fri, 24 Mar 2017 17:01:41 -0400
Subject: [PATCH 0144/1744] gitkraken: 2.2.0 -> 2.2.1

---
 .../version-management/gitkraken/default.nix       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 28d89fb32d0..6cc84c9e098 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -4,16 +4,18 @@
   ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
-    sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d";
+    sha256 = "12nyw2dh9ylrms264dbw0xzyif0znmba32zyfq7kdp0iay0wvgqd";
   };
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = makeLibraryPath [
     stdenv.cc.cc.lib
     curl
     udev
@@ -58,13 +60,13 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
              --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
     wrapProgram $out/opt/gitkraken/gitkraken \
-      --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ curl ]}/libcurl.so.4" \
-      --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
+      --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
+      --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
     mkdir "$out/bin"
     ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://www.gitkraken.com/;
     description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
     license = licenses.unfree;

From edac1d3e7a2c319ee748882fc57d0dcb304d7591 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 25 Mar 2017 00:48:27 +0300
Subject: [PATCH 0145/1744] docs: clarify UEFI bootloader setup

---
 nixos/doc/manual/installation/installing-uefi.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
index 927648febc5..0d3eaa8bb1f 100644
--- a/nixos/doc/manual/installation/installing-uefi.xml
+++ b/nixos/doc/manual/installation/installing-uefi.xml
@@ -26,7 +26,8 @@ changes:
     <literal>vfat</literal> filesystem.</para>
   </listitem>
   <listitem>
-    <para>You must set <option>boot.loader.systemd-boot.enable</option> to
+    <para>Instead of <option>boot.loader.grub.device</option>,
+    you must set <option>boot.loader.systemd-boot.enable</option> to
     <literal>true</literal>. <command>nixos-generate-config</command>
     should do this automatically for new configurations when booted in
     UEFI mode.</para>

From acb3135613fe446a0d04f793b0ddcba459d42463 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Fri, 24 Mar 2017 22:16:50 +0100
Subject: [PATCH 0146/1744] emacsMacport: correct description

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

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 90812fb802c..f0f19dce6e3 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
       extensions are distributed with GNU Emacs; others are available
       separately.
 
-      This is "Mac port" addition to GNU Emacs 24. This provides a native
-      GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later
+      This is "Mac port" addition to GNU Emacs 25. This provides a native
+      GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
       already contain the official GUI support via the NS (Cocoa) port for
       Mac OS X 10.4 and later. So if it is good enough for you, then you
       don't need to try this.

From db30cff50008546ca00a46f0e6171bbc186cb3c2 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Fri, 24 Mar 2017 23:16:16 +0100
Subject: [PATCH 0147/1744] earlyoom service: init

---
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/services/system/earlyoom.nix | 96 ++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 nixos/modules/services/system/earlyoom.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 610c2a2b758..a55c2c4565e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -528,6 +528,7 @@
   ./services/system/cgmanager.nix
   ./services/system/cloud-init.nix
   ./services/system/dbus.nix
+  ./services/system/earlyoom.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
new file mode 100644
index 00000000000..daa46838bfa
--- /dev/null
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -0,0 +1,96 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  ecfg = config.services.earlyoom;
+in
+{
+  options = {
+    services.earlyoom = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable early out of memory killing.
+        '';
+      };
+
+      freeMemThreshold = mkOption {
+        type = types.int;
+        default = 10;
+        description = ''
+          Minimum of availabe memory (in percent).
+          If the free memory falls below this threshold and the analog is true for
+          <option>services.earlyoom.freeSwapThreshold</option>
+          the killing begins.
+        '';
+      };
+
+      freeSwapThreshold = mkOption {
+        type = types.int;
+        default = 10;
+        description = ''
+          Minimum of availabe swap space (in percent).
+          If the available swap space falls below this threshold and the analog
+          is true for <option>services.earlyoom.freeMemThreshold</option>
+          the killing begins.
+        '';
+      };
+
+      useKernelOOMKiller= mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Use kernel OOM killer instead of own user-space implementation.
+        '';
+      };
+
+      ignoreOOMScoreAdjust = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Ignore oom_score_adjust values of processes.
+          User-space implementation only.
+        '';
+      };
+
+      enableDebugInfo = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable debugging messages.
+        '';
+      };
+    };
+  };
+
+  config = mkIf ecfg.enable {
+    assertions = [
+      { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100;
+        message = "Needs to be a positive percentage"; }
+      { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100;
+        message = "Needs to be a positive percentage"; }
+      { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust;
+        message = "Both options in conjunction do not make sense"; }
+    ];
+
+    systemd.services.earlyoom = {
+      description = "Early OOM Daemon for Linux";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        StandardOutput = "null";
+        StandardError = "syslog";
+        ExecStart = ''
+          ${pkgs.earlyoom}/bin/earlyoom \
+          -m ${toString ecfg.freeMemThreshold} \
+          -s ${toString ecfg.freeSwapThreshold} \
+          ${optionalString ecfg.useKernelOOMKiller "-k"} \
+          ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \
+          ${optionalString ecfg.enableDebugInfo "-d"}
+        '';
+      };
+    };
+  };
+}

From 6c9e6c218cbaab5f3e13ce6c56c39ad8a8662f92 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 24 Mar 2017 18:09:15 -0500
Subject: [PATCH 0148/1744] bluez-tools: 2015-09-10 -> 2016-12-12

---
 pkgs/tools/bluetooth/bluez-tools/default.nix | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix
index 4640e3c4a61..47aaadc9ccf 100644
--- a/pkgs/tools/bluetooth/bluez-tools/default.nix
+++ b/pkgs/tools/bluetooth/bluez-tools/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }:
+{ stdenv, autoreconfHook, readline
+, fetchFromGitHub, glib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  date    = "2015-09-10";
+  date    = "2016-12-12";
   name    = "bluez-tools-${date}";
-  rev     = "193ad6bb3db";
+  rev     = "97efd29";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url    = "https://github.com/khvzak/bluez-tools.git";
-    sha256 = "0ylk10gfqlwmiz1k355axdhraixc9zym9f87xhag23934x64m8wa";
+    owner = "khvzak";
+    repo = "bluez-tools";
+    sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6";
   };
-  preConfigure = ''
-    ./autogen.sh
-  '';
-  buildInputs = [ stdenv autoconf automake glib pkgconfig readline ];
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  buildInputs = [ readline glib ];
 
   meta = with stdenv.lib; {
     description = "Command line bluetooth manager for Bluez5";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     maintainers = [ maintainers.dasuxullebt ];
     platforms = platforms.unix;
   };

From 2078c34dad8ecdb8955572e2662ecb4eef750d70 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@spacekitteh.moe>
Date: Fri, 24 Mar 2017 18:27:18 +1000
Subject: [PATCH 0149/1744] fetchRepoProject: Fix buildCommand

---
 pkgs/build-support/fetchrepoproject/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 01d7fe1d0f5..33adb5ab1dd 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -15,10 +15,11 @@ stdenv.mkDerivation {
     done
 
     export HOME=.repo
-    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle
-    ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
-    ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
-    ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
+    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
+  + optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"
+  + optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"
+  + optionalString (referenceDir != "") " --reference=${referenceDir}"
+  + ''
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
     rm -rf $out/.repo
   '';

From 00f472a563c030d0232bfd39af8b3f5411169a5d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 25 Mar 2017 00:35:20 +0100
Subject: [PATCH 0150/1744] fetchrepoproject: cleanup extra flags

---
 .../fetchrepoproject/default.nix              | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 33adb5ab1dd..78a46d4ac9b 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -1,25 +1,34 @@
-{stdenv, git, gitRepo, gnupg ? null, cacert}:
+{ stdenv, git, gitRepo, gnupg ? null, cacert }:
 
-{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "",
-localManifests ? [] }:
+{ name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
+, localManifests ? []
+}:
 
 assert repoRepoRev != "" -> repoRepoURL != "";
 
+with stdenv.lib;
+
+let
+  extraRepoInitFlags = [
+    (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+    (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+    (optionalString (referenceDir != "") "--reference=${referenceDir}")
+  ];
+in
+
 stdenv.mkDerivation {
-  buildCommand = with stdenv.lib; ''
+  buildCommand = ''
     mkdir ./.repo
     mkdir ./.repo/local_manifests
-    for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests}
+    for local_manifest in ${concatMapStringsSep " " toString localManifests}
     do
       cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
     done
 
     export HOME=.repo
-    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
-  + optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"
-  + optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"
-  + optionalString (referenceDir != "") " --reference=${referenceDir}"
-  + ''
+    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle \
+        ${concatStringsSep " " extraRepoInitFlags}
+
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
     rm -rf $out/.repo
   '';
@@ -30,7 +39,7 @@ stdenv.mkDerivation {
     "GIT_PROXY_COMMAND" "SOCKS_SERVER"
   ];
 
-  buildInputs = [git gitRepo cacert] ++ stdenv.lib.optional (gnupg != null) [gnupg] ;
+  buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";

From 60788745c9dce2544e90a0d5638843f5259e9f9b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 17:58:55 +0200
Subject: [PATCH 0151/1744] channel.nix: Use filterSource to exclude
 unnecessary files from nixpkgs

Currently, if you try to build a NixOS config including channel.nix, e.g.:

nix-build -I nixpkgs=. -I nixos-config=nixos/modules/installer/cd-dvd/installation-cd-minimal.nix nixos -A config.system.build.isoImage

twice in a row, you end up with two different build results. This is
caused by the 'result' symlink of the first build affecting the channel
contents of the second build.

If we use filterSource with a predicate that ignores the 'result'
symlinks, the problem is gone. Do the same thing for VIM/Emacs
swap/backup files to avoid even more 'spurious' rebuilds.

Additionally, filter out the '.git' directory at the same time, as we
'rm -rf' it from the result anyway. This avoids a considerable amount of
unnecessary file I/O copying and deleting the .git directory.
---
 nixos/modules/installer/cd-dvd/channel.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index cd6e72755de..663ff24c81f 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -6,6 +6,16 @@
 with lib;
 
 let
+  # Do not include these things:
+  #   - The '.git' directory
+  #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
+  #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
+  filterFn = path: type: let basename = baseNameOf (toString path); in
+    if type == "directory" then basename != ".git"
+    else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
+    else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
+
+  nixpkgs = builtins.filterSource filterFn pkgs.path;
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
   # CD.  These are installed into the "nixos" channel of the root
@@ -15,12 +25,11 @@ let
     { }
     ''
       mkdir -p $out
-      cp -prd ${pkgs.path} $out/nixos
+      cp -prd ${nixpkgs} $out/nixos
       chmod -R u+w $out/nixos
       if [ ! -e $out/nixos/nixpkgs ]; then
         ln -s . $out/nixos/nixpkgs
       fi
-      rm -rf $out/nixos/.git
       echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
     '';
 

From 186cc512a68e228d8768f4c817f072b112b922d3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 25 Mar 2017 02:12:14 +0200
Subject: [PATCH 0152/1744] freicoin: Fix eval

---
 pkgs/applications/altcoins/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 9c19be3cc52..d304019953a 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -16,7 +16,7 @@ rec {
   dogecoin  = callPackage ./dogecoin.nix { withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { withGui = false; };
 
-  freicoin = callPackage ../freicoin.nix { boost = boost155; };
+  freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
   go-ethereum = callPackage ./go-ethereum.nix { };
 
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
@@ -34,5 +34,4 @@ rec {
   primecoind = callPackage ./primecoin.nix { withGui = false; };
 
   stellar-core = callPackage ./stellar-core.nix { };
-
 }

From 22e58be888c954b9cb6893a6d3d8e8015e860672 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 24 Mar 2017 21:37:56 -0500
Subject: [PATCH 0153/1744] advancecomp: 1.19 -> 1.23

---
 .../tools/compression/advancecomp/default.nix | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 5737f1eca15..2f4b56ffcaf 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -1,31 +1,26 @@
-{stdenv, fetchurl, zlib}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="advancecomp";
-    version="1.19";
-    name="${baseName}-${version}";
-    url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download";
-    sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m";
+{ stdenv, fetchFromGitHub
+, autoreconfHook, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "advancecomp-${version}";
+  version = "1.23";
+
+  src = fetchFromGitHub {
+    owner = "amadvance";
+    repo = "advancecomp";
+    rev = "v${version}";
+    sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w"; 
   };
-  buildInputs = [
-    zlib
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ zlib ];
+
+  meta = with stdenv.lib; {
     description = ''A set of tools to optimize deflate-compressed files'';
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    updateWalker = true;
-    homepage = "http://advancemame.sourceforge.net/comp-readme.html";
-    downloadPage = "http://advancemame.sourceforge.net/comp-download.html";
+    license = licenses.gpl2 ;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    homepage = https://github.com/amadvance/advancecomp;
+
   };
 }

From a7a3d910392147fae005890ae3eb78a2cd202b7e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Mar 2017 06:57:46 +0000
Subject: [PATCH 0154/1744] ocamlPackages.ppx_traverse_builtins: init at 0.9.0

This OCaml library defines the default methods for builtin types
(int, string, list, ...) for Ppx_traverse.

Homepage: https://github.com/janestreet/ppx_traverse_builtins
---
 .../janestreet/ppx_traverse_builtins.nix      | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
new file mode 100644
index 00000000000..d84983ed634
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0";
+	src = fetchurl {
+		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz;
+		sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6";
+	};
+
+	buildInputs = [ ocaml jbuilder findlib ];
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "Builtins for Ppx_traverse";
+		homepage = https://github.com/janestreet/ppx_traverse_builtins;
+		license = stdenv.lib.licenses.asl20;
+		inherit (ocaml.meta) platforms;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 54460f855db..bca0c1dc216 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -682,6 +682,8 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
+    ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {};
+
 
     # Core sublibs
     typerep =

From 6e0b7273a230b55433fe9ae2799fc53f2b33f8dc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Mar 2017 07:06:49 +0000
Subject: [PATCH 0155/1744] ocamlPackages.stdio: init at 0.9.0

Stdio implements simple input/output functionalities for OCaml.

Homepage: https://github.com/janestreet/stdio
---
 .../ocaml-modules/stdio/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/stdio/default.nix

diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix
new file mode 100644
index 00000000000..87382330022
--- /dev/null
+++ b/pkgs/development/ocaml-modules/stdio/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-stdio-0.9.0";
+
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz;
+    sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5";
+  };
+
+  buildInputs = [ ocaml jbuilder findlib ];
+  propagatedBuildInputs = [ base ];
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    description = "Standard IO library for OCaml";
+    homepage = https://github.com/janestreet/stdio;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bca0c1dc216..41347a2607d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -516,6 +516,8 @@ let
 
     sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
 
+    stdio = callPackage ../development/ocaml-modules/stdio { };
+
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
     topkg = callPackage ../development/ocaml-modules/topkg { };

From b97dd5f560cee49ede14c9b7129b6e1bca3a3707 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Mon, 20 Mar 2017 22:09:55 +0100
Subject: [PATCH 0156/1744] qt58: enable darwin compatibility

---
 .../libraries/qt-5/5.8/default.nix            |   6 +-
 .../qt-5/5.8/qtbase/cmake-paths-darwin.patch  | 384 ++++++++++++++++++
 .../libraries/qt-5/5.8/qtbase/default.nix     | 113 ++++--
 .../libraries/qt-5/5.8/qtbase/series          |   1 -
 4 files changed, 463 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index f02b8070638..eb26f88f725 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -106,13 +106,13 @@ let
 
       makeQtWrapper =
         makeSetupHook
-        { deps = [ makeWrapper dconf.lib gtk3 ]; }
-        ../make-qt-wrapper.sh;
+        { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
+        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
       qmakeHook =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
-        ../qmake-hook.sh;
+        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
 
     };
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
new file mode 100644
index 00000000000..da7f36542ef
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
@@ -0,0 +1,384 @@
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+ endif()
+ !!ENDIF
+
+-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ELSE
+-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+-# Use original install prefix when loaded through a
+-# cross-prefix symbolic link such as /lib -> /usr/lib.
+-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
+-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
+-else()
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-endif()
+-unset(_realOrig)
+-unset(_realCurr)
+-unset(_IMPORT_PREFIX)
+-!!ENDIF
+-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-!!ELSE
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ENDIF
+-
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    endif()
+ !!ELSE
+     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
+     )
+
+-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ELSE
+-    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ENDIF
+-    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
+-    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
+-        )
+-    endif()
+-!!ENDIF
+ endmacro()
+ !!ENDIF
+
+ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+
+ !!IF !no_module_headers
+-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+-    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
+-      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
+-      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+-    )
+-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+-    )
+-!!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
++    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
++        \"\"
+     )
+ !!ELSE
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+-!!ENDIF
++
+ !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
+     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
+ !!ENDIF
+@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+-    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+-        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+     if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
++        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ELSE
+         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ENDIF
+       AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
++        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ELSE
+         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ENDIF
+         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+     endif()
+ !!ENDIF // CMAKE_DEBUG_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ !!ENDIF // CMAKE_RELEASE_TYPE
+
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE
+     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_RELEASE_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+-    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+-        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+     if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
++        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ELSE
+         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ENDIF
+       AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
++        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ELSE
+         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ENDIF
+         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+     endif()
+ !!ENDIF // CMAKE_RELEASE_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
+-        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+-!!ELSE
+-        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+-!!ENDIF
++        set(imported_location \"${PLUGIN_LOCATION}\")
+         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+         set_target_properties(Qt5::${Plugin} PROPERTIES
+             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -2,7 +2,7 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ELSE
+ set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ENDIF
+@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
+     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
++    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ELSE
+     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+     add_executable(Qt5::uic IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
+     add_executable(Qt5::qmake IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
+     add_executable(Qt5::moc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
+     add_executable(Qt5::rcc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ENDIF
+@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
+     add_executable(Qt5::qdbuscpp2xml IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
+     add_executable(Qt5::qdbusxml2cpp IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf
++++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
+@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
+
+     win32 {
+         isEmpty(CMAKE_STATIC_TYPE) {
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
++            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
+         } else:mingw {
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
++            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
+         } else {                         # MSVC static
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
++            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
+         }
+     } else {
+         mac {
+             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
+             else: CMAKE_PlUGIN_EXT = .a
+
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+         } else {
+             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
+             else: CMAKE_PlUGIN_EXT = .a
+
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
++            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+         }
+     }
+     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 7da02525f2d..f881c76c3ad 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -4,6 +4,8 @@
 
   coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
   ruby,
+  # darwin support
+  darwin, libiconv, libcxx,
 
   dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
@@ -15,7 +17,8 @@
   cups ? null, mysql ? null, postgresql ? null,
 
   # options
-  mesaSupported, mesa,
+  mesaSupported ? (!stdenv.isDarwin),
+  mesa,
   buildExamples ? false,
   buildTests ? false,
   developerBuild ? false,
@@ -35,6 +38,7 @@ stdenv.mkDerivation {
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
     ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -54,11 +58,11 @@ stdenv.mkDerivation {
       substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
         --replace "@glibc@" "${stdenv.cc.libc.out}"
 
-      substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor.out}"
-
       substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
         --replace "@openssl@" "${openssl.out}"
+    '' + lib.optionalString stdenv.isLinux ''
+      substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
+        --replace "@libXcursor@" "${libXcursor.out}"
 
       substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
@@ -74,8 +78,23 @@ stdenv.mkDerivation {
       substituteInPlace mkspecs/common/linux.conf \
         --replace "@mesa_lib@" "${mesa.out}" \
         --replace "@mesa_inc@" "${mesa.dev or mesa}"
-    '';
-
+    ''+ lib.optionalString stdenv.isDarwin ''
+      sed -i \
+          -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
+          -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
+          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
+          -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
+          -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
+          -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
+          -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
+          ./configure
+      sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
+      sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
+      sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
+      sed -i 's/QMAKE_LFLAGS_RPATH      = -Wl,-rpath,/QMAKE_LFLAGS_RPATH      =/' ./mkspecs/common/mac.conf
+     '';
+     # Note on the above: \x27 is a way if including a single-quote
+     # character in the sed string arguments.
 
   setOutputFlags = false;
   preConfigure = ''
@@ -102,7 +121,7 @@ stdenv.mkDerivation {
     -shared
     ${lib.optionalString developerBuild "-developer-build"}
     -accessibility
-    -rpath
+    -optimized-qmake
     -strip
     -no-reduce-relocations
     -system-proxies
@@ -114,15 +133,6 @@ stdenv.mkDerivation {
     -qml-debug
     -icu
     -pch
-    -glib
-    -xcb
-    -qpa xcb
-    -${lib.optionalString (cups == null) "no-"}cups
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
 
     ${lib.optionalString (!system-x86_64) "-no-sse2"}
     -no-sse3
@@ -135,16 +145,10 @@ stdenv.mkDerivation {
     -no-mips_dspr2
 
     -system-zlib
-    -system-libpng
     -system-libjpeg
     -system-harfbuzz
-    -system-xcb
-    -system-xkbcommon
     -system-pcre
     -openssl-linked
-    -dbus-linked
-    -libinput
-    -gtk
 
     -system-sqlite
     -${if mysql != null then "plugin" else "no"}-sql-mysql
@@ -155,6 +159,31 @@ stdenv.mkDerivation {
     -${lib.optionalString (buildExamples == false) "no"}make examples
     -${lib.optionalString (buildTests == false) "no"}make tests
     -v
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    -rpath
+    -glib
+    -xcb
+    -qpa xcb
+
+    -${lib.optionalString (cups == null) "no-"}cups
+
+    -no-eglfs
+    -no-directfb
+    -no-linuxfb
+    -no-kms
+
+    -libinput
+    -gtk
+    -system-libpng
+    -system-xcb
+    -system-xkbcommon
+    -dbus-linked
+  '' + lib.optionalString stdenv.isDarwin ''
+    -platform macx-clang
+    -no-use-gold-linker
+    -no-fontconfig
+    -qt-freetype
+    -qt-libpng
   '';
 
   # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
@@ -163,32 +192,44 @@ stdenv.mkDerivation {
   PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
-    dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
+    libxml2 libxslt openssl pcre16 sqlite zlib
+
+    # Text rendering
+    harfbuzz icu
 
     # Image formats
     libjpeg libpng libtiff
+  ]
+  ++ lib.optional mesaSupported mesa
+  ++ lib.optionals (!stdenv.isDarwin) [
+    dbus glib udev
 
     # Text rendering
-    fontconfig freetype harfbuzz icu
+    fontconfig freetype
 
     # X11 libs
     libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
     xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
-  ]
-  ++ lib.optional mesaSupported mesa;
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
+    DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+  ]);
 
-  buildInputs =
-    [ gtk3 libinput ]
+  buildInputs = [ ]
+    ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
     ++ lib.optional (postgresql != null) postgresql;
 
-  nativeBuildInputs =
-    [ bison flex gperf lndir patchelf perl pkgconfig python2 ];
+  nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
 
   # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
+    + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
+  # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
+  # 10.9 which necessitates the above macro definition that mentions
+  # 10.10
 
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
@@ -218,7 +259,7 @@ stdenv.mkDerivation {
       # Move libtool archives and qmake projects
       if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
           pushd "''${!outputLib}"
-          find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+          find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
               while read -r file; do
                   mkdir -p "''${!outputDev}/$(dirname "$file")"
                   mv "''${!outputLib}/$file" "''${!outputDev}/$file"
@@ -226,14 +267,12 @@ stdenv.mkDerivation {
           popd
       fi
     ''
-
     # fixup .pc file (where to find 'moc' etc.)
     + lib.optionalString (!stdenv.isDarwin) ''
       sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
           -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
-
-    # Don't move .prl files on darwin because they end up in
+    # Don' move .prl files on darwin because they end up in
     # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
     # use of lndir in the qtbase setup-hook. On Linux, the .prl files
     # are in lib, and so do not cause a subsequent recreation of deep
@@ -265,8 +304,8 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ qknight ttuegel periklis ];
+    platforms = platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 44e2d904080..2196d838375 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -7,4 +7,3 @@ xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
-cmake-paths.patch

From c7cd4fec60748a2541c4a696b82a59876f7d565a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 25 Mar 2017 09:51:28 +0100
Subject: [PATCH 0157/1744] ponyc: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f78eafa68af..a386abec95b 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "08wh8rh17bf043glvn7778bwpxyzpm95kgfll645hf2m65n5ncsh";
+    sha256 = "0csssmc9dcm2ib9k5qhglnjyrqsmci9b5q0b5cxwvl5z1llib9hg";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 6c9bfa3bd78c357f9dc4c29a2c4d54ce5a7d4b7e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Mar 2017 09:27:11 +0000
Subject: [PATCH 0158/1744] ocamlPackages.angstrom: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 755724bc8b8..fadb55907bf 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.0";
+  version = "0.4.0";
   name = "ocaml-angstrom-${version}";
 
   src = fetchFromGitHub {
     owner  = "inhabitedtype";
     repo   = "angstrom";
     rev    = "${version}";
-    sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q";
+    sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2";
   };
 
   createFindlibDestdir = true;

From e3fd4ec6ceb8988c3d6bcace4d02073f63d73498 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Mar 2017 09:54:46 +0000
Subject: [PATCH 0159/1744] ocamlPackages.ocaml_mysql: 1.1.1 -> 1.2.1

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

diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 9eafa055b24..3fa8e9d46b4 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, mysql }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz";
-    sha256 = "f896fa101a05d81b85af8122fe1c2809008a5e5fdca00f9ceeb7eec356369e3a";
+    url = "http://ygrek.org.ua/p/release/ocaml-mysql/${name}.tar.gz";
+    sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
   };
 
   configureFlags = [ 
@@ -22,17 +22,12 @@ stdenv.mkDerivation rec {
      "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
   ];
 
-  buildInputs = [ocaml findlib camlp4 ];
+  buildInputs = [ ocaml findlib ];
 
   createFindlibDestdir = true;
 
   propagatedBuildInputs = [ mysql.client ];
 
-  buildPhase = ''
-    make
-    make opt
-  '';
-
   meta = {
     homepage = http://ocaml-mysql.forge.ocamlcore.org;
     description = "Bindings for interacting with MySQL databases from ocaml";

From f6c9121d32f948b8f9d5a11daaaa96057d3a609c Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 24 Mar 2017 21:27:41 +1100
Subject: [PATCH 0160/1744] iterm2: 3.0.4 -> 3.0.14

---
 pkgs/applications/misc/iterm2/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index 028e5d6b725..fa2ac38d383 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -2,16 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "iterm2-${version}";
-  version = "3.0.4";
+  version = "3.0.14";
 
   src = fetchFromGitHub {
     owner = "gnachman";
     repo = "iTerm2";
     rev = "v${version}";
-    sha256 = "0ffg9l2jvv503h13nd5rjkn5xrahswcqqwmm052qzd6d0lmqjm93";
+    sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj";
   };
 
   patches = [ ./disable_updates.patch ];
+  postPatch = ''
+    sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj
+  '';
   makeFlagsArray = ["Deployment"];
   installPhase = ''
     mkdir -p "$out/Applications"

From 101cb04b6ae7be2fe7076223c104c725f9b74521 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 25 Mar 2017 11:53:45 +0100
Subject: [PATCH 0161/1744] surf-webkit2: 2017-03-06 -> 2017-03-22

Fixes a race condition
---
 pkgs/applications/networking/browsers/surf/webkit2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix
index 4a7b3d44e79..929bf7dbcb2 100644
--- a/pkgs/applications/networking/browsers/surf/webkit2.nix
+++ b/pkgs/applications/networking/browsers/surf/webkit2.nix
@@ -6,9 +6,9 @@
 
 let
   # http://git.suckless.org/surf/log/?h=surf-webkit2
-  rev = "37e43501d80710533f3ec0bd61ee84916c8524a4";
-  sha256 = "1q388rzm4irpaam4z8xycbyh5dgkjlar5jn1iw7zfls1pbpzr5br";
-  date = "2017-03-06";
+  rev = "7e02344a615a61246ccce1c7f770e88fbd57756e";
+  sha256 = "11f93fbjhl7nfgwkcc45lcm3x1wk5h87ap8fbw9w855021i57pp6";
+  date = "2017-03-22";
 in
 
 stdenv.mkDerivation rec {

From bb5d0f3ded60c144a986ec0ed968dc35e9a949ee Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 25 Mar 2017 11:20:37 +0100
Subject: [PATCH 0162/1744] gdm: the patch is still necessary

---
 pkgs/desktops/gnome-3/3.22/core/gdm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
index 7ba3c3734f8..0d8e46aeece 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ #./xserver_path.patch # gdm now uses wayland
+  patches = [ ./xserver_path.patch
               ./sessions_dir.patch
               ./gdm-x-session_extra_args.patch
               ./gdm-session-worker_xserver-path.patch

From a381ee89cda19dc074753cee2d2c940c657c958d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 13:23:45 +0300
Subject: [PATCH 0163/1744] zenity: fix for non-GNOME 3

---
 pkgs/desktops/gnome-3/3.22/core/zenity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
index 8f525945a6a..80f2dde534e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
+, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
 
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From 4f9e590c06feb71ee08920d3e17ac62fee7f1780 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 25 Mar 2017 12:51:36 +0100
Subject: [PATCH 0164/1744] gitkraken: clean-up

---
 .../version-management/gitkraken/default.nix     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 6cc84c9e098..d17af6f5188 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,7 +1,7 @@
-{stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
-  ,libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
-  ,libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
-  ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
+{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
+, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
+, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
+, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
 }:
 
 with stdenv.lib;
@@ -49,14 +49,16 @@ stdenv.mkDerivation rec {
     libgnome_keyring
   ];
 
-  phases = [ "unpackPhase" "installPhase" ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [ makeWrapper ];
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out/opt/gitkraken"
     cp -r ./* "$out/opt/gitkraken"
-    fixupPhase
+  '';
+
+  postFixup = ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
              --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
     wrapProgram $out/opt/gitkraken/gitkraken \

From 99632d54663ad8866f8414948c12f37328abe865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Mar 2017 11:16:45 +0100
Subject: [PATCH 0165/1744] Nix, Hydra: bump to 2017-03-21

---
 pkgs/development/tools/misc/hydra/default.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 0906492ad10..4b0768af1e2 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -61,15 +61,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-02-03";
+  version = "2017-03-21";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "a366f362e197476615a813e2cc904b60db28e65f";
-    sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf";
+    rev = "57bc0eaead8c76ffd71ddc49adfacc47bb8a75ac";
+    sha256 = "1kshl6ms42fgh621s1ba3a224rawqzgvl89rq1k6c9qhlplpndd9";
   };
 
   buildInputs =
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3aa555f1916..5603ae1b324 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp
+, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
@@ -21,6 +21,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
+      ++ lib.optional fromGit brotli # Since 1.12
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -112,12 +113,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5073_1cf4801";
+    suffix = "pre5110_165786d";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
-      sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
+      rev = "165786dbc0ca0b93fadb6e491defac603475b601";
+      sha256 = "0ah68ss5wlpgfpc4k7yl2h3szbwgllyn5d6s464vynaig6b165pz";
     };
     fromGit = true;
   });

From f77de6d3dccd21b3a79bc96b4e809ea8c651baa4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 25 Mar 2017 12:31:46 +0000
Subject: [PATCH 0166/1744] arcanist: 20160825 -> 20170323

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

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 33b782098c5..760ad521cef 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -4,19 +4,19 @@ let
   libphutil = fetchFromGitHub {
     owner = "phacility";
     repo = "libphutil";
-    rev = "5fd1af8b4f2b9631e2ceb06bd88d21f2416123c2";
-    sha256 = "06zkfkgwni8prr3cnsbf1h4s30k4v00y8ll1bcl6282xynnh3gf6";
+    rev = "01b33af6f4d570b34ad791cd5ccaa3ea7f77dcb9";
+    sha256 = "0glrxlj4cr2821pdc2yy2m5bss4yr1zx3sdgw3r5d8hbfz361nx7";
   };
   arcanist = fetchFromGitHub {
     owner = "phacility";
     repo = "arcanist";
-    rev = "9e82ef979e8148c43b9b8439025d505b1219e213";
-    sha256 = "0h7ny8wr3cjn105gyzhd4qmhhccd0ilalslsdjj10nxxw2cgn193";
+    rev = "3b6b523c2b236e3724a1e115f126cb6fd05fa128";
+    sha256 = "1pr2izwj446rf2v6x6v2wsj7iwnaxq3xg3qqipybyf1xpqfmh5q8";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20160825";
+  version = "20170323";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];

From 6b8ad8b581576d45996a17822e80e6be281dffd9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 25 Mar 2017 13:54:57 +0100
Subject: [PATCH 0167/1744] networkd: fix setting both defaultGateway{,6}

---
 .../tasks/network-interfaces-systemd.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 8b85ff0057f..a365a01bfb1 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -59,15 +59,16 @@ in
     systemd.network =
       let
         domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
-        genericNetwork = override: {
-          DHCP = override (dhcpStr cfg.useDHCP);
-        } // optionalAttrs (cfg.defaultGateway != null) {
-          gateway = override [ cfg.defaultGateway.address ];
-        } // optionalAttrs (cfg.defaultGateway6 != null) {
-          gateway = override [ cfg.defaultGateway6.address ];
-        } // optionalAttrs (domains != [ ]) {
-          domains = override domains;
-        };
+        genericNetwork = override:
+          let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address
+            ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;
+          in {
+            DHCP = override (dhcpStr cfg.useDHCP);
+          } // optionalAttrs (gateway != [ ]) {
+            gateway = override gateway;
+          } // optionalAttrs (domains != [ ]) {
+            domains = override domains;
+          };
       in mkMerge [ {
         enable = true;
         networks."99-main" = genericNetwork mkDefault;

From 22300a9d77aaa266a2ba21c5fed1d48ae670e350 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:28:29 -0500
Subject: [PATCH 0168/1744] qcachegrind: pin to Qt 5.6 and correct packaging
 errors

---
 pkgs/development/tools/analysis/qcachegrind/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 865b3ad6797..64bb39aaf45 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt, qmakeHook, makeQtWrapper, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }:
 
 stdenv.mkDerivation rec {
   name = "qcachegrind-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
   };
 
-  buildInputs = [ qt.qtbase perl python php ];
+  buildInputs = [ qtbase perl python php ];
 
   nativeBuildInputs = [ qmakeHook makeQtWrapper ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 217137c210f..51dd9d3f561 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6955,9 +6955,7 @@ with pkgs;
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
-  qcachegrind = libsForQt57.callPackage ../development/tools/analysis/qcachegrind {
-    qt = qt57;
-  };
+  qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {};
 
   verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
     coq = coq_8_4;

From c84fbda57c2f2f355b8b5607b19648f72c84f9ec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:37:00 -0500
Subject: [PATCH 0169/1744] lyx: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51dd9d3f561..7c9fa253ee5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14454,7 +14454,7 @@ with pkgs;
 
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
-  lyx = libsForQt57.callPackage ../applications/misc/lyx { };
+  lyx = libsForQt56.callPackage ../applications/misc/lyx { };
 
   mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
 

From 25b3a8a961397bfc36ece5bcc6182717c572038b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:37:10 -0500
Subject: [PATCH 0170/1744] fdr: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c9fa253ee5..9263671fa8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13532,7 +13532,7 @@ with pkgs;
 
   fbreader = callPackage ../applications/misc/fbreader { };
 
-  fdr = qt57.callPackage ../applications/science/programming/fdr { };
+  fdr = libsForQt56.callPackage ../applications/science/programming/fdr { };
 
   fehlstart = callPackage ../applications/misc/fehlstart { };
 

From ed6adaab00926301438dbbe5db17b87401aac008 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:40:00 -0500
Subject: [PATCH 0171/1744] speedcrunch: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9263671fa8d..cabeb8579c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17614,7 +17614,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = libsForQt57.callPackage ../applications/science/math/speedcrunch { };
+  speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC
 

From b4e6351c781127f477f935085e8c50f1447180f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:41:31 -0500
Subject: [PATCH 0172/1744] Remove Qt 5.7

The community support window for Qt 5.7 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
---
 .../libraries/qt-5/5.7/default.nix            | 122 ------
 pkgs/development/libraries/qt-5/5.7/fetch.sh  |   3 -
 .../qt-5/5.7/qtbase/cmake-paths-darwin.patch  | 384 -----------------
 .../qt-5/5.7/qtbase/cmake-paths.patch         | 385 ------------------
 .../qt-5/5.7/qtbase/compose-search-path.patch |  16 -
 .../qt-5/5.7/qtbase/decrypt-ssl-traffic.patch |  13 -
 .../libraries/qt-5/5.7/qtbase/default.nix     | 313 --------------
 .../qt-5/5.7/qtbase/dlopen-dbus.patch         |  13 -
 .../libraries/qt-5/5.7/qtbase/dlopen-gl.patch |  17 -
 .../qt-5/5.7/qtbase/dlopen-gtkstyle.patch     |  50 ---
 .../qt-5/5.7/qtbase/dlopen-libXcursor.patch   |  17 -
 .../qt-5/5.7/qtbase/dlopen-openssl.patch      |  26 --
 .../qt-5/5.7/qtbase/dlopen-resolv.patch       |  26 --
 .../libraries/qt-5/5.7/qtbase/libressl.patch  |  33 --
 .../qt-5/5.7/qtbase/mkspecs-libgl.patch       |  15 -
 .../qtbase/nix-profiles-library-paths.patch   |  22 -
 .../libraries/qt-5/5.7/qtbase/series          |   9 -
 .../libraries/qt-5/5.7/qtbase/tzdir.patch     |  40 --
 .../qt-5/5.7/qtbase/xdg-config-dirs.patch     |  41 --
 .../libraries/qt-5/5.7/qtconnectivity.nix     |   6 -
 .../qt-5/5.7/qtdeclarative/default.nix        |   8 -
 .../nix-profiles-import-paths.patch           |  20 -
 .../libraries/qt-5/5.7/qtdeclarative/series   |   1 -
 pkgs/development/libraries/qt-5/5.7/qtdoc.nix |   6 -
 .../libraries/qt-5/5.7/qtgraphicaleffects.nix |   6 -
 .../libraries/qt-5/5.7/qtimageformats.nix     |   6 -
 .../libraries/qt-5/5.7/qtlocation.nix         |   6 -
 .../libraries/qt-5/5.7/qtmultimedia.nix       |  12 -
 .../libraries/qt-5/5.7/qtquickcontrols.nix    |   6 -
 .../libraries/qt-5/5.7/qtquickcontrols2.nix   |   6 -
 .../qt-5/5.7/qtscript/0001-glib-2.32.patch    |  25 --
 .../libraries/qt-5/5.7/qtscript/default.nix   |   7 -
 .../libraries/qt-5/5.7/qtsensors.nix          |   6 -
 .../0001-dlopen-serialport-udev.patch         |  28 --
 .../qt-5/5.7/qtserialport/default.nix         |  12 -
 pkgs/development/libraries/qt-5/5.7/qtsvg.nix |   6 -
 .../qt-5/5.7/qttools/cmake-paths.patch        |  86 ----
 .../libraries/qt-5/5.7/qttools/default.nix    |  11 -
 .../libraries/qt-5/5.7/qttools/series         |   1 -
 .../libraries/qt-5/5.7/qttranslations.nix     |   6 -
 .../libraries/qt-5/5.7/qtwayland.nix          |   8 -
 .../libraries/qt-5/5.7/qtwebchannel.nix       |   7 -
 .../qt-5/5.7/qtwebengine/default.nix          |  85 ----
 .../qtwebengine-paxmark-mksnapshot.patch      |  46 ---
 .../0001-dlopen-webkit-nsplugin.patch         |  53 ---
 .../5.7/qtwebkit/0002-dlopen-webkit-gtk.patch |  25 --
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  31 --
 .../libraries/qt-5/5.7/qtwebkit/default.nix   |  35 --
 .../libraries/qt-5/5.7/qtwebsockets.nix       |   6 -
 .../libraries/qt-5/5.7/qtx11extras.nix        |   6 -
 .../libraries/qt-5/5.7/qtxmlpatterns.nix      |   6 -
 pkgs/development/libraries/qt-5/5.7/srcs.nix  | 317 --------------
 pkgs/top-level/all-packages.nix               |  14 -
 53 files changed, 2455 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/fetch.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtdeclarative/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtdoc.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtimageformats.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtlocation.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtscript/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtsensors.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtsvg.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qttools/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qttools/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qttranslations.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwayland.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtx11extras.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
deleted file mode 100644
index 3af342aad93..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-
-# Updates
-
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `maintainers/scripts/generate-qt.sh`.
-2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
-  newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
-  bison, cups ? null, harfbuzz, mesa, perl,
-  gstreamer, gst-plugins-base, gtk3, dconf,
-
-  # options
-  developerBuild ? false,
-  decryptSslTraffic ? false,
-}:
-
-with stdenv.lib;
-
-let
-
-  mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
-
-  qtSubmodule = args:
-    let
-      inherit (args) name;
-      version = args.version or srcs."${name}".version;
-      src = args.src or srcs."${name}".src;
-      inherit (stdenv) mkDerivation;
-    in mkDerivation (args // {
-      name = "${name}-${version}";
-      inherit src;
-
-      propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
-      nativeBuildInputs =
-        (args.nativeBuildInputs or [])
-        ++ [ perl self.qmakeHook ];
-
-      NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-
-      outputs = args.outputs or [ "out" "dev" ];
-      setOutputFlags = args.setOutputFlags or false;
-
-      setupHook = ../qtsubmodule-setup-hook.sh;
-
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
-      meta = self.qtbase.meta // (args.meta or {});
-    });
-
-  addPackages = self: with self;
-    let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
-    in {
-
-      qtbase = callPackage ./qtbase {
-        inherit (srcs.qtbase) src version;
-        inherit bison cups harfbuzz mesa;
-        inherit developerBuild decryptSslTraffic;
-      };
-
-      qtconnectivity = callPackage ./qtconnectivity.nix {};
-      qtdeclarative = callPackage ./qtdeclarative {};
-      qtdoc = callPackage ./qtdoc.nix {};
-      qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
-      qtimageformats = callPackage ./qtimageformats.nix {};
-      qtlocation = callPackage ./qtlocation.nix {};
-      qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit gstreamer gst-plugins-base;
-      };
-      qtquick1 = null;
-      qtquickcontrols = callPackage ./qtquickcontrols.nix {};
-      qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
-      qtscript = callPackage ./qtscript {};
-      qtsensors = callPackage ./qtsensors.nix {};
-      qtserialport = callPackage ./qtserialport {};
-      qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools {};
-      qttranslations = callPackage ./qttranslations.nix {};
-      qtwayland = callPackage ./qtwayland.nix {};
-      qtwebchannel = callPackage ./qtwebchannel.nix {};
-      qtwebengine = callPackage ./qtwebengine {};
-      qtwebkit = callPackage ./qtwebkit {};
-      qtwebsockets = callPackage ./qtwebsockets.nix {};
-      qtx11extras = callPackage ./qtx11extras.nix {};
-      qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
-
-      env = callPackage ../qt-env.nix {};
-      full = env "qt-${qtbase.version}" [
-        qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats
-        qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript
-        qtsensors qtserialport qtsvg qttools qttranslations qtwayland
-        qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras
-        qtxmlpatterns
-      ];
-
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper dconf.lib gtk3 ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
-      qmakeHook =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
-
-    };
-
-   self = makeScope newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh
deleted file mode 100644
index 6a6a34d520d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/fetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \
-            http://download.qt.io/community_releases/5.7/5.7.1/ \
-            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
deleted file mode 100644
index 2fda5ed8cf0..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
- 
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-     )
- 
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
--    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
--    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
--    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
--        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
--        )
--    endif()
--!!ENDIF
- endmacro()
- !!ENDIF
- 
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
--    )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
--    )
--!!ELSE
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+        \"\"
-     )
- !!ELSE
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
-     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
- 
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
--!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
--        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ELSE
--        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ENDIF
-+        set(imported_location \"${PLUGIN_LOCATION}\")
-         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
-         set_target_properties(Qt5::${Plugin} PROPERTIES
-             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
- 
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
-     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
-     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
-     add_executable(Qt5::uic IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
-     add_executable(Qt5::qmake IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
-     add_executable(Qt5::moc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
-     add_executable(Qt5::rcc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
-     add_executable(Qt5::qdbuscpp2xml IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
-     add_executable(Qt5::qdbusxml2cpp IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
-@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
- 
-     win32 {
-         isEmpty(CMAKE_STATIC_TYPE) {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
-         } else:mingw {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
-         } else {                         # MSVC static
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
-         }
-     } else {
-         mac {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
-             else: CMAKE_PlUGIN_EXT = .a
- 
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         } else {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
-             else: CMAKE_PlUGIN_EXT = .a
- 
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         }
-     }
-     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
- 
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
- 
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch
deleted file mode 100644
index 0d5c2d51092..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch
+++ /dev/null
@@ -1,385 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
- 
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-     )
- 
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
--    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
--    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
--    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
--        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
--        )
--    endif()
--!!ENDIF
- endmacro()
- !!ENDIF
- 
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
--    )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
--    )
--!!ELSE
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-+        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-     )
- !!ELSE
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
-     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
- 
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
--!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
--        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ELSE
--        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ENDIF
-+        set(imported_location \"${PLUGIN_LOCATION}\")
-         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
-         set_target_properties(Qt5::${Plugin} PROPERTIES
-             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
- 
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
-     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
-     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
-     add_executable(Qt5::uic IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
-     add_executable(Qt5::qmake IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
-     add_executable(Qt5::moc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
-     add_executable(Qt5::rcc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
-     add_executable(Qt5::qdbuscpp2xml IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
-     add_executable(Qt5::qdbusxml2cpp IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
-@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
- 
-     win32 {
-         isEmpty(CMAKE_STATIC_TYPE) {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
-         } else:mingw {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
-         } else {                         # MSVC static
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
-         }
-     } else {
-         mac {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
-             else: CMAKE_PlUGIN_EXT = .a
- 
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         } else {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
-             else: CMAKE_PlUGIN_EXT = .a
- 
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         }
-     }
-     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
- 
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
- 
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch
deleted file mode 100644
index a0e344a7bc6..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio
-     // the QTCOMPOSE environment variable
-     if (qEnvironmentVariableIsSet("QTCOMPOSE"))
-         m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
--    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 495db07cfbb..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-@@ -48,7 +48,7 @@
- ****************************************************************************/
- 
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
- 
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
deleted file mode 100644
index f41e8da1193..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  stdenv, lib, copyPathsToStore,
-  src, version,
-
-  coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
-  ruby,
-  darwin, libiconv,
-
-  dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
-  libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
-  libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev,
-  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
-  zlib,
-
-  # optional dependencies
-  cups ? null, mysql ? null, postgresql ? null,
-
-  # options
-  mesaSupported ? (!stdenv.isDarwin),
-  mesa,
-  buildExamples ? false,
-  buildTests ? false,
-  developerBuild ? false,
-  decryptSslTraffic ? false
-}:
-
-let
-  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-in
-
-stdenv.mkDerivation {
-
-  name = "qtbase-${version}";
-  inherit src version;
-
-  outputs = [ "out" "dev" ];
-
-  patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
-    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
-
-  postPatch =
-    ''
-      substituteInPlace configure --replace /bin/pwd pwd
-      substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
-
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
-      sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
-      substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-      substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-
-      substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl.out}"
-    '' + lib.optionalString stdenv.isLinux ''
-      substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor.out}"
-
-      substituteInPlace src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus.lib}"
-
-      substituteInPlace \
-        src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11.out}"
-    ''
-    + lib.optionalString mesaSupported ''
-      substituteInPlace \
-        src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
-        --replace "@mesa_lib@" "${mesa.out}"
-      substituteInPlace mkspecs/common/linux.conf \
-        --replace "@mesa_lib@" "${mesa.out}" \
-        --replace "@mesa_inc@" "${mesa.dev or mesa}"
-    ''+ lib.optionalString stdenv.isDarwin ''
-      sed -i \
-          -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
-          -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
-          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
-          -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
-          -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
-          -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
-          -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
-          ./configure
-      sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
-      sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
-      sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
-      sed 's/QMAKE_LFLAGS_RPATH      = -Wl,-rpath,/QMAKE_LFLAGS_RPATH      =/' -i ./mkspecs/common/mac.conf
-     '';
-     # Note on the above: \x27 is a way if including a single-quote
-     # character in the sed string arguments.
-
-  setOutputFlags = false;
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-
-    configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
-  '';
-
-  prefixKey = "-prefix ";
-
-  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
-  # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
-
-    -release
-    -shared
-    ${lib.optionalString developerBuild "-developer-build"}
-    -largefile
-    -accessibility
-    -optimized-qmake
-    -strip
-    -no-reduce-relocations
-    -system-proxies
-    -pkg-config
-
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -iconv
-    -icu
-    -pch
-
-    ${lib.optionalString (!system-x86_64) "-no-sse2"}
-    -no-sse3
-    -no-ssse3
-    -no-sse4.1
-    -no-sse4.2
-    -no-avx
-    -no-avx2
-    -no-mips_dsp
-    -no-mips_dspr2
-
-    -system-zlib
-    -system-libpng
-    -system-libjpeg
-    -system-harfbuzz
-    -system-pcre
-    -openssl-linked
-
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
-
-    -make libs
-    -make tools
-    -${lib.optionalString (buildExamples == false) "no"}make examples
-    -${lib.optionalString (buildTests == false) "no"}make tests
-    -v
-  '' + lib.optionalString (!stdenv.isDarwin) ''
-    -no-rpath
-    -glib
-    -xcb
-    -qpa xcb
-
-    -${lib.optionalString (cups == null) "no-"}cups
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
-
-    -libinput
-    -gtk
-    -system-xcb
-    -system-xkbcommon
-    -dbus-linked
-  '' + lib.optionalString stdenv.isDarwin ''
-    -platform macx-clang
-    -no-use-gold-linker
-    -no-fontconfig
-    -qt-freetype
-   '';
-
-  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-  # if dependency paths contain the string "pq", which can occur in the hash.
-  # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
-  propagatedBuildInputs = [
-    libxml2 libxslt openssl pcre16 sqlite zlib
-
-    # Text rendering
-    harfbuzz icu
-
-    # Image formats
-    libjpeg libpng libtiff
-  ]
-  ++ lib.optional mesaSupported mesa
-  ++ lib.optionals (!stdenv.isDarwin) [
-    dbus glib udev
-
-    # Text rendering
-    fontconfig freetype
-
-    # X11 libs
-    libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
-    xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
-   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
-    DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
-  ]);
-
-  buildInputs = [ ]
-    ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
-    ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
-
-  nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
-    + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
-  # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
-  # 10.9 which necessitates the above macro definition that mentions
-  # 10.10
-
-  postInstall = ''
-    find "$out" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
-    done
-  '';
-
-  preFixup = ''
-    # We cannot simply set these paths in configureFlags because libQtCore retains
-    # references to the paths it was built with.
-    moveToOutput "bin" "$dev"
-    moveToOutput "include" "$dev"
-    moveToOutput "mkspecs" "$dev"
-
-    # The destination directory must exist or moveToOutput will do nothing
-    mkdir -p "$dev/share"
-    moveToOutput "share/doc" "$dev"
-  '';
-
-  postFixup =
-    ''
-      # Don't retain build-time dependencies like gdb.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
-
-      # Move libtool archives and qmake projects
-      if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
-          pushd "''${!outputLib}"
-          find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
-              while read -r file; do
-                  mkdir -p "''${!outputDev}/$(dirname "$file")"
-                  mv "''${!outputLib}/$file" "''${!outputDev}/$file"
-              done
-          popd
-      fi
-    ''
-
-    # fixup .pc file (where to find 'moc' etc.)
-    + lib.optionalString (!stdenv.isDarwin) ''
-      sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-          -e "/^host_bins=/ c host_bins=$dev/bin"
-    ''
-
-    # Don't move .prl files on darwin because they end up in
-    # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
-    # use of lndir in the qtbase setup-hook. On Linux, the .prl files
-    # are in lib, and so do not cause a subsequent recreation of deep
-    # framework directory trees.
-    + lib.optionalString stdenv.isDarwin ''
-      fixDarwinDylibNames_rpath() {
-        local flags=()
-
-        for fn in "$@"; do
-          flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn")
-        done
-
-        for fn in "$@"; do
-          echo "$fn: fixing dylib"
-          install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn"
-        done
-      }
-      fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL"
-    '';
-
-  inherit lndir;
-  setupHook = if stdenv.isDarwin
-              then ../../qtbase-setup-hook-darwin.sh
-              else ../../qtbase-setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = http://www.qt.io;
-    description = "A cross-platform application framework for C++";
-    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel ];
-    platforms = platforms.unix;
-  };
-
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 10b0b6701dd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
-@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
-         QLatin1String("dbus-1"),
- #endif
--        QLatin1String("libdbus-1")
-+        QLatin1String("@dbus_libs@/lib/libdbus-1")
-     };
- 
-     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch
deleted file mode 100644
index ea3073ced50..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
-             {
-                 extern const QString qt_gl_library_name();
- //                QLibrary lib(qt_gl_library_name());
-+                // Check system library paths first
-                 QLibrary lib(QLatin1String("GL"));
-+                if (!lib.load()) {
-+                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
-+                }
-                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
-             }
-         }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch
deleted file mode 100644
index 755b0965cf5..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtk2painter.cpp
-+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
-@@ -96,7 +96,7 @@ static void initGtk()
-     static bool initialized = false;
-     if (!initialized) {
-         // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
--        QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+        QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-         QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
-         QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
-Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtkstyle_p.cpp
-+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
-@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
- void QGtkStylePrivate::resolveGtk() const
- {
-     // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
--    QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+    QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
-     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons
-     pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
-     pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
- 
--    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
--    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
-+    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
-+    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
- }
- 
- /* \internal
-@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets
- static bool resolveGConf()
- {
-     if (!QGtkStylePrivate::gconf_client_get_default) {
--        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
--        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
--        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
-+        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
-+        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
-+        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
-     }
-     return (QGtkStylePrivate::gconf_client_get_default !=0);
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch
deleted file mode 100644
index 02b7efb73d2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
-     static bool function_ptrs_not_initialized = true;
-     if (function_ptrs_not_initialized) {
--        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
-         bool xcursorFound = xcursorLib.load();
-         if (!xcursorFound) { // try without the version number
--            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
-             xcursorFound = xcursorLib.load();
-         }
-         if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch
deleted file mode 100644
index 9891bfeac5b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -676,8 +676,8 @@ static QPair<QLibrary*, QLibrary*> loadO
-     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch
deleted file mode 100644
index 98a3610f5fb..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
-@@ -85,7 +85,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
-         if (!lib.load())
-             return false;
-     }
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
-@@ -100,7 +100,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
-         if (!lib.load())
-             return false;
-     }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch
deleted file mode 100644
index 4390db977a7..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sat, 10 Oct 2015 01:15:01 +0200
-Subject: [PATCH] Fix compilation with libressl
-
-By additionally checking for defined(SSL_CTRL_SET_CURVES), which
-is defined in openssl, but not in libressl.
----
- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
-@@ -347,7 +347,7 @@ init_context:
- 
-     const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
-     if (!qcurves.isEmpty()) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
-         // Set the curves to be used
-         if (q_SSLeay() >= 0x10002000L) {
-             // SSL_CTX_ctrl wants a non-const pointer as last argument,
-@@ -360,7 +360,7 @@ init_context:
-                 sslContext->errorCode = QSslError::UnspecifiedError;
-             }
-         } else
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
-         {
-             // specific curves requested, but not possible to set -> error
-             sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index fda3d3e3653..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf
-+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR            =
- QMAKE_LIBDIR            =
- QMAKE_INCDIR_X11        =
- QMAKE_LIBDIR_X11        =
--QMAKE_INCDIR_OPENGL     =
--QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index ebaf3651a6d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat
-         QStringList *app_libpaths = new QStringList;
-         coreappdata()->app_libpaths.reset(app_libpaths);
- 
-+        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        for (const QByteArray &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+            }
-+        }
-+
-         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-+        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
-         if (!libPathEnv.isEmpty()) {
-             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series
deleted file mode 100644
index 2196d838375..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/series
+++ /dev/null
@@ -1,9 +0,0 @@
-dlopen-resolv.patch
-tzdir.patch
-dlopen-libXcursor.patch
-dlopen-openssl.patch
-dlopen-dbus.patch
-xdg-config-dirs.patch
-nix-profiles-library-paths.patch
-compose-search-path.patch
-libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch
deleted file mode 100644
index f4056dd9cc9..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+    QString path = qgetenv("TZDIR");
-+    path += "/zone.tab";
-+    if (!QFile::exists(path))
-+        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-     if (!QFile::exists(path))
-         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
- 
-@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt
-         if (!tzif.open(QIODevice::ReadOnly))
-             return;
-     } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+        // Try TZDIR first
-+        QString zoneinfoDir = qgetenv("TZDIR");
-+        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+        tzif.setFileName(zoneinfoDir);
-         if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly))
--                return;
-+            // Open named tz, try modern path first, if fails try legacy path
-+            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+            if (!tzif.open(QIODevice::ReadOnly)) {
-+                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+                if (!tzif.open(QIODevice::ReadOnly))
-+                    return;
-+            }
-         }
-     }
- 
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index 1f2f316c5b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
-@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti
-         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
-     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
- 
-+#if !defined(Q_OS_WIN)
-+    // Add directories specified in $XDG_CONFIG_DIRS
-+    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+    if (!pathEnv.isEmpty()) {
-+        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+        if (!pathEntries.isEmpty()) {
-+            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+                const QString& path = pathEntries.at(k);
-+                if (!application.isEmpty())
-+                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+            }
-+        }
-+    }
-+#endif
-+
-     for (i = 0; i < NumConfFiles; ++i) {
-         if (confFiles[i]) {
-             spec = i;
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
-@@ -246,7 +246,7 @@ public:
-         F_Organization = 0x1,
-         F_User = 0x0,
-         F_System = 0x2,
--        NumConfFiles = 4
-+        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
-     };
- 
-     QSettings::Format format;
diff --git a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix
deleted file mode 100644
index 95cd6fea79b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtconnectivity";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix
deleted file mode 100644
index 9b6a6c46176..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
-
-qtSubmodule {
-  name = "qtdeclarative";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python2 ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch
deleted file mode 100644
index 06b244b974f..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
-     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-     addImportPath(installImportsPath);
- 
-+    // Add library paths derived from NIX_PROFILES.
-+    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+    const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+    Q_FOREACH (const QByteArray &profile, profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
-+        }
-+    }
-+
-     // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix b/pkgs/development/libraries/qt-5/5.7/qtdoc.nix
deleted file mode 100644
index 578ea6ba0b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtdoc";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix
deleted file mode 100644
index 3273f12eb83..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtgraphicaleffects";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix
deleted file mode 100644
index 03d0fffbe80..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtimageformats";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix
deleted file mode 100644
index 1e134057c4b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtmultimedia }:
-
-qtSubmodule {
-  name = "qtlocation";
-  qtInputs = [ qtbase qtmultimedia ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
deleted file mode 100644
index a48dd38ae6d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-}:
-
-qtSubmodule {
-  name = "qtmultimedia";
-  qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = [
-    pkgconfig gstreamer gst-plugins-base libpulseaudio
-  ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
-  qmakeFlags = [ "GST_VERSION=1.0" ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix
deleted file mode 100644
index 93a864621b8..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtquickcontrols";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
deleted file mode 100644
index 19750f2fd99..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtquickcontrols2";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch
deleted file mode 100644
index 887e107b6c1..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:13:34 -0500
-Subject: [PATCH] glib-2.32
-
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include <pthread.h>
- #elif PLATFORM(GTK)
- #include <wtf/gtk/GOwnPtr.h>
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix
deleted file mode 100644
index 127766e2ebd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qttools }:
-
-qtSubmodule {
-  name = "qtscript";
-  qtInputs = [ qtbase qttools ];
-  patches = [ ./0001-glib-2.32.patch ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix
deleted file mode 100644
index 61e64dc47e4..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtsensors";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
-     if (!udevLibrary->isLoaded()) {
--        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         if (!udevLibrary->load()) {
--            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-             if (!udevLibrary->load()) {
-                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
-                 return false;
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix
deleted file mode 100644
index 2bffd0a2bd6..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
-
-qtSubmodule {
-  name = "qtserialport";
-  qtInputs = [ qtbase ];
-  patches = [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix
deleted file mode 100644
index b9ccac7cf93..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtsvg";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
deleted file mode 100644
index e3db17e978c..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
---- qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in	2016-11-03 09:31:16.000000000 +0100
-+++ qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in	2017-02-28 16:37:20.130457615 +0100
-@@ -2,11 +2,10 @@
- if (NOT TARGET Qt5::qcollectiongenerator)
-     add_executable(Qt5::qcollectiongenerator IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_Help_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-@@ -17,11 +16,10 @@
- if (NOT TARGET Qt5::qhelpgenerator)
-     add_executable(Qt5::qhelpgenerator IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_Help_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::qhelpgenerator PROPERTIES
-diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
---- qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in	2016-11-03 09:31:16.000000000 +0100
-+++ qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in	2017-02-28 16:35:40.470100681 +0100
-@@ -44,11 +44,10 @@
- if (NOT TARGET Qt5::lrelease)
-     add_executable(Qt5::lrelease IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +58,10 @@
- if (NOT TARGET Qt5::lupdate)
-     add_executable(Qt5::lupdate IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +72,10 @@
- if (NOT TARGET Qt5::lconvert)
-     add_executable(Qt5::lconvert IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
deleted file mode 100644
index d72d7b6c64c..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtbase }:
-
-qtSubmodule {
-  name = "qttools";
-  qtInputs = [ qtbase ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/series b/pkgs/development/libraries/qt-5/5.7/qttools/series
deleted file mode 100644
index 6cc1d3b87bc..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix
deleted file mode 100644
index 50fc8cf6826..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools }:
-
-qtSubmodule {
-  name = "qttranslations";
-  qtInputs = [ qttools ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix b/pkgs/development/libraries/qt-5/5.7/qtwayland.nix
deleted file mode 100644
index 6d887f7c650..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:
-
-qtSubmodule {
-  name = "qtwayland";
-  qtInputs = [ qtbase qtquickcontrols ];
-  buildInputs = [ wayland ];
-  nativeBuildInputs = [ pkgconfig ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix
deleted file mode 100644
index fd7a3c52026..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtwebchannel";
-  qtInputs = [ qtbase qtdeclarative ];
-}
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
deleted file mode 100644
index 3ce7db5a932..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
-
-, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
-, fontconfig, freetype, harfbuzz, icu, dbus
-, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
-, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
-, alsaLib
-, libcap
-, pciutils
-, systemd
-
-, bison, flex, git, which, gperf
-, coreutils
-, pkgconfig, python2
-, enableProprietaryCodecs ? true
-
-, lib, stdenv # lib.optional, needsPax
-}:
-
-qtSubmodule {
-  name = "qtwebengine";
-  qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
-  buildInputs = [ bison flex git which gperf ];
-  nativeBuildInputs = [ pkgconfig python2 coreutils ];
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-    substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-
-    # Fix library paths
-    sed -i \
-      -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-      -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-      -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
-      src/core/web_engine_library_info.cpp
-
-    sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
-      src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
-    sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-      src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-  '';
-
-  qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
-
-  propagatedBuildInputs = [
-    dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
-
-    # Image formats
-    libjpeg libpng libtiff libwebp
-
-    # Video formats
-    srtp libvpx
-
-    # Audio formats
-    alsaLib libopus
-
-    # Text rendering
-    fontconfig freetype harfbuzz icu
-
-    # X11 libs
-    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
-    xlibs.libXcomposite
-
-    libcap
-    pciutils
-  ];
-  patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
-  postInstall = ''
-    cat > $out/libexec/qt.conf <<EOF
-    [Paths]
-    Prefix = ..
-    EOF
-
-    paxmark m $out/libexec/QtWebEngineProcess
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
deleted file mode 100644
index b3316188f7d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-03-04 01:48:36.000000000 +1100
-+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-05-01 19:15:44.052770543 +1000
-@@ -33,6 +33,7 @@
-     'embed_script%': "",
-     'v8_extra_library_files%': [],
-     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'remove_v8base_debug_symbols%': 0,
-   },
-   'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
-@@ -1913,7 +1914,7 @@
-         ]
-     },
-     {
--      'target_name': 'mksnapshot',
-+      'target_name': 'mksnapshot_u',
-       'type': 'executable',
-       'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
-       'include_dirs+': [
-@@ -1936,5 +1937,26 @@
-         }],
-       ],
-     },
-+    {
-+      'target_name': 'mksnapshot',
-+      'type': 'executable',
-+      'dependencies': ['mksnapshot_u'],
-+      'actions': [
-+        {
-+          'action_name': 'paxmark_m_mksnapshot',
-+          'inputs': [
-+            '<(mksnapshot_u_exec)',
-+          ],
-+          'outputs': [
-+            '<(mksnapshot_exec)',
-+          ],
-+          'action': [
-+            'sh',
-+            '-c',
-+            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)',
-+          ],
-+        },
-+      ],
-+    },
-   ],
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc0..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp                        | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp                           | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
--    QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
--    QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
-     bool load()
-     {
-         m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         m_loaded = m_libUdev.load();
-         if (resolveMethods())
-             return true;
- 
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-         m_loaded = m_libUdev.load();
-         return resolveMethods();
-     }
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix
deleted file mode 100644
index 915a6bcae8a..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
-, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
-, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
-, substituteAll
-, flashplayerFix ? false
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
-  name = "qtwebkit";
-  qtInputs = [ qtdeclarative qtlocation qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
-  nativeBuildInputs = [
-    bison2 flex gdb gperf perl pkgconfig python2 ruby
-  ];
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
-  meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix
deleted file mode 100644
index fbdfbbcf0db..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtwebsockets";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix
deleted file mode 100644
index a765161e2d7..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtx11extras";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix
deleted file mode 100644
index 9a8ddbba2bd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtxmlpatterns";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix
deleted file mode 100644
index 3fc4fab4ea5..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/srcs.nix
+++ /dev/null
@@ -1,317 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz";
-      sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x";
-      name = "qt3d-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz";
-      sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c";
-      name = "qtactiveqt-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz";
-      sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg";
-      name = "qtandroidextras-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz";
-      sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd";
-      name = "qtbase-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz";
-      sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8";
-      name = "qtcanvas3d-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz";
-      sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5";
-      name = "qtcharts-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz";
-      sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k";
-      name = "qtconnectivity-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz";
-      sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv";
-      name = "qtdatavis3d-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz";
-      sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx";
-      name = "qtdeclarative-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtdeclarative-render2d = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz";
-      sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3";
-      name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz";
-      sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm";
-      name = "qtdoc-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz";
-      sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv";
-      name = "qtgamepad-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz";
-      sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c";
-      name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz";
-      sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg";
-      name = "qtimageformats-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz";
-      sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr";
-      name = "qtlocation-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz";
-      sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx";
-      name = "qtmacextras-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz";
-      sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5";
-      name = "qtmultimedia-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz";
-      sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n";
-      name = "qtpurchasing-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz";
-      sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg";
-      name = "qtquickcontrols-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz";
-      sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j";
-      name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz";
-      sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav";
-      name = "qtscript-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz";
-      sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx";
-      name = "qtscxml-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz";
-      sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc";
-      name = "qtsensors-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz";
-      sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj";
-      name = "qtserialbus-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz";
-      sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn";
-      name = "qtserialport-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz";
-      sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h";
-      name = "qtsvg-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz";
-      sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4";
-      name = "qttools-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz";
-      sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n";
-      name = "qttranslations-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz";
-      sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj";
-      name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz";
-      sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj";
-      name = "qtwayland-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz";
-      sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3";
-      name = "qtwebchannel-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz";
-      sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091";
-      name = "qtwebengine-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz";
-      sha256 = "00szgcra6pf2myfjrdbsr1gmrxycpbjqlzkplna5yr1rjg4gfv54";
-      name = "qtwebkit-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-examples-opensource-src-5.7.1.tar.xz";
-      sha256 = "09c2ni3nf7vdsw1y9yhpbal9zs8jgvi1wndnva6mgdbcnm8h23fm";
-      name = "qtwebkit-examples-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz";
-      sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw";
-      name = "qtwebsockets-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz";
-      sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k";
-      name = "qtwebview-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz";
-      sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514";
-      name = "qtwinextras-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz";
-      sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz";
-      name = "qtx11extras-opensource-src-5.7.1.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.7.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz";
-      sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8";
-      name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cabeb8579c9..1311d3898b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9460,20 +9460,6 @@ with pkgs;
 
   libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5);
 
-  qt57 = recurseIntoAttrs (import ../development/libraries/qt-5/5.7 {
-    inherit newScope;
-    inherit stdenv fetchurl makeSetupHook makeWrapper;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-    cups = if stdenv.isLinux then cups else null;
-    harfbuzz = harfbuzz-icu;
-    mesa = mesa_noglu;
-    inherit perl;
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-    inherit (gnome3) gtk3 dconf;
-  });
-
-  libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
-
   qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 {
     inherit newScope;
     inherit stdenv fetchurl makeSetupHook makeWrapper;

From b745cece54e76cf8957e4a182b3ca2ace3635fb9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:51:22 -0500
Subject: [PATCH 0173/1744] apitrace: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1311d3898b4..ce03724903b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -434,7 +434,7 @@ with pkgs;
     withGui = false;
   };
 
-  apitrace = libsForQt55.callPackage ../applications/graphics/apitrace {};
+  apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {};
 
   argus = callPackage ../tools/networking/argus {};
 

From db380160d6b8de165735eebe643ced280348b6f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:52:20 -0500
Subject: [PATCH 0174/1744] cool-retro-term: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce03724903b..2c3c85f49cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1352,7 +1352,7 @@ with pkgs;
 
   convoy = callPackage ../tools/filesystems/convoy { };
 
-  cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { };
+  cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { };
 
   coreutils = callPackage ../tools/misc/coreutils {
     aclSupport = stdenv.isLinux;

From 7a681599febe068037a5bce02fb2f62fac8338f5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 12:56:32 -0500
Subject: [PATCH 0175/1744] sigil: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c3c85f49cd..beccac84127 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3905,7 +3905,7 @@ with pkgs;
 
   siege = callPackage ../tools/networking/siege {};
 
-  sigil = libsForQt55.callPackage ../applications/editors/sigil { };
+  sigil = libsForQt56.callPackage ../applications/editors/sigil { };
 
   # aka., gpg-tools
   signing-party = callPackage ../tools/security/signing-party { };

From d839b85947fcbdbb95486852358411f85ce8c96e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:00:27 -0500
Subject: [PATCH 0176/1744] cutegram: broken with Qt 5.6

---
 .../networking/instant-messengers/telegram/cutegram/default.nix | 1 +
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index f0c99841c1b..d05ff845ebb 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ profpatsch AndersonTorres ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
 #TODO: appindicator, for system tray plugin (by @profpatsch)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beccac84127..dd1bb3e553c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,7 +13104,7 @@ with pkgs;
   cutecom = callPackage ../tools/misc/cutecom { };
 
   cutegram =
-    let callpkg = libsForQt55.callPackage;
+    let callpkg = libsForQt56.callPackage;
     in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec {
       libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
       telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml {

From 334466c2649fc96bc379a6d5364e30d882adcfaf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:07:56 -0500
Subject: [PATCH 0177/1744] goldendict: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd1bb3e553c..59f1fc6ad89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13583,7 +13583,7 @@ with pkgs;
 
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
 
-  goldendict = libsForQt55.callPackage ../applications/misc/goldendict { };
+  goldendict = libsForQt56.callPackage ../applications/misc/goldendict { };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 

From a7abe7e4514697fea98567340d334ebf574e2da9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:13:46 -0500
Subject: [PATCH 0178/1744] luminanceHDR: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59f1fc6ad89..129fc1b8610 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14415,7 +14415,7 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
-  luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 

From 152e808b44442e6a7c41787fec1e8d24b4e0fd13 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:15:37 -0500
Subject: [PATCH 0179/1744] mumble: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 129fc1b8610..e9d6231c9eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14660,7 +14660,7 @@ with pkgs;
       avahi = avahi.override {
         withLibdnssdCompat = true;
       };
-      qt5 = qt55; # Mumble doesn't work with newer Qt versions.
+      qt5 = qt56; # Mumble doesn't work with Qt > 5.5
       jackSupport = config.mumble.jackSupport or false;
       speechdSupport = config.mumble.speechdSupport or false;
       pulseSupport = config.pulseaudio or false;

From b33d0129ee562e4e042418833bd8c7038a60b1ac Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:27:52 -0500
Subject: [PATCH 0180/1744] musescore: broken with Qt 5.6

---
 pkgs/applications/audio/musescore/default.nix | 1 +
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index c719080c742..463bd64495d 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
+    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9d6231c9eb..fe28a4ab4ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14677,7 +14677,7 @@ with pkgs;
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }
     else
-      libsForQt55.callPackage ../applications/audio/musescore { };
+      libsForQt56.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {

From 8526c87e24219e20fbdc6f280ad5b7a4d2661190 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:30:16 -0500
Subject: [PATCH 0181/1744] smtube: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe28a4ab4ae..2004b75dda0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14731,7 +14731,7 @@ with pkgs;
 
   smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
 
-  smtube = libsForQt55.callPackage ../applications/video/smtube {};
+  smtube = libsForQt56.callPackage ../applications/video/smtube {};
 
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
 

From 84ed4737635c068e716a8fc286b081bfe5d1febc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:34:03 -0500
Subject: [PATCH 0182/1744] notepadqq: correct packaging errors and pin to Qt
 5.6

---
 pkgs/applications/editors/notepadqq/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 0de33d6d194..b553e09ed5e 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
 
 let
   version = "0.53.0";
@@ -12,11 +12,11 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    pkgconfig which
+    pkgconfig which qttools
   ];
 
   buildInputs = [
-    qtbase.qtsvg qtbase.qtwebkit qtbase.qttools
+    qtbase qtsvg qtwebkit
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2004b75dda0..3842d138182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14804,9 +14804,7 @@ with pkgs;
 
   nedit = callPackage ../applications/editors/nedit { };
 
-  notepadqq = callPackage ../applications/editors/notepadqq {
-    qtbase = qt55;
-  };
+  notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
 

From 299c842df25f8bc8e70124d97a63bb1df2fd0229 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:35:27 -0500
Subject: [PATCH 0183/1744] qgroundcontrol: broken on Qt 5.6

---
 pkgs/applications/science/robotics/qgroundcontrol/default.nix | 1 +
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 98567c340bc..e323b42d7ae 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ pxc ];
+    broken = true; # relies improperly on private Qt 5.5 headers
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3842d138182..e4a2f02b6b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15089,7 +15089,7 @@ with pkgs;
 
   qgis = callPackage ../applications/gis/qgis {};
 
-  qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { };
+  qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { };
 
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 

From 5044ceb7e768c1ae147debbb380c25a00c7046dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:37:00 -0500
Subject: [PATCH 0184/1744] rapcad: broken on Qt 5.6

---
 pkgs/applications/graphics/rapcad/default.nix | 1 +
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 118630e9608..16c9e9fdff2 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     description = ''Constructive solid geometry package'';
+    broken = true; # redefines template instance added in Qt 5.6
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4a2f02b6b2..290ae99a17b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15182,7 +15182,7 @@ with pkgs;
     demo = false;
   };
 
-  rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; };
+  rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 

From d9efe842222878e42af3cdbc3f571e8cf98de884 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:39:17 -0500
Subject: [PATCH 0185/1744] ricochet: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 290ae99a17b..17da4d57502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15224,7 +15224,7 @@ with pkgs;
 
   retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
 
-  ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { };
+  ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { };
 
   ripser = callPackage ../applications/science/math/ripser { };
 

From 68495d16cb1235e1165f8634d172a8cdd88450d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:40:23 -0500
Subject: [PATCH 0186/1744] teamspeak_client: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17da4d57502..ad192720cb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15589,7 +15589,7 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt56.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; };

From aaff5ee1979385dfaef1db709c0beb3642bbcfea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:48:21 -0500
Subject: [PATCH 0187/1744] trojita: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad192720cb9..781035109f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15717,8 +15717,7 @@ with pkgs;
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
-  # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
-  trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
+  trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };
 
   tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
 

From 3d5f88e7a344c619ca434bd8b96ec5c1df78b70d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:52:35 -0500
Subject: [PATCH 0188/1744] redis-desktop-manager: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 781035109f1..ac190349e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17972,7 +17972,7 @@ with pkgs;
     pcre = pcre-cpp;
   });
 
-  redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { };
+  redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
 
   robomongo = libsForQt5.callPackage ../applications/misc/robomongo { };
 

From a90fd50bdc485adc8d95ab3db1b67ef20a935fc0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:53:12 -0500
Subject: [PATCH 0189/1744] zoom-us: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac190349e5a..51a4fbe3822 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18382,7 +18382,7 @@ with pkgs;
 
   zuki-themes = callPackage ../misc/themes/zuki { };
 
-  zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
+  zoom-us = libsForQt56.callPackage ../applications/networking/instant-messengers/zoom-us {};
 
   tora = libsForQt5.callPackage ../development/tools/tora {};
 

From f87d3d6f80e673542723ec530f72d12710e5bef5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 15:00:03 -0500
Subject: [PATCH 0190/1744] supercollider: pin to Qt 5.6

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

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index f32cb9db02a..f8c98c727f4 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig
 , libjack2, libsndfile, fftw, curl, gcc
-, libXt, qt55, readline
+, libXt, qtbase, qttools, qtwebkit, readline
 , useSCEL ? false, emacs
 }:
 
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     -DSC_EL=${if useSCEL then "ON" else "OFF"}
   '';
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   buildInputs = [
-    gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ]
+    gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
       ++ optional useSCEL emacs;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51a4fbe3822..d9c3c7947dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6112,7 +6112,7 @@ with pkgs;
 
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
 
-  supercollider = callPackage ../development/interpreters/supercollider {
+  supercollider = libsForQt56.callPackage ../development/interpreters/supercollider {
     fftw = fftwSinglePrec;
   };
 

From f77e6d03e9342aab03a08917c1f3db7cbb136ade Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 15:12:06 -0500
Subject: [PATCH 0191/1744] openshot-qt: correct packaging errors and pin to Qt
 5.6

---
 pkgs/applications/video/openshot-qt/default.nix     | 9 +++------
 pkgs/applications/video/openshot-qt/libopenshot.nix | 6 +++---
 pkgs/top-level/all-packages.nix                     | 4 +++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index ca44742b046..a1d8cb0f01e 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,11 +1,8 @@
 {stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
-, ffmpeg, python3Packages, qt55}:
+, ffmpeg, python3Packages, libopenshot, qtbase, qtmultimedia }:
 
 with stdenv.lib;
 
-let
-  libopenshot = callPackage ./libopenshot.nix {};
-in
 stdenv.mkDerivation rec {
   name = "openshot-qt-${version}";
   version = "2.1.0";
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
   buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
 
   propagatedBuildInputs = [
-    qt55.qtbase
-    qt55.qtmultimedia
+    qtbase
+    qtmultimedia
     libopenshot
   ];
 
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b0891a3d69f..de4a0cf1dcd 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
+{ stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
+, imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
 , cppzmq, czmqpp
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cmake doxygen
-    imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
+    imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
     unittest-cpp cppzmq czmqpp
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9c3c7947dc..598dd204ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5335,7 +5335,7 @@ with pkgs;
   jre = jre8;
   jre_headless = jre8_headless;
 
-  openshot-qt = callPackage ../applications/video/openshot-qt { };
+  openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
 
@@ -9528,6 +9528,8 @@ with pkgs;
 
     libktorrent = callPackage ../development/libraries/libktorrent { };
 
+    libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {};
+
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
     };

From 3dc1a4ba8bc59b1dadd529e6c415838baf470523 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:53:38 -0500
Subject: [PATCH 0192/1744] Remove Qt 5.5

The community support window for Qt 5.5 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
---
 .../libraries/qt-5/5.5/default.nix            | 130 -------
 pkgs/development/libraries/qt-5/5.5/fetch.sh  |   3 -
 .../qt-5/5.5/qtbase/cmake-paths.patch         | 321 ------------------
 .../qt-5/5.5/qtbase/compose-search-path.patch |  16 -
 .../qt-5/5.5/qtbase/decrypt-ssl-traffic.patch |  13 -
 .../libraries/qt-5/5.5/qtbase/default.nix     | 293 ----------------
 .../qt-5/5.5/qtbase/dlopen-dbus.patch         |  13 -
 .../libraries/qt-5/5.5/qtbase/dlopen-gl.patch |  17 -
 .../qt-5/5.5/qtbase/dlopen-libXcursor.patch   |  17 -
 .../qt-5/5.5/qtbase/dlopen-openssl.patch      |  26 --
 .../qt-5/5.5/qtbase/dlopen-resolv.patch       |  26 --
 .../libraries/qt-5/5.5/qtbase/libressl.patch  |  36 --
 .../qt-5/5.5/qtbase/mkspecs-libgl.patch       |  15 -
 .../qtbase/nix-profiles-library-paths.patch   |  21 --
 .../libraries/qt-5/5.5/qtbase/series          |  10 -
 .../libraries/qt-5/5.5/qtbase/tzdir.patch     |  40 ---
 .../qt-5/5.5/qtbase/xdg-config-dirs.patch     |  42 ---
 .../libraries/qt-5/5.5/qtconnectivity.nix     |   6 -
 .../qt-5/5.5/qtdeclarative/default.nix        |   8 -
 .../nix-profiles-import-paths.patch           |  20 --
 .../libraries/qt-5/5.5/qtdeclarative/series   |   1 -
 pkgs/development/libraries/qt-5/5.5/qtdoc.nix |   6 -
 .../libraries/qt-5/5.5/qtenginio.nix          |   6 -
 .../libraries/qt-5/5.5/qtgraphicaleffects.nix |   6 -
 .../libraries/qt-5/5.5/qtimageformats.nix     |   6 -
 .../libraries/qt-5/5.5/qtlocation.nix         |   6 -
 .../libraries/qt-5/5.5/qtmultimedia.nix       |  12 -
 .../libraries/qt-5/5.5/qtquick1/default.nix   |   7 -
 .../qtquick1/nix-profiles-import-paths.patch  |  20 --
 .../libraries/qt-5/5.5/qtquick1/series        |   1 -
 .../libraries/qt-5/5.5/qtquickcontrols.nix    |   6 -
 .../qt-5/5.5/qtscript/0001-glib-2.32.patch    |  25 --
 .../libraries/qt-5/5.5/qtscript/default.nix   |   7 -
 .../libraries/qt-5/5.5/qtsensors.nix          |   6 -
 .../0001-dlopen-serialport-udev.patch         |  28 --
 .../qt-5/5.5/qtserialport/default.nix         |  12 -
 pkgs/development/libraries/qt-5/5.5/qtsvg.nix |   6 -
 .../qt-5/5.5/qttools/cmake-paths.patch        |  72 ----
 .../libraries/qt-5/5.5/qttools/default.nix    |  11 -
 .../libraries/qt-5/5.5/qttools/series         |   1 -
 .../libraries/qt-5/5.5/qttranslations.nix     |   6 -
 .../libraries/qt-5/5.5/qtwebkit-examples.nix  |   6 -
 .../0001-dlopen-webkit-nsplugin.patch         |  53 ---
 .../5.5/qtwebkit/0002-dlopen-webkit-gtk.patch |  25 --
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  31 --
 .../libraries/qt-5/5.5/qtwebkit/default.nix   |  34 --
 .../libraries/qt-5/5.5/qtwebsockets.nix       |   6 -
 .../libraries/qt-5/5.5/qtx11extras.nix        |   6 -
 .../libraries/qt-5/5.5/qtxmlpatterns.nix      |   6 -
 pkgs/development/libraries/qt-5/5.5/srcs.nix  | 261 --------------
 pkgs/top-level/all-packages.nix               |  14 -
 51 files changed, 1766 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/default.nix
 delete mode 100755 pkgs/development/libraries/qt-5/5.5/fetch.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtdeclarative/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtdoc.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtenginio.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtlocation.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtquick1/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtsensors.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtsvg.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qttools/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qttools/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qttranslations.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.5/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
deleted file mode 100644
index b7e8fb33387..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-
-# Minor Updates
-
-1. Edit ./fetchsrcs.sh to point to the updated URL.
-2. Run ./fetchsrcs.sh.
-3. Build and enjoy.
-
-# Major Updates
-
-1. Make a copy of this directory. (We like to keep the old version around
-   for a short time after major updates.)
-2. Delete the tmp/ subdirectory of the copy.
-3. Follow the minor update instructions above.
-4. Package any new Qt modules, if necessary.
-
-*/
-
-{
-  newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
-  bison, cups ? null, harfbuzz, mesa, perl,
-  libgnomeui, GConf, gnome_vfs,
-  gstreamer, gst-plugins-base,
-
-  # options
-  developerBuild ? false,
-  decryptSslTraffic ? false,
-}:
-
-with stdenv.lib;
-
-let
-
-  mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; };
-
-  qtSubmodule = args:
-    let
-      inherit (args) name;
-      inherit (srcs."${args.name}") version src;
-      inherit (stdenv) mkDerivation;
-    in mkDerivation (args // {
-      name = "${name}-${version}";
-      inherit src;
-
-      propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
-      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ];
-
-      NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-
-      outputs = args.outputs or [ "out" "dev" ];
-      setOutputFlags = args.setOutputFlags or false;
-
-      setupHook = ../qtsubmodule-setup-hook.sh;
-
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
-      meta = self.qtbase.meta // (args.meta or {});
-    });
-
-  addPackages = self: with self;
-    let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
-    in {
-
-      qtbase = callPackage ./qtbase {
-        inherit bison cups harfbuzz mesa;
-        # GNOME dependencies are not used unless gtkStyle == true
-        inherit libgnomeui GConf gnome_vfs;
-        inherit developerBuild decryptSslTraffic;
-      };
-
-      /* qt3d = not packaged */
-      /* qtactiveqt = not packaged */
-      /* qtandroidextras = not packaged */
-      /* qtcanvas3d = not packaged */
-      qtconnectivity = callPackage ./qtconnectivity.nix {};
-      qtdeclarative = callPackage ./qtdeclarative {};
-      qtdoc = callPackage ./qtdoc.nix {};
-      qtenginio = callPackage ./qtenginio.nix {};
-      qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
-      qtimageformats = callPackage ./qtimageformats.nix {};
-      qtlocation = callPackage ./qtlocation.nix {};
-      /* qtmacextras = not packaged */
-      qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit gstreamer gst-plugins-base;
-      };
-      qtquick1 = callPackage ./qtquick1 {};
-      qtquickcontrols = callPackage ./qtquickcontrols.nix {};
-      qtquickcontrols2 = null;
-      qtscript = callPackage ./qtscript {};
-      qtsensors = callPackage ./qtsensors.nix {};
-      qtserialport = callPackage ./qtserialport {};
-      qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools {};
-      qttranslations = callPackage ./qttranslations.nix {};
-      /* qtwayland = not packaged */
-      /* qtwebchannel = not packaged */
-      /* qtwebengine = not packaged */
-      qtwebkit = callPackage ./qtwebkit {};
-      qtwebkit-examples = callPackage ./qtwebkit-examples.nix {};
-      qtwebsockets = callPackage ./qtwebsockets.nix {};
-      /* qtwinextras = not packaged */
-      qtx11extras = callPackage ./qtx11extras.nix {};
-      qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
-
-      env = callPackage ../qt-env.nix {};
-      full = env "qt-${qtbase.version}" [
-        qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
-        qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
-        qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
-        qtxmlpatterns
-      ];
-
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper ]; }
-        ../make-qt-wrapper.sh;
-
-      qmakeHook =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        ../qmake-hook.sh;
-
-    };
-
-   self = makeScope newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.5/fetch.sh b/pkgs/development/libraries/qt-5/5.5/fetch.sh
deleted file mode 100755
index 512d985f346..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/fetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/ \
-            http://download.qt.io/community_releases/5.5/5.5.1/ \
-            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
deleted file mode 100644
index 63c4ab7256a..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
- 
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-     )
- 
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
--    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
--    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
--    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
--        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
--        )
--    endif()
--!!ENDIF
- endmacro()
- !!ENDIF
- 
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
--    )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
--    )
--!!ELSE
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-+        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-     )
- !!ELSE
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
-     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
- 
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
--        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
- !!ELSE
-         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
- 
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
-     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
-     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
-     add_executable(Qt5::uic IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
-     add_executable(Qt5::qmake IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
-     add_executable(Qt5::moc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
-     add_executable(Qt5::rcc IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- 
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
- 
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
-     add_executable(Qt5::qdbuscpp2xml IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
-     add_executable(Qt5::qdbusxml2cpp IMPORTED)
- 
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
deleted file mode 100644
index 08d12087f08..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio
-     // the QTCOMPOSE environment variable
-     if (qEnvironmentVariableIsSet("QTCOMPOSE"))
-         m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
--    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 2cb3f7dfa70..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -48,7 +48,7 @@
- ****************************************************************************/
- 
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
- 
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
deleted file mode 100644
index 141acfc3e57..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ /dev/null
@@ -1,293 +0,0 @@
-{ stdenv, lib, fetchpatch, copyPathsToStore
-, srcs
-
-, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
-, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
-, fontconfig, freetype, harfbuzz
-, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
-, zlib, libjpeg, libpng, libtiff, sqlite, icu
-
-, coreutils, bison, flex, gdb, gperf, lndir
-, patchelf, perl, pkgconfig, python2
-
-# optional dependencies
-, cups ? null
-, mysql ? null, postgresql ? null
-
-# options
-, mesaSupported, mesa
-, buildExamples ? false
-, buildTests ? false
-, developerBuild ? false
-, libgnomeui, GConf, gnome_vfs, gtk2
-, decryptSslTraffic ? false
-}:
-
-let
-  inherit (srcs.qt5) version;
-  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-
-  # Search path for Gtk plugin
-  gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ];
-
-  dontInvalidateBacking = fetchpatch {
-    url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
-    name = "qtbug-48321-dont-invalidate-backing-store.patch";
-    sha256 = "1wynm2hhbhpvzvsz4vpzzkl0ss5skac6934bva8brcpi5xq68h1q";
-  };
-in
-
-stdenv.mkDerivation {
-
-  name = "qtbase-${version}";
-  inherit version;
-
-  srcs = with srcs; [ qt5.src qtbase.src ];
-
-  sourceRoot = "qt-everywhere-opensource-src-${version}";
-
-  outputs = [ "out" "dev" "gtk" ];
-
-  postUnpack = ''
-    mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
-  '';
-
-  patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
-
-  postPatch =
-    ''
-      cd qtbase
-      patch -p1 <${dontInvalidateBacking}
-      cd ..
-
-      substituteInPlace configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
-      sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
-      substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-      substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-
-      substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor.out}"
-
-      substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl.out}"
-
-      substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus.lib}"
-
-      substituteInPlace \
-        qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11.out}"
-    ''
-    + lib.optionalString mesaSupported ''
-      substituteInPlace \
-        qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
-        --replace "@mesa_lib@" "${mesa.out}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf \
-        --replace "@mesa_lib@" "${mesa.out}" \
-        --replace "@mesa_inc@" "${mesa.dev}"
-    '';
-
-
-  setOutputFlags = false;
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-
-    configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
-  '';
-
-  prefixKey = "-prefix ";
-
-  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
-  # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
-
-    -release
-    -shared
-    -c++11
-    ${lib.optionalString developerBuild "-developer-build"}
-    -largefile
-    -accessibility
-    -rpath
-    -optimized-qmake
-    -strip
-    -no-reduce-relocations
-    -system-proxies
-    -pkg-config
-
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -nis
-    -iconv
-    -icu
-    -pch
-    -glib
-    -xcb
-    -qpa xcb
-    -${lib.optionalString (cups == null) "no-"}cups
-    -gtkstyle
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
-
-    ${lib.optionalString (!system-x86_64) "-no-sse2"}
-    -no-sse3
-    -no-ssse3
-    -no-sse4.1
-    -no-sse4.2
-    -no-avx
-    -no-avx2
-    -no-mips_dsp
-    -no-mips_dspr2
-
-    -system-zlib
-    -system-libpng
-    -system-libjpeg
-    -system-harfbuzz
-    -system-xcb
-    -system-xkbcommon
-    -system-pcre
-    -openssl-linked
-    -dbus-linked
-
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
-
-    -make libs
-    -make tools
-    -${lib.optionalString (buildExamples == false) "no"}make examples
-    -${lib.optionalString (buildTests == false) "no"}make tests
-  '';
-
-  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-  # if dependency paths contain the string "pq", which can occur in the hash.
-  # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
-  propagatedBuildInputs = [
-    dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
-
-    # Image formats
-    libjpeg libpng libtiff
-
-    # Text rendering
-    fontconfig freetype harfbuzz icu
-
-    # X11 libs
-    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
-  ]
-  ++ lib.optional mesaSupported mesa;
-
-  buildInputs =
-    [ bison flex gperf ]
-    ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql
-    # FIXME: move to the main list on rebuild.
-    ++ [gnome_vfs.out libgnomeui.out gtk2 GConf];
-
-  nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
-  postInstall = ''
-    find "$out" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
-    done
-  '';
-
-  preFixup = ''
-    # We cannot simply set these paths in configureFlags because libQtCore retains
-    # references to the paths it was built with.
-    moveToOutput "bin" "$dev"
-    moveToOutput "include" "$dev"
-    moveToOutput "mkspecs" "$dev"
-
-    # The destination directory must exist or moveToOutput will do nothing
-    mkdir -p "$dev/share"
-    moveToOutput "share/doc" "$dev"
-
-    # Move the QGtkStyle plugin to the gtk output
-    mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
-    mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
-    rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
-
-    # Set RPATH for QGtkStyle plugin
-    qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
-    qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
-    qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
-    patchelf "$qgtk2" \
-        --add-needed libgtk-x11-2.0.so \
-        --add-needed libgnomeui-2.so \
-        --add-needed libgnomevfs-2.so \
-        --add-needed libgconf-2.so \
-        --set-rpath "$qgtk2_RPATH"
-  '';
-
-  postFixup =
-    ''
-      # Don't retain build-time dependencies like gdb.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
-
-      # Move libtool archives and qmake projects
-      if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
-          pushd "''${!outputLib}"
-          find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
-              while read -r file; do
-                  mkdir -p "''${!outputDev}/$(dirname "$file")"
-                  mv "''${!outputLib}/$file" "''${!outputDev}/$file"
-              done
-          popd
-      fi
-    ''
-
-    # fixup .pc file (where to find 'moc' etc.)
-    + lib.optionalString (!stdenv.isDarwin) ''
-      sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-          -e "/^host_bins=/ c host_bins=$dev/bin"
-    '';
-
-  inherit lndir;
-  setupHook = ../../qtbase-setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = http://www.qt.io;
-    description = "A cross-platform application framework for C++";
-    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 401cfd5c295..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
-         QLatin1String("dbus-1"),
- #endif
--        QLatin1String("libdbus-1")
-+        QLatin1String("@dbus_libs@/lib/libdbus-1")
-     };
- 
-     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
deleted file mode 100644
index 59f510ac54d..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
-             {
-                 extern const QString qt_gl_library_name();
- //                QLibrary lib(qt_gl_library_name());
-+                // Check system library paths first
-                 QLibrary lib(QLatin1String("GL"));
-+                if (!lib.load()) {
-+                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
-+                }
-                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
-             }
-         }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
deleted file mode 100644
index e66ce1676d3..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #ifdef XCB_USE_XLIB
-     static bool function_ptrs_not_initialized = true;
-     if (function_ptrs_not_initialized) {
--        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
-         bool xcursorFound = xcursorLib.load();
-         if (!xcursorFound) { // try without the version number
--            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
-             xcursorFound = xcursorLib.load();
-         }
-         if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
deleted file mode 100644
index 1cc6fac583b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -640,8 +640,8 @@ static QPair<QLibrary*, QLibrary*> loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO
-     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
deleted file mode 100644
index 20e56bf3149..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-@@ -79,7 +79,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
-         if (!lib.load())
-             return;
-     }
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-@@ -95,7 +95,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
-         if (!lib.load())
-             return;
-     }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch
deleted file mode 100644
index e483ad14e05..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sat, 10 Oct 2015 01:15:01 +0200
-Subject: [PATCH] Fix compilation with libressl
-
-By additionally checking for defined(SSL_CTRL_SET_CURVES), which
-is defined in openssl, but not in libressl.
----
- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index b88ab54..cfc4f6d 100644
---- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -338,7 +338,7 @@ init_context:
- 
-     const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
-     if (!qcurves.isEmpty()) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
-         // Set the curves to be used
-         if (q_SSLeay() >= 0x10002000L) {
-             // SSL_CTX_ctrl wants a non-const pointer as last argument,
-@@ -352,7 +352,7 @@ init_context:
-                 return sslContext;
-             }
-         } else
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
-         {
-             // specific curves requested, but not possible to set -> error
-             sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
--- 
-2.6.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index 56ee0a411d4..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR            =
- QMAKE_LIBDIR            =
- QMAKE_INCDIR_X11        =
- QMAKE_LIBDIR_X11        =
--QMAKE_INCDIR_OPENGL     =
--QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index b4561db6e77..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp
-@@ -2498,6 +2498,16 @@ QStringList QCoreApplication::libraryPat
-                 }
-             }
-         }
-+        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
-+
-+        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        Q_FOREACH (const QByteArray &profile, profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+            }
-+        }
-     }
-     return *(coreappdata()->app_libpaths);
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series
deleted file mode 100644
index 1dfd8ac2683..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/series
+++ /dev/null
@@ -1,10 +0,0 @@
-dlopen-resolv.patch
-tzdir.patch
-dlopen-libXcursor.patch
-dlopen-openssl.patch
-dlopen-dbus.patch
-xdg-config-dirs.patch
-nix-profiles-library-paths.patch
-compose-search-path.patch
-libressl.patch
-cmake-paths.patch
\ No newline at end of file
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
deleted file mode 100644
index 92adeda8273..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+    QString path = qgetenv("TZDIR");
-+    path += "/zone.tab";
-+    if (!QFile::exists(path))
-+        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-     if (!QFile::exists(path))
-         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
- 
-@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt
-         if (!tzif.open(QIODevice::ReadOnly))
-             return;
-     } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+        // Try TZDIR first
-+        QString zoneinfoDir = qgetenv("TZDIR");
-+        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+        tzif.setFileName(zoneinfoDir);
-         if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly))
--                return;
-+            // Open named tz, try modern path first, if fails try legacy path
-+            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+            if (!tzif.open(QIODevice::ReadOnly)) {
-+                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+                if (!tzif.open(QIODevice::ReadOnly))
-+                    return;
-+            }
-         }
-     }
- 
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index 24dc3bde148..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp
-@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSetti
-     if (!application.isEmpty())
-         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
-     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
-+
-+#if !defined(Q_OS_WIN)
-+    // Add directories specified in $XDG_CONFIG_DIRS
-+    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+    if (!pathEnv.isEmpty()) {
-+        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+        if (!pathEntries.isEmpty()) {
-+            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+                const QString& path = pathEntries.at(k);
-+                if (!application.isEmpty())
-+                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+            }
-+        }
-+    }
-+#endif
-+
- #else
-     QString confName = getPath(format, QSettings::UserScope) + org;
-     if (!application.isEmpty())
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings_p.h
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h
-@@ -240,7 +240,7 @@ public:
-         F_Organization = 0x1,
-         F_User = 0x0,
-         F_System = 0x2,
--        NumConfFiles = 4
-+        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
- #else
-         SandboxConfFile = 0,
-         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
deleted file mode 100644
index 95cd6fea79b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtconnectivity";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
deleted file mode 100644
index 9b6a6c46176..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
-
-qtSubmodule {
-  name = "qtdeclarative";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python2 ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch
deleted file mode 100644
index 06b244b974f..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
-     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-     addImportPath(installImportsPath);
- 
-+    // Add library paths derived from NIX_PROFILES.
-+    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+    const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+    Q_FOREACH (const QByteArray &profile, profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
-+        }
-+    }
-+
-     // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
deleted file mode 100644
index 578ea6ba0b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtdoc";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
deleted file mode 100644
index b860a73ef89..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtenginio";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
deleted file mode 100644
index 3273f12eb83..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtgraphicaleffects";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
deleted file mode 100644
index 03d0fffbe80..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtimageformats";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
deleted file mode 100644
index 1e134057c4b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtmultimedia }:
-
-qtSubmodule {
-  name = "qtlocation";
-  qtInputs = [ qtbase qtmultimedia ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
deleted file mode 100644
index 7c1cc5da07e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-}:
-
-qtSubmodule {
-  name = "qtmultimedia";
-  qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = [
-    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
-  ];
-  qmakeFlags = [ "GST_VERSION=1.0" ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
deleted file mode 100644
index 64937b3dcd3..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtscript, qtsvg, qtwebkit, qtxmlpatterns }:
-
-qtSubmodule {
-  name = "qtquick1";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch
deleted file mode 100644
index c01061d3378..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp
-===================================================================
---- qtquick1-opensource-src-5.5.1.orig/src/declarative/qml/qdeclarativeimport.cpp
-+++ qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp
-@@ -725,6 +725,15 @@ QDeclarativeImportDatabase::QDeclarative
- 
-     addImportPath(installImportsPath);
- 
-+    // Add library paths derived from NIX_PROFILES.
-+    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+    const QString importdir = QString::fromLatin1("/lib/qt5/imports");
-+    Q_FOREACH (const QByteArray &profile, profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + importdir);
-+        }
-+    }
-+
-     // env import paths
-     QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/series b/pkgs/development/libraries/qt-5/5.5/qtquick1/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
deleted file mode 100644
index 93a864621b8..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtquickcontrols";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
deleted file mode 100644
index 887e107b6c1..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:13:34 -0500
-Subject: [PATCH] glib-2.32
-
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include <pthread.h>
- #elif PLATFORM(GTK)
- #include <wtf/gtk/GOwnPtr.h>
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
deleted file mode 100644
index 127766e2ebd..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qttools }:
-
-qtSubmodule {
-  name = "qtscript";
-  qtInputs = [ qtbase qttools ];
-  patches = [ ./0001-glib-2.32.patch ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
deleted file mode 100644
index 61e64dc47e4..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtsensors";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
-     if (!udevLibrary->isLoaded()) {
--        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         if (!udevLibrary->load()) {
--            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-             if (!udevLibrary->load()) {
-                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
-                 return false;
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
deleted file mode 100644
index 2bffd0a2bd6..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
-
-qtSubmodule {
-  name = "qtserialport";
-  qtInputs = [ qtbase ];
-  patches = [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
deleted file mode 100644
index b9ccac7cf93..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtsvg";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
deleted file mode 100644
index fe5bcadbe9a..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-===================================================================
---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-@@ -2,11 +2,10 @@
- if (NOT TARGET Qt5::qcollectiongenerator)
-     add_executable(Qt5::qcollectiongenerator IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_Help_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
-===================================================================
---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
-+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
-@@ -44,11 +44,10 @@ endmacro()
- if (NOT TARGET Qt5::lrelease)
-     add_executable(Qt5::lrelease IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +58,10 @@ endif()
- if (NOT TARGET Qt5::lupdate)
-     add_executable(Qt5::lupdate IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +72,10 @@ endif()
- if (NOT TARGET Qt5::lconvert)
-     add_executable(Qt5::lconvert IMPORTED)
- 
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ELSE
--    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+    endif()
-     _qt5_LinguistTools_check_file_exists(${imported_location})
- 
-     set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
deleted file mode 100644
index d72d7b6c64c..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtbase }:
-
-qtSubmodule {
-  name = "qttools";
-  qtInputs = [ qtbase ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/series b/pkgs/development/libraries/qt-5/5.5/qttools/series
deleted file mode 100644
index 6cc1d3b87bc..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
deleted file mode 100644
index 50fc8cf6826..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools }:
-
-qtSubmodule {
-  name = "qttranslations";
-  qtInputs = [ qttools ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
deleted file mode 100644
index 64f85c42d19..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools, qtwebkit }:
-
-qtSubmodule {
-  name = "qtwebkit-examples";
-  qtInputs = [ qttools qtwebkit ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc0..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp                        | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp                           | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
--    QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
--    QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
-     bool load()
-     {
-         m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         m_loaded = m_libUdev.load();
-         if (resolveMethods())
-             return true;
- 
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-         m_loaded = m_libUdev.load();
-         return resolveMethods();
-     }
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
deleted file mode 100644
index 35568c1eb2f..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
-, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
-, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
-, substituteAll
-, flashplayerFix ? false
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
-  name = "qtwebkit";
-  qtInputs = [ qtdeclarative qtlocation qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
-  nativeBuildInputs = [
-    bison2 flex gdb gperf perl pkgconfig python2 ruby
-  ];
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
deleted file mode 100644
index fbdfbbcf0db..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtwebsockets";
-  qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
deleted file mode 100644
index a765161e2d7..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtx11extras";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
deleted file mode 100644
index 9a8ddbba2bd..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtxmlpatterns";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix
deleted file mode 100644
index 20aa28a55da..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/srcs.nix
+++ /dev/null
@@ -1,261 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz";
-      sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073";
-      name = "qt3d-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qt5 = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz";
-      sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26";
-      name = "qt5-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz";
-      sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m";
-      name = "qtactiveqt-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz";
-      sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4";
-      name = "qtandroidextras-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz";
-      sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z";
-      name = "qtbase-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz";
-      sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm";
-      name = "qtcanvas3d-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz";
-      sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn";
-      name = "qtconnectivity-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz";
-      sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz";
-      name = "qtdeclarative-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz";
-      sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz";
-      name = "qtdoc-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtenginio = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz";
-      sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7";
-      name = "qtenginio-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz";
-      sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv";
-      name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz";
-      sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9";
-      name = "qtimageformats-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz";
-      sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z";
-      name = "qtlocation-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz";
-      sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2";
-      name = "qtmacextras-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz";
-      sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw";
-      name = "qtmultimedia-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtquick1 = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz";
-      sha256 = "0b0znnwy2fv5rn368nw7ph2fypz16fchb09id63hm7wbkbjsf4n8";
-      name = "qtquick1-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz";
-      sha256 = "1w7w87c8i6v3p78psmjb30fh9sx7745m5jyjkdi6q1jnss4q6yhv";
-      name = "qtquickcontrols-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz";
-      sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind";
-      name = "qtscript-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz";
-      sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx";
-      name = "qtsensors-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz";
-      sha256 = "0ylgjscmql3lspzv0cr5n4g1v354frz0yfalvswvkc9x0bxxnd50";
-      name = "qtserialport-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz";
-      sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp";
-      name = "qtsvg-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz";
-      sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3";
-      name = "qttools-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz";
-      sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21";
-      name = "qttranslations-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz";
-      sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063";
-      name = "qtwayland-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz";
-      sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz";
-      name = "qtwebchannel-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebengine-opensource-src-5.5.1.tar.xz";
-      sha256 = "141bgr3x7n2vjbsydgll44aq0pcf99gn2l1l1jpim685sf6k4kbw";
-      name = "qtwebengine-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz";
-      sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289";
-      name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz";
-      sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p";
-      name = "qtwebkit-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz";
-      sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng";
-      name = "qtwebsockets-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz";
-      sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b";
-      name = "qtwinextras-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz";
-      sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3";
-      name = "qtx11extras-opensource-src-5.5.1.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.5.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz";
-      sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm";
-      name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 598dd204ba1..4929814647f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9433,20 +9433,6 @@ with pkgs;
     developerBuild = true;
   });
 
-  qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 {
-    inherit newScope;
-    inherit stdenv fetchurl makeSetupHook makeWrapper;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-    cups = if stdenv.isLinux then cups else null;
-    harfbuzz = harfbuzz-icu;
-    mesa = mesa_noglu;
-    inherit perl;
-    inherit (gnome2) libgnomeui GConf gnome_vfs;
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-  });
-
-  libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5);
-
   qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 {
     inherit newScope;
     inherit stdenv fetchurl makeSetupHook makeWrapper;

From 417844b596007a3e7e4ffcdbc9d46090af81de9c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 25 Mar 2017 15:34:05 +0300
Subject: [PATCH 0193/1744] phpfpm service: don't use private /tmp

This breaks local PostgreSQL connections.
---
 nixos/modules/services/web-servers/phpfpm/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index efb721c5773..26f54602203 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -147,7 +147,6 @@ in {
           cfgFile = fpmCfgFile pool poolConfig;
         in {
           Slice = "phpfpm.slice";
-          PrivateTmp = true;
           PrivateDevices = true;
           ProtectSystem = "full";
           ProtectHome = true;

From 1cca97cf1864605e5163b298c43b5d2f6b3ff4c1 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 23 Mar 2017 15:26:37 -0500
Subject: [PATCH 0194/1744] libvirt: 3.0.0 -> 3.1.0

---
 .../development/libraries/libvirt/default.nix | 19 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 5fcdd153c99..2c5d6350315 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -6,6 +6,9 @@
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, xen, zfs
 }:
+
+with stdenv.lib;
+
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
@@ -23,14 +26,14 @@ stdenv.mkDerivation rec {
     libxml2 gnutls perl python2 readline
     gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
     libnl numad numactl xen zfs
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ optionals stdenv.isDarwin [
      libiconv gmp
   ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+  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"'
@@ -48,13 +51,13 @@ stdenv.mkDerivation rec {
     "--with-test"
     "--with-esx"
     "--with-remote"
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ optionals stdenv.isLinux [
     "--with-numad"
     "--with-macvtap"
     "--with-virtualport"
     "--with-init-script=redhat"
     "--with-storage-zfs"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ optionals stdenv.isDarwin [
     "--with-init-script=none"
   ];
 
@@ -67,16 +70,16 @@ stdenv.mkDerivation rec {
     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"
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + optionalString stdenv.isLinux ''
     wrapProgram $out/sbin/libvirtd \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]}
+      --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
   '';
 
   enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://libvirt.org/;
     repositories.git = git://libvirt.org/libvirt.git;
     description = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3bc3732d9f0..9f6d1b9ddb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29067,13 +29067,13 @@ EOF
   };
 
   libvirt = let
-    version = "3.0.0";
+    version = "3.1.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl";
+      sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 160fd7231ed57d9b5c1216d2b511478b80b08130 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Mar 2017 14:57:45 +0100
Subject: [PATCH 0195/1744] virt-manager: needs file for building translations

---
 pkgs/applications/virtualization/virt-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 787729d3afc..3efcf6e582c 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, intltool, curl
+{ stdenv, fetchurl, python2Packages, intltool, curl, file
 , wrapGAppsHook, virtinst, gtkvnc, vte
 , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
 , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
@@ -27,7 +27,7 @@ buildPythonApplication rec {
       wrapGAppsHook
     ] ++ optional spiceSupport spice_gtk;
 
-  buildInputs = [ dconf avahi intltool ];
+  buildInputs = [ dconf avahi intltool file ];
 
   patchPhase = ''
     sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
@@ -54,6 +54,6 @@ buildPythonApplication rec {
       manages Xen and LXC (linux containers).
     '';
     license = licenses.gpl2;
-    maintainers = with maintainers; [qknight offline];
+    maintainers = with maintainers; [ qknight offline fpletz ];
   };
 }

From ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Mar 2017 14:58:26 +0100
Subject: [PATCH 0196/1744] libvirt: build with attr and apparmor

---
 pkgs/development/libraries/libvirt-glib/default.nix |  6 ++++--
 pkgs/development/libraries/libvirt/default.nix      | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 0018e38a9f9..8cebaeee2af 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
+, xen, libapparmor
 }:
 
 let
@@ -15,9 +15,11 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
-    python pygobject2 gobjectIntrospection libcap_ng numactl xen
+    python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Library for working with virtual machines";
     longDescription = ''
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2c5d6350315..08a70b5514d 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchpatch
 , pkgconfig, makeWrapper
-, libxml2, gnutls, devicemapper, perl, python2
+, libxml2, gnutls, devicemapper, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
-, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng
+, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, xen, zfs
 }:
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline
-    gettext libtasn1 libgcrypt yajl
+    gettext libtasn1 libgcrypt yajl attr
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
-    libnl numad numactl xen zfs
+    libnl numad numactl xen zfs libapparmor
   ] ++ optionals stdenv.isDarwin [
      libiconv gmp
   ];
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
     "--with-esx"
     "--with-remote"
   ] ++ optionals stdenv.isLinux [
+    "--with-attr"
+    "--with-apparmor"
+    "--with-secdriver-apparmor"
     "--with-numad"
     "--with-macvtap"
     "--with-virtualport"

From bb99babc5a1c62edd012da5a1ad14cd3fe1abf0a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Mar 2017 08:58:58 -0500
Subject: [PATCH 0197/1744] Remove zoom-us

This package needs maintenance, but has no maintainer: proprietary Qt-based
packages should use the vendor-provided Qt libraries.
---
 .../instant-messengers/zoom-us/default.nix    | 104 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 106 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
deleted file mode 100644
index 067b1c7884a..00000000000
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ alsaLib
-, fetchurl
-, gcc
-, glib
-, gst-plugins-base
-, gstreamer
-, icu
-, libpulseaudio
-, libuuid
-, libxml2
-, libxslt
-, makeQtWrapper
-, qt56
-, sqlite
-, stdenv
-, xlibs
-, xorg
-, zlib
-}:
-
-stdenv.mkDerivation rec {
-    name = "zoom-us";
-    meta = {
-      homepage = http://zoom.us;
-      description = "zoom.us instant messenger";
-      license = stdenv.lib.licenses.unfree;
-      platforms = stdenv.lib.platforms.linux;
-    };
-
-    version = "2.0.81497.0116";
-    src = fetchurl {
-      url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j";
-    };
-
-    phases = [ "unpackPhase" "installPhase" ];
-    nativeBuildInputs = [ makeQtWrapper ];
-    buildInputs = [
-      alsaLib
-      gcc.cc
-      glib
-      gst-plugins-base
-      gstreamer
-      icu
-      libpulseaudio
-      libuuid
-      libxml2
-      libxslt
-      qt56.qtbase
-      qt56.qtdeclarative
-      qt56.qtlocation
-      qt56.qtscript
-      qt56.qtwebchannel
-      qt56.qtwebengine
-      sqlite
-      xlibs.xcbutilkeysyms
-      xorg.libX11
-      xorg.libxcb
-      xorg.libXcomposite
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXrender
-      xorg.xcbutilimage
-      zlib
-    ];
-
-    libPath = stdenv.lib.makeLibraryPath buildInputs;
-
-    installPhase = ''
-      mkdir -p $out/share
-      cp -r \
-         application-x-zoom.png \
-         audio \
-         imageformats \
-         config-dump.sh \
-         dingdong1.pcm \
-         dingdong.pcm \
-         doc \
-         Droplet.pcm \
-         Droplet.wav \
-         platforminputcontexts \
-         platforms \
-         platformthemes \
-         leave.pcm \
-         ring.pcm \
-         ring.wav \
-         version.txt \
-         xcbglintegrations \
-         zcacert.pem \
-         zoom \
-         Zoom.png \
-         ZXMPPROOT.cer \
-         $out/share
-
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath ${libPath} \
-        $out/share/zoom
-      paxmark m $out/share/zoom
-      wrapQtProgram "$out/share/zoom"
-      mkdir -p $out/bin
-      ln -s $out/share/zoom $out/bin/zoom-us
-    '';
- }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4929814647f..7760e29a520 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18370,8 +18370,6 @@ with pkgs;
 
   zuki-themes = callPackage ../misc/themes/zuki { };
 
-  zoom-us = libsForQt56.callPackage ../applications/networking/instant-messengers/zoom-us {};
-
   tora = libsForQt5.callPackage ../development/tools/tora {};
 
   xulrunner = firefox-unwrapped;

From d545772640d13e0d2d984ad582888deda7cefa86 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Mar 2017 14:59:01 +0100
Subject: [PATCH 0198/1744] libvirt: make guest suspend work, use upstream
 units

---
 nixos/modules/virtualisation/libvirtd.nix     | 30 ++++++++++++-------
 .../development/libraries/libvirt/default.nix |  6 ++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 101ea9a4f51..c0cebaddec8 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -90,14 +90,16 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages =
-      [ pkgs.libvirt pkgs.netcat-openbsd ]
-       ++ optional cfg.enableKVM pkgs.qemu_kvm;
+    environment.systemPackages = with pkgs;
+      [ libvirt netcat-openbsd ]
+       ++ optional cfg.enableKVM qemu_kvm;
 
     boot.kernelModules = [ "tun" ];
 
     users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd;
 
+    systemd.packages = [ pkgs.libvirt ];
+
     systemd.services.libvirtd = {
       description = "Libvirt Virtual Machine Management Daemon";
 
@@ -105,13 +107,17 @@ in {
       after = [ "systemd-udev-settle.service" ]
               ++ optional vswitch.enable "vswitchd.service";
 
-      path = [
-          pkgs.bridge-utils
-          pkgs.dmidecode
-          pkgs.dnsmasq
-          pkgs.ebtables
+      environment = {
+        LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
+      };
+
+      path = with pkgs; [
+          bridge-utils
+          dmidecode
+          dnsmasq
+          ebtables
         ]
-        ++ optional cfg.enableKVM pkgs.qemu_kvm
+        ++ optional cfg.enableKVM qemu_kvm
         ++ optional vswitch.enable vswitch.package;
 
       preStart = ''
@@ -153,13 +159,17 @@ in {
       ''; # */
 
       serviceConfig = {
-        ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
         Type = "notify";
         KillMode = "process"; # when stopping, leave the VMs alone
         Restart = "on-failure";
       };
     };
 
+    systemd.services.libvirt-guests = {
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ coreutils libvirt gawk ];
+    };
+
     systemd.sockets.virtlogd = {
       description = "Virtual machine log manager socket";
       wantedBy = [ "sockets.target" ];
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 08a70b5514d..aa044c885ea 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     "--with-numad"
     "--with-macvtap"
     "--with-virtualport"
-    "--with-init-script=redhat"
+    "--with-init-script=systemd+redhat"
     "--with-storage-zfs"
   ] ++ optionals stdenv.isDarwin [
     "--with-init-script=none"
@@ -72,7 +72,9 @@ 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 "$out/bin" "${gettext}/bin" \
+      --replace "lock/subsys" "lock"
+    rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
   '' + optionalString stdenv.isLinux ''
     wrapProgram $out/sbin/libvirtd \
       --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}

From e6dc95697a3cf633e6d700e19470b19e61150715 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Mar 2017 09:23:52 -0500
Subject: [PATCH 0199/1744] rapcad: pin to Qt 5.6

---
 pkgs/applications/graphics/rapcad/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 16c9e9fdff2..b7672a39d0d 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
+{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
 , qtbase, qmakeHook, mesa_glu
 }:
 
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir";
   };
 
+  patches = [
+    (fetchurl {
+      url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch";
+      sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj";
+      name = "disable-QVector-qHash.patch";
+    })
+  ];
+
   nativeBuildInputs = [ qmakeHook ];
   buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
 
@@ -21,6 +29,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     description = ''Constructive solid geometry package'';
-    broken = true; # redefines template instance added in Qt 5.6
   };
 }

From 10725a63290efe6738fff68d953339f2dc043377 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 25 Mar 2017 10:25:54 -0400
Subject: [PATCH 0200/1744] git: 2.12.0 -> 2.12.2

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index d6cc205bbae..e1e01c1ed28 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.12.0";
+  version = "2.12.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q";
+    sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
   };
 
   hardeningDisable = [ "format" ];

From 97ca8d1105d678da9bc5ae482ce88cc44ac56bde Mon Sep 17 00:00:00 2001
From: rbasso <rbasso@sharpgeeks.net>
Date: Sat, 25 Mar 2017 23:38:55 +0900
Subject: [PATCH 0201/1744] exercism: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 962d8f8b31f..d0b98863d20 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name    = "exercism-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   goPackagePath = "github.com/exercism/cli";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "exercism";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5";
+    sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa";
   };
 
   meta = with stdenv.lib; {

From ecd0e1a2c736a9a609cd820de0cb2861129482c3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 25 Mar 2017 15:59:13 +0100
Subject: [PATCH 0202/1744] torbrowser: reduce risk of stale Nix store
 references

This patch restructures the expression and wrapper to minimize Nix store
references captured by the user's state directory.

The previous version would write lots of references to the Nix store into
the user's state directory, resulting in synchronization issues between
the Store and the local state directory.  At best, this would cause TBB to
stop working when the version used to instantiate the local state was
garbage collected; at worst, a user would continue to use the old version
even after an upgrade.

To solve the issue, hard-code as much as possible at the Store side and
minimize the amount of stuff being copied into the local state dir.
Currently, only a few files generated at firefox startup and fontconfig
cache files end up capturing store paths; these files are simply removed
upon every startup.  Otherwise, no capture should occur and the user
should always be using the TBB associated with the tor-browser wrapper
script.

To check for stale Store paths, do
   `grep -Ero '/nix/store/[^/]+' ~/.local/share/tor-browser`
This command should *never* return any other store path than the one
associated with the current tor-browser wrapper script, even after an
update (assuming you've run tor-browser at least once after updating).
Deviations from this general rule are considered bugs from now on.

Note that no attempt has been made to support pluggable transports; they
are still broken with this patch (to be fixed in a follow-up patch).

User visible changes:
- Wrapper retains only environment variables required for TBB to work
- pulseaudioSupport can be toggled independently of mediaSupport (the
  latter weakly implies the former).
- Store local state under $TBB_HOME.  Defaults to $XDG_DATA_HOME/tor-browser
- Stop obnoxious first-run stuff (NoScript redirect, in particular)
- Set desktop item GenericName to Web Browser

Some minor enhancements:
- Disable Hydra builds
- Specify system -> source mapping to make it easier to
  extend supported platforms.
---
 .../browsers/torbrowser/default.nix           | 301 ++++++++++++++++++
 pkgs/tools/security/tor/torbrowser.nix        | 103 ------
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 302 insertions(+), 104 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/torbrowser/default.nix
 delete mode 100644 pkgs/tools/security/tor/torbrowser.nix

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
new file mode 100644
index 00000000000..da051c227d2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -0,0 +1,301 @@
+{ stdenv
+, fetchurl
+, makeDesktopItem
+
+# Common run-time dependencies
+, zlib
+
+# libxul run-time dependencies
+, alsaLib
+, atk
+, cairo
+, dbus
+, dbus_glib
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gtk2
+, libX11
+, libXext
+, libXrender
+, libXt
+, pango
+
+# Pulseaudio support
+, pulseaudioSupport ? mediaSupport
+, libpulseaudio
+
+# Media support (implies pulseaudio support)
+, mediaSupport ? false
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-ffmpeg
+, gmp
+, ffmpeg
+}:
+
+with stdenv.lib;
+
+let
+  libPath = makeLibraryPath ([
+    alsaLib
+    atk
+    cairo
+    dbus
+    dbus_glib
+    fontconfig
+    freetype
+    gdk_pixbuf
+    glib
+    gtk2
+    libX11
+    libXext
+    libXrender
+    libXt
+    pango
+    stdenv.cc.cc
+    zlib
+  ]
+  ++ optionals pulseaudioSupport [ libpulseaudio ]
+  ++ optionals mediaSupport [
+    gstreamer
+    gst-plugins-base
+    gmp
+    ffmpeg
+  ]);
+
+  gstPluginsPath = concatMapStringsSep ":" (x:
+    "${x}/lib/gstreamer-0.10") [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-ffmpeg
+    ];
+
+  # Upstream source
+  version = "6.5.1";
+
+  lang = "en-US";
+
+  srcs = {
+    "x86_64-linux" = fetchurl {
+      url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+      sha256 = "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i";
+    };
+
+    "i686-linux" = fetchurl {
+      url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
+      sha256 = "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
+    };
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "tor-browser-${version}";
+  inherit version;
+
+  src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+
+  preferLocalBuild = true;
+
+  desktopItem = makeDesktopItem {
+    name = "torbrowser";
+    exec = "tor-browser";
+    icon = "torbrowser";
+    desktopName = "Tor Browser";
+    genericName = "Web Browser";
+    comment = meta.description;
+    categories = "Network;WebBrowser;Security;";
+  };
+
+  buildCommand = ''
+    # For convenience ...
+    TBB_IN_STORE=$out/share/tor-browser
+    interp=$(< $NIX_CC/nix-support/dynamic-linker)
+
+    # Unpack & enter
+    mkdir -p "$TBB_IN_STORE"
+    tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2
+    pushd "$TBB_IN_STORE"
+
+    # Set ELF interpreter
+    for exe in firefox TorBrowser/Tor/tor ; do
+      patchelf --set-interpreter "$interp" "$exe"
+    done
+
+    # The final libPath.  Note, we could split this into firefoxLibPath
+    # and torLibPath for accuracy, but this is more convenient ...
+    libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+
+    # Prepare for autoconfig.
+    #
+    # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+    cat >defaults/pref/autoconfig.js <<EOF
+    //
+    pref("general.config.filename", "mozilla.cfg");
+    pref("general.config.obscure_value", 0);
+    EOF
+
+    # Hard-coded Firefox preferences.
+    cat >mozilla.cfg <<EOF
+    // First line must be a comment
+
+    // Always update via Nix
+    lockPref("app.update.auto", false);
+    lockPref("app.update.enabled", false);
+    lockPref("extensions.update.autoUpdateDefault", false);
+    lockPref("extensions.update.enabled", false);
+
+    // User should never change these.  Locking prevents these
+    // values from being written to prefs.js, avoiding Store
+    // path capture.
+    lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
+    lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
+
+    // Reset pref that captures store paths.
+    clearPref("extensions.xpiState");
+
+    // Stop obnoxious first-run redirection.
+    lockPref("noscript.firstRunRedirection", false);
+    EOF
+
+    # Hard-code path to TBB fonts; see also FONTCONFIG_FILE in
+    # the wrapper below.
+    FONTCONFIG_FILE=$TBB_IN_STORE/TorBrowser/Data/fontconfig/fonts.conf
+    sed -i "$FONTCONFIG_FILE" \
+        -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>,"
+
+    # Move default extension overrides into distribution dir, to avoid
+    # having to synchronize between local state and store.
+    mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
+
+    # Hard-code paths to geoip data files, to prevent them from being
+    # copied into the local state directory.
+    cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
+    GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
+    GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
+    EOF
+
+    # Generate wrapper
+    mkdir -p $out/bin
+    cat > "$out/bin/tor-browser" << EOF
+    #! ${stdenv.shell}
+    set -o errexit -o nounset
+
+    # Enter local state directory.
+    REAL_HOME=\$HOME
+    TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
+    HOME=\$TBB_HOME
+
+    mkdir -p "\$HOME"
+    cd "\$HOME"
+
+    # Initialize empty TBB local state directory hierarchy.  We
+    # intentionally mirror the layout that TBB would see if executed from
+    # the unpacked bundle dir.
+    mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data"
+
+    # Initialize the Tor data directory.
+    mkdir -p "\$HOME/TorBrowser/Data/Tor"
+
+    # Initialize the browser profile state.  Note that the only data
+    # copied from the Store payload is the initial bookmark file, which is
+    # never updated once created.  All other files under user's profile
+    # dir are generated by TBB.
+    mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
+    cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \
+      "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html"
+
+    # Clear out some files that tend to capture store references but are
+    # easily generated by firefox at startup.
+    rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
+
+    # Ensure that we're always using the up-to-date extensions.
+    ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \
+      "\$HOME/TorBrowser/Data/Browser/profile.default/extensions"
+
+    ${optionalString pulseaudioSupport ''
+      # Figure out some envvars for pulseaudio
+      : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"
+      : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}"
+      : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}"
+      : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}"
+    ''}
+
+    # Font cache files capture store paths; clear them out on the off
+    # chance that TBB would continue using old font files.
+    rm -rf "\$HOME/.cache/fontconfig"
+
+    # Lift-off
+    #
+    # XAUTHORITY and DISPLAY are required for TBB to work at all.
+    #
+    # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to
+    # prevent that, set it to an empty/invalid value prior to running
+    # tor-browser.
+    #
+    # PULSE_SERVER is necessary for audio playback.
+    #
+    # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB
+    # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+    # indicates the system fonts.conf being used instead.
+    exec env -i \
+      HOME="\$HOME" \
+      XAUTHORITY="\$XAUTHORITY" \
+      DISPLAY="\$DISPLAY" \
+      DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
+      \
+      PULSE_SERVER="\''${PULSE_SERVER:-}" \
+      PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
+      \
+      GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
+      GST_REGISTRY="/dev/null" \
+      GST_REGISTRY_UPDATE="no" \
+      \
+      FONTCONFIG_FILE="$FONTCONFIG_FILE" \
+      \
+      LD_LIBRARY_PATH="$libPath" \
+      \
+      "$TBB_IN_STORE/firefox" \
+        --class "Tor Browser" \
+        -no-remote \
+        -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \
+        "\''${@}"
+    EOF
+    chmod +x $out/bin/tor-browser
+
+    # Easier access to docs
+    mkdir -p $out/share/doc
+    ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
+
+    # Install .desktop item
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+
+    # Install icons
+    mkdir -p $out/share/pixmaps
+    cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
+
+    # Check installed apps
+    echo "Checking bundled Tor ..."
+    LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
+
+    echo "Checking tor-browser wrapper ..."
+    DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
+      $out/bin/tor-browser --version >/dev/null
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tor Browser Bundle";
+    homepage = https://www.torproject.org/;
+    platforms = attrNames srcs;
+    maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
+    hydraPlatforms = [];
+    # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
+    # the compound is "libre" in a strict sense (some components place certain
+    # restrictions on redistribution), it's free enough for our purposes.
+    license = licenses.free;
+  };
+}
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
deleted file mode 100644
index 80a92b4a932..00000000000
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeDesktopItem
-, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
-, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
-, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
-, libpulseaudio
-, mediaSupport ? false
-}:
-
-let
-  libPath = stdenv.lib.makeLibraryPath ([
-    stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
-    fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
-  ] ++ stdenv.lib.optionals mediaSupport [
-    gstreamer gst-plugins-base gmp ffmpeg
-    libpulseaudio
-  ]);
-
-  # Ignored if !mediaSupport
-  gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ];
-
-  gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
-    "${x}/lib/gstreamer-0.10") gstPlugins;
-in
-
-stdenv.mkDerivation rec {
-  name = "tor-browser-${version}";
-  version = "6.5.1";
-
-  src = fetchurl {
-    url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
-    sha256 = if stdenv.is64bit then
-      "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else
-      "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
-  };
-
-  preferLocalBuild = true;
-
-  desktopItem = makeDesktopItem {
-    name = "torbrowser";
-    exec = "tor-browser";
-    icon = "torbrowser";
-    desktopName = "Tor Browser";
-    genericName = "Tor Browser";
-    comment = meta.description;
-    categories = "Network;WebBrowser;Security;";
-  };
-
-  patchPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
-
-    sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults
-  '';
-
-  doCheck = true;
-  checkPhase = ''
-    echo "Checking firefox..."
-    LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null
-    echo "Checking tor..."
-    LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/tor-browser
-    mkdir -p $out/bin
-    cp -R * $out/share/tor-browser
-
-    cat > "$out/bin/tor-browser" << EOF
-    #! ${stdenv.shell}
-    unset SESSION_MANAGER
-    export HOME="\$HOME/.torbrowser4"
-    if [ ! -d \$HOME ]; then
-      mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
-      echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
-        ~/Data/Browser/profile.default/preferences/extension-overrides.js
-      echo "pref(\"extensions.torlauncher.torrc-defaults_path\", \"\$HOME/Data/Tor/torrc-defaults\");" >> \
-        ~/Data/Browser/profile.default/preferences/extension-overrides.js
-      echo "pref(\"extensions.torlauncher.tor_path\", \"$out/share/tor-browser/Browser/TorBrowser/Tor/tor\");" >> \
-        ~/Data/Browser/profile.default/preferences/extension-overrides.js
-    fi
-    export FONTCONFIG_PATH=\$HOME/Data/fontconfig
-    export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
-    ${stdenv.lib.optionalString mediaSupport ''
-      export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
-    ''}
-    exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
-    EOF
-    chmod +x $out/bin/tor-browser
-
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications"/"* $out/share/applications
-
-    mkdir -p $out/share/pixmaps
-    cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Tor Browser Bundle";
-    homepage    = https://www.torproject.org/;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 217137c210f..7970732ce3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4189,7 +4189,7 @@ with pkgs;
 
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
+  torbrowser = callPackage ../applications/networking/browsers/torbrowser { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 

From c0d9bce6f79b1840dbac41e707c6115dcb84bb49 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 25 Mar 2017 11:04:41 -0400
Subject: [PATCH 0203/1744] kotlin: 1.1 -> 1.1.1.

---
 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 33921ef02cd..508ac254f0a 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1";
+  version = "1.1.1";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "179m5y56fi50qvxsm075h0547swib7n2pfdn8a4axk9wpwldni5a";
+    sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 55d21cad95cf325e42c0919d1ed8a290d9207f4d Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 25 Mar 2017 15:54:24 +0100
Subject: [PATCH 0204/1744] manticore: fix build, remove builder.sh (see
 #23253)

---
 .../compilers/manticore/builder.sh            | 24 ---------------
 .../compilers/manticore/default.nix           | 29 ++++++++++++++-----
 2 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100755 pkgs/development/compilers/manticore/builder.sh

diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh
deleted file mode 100755
index ad72f50a1b3..00000000000
--- a/pkgs/development/compilers/manticore/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!@shell@
-
-source $stdenv/setup
-echo "Building Manticore research compiler."
-set -xe
-
-PATH=$smlnj/bin:$PATH
-
-mkdir -p $out/bin
-
-# Manticore seems to use the MLB files from the build tree,
-# so for now we copy the whole build tree into the store:
-cd $out/
-tar xf $src
-mv manticore* repo_checkout
-cd repo_checkout/
-# TODO: At the very least, this could probably be cut down to a subset
-# of the repo.
-
-${autoconf}/bin/autoheader -Iconfig
-${autoconf}/bin/autoconf -Iconfig
-./configure --prefix=$out
-make build -j
-make install
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 7e8312549da..d068d744f20 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,14 +1,29 @@
-{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }:
+{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
 
-stdenv.mkDerivation rec {
+let
+    rev = "592a5714595b4448b646a7d49df04c285668c2f8";
+in stdenv.mkDerivation rec {
   name = "manticore-${version}";
   version = "2014.08.18";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz; 
-    sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d";
+ 
+  src = fetchFromGitHub {
+    owner = "rrnewton";
+    repo = "manticore_temp_mirror";
+    sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi";
+    inherit rev;
   };
-  inherit stdenv coreutils autoconf automake smlnj;
+
+  enableParallelBuilding = false;
+ 
+  nativeBuildInputs = [ autoreconfHook ];
+  
+  buildInputs = [ coreutils smlnj ];
+
+  autoreconfFlags = "-Iconfig -vfi";
+
+  postPatch = "patchShebangs .";
+
+  preInstall = "mkdir -p $out/bin";
 
   meta = {
     description = "A parallel, pure variant of Standard ML";

From 915e44e6d1ab18631aa74bbdc7b65e7cf5111a3e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 25 Mar 2017 10:09:42 -0500
Subject: [PATCH 0205/1744] lzfse: 2016-06-21 -> 2017-03-08

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

diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index fca1a433ff3..0bf15580798 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lzfse-${version}";
-  version = "2016-06-21";
+  version = "2017-03-08";
 
   src = fetchFromGitHub {
     owner = "lzfse";
     repo = "lzfse";
-    rev = "45912281e3945a09c6ebfa8c6629f6906a99fc29";
-    sha256 = "1wbh3x874fjn548g1hw4bm7lkk60vlvy8ph0wsjkzcx8873hwj7h";
+    rev = "88e2d27";
+    sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5";
   };
 
   makeFlags = [ "INSTALL_PREFIX=$(out)" ];

From f087b7594150998652f6b7945b0ca86bceba9e79 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 25 Mar 2017 11:13:25 -0400
Subject: [PATCH 0206/1744] nix-buffer support: Make process-environment
 changes actually local

---
 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 1cbac0709a6..6c5e0570fd0 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@@ -39,6 +39,8 @@
       (make-local-variable 'process-environment)
       (put 'process-environment 'permanent-local t)
       (inherit-local 'process-environment)
+      ; setenv modifies in place, so copy the environment first
+      (setq process-environment (copy-tree process-environment))
       (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
       (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
 

From 9125bab708fcacbfbf7b77e44935c8ce254de3b9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Mar 2017 10:14:51 -0500
Subject: [PATCH 0207/1744] dropbox: use vendored Qt 5 libraries

---
 .../networking/dropbox/default.nix            | 24 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 3721f7ed4af..6d3c34b48d5 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -3,7 +3,6 @@
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
 , libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit
 }:
 
 # this package contains the daemon version of dropbox
@@ -44,8 +43,6 @@ let
       dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
       libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
       ncurses zlib
-
-      qtbase qtdeclarative qtwebkit
     ];
 
   desktopItem = makeDesktopItem {
@@ -73,6 +70,8 @@ in stdenv.mkDerivation {
   dontStrip = true; # already done
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out/${appdir}"
     cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
 
@@ -81,19 +80,6 @@ in stdenv.mkDerivation {
     rm "$out/${appdir}/libGL.so.1"
     rm "$out/${appdir}/libX11-xcb.so.1"
 
-    rm "$out/${appdir}/libQt5Core.so.5"
-    rm "$out/${appdir}/libQt5DBus.so.5"
-    rm "$out/${appdir}/libQt5Gui.so.5"
-    rm "$out/${appdir}/libQt5Network.so.5"
-    rm "$out/${appdir}/libQt5OpenGL.so.5"
-    rm "$out/${appdir}/libQt5PrintSupport.so.5"
-    rm "$out/${appdir}/libQt5Qml.so.5"
-    rm "$out/${appdir}/libQt5Quick.so.5"
-    rm "$out/${appdir}/libQt5Sql.so.5"
-    rm "$out/${appdir}/libQt5WebKit.so.5"
-    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
-    rm "$out/${appdir}/libQt5XcbQpa.so.5"
-
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
 
@@ -106,9 +92,13 @@ in stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox
+
+    runHook postInstall
   '';
 
   fixupPhase = ''
+    runHook preFixup
+
     INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
     RPATH="${ldpath}:$out/${appdir}"
     getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
@@ -148,6 +138,8 @@ in stdenv.mkDerivation {
     done
 
     paxmark m $out/${appdir}/dropbox
+
+    runHook postFixup
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7760e29a520..b0e4dfe1e60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15394,7 +15394,7 @@ with pkgs;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  dropbox = libsForQt5.callPackage ../applications/networking/dropbox { };
+  dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 

From dc10688edbfabe516a708e6dc2341fb5cfc2d3ad Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <rzetterberg@users.noreply.github.com>
Date: Sat, 25 Mar 2017 16:34:02 +0100
Subject: [PATCH 0208/1744] nftables: adds information regarding nftables and
 Docker (#24326)

---
 nixos/modules/services/networking/nftables.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 029c3df8993..56b94205414 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -17,6 +17,17 @@ in
 
           This conflicts with the standard networking firewall, so make sure to
           disable it before using nftables.
+
+          Note that if you have Docker enabled you will not be able to use
+          nftables without intervention. Docker uses iptables internally to
+          setup NAT for containers. This module disables the ip_tables kernel
+          module, however Docker automatically loads the module. Please see [1]
+          for more information.
+
+          There are other programs that use iptables internally too, such as
+          libvirt.
+
+          [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273
         '';
     };
     networking.nftables.ruleset = mkOption {

From 65593e64c480493555ae21050a422e4c7ff9c7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 25 Mar 2017 16:49:29 +0100
Subject: [PATCH 0209/1744] drumgizmo: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index eaf02bd2689..a52301c34d7 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.11";
+  version = "0.9.12";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf";
+    sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z";
   };
 
   configureFlags = [ "--enable-lv2" ];

From e3938c8e318b3ba76be735e0eb1652b640fb8d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 25 Mar 2017 17:04:44 +0100
Subject: [PATCH 0210/1744] drumkv1: 0.8.0 -> 0.8.1

---
 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 0a2e293d90b..064feeb02a3 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.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga";
+    sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

From 5861b8b1c9f8a0e394ae83d96ef99a9f10f4f0f0 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sat, 25 Mar 2017 17:29:02 +0100
Subject: [PATCH 0211/1744] nodejs-4_x: 4.6.0 -> 4.8.1

---
 pkgs/development/web/nodejs/v4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 9a142a89677..edef6f7663c 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "4.6.2";
+    version = "4.8.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-      sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545";
+      sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms";
     };
 
   })

From 53dde421533d96de8c8c72c9d756042de800fd6b Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 25 Mar 2017 19:43:42 +0100
Subject: [PATCH 0212/1744] manticore: fix compiling pml sources

Compiler depends on sources that weren't present in the output.
---
 pkgs/development/compilers/manticore/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index d068d744f20..795830e0e70 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -21,7 +21,19 @@ in stdenv.mkDerivation rec {
 
   autoreconfFlags = "-Iconfig -vfi";
 
-  postPatch = "patchShebangs .";
+  unpackPhase = ''
+    mkdir -p $out
+    cd $out
+    unpackFile $src
+    mv manticore_temp_mirror-${rev}-src repo_checkout
+    cd repo_checkout
+    chmod u+w . -R
+  ''; 
+  
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
+  '';
 
   preInstall = "mkdir -p $out/bin";
 

From e5c927cb8de8a78cd2ed4ad1bf41ccbfef1dcfce Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sat, 25 Mar 2017 20:14:04 +0100
Subject: [PATCH 0213/1744] NixOS Manual: Update version numbers

---
 nixos/doc/manual/development/sources.xml    | 14 ++++++-------
 nixos/doc/manual/installation/upgrading.xml | 22 ++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 7cd5ce0002c..0b2528e9a77 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -27,8 +27,8 @@ a subdirectory of the Nixpkgs repository.) The remote
 <literal>channels</literal> refers to a read-only repository that
 tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/>
 for more information about channels). Thus, the Git branch
-<literal>channels/nixos-14.12</literal> will contain the latest built
-and tested version available in the <literal>nixos-14.12</literal>
+<literal>channels/nixos-17.03</literal> will contain the latest built
+and tested version available in the <literal>nixos-17.03</literal>
 channel.</para>
 
 <para>It’s often inconvenient to develop directly on the master
@@ -39,9 +39,9 @@ branch based on your current NixOS version:
 
 <screen>
 $ nixos-version
-14.04.273.ea1952b (Baboon)
+17.09pre104379.6e0b727 (Hummingbird)
 
-$ git checkout -b local ea1952b
+$ git checkout -b local e3938c8
 </screen>
 
 Or, to base your local branch on the latest version available in a
@@ -49,17 +49,17 @@ NixOS channel:
 
 <screen>
 $ git remote update channels
-$ git checkout -b local channels/nixos-14.12
+$ git checkout -b local channels/nixos-17.03
 </screen>
 
-(Replace <literal>nixos-14.12</literal> with the name of the channel
+(Replace <literal>nixos-17.03</literal> with the name of the channel
 you want to use.) You can use <command>git merge</command> or
 <command>git rebase</command> to keep your local branch in sync with
 the channel, e.g.
 
 <screen>
 $ git remote update channels
-$ git merge channels/nixos-14.12
+$ git merge channels/nixos-17.03
 </screen>
 
 You can use <command>git cherry-pick</command> to copy commits from
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index c974523f886..aee6523345c 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -15,12 +15,12 @@ been built.  These channels are:
 <itemizedlist>
   <listitem>
     <para><emphasis>Stable channels</emphasis>, such as <literal
-    xlink:href="https://nixos.org/channels/nixos-14.12">nixos-14.12</literal>.
+    xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03</literal>.
     These only get conservative bug fixes and package upgrades.  For
     instance, a channel update may cause the Linux kernel on your
-    system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
-    not from 3.4.<replaceable>x</replaceable> to
-    3.11.<replaceable>x</replaceable> (a major change that has the
+    system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but
+    not from 4.9.<replaceable>x</replaceable> to
+    4.11.<replaceable>x</replaceable> (a major change that has the
     potential to break things).  Stable channels are generally
     maintained until the next stable branch is created.</para>
     <para></para>
@@ -34,7 +34,7 @@ been built.  These channels are:
   </listitem>
   <listitem>
     <para><emphasis>Small channels</emphasis>, such as <literal
-    xlink:href="https://nixos.org/channels/nixos-14.12-small">nixos-14.12-small</literal>
+    xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small</literal>
     or <literal
     xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These
     are identical to the stable and unstable channels described above,
@@ -55,8 +55,8 @@ appliances.)</para>
 
 <para>When you first install NixOS, you’re automatically subscribed to
 the NixOS channel that corresponds to your installation source.   For
-instance, if you installed from a 14.12 ISO, you will be subscribed to
-the <literal>nixos-14.12</literal> channel.  To see which NixOS
+instance, if you installed from a 17.03 ISO, you will be subscribed to
+the <literal>nixos-17.03</literal> channel.  To see which NixOS
 channel you’re subscribed to, run the following as root:
 
 <screen>
@@ -71,16 +71,16 @@ To switch to a different NixOS channel, do
 </screen>
 
 (Be sure to include the <literal>nixos</literal> parameter at the
-end.)  For instance, to use the NixOS 14.12 stable channel:
+end.)  For instance, to use the NixOS 17.03 stable channel:
 
 <screen>
-# nix-channel --add https://nixos.org/channels/nixos-14.12 nixos
+# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos
 </screen>
 
 If you have a server, you may want to use the “small” channel instead:
 
 <screen>
-# nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos
+# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos
 </screen>
 
 And if you want to live on the bleeding edge:
@@ -130,7 +130,7 @@ runs, see <command>systemctl list-timers</command>.)  You can also
 specify a channel explicitly, e.g.
 
 <programlisting>
-system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09;
+system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03;
 </programlisting>
 
 </para>

From a616f4ec9b7bccc04f78e10c685346170ae56a8f Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Sat, 25 Mar 2017 20:14:12 +0100
Subject: [PATCH 0214/1744] prosody: 0.9.10 -> 0.9.12 (#24269)

---
 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 f32e6d68452..3285456a348 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -19,12 +19,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.10";
+  version = "0.9.12";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8";
+    sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
   };
 
   communityModules = fetchhg {

From b00cfd49d50d46c6e8ae5257cbd98c11ba543df3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Mar 2017 20:44:16 +0100
Subject: [PATCH 0215/1744] irssi: 1.0.1 -> 1.0.2 for CVE-2017-7191

See https://irssi.org/security/irssi_sa_2017_03.txt.
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index d46539a88b7..7ab6a4438f3 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.2";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
+    sha256 = "1fas6dqz6g8m2400spvkhfxihj3w06qb917h4vhcb716g9wpjkwf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7b706900e7dd3ec55eb46a366f0bc47858fb7633 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 25 Mar 2017 21:03:46 +0100
Subject: [PATCH 0216/1744] graphicsmagick: patch for CVE-2017-6335

---
 .../graphicsmagick/cmyka-bounds.patch         | 36 +++++++++++++++++++
 .../graphics/graphicsmagick/default.nix       |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch

diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
new file mode 100644
index 00000000000..dd375143277
--- /dev/null
+++ b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
+# Date 1487905610 21600
+# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8
+# Parent  0392c4305a4369984ec8069055acc470c0a73647
+Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel.
+
+diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c
+--- a/coders/tiff.c	Sun Jan 29 10:04:57 2017 -0600
++++ b/coders/tiff.c	Thu Feb 23 21:06:50 2017 -0600
+@@ -1230,8 +1230,8 @@
+                   case 0:
+                     if (samples_per_pixel == 1)
+                       *quantum_type=GrayQuantum;
+-                      else
+-                        *quantum_type=RedQuantum;
++                    else
++                      *quantum_type=RedQuantum;
+                     break;
+                   case 1:
+                     *quantum_type=GreenQuantum;
+@@ -1411,12 +1411,12 @@
+               }
+             else
+               {
+-                if (image->matte)
++                if (image->matte && samples_per_pixel >= 5)
+                   {
+                     *quantum_type=CMYKAQuantum;
+                     *quantum_samples=5;
+                   }
+-                else
++                else if (samples_per_pixel >= 4)
+                   {
+                     *quantum_type=CMYKQuantum;
+                     *quantum_samples=4;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index f655979c2cc..0858dfba8b4 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
       url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
       sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
     })
+    ./cmyka-bounds.patch
   ];
 
   configureFlags = [

From 958668ab80552f0cc864b5ea72b22a22f4935e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 25 Mar 2017 21:18:34 +0100
Subject: [PATCH 0217/1744] nixos, openafs-client: correct serviceConfig

---
 .../services/network-filesystems/openafs-client/default.nix      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 6f51e287910..f7c58c92863 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -76,6 +76,7 @@ in
       description = "AFS client";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      serviceConfig = { RemainAfterExit = true; };
 
       preStart = ''
         mkdir -p -m 0755 /afs

From 2db5c5cfe2aa4700dba8daef75e2e9f8e148c01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 25 Mar 2017 21:18:34 +0100
Subject: [PATCH 0218/1744] jackett: init at 0.7.1197 + nixos module

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

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 610c2a2b758..145cf140847 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -275,6 +275,7 @@
   ./services/misc/gpsd.nix
   #./services/misc/ihaskell.nix
   ./services/misc/irkerd.nix
+  ./services/misc/jackett.nix
   ./services/misc/leaps.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
new file mode 100644
index 00000000000..e467e7ee85b
--- /dev/null
+++ b/nixos/modules/services/misc/jackett.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, lib, mono, ... }:
+
+with lib;
+
+let
+  cfg = config.services.jackett;
+in
+{
+  options = {
+    services.jackett = {
+      enable = mkEnableOption "Jackett";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.jackett = {
+      description = "Jackett";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d /var/lib/jackett/ || {
+          echo "Creating jackett data directory in /var/lib/jackett/"
+          mkdir -p /var/lib/jackett/
+        }
+        chown -R jackett /var/lib/jackett/
+        chmod 0700 /var/lib/jackett/
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = "jackett";
+        Group = "nogroup";
+        PermissionsStartOnly = "true";
+        ExecStart = "${pkgs.jackett}/bin/Jackett";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers.jackett = {
+      home = "/var/lib/jackett";
+    };
+
+  };
+}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
new file mode 100644
index 00000000000..3b3f2e0cc0f
--- /dev/null
+++ b/pkgs/servers/jackett/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, mono, curl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "jackett-${version}";
+  version = "0.7.1197";
+
+  src = fetchurl {
+    url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
+    sha256 = "0p9xdfbb8pda5a3knnw6145jky3bf10y1dj2clgsbbygi2xnam2v";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/${name}}
+    cp -r * $out/share/${name}
+
+    makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
+      --add-flags "$out/share/${name}/JackettConsole.exe" \
+      --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "API Support for your favorite torrent trackers.";
+    homepage = https://github.com/Jackett/Jackett/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7970732ce3f..3676d3c499c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2436,6 +2436,8 @@ with pkgs;
 
   jaaa = callPackage ../applications/audio/jaaa { };
 
+  jackett = callPackage ../servers/jackett { };
+
   jade = callPackage ../tools/text/sgml/jade { };
 
   jd-gui = callPackage_i686 ../tools/security/jd-gui { };

From b35d22b30c8c6834842382c71124021372e837a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 25 Mar 2017 21:18:34 +0100
Subject: [PATCH 0219/1744] radarr: init at 0.2.0.553 + nixos module

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/radarr.nix | 44 ++++++++++++++++++++++++++
 pkgs/servers/radarr/default.nix        | 31 ++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 4 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/services/misc/radarr.nix
 create mode 100644 pkgs/servers/radarr/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 145cf140847..4e9154f1740 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -296,6 +296,7 @@
   ./services/misc/parsoid.nix
   ./services/misc/phd.nix
   ./services/misc/plex.nix
+  ./services/misc/radarr.nix
   ./services/misc/redmine.nix
   ./services/misc/rippled.nix
   ./services/misc/ripple-rest.nix
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
new file mode 100644
index 00000000000..cc5efffca44
--- /dev/null
+++ b/nixos/modules/services/misc/radarr.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, lib, mono, ... }:
+
+with lib;
+
+let
+  cfg = config.services.radarr;
+in
+{
+  options = {
+    services.radarr = {
+      enable = mkEnableOption "Radarr";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.radarr = {
+      description = "Radarr";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d /var/lib/radarr/ || {
+          echo "Creating radarr data directory in /var/lib/radarr/"
+          mkdir -p /var/lib/radarr/
+        }
+        chown -R radarr /var/lib/radarr/
+        chmod 0700 /var/lib/radarr/
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = "radarr";
+        Group = "nogroup";
+        PermissionsStartOnly = "true";
+        ExecStart = "${pkgs.radarr}/bin/Radarr";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers.radarr = {
+      home = "/var/lib/radarr";
+    };
+
+  };
+}
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
new file mode 100644
index 00000000000..446927745a9
--- /dev/null
+++ b/pkgs/servers/radarr/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "radarr-${version}";
+  version = "0.2.0.535";
+
+  src = fetchurl {
+    url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
+    sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/${name}}
+    cp -r * $out/share/${name}/.
+
+    makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
+      --add-flags "$out/share/${name}/Radarr.exe" \
+      --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \
+      --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Usenet/BitTorrent movie downloader.";
+    homepage = https://radarr.video/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3676d3c499c..86205f329f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3670,6 +3670,8 @@ with pkgs;
 
   radamsa = callPackage ../tools/security/radamsa { };
 
+  radarr = callPackage ../servers/radarr { };
+
   radvd = callPackage ../tools/networking/radvd { };
 
   rambox = callPackage ../applications/networking/instant-messengers/rambox { };

From 5e0cbbbdb6600335dde8c25b25c62a329b02c284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Mar 2017 21:36:29 +0100
Subject: [PATCH 0220/1744] keepassx-community: 2.1.2 -> 2.1.3

fixes https://github.com/NixOS/security/issues/105
---
 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 c5bd9afd2cf..a5defaf5c29 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6";
+    sha256 = "1zamk3dc44fn61b880i3l1r0np2sx2hs05cvcf2x4748r3xicacf";
   };
 
   cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];

From dc514b246ef0e4152e3b4566f9cda0134a585979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 25 Mar 2017 21:41:46 +0100
Subject: [PATCH 0221/1744] i2pd: 2.11.0 -> 2.12.0

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

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

From 8c4339a9dcd34d33e16b3db5d911cc078164f0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Mar 2017 23:01:29 +0100
Subject: [PATCH 0222/1744] texlive: fix CVE-2016-10243

https://github.com/NixOS/security/issues/104
---
 pkgs/tools/typesetting/tex/texlive/combine.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index abfe951a33f..c783316c6d5 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -111,6 +111,7 @@ in buildEnv {
         -e "s,\$SELFAUTODIR,$out/share,g" \
         -e "s,\$SELFAUTOPARENT,$out/share,g" \
         -e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \
+        -e "/^mpost,/d" `# CVE-2016-10243` \
         "$cnfOrig" > ./texmf.cnf
 
       patchCnfLua "./texmfcnf.lua"

From 99434abff7cac3423986a1f0c9570268cc870c07 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 25 Mar 2017 23:53:01 +0300
Subject: [PATCH 0223/1744] ibus: wrap with GTK dependencies

Without this ibus can't load its settings.
Also don't propagate PYTHONPATH.
---
 pkgs/tools/inputmethods/ibus/default.nix | 23 ++++++++++-------------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index de375ed4529..1654f57c8ed 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, fetchurl, wrapGAppsHook
 , intltool, isocodes, pkgconfig
-, python3, pygobject3
+, python3
 , gtk2, gtk3, atk, dconf, glib, json_glib
 , dbus, libnotify, gobjectIntrospection, wayland
 , nodePackages
@@ -34,19 +34,21 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python3 pygobject3
+    python3
     intltool isocodes pkgconfig
     gtk2 gtk3 dconf
     json_glib
     dbus libnotify gobjectIntrospection wayland
   ];
 
-  propagatedBuildInputs = [ glib ];
+  propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
 
   outputs = [ "out" "dev" ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     # Fix hard-coded installation paths, so make does not try to overwrite our
     # Python installation.
@@ -59,14 +61,9 @@ stdenv.mkDerivation rec {
     substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
   '';
 
-  preFixup = ''
-    for f in "$out/bin"/*; do #*/
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    done
+  postFixup = ''
+    buildPythonPath $out
+    patchPythonScript $out/share/ibus/setup/main.py
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86205f329f0..43c2e553f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1266,7 +1266,6 @@ with pkgs;
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
   ibus = callPackage ../tools/inputmethods/ibus {
-    inherit (python3Packages) pygobject3;
     inherit (gnome3) dconf glib;
   };
 

From 66b05cd4e68408bf9026bb304f344b87c66feec3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 25 Mar 2017 23:53:14 +0300
Subject: [PATCH 0224/1744] ibus-engines: use wrapPythonPrograms

This is needed now that PYTHONPATH is not propagated. Also several packages
with additional dependencies are now properly wrapped.
---
 .../ibus-engines/ibus-anthy/default.nix       |  9 +++++----
 .../ibus-engines/ibus-hangul/default.nix      |  8 +++++---
 .../ibus-engines/ibus-libpinyin/default.nix   |  6 ++++--
 .../ibus-engines/ibus-m17n/default.nix        |  8 +++++---
 .../ibus-engines/ibus-mozc/default.nix        |  8 ++++----
 .../ibus-engines/ibus-table/default.nix       |  8 +++++---
 .../ibus-engines/ibus-uniemoji/default.nix    |  7 +++++++
 pkgs/top-level/all-packages.nix               | 19 ++++---------------
 8 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 50059e9477a..5d130d7ad80 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3
+, anthy, ibus, glib, gobjectIntrospection, gtk3, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
     maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
-  configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
+  configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ];
 
   buildInputs = [
-    anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3
+    anthy glib gobjectIntrospection gtk3 ibus python3
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
 
   postFixup = ''
+    wrapPythonPrograms
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
   '';
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 1ada62580db..74253fa09fc 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, librsvg, python3, pygobject3
+, gtk3, ibus, libhangul, librsvg, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
   };
 
-  buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
+  buildInputs = [ gtk3 ibus libhangul ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
+
+  postFixup = "wrapPythonPrograms";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 799d66aac9b..6293fa30d7a 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook
 , intltool, pkgconfig, sqlite, libpinyin, db
-, ibus, glib, gtk3, python3, pygobject3
+, ibus, glib, gtk3, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,12 +15,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];
-  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ];
 
   postAutoreconf = ''
     intltoolize
   '';
 
+  postFixup = "wrapPythonPrograms";
+
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "IBus interface to the libpinyin input method";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 2dbab712955..2d25e6bf430 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
-, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3
+, ibus, m17n_lib, m17n_db, gettext, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ibus m17n_lib m17n_db gettext
-    python3 pygobject3
+    python3
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig python3.pkgs.wrapPython ];
+
+  postFixup = "wrapPythonPrograms";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 644725c2910..aa346f45274 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
+{ clangStdenv, fetchFromGitHub, fetchsvn, which, ninja, python2, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
 
 let
   japanese_usage_dictionary = fetchsvn {
@@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec {
     maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
-  nativeBuildInputs = [ gyp which ninja python pkgconfig ];
+  nativeBuildInputs = [ which ninja python2 python2.pkgs.gyp pkgconfig ];
   buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ];
 
   src = fetchFromGitHub {
@@ -36,8 +36,8 @@ in clangStdenv.mkDerivation rec {
 
   configurePhase = ''
     export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc"
-    python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \
-    python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin
+    python src/build_mozc.py gyp --gypdir=${python2.pkgs.gyp}/bin --server_dir=$out/lib/mozc \
+    python src/unix/fcitx/fcitx.gyp gyp --gypdir=${python2.pkgs.gyp}/bin
   '';
 
   preBuildPhase = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index c5090e5b949..8900ebc120c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, docbook2x, pkgconfig
 , gtk3, dconf, gobjectIntrospection
-, ibus, python3, pygobject3 }:
+, ibus, python3 }:
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
@@ -29,16 +29,18 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    dconf gtk3 gobjectIntrospection ibus python3 pygobject3
+    dconf gtk3 gobjectIntrospection ibus python3
   ];
 
-  nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
 
   postUnpack = ''
     substituteInPlace $sourceRoot/engine/Makefile.am \
       --replace "docbook2man" "docbook2man --sgml"
   '';
 
+  postFixup = "wrapPythonPrograms";
+
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "An IBus framework for table-based input methods";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 161982ac618..1ea7ef4251f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ];
 
+  nativeBuildInputs = [ python3Packages.wrapPython ];
+
+  postFixup = ''
+    buildPythonPath $out
+    patchPythonScript $out/share/ibus-uniemoji/uniemoji.py
+  '';
+
   makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc"
                 "PYTHON=${python3Packages.python.interpreter}"
               ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43c2e553f0b..c33e8cf3c95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1272,30 +1272,19 @@ with pkgs;
   ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
 
   ibus-engines = recurseIntoAttrs {
+    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
-    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy {
-      inherit (python3Packages) pygobject3;
-    };
+    hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
-    hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul {
-      inherit (python3Packages) pygobject3;
-    };
+    libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
 
-    libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin {
-      inherit (python3Packages) pygobject3;
-    };
-
-    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n {
-      inherit (python3Packages) pygobject3;
-    };
+    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
-      inherit (pythonPackages) gyp;
       protobuf = protobuf.override { stdenv = clangStdenv; };
     };
 
     table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
-      inherit (python3Packages) pygobject3;
       inherit (gnome3) dconf;
     };
 

From 3c090f0e5a61b9b16a95059c6bfaa6a59abe2ccd Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sun, 26 Mar 2017 01:13:11 +0100
Subject: [PATCH 0225/1744] spotify: 1.0.49.125.g72ee7853-111 ->
 1.0.52.717.g2f08534a-47

---
 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 6b4d8e33b50..8821da4362b 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,7 @@ let
   # Please update the stable branch!
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
-  version = "1.0.49.125.g72ee7853-111";
+  version = "1.0.52.717.g2f08534a-47";
 
   deps = [
     alsaLib
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
+      sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 7bd73bdba3abdb21d591892bfc044fc258fccaee Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 25 Mar 2017 21:07:09 -0700
Subject: [PATCH 0226/1744] obs-studio: use upstream crash fixes, drop patch

---
 .../applications/video/obs-studio/default.nix |  6 +--
 .../obs-studio/segfault-patch-systray.patch   | 40 -------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/video/obs-studio/segfault-patch-systray.patch

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index a6238d9e808..539314867ab 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -27,12 +27,10 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
-    rev = "${version}";
-    sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6";
+    rev = "624aa2a5";
+    sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
   };
 
-  patches = [ ./segfault-patch-systray.patch ];
-
   nativeBuildInputs = [ cmake
                       ];
 
diff --git a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch b/pkgs/applications/video/obs-studio/segfault-patch-systray.patch
deleted file mode 100644
index c66b07bb57a..00000000000
--- a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c31e0f682431508ccd2d3c0f74e6e16fc71445d8 Mon Sep 17 00:00:00 2001
-From: Cray Elliott <MP2E@archlinux.us>
-Date: Fri, 10 Mar 2017 03:48:36 -0800
-Subject: [PATCH] Fix segfault in Linux when no system tray exists
-
-previously, switching workspaces while obs-studio is running resulted in a
-segfault if no system tray was available
----
- UI/window-basic-main.cpp | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
-index 8590dd75..024854d6 100644
---- a/UI/window-basic-main.cpp
-+++ b/UI/window-basic-main.cpp
-@@ -2916,13 +2916,15 @@ void OBSBasic::closeEvent(QCloseEvent *event)
-
- void OBSBasic::changeEvent(QEvent *event)
- {
--	if (event->type() == QEvent::WindowStateChange &&
--	    isMinimized() &&
--	    trayIcon->isVisible() &&
--	    sysTrayMinimizeToTray()) {
--
--		ToggleShowHide();
--	}
-+  if (trayIcon) {
-+	  if (event->type() == QEvent::WindowStateChange &&
-+	      isMinimized() &&
-+	      trayIcon->isVisible() &&
-+	      sysTrayMinimizeToTray()) {
-+
-+	  	ToggleShowHide();
-+	  }
-+  }
- }
-
- void OBSBasic::on_actionShow_Recordings_triggered()
---
-2.12.0

From 1b78108bce5233cf887e585da2daab3fd0fb7bcc Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Sun, 26 Mar 2017 08:43:47 +0300
Subject: [PATCH 0227/1744] bup: 0.28.1 -> 0.29

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

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 4e035ab67ac..baf9e4f4e39 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.28.1"; in
+let version = "0.29"; in
 
 with stdenv.lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l";
+    sha256 = "1cc9kpq9bpln89m4ni6wqzh4c8zwxmgnhaibdxxfs5pk2mpl3ds5";
   };
 
   buildInputs = [ git python2Packages.python ];

From 03ddb417c3f64cb59ca2b0c4833db40b1313bf46 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <skosyrev@ptsecurity.com>
Date: Fri, 17 Mar 2017 23:03:33 +0300
Subject: [PATCH 0228/1744] vogl:  init at 2016-05-13

---
 pkgs/development/tools/vogl/default.nix | 47 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/vogl/default.nix

diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
new file mode 100644
index 00000000000..f3967b0d923
--- /dev/null
+++ b/pkgs/development/tools/vogl/default.nix
@@ -0,0 +1,47 @@
+{ fetchFromGitHub, stdenv
+, cmake, git, pkgconfig, wget, zip
+, makeQtWrapper, qtbase, qtx11extras
+, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
+, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
+, freeglut, mesa, mesa_glu
+}:
+stdenv.mkDerivation rec {
+  name = "vogl-${version}";
+  version = "2016-05-13";
+
+  src = fetchFromGitHub {
+    owner  = "deepfire";
+    repo   = "vogl";
+    rev    = "cbc5f1853e294b363f16c4e00b3e0c49dbf74559";
+    sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
+  };
+
+  nativeBuildInputs = [
+    cmake makeQtWrapper pkgconfig
+  ];
+
+  buildInputs = [
+    git wget zip
+    qtbase qtx11extras
+    libdwarf libjpeg_turbo libunwind lzma tinyxml libX11
+    SDL2 SDL2_gfx SDL2_image SDL2_ttf
+    freeglut mesa mesa_glu
+  ];
+
+  enableParallelBuilding = true;
+
+  dontUseCmakeBuildDir = true;
+  preConfigure = ''
+    cmakeDir=$PWD
+    mkdir -p vogl/vogl_build/release64 && cd $_
+  '';
+  cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On'';
+
+  meta = with stdenv.lib; {
+    description = "OpenGL capture / playback debugger.";
+    homepage = https://github.com/ValveSoftware/vogl;
+    license = licenses.mit;
+    maintainers = [ maintainers.deepfire ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 217137c210f..c78b1f6164a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15921,6 +15921,8 @@ with pkgs;
 
   vnstat = callPackage ../applications/networking/vnstat { };
 
+  vogl = qt57.callPackage ../development/tools/vogl { };
+
   volnoti = callPackage ../applications/misc/volnoti { };
 
   vorbis-tools = callPackage ../applications/audio/vorbis-tools { };

From 4a8b2c29420ef11af6d9abad8d8b6710eb397a23 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Mar 2017 08:35:10 +0000
Subject: [PATCH 0229/1744] sile: on Darwin, use AppKit for font selection

---
 pkgs/tools/typesetting/sile/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 382219a0a3a..2c34a9aff32 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
 , harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem
 , fontconfig, lua, libiconv
 }:
@@ -26,7 +26,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [pkgconfig makeWrapper];
-  buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
+  buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]
+  ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
+  ;
+
+  preConfigure = optionalString stdenv.isDarwin ''
+    sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
+  '';
+
+  NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit";
 
   LUA_PATH = luaPath;
   LUA_CPATH = luaCPath;
@@ -49,8 +57,8 @@ stdenv.mkDerivation rec {
       technologies and borrowing some ideas from graphical systems
       such as InDesign.
     '';
-    homepage = "http://www.sile-typesetter.org";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
+    homepage = http://www.sile-typesetter.org;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From 1f545f01bb96d885b33e9ff18ce291b85d3a69fb Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@spacekitteh.moe>
Date: Sun, 26 Mar 2017 19:59:08 +1000
Subject: [PATCH 0230/1744] fetchRepoProject: fixes; more options

---
 .../fetchrepoproject/default.nix              | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index f0bc02cf66d..8d5259908d7 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -1,27 +1,49 @@
-{stdenv, git, gitRepo, gnupg ? null, cacert}:
+{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }:
 
-{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "",
-localManifests ? [] }:
+{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
+, localManifests ? [], createMirror ? false, useArchive ? !createMirror
+}:
 
 assert repoRepoRev != "" -> repoRepoURL != "";
+assert createMirror -> !useArchive;
+
+with stdenv.lib;
+
+let
+  repoInitFlags = [
+    "--manifest-url=${manifest}"
+    "--manifest-branch=${rev}"
+    "--depth=1"
+    #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox.
+    "--no-clone-bundle"
+    (optionalString (createMirror != "") "--mirror")
+    (optionalString useArchive "--archive")
+    (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+    (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+    (optionalString (referenceDir != "") "--reference=${referenceDir}")
+  ];
+
+  local_manifests = copyPathsToStore localManifests;
+
+in
 
 stdenv.mkDerivation {
-  buildCommand = with stdenv.lib; ''
-    mkdir ./.repo
+
+  buildCommand = ''
+    mkdir .repo
+    ${optionalString (local_manifests != []) ''
     mkdir ./.repo/local_manifests
-    for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests}
+    for local_manifest in ${concatMapStringsSep " " toString local_manifests}
     do
       cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
     done
+    ''}
 
     export HOME=.repo
-    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
-  + ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
-  + ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
-  + ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
-  + ''
+    repo init ${concatStringsSep " " repoInitFlags}
+
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
-    rm -rf $out/.repo
+    ${optionalString createMirror "rm -rf $out/.repo"}
   '';
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
@@ -30,8 +52,7 @@ stdenv.mkDerivation {
     "GIT_PROXY_COMMAND" "SOCKS_SERVER"
   ];
 
-  buildInputs = [git gitRepo cacert] ++ stdenv.lib.optional (gnupg != null) [gnupg] ;
-
+  buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = sha256;

From f3b6a0b14ccbfc9f03c0e25353f8ed8366a8c1e9 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Sun, 26 Mar 2017 21:50:46 +1000
Subject: [PATCH 0231/1744] fetchRepoProject: typo

---
 pkgs/build-support/fetchrepoproject/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 13a281b12d7..289171aa1ca 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     repo init ${concatStringsSep " " repoInitFlags}
 
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
-    ${optionalString createMirror "rm -rf $out/.repo"}
+    ${optionalString !createMirror "rm -rf $out/.repo"}
   '';
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 69055ecb51ff6f52406ad1fb616c3d970e47d267 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Sun, 26 Mar 2017 21:55:41 +1000
Subject: [PATCH 0232/1744] fetchRepoProject: fixup

---
 pkgs/build-support/fetchrepoproject/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 289171aa1ca..e8ec0c1f4d4 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     repo init ${concatStringsSep " " repoInitFlags}
 
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
-    ${optionalString !createMirror "rm -rf $out/.repo"}
+    ${optionalString (!createMirror) "rm -rf $out/.repo"}
   '';
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 65029beb38d358e45f2f322c46a9e25c2aacfd3d Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sun, 26 Mar 2017 13:17:51 +0200
Subject: [PATCH 0233/1744] libguestfs: add qemu to wrapped PATH

virt-df doesn't find qemu-img otherwise.
---
 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 8901fef21fd..69bd6702ef5 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for bin in $out/bin/*; do
       wrapProgram "$bin" \
-        --prefix "PATH" : "$out/bin:${hivex}/bin" \
+        --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \
         --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl"
     done
   '';

From 6c17ad677c4970c87e8562574ea7e6fbf12b0813 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 25 Mar 2017 15:10:32 -0500
Subject: [PATCH 0234/1744] jasper: 2.0.10 -> 2.0.12

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

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 36b2c469eaf..34e7e4a761f 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-2.0.10";
+  name = "jasper-2.0.12";
 
   src = fetchurl {
     # You can find this code on Github at https://github.com/mdadams/jasper
     # however note at https://www.ece.uvic.ca/~frodo/jasper/#download
     # not all tagged releases are for distribution.
     url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
-    sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l";
+    sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v";
   };
 
   # newer reconf to recognize a multiout flag
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
     moveToOutput bin "$bin"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From 20a5b5beadeffa7a8c1a5f1f7520db560247305f Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <sargon@toppoint.de>
Date: Tue, 7 Mar 2017 16:50:33 +0100
Subject: [PATCH 0235/1744] sshguard: new package

---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   3 +-
 nixos/modules/services/security/sshguard.nix  | 140 ++++++++++++++++++
 ...move-the-unnecessary-from-ipset-cmds.patch |  27 ++++
 pkgs/tools/security/sshguard/default.nix      |  32 ++++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/security/sshguard.nix
 create mode 100644 pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
 create mode 100644 pkgs/tools/security/sshguard/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dd257a49502..58c2a5d4d66 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -446,6 +446,7 @@
   s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+  sargon = "Daniel Ehlers <danielehlers@mindeye.net>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7d2ae4a571c..f60783d7720 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -517,8 +517,9 @@
   ./services/security/munge.nix
   ./services/security/oauth2_proxy.nix
   ./services/security/physlock.nix
-  ./services/security/torify.nix
+  ./services/security/sshguard.nix
   ./services/security/tor.nix
+  ./services/security/torify.nix
   ./services/security/torsocks.nix
   ./services/system/cgmanager.nix
   ./services/system/cloud-init.nix
diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
new file mode 100644
index 00000000000..5a183443f71
--- /dev/null
+++ b/nixos/modules/services/security/sshguard.nix
@@ -0,0 +1,140 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.sshguard;
+in {
+
+  ###### interface
+
+  options = {
+
+    services.sshguard = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to enable the sshguard service.";
+      };
+
+      attack_threshold = mkOption {
+        default = 30;
+        type = types.int;
+        description = ''
+            Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10.
+          '';
+      };
+
+      blacklist_threshold = mkOption {
+        default = null;
+        example = 120;
+        type = types.nullOr types.int;
+        description = ''
+            Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.
+          '';
+      };
+
+      blacklist_file = mkOption {
+        default = "/var/lib/sshguard/blacklist.db";
+        type = types.path;
+        description = ''
+            Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.
+          '';
+      };
+
+      blocktime = mkOption {
+        default = 120;
+        type = types.int;
+        description = ''
+            Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5.
+
+            sshguard unblocks attacks at random intervals, so actual block times will be longer.
+          '';
+      };
+
+      detection_time = mkOption {
+        default = 1800;
+        type = types.int;
+        description = ''
+            Remember potential attackers for up to detection_time seconds before resetting their score.
+          '';
+      };
+
+      whitelist = mkOption {
+        default = [ ];
+        example = [ "198.51.100.56" "198.51.100.2" ];
+        type = types.listOf types.str;
+        description = ''
+            Whitelist a list of addresses, hostnames, or address blocks.
+          '';
+      };
+
+      services = mkOption {
+        default = [ "sshd" ];
+        example = [ "sshd" "exim" ];
+        type = types.listOf types.str;
+        description = ''
+            Systemd services sshguard should receive logs of.
+          '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ];
+
+    environment.etc."sshguard.conf".text = let 
+        list_services = ( name:  "-t ${name} ");
+      in ''
+        BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"
+        LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat"
+      '';
+
+    systemd.services.sshguard =
+      { description = "SSHGuard brute-force attacks protection system";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        partOf = optional config.networking.firewall.enable "firewall.service";
+
+        path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ];
+
+        postStart = ''
+          mkdir -p /var/lib/sshguard
+          ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet
+          ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6
+          ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP
+          ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP
+        '';
+
+        preStop = ''
+          ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP
+          ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
+        '';
+
+        unitConfig.Documentation = "man:sshguard(8)";
+
+        serviceConfig = {
+            Type = "simple";
+            ExecStart = let
+                list_whitelist = ( name:  "-w ${name} ");
+              in ''
+                 ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)}
+              '';
+            PIDFile = "/run/sshguard/sshguard.pid";
+            Restart = "always";
+
+            ReadOnlyDirectories = "/";
+            ReadWriteDirectories = "/run/sshguard /var/lib/sshguard";
+            RuntimeDirectory = "sshguard";
+            CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
+         };
+      };
+  };
+}
diff --git a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
new file mode 100644
index 00000000000..f1233a04b7a
--- /dev/null
+++ b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
@@ -0,0 +1,27 @@
+From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001
+From: Daniel Aleksandersen <code@daniel.priv.no>
+Date: Mon, 13 Mar 2017 16:29:33 +0100
+Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds
+
+---
+ src/fw/sshg-fw-ipset.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh
+index 510bc2c..dc7f86b 100644
+--- a/src/fw/sshg-fw-ipset.sh
++++ b/src/fw/sshg-fw-ipset.sh
+@@ -3,8 +3,8 @@
+ # This file is part of SSHGuard.
+ 
+ fw_init() {
+-    ipset -quiet create -exist sshguard4 hash:ip family=inet
+-    ipset -quiet create -exist sshguard6 hash:ip family=inet6
++    ipset -quiet create -exist sshguard4 hash:ip family inet
++    ipset -quiet create -exist sshguard6 hash:ip family inet6
+ }
+ 
+ fw_block() {
+-- 
+2.10.0
+
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
new file mode 100644
index 00000000000..bb165e53c73
--- /dev/null
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, autoreconfHook, yacc, flex}:
+
+
+stdenv.mkDerivation rec {
+  version = "2.0.0";
+  name = "sshguard-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz";
+    sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06";
+  };
+
+  doCheck = true;
+
+  nativeBuildInputs = [ autoreconfHook yacc flex ];
+
+  configureFlags = [ "--sysconfdir=/etc" ];
+
+  patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ];
+
+  meta = with stdenv.lib; {
+    description = "SSHGuard protects hosts from brute-force attacks";
+    longDescription = ''
+      SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns.
+      If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked.
+    '';
+    homepage = https://sshguard.net;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sargon ];
+    platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d98ce26aff4..d5025e8f7d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3912,6 +3912,8 @@ with pkgs;
 
   snort = callPackage ../applications/networking/ids/snort { };
 
+  sshguard = callPackage ../tools/security/sshguard {};
+
   softhsm = callPackage ../tools/security/softhsm { };
 
   solr = callPackage ../servers/search/solr { };

From 7035325c6243f5630fb8ca823f861057b2ee40d1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 25 Mar 2017 14:12:28 +0000
Subject: [PATCH 0236/1744] citrix-receiver: fix wrapper, direct dl url, $PWD
 needs escaping

(edited by @obadz, closes #24320)
---
 .../remote/citrix-receiver/default.nix           | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index cf7afc37b8b..c656ff24df8 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -22,14 +22,15 @@
 , alsaLib
 }:
 
-stdenv.mkDerivation rec {
+let versionRec = { major = "13"; minor = "4"; patch = "0"; };
+in stdenv.mkDerivation rec {
   name = "citrix-receiver-${version}";
-  version = "13.4.0";
+  version = with versionRec; "${major}.${minor}.${patch}";
   homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
 
   prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
-  src = requireFile rec {
+  src = with versionRec; requireFile rec {
     name = "${prefixWithBitness}-${version}.10109380.tar.gz";
     sha256 =
       if stdenv.is64bit
@@ -41,12 +42,14 @@ stdenv.mkDerivation rec {
 
       ${homepage}
 
-      (if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/)
+      (if you do not find version ${version} there, try at
+      https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
+      or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
 
       Once you have downloaded the file, please use the following command and re-run the
       installation:
 
-      nix-prefetch-url file://$PWD/${name}
+      nix-prefetch-url file://\$PWD/${name}
     '';
   };
 
@@ -135,7 +138,8 @@ stdenv.mkDerivation rec {
     echo "Wrapping wfica..."
     mkdir "$out/bin"
 
-    makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
+    makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+      --add-flags "-icaroot $ICAInstDir" \
       --set ICAROOT "$ICAInstDir" \
       --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

From 422a8b9cd114d013af14cddd9d6128e68e7f5b43 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Mar 2017 10:00:57 -0400
Subject: [PATCH 0237/1744] linux: 4.9.17 -> 4.9.18

---
 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 688a08ceb8e..586627c5925 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.17";
+  version = "4.9.18";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zxcz7h8sy58qibqh1n1f39diywmdl8hd9vr16z9rbpba1jw35ch";
+    sha256 = "1lb18b29ykia9v2ryj1w6chwh19hmv6ynfjhl9p66rsnm09fl3m1";
   };
 
   kernelPatches = args.kernelPatches;

From c0411ea2290f51f8827f0d4413b1605494e8e461 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Mar 2017 10:05:22 -0400
Subject: [PATCH 0238/1744] linux: 4.10.5 -> 4.10.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index d0f891cb00c..01fa2a8fb63 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.5";
+  version = "4.10.6";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04gwdqsngzddxvw34lcy9r03179l6s25qbxmsv5jz5kbczivzg6x";
+    sha256 = "1vjdd0i4k6m8nx5npwz5p3czg61j93wchw5amggrqfaarwy2j6j5";
   };
 
   kernelPatches = args.kernelPatches;

From 9d18de5f88b1da69ad6bbfcd7a607b95d431ecc2 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 26 Mar 2017 16:07:21 +0200
Subject: [PATCH 0239/1744] spark: 1.6.0 ->1.6.3

---
 pkgs/applications/networking/cluster/spark/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index bdcb0a84625..70200972377 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -5,9 +5,9 @@
 
 let
   versionMap = {
-    "1.6.0" = {
+    "1.6.3" = {
                 hadoopVersion = "cdh4";
-                sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+                sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";
               };
     "2.1.0" = {
                 hadoopVersion = "hadoop2.4";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ead43cdab3f..4883b293143 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6092,7 +6092,7 @@ with pkgs;
   self = callPackage_i686 ../development/interpreters/self { };
 
   spark = spark_21;
-  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; };
+  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; };
   spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };

From 23d0f01e9584394d4c05ee6ff395b69d60b8f370 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Mar 2017 10:08:56 -0400
Subject: [PATCH 0240/1744] linux: 4.4.56 -> 4.4.57

---
 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 5a0366eb4ea..c6a220b9c52 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.56";
+  version = "4.4.57";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dm2qas6v73pkq787x2pqhl44xznnhdcvvjnyw75ajwyhqj1w62m";
+    sha256 = "1jmjb7pmk8mjy7pyz58a3xs5rx2m7p6kzy4n9mp000b4zqb2kzwj";
   };
 
   kernelPatches = args.kernelPatches;

From b90d1a4496eebad6fc5bda330da3d01581627e3d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Mar 2017 14:07:20 +0000
Subject: [PATCH 0241/1744] ocamlPackages.fmt: 0.8.0 -> 0.8.2

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

diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index 9994d156a4c..469f808947a 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-fmt-0.8.0";
+  name = "ocaml${ocaml.version}-fmt-0.8.2";
 
   src = fetchurl {
-    url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz;
-    sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px";
+    url = http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz;
+    sha256 = "020qz74cm65bzrywf6kylm93gr5x1ayl6hfmxaql995f6whb388i";
   };
 
   unpackCmd = "tar xjf $src";
 
   buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ];
+  propagatedBuildInputs = [ result uchar ];
 
   inherit (topkg) buildPhase installPhase;
 

From 41699287b676297a78ca886d83c4edb138d9cf0e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Mar 2017 09:40:27 -0500
Subject: [PATCH 0242/1744] vogl: pin to Qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 418de6daefb..1730a60a9a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15882,7 +15882,7 @@ with pkgs;
 
   vnstat = callPackage ../applications/networking/vnstat { };
 
-  vogl = qt57.callPackage ../development/tools/vogl { };
+  vogl = qt56.callPackage ../development/tools/vogl { };
 
   volnoti = callPackage ../applications/misc/volnoti { };
 

From 6b9c81aa1829611094464e4885e6f1b47adf4685 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 26 Mar 2017 16:30:01 +0200
Subject: [PATCH 0243/1744] pcre: 8.39 -> 8.40 + security fix

CVE-2017-7186

refs nixos/security#57 #24319
---
 .../libraries/pcre/CVE-2017-7186.patch        | 52 +++++++++++++++++++
 pkgs/development/libraries/pcre/default.nix   |  6 ++-
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/pcre/CVE-2017-7186.patch

diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch
new file mode 100644
index 00000000000..e9e1997e47c
--- /dev/null
+++ b/pkgs/development/libraries/pcre/CVE-2017-7186.patch
@@ -0,0 +1,52 @@
+--- a/pcre_internal.h	2016/05/21 13:34:44	1649
++++ b/pcre_internal.h	2017/02/24 17:30:30	1688
+@@ -2772,6 +2772,9 @@
+ extern const pcre_uint16 PRIV(ucd_stage2)[];
+ extern const pcre_uint32 PRIV(ucp_gentype)[];
+ extern const pcre_uint32 PRIV(ucp_gbtable)[];
++#ifdef COMPILE_PCRE32
++extern const ucd_record  PRIV(dummy_ucd_record)[];
++#endif
+ #ifdef SUPPORT_JIT
+ extern const int         PRIV(ucp_typerange)[];
+ #endif
+@@ -2780,9 +2783,15 @@
+ /* UCD access macros */
+ 
+ #define UCD_BLOCK_SIZE 128
+-#define GET_UCD(ch) (PRIV(ucd_records) + \
++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
+         PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
+         UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
++        
++#ifdef COMPILE_PCRE32
++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
++#else
++#define GET_UCD(ch) REAL_GET_UCD(ch)
++#endif 
+ 
+ #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
+ #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
+--- a/pcre_ucd.c	2014/06/19 07:51:39	1490
++++ b/pcre_ucd.c	2017/02/24 17:30:30	1688
+@@ -38,6 +38,20 @@
+ const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
+ #else
+ 
++/* If the 32-bit library is run in non-32-bit mode, character values
++greater than 0x10ffff may be encountered. For these we set up a
++special record. */
++
++#ifdef COMPILE_PCRE32
++const ucd_record PRIV(dummy_ucd_record)[] = {{
++  ucp_Common,    /* script */
++  ucp_Cn,        /* type unassigned */
++  ucp_gbOther,   /* grapheme break property */
++  0,             /* case set */
++  0,             /* other case */
++  }};
++#endif
++
+ /* When recompiling tables with a new Unicode version, please check the
+ types in this structure definition from pcre_internal.h (the actual
+ field names will be different):
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index d3499f3e15c..21de038f7d6 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 assert elem variant [ null "cpp" "pcre16" "pcre32" ];
 
 let
-  version = "8.39";
+  version = "8.40";
   pname = if (variant == null) then "pcre"
     else  if (variant == "cpp") then "pcre-cpp"
     else  variant;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
-    sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q";
+    sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0";
   };
 
   outputs = [ "bin" "dev" "out" "doc" "man" ];
@@ -29,6 +29,8 @@ in stdenv.mkDerivation rec {
   ]
     ++ optional (variant != null) "--enable-${variant}";
 
+  patches = [ ./CVE-2017-7186.patch ];
+
   doCheck = with stdenv; !(isCygwin || isFreeBSD);
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra

From 2ad44935f1bf545a97104c5e2430eb296d8e5686 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Mar 2017 14:51:08 +0200
Subject: [PATCH 0244/1744] torbrowser: correct internal note about geoip

---
 .../applications/networking/browsers/torbrowser/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
index da051c227d2..79eea625ade 100644
--- a/pkgs/applications/networking/browsers/torbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -171,8 +171,10 @@ stdenv.mkDerivation rec {
     # having to synchronize between local state and store.
     mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
 
-    # Hard-code paths to geoip data files, to prevent them from being
-    # copied into the local state directory.
+    # Hard-code paths to geoip data files.  TBB resolves the geoip files
+    # relative to torrc-defaults_path but if we do not hard-code them
+    # here, these paths end up being written to the torrc in the user's
+    # state dir.
     cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
     GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
     GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6

From f2cf8ffdcb4b117102b337417151b6e1178aaef7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Mar 2017 16:20:08 +0200
Subject: [PATCH 0245/1744] torbrowser: hard-code path to wrapper in desktop
 file

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

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
index 79eea625ade..3b5173aa91d 100644
--- a/pkgs/applications/networking/browsers/torbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -275,6 +275,8 @@ stdenv.mkDerivation rec {
     # Install .desktop item
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications"/"* $out/share/applications
+    sed -i $out/share/applications/torbrowser.desktop \
+        -e "s,Exec=.*,Exec=$out/bin/tor-browser,"
 
     # Install icons
     mkdir -p $out/share/pixmaps

From 955b79f4629dd7ea8ba6b234c043b97e4ed5e5f5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 26 Mar 2017 17:12:13 +0200
Subject: [PATCH 0246/1744] pcre2: 10.22 -> 10.23 + security fix

CVE-2017-7186

refs nixos/security#57 #24319
---
 pkgs/development/libraries/pcre2/default.nix | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index d226a51d0f8..8df18530472 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "pcre2-${version}";
-  version = "10.22";
+  version = "10.23";
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j";
+    sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz";
   };
 
   configureFlags = [
@@ -14,6 +14,23 @@ stdenv.mkDerivation rec {
     "--enable-jit"
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-7186-part1.patch";
+      url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date";
+      sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr";
+      stripLen = 2;
+      addPrefixes = true;
+    })
+    (fetchpatch {
+      name = "CVE-2017-7186-part2.patch";
+      url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date";
+      sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn";
+      stripLen = 2;
+      addPrefixes = true;
+    })
+  ];
+
   outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
 
   postFixup = ''

From 2fcc32f42bffec94b53278288c2a29d50895fda4 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Sun, 26 Mar 2017 11:18:37 -0400
Subject: [PATCH 0247/1744] groovy: 2.4.8 -> 2.4.10

---
 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 b4a9282e185..1928d51d3e5 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.8";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6";
+    sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 7ddd5012a1e932e26f8dd499d53067550e1b540a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 23 Mar 2017 19:39:15 +0100
Subject: [PATCH 0248/1744] libcxx-4: add pthread_mach_thread_np patch

---
 .../compilers/llvm/4/libc++/default.nix       | 21 ++++++----
 .../4/libc++/pthread_mach_thread_np.patch     | 41 +++++++++++++++++++
 2 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch

diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index ba8302919e1..a43826d7a31 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -10,22 +10,27 @@ stdenv.mkDerivation rec {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
+  # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
+  patches = [ ./pthread_mach_thread_np.patch ];
+
+  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")
   '';
 
-  patchPhase = ''
-    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
-  '';
+  nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   cmakeFlags = [
-      "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
-      "-DLIBCXX_LIBCPPABI_VERSION=2"
-      "-DLIBCXX_CXX_ABI=libcxxabi"
-    ];
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
new file mode 100644
index 00000000000..8c71f1b815d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
@@ -0,0 +1,41 @@
+From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001
+From: Asiri Rathnayake <asiri.rathnayake@arm.com>
+Date: Thu, 26 Jan 2017 10:40:17 +0000
+Subject: [PATCH] Fix chromium build (libcxx)
+
+Remove the reference to pthread_mach_thread_np() in libcxx headers.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/__threading_support | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/include/__threading_support b/include/__threading_support
+index 13ab769..dfe7fe1 100644
+--- a/include/__threading_support
++++ b/include/__threading_support
+@@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
+                           void (*init_routine)(void));
+ 
+ // Thread id
+-#if defined(__APPLE__) && !defined(__arm__)
+-_LIBCPP_THREAD_ABI_VISIBILITY
+-mach_port_t __libcpp_thread_get_port();
+-#endif
+-
+ _LIBCPP_THREAD_ABI_VISIBILITY
+ bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2);
+ 
+@@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
+ }
+ 
+ // Thread id
+-#if defined(__APPLE__) && !defined(__arm__)
+-mach_port_t __libcpp_thread_get_port() {
+-    return pthread_mach_thread_np(pthread_self());
+-}
+-#endif
+-
+ // Returns non-zero if the thread ids are equal, otherwise 0
+ bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2)
+ {

From fb50abba2e0c8738b3a92142488e57ef3c631495 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sun, 26 Mar 2017 09:09:02 -0700
Subject: [PATCH 0249/1744] vis: 2016-10-09 -> 0.3

---
 pkgs/applications/editors/vis/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index f6760895b57..921018531ea 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -1,18 +1,15 @@
 { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
 , ncurses, libtermkey, lpeg, lua
 , acl ? null, libselinux ? null
-, version ? "2016-10-09"
-, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1"
-, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90"
 }:
 
 stdenv.mkDerivation rec {
-  name = "vis-unstable-${version}";
-  inherit version;
+  name = "vis-${version}";
+  version  = "0.3";
 
   src = fetchFromGitHub {
-    inherit sha256;
-    inherit rev;
+    rev = "v${version}";
+    sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk";
     repo = "vis";
     owner = "martanne";
   };

From 68729958e889b7db114fcb3f5ca297d28ae59165 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 11 Feb 2017 16:46:55 +0100
Subject: [PATCH 0250/1744] network-interfaces: reload bridges on conf changes

And adopt the tests to add an interface and remove it again.

It should work when deactivating rstp, it will not work when activating
rstp for the first bridge as then the userspace daemon is not yet
available. But once one bridge is active with stp, it should work with
the reload for any further bridge.

Fixes #21745. Also see #22547.
---
 .../tasks/network-interfaces-scripted.nix     |  25 ++++
 nixos/release.nix                             |   1 +
 nixos/tests/containers-restart_networking.nix | 114 ++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 nixos/tests/containers-restart_networking.nix

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 3571e00d04e..f30906b84a2 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -239,6 +239,10 @@ let
                 ip link set "${i}" master "${n}"
                 ip link set "${i}" up
               '')}
+              # Save list of enslaved interfaces
+              echo "${flip concatMapStrings v.interfaces (i: ''
+                ${i}
+              '')}" > /run/${n}.interfaces
 
               # Enable stp on the interface
               ${optionalString v.rstp ''
@@ -250,7 +254,28 @@ let
             postStop = ''
               ip link set "${n}" down || true
               ip link del "${n}" || true
+              rm -f /run/${n}.interfaces
             '';
+            reload = ''
+              # Un-enslave child interfaces (old list of interfaces)
+              for interface in `cat /run/${n}.interfaces`; do
+                ip link set "$interface" nomaster up
+              done
+
+              # Enslave child interfaces (new list of interfaces)
+              ${flip concatMapStrings v.interfaces (i: ''
+                ip link set "${i}" master "${n}"
+                ip link set "${i}" up
+              '')}
+              # Save list of enslaved interfaces
+              echo "${flip concatMapStrings v.interfaces (i: ''
+                ${i}
+              '')}" > /run/${n}.interfaces
+
+              # (Un-)set stp on the bridge
+              echo ${if v.rstp then "2" else "0"} > /sys/class/net/${n}/bridge/stp_state
+            '';
+            reloadIfChanged = true;
           });
 
         createVswitchDevice = n: v: nameValuePair "${n}-netdev"
diff --git a/nixos/release.nix b/nixos/release.nix
index 3535690a8e6..523d6e291ac 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -228,6 +228,7 @@ in rec {
   tests.containers-imperative = callTest tests/containers-imperative.nix {};
   tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {};
   tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {};
+  tests.containers-restart_networking = callTest tests/containers-restart_networking.nix {};
   tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};
   tests.containers-hosts = callTest tests/containers-hosts.nix {};
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
new file mode 100644
index 00000000000..086d056c51c
--- /dev/null
+++ b/nixos/tests/containers-restart_networking.nix
@@ -0,0 +1,114 @@
+# Test for NixOS' container support.
+
+let
+  client_base = rec {
+    networking.firewall.enable = false;
+
+    containers.webserver = {
+      autoStart = true;
+      privateNetwork = true;
+      hostBridge = "br0";
+      config = {
+        networking.firewall.enable = false;
+        networking.firewall.allowPing = true;
+        networking.interfaces.eth0.ip4 = [
+          { address = "192.168.1.122"; prefixLength = 24; }
+        ];
+      };
+    };
+  };
+in import ./make-test.nix ({ pkgs, lib, ...} :
+{
+  name = "containers-restart_networking";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ kampfschlaefer ];
+  };
+
+  nodes = {
+    client = { lib, pkgs, ... }: client_base // {
+      virtualisation.vlans = [ 1 ];
+
+      networking.bridges.br0 = {
+        interfaces = [];
+        rstp = false;
+      };
+      networking.interfaces = {
+        eth1.ip4 = lib.mkOverride 0 [ ];
+        br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }];
+      };
+
+    };
+    client_eth1 = { lib, pkgs, ... }: client_base // {
+      networking.bridges.br0 = {
+        interfaces = [ "eth1" ];
+        rstp = false;
+      };
+      networking.interfaces = {
+        eth1.ip4 = lib.mkOverride 0 [ ];
+        br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+      };
+    };
+    client_eth1_rstp = { lib, pkgs, ... }: client_base // {
+      networking.bridges.br0 = {
+        interfaces = [ "eth1" ];
+        rstp = true;
+      };
+      networking.interfaces = {
+        eth1.ip4 = lib.mkOverride 0 [ ];
+        br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+      };
+    };
+  };
+
+  testScript = {nodes, ...}: let
+    originalSystem = nodes.client.config.system.build.toplevel;
+    eth1_bridged = nodes.client_eth1.config.system.build.toplevel;
+    eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel;
+  in ''
+    $client->start();
+
+    $client->waitForUnit("default.target");
+
+    subtest "initial state", sub {
+      $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+      $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+
+      $client->fail("ip l show eth1 |grep \"master br0\" >&2");
+      $client->fail("grep eth1 /run/br0.interfaces >&2");
+    };
+
+    subtest "interfaces without stp", sub {
+      $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2");
+
+      $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+      $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
+
+      $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
+      $client->succeed("grep eth1 /run/br0.interfaces >&2");
+    };
+
+    # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity
+    #subtest "interfaces with rstp", sub {
+    #  $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2");
+    #  $client->execute("ip -4 a >&2");
+    #  $client->execute("ip l >&2");
+    #
+    #  $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+    #  $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
+    #
+    #  $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
+    #  $client->succeed("grep eth1 /run/br0.interfaces >&2");
+    #};
+
+    subtest "back to no interfaces and no stp", sub {
+      $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2");
+
+      $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+      $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+
+      $client->fail("ip l show eth1 |grep \"master br0\" >&2");
+      $client->fail("grep eth1 /run/br0.interfaces >&2");
+    };
+  '';
+
+})

From aa0fb8f8efbc21843fcab97d30005669ebe6464e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 26 Mar 2017 18:48:56 +0200
Subject: [PATCH 0251/1744] idea.idea-ultimate: 2016.3.4 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 6ea5590106b..6c956dde395 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -208,12 +208,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.3.4";
+    version = "2017.1";
     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}.tar.gz";
-      sha256 = "1ichjrdmnhyqv9cr73d8kif9l53k3x36i8js8nf9cmkbhdsfckn3";
+      sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225";
     };
     wmClass = "jetbrains-idea";
   };

From 83be684608e3a75bde710f857ca69375ce42206a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 26 Mar 2017 19:28:46 +0200
Subject: [PATCH 0252/1744] filezilla: 3.25.0 -> 3.25.1

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 95e0c502749..ffc22429d1e 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.25.0"; in
+let version = "3.25.1"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1b1lb1zvm887xy3q9i5ziqvwk4ww2pd81a1msbwjrxzy5lq5ykhh";
+    sha256 = "1h9g26i16wvc3yjavd39lxifr8d21q9mvfidnwjp9ksrc1qvwww8";
   };
 
   configureFlags = [

From 84b768456a66b3532ee1142d1338bafdf0579c1e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Mar 2017 13:16:34 -0500
Subject: [PATCH 0253/1744] dropbox: 21.4.25 -> 22.4.24

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 6d3c34b48d5..028ca2e7397 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -22,11 +22,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "21.4.25";
+  version = "22.4.24";
   sha256 =
     {
-      "x86_64-linux" = "1pgab1ah6rl30rm4dj0biq5714pfzd5jjd2bp0nmhdqn1hm5vmhv";
-      "i686-linux"   = "05kn8qman8ghknb0chrlmcxrxg7w6l79frkaqj6blgnhanh13h4n";
+      "x86_64-linux" = "1353mwk8hjqfc9a87zrp12klsc4anrxr7ccai4cffnq0yw2pnbfp";
+      "i686-linux"   = "07gpdxq61qkj3c4aywh61zwj34w7j24gcv5y2xf2qgcwn8bykks2";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From eef066d05ca4f3236cee0d9ac92e7ccc5c4d6a47 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sun, 26 Mar 2017 21:22:52 +0300
Subject: [PATCH 0254/1744] way-cooler: init at 0.5.2

---
 lib/maintainers.nix                           |  1 +
 .../window-managers/way-cooler/default.nix    | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+)
 create mode 100755 pkgs/applications/window-managers/way-cooler/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4f9754445fa..e6c44aa81b1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -316,6 +316,7 @@
   michalrus = "Michal Rus <m@michalrus.com>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
   mikefaille = "Michaël Faille <michael@faille.io>";
+  miltador = "Vasiliy Solovey <miltador@yandex.ua>";
   mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
   mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
new file mode 100755
index 00000000000..d9d84e83430
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
+, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "way-cooler-${version}";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "way-cooler";
+    repo = "way-cooler";
+    rev = "v${version}";
+    sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
+  };
+
+  depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc";
+
+  buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Customizable Wayland compositor (window manager)";
+    longDescription = ''
+      Way Cooler is a customizable tiling window manager written in Rust
+      for Wayland and configurable using Lua. It is heavily inspired by
+      the tiling and extensibility of both i3 and awesome. While Lua is
+      used for the configuration, like awesome, extensions for Way Cooler
+      are implemented as totally separate client programs using D-Bus.
+      This means that you can use virtually any language to extend the
+      window manager, with much better guarantees about interoperability
+      between extensions.
+    '';
+    homepage = http://way-cooler.org/;
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.miltador ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1730a60a9a9..87cf7d19665 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15917,6 +15917,8 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  way-cooler = callPackage ../applications/window-managers/way-cooler {};
+
   wayv = callPackage ../tools/X11/wayv {};
 
   weechat = callPackage ../applications/networking/irc/weechat {

From a4ac5506f57f767fd53aebd0eeea8db4c911f83f Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Fri, 24 Mar 2017 01:27:49 +0000
Subject: [PATCH 0255/1744] google-compute-image: fix Yama LSM option conflict

Having fixed the Google Compute Engine image build process's copying
of store paths in PR #24264, I ran `nixos-rebuild --upgrade switch`...
and the GCE image broke again, because it sets the NixOS configuration
option for the sysctl variable `kernel.yama.ptrace_scope` to
`mkDefault "1"`, i.e., with override priority 1000, and now the
`sysctl` module sets the same option to `mkDefault "0"` (this was
changed in commit 86721a5f78718caf10c578e9501f8b4d19c0eb44).

This patch raises the override priority of the Google Compute Engine
image configuration's definition of the Yama sysctl option to 500
(still lower than the priority of an unmodified option definition).

I have tested that this patch allows the Google Compute Engine image
to again build successfully for me.
---
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index a03c45bfeff..a3dd3bd55d1 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -261,7 +261,7 @@ in
     "kernel.kptr_restrict" = mkDefault "1";
 
     # set ptrace protections
-    "kernel.yama.ptrace_scope" = mkDefault "1";
+    "kernel.yama.ptrace_scope" = mkOverride 500 "1";
 
     # set perf only available to root
     "kernel.perf_event_paranoid" = mkDefault "2";

From ef8c0d1388e17e0f8aa76f9623411f336f66dca5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Dec 2016 21:12:49 +0100
Subject: [PATCH 0256/1744] signing-party: Fix deps and include all tools

Additional tools:
- gpg-key2latex
- gpgdir
- gpgwrap

This module is really hacky and the dependencies are very messy... :o

However I tried my best at testing all 19 individual tools and they
should (hopefully) all work now (apart from sendmail which can be
provided by multiple packages) :)

The code is very redundant (sorry) but imho it's easier to read and
maintain it that way.

TODO: There are some additional manual pages that could be included (I'm
too exhausted for that atm...). And there might be a lot of stuff that
could be improved in the future.
---
 pkgs/tools/security/signing-party/default.nix | 234 ++++++++++++++----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 191 insertions(+), 46 deletions(-)

diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index ea6b7411c4e..e6abb72b43d 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -1,73 +1,217 @@
-{ stdenv, fetchurl, makeWrapper, autoconf, automake
-, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat
-, perlPackages }:
+{ stdenv, fetchurl, autoconf, automake, makeWrapper
+, python, perl, perlPackages
+, libmd, gnupg1, which, getopt, libpaper, nettools, qprint
+, sendmailPath ? "/run/wrappers/bin/sendmail" }:
 
+let
+  # All runtime dependencies from the CPAN graph:
+  # https://widgets.stratopan.com/wheel?q=GnuPG-Interface-0.52&runtime=1&fs=1
+  # TODO: XSLoader seems optional
+  GnuPGInterfaceRuntimeDependencies = with perlPackages; [
+    strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny
+    GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate
+    RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader
+  ];
+in
 stdenv.mkDerivation rec {
+  pname = "signing-party";
   version = "2.5";
-  basename = "signing-party";
-  name = "${basename}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz";
+    url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz";
     sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2";
   };
 
   sourceRoot = ".";
 
+  # TODO: Get this patch upstream...
   patches = [ ./gpgwrap_makefile.patch ];
 
   postPatch = ''
-    substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail"
+    substituteInPlace gpg-mailkeys/gpg-mailkeys --replace \
+      "/usr/sbin/sendmail" "${sendmailPath}"
   '';
 
+  # One can use the following command to find all relevant Makefiles:
+  # grep -R '$(DESTDIR)/usr' | cut -d: -f1 | sort -u | grep -v 'debian/rules'
   preBuild = ''
-    substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out"
-    substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out"
-    substituteInPlace keylookup/Makefile --replace "\$(DESTDIR)/usr" "$out"
-    substituteInPlace springgraph/Makefile --replace "\$(DESTDIR)/usr" "$out"
-    substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out"
+    substituteInPlace gpgsigs/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace keyanalyze/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace keylookup/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace sig2dot/Makefile --replace '$(DESTDIR)/usr' "$out"
+    substituteInPlace springgraph/Makefile --replace '$(DESTDIR)/usr' "$out"
   '';
 
+  # Perl is required for it's pod2man.
+  # Python and Perl are required for patching the script interpreter paths.
   nativeBuildInputs = [ autoconf automake makeWrapper ];
-  buildInputs = [ gnupg perl python libmd ] ++
-    (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]);
-
-  installFlags = [ "DESTDIR=\${out}" ];
+  buildInputs = [ python perl perlPackages.GnuPGInterface libmd gnupg1 ];
 
   postInstall = ''
-    install -m 755 \
-      caff/caff caff/pgp-clean caff/pgp-fixkey \
-      gpglist/gpglist \
-      gpgparticipants/gpgparticipants \
-      gpgparticipants/gpgparticipants-prefill \
-      gpgsigs/gpgsigs \
-      gpg-key2ps/gpg-key2ps \
-      gpg-mailkeys/gpg-mailkeys \
-      keyart/keyart \
-      $out/bin
+    # Install all tools which aren't handled by 'make install'.
+    # TODO: Fix upstream...!
 
-    install -m 644 \
-      caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \
-      gpglist/gpglist.1 \
-      gpgparticipants/gpgparticipants-prefill.1 \
-      gpgparticipants/gpgparticipants.1 \
-      gpgsigs/gpgsigs.1 \
-      gpg-key2ps/gpg-key2ps.1 \
-      gpg-mailkeys/gpg-mailkeys.1 \
-      $out/share/man/man1
+    # caff: CA - Fire and Forget signs and mails a key
+    install -D -m555 caff/caff $out/bin/caff;
+    install -D -m444 caff/caff.1 $out/share/man/man1/caff.1;
 
-    wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}"
-    wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}"
+    # pgp-clean: removes all non-self signatures from key
+    install -D -m555 caff/pgp-clean $out/bin/pgp-clean;
+    install -D -m444 caff/pgp-clean.1 $out/share/man/man1/pgp-clean.1;
+
+    # pgp-fixkey: removes broken packets from keys
+    install -D -m555 caff/pgp-fixkey $out/bin/pgp-fixkey;
+    install -D -m444 caff/pgp-fixkey.1 $out/share/man/man1/pgp-fixkey.1;
+
+    # gpg-mailkeys: simply mail out a signed key to its owner
+    install -D -m555 gpg-mailkeys/gpg-mailkeys $out/bin/gpg-mailkeys;
+    install -D -m444 gpg-mailkeys/gpg-mailkeys.1 $out/share/man/man1/gpg-mailkeys.1;
+
+    # gpg-key2ps: generate PostScript file with fingerprint paper slips
+    install -D -m555 gpg-key2ps/gpg-key2ps $out/bin/gpg-key2ps;
+    install -D -m444 gpg-key2ps/gpg-key2ps.1 $out/share/man/man1/gpg-key2ps.1;
+
+    # gpgdir: recursive directory encryption tool
+    install -D -m555 gpgdir/gpgdir $out/bin/gpgdir;
+    install -D -m444 gpgdir/gpgdir.1 $out/share/man/man1/gpgdir.1;
+
+    # gpglist: show who signed which of your UIDs
+    install -D -m555 gpglist/gpglist $out/bin/gpglist;
+    install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1;
+
+    # gpgsigs: annotates list of GnuPG keys with already done signatures
+    # Handled by 'make install'
+
+    # gpgparticipants: create list of party participants for the organiser
+    install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants;
+    install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1;
+    install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill;
+    install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1;
+
+    # gpgwrap: a passphrase wrapper
+    install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap;
+    install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1;
+
+    # keyanalyze: minimum signing distance (MSD) analysis on keyrings
+    # Handled by 'make install'
+
+    # keylookup: ncurses wrapper around gpg --search
+    # Handled by 'make install'
+
+    # sig2dot: converts a list of GnuPG signatures to a .dot file
+    # Handled by 'make install'
+
+    # springgraph: creates a graph from a .dot file
+    # Handled by 'make install'
+
+    # keyart: creates a random ASCII art of a PGP key file
+    install -D -m555 keyart/keyart $out/bin/keyart;
+    install -D -m444 keyart/doc/keyart.1 $out/share/man/man1/keyart.1;
+
+    # gpg-key2latex: generate LaTeX file with fingerprint paper slips
+    install -D -m555 gpg-key2latex/gpg-key2latex $out/bin/gpg-key2latex;
+    install -D -m444 gpg-key2latex/gpg-key2latex.1 $out/share/man/man1/gpg-key2latex.1;
   '';
 
-  doCheck = false; # no tests
+  postFixup = ''
+    # Add the runtime dependencies for all programs (but mainly for the Perl
+    # scripts)
 
-  meta = {
-    description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc";
-    homepage = http://pgp-tools.alioth.debian.org;
-    platforms = gnupg.meta.platforms;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ fpletz ];
+    wrapProgram $out/bin/caff --set PERL5LIB \
+      ${with perlPackages; stdenv.lib.makePerlPath ([
+        TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ]
+        ++ GnuPGInterfaceRuntimeDependencies)} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}"
+
+    wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
+      ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}"
+
+    wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}"
+
+    wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 qprint ]}"
+
+    wrapProgram $out/bin/gpgdir --set PERL5LIB \
+      ${with perlPackages; stdenv.lib.makePerlPath ([
+        TermReadKey ]
+        ++ GnuPGInterfaceRuntimeDependencies)}
+
+    wrapProgram $out/bin/gpglist --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+    wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ getopt gnupg1 ]}"
+
+#    wrapProgram $out/bin/gpgparticipants-prefill
+
+    wrapProgram $out/bin/gpgsigs --set PERL5LIB \
+      ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+    wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+#    wrapProgram $out/bin/keyanalyze --set PERL5LIB \
+
+    wrapProgram $out/bin/keyart --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+    wrapProgram $out/bin/keylookup --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+    wrapProgram $out/bin/pgp-clean --set PERL5LIB \
+      ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+    wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
+      ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+#    wrapProgram $out/bin/pgpring
+
+#    wrapProgram $out/bin/process_keys
+
+     # Upstream-Bug: Seems like sig2dot doesn't work with 2.1 (modern) anymore,
+     # please use 2.0 (stable) instead.
+#    wrapProgram $out/bin/sig2dot
+
+    wrapProgram $out/bin/springgraph --set PERL5LIB \
+      ${with perlPackages; stdenv.lib.makePerlPath [ GD ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://pgp-tools.alioth.debian.org/";
+    description = "A collection of several projects relating to OpenPGP";
+    longDescription = ''
+      This is a collection of several projects relating to OpenPGP.
+
+      * caff: CA - Fire and Forget signs and mails a key
+      * pgp-clean: removes all non-self signatures from key
+      * pgp-fixkey: removes broken packets from keys
+      * gpg-mailkeys: simply mail out a signed key to its owner
+      * gpg-key2ps: generate PostScript file with fingerprint paper slips
+      * gpgdir: recursive directory encryption tool
+      * gpglist: show who signed which of your UIDs
+      * gpgsigs: annotates list of GnuPG keys with already done signatures
+      * gpgparticipants: create list of party participants for the organiser
+      * gpgwrap: a passphrase wrapper
+      * keyanalyze: minimum signing distance (MSD) analysis on keyrings
+      * keylookup: ncurses wrapper around gpg --search
+      * sig2dot: converts a list of GnuPG signatures to a .dot file
+      * springgraph: creates a graph from a .dot file
+      * keyart: creates a random ASCII art of a PGP key file
+      * gpg-key2latex: generate LaTeX file with fingerprint paper slips
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fpletz primeos ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f790bbf29ed..dfecb3f7212 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -95,6 +95,7 @@ doNotDisplayTwice rec {
   nfsUtils = nfs-utils;  # added 2014-12-06
   opencl-icd = ocl-icd; # added 2017-01-20
   owncloudclient = owncloud-client;  # added 2016-08
+  pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87cf7d19665..4da7d503d45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3899,7 +3899,7 @@ with pkgs;
 
   sigil = libsForQt56.callPackage ../applications/editors/sigil { };
 
-  # aka., gpg-tools
+  # aka., pgp-tools
   signing-party = callPackage ../tools/security/signing-party { };
 
   silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };

From e2ad762394778627d170a69809e754eb839cd06c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 26 Mar 2017 16:17:42 -0300
Subject: [PATCH 0257/1744] lxqt-panel: fix for `explicit` (a C++11 keyword)
 being used as variable

It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time.  Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.
---
 pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index dfbd39acaa3..d2faf9c0eee 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchFromGitHub, standardPatch,
+  stdenv, fetchFromGitHub, fetchurl, standardPatch,
   cmake, pkgconfig, lxqt-build-tools,
   qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
   kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
@@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
     lxmenu-data
   ];
 
+  patches = [
+    (fetchurl {
+       url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
+       sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
+    })
+  ];
+
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
   postPatch = standardPatch;

From 72a0d65d3d0c923900e958c8d788f28527e78881 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sun, 31 Jul 2016 14:41:56 -0500
Subject: [PATCH 0258/1744] update skarnet.org packages

execline:          2.1.4.5 -> 2.2.0.0
s6-dns:            2.0.0.7 -> 2.1.0.0
s6-linux-utils:    2.0.2.3 -> 2.2.0.0
s6-networking:     2.1.0.4 -> 2.2.1.0
s6-portable-utils: 2.1.0.0 -> 2.1.0.0 (no version change)
s6-rc:             0.0.2.1 -> 0.1.0.0
s6:                2.2.4.3 -> 2.4.0.0
skalibs:           2.3.9.0 -> 2.4.0.1

Also use new --enable-absolute-paths configure arg to correctly set
paths to runtime executables to point within the nix store rather than
relying on PATH resolution.
---
 pkgs/development/libraries/skalibs/default.nix    |  4 ++--
 pkgs/os-specific/linux/s6-linux-utils/default.nix |  5 +++--
 pkgs/tools/misc/execline/default.nix              |  5 +++--
 pkgs/tools/misc/s6-portable-utils/default.nix     | 11 +++++------
 pkgs/tools/networking/s6-dns/default.nix          |  5 +++--
 pkgs/tools/networking/s6-networking/default.nix   |  5 +++--
 pkgs/tools/system/s6-rc/default.nix               |  5 +++--
 pkgs/tools/system/s6/default.nix                  | 10 +++-------
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 93142c269c2..3c137872707 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.9.0";
+  version = "2.4.0.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/skalibs";
     rev = "refs/tags/v${version}";
-    sha256 = "1x52mgf39yiijsj63x0ibp6d3nj0d4z9k9lisa4rzsxs7846za4a";
+    sha256 = "1sdzm2vd9mxlwxbmjajb6n1n13dpsavdap2nbbnyx4wnzixxx9k7";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index c6065dbfca2..52d7446e48c 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.2.3";
+  version = "2.2.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -10,12 +10,13 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
-    sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr";
+    sha256 = "1y9mva7wk1ca2djq3qjh7hz756zk57yv7ljdnldn7k7jzfmlaxsq";
   };
 
   dontDisableStatic = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--includedir=\${prefix}/include"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index f34c9b6db23..6dbc2290f01 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.1.4.5";
+  version = "2.2.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/execline";
     rev = "refs/tags/v${version}";
-    sha256 = "01hfh2gmap3qd9qc5ncp1sxagrsi8q6cdjxxspwpmrc4d4cmzcr0";
+    sha256 = "1795n6s0sp9hw8amx2hs9r395gv4c5sn63g077g1gal1vcpkcssn";
   };
 
   dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--libdir=\${prefix}/lib"
     "--includedir=\${prefix}/include"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index b16806139b4..c3156650551 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, skalibs, gcc }:
+{ stdenv, fetchurl, skalibs, gcc }:
 
 with stdenv.lib;
 
@@ -6,11 +6,9 @@ stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
   version = "2.1.0.0";
 
-  src = fetchFromGitHub {
-    owner = "skarnet";
-    repo = "s6-portable-utils";
-    rev = "v${version}";
-    sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9";
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
+    sha256 = "0khw5ljmlghvl4hyrf4vd0hl5rrmsspchi8w4xgniwfip6vlbqfd";
   };
 
   dontDisableStatic = true;
@@ -19,6 +17,7 @@ stdenv.mkDerivation rec {
   ++ optional stdenv.isDarwin gcc;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index a8bbe8b71ab..067f80c42a9 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.0.7";
+  version = "2.1.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-dns";
     rev = "refs/tags/v${version}";
-    sha256 = "1f9a4bjpsqhs9aq0zam74mj6zn1ffaljgp98hqj9j83d2jlvqpv5";
+    sha256 = "126ikznsw0hlk4mmf03yxzfnvcw823g5il1vfs3a5fa9q26xyc72";
   };
 
   dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--includedir=\${prefix}/include"
     "--libdir=\${prefix}/lib"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index fa7994e8f8f..1ddd4fad4dc 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.1.0.4";
+  version = "2.2.1.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-networking";
     rev = "refs/tags/v${version}";
-    sha256 = "0rm0vpfshayhi5qwsvkgzdjmg43lvslp74h7lda964p72wr6gahg";
+    sha256 = "0msfssd42pdwch0z8rhrm7hd4ps9d730az92vg0pnz769xs8kjx0";
   };
 
   dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-include=${execline}/include"
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 02c76798fd7..31c01409eb2 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.0.2.1";
+  version = "0.1.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-rc";
     rev = "refs/tags/v${version}";
-    sha256 = "1gh72q1h1ds53yrzp481nvzaxkhhpm2kv59pfx4x564gxwdvq3a6";
+    sha256 = "1izjss1vfmkrkbgpzxlh0krkd2zin9d77ykr6i08rhixz7c2am0r";
   };
 
   dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-include=${execline}/include"
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 84e79442ffa..19045a8c790 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.2.4.3";
+  version = "2.4.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6";
     rev = "refs/tags/v${version}";
-    sha256 = "1jlavi3q6wmcxdcwsy42qcgfkl0ag6hwcgmi4g67dvqs9nqjq2a3";
+    sha256 = "0yf9apl05g1gxqwh01yd1iyg0xm50ywnlwp4szd08sg0srmvys16";
   };
 
   dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
+    "--enable-absolute-paths"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-include=${execline}/include"
@@ -30,11 +31,6 @@ in stdenv.mkDerivation rec {
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
-  preBuild = ''
-    substituteInPlace "src/daemontools-extras/s6-log.c" \
-      --replace '"execlineb"' '"${execline}/bin/execlineb"'
-  '';
-
   meta = {
     homepage = http://www.skarnet.org/software/s6/;
     description = "skarnet.org's small & secure supervision software suite";

From 5fe81c1bdb8b1331cef33231d642940b3ff026a0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Mar 2017 21:34:49 +0200
Subject: [PATCH 0259/1744] grsecurity: 4.9.17-201703221829 ->
 4.9.18-201703261106

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b17209bca0e..d009a4fd11f 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.17";
+  version = "4.9.18";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "35mcvjl686xjgnbxrz2z84gg4q1m9y7wp541sg9k3jadlgsdyqrynz09j3lx3f5v40a83xmr5j3clavjaij16bl4imi716z7vjkfryx";
+    sha512 = "0l60ny68qwjf585x84yxipndv2g00g08rm4k6hd7k8s93kf3h7lvspsbdg1g1nw50g8dc3n0w31pqads7b2ha6zf39jh77cx7449rn3";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0520a0425bf..cd535a522d3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.17";
-      grrev  = "201703221829";
-      sha512 = "3br0xdjj95k8qnri83jj67s1lb4q6ws6irhdlr9kcyxj1384kipkfz8ciafs7zd3vqyfgsmdc56lmfpiyq5cx4dggy95qykx86ip787";
+    { kver   = "4.9.18";
+      grrev  = "201703261106";
+      sha512 = "2zr38i847fpxi631kv4l88zgj9xzc8fvyjyk5db4d53n35pp7vxdw4iq89wp6z1n5hmzwdp5kqvq3z3hn9va3yvhh88aq0dza48lgfx";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 829b68844a46bbcf938218c1e4880eceeb2d27ec Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sun, 26 Mar 2017 22:15:16 +0200
Subject: [PATCH 0260/1744] shrikhand: init 2016-03-03

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

diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix
new file mode 100644
index 00000000000..942a284e2c0
--- /dev/null
+++ b/pkgs/data/fonts/shrikhand/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "2016-03-03";
+  name = "shrikhand-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jonpinhorn";
+    repo = "shrikhand";
+    rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394";
+    sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk";
+  };
+
+  installPhase = ''
+    install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://jonpinhorn.github.io/shrikhand/;
+    description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
+    maintainers = with maintainers; [ sternenseemann ];
+    platforms = platforms.all;
+    license = licenses.ofl;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3a1d42be71..62380c21e1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3897,6 +3897,8 @@ with pkgs;
 
   shellinabox = callPackage ../servers/shellinabox { };
 
+  shrikhand = callPackage ../data/fonts/shrikhand { };
+
   sic = callPackage ../applications/networking/irc/sic { };
 
   siege = callPackage ../tools/networking/siege {};

From 167aba003a6360347fb24aa05b761d05c924b0a9 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 26 Mar 2017 18:15:59 -0400
Subject: [PATCH 0261/1744] capnproto: fix on clang 4

Embedding the patch because the way they build their source releases
changes the paths, so fetchpatch against GitHub doesn't apply cleanly
---
 .../libraries/capnproto/clang4.patch          | 22 +++++++++++++++++++
 .../libraries/capnproto/default.nix           |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/capnproto/clang4.patch

diff --git a/pkgs/development/libraries/capnproto/clang4.patch b/pkgs/development/libraries/capnproto/clang4.patch
new file mode 100644
index 00000000000..e83abe9f433
--- /dev/null
+++ b/pkgs/development/libraries/capnproto/clang4.patch
@@ -0,0 +1,22 @@
+From 0f1fd1938b19dccdb5dbfe9cb5177c4342a2a5b5 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier <eric@efcs.ca>
+Date: Thu, 29 Dec 2016 14:23:40 -0700
+Subject: [PATCH] Fix conversion build error when building with Clang 4.0
+
+---
+ c++/src/capnp/layout.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/c++/src/capnp/layout.h b/c++/src/capnp/layout.h
+index 850925a..b955f08 100644
+--- a/src/capnp/layout.h
++++ b/src/capnp/layout.h
+@@ -126,7 +126,7 @@template <> struct ElementSizeForType<Void> { static constexpr ElementSize value
+ template <> struct ElementSizeForType<bool> { static constexpr ElementSize value = ElementSize::BIT; };
+ 
+ // Lists and blobs are pointers, not structs.
+-template <typename T, bool b> struct ElementSizeForType<List<T, b>> {
++template <typename T, Kind K> struct ElementSizeForType<List<T, K>> {
+   static constexpr ElementSize value = ElementSize::POINTER;
+ };
+ template <> struct ElementSizeForType<Text> {
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 839d48e488f..0a5df88efdb 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
   };
 
+  patches = [
+    # Remove once they release a version above 0.5.3. See https://github.com/sandstorm-io/capnproto/issues/433
+    ./clang4.patch
+  ];
+
   meta = with stdenv.lib; {
     homepage    = "http://kentonv.github.io/capnproto";
     description = "Cap'n Proto cerealization protocol";

From df4b6ae3ba69350f7cc5f66fa55e116958459ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 27 Mar 2017 00:18:05 +0200
Subject: [PATCH 0262/1744] vis: use correct separator for LUA_CPATH/LUA_PATH

---
 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 921018531ea..291c7b1b412 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     cp $desktopItem/share/applications/* $out/share/applications
     echo wrapping $out/bin/vis with runtime environment
     wrapProgram $out/bin/vis \
-      --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
-      --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
+      --prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
+      --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
       --prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
   '';
 

From 09a5007797e96ae5d1b2318bb164ec9c81215561 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sun, 26 Mar 2017 17:30:41 -0500
Subject: [PATCH 0263/1744] skarnet.org packages: fix darwin build

The configure scripts have been changed so that `--build` is now the
way to specify (non-cross compiling) build target, which is necessary
on darwin for binary compatibility across darwin versions.
---
 pkgs/development/libraries/skalibs/default.nix  |  2 +-
 pkgs/tools/misc/execline/default.nix            |  2 +-
 pkgs/tools/misc/s6-portable-utils/default.nix   | 12 +++++++-----
 pkgs/tools/networking/s6-dns/default.nix        |  2 +-
 pkgs/tools/networking/s6-networking/default.nix |  2 +-
 pkgs/tools/system/s6-rc/default.nix             |  2 +-
 pkgs/tools/system/s6/default.nix                |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 3c137872707..b87662a6e34 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   # Explicitly setting target ensures code can be compiled against a skalibs
   # binary built on a different version of darwin.
   # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/skalibs/;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 6dbc2290f01..5010343d3c7 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/execline/;
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index c3156650551..bf5a158625c 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -13,17 +13,19 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  nativeBuildInputs = []
-  ++ optional stdenv.isDarwin gcc;
-
   configureFlags = [
     "--enable-absolute-paths"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
-  ];
-
+  ]
+  # On darwin, the target triplet from -dumpmachine includes version number, but
+  # skarnet.org software uses the triplet to test binary compatibility.
+  # Explicitly setting target ensures code can be compiled against a skalibs
+  # binary built on a different version of darwin.
+  # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 067f80c42a9..8ea134843c3 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-dns/;
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 1ddd4fad4dc..6574a02bb92 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${s6}/lib"
     "--with-dynlib=${s6Dns}/lib"
   ]
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-networking/;
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 31c01409eb2..763d4406668 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${s6}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/s6-rc/;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 19045a8c790..67acb8ac3dc 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${execline}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6/;

From 310bb3e6bb61ed6983c1d88899d3110851f84809 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Mar 2017 19:04:21 -0400
Subject: [PATCH 0264/1744] linux: 4.11-rc3 -> 4.11-rc4

---
 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 5f0d2db27f2..4606fc922a6 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11-rc3";
-  modDirVersion = "4.11.0-rc3";
+  version = "4.11-rc4";
+  modDirVersion = "4.11.0-rc4";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "07y54bl2i4qsz36hwbp3k56k8hzjyvs82cimrg0hnp2xca537vxz";
+    sha256 = "0kvp5zkq54ahxp59d33fpzf3jpr5k0jjfbxc1kfqwxvlkgznmd7h";
   };
 
   features.iwlwifi = true;

From 1ba30ca45bc9bf5484836af3f116d8a17c88dc9c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 27 Mar 2017 01:05:25 +0000
Subject: [PATCH 0265/1744] poco: init at 1.7.8

---
 pkgs/development/libraries/poco/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/poco/default.nix

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
new file mode 100644
index 00000000000..0f971cff64d
--- /dev/null
+++ b/pkgs/development/libraries/poco/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }:
+
+stdenv.mkDerivation rec {
+  name = "poco-${version}";
+
+  version = "1.7.8";
+
+  src = fetchurl {
+    url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
+    sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ];
+
+  cmakeFlags = [
+    "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql"
+    "-DPOCO_UNBUNDLED=ON"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://pocoproject.org/;
+    description = "Cross-platform C++ libraries with a network/internet focus";
+    license = licenses.boost;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdfdf4181c7..8ab57716d49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9320,6 +9320,8 @@ with pkgs;
 
   pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
 
+  poco = callPackage ../development/libraries/poco { };
+
   podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
 
   poker-eval = callPackage ../development/libraries/poker-eval { };

From c46600d47b12ba81f8cc88dc4240ac58cad467f3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 26 Mar 2017 21:41:22 -0400
Subject: [PATCH 0266/1744] iperf2: 2.0.5 -> 2.0.9

This also fixes the build on clang 4
---
 pkgs/tools/networking/iperf/2.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index 13f8cedc673..c0fd6c973cd 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iperf-2.0.5";
+  name = "iperf-2.0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/iperf/${name}.tar.gz";
-    sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3";
+    url = "mirror://sourceforge/iperf2/files/${name}.tar.gz";
+    sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv";
   };
 
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://sourceforge.net/projects/iperf/"; 
+    homepage = "http://sourceforge.net/projects/iperf/";
     description = "Tool to measure IP bandwidth using UDP or TCP";
     platforms = platforms.unix;
-    license = "as-is";
+    license = licenses.mit;
   };
 }

From ee39d4b98a285bb2812c6e6ab51f4038ac013173 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 27 Mar 2017 04:15:44 +0200
Subject: [PATCH 0267/1744] nixos/tests/virtualbox: Fix @shell@ expansion

This has surfaced since f803270b7e00fa7124282809838d5652083b6aad.

The commit bumped bash to version 4.4, which caused to change the order
of --subst-var flags in substituteAll, which this test was relying on,
because it added a @shell@ to boot.initrd.postMountCommands.

Our substituter is currently working a bit like this:

original.replace('@var1@', 'val1').replace('@var2@', 'val2')...

Unfortunately, this means that if @var2@ occurs within @var1@ it is
replaced by the new value, so the order of the substvars actually
matter. I highly doubt that we want a behaviour like this and I'm
wondering why it didn't occur to me as a problem while writing the
initial implementation of the VirtualBox tests.

Whether to get rid of this and disallowing substitution of substvars
within substvars is another topic which I think needs discussion in a
different place.

As for now, I'm using stdenv.shell, because the closure size of this
should fit within the initrd, so it's fine especially because it's just
a test.

Tested with the net-hostonlyif and systemd-detect-virt tests and they
both succeed with this change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: @globin on IRC
---
 nixos/tests/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 376c4f21dc0..4f7cb176d96 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -65,7 +65,7 @@ let
       touch /mnt-root/boot-done
       hostname "${vmName}"
       mkdir -p /nix/store
-      unshare -m "@shell@" -c '
+      unshare -m ${escapeShellArg pkgs.stdenv.shell} -c '
         mount -t vboxsf nixstore /nix/store
         exec "$stage2Init"
       '

From e55ec544caeadd30a233897eaa76e789a6f466bb Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Mon, 27 Mar 2017 12:54:15 +0800
Subject: [PATCH 0268/1744] emem: 0.2.47 -> 0.2.48

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

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 5c163fe8c44..7248fe2c875 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.47";
+  version = "0.2.48";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0hz862g7k42kik9vgzskqr99321llmmakl54ay9vsykvcxs632mx";
+    sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq";
   };
 
   phases = [ "buildPhase" "installPhase" ];

From 50d964d105d3f9fa91e4f54c4a17302bdbde2064 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Mon, 27 Mar 2017 15:04:02 +1000
Subject: [PATCH 0269/1744] fetchRepoProject: typo

---
 pkgs/build-support/fetchrepoproject/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index e8ec0c1f4d4..8c55db5372d 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -16,7 +16,7 @@ let
     "--depth=1"
     #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox.
     "--no-clone-bundle"
-    (optionalString (createMirror != "") "--mirror")
+    (optionalString createMirror "--mirror")
     (optionalString useArchive "--archive")
     (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
     (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")

From 50cce50143c8395738702e735c682e4afd965f1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Mar 2017 09:00:06 +0200
Subject: [PATCH 0270/1744] callCabal2nix: Revert "Don't rebuild unchanged
 cabal file"

This reverts commit 24b47526ce38e3ccb073c776b32c0ea220f3c0f2 since it broke
callCabal2nix, apparently. See https://github.com/NixOS/nixpkgs/issues/24245
for details.
---
 pkgs/development/haskell-modules/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7205f777bcf..df17c769ea2 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -84,14 +84,7 @@ let
         callHackage = name: version: self.callPackage (hackage2nix name version);
 
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = name: src: args:
-          let
-            # Filter out files other than the cabal file. This ensures
-            # that we don't create new derivations even when the cabal
-            # file hasn't changed.
-            justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
-            drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
-          in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
+        callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; });
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From 39af068aba15cd63387f27437be52f9d63dc817a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 27 Mar 2017 09:34:37 +0200
Subject: [PATCH 0271/1744] mysql-haskell: dontCheck because check requires
 running server

---
 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 b2d678edada..fe11b990156 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -55,6 +55,7 @@ self: super: {
 
   # check requires mysql server
   mysql-simple = dontCheck super.mysql-simple;
+  mysql-haskell = dontCheck super.mysql-haskell;
 
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

From e58e681d9f1407142409c6414769d21df9ff4bd7 Mon Sep 17 00:00:00 2001
From: Thomas Bach <t.bach@ilexius.de>
Date: Tue, 14 Mar 2017 21:39:40 +0100
Subject: [PATCH 0272/1744] haproxy: refactor

`preConfigure` line became too long to edit comfortably. Split up
flags into ones necessary during both build and install phase and
install phase only. Makefile defines a target for OS X/Darwin which
automatically sets the `KQUEUE` flag.
---
 pkgs/tools/networking/haproxy/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 3b7a68fb972..88c750525b2 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -15,9 +15,17 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl zlib ];
 
   # TODO: make it work on bsd as well
-  preConfigure = ''
-    export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux2628" else "generic"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes ${stdenv.lib.optionalString stdenv.isDarwin "CC=cc USE_KQUEUE=1"}"
-  '';
+  makeFlags = [
+    "PREFIX=\${out}"
+    ("TARGET=" + (if stdenv.isSunOS  then "solaris"
+             else if stdenv.isLinux  then "linux2628"
+             else if stdenv.isDarwin then "osx"
+             else "generic"))
+  ];
+  buildFlags = [
+    "USE_OPENSSL=yes"
+    "USE_ZLIB=yes"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc";
 
   meta = {
     description = "Reliable, high performance TCP/HTTP load balancer";

From f20a10b451768bfffc9d18c2a3a5b3a6af5fdb6b Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Fri, 24 Mar 2017 22:16:39 +0100
Subject: [PATCH 0273/1744] emacsMacport: change naming scheme

Changed name from emacs-25.1-mac-6.1 to emacs-mac-25.1-6.1.
The former scheme confused compareVersions from nix and consequently
nix-env -u.
---
 pkgs/applications/editors/emacs/macport.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index f0f19dce6e3..34729783cce 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,8 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  emacsName = "emacs-25.1";
-  name = "${emacsName}-mac-6.1";
+  emacsVersion = "25.1";
+  emacsName = "emacs-${emacsVersion}";
+  macportVersion = "6.1";
+  name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   builder = ./builder.sh;
 
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
+    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
     sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
   };
 
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     mv $sourceRoot $name
-    tar xzf $macportSrc
+    tar xzf $macportSrc -C $name --strip-components=1
     mv $name $sourceRoot
 
     # extract retina image resources

From 6c116b86ebab9b0975e625fa99b49b73239c8529 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 27 Mar 2017 05:28:54 -0400
Subject: [PATCH 0274/1744] dropbox-cli: include dropbox icon (#24368)

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

diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 892d8fa3300..18c55c80fc0 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p "$out/bin/" "$out/share/applications"
     cp data/dropbox.desktop "$out/share/applications"
+    cp -a data/icons "$out/share/icons"
+    find "$out/share/icons" -type f \! -name '*.png' -delete
     substitute "dropbox.in" "$out/bin/dropbox" \
       --replace '@PACKAGE_VERSION@' ${version} \
       --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \

From 6911ae7c0c688f85eb513e5f12c8452f87bd1070 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Mar 2017 13:49:24 +0200
Subject: [PATCH 0275/1744] torbrowser: support obfs and fte transports

meek still broken, but then, sending all your traffic to Amazon seems like
something you'd do only if everything else fails.
---
 .../browsers/torbrowser/default.nix           | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
index 3b5173aa91d..5ce7c4780c8 100644
--- a/pkgs/applications/networking/browsers/torbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -34,6 +34,9 @@
 , gst-ffmpeg
 , gmp
 , ffmpeg
+
+# Pluggable transport dependencies
+, python27
 }:
 
 with stdenv.lib;
@@ -74,6 +77,9 @@ let
       gst-ffmpeg
     ];
 
+  # Library search path for the fte transport
+  fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
+
   # Upstream source
   version = "6.5.1";
 
@@ -129,6 +135,24 @@ stdenv.mkDerivation rec {
     # and torLibPath for accuracy, but this is more convenient ...
     libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
 
+    # Fixup paths to pluggable transports.
+    sed -i TorBrowser/Data/Tor/torrc-defaults \
+        -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g"
+
+    # Fixup obfs transport.  Work around patchelf failing to set
+    # interpreter for pre-compiled Go binaries by invoking the interpreter
+    # directly.
+    sed -i TorBrowser/Data/Tor/torrc-defaults \
+        -e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \
+
+    # Fixup fte transport
+    #
+    # Note: the script adds its dirname to search path automatically
+    sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \
+        -e "s,/usr/bin/env python,${python27.interpreter},"
+
+    patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so
+
     # Prepare for autoconfig.
     #
     # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment

From 12df6d88d8ea570743e497039d4e6a5f1b8875ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20FRAUDEAU?=
 <jfraudeau@users.noreply.github.com>
Date: Mon, 27 Mar 2017 13:56:58 +0200
Subject: [PATCH 0276/1744] openjdk-darwin: zulu1.8.0_66 -> zulu1.8.0_121

---
 pkgs/development/compilers/openjdk-darwin/8.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 2f3391f70e0..51effd2c784 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -7,11 +7,11 @@ let
   };
 
   jdk = stdenv.mkDerivation {
-    name = "zulu1.8.0_66-8.11.0.1";
+    name = "zulu1.8.0_121-8.20.0.5";
 
     src = fetchurl {
-      url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip";
-      sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
+      url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip";
+      sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
     };
 

From 6ef630a12549c2f36bc1706718c5ad12e0fa05f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 27 Mar 2017 15:37:49 +0200
Subject: [PATCH 0277/1744] systemd: Include
 https://github.com/NixOS/systemd/pull/8

---
 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 db474f688e5..d1042723a71 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0";
-    sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz";
+    rev = "66e778e851440fde7f20cff0c24d23538144be8d";
+    sha256 = "1valz8v2q4cj0ipz2b6mh5p0rjxpy3m88gg9xa2rcc4gcmscndzk";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From ed7a1ac30273c1ffdf188ab0ee8f8e6fa85d7eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Thu, 2 Mar 2017 15:03:08 +0000
Subject: [PATCH 0278/1744] docopt.cpp: init at 0.6.2

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

diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
new file mode 100644
index 00000000000..83466b693f5
--- /dev/null
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, python }:
+
+stdenv.mkDerivation rec {
+  version = "0.6.2";
+  name = "docopt.cpp-${version}";
+
+  src = fetchFromGitHub {
+    owner = "docopt";
+    repo = "docopt.cpp";
+    rev = "v${version}";
+    sha256 = "1rgkc8nsc2zz2lkyai0y68vrd6i6kbq63hm3vdza7ab6ghq0n1dd";
+  };
+
+  nativeBuildInputs = [ cmake python ];
+
+  cmakeFlags = ["-DWITH_TESTS=ON"];
+
+  doCheck = true;
+
+  checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests";
+
+  meta = with stdenv.lib; {
+    description = "C++11 port of docopt";
+    homepage = https://github.com/docopt/docopt.cpp;
+    license = with licenses; [ mit boost ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ knedlsepp ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cd7dfafdc0..9407531963f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6296,6 +6296,8 @@ let
 
   dlib = callPackage ../development/libraries/dlib { };
 
+  docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
+
   dotconf = callPackage ../development/libraries/dotconf { };
 
   dssi = callPackage ../development/libraries/dssi {};

From 4f33f909f34b3c63c1b0dc0fcfd0133aa15d63b9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 27 Mar 2017 23:06:14 +0800
Subject: [PATCH 0279/1744] libtoxcore: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 3a00408c7ca..d92674e59ef 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "libtoxcore-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner  = "TokTok";
     repo   = "c-toxcore";
     rev    = "v${version}";
-    sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";
+    sha256 = "11lqq825id174xdjxm0cy5dbyvmdy841hjy9q3l51yiya9f82d5b";
   };
 
   cmakeFlags = [

From d8dd2fb9e59fd7cd8cd4d3d969b4e8a322120365 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 27 Mar 2017 17:07:14 +0200
Subject: [PATCH 0280/1744] libvirt: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index aa044c885ea..73c2a0ae919 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx";
+    sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq";
   };
 
   patches = [ ./build-on-bsd.patch ];

From d1228f95e9023f4283220f11d2213b0af26216ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 26 Mar 2017 18:15:14 +0200
Subject: [PATCH 0281/1744] Revert "Revert "gdm module: only make xserver args
 overrideable""

This reverts commit 4e57e7f7c6db9a9c00f527eff80cb37890ba516d.

This actually broke gnome3 and didn't fix anything, I failed bisecting.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 1bf4fd3c089..6c63fede857 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -99,7 +99,8 @@ in
     services.xserver.displayManager.job =
       {
         environment = {
-          GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}";
+          GDM_X_SERVER_EXTRA_ARGS = toString
+            (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";

From 50adc53207cc7c5697d8c7581222d5c1cbe73b2b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 27 Mar 2017 18:23:49 +0300
Subject: [PATCH 0282/1744] buildDotnetPackage: don't depend on invalid quoting
 in makeWrapper

Fixes #24387.
---
 pkgs/build-support/build-dotnet-package/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index 3d24f6fb434..2b1b34429c5 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -102,8 +102,9 @@ attrsOrig @
             mkdir -p "$out"/bin
             commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")"
             makeWrapper \
-              "${mono}/bin/mono \"$exe\"" \
+              "${mono}/bin/mono" \
               "$out"/bin/"$commandName" \
+              --add-flags "\"$exe\"" \
               ''${makeWrapperArgs}
           done
         done

From 72ec884cc65c2bfd799376a80868994f24621b1b Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Wed, 22 Mar 2017 17:17:25 +0100
Subject: [PATCH 0283/1744] Make GCE image as small as possible and incorporate
 partition growing when users of nixops specified a larger root disk via
 deployment.gce.rootDiskSize

1GB is the smallest possible size as GCP doesn't support
fractions of GB for RAW images, see
https://cloud.google.com/compute/docs/images/import-existing-image#requirements
---
 nixos/modules/virtualisation/google-compute-image.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index a3dd3bd55d1..5673d55b339 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  diskSize = "100G";
+  diskSize = "1G";
 in
 {
-  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
 
   # https://cloud.google.com/compute/docs/tutorials/building-images
   networking.firewall.enable = mkDefault false;
@@ -94,7 +94,10 @@ in
         ''
     );
 
-  fileSystems."/".label = "nixos";
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    autoResize = true;
+  };
 
   boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
   boot.initrd.kernelModules = [ "virtio_scsi" ];

From 036f4b2f04b7f69e02096ed38980f989dcd25e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 27 Mar 2017 18:56:16 +0200
Subject: [PATCH 0284/1744] cups: fix #24339: broken paths in cups-config

Note: this doesn't fix cups-dymo by itself.
It causes a slightly nontrivial rebuild on Linux.
---
 pkgs/misc/cups/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index f47ba022c35..38440bac81a 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -79,7 +79,12 @@ stdenv.mkDerivation rec {
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
 
+      # Some outputs in cups-config were unexpanded and some even wrong.
       moveToOutput bin/cups-config "$dev"
+      sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \
+          -e "s|\$(out)|$out|" \
+          -e "s|\$(lib)|$lib|" \
+          -i "$dev/bin/cups-config"
 
       # Rename systemd files provided by CUPS
       for f in "$out"/lib/systemd/system/*; do

From 73c7649708940e776bcc4f1268c02892d083560e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 27 Mar 2017 13:28:56 -0400
Subject: [PATCH 0285/1744] google-cloud-sdk: 138.0.0 -> 148.0.1

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index acc440b34ed..6e6fbed2dbf 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "138.0.0";
+  version = "148.0.1";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616";
+        sha256 = "17az8nah6s33c790kkqcpmcsc8cydhndmq7dblpwgizd86hg245g";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba";
+        sha256 = "1p5076cqk02y8zc3pkdlmrgh3mx2w1pddb2r5c9h3krfcaim2yj8";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw";
+        sha256 = "0fr07vcksy0vrg7inmyddz9jlbqx0yg933s45zzkpp3a0m5hz6ll";
       };
 
   buildInputs = [python27 makeWrapper];

From 96d41e393da3ca27fbcc7c82b7221a5c923460c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 27 Mar 2017 19:11:17 +0200
Subject: [PATCH 0286/1744] treewide: purge maintainers.urkud

It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
---
 lib/maintainers.nix                                             | 2 +-
 pkgs/applications/graphics/dia/default.nix                      | 2 +-
 pkgs/applications/graphics/djview/default.nix                   | 2 +-
 pkgs/applications/misc/djvulibre/default.nix                    | 2 +-
 pkgs/applications/misc/k3b/default.nix                          | 2 +-
 pkgs/applications/misc/krename/default.nix                      | 2 +-
 pkgs/applications/misc/krusader/default.nix                     | 2 +-
 pkgs/applications/misc/merkaartor/default.nix                   | 2 +-
 pkgs/applications/networking/browsers/links2/default.nix        | 2 +-
 .../networking/instant-messengers/telepathy/kde/default.nix     | 2 +-
 .../networking/instant-messengers/telepathy/logger/default.nix  | 2 +-
 pkgs/applications/office/calligra/default.nix                   | 2 +-
 pkgs/applications/office/zanshin/default.nix                    | 2 +-
 pkgs/applications/science/astronomy/xplanet/default.nix         | 2 +-
 pkgs/applications/science/chemistry/avogadro/default.nix        | 2 +-
 pkgs/applications/science/math/ginac/default.nix                | 2 +-
 pkgs/applications/video/mplayer/default.nix                     | 2 +-
 pkgs/data/misc/mobile-broadband-provider-info/default.nix       | 2 +-
 pkgs/data/misc/poppler-data/default.nix                         | 2 +-
 pkgs/data/misc/shared-desktop-ontologies/default.nix            | 2 +-
 pkgs/desktops/kde-4.14/support/akonadi/default.nix              | 2 +-
 pkgs/development/libraries/aqbanking/default.nix                | 2 +-
 pkgs/development/libraries/atk/default.nix                      | 2 +-
 pkgs/development/libraries/attica/default.nix                   | 2 +-
 pkgs/development/libraries/cln/default.nix                      | 2 +-
 pkgs/development/libraries/clutter-gtk/default.nix              | 2 +-
 pkgs/development/libraries/clutter/default.nix                  | 2 +-
 pkgs/development/libraries/dbus-glib/default.nix                | 2 +-
 pkgs/development/libraries/eigen/2.0.nix                        | 2 +-
 pkgs/development/libraries/eigen/3.3.nix                        | 2 +-
 pkgs/development/libraries/eigen/default.nix                    | 2 +-
 pkgs/development/libraries/farstream/default.nix                | 2 +-
 pkgs/development/libraries/funambol/default.nix                 | 2 +-
 pkgs/development/libraries/glib/default.nix                     | 2 +-
 pkgs/development/libraries/gobject-introspection/default.nix    | 2 +-
 pkgs/development/libraries/grantlee/5.x.nix                     | 2 +-
 pkgs/development/libraries/grantlee/default.nix                 | 2 +-
 pkgs/development/libraries/gtk+/3.x.nix                         | 2 +-
 pkgs/development/libraries/herqq/default.nix                    | 2 +-
 pkgs/development/libraries/hspell/default.nix                   | 2 +-
 pkgs/development/libraries/icu/default.nix                      | 2 +-
 pkgs/development/libraries/iso-codes/default.nix                | 2 +-
 pkgs/development/libraries/lensfun/default.nix                  | 2 +-
 pkgs/development/libraries/libass/default.nix                   | 2 +-
 pkgs/development/libraries/libdbusmenu-qt/default.nix           | 2 +-
 pkgs/development/libraries/libdevil/default.nix                 | 2 +-
 pkgs/development/libraries/libdmtx/default.nix                  | 2 +-
 pkgs/development/libraries/libgpod/default.nix                  | 2 +-
 pkgs/development/libraries/libkate/default.nix                  | 2 +-
 pkgs/development/libraries/liblastfm/default.nix                | 2 +-
 pkgs/development/libraries/liblqr-1/default.nix                 | 2 +-
 pkgs/development/libraries/libmms/default.nix                   | 2 +-
 pkgs/development/libraries/libmng/default.nix                   | 2 +-
 pkgs/development/libraries/libmtp/default.nix                   | 2 +-
 pkgs/development/libraries/libmusicbrainz/2.x.nix               | 2 +-
 pkgs/development/libraries/libmusicbrainz/5.x.nix               | 2 +-
 pkgs/development/libraries/libmusicbrainz/default.nix           | 2 +-
 pkgs/development/libraries/libnatspec/default.nix               | 2 +-
 pkgs/development/libraries/libofx/default.nix                   | 2 +-
 pkgs/development/libraries/liboggz/default.nix                  | 2 +-
 pkgs/development/libraries/libplist/default.nix                 | 2 +-
 pkgs/development/libraries/libqalculate/default.nix             | 2 +-
 pkgs/development/libraries/librdf/raptor2.nix                   | 2 +-
 pkgs/development/libraries/librdf/rasqal.nix                    | 2 +-
 pkgs/development/libraries/libssh/default.nix                   | 2 +-
 pkgs/development/libraries/libssh2/default.nix                  | 2 +-
 pkgs/development/libraries/libusb1/default.nix                  | 2 +-
 pkgs/development/libraries/libwpg/default.nix                   | 2 +-
 pkgs/development/libraries/mp4v2/default.nix                    | 2 +-
 pkgs/development/libraries/ntrack/default.nix                   | 2 +-
 pkgs/development/libraries/openbabel/default.nix                | 2 +-
 pkgs/development/libraries/p11-kit/default.nix                  | 2 +-
 pkgs/development/libraries/pango/default.nix                    | 2 +-
 pkgs/development/libraries/podofo/default.nix                   | 2 +-
 pkgs/development/libraries/polkit/default.nix                   | 2 +-
 pkgs/development/libraries/prison/default.nix                   | 2 +-
 pkgs/development/libraries/qca2/default.nix                     | 2 +-
 pkgs/development/libraries/qjson/default.nix                    | 2 +-
 pkgs/development/libraries/qoauth/default.nix                   | 2 +-
 pkgs/development/libraries/qt-4.x/4.8/default.nix               | 2 +-
 pkgs/development/libraries/qtscriptgenerator/default.nix        | 2 +-
 pkgs/development/libraries/soprano/default.nix                  | 2 +-
 pkgs/development/libraries/strigi/default.nix                   | 2 +-
 pkgs/development/libraries/taglib/1.9.nix                       | 2 +-
 pkgs/development/libraries/taglib/default.nix                   | 2 +-
 pkgs/development/libraries/xbase/default.nix                    | 2 +-
 pkgs/development/python-modules/sip/default.nix                 | 2 +-
 pkgs/development/tools/build-managers/cmake/2.8.nix             | 2 +-
 pkgs/development/tools/build-managers/cmake/default.nix         | 2 +-
 pkgs/development/tools/misc/automoc4/default.nix                | 2 +-
 pkgs/development/tools/misc/itstool/default.nix                 | 2 +-
 pkgs/development/tools/misc/swig/2.x.nix                        | 2 +-
 pkgs/development/tools/misc/swig/3.x.nix                        | 2 +-
 pkgs/development/tools/parsing/peg/default.nix                  | 2 +-
 pkgs/misc/cups/default.nix                                      | 2 +-
 pkgs/misc/drivers/foo2zjs/default.nix                           | 2 +-
 pkgs/misc/screensavers/xscreensaver/default.nix                 | 2 +-
 pkgs/os-specific/linux/libnl/default.nix                        | 2 +-
 pkgs/os-specific/linux/wpa_supplicant/default.nix               | 2 +-
 pkgs/os-specific/linux/xf86-input-wacom/default.nix             | 2 +-
 pkgs/servers/sql/virtuoso/6.x.nix                               | 2 +-
 pkgs/servers/sql/virtuoso/7.x.nix                               | 2 +-
 pkgs/tools/archivers/zip/default.nix                            | 2 +-
 pkgs/tools/filesystems/ntfs-3g/default.nix                      | 2 +-
 pkgs/tools/graphics/dcraw/default.nix                           | 2 +-
 pkgs/tools/graphics/qrencode/default.nix                        | 2 +-
 pkgs/tools/misc/convmv/default.nix                              | 2 +-
 pkgs/tools/misc/usbmuxd/default.nix                             | 2 +-
 pkgs/tools/networking/modemmanager/default.nix                  | 2 +-
 pkgs/tools/networking/network-manager-applet/default.nix        | 2 +-
 pkgs/tools/networking/network-manager/default.nix               | 2 +-
 pkgs/tools/networking/pptp/default.nix                          | 2 +-
 pkgs/tools/security/gnupg/20.nix                                | 2 +-
 pkgs/tools/security/polkit-gnome/default.nix                    | 2 +-
 pkgs/tools/system/sg3_utils/default.nix                         | 2 +-
 pkgs/tools/text/catdoc/default.nix                              | 2 +-
 pkgs/tools/text/ebook-tools/default.nix                         | 2 +-
 pkgs/tools/text/kdiff3/default.nix                              | 2 +-
 pkgs/tools/text/odt2txt/default.nix                             | 2 +-
 119 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e6c44aa81b1..087c2463957 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -517,7 +517,7 @@
   tvorog = "Marsel Zaripov <marszaripov@gmail.com>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   uralbash = "Svintsov Dmitry <root@uralbash.ru>";
-  urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
+  #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index a8f38d61f9d..8d8e36a8bc8 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Gnome Diagram drawing software";
     homepage = http://live.gnome.org/Dia;
-    maintainers = with stdenv.lib.maintainers; [raskin urkud];
+    maintainers = with stdenv.lib.maintainers; [raskin];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 2ce1ebb257d..85c0f58174a 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "A portable DjVu viewer and browser plugin";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 093382e13e6..6e158f5696c 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "A library and viewer for the DJVU file format for scanned images";
     homepage = http://djvu.sourceforge.net;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ urkud ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index bda64765941..072685b8194 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+    maintainers = [ maintainers.sander maintainers.phreedom ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 8ce74850e1a..1137d6c07f6 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -21,7 +21,7 @@ let
       homepage = http://www.krename.net;
       description = "A powerful batch renamer for KDE";
       inherit (kconfig.meta) platforms;
-      maintainers = with maintainers; [ urkud peterhoeg ];
+      maintainers = with maintainers; [ peterhoeg ];
     };
 
     buildInputs = [ taglib exiv2 podofo ];
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 75b2da6e8a2..ed74eae46f3 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "Norton/Total Commander clone for KDE";
     license = "GPL";
     homepage = http://www.krusader.org;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    maintainers = with stdenv.lib.maintainers; [ sander ];
     inherit (kdelibs4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 3882f679cae..a1744f7a2c0 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "An openstreetmap editor";
     homepage = http://merkaartor.org/;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric urkud];
+    maintainers = with stdenv.lib.maintainers; [viric];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index befe3cb21f9..f504c3c2b33 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://links.twibright.com/;
     description = "A small browser with some graphics support";
-    maintainers = with maintainers; [ raskin urkud viric ];
+    maintainers = with maintainers; [ raskin viric ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 592fc2b5934..0a5a309c27d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -54,7 +54,7 @@ let
 
         meta = {
           inherit (kdelibs4.meta) platforms;
-          maintainers = [ stdenv.lib.maintainers.urkud ];
+          maintainers = [ ];
         };
       }
     );
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 2ade2fd3edd..4cf0d2a0449 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Logger service for Telepathy framework";
     homepage = http://telepathy.freedesktop.org/wiki/Logger ;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
   };
 }
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 154ff33c844..76027f29a70 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       vector graphics.
     '';
     homepage = http://calligra.org;
-    maintainers = with maintainers; [ urkud phreedom ebzzry ];
+    maintainers = with maintainers; [ phreedom ebzzry ];
     inherit (kdelibs4.meta) platforms;
     license = licenses.gpl2;
   };
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 71f38bb8d3c..0cf85840db6 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GTD for KDE";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     inherit (kdelibs4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index bdb93c99226..9c79bfe1a55 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Renders an image of the earth or other planets into the X root window";
     homepage = http://xplanet.sourceforge.net;
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 1e9f3ee521b..878dfde8f4e 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Molecule editor and visualizer";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 9ea43023d57..ee67af62bb1 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "GiNaC is Not a CAS";
     homepage    = http://www.ginac.de/;
-    maintainers = with maintainers; [ lovek323 urkud ];
+    maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 60625412617..ba02583a274 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation rec {
     description = "A movie player that supports many video formats";
     homepage = "http://mplayerhq.hu";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
+    maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index 0c4e5bc2a13..95c66ed029e 100644
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.publicDomain;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index beac8105199..59f4724e1be 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "Encoding files for Poppler, a PDF rendering library";
     platforms = platforms.all;
     license = licenses.free; # more free licenses combined
-    maintainers = with maintainers; [ urkud ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 831028467f4..72895653479 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       are used by projects like KDE or Strigi.
     '';
     platforms = platforms.all;
-    maintainers = [ maintainers.sander maintainers.urkud ];
+    maintainers = [ maintainers.sander ];
   };
 }
 
diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
index 5238744cc7b..ecfb4913a42 100644
--- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "KDE PIM Storage Service";
     license = "LGPL";
     homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+    maintainers = [ maintainers.sander maintainers.phreedom ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 277886d717a..4433a3df45d 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
     hydraPlatforms = [];
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ goibhniu urkud ];
+    maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index e44ad424e0c..cd2ffe55664 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 3174dc57667..d883100fd3c 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Library to access Open Collaboration Service providers";
     license = "LGPL";
-    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+    maintainers = [ maintainers.sander maintainers.phreedom ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index c6523921fb5..9d7c9c4f30f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = http://www.ginac.de/CLN/;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = with stdenv.lib.platforms; allBut cygwin;
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index ef2ac6f9385..39296f86d8e 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Clutter-GTK";
     homepage = http://www.clutter-project.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index fc80b0ec2b2..af7acb35aac 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index df983ff3471..4d27552d735 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = http://dbus.freedesktop.org;
     license = with stdenv.lib.licenses; [ afl21 gpl2 ];
     description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 04e7b5e38cb..8841855a24e 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
     branch = "2";
     platforms = with stdenv.lib.platforms; unix;
   };
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index b4cb1029001..582b4fed9df 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
     inherit version;
   };
 }
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 374f52c9cb0..5869276a797 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
     inherit version;
   };
 }
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 260a424038f..03473881339 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/Farstream;
     description = "Audio/Video Communications Framework formely known as farsight";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 161d836bf31..d0850128ebc 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "SyncML client sdk by Funambol project";
     homepage = http://www.funambol.com;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 9eb71fc708f..5d8d98af8d3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
     description = "C library of programming buildings blocks";
     homepage    = http://www.gtk.org/;
     license     = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ lovek323 raskin urkud ];
+    maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 7154db626aa..4773cc38000 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
-    maintainers = with maintainers; [ lovek323 urkud lethalman ];
+    maintainers = with maintainers; [ lovek323 lethalman ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix
index b4aa9414163..fb6af9c895d 100644
--- a/pkgs/development/libraries/grantlee/5.x.nix
+++ b/pkgs/development/libraries/grantlee/5.x.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     inherit (qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index bb2461a98a1..3944d2ecab6 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index d21fef3e674..10f01294301 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.lgpl2Plus;
 
-    maintainers = with maintainers; [ urkud raskin vcunat lethalman ];
+    maintainers = with maintainers; [ raskin vcunat lethalman ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 39d5b2c792a..5a1af01c3b1 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     homepage = http://herqq.org;
     description = "A software library for building UPnP devices and control points";
     inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index eebd105a00d..424ffd18499 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Hebrew spell checker";
     homepage = http://hspell.ivrix.org.il/;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
 # Note that I don't speak hebrew, so I can only fix compile problems
   };
 }
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index ea0919caa31..b64d8c84e22 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation ({
   meta = with stdenv.lib; {
     description = "Unicode and globalization support library";
     homepage = http://site.icu-project.org/;
-    maintainers = with maintainers; [ raskin urkud ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.all;
   };
 } // (if stdenv.isArm then {
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index ed742888a0e..7d07408236e 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://pkg-isocodes.alioth.debian.org/;
     description = "Various ISO codes packaged as XML files";
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 776a7646bd7..bd740b75758 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
     license = stdenv.lib.licenses.lgpl3;
     description = "An opensource database of photographic lenses and their characteristics";
     homepage = http://lensfun.sourceforge.net/;
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 3528edcba12..b3345c47732 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/libass/libass;
     license     = licenses.isc;
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ codyopel urkud ];
+    maintainers = with maintainers; [ codyopel ];
     repositories.git = git://github.com/libass/libass.git;
   };
 }
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index d49f4cc6a72..34ba39d799e 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 68bd72f3e0f..20e74cdc151 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
     license = licenses.lgpl2;
     platforms = platforms.mesaPlatforms;
-    maintainers = [ maintainers.phreedom maintainers.urkud ];
+    maintainers = [ maintainers.phreedom ];
   };
 }
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 26cf2c023eb..390bb4ea9e4 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = http://libdmtx.org;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index e35da9e8087..60400712e30 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
     platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index aee95b1f1af..7a3eb9caa66 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       in an Ogg container. It can carry Unicode text, images, and animate
       them.'';
     homepage = http://code.google.com/p/libkate;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index ad578ac272b..0beb689090a 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     repositories.git = git://github.com/lastfm/liblastfm.git;
     description = "Official LastFM library";
     inherit (qt4.meta) platforms;
-    maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
+    maintainers = with stdenv.lib.maintainers; [ phreedom ];
   };
 }
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index 3af1227c69b..e505871eb02 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://liblqr.wikidot.com;
     description = "Seam-carving C/C++ library called Liquid Rescaling";
     platforms = platforms.all;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix
index 441b4ea7f9a..d1dd7860de4 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/pkgs/development/libraries/libmms/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://libmms.sourceforge.net;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index 103595bc035..ff627499855 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = http://www.libmng.com;
     license = licenses.zlib;
-    maintainers = with maintainers; [ marcweber urkud ];
+    maintainers = with maintainers; [ marcweber ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index e1902263ac2..b187c213bee 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
       systems. We implement MTP Basic, the stuff proposed for standardization.
       '';
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix
index 4cad0c0f9f6..f12b854e778 100644
--- a/pkgs/development/libraries/libmusicbrainz/2.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       The libmusicbrainz (also known as mb_client or MusicBrainz Client
       Library) is a development library geared towards developers who wish to
       add MusicBrainz lookup capabilities to their applications.'';
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 5ec8f80f7e0..4765e90c6df 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       The libmusicbrainz (also known as mb_client or MusicBrainz Client
       Library) is a development library geared towards developers who wish to
       add MusicBrainz lookup capabilities to their applications.'';
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index 99c253cdb35..596399c4fa8 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       The libmusicbrainz (also known as mb_client or MusicBrainz Client
       Library) is a development library geared towards developers who wish to
       add MusicBrainz lookup capabilities to their applications.'';
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index cdde02c361f..fe38755f10c 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
     homepage = http://natspec.sourceforge.net/ ;
     description = "A library intended to smooth national specificities in using of programs";
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
   NIX_LDFLAGS = "-liconv";
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 396e8e92acf..7927dba8983 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     homepage = http://libofx.sourceforge.net/;
     license = "LGPL";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 0689be2c621..83bb80cc320 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       interleaving data container developed by Monty at Xiph.Org, originally to
       support the Ogg Vorbis audio format but now used for many free codecs
       including Dirac, FLAC, Speex and Theora.'';
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index b98fdbdb470..7ff44db52a8 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     knownVulnerabilities = [
       "CVE-2017-5209: base64decode function in base64.c allows attackers to obtain sensitive information from process memory or cause a denial of service"
       "CVE-2017-5545: attackers to obtain sensitive information from process memory or cause a denial of service"
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 734760c8830..abc0eb4a228 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An advanced calculator library";
     homepage = http://qalculate.github.io;
-    maintainers = with maintainers; [ urkud gebner ];
+    maintainers = with maintainers; [ gebner ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index f84cfa044c6..1271089060b 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 6a5e4578cac..8a0ca6f000d 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 025a2ee37ff..1db053ef398 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "SSH client library";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ sander urkud ];
+    maintainers = with maintainers; [ sander ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 0e53d27c889..4320cacc590 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = http://www.libssh2.org;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 947a10c0e47..5a76a93b8e3 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.libusb.info;
     description = "User-space USB library";
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 0cb405d4837..57dfe34132f 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libwpg.sourceforge.net;
     description = "C++ library to parse WPG";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 48abf2b6151..741ca96348d 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://code.google.com/p/mp4v2;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 564bf9f62e3..3483d4bed77 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "Network Connectivity Tracking library for Desktop Applications";
     homepage = https://launchpad.net/ntrack;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index b124e592f36..61024a33113 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index fc63c1942c2..0888fba4eca 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://p11-glue.freedesktop.org/;
     platforms = platforms.all;
-    maintainers = with maintainers; [ urkud wkennington ];
+    maintainers = with maintainers; [ wkennington ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 22cf7be84d0..b90ff39dc1f 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.pango.org/;
     license = licenses.lgpl2Plus;
 
-    maintainers = with maintainers; [ raskin urkud ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index d7569c017a7..5f5dcfb71e6 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://podofo.sourceforge.net;
     description = "A library to work with the PDF file format";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 27482743d2c..c1f8725f6f7 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.freedesktop.org/wiki/Software/polkit;
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
     platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index 7beb93eb462..29ff988a226 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt4 library for QR-codes";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 6a951fddb79..2265d0df394 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";
     homepage = http://delta.affinix.com/qca;
-    maintainers = [ maintainers.sander maintainers.urkud ];
+    maintainers = [ maintainers.sander ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 1d4da00bf4c..6ab134a0306 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake qt4 ];
 
   meta = {
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 5a448d33067..48a63e41234 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Qt library for OAuth authentication";
     inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index d4b85e0dfe4..b03b8896a5f 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
     homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
     license     = licenses.lgpl21Plus; # or gpl3
-    maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
+    maintainers = with maintainers; [ lovek323 phreedom sander ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 3221fec4b4b..103b495f8e2 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     description = "QtScript bindings generator";
     homepage = http://code.google.com/p/qtscriptgenerator/;
     inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 7736eab511e..4739c736397 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://soprano.sourceforge.net/;
     description = "An object-oriented C++/Qt4 framework for RDF data";
     license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    maintainers = with stdenv.lib.maintainers; [ sander ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index faba57d155f..1961160cbc9 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://strigi.sourceforge.net;
     description = "A very fast and efficient crawler to index data on your harddrive";
     license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    maintainers = with stdenv.lib.maintainers; [ sander ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 41087044e49..71b8a764eed 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
 
     description = "A library for reading and editing the meta-data of several popular audio formats";
     inherit (cmake.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 0937b2fe8cf..602aab852cc 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
 
     description = "A library for reading and editing the meta-data of several popular audio formats";
     inherit (cmake.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 95ba2a05ad9..931d4064400 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     homepage = http://linux.techass.com/projects/xdb/;
     description = "C++ class library formerly known as XDB";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 29295de66b7..76652954cf0 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -19,7 +19,7 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
     description = "Creates C++ bindings for Python modules";
     homepage    = "http://www.riverbankcomputing.co.uk/";
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 sander urkud ];
+    maintainers = with maintainers; [ lovek323 sander ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index a197c69edff..590de68d52f 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
+    maintainers = with stdenv.lib.maintainers; [ mornfall ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9f607a60b59..00d76fbff9f 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else platforms.all;
-    maintainers = with maintainers; [ urkud mornfall ttuegel lnl7 ];
+    maintainers = with maintainers; [ mornfall ttuegel lnl7 ];
   };
 }
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix
index 608c17f9214..e6c7dcbd362 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/pkgs/development/tools/misc/automoc4/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     homepage = http://techbase.kde.org/Development/Tools/Automoc4;
     description = "KDE Meta Object Compiler";
     license = licenses.bsd2;
-    maintainers = [ maintainers.sander maintainers.urkud ];
+    maintainers = [ maintainers.sander ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index 8c2686d9a22..70ed9cd0570 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "XML to PO and back again";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index 21da4b21a4b..6dbaca26c81 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
 
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
 
-    maintainers = [ lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index dfcfe7c9e89..2a6b6880183 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
     license = licenses.gpl3Plus;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ urkud wkennington ];
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix
index b1b9a6dee4e..1706b5448e1 100644
--- a/pkgs/development/tools/parsing/peg/default.nix
+++ b/pkgs/development/tools/parsing/peg/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://piumarta.com/software/peg/;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index f47ba022c35..5dbebeeb709 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
     license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = with maintainers; [ urkud jgeerds ];
+    maintainers = with maintainers; [ jgeerds ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 36b580bb16d..14ceb405d68 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     description = "ZjStream printer drivers";
     maintainers = with maintainers;
     [
-      raskin urkud
+      raskin
     ];
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 276c311fa45..cd437bfe452 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.jwz.org/xscreensaver/";
     description = "A set of screensavers";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = with stdenv.lib.platforms; allBut cygwin;
     inherit version;
     downloadPage = "http://www.jwz.org/xscreensaver/download.html";
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 4bf243c4f03..dc0dadf92e0 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     inherit version;
     homepage = "http://www.infradead.org/~tgr/libnl/";
     description = "Linux NetLink interface library";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fe0d2ca28f9..1cac0911b24 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
     homepage = http://hostap.epitest.fi/wpa_supplicant/;
     description = "A tool for connecting to WPA and WPA2-protected wireless networks";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ marcweber urkud wkennington ];
+    maintainers = with maintainers; [ marcweber wkennington ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index b308a5ec3c3..e231e3a5989 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   CFLAGS = "-I${pixman}/include/pixman-1";
 
   meta = with stdenv.lib; {
-    maintainers = [ maintainers.goibhniu maintainers.urkud ];
+    maintainers = [ maintainers.goibhniu ];
     description = "Wacom digitizer driver for X11";
     homepage = http://linuxwacom.sourceforge.net;
     license = licenses.gpl2;
diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix
index 5f6b3904155..b0b8f926d9e 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/pkgs/servers/sql/virtuoso/6.x.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "SQL/RDF database used by, e.g., KDE-nepomuk";
     homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
     platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index 2087829084f..a24daa70812 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
     #configure: The current version [...] can only be built on 64bit platforms
     platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 145b81c95bc..3c841aa621f 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
     description = "Compressor/archiver for creating and modifying zipfiles";
     homepage = http://www.info-zip.org;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 01d9b81d038..a5c858ecbae 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.tuxera.com/community/open-source-ntfs-3g/;
     description = "FUSE-based NTFS driver with full write support";
-    maintainers = with maintainers; [ urkud dezgeg ];
+    maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.linux;
     license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+
   };
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index b8cdb64da87..66d3a110080 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "Decoder for many camera raw picture formats";
     license = stdenv.lib.licenses.free;
     platforms = with stdenv.lib.platforms; allBut cygwin;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 936956cbd17..40f61253306 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index 7db7ebf96d6..6a76906a805 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Converts filenames from one encoding to another";
     platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
-    maintainers = [ maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index accd3b8070a..fc8c40ea4e0 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
       talking to your iPhone or iPod Touch over USB and coordinating access to
       its services by other applications.'';
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 9fe4b4421a7..dc4e246c02f 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "WWAN modem manager, part of NetworkManager";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index cca111db67d..d2240984d9f 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage    = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ phreedom urkud rickynils ];
+    maintainers = with maintainers; [ phreedom rickynils ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 1ad1e54e7fb..cac37bce280 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     homepage    = http://projects.gnome.org/NetworkManager/;
     description = "Network configuration and management tool";
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ];
+    maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index 8fcdb49b2b1..c2c41d92acb 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "PPTP client for Linux";
     homepage = http://pptpclient.sourceforge.net/;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index fd79419d82a..06fdc4a2a44 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       S/MIME.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ roconnor urkud ];
+    maintainers = with stdenv.lib.maintainers; [ roconnor ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix
index 38d47e742a2..e8709130015 100644
--- a/pkgs/tools/security/polkit-gnome/default.nix
+++ b/pkgs/tools/security/polkit-gnome/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     homepage = http://hal.freedesktop.org/docs/PolicyKit/;
     description = "A dbus session bus service that is used to bring up authentication dialogs";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
+    maintainers = with stdenv.lib.maintainers; [ phreedom ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index e0f30b2db73..c1c4527d0a0 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
     homepage = http://sg.danny.cz/sg/;
     description = "Utilities that send SCSI commands to devices";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index b9db2eba5cd..fb0309e7532 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "MS-Word/Excel/PowerPoint to text converter";
     platforms = platforms.all;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ urkud ndowens ];
+    maintainers = with maintainers; [ ndowens ];
   };
 }
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
index 2fafec02d81..da246832b93 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ebook-tools.sourceforge.net";
     description = "Tools and library for dealing with various ebook file formats";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index a35e09cfcda..4303fe82a45 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -30,7 +30,7 @@ let
       homepage = http://kdiff3.sourceforge.net/;
       license = licenses.gpl2Plus;
       description = "Compares and merges 2 or 3 files or directories";
-      maintainers = with maintainers; [ viric urkud peterhoeg ];
+      maintainers = with maintainers; [ viric peterhoeg ];
       platforms = with platforms; linux;
     };
   };
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 85f0f24b387..42f80f29073 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://stosberg.net/odt2txt;
     platforms = stdenv.lib.platforms.all;
     lincense = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ ];
   };
 }

From a3bc12e1aba0b6f9cc05aafe98c80d5966ab4758 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 27 Mar 2017 15:20:17 -0500
Subject: [PATCH 0287/1744] mendeley: 1.17.8 -> 1.17.9

---
 pkgs/applications/office/mendeley/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index d24c59b87d9..0a14a87cf56 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -36,14 +36,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.17.8-stable";
+  shortVersion = "1.17.9-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7"
-    else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5";
+    then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr"
+    else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg";
 
   deps = [
     qt5.qtbase

From 892c418f5d52424d15bbe0a2d6908c876a49bbe9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 27 Mar 2017 23:27:47 +0200
Subject: [PATCH 0288/1744] cups-dymo: patch upstream for cups 2.2

---
 pkgs/misc/cups/drivers/dymo/default.nix       |  2 +
 .../misc/cups/drivers/dymo/fix-includes.patch | 67 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/dymo/fix-includes.patch

diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index b2801c7ae67..9c187a8f378 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cups ];
+  patches = [ ./fix-includes.patch ];
+
   makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
 
   meta = {
diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/misc/cups/drivers/dymo/fix-includes.patch
new file mode 100644
index 00000000000..fa7df5591dd
--- /dev/null
+++ b/pkgs/misc/cups/drivers/dymo/fix-includes.patch
@@ -0,0 +1,67 @@
+diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h
+*** dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h	2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h	2017-03-27 23:10:17.638976126 +0200
+***************
+*** 22,29 ****
+--- 22,31 ----
+  #define hfc4bbdea_8a1b_427c_9ab5_50b84576b19e
+  
+  #include <cups/cups.h>
++ #include <cups/ppd.h>
+  #include <cups/raster.h>
+  #include <memory>
++ #include <stdio.h>
+  #include <string>
+  #include "CupsPrintEnvironment.h"
+  #include "ErrorDiffusionHalftoning.h"
+diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h
+*** dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h	2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h	2017-03-27 23:10:17.638976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+  #define h952b1c81_8931_433a_8479_7ae6d8e85a86
+  
+  #include "PrinterDriver.h"
++ #include <stdio.h>
+  
+  namespace DymoPrinterDriver
+  {
+diff -rp dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h
+*** dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h	2012-02-07 14:22:38.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h	2017-03-27 23:10:17.635976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+  #define he780684b_6efc_428d_bfdb_c5422b1ed982
+  
+  #include <cups/cups.h>
++ #include <cups/ppd.h>
+  #include <cups/raster.h>
+  #include "LabelManagerDriver.h"
+  #include "LabelManagerLanguageMonitor.h"
+*************** public:
+*** 50,53 ****
+  
+  /*
+   * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+!  */
+\ No newline at end of file
+--- 51,54 ----
+  
+  /*
+   * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+!  */
+diff -rp dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h
+*** dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h	2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h	2017-03-27 23:10:17.632976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+  #define hd8574b83_b264_47b2_8d33_a46ae75691d2
+  
+  #include <cups/cups.h>
++ #include <cups/ppd.h>
+  #include <cups/raster.h>
+  #include "LabelWriterDriver.h"
+  #include "LabelWriterLanguageMonitor.h"

From 52451067c7bfe3bd35f26e8387097fd835a26113 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Mar 2017 00:28:26 +0300
Subject: [PATCH 0289/1744] virtualbox: wrap with Qt dependencies

Fixes GTK file open dialogs. Also make sure that linked applications really
exist, and update their list.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 257c419d88c..48000271d12 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
     ++ optionals (headless) [ libXrandr ]
-    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
+    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
 
@@ -153,7 +153,12 @@ in stdenv.mkDerivation {
 
     # Create wrapper script
     mkdir -p $out/bin
-    for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
+    ${optionalString (!headless) ''
+      makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
+    ''}
+    for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+        echo "Linking $file to /bin"
+        test -x "$libexec/$file"
         ln -s "$libexec/$file" $out/bin/$file
     done
 

From 0c3138e6021dbca615d1f0efd0f3c6a2558d6f48 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Fri, 24 Mar 2017 05:49:12 +0300
Subject: [PATCH 0290/1744] virtualbox:  a more maintenance-free way of
 patching refs to dlopen()-affected dependencies

---
 .../virtualization/virtualbox/default.nix     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 48000271d12..6c49e95b6b9 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -72,15 +72,17 @@ in stdenv.mkDerivation {
         ''} -i configure
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
-    sed -i -e '
-      s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
-      s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
-      ${optionalString pulseSupport ''
-      s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
-      ''}
-    ' src/VBox/Main/xml/Settings.cpp \
-      src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
-      include/VBox/dbus-calls.h
+
+    grep 'libpulse\.so\.0'      src include -rI --files-with-match | xargs sed -i -e '
+      ${optionalString pulseSupport
+        ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}'
+
+    grep 'libdbus-1\.so\.3'     src include -rI --files-with-match | xargs sed -i -e '
+      s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
+
+    grep 'libasound\.so\.2'     src include -rI --files-with-match | xargs sed -i -e '
+      s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g'
+
     export USER=nix
     set +x
   '';

From 6ce0af295d73bdd235c783d74c8a7977c5ce43f8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 28 Mar 2017 00:40:25 +0200
Subject: [PATCH 0291/1744] python-gnupg: 0.3.8 -> 0.4.0 and disable tests

All 20 tests did fail because no gpg binary was found. With gnupg1 as
build input they never finish. Deactivating them might be the best
option for now (and it improves the current situation since they never
actually succeeded anyway -> build was failing, I noticed this while
running nox-review for #24390).
---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b20c0e499c..be75c7e3f8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -816,19 +816,23 @@ in {
 
   python-gnupg = buildPythonPackage rec {
     name    = "python-gnupg-${version}";
-    version = "0.3.8";
+    version = "0.4.0";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/p/python-gnupg/${name}.tar.gz";
-      sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq";
+      sha256 = "1yd88acafs9nwk6gzpbxjzpx0zd04qrvc6hmwhj1i89ghm2g7ap6";
     };
 
+    propagatedBuildInputs = [ pkgs.gnupg1 ];
+
     # Let's make the library default to our gpg binary
     patchPhase = ''
       substituteInPlace gnupg.py \
         --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
     '';
 
+    doCheck = false;
+
     meta = {
       description = "A wrapper for the Gnu Privacy Guard";
       homepage    = "https://pypi.python.org/pypi/python-gnupg";

From d466d9062373ae3a9a9d393b6f84f75099de05b6 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:22:00 -0300
Subject: [PATCH 0292/1744] mate-common: 1.17.0 -> 1.18.0

---
 pkgs/desktops/mate/mate-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index b020351afe2..7bd7a3f2770 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-common-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.17";
+  major-ver = "1.18";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc";
+    sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p";
   };
 
   meta = {

From a5c34e5689ce3510d79299a67fb4bc8d4a532d7c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:22:40 -0300
Subject: [PATCH 0293/1744] mate-icon-theme: 1.17.0 -> 1.18.0

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index ab699c78c0e..e41a1c21710 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.17";
+  major-ver = "1.18";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n";
+    sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

From 23f373d7249e8370229f184ad3d40b586d2254d2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:23:30 -0300
Subject: [PATCH 0294/1744] mate-icon-theme-faenza: 1.16.0 -> 1.18.0

---
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index d9370f318d7..3d820553b4a 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-faenza-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.16";
+  major-ver = "1.18";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg";
+    sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 55acc8708b920cd6d827b95660425b03f362d71d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:25:11 -0300
Subject: [PATCH 0295/1744] mate-themes: 3.22.3 -> 3.22.7

---
 pkgs/desktops/mate/mate-themes/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 343148da0bc..cf78009708b 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,17 +6,15 @@ stdenv.mkDerivation rec {
   version = "${major-ver}.${minor-ver}";
   major-ver = gnome3.version;
   minor-ver = {
-    "3.18" = "4";
-    "3.20" = "12";
-    "3.22" = "3";
+    "3.20" = "16";
+    "3.22" = "7";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b";
-      "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca";
-      "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k";
+      "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v";
+      "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0";
     }."${major-ver}";
   };
 

From 8844d9b8667a01392cc421e77ae8353a886dc1f3 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:25:49 -0300
Subject: [PATCH 0296/1744] mate-desktop: 1.17.2 -> 1.18.0

---
 pkgs/desktops/mate/mate-desktop/default.nix | 43 +++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index fcb66c9ad79..2afd700d933 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name      = "mate-desktop-${version}";
-  version   = "${major-ver}.${minor-ver}";
-  major-ver = "1.17";
-  minor-ver = "2";
+  name = "mate-desktop-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
 
   src = fetchurl {
-    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g";
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
   };
 
-  propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ];
-
-  buildInputs = with pkgs; [
-      intltool
-      pkgconfig
-
-      gnome3.dconf
-      gnome3.gtk
-      gnome3.defaultIconTheme
+  propagatedUserEnvPkgs = [
+    gnome3.gnome_themes_standard
   ];
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [
+    gnome3.dconf
+    gnome3.gtk
+    gnome3.defaultIconTheme
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
 
   meta = with stdenv.lib; {
     description = "Library with common API for various MATE modules";
-    homepage    = "http://mate-desktop.org";
-    license     = licenses.gpl2;
-    platforms   = platforms.unix;
+    homepage = "http://mate-desktop.org";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
   };
 }

From d9672293c2681ee867cc9288b68b91c4fa2efc05 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 27 Mar 2017 23:26:24 -0300
Subject: [PATCH 0297/1744] mate-terminal: 1.17.0 -> 1.18.0

---
 pkgs/desktops/mate/mate-terminal/default.nix | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index dd380f39477..fd907c56280 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name      = "mate-terminal-${version}";
-  version   = "${major-ver}.${minor-ver}";
-  major-ver = "1.17";
+  name = "mate-terminal-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
   minor-ver = "0";
 
   src = fetchurl {
-    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f";
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92";
   };
 
-  buildInputs = with pkgs; [
-     intltool
-     pkgconfig
+  buildInputs = [
      glib
      itstool
      libxml2
@@ -25,12 +23,16 @@ stdenv.mkDerivation rec {
      gnome3.dconf
   ];
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
 
   meta = with stdenv.lib; {
     description = "The MATE Terminal Emulator";
-    homepage    = "http://mate-desktop.org";
-    license     = licenses.gpl3;
-    platforms   = platforms.unix;
+    homepage = "http://mate-desktop.org";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
   };
 }

From de02dfc90b53a43fd5240c640f630c7229ea94f3 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Tue, 28 Mar 2017 03:52:58 -0400
Subject: [PATCH 0298/1744] palemoon: 27.1.1 -> 27.2.1

Also adding fix for desktop entry.
---
 .../networking/browsers/palemoon/default.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index b167b59f03c..bd334356df5 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -3,21 +3,21 @@
 , dbus, dbus_glib, file, fontconfig, freetype
 , gstreamer, gst-plugins-base, gst_all_1
 , gtk2, hunspell, icu, libevent, libjpeg, libnotify
-, libstartup_notification, libvpx, makeWrapper, mesa 
-, nspr, nss, pango, perl, python, libpulseaudio, sqlite 
+, libstartup_notification, libvpx, makeWrapper, mesa
+, nspr, nss, pango, perl, python, libpulseaudio, sqlite
 , unzip, xlibs, which, yasm, zip, zlib
 }:
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.1.1";
+  version = "27.2.1";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
-    rev    = "a35936746069e6591181eb67e5f9ea094938bae5";
-    sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk";
+    rev    = version + "_Release";
+    sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
   };
 
   desktopItem = makeDesktopItem {
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
     cd $builddir
     $src/mach install
   '';

From 12d0d211b900f906101345d7d6e3286236a6ca18 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Tue, 28 Mar 2017 21:18:38 +1100
Subject: [PATCH 0299/1744] marp: 0.0.9 -> 0.0.10

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

diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 9a59bef617b..0e53d58a083 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marp-${version}";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchurl {
     url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
-    sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2";
+    sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx";
   };
   sourceRoot = ".";
 

From 31399937404884e76c409487fd8db9abfb10fca1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 28 Mar 2017 11:31:50 +0000
Subject: [PATCH 0300/1744] nixUnstable: update to 1.12pre5122_c60715e

(cherry picked from commit 4da11d7c9b7ed59b5acb19dd6ba335aef113db94)
---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5603ae1b324..dbd6a352132 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -113,12 +113,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5110_165786d";
+    suffix = "pre5122_c60715e";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "165786dbc0ca0b93fadb6e491defac603475b601";
-      sha256 = "0ah68ss5wlpgfpc4k7yl2h3szbwgllyn5d6s464vynaig6b165pz";
+      rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
+      sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
     };
     fromGit = true;
   });

From 7bc9e508ba704918165c3c8ea2e6cbd011b4d530 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 28 Mar 2017 08:44:28 -0300
Subject: [PATCH 0301/1744] caja: init at 1.18.0

---
 pkgs/desktops/mate/caja/default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/desktops/mate/default.nix      |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/mate/caja/default.nix

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
new file mode 100644
index 00000000000..aea006fc486
--- /dev/null
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "caja-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libnotify
+    libxml2
+    libexif
+    exempi
+    mate.mate-desktop
+  ];
+
+  configureFlags = [ "--disable-update-mimedb" ];
+  
+  meta = {
+    description = "File manager for the MATE desktop";
+    homepage = "http://mate-desktop.org";
+    license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 4d662cf52a9..d9565e8f4d1 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,5 +1,6 @@
 { callPackage, pkgs }:
 rec {
+  caja = callPackage ./caja { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };

From 88b697330ab4521ab17c385f8031723dd0c9a718 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 28 Mar 2017 21:12:57 +0900
Subject: [PATCH 0302/1744] firefox-bin: 52.0.1 -> 52.0.2

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 06aca4b58e3..69b14db7047 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,925 @@
 {
-  version = "52.0.1";
+  version = "52.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ach/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ach/firefox-52.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "9005c3ebc0eebb7e1b29384e931ed5c2b888d0d55c8a3f34133dda908b82df0a437c5f2a6f91288396306e161fd82df2cca4f2c49685f898760b125b6d7743dd";
+      sha512 = "5fbb048cce8addbbf8b985920a44fcd2580a31ebead7f1c9029287245bcdefffbe6c73d887da08dc7ffcbbd1f35ac235af59cc900519b49eb6d741a610b4d538";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/af/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/af/firefox-52.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8b5e3fba883af6b097ec61bb79d3e024e55c59e9f1c3f443f74e944b9b71d56ac8ce7199bbdabff06087e0082db618636d3fc832fdde926a35877046c7baf740";
+      sha512 = "e48997da8e26a95c479804b4dbe75d5513574f9301b264f8f28bb8e2b2982b5d69792a454239ea6e8c384e2e5015bb1842dde450411f0019e5f11e0e19eedc33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/an/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/an/firefox-52.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "cf0949e99606dc9f961da9f8324f96f5873ea3f7fc0454aebbf982b43704ae71575371fc8bad84b036348f206e9112ef251a0939185f39d3f0ff15aa3dcccbc0";
+      sha512 = "18ad310dc853078f556af387afefb6a4adbfa9b3db1ac3a710963510ab0b40acceae50d79cd4d851b1c6d114bdf555f792fddeecb53e0e00bce3c9827dd2ebb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ar/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ar/firefox-52.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "202e602cea8fab71cf3b0cad522986904fa328e181599d7005e7668a115edc3eedc3d03a66eee3a3f2ff3b07b36b43394ab90e5ddd915c89550302c203ce0a27";
+      sha512 = "8cd1078dbba732b635dae123206b0c5c312fdc1cc9c77271f451670e45f54fc13cda66623d2d6bbf4d99b94c463fd35300ebf6372d0b7206c493966f5aaff7c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/as/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/as/firefox-52.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "9eaaad262dbe64e70d21b651f847abeac51c66fc9ee6116847440e4217dae28bbc28d54c8d90ec7e35dc614170c86fd66bbe4d7d4e26359769d3022c3b1194fe";
+      sha512 = "e11476e2b9da554583fb2b5c8ce47b4e96a8de888a10191822fb8afa646da260df8517b3109853d08f2dad591e40c3bf20ab2bb101ec3bdac480d87a68cb9d03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ast/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ast/firefox-52.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "93bbd1bffd278e0b9ad3f137bfaf28ba0defc95c7c9c646daf034be198051fff59e3905bac5fbddb7e6e4565e21424e0de7fa1d223ff9367d165877fcea88675";
+      sha512 = "a476386d83f4b0ac51d9b21c5fa2a9c0a0241a17334f090528a9115c83fcd2aca302ae03ad3263b894ed4f1bef5fc3fd07f33d06ec2be493175fae0c155579b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/az/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/az/firefox-52.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "a7a431a8d9aff2ed8dec35b60c0802825a69ced5de4683c006feaaf2f7e05c5d19f3944fa2598be2dc6b3013e6483a0897a5924d648a8663e2a7f2647d86d491";
+      sha512 = "da12bb98f708cc7c30005581e0c17c2af7231a61042e6a5b94b6b15c802dbb4d5cd34e8f6ccdd8f919a6f369b7bf76cefd637eda2529fe3cc29a33850174eba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bg/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bg/firefox-52.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "edf77b166ce81c45f823d1e672ad17b9da4fa598322110c57866d32366e4df99c5b61ad96a5dd6696c5c7af4d8af941d32eedaa4e998e3cdfec1fb7512e2e503";
+      sha512 = "2beb76258e0addde9d4e5e478830e8ca04816fc4ae4964e1a74b7dc919144b5b811b075b6a8808032c9f343ab2d74dca00c2d73f9fd9e8ea5d72078225f43227";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-BD/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-BD/firefox-52.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "97b39ab362e5c99be87408bf69ac25fa9385a6fa9131e0cb653ab04993e379de1624df6cede9862535cb301244ab16e8356c243ce15970a0e292317c84399426";
+      sha512 = "ec5133db8877cc50159fac7ecae02cc7c084ce1b8183f88e654355fcc0467b593d4a7099b100746bf26dfeece89a2764bb42a728b1dfde7e87a6140ca9674f5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-IN/firefox-52.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "8b49ee12c9e9516348268a595b51a808dedb505b94c35ac55e357046e9346998ccc2b94e7540a749dec2c87b3ad6be95dad2f00edf8873feacef2fed162bba2c";
+      sha512 = "5333c97ec057f5fa5323a82bc81b93511fb5770df9937b679085f9ccb02ac02d35800427ddc9ef3d009e4042b95926796a5cdfd8cad7608d150248ca8677905f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/br/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/br/firefox-52.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b464d2da9bb8a734974e35740c8609ceafc7b731feffdc250fb16d9210c895f582f9e3faac3f70484d76b8c37f435163d6b3d1c0f9c1388f9bd1f473eaad42fe";
+      sha512 = "d9259119132d42aa8eb8ac07378ec87e58b724173dcd0540ffedc116448dbf8f0abf51c438533ea6ec69b882a423c2fa8a65a448ffee05af5cefbe5b06837778";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bs/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bs/firefox-52.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "f323bfb8893c0899810e7f58ce72e569771de10e50d1f711a52df627bd074d95532d09bd9c3dc5579876ef32ba3302e3ec6799f7d8e93fa4830d6584d8a69e1b";
+      sha512 = "8afe61d4d2bdb40d21d0673569b6b0514c559e492c9a736e0ab56f5bf35f07dd727a5a11c049a0d3a1eed211584d511bbca2c5248a54ed43779183301c4b207d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ca/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ca/firefox-52.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "717cba2c2f690051e60a71f74e0b33d7792ddcf574cf65388de6780bf9bed90c231187a39357332bd389be83279a3b00778a04149adfaefbb6a1047077ff886c";
+      sha512 = "7ef55d89c32e45cb84aa2568d053d0950dd0e0f448056a7c6b9dff55484e0b2a0a81183bcb7708a8f85e2fdafd794b846ba4672b447cf987f903df04617cad99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cak/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cak/firefox-52.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "53c5a18b593450cac1336b6b16767bde7e3feb8575a5f32e00f57963daaea6a14276679378dddbeed4bf729ce55e929670ff79a65e2b3bc2da882d19a4c750af";
+      sha512 = "341739dbddac50589949738376aafd039029b7e566d02d6beb71d00dcfb27eab8fc36129273eaae983bcfb0cfe0f266ea7e2b1613a95515b5ed129d0d13763c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cs/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cs/firefox-52.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "464b3b2d86256fa941a8cbbc04e68452961e8562194abc14e3e972a15ac7ccd59472e41e9a3c80ea92e5ddebaf2f56c6ff297efdfa25d3d9a892ce6d75612c14";
+      sha512 = "8a03c8f2487d853d3c662510d486a4349b5f1c94d8064f38291b231e7a4ee1b02ea58d22324cf6cbb2c02e490e49244d99a20f1cf432e2da0c882fdb5436e3a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cy/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cy/firefox-52.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "00fc374e844bc59793e60d7813c7c2a255d6fcd62994455eb55a014743bec81b2eb5fa31ba39219d1d7ecfc79751f62913b3dd786d62227bdfb030f7c2d24c3c";
+      sha512 = "d22710f178f69efad411f8619a618264ab8b678f3156f1ba8ed4c1c15fb9598f8cda42840837e0bf62024cd160b1b4bbe3002072852c007d905486dd04eec617";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/da/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/da/firefox-52.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d61608a98197a6c48bc38edbcdfa7cc821fba8221c16534ffe67e6a013e5b1ba23011c3524a8e8f2b07e6f5c86952854cadb4c8b8d04f945f2e6dbfb1fb4aeff";
+      sha512 = "ed130939217b4a2fcffa91ad7112a5485752baac2834adb30a2ee5915a905a3383fdbe651b268d0c245920d608de80a37dca01ca6380cb6aede5bbfd8dd757f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/de/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/de/firefox-52.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "af188724c00163656584d8e28bab102ac3660353a6f78c703b9fa336f1996e7b3598144d0862e31de595b0b40d5345527dbd2c515009f93af9c4452f7faafd25";
+      sha512 = "a16eda9c74517026092169ec9caa4e13876760e9e05774c70fd4148653e0198ed000f9ff3f6dd4224b8aca5fd5fcdb7dd3bb60043f9d4c32d93909f879f35e16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/dsb/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/dsb/firefox-52.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a15754dab9300b45db4369e84f5adad3231763d0de944c589ebb90789b80116233ad159f90ce6ab5275e6e53266e09b1095905fcbca3b857318608174a776a13";
+      sha512 = "9e379f2d6ceacb223e4255c0ca89a6c1f13ed877168a06fc76b181d8b4476e9eb51a3f25a3be9853239363bcdad91f50cf8b2abe67ff937ec73fbedad1d03630";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/el/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/el/firefox-52.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "fbefdf3d5f155e726132eac8eb61e2f94352a5377502b9f56e128c386e7950b4a9718c1c50782ef2e98cb2e4c5bb4eeacc11f200ca36c97baa0ad0adbe14b9ed";
+      sha512 = "b62e72b5583b204d121ca8739f83c57aae4a39467d8d0f7b48f5bd894c69f3a9c8689d6840f5b0cf9bdff94b669fff520b2a3d4478fd6b35637eb2ff597e3fc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-GB/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-GB/firefox-52.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "6d492447da62f9d0f759c67b50b88bad0346a9d932f3eea2959b105395488dceb2a773f51c3e75ca97fca4426c3110ce1209fbbed4900f9d7bab1d78e5ec6883";
+      sha512 = "48bd9c2281d5f87b694b06354e35090ee940eb81a3c2fc05c0bd84a312b96952bc627995359eabc43fe12da6f7879c86f2e85efb0cddca5b4bb9a7a1eb7b6842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-US/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-US/firefox-52.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "186ddb8b223a968c4a4364dd0ea6a1492149e2290056f3fda58a1436f37312374c1e07775244debecd1044eb51586f43b893b82add94971eacbc86414757c0fd";
+      sha512 = "f84b186c83e7cc3cc2bcab136029e299cfb4cbf89891f07a7f0c79584df18c914c24c51615e6bdb677571e194e964cd6d49cdf10f76f68f3b7b9bcaae50ceb3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-ZA/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-ZA/firefox-52.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "1aa8e9c6de59af862b0578b6ff44d3a0e98827c6ddb8ad31d4e6de3f26768b7e302252bb76a7c9c8e0494b49d820806b00d9d89c1618eb44d307bcece7345f01";
+      sha512 = "f7d93f3b87b7b544b8f9e216e44c1198664651e338cfca2ed80c0b1da58f5ebc4e3ddff846fc24817fc990bc0fc4e71dc9ccab7536fbf00038c89b74c9792ff4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eo/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eo/firefox-52.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5f1b247a37d72c0587ade24f4f4a9fb79f25bd8395e5777524a877d0854cfbb921b62e07a4662d8992d02fc1de6c318d2e28cd3cbeef5ec26ee9f2ef25e87939";
+      sha512 = "48a53a09475afb8a869d132b7d0eb9a4a95b51fa5b67660bad0ef2b85fb5fbeab8f1b87b1b11292be1449735abad8905aa5a35e23c3f9d04b23f8abc775309a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-AR/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-AR/firefox-52.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e6f1f54b43da0740b14bed00b45db2ae2d23735cbf9baff26b5d828f2e20161b8527d10ac2c2a63351122b7d3f8a2ac4b0d546f136ad063b75eab7255b16ab29";
+      sha512 = "f95ab62d722f2c4417dae3d95e07bff50cd94db863988f6216234a2781711b5ad6479276b213abf470be174a8130ae5fb40cca79cffd67acbee6a6d583e5131a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-CL/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-CL/firefox-52.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9cb2f8c9aac77caeff715e687d239d9a57567e079c61efeec5647eaa65bde141251285509ea066a4f8a053986119cdf731a6d7ba182660ade5e2948cdee0352d";
+      sha512 = "ec9ec0fd29ca215de08656582738d0f00206c38ae9d52516abe8499c107af8b85567b96bd71345deb9e8eda98ca16ea5a6e89fa87769e65aa43832011eb36abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-ES/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-ES/firefox-52.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "21254e11b51050a422ba68ac9df14be6f7f672518a7473e874145f7ff07f9071ae315c0d7395940c38caa8735bf53242f63658f3c2a9cfe12320525e24ded2d1";
+      sha512 = "b84b43d975d5848355d10e88ee131ab85cf3bd4f2f48668d2d75752b7e5d517e9aaa32eb7a482d768f5bb9512dd79240f6ffa3947ce21c377f632ed2c6ad3bdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-MX/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-MX/firefox-52.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "98629639d6f6cf4c59ef294dc6b1bc3677babaf9130506e940e288beb4253406862484f1a0953accd25ee10492a5bb3578bbf692b61e7ee36a0b238e7ce6f317";
+      sha512 = "dd6c3ea08ce626ce5ac6ea14bbbff373394da116d386714d9a5eb62a5ceb50975e2246ab30948569693b75fd5ae63adf7bd76e6b694601e7968ea8e5d5426b6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/et/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/et/firefox-52.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "affc635c93901437f078bc4bb07c7f22939429ad20e0ef5171ee53762fe31124115892d77519d6ff59f86d19170ba239cd895273ac84f26aec4283323d7f7682";
+      sha512 = "0941ff6cceb4aa355933a4d631af009757c1be88d63568d3087685407d5162630012b1a3746ce23166cc31f56629d017efab1fb1c3fd7a9e7b62e61c01fb004a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eu/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eu/firefox-52.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2891294c7e382ac55a9c210d7e824479baa281eec8fdbd6cad6d1dea0baf08caa9051f49530c1aca11b71ce5d50fa475a1e192490c232170ffdb9aafa47d1458";
+      sha512 = "fa7d4950f1ff3414961ad2a0caf1d1beabe9522694baa212c7c58b91681c7971fe323b9b85296021635c805b853ae4de12428ea6ff83696c04c37a8442a03538";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fa/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fa/firefox-52.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "b7df64d26a1155616ef70a8cb99192ab5d9624a4b0649f5829dccdd2fe833cf4aac3aaff86939adb228487b9a75e7fbddd6bbecb3345a3a42113863cf466cb0f";
+      sha512 = "c31fc76bb460b0a18a8b8acbccd0e09491da203a8c88d238026192d2ce0c0b0b744286ed84363b6b1199c3d6bb92a2ae69c4897b82c6d4c46864d1a03fe6502d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ff/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ff/firefox-52.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "1341979a105df3a1cd5beca0e99ed6cf177e5245ee550decb2df3b06c867cf629522fda9826a69826a1e5676d728d16315e3822a71f523691d68a5114e68fb6d";
+      sha512 = "0349ff6ae8df062abbcb7a98d5d832c30b7abb8a2c9e9bb87d1646612ce81b7932a4ad1cef77e853bbe644bbd1285fb8aa156417209fbb20020e9b92b5c30ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fi/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fi/firefox-52.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "01347d4f9d4cf31b3d2c2bca5206ef80123ef4f3b96cab6d9aaee503c497df2ae0a8099e28e9de410a3baee4d7b950f2c840056b690b528dbae5759fdad7e3cf";
+      sha512 = "b3ca267bb15fc2351164b2b561a399c7063d5e391a263f4a62bd7706de85e8720461a05b715fc3eb472ca3ff959464d0ceb20f86628553c6c39e74388c8b1722";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fr/firefox-52.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "6d5eb134e9b75cdc0f0e4f4119c74f7aa73bd5c4512ebd0371c4ec330ca0c5414b9e6d398ae67284d73011e42ce6ab6e8ef4014cb7d6133d284abae159eae2cf";
+      sha512 = "f66d0139e7ab051e06fe73c11b2d2cf88ec1587fdd6787a4eaf6cc53358e4dacda5dba41dac46aa0eee2362740ba37a0fc728445d4182eea53d69dc4dc24bedd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fy-NL/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fy-NL/firefox-52.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "71e9ad99c3bfe723285ce4437a9b1a5506279186b8f144520e3479ff463d792ce3a53b7681a03de055d69849382616986f383ddc5e59eecd5502fd6a6f745819";
+      sha512 = "e0dd7577c12a669259204157d2a65ec00eac52beb91a1fe3d69bcd92705c9b27ea0010bb4a50dbb7f9e87e1161eb089e966b60f4db304b24ba4929468d7d62a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ga-IE/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ga-IE/firefox-52.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "9fae8bdc0b63bc38672f9f7cd3fe6d995d2f2131d4d4ca5f18dca0be21294e8e2328dcca6e630467929764a300f6fd9b82c080afe02a072d4e81f1874894e1b6";
+      sha512 = "10c7729dc2a774f09e44a3dfdc6635892efc7d9ed3e57ae5e6455c9221201d47f9228311c11d7220eaa5d40bc1e6af81fd1933c1b93f2a29cc37b5913ccbd366";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gd/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gd/firefox-52.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "750dfe9668cc811e9b72e792223640bda908e5273f03b46e2af68614a070fee1fad999119d750e74eb42c6118dd5b4212c0cd75b3d8f9dc842c6af907938390e";
+      sha512 = "1a957c457be0b85b5623e730513c006d6ac5d783e8d6ff714ef6a46e89b4e4779f32ba6705b35da9c65949de433ac261653515adcc8ba7ff68dc6b727687f71a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gl/firefox-52.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dda00c0b6f88dc20516f65781ff9d96e45934c1f92138a1444aa83264a2aea85ea075376af91f71c5311c684a5f9aa9cccb63d67b4a3f2a96045540a161d36df";
+      sha512 = "75142b0a03d075938e1a221fb78b9d7833e70d55982f3b710ee6e9c664b44289c7b34d883e20cef27376c8836f26abfb15d8078bc6536f9fbdbbb085c101c04d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gn/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gn/firefox-52.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "4638c96bb72a53c2c8add3c7f767d58a9dc62ac812665aaa1c46ce840d3f4367a9cd7024794b38ab7e8c2e21ecd2bc94ceb38606dbd1f53b8b2dc1751fd1bb5e";
+      sha512 = "41809ce36cb357a0bb82ab5f22c747ce234ffb670fafc7dc695b75675f6192d5b251ca060d3f54c16ccfe9680939313c32a00cc2551d376420c2b7240654c7c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gu-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gu-IN/firefox-52.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "41af30d770df6c5dde5e55e61ac4f5ac8a6b28bac27c554ab023171ad5eaa973c3b80f64e3ca9fb5db9c7d7943c9c9438ab7b37880f673a1a418e70ddde74624";
+      sha512 = "c6608688782cea5f8c96250590dd71659c80918b1219a6bd95c6825abe19fb2310e16a275018be1b828a2c49fc1b457ba922e504e9794d6ffde0a940d4569708";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/he/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/he/firefox-52.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "023359000792e3ad54764abbb46c3708f248730e5f1c8c067b1bdb81d1fbde83ef44233ab3177fad322b50329c5663aa7a0c89e820a2c8efdafe5b92f134a0e8";
+      sha512 = "bde85d84e3a52c2ff7345b5f1fafb9badc4ced0ab53cf46e2376d0fbd2a73deacdf48a2a874f09937761a9242c8a95836441332fbd2b8c26ce62835f0da621dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hi-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hi-IN/firefox-52.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c2f26a610fec1c18333a01a5e7d44af1303366e9bb071ee945588b5886ce17670ea34c5bda3be647b4067dbb9a6e3f7c9c0751f7a39cc8463bf6c690e2460198";
+      sha512 = "3ab61abee1275844f906c09d17b986d0ec22345a0c49fd6ce262098495ad90a754cd671df65b2669193b24601eb037e3241d49ddaf29fc3b755c58ad9d6d7280";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hr/firefox-52.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "68c04f03fe526b16552a734bc2ddad6dbbe276572586a3ffbe0ad90b8bda7f943fc107eccc9679f0778ca1fc61c475a3b519581c105ff526ff4d4896a6c41eaf";
+      sha512 = "5036e514a41103bc880ae6d6ac16da37570230026f9301c6d831ac88461783072149a252d647b0d8bc6af9e22b5c8845e368cb3d986c8a9020af56f29bfc2094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hsb/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hsb/firefox-52.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b07a88ad8c041444a46ae81608de6048e05366fa0756270b4266c2a613246eaba0d7993e589556a92425558a106aa5e7a18d69423d680cd44cfaea6c64a64fc7";
+      sha512 = "ae110953078579fcf38d3ed24b6ecdade9e4de270ad77d757a1a4a413766b50a9d1ee9faee3986d30f18b9702d25a097e491c5a9d4f33ffa195bb9a52c3ca77c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hu/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hu/firefox-52.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "14ac0e6a21bed1fd94f67bd04e4b93133c7a1e37b66b84effd2212df0561b88762dc1f4a218487077c060f72fa13cac14d5f8d0d70e016bcef624b6a2c2cef0b";
+      sha512 = "e236dc28c60ce2958557bc76dd80fc8f5dad8aaa9a1fd89aba168d1f84ec15512fd5b5967b5d518b8d1ddaf7399ec1cbc775774cd46480c5ea345ca6f0e12476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hy-AM/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hy-AM/firefox-52.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8d7808b549c8faee13a06671bd81c46fd896ea479a15723af0e8c70874c70993df3bab9a6013efddc2932cce910a0b52ed5a3ba853bf44fb0b18da6d4251755f";
+      sha512 = "ae7a7ac1bc08280552efa232a83f571319c4a0a1ce54b8876100dfbc6c4e43d1b461d92ab98764c6ce7d450a6a84a13845a3e972fedf7fb32ba04ae36083951f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/id/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/id/firefox-52.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ac3929a73f46bdc6ebc1d185fc53368590beadd0614e8447f390c52ee213459e49eb05a822128572fa2d4c4b128b93e7c1a4b94dfa4c2a4c071ea679d495db72";
+      sha512 = "96404c291b4bb1d3e57e811f3fe12bbb49f4d3c69a68c903f00c83f284da2c1843e2d045b1fe6f0de784850aeb1e828007a1baa7c7aeaac479611979ecb416ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/is/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/is/firefox-52.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e9b49b02dfa2ca87a273803c6a84c981d731e0320fce30a4580fa31d93c9ff06ea4d55f49efe771b008a5af3539a3c8e0fb9ccbd855bef951846dc687219ea4e";
+      sha512 = "da23804164392edf96728a18e21e53a4951a5122f22c867fa61a72db16f3dd697f48a099c91c3609fd555a20dd3e6f2221e0379f8d2a4f9b312359d1630c3225";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/it/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/it/firefox-52.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "4fe510002bdd30d0d713ea112819365f55fc41de024877dfc02b217fe7ce825e5283838f81acdd0456418b5cfa70c42f071ca36668908b257ada23659042cb12";
+      sha512 = "74c4c4fe5ec6af0ccda964194e080657d294e237631ba90ea4378ee3f2eb1cab6338829c81b419994da181e696606617c1b617e0664f887e1cc45288b2854c1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ja/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ja/firefox-52.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "a56937787b4f6fe0fe079ee13a362a6cbbcf8160e0ce08d57d58bca7f14ca4fa34ea62c7ec1081aeefeb271c6f010a31a00ff31bb8d3d913b41382fceb9a3e3d";
+      sha512 = "8cc5accbdd64fe2cf725af09a5a6677033eac513a831793347d1c8a9eb3b78236e3311aa330c1a4c23f17df2dcd9ec78218ab6b478a0d0baff08fe9d1d8bee2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ka/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ka/firefox-52.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "3138f39d4a346f1c38ac28c498bd27c34b541c1b389eb0bfcc1957e1da098fe9b2209d46e362eba66eb833a07e77e056e44c179651b7daa88e706c20f26ab0c4";
+      sha512 = "5b3023d30f70652409074a2507bdc998fccbfadf1d94b5ef3896fb18cd934eb4c0b21a8448042cc5950434cd1bdbf004207823b2416684f599cb5e9a7b425bce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kab/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kab/firefox-52.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "8539be22d54dee4a51207bf686260a85c66eabc19efb17d397604d19711776c310f1ceb2bb7e67be797216ba52b8eb6fbafbc63561db8dbff1d62b02baafd6ae";
+      sha512 = "cc9bce1b5ae317fa4e6f6e33440f4c0aa7beec036d27f36e8cfd17df34d4c78ebfea9d7bacad2c0805e5808a311adb6d573ef81c3230de99d6a51efc51d07f26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kk/firefox-52.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "4df849e9011631763f6a16ebe2e1bee6a0dfc25acebdee417b0b023e1c6279f91ec73ed2703c206b66a55e220425037ed11bf0a4d022d5a94ba8506537c26fd4";
+      sha512 = "d5ed3e9b0542076370df94fdcd2eb924d07dbaeb4763bca3452b156ef1d9d75e43a4c7d202e70cab018e9de5ce40f7e9702864c120fa6fd8f0833dc916d9d205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/km/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/km/firefox-52.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b9d063f695030b801502265ff5f93bd56a0812c45c032cfaba2354ff103e8e5c5ecc3ea43a23922c27b36e68887a9180746fe173de428c48c9a9069ab07e3c7a";
+      sha512 = "bbd78525f8871f115e64bb225e8b62f89a446f1df19521b364ef8a3d8fce2c44c4cf4f36130fab12b60d9db8e127604c08491b91e34fd9cdb21b4eab56728e0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kn/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kn/firefox-52.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "bad628d1438caaf285d14cd68ccd1f7d7021d1a7cbd28f6b86f3368e8eb7dd4c5eb60d5b75b645fa41b88ece5925e09b87eb69f2b187a1ce63e813537e0baaca";
+      sha512 = "63b06655503229444c03170141962374ea469398b55a154965c3d3e062016ee6004203a22575c0f737bb21a8271d70c9a816cd8150f72cf03ecf6ddea2717c59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ko/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ko/firefox-52.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d1069067daaee4a20eb41efaaeb211554e110b9ff35d3a71e48248eaa1da6c12242fe66f41a1e38bc53dceb731e1f46e0b77b25a128c4546b2103e817a895ceb";
+      sha512 = "c96616dfe9abd66d8b92ac3c6e80cf93733587ba9facdc397136504b3532b014b9d43393e623cc6a0f44a0a719172da09f807a08ce0b82f00d21e6dd9731f43c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lij/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lij/firefox-52.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "eacc7cb06e9d2bf006c5de5ff52063d76198f0444e66e0352a5cf337f722ec7648baf8555ac5da115254f35471ba176d2f7f5ba3a166005534327481a3c566d0";
+      sha512 = "615cb07855818b741c59fc7fee38f31052042e65962e809e46d75aae5dfd7ef13b77462c51c0956915631fb9979f4ecb093248825399cb6c3c6af98c112ccec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lt/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lt/firefox-52.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "04e2984a9060fbb5315aea2f6cc822fb56c6bb73f44e95b410aea0e2748e15f31ff3e6ad869215d13df881300cf1caf55c6fdaf47fbc14472d103772d3ed06c4";
+      sha512 = "bc8ae3fc1989e400ac6f8baf251e2c9f43c457668e474a25f7c57cb0e55469a3b7c2cba51fe17a29bd2e8bd9287bfc9a8f39c811a63104f4af017ad7998c0d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lv/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lv/firefox-52.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2dfba1438c807e6f19bf659e17a6847f3d84cb6e1afde89026a5b54083ec5a040366a81a9a3d2653f121ab3ddaa8f2d9bf7c5d49d61370f29bad2f0c705137aa";
+      sha512 = "9bcffbc83770a25f2b44d4a89eea71de92a62fbe654abac762bda4db6075bca20f786b99b1942fce7b9a7a24b99ff129e3349938ee4ea9e06770d02326487cd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mai/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mai/firefox-52.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "44ef596b16c11621b9064cef9c441be0d2a859429d59b7f6bdd760eeaaa7c487071da0610f1f2723ab1784a41931dcea31681ed91f9f5075b6dee3657e69feb5";
+      sha512 = "2d89a6b43bc9bc3096cd4e6c8537edf86fc9baca3e07e062bba03580c1c3321ac07024a904da27d6dbb246d0d9a691f2669f789f9a7b53332dd323bedfc23991";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mk/firefox-52.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "52246cd03b0b9157a641ac25bd159a605ee2ae799c795f61fd5987b5057f0c364df07339e67cbe475fc0c053d1bb5f2244accdefb1e705b5201702272d210712";
+      sha512 = "09c763ee3657545eaa095acc2cd3df82b5d4d61afec274dfd026b2fec670f75fe0948854ace5ecbecdb1c32bbc3916cbdb0073dce83e004e6d36b84b177df7da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ml/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ml/firefox-52.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a5548a153520fe7b930aa2f5645c3b6c73a957d564aa811b548fcc4a4814357fa2f1ca701948aadc2109f0c6ecf5117cda0f0752fbf981f3f65a46ee71543234";
+      sha512 = "db6b7d35faa8c0b37fc46b73e4af09ed3e297a70e21fe25496a36aabac41ae39f2ccc060c84ee6134855078f8ef3099f4a727ca8e6631960d72fee080646e2f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mr/firefox-52.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "863e5c767b9c071f4cd24562b6259fd758b834f091d3e22be26ed7e81d242861fb6a0d401fcd1156b1a3d750243e37bdc4f0ff716024d3eff1dd783bf2153e06";
+      sha512 = "95690e4b71eb853d5482b28f0acddaad6bbdda466650b691836e07bf48ffc1005794f783dcf64620390936fcd77db352a0585abcaae796dcf9e60b93084d44be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ms/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ms/firefox-52.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a60877264b3ff2d2b0343f6030f2da7b07f6c21a4d805cf1d125297f49c7bc2b93980293e428c6cbc955b39407def434e503654084e8f1054290786734d89cd4";
+      sha512 = "e98d53dcc9af968211a81a97bb749b308139d35403ab221c7f36e0b291e8b429b7db6c7531a2c261bf90b81373430fa1e54cff75f88546586f808c8784f868d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nb-NO/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nb-NO/firefox-52.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2fbff650d3881898e6feb998bb00a77d320ac11d4974bc9ef3f77b6df0bdd07ba2486bf358691163e5cd11d11444c63aca728316bbb3e4ba15b1067d3a9b7962";
+      sha512 = "b7c34ba0d7fd0259637e650d2bc251dbf1b3ca2c365549f34928f7fe30c663b8b54c2cf7c587120df5586fbaa770c8b7482a53881339e2ce3b947b3866f4ef43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nl/firefox-52.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "9ebf1a1fbd185f1992793b8c13cacd4ef26b7b51c239d69395c02903ba412382bdf21638fb60723f1b3a407ff2591fcf95836a75d4f4d1a660968b9aac513708";
+      sha512 = "85c57bd3bb2e8b89fbef5f2ec59130ab16d723fb79fbd91e1a4f3c056ec9dbe8ca5dc293d34730603af60015aff94b43eac581f9bc2bf462512762232ff445b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nn-NO/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nn-NO/firefox-52.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "9e9fa5784fb5d5f1239f511cdbbcebb7b2dce412f7a038d9dc4a3c5890764621d8949d788de1fd83a2f7bc83e909f0f60591ae1cdcf26d6c09600877cc540a5e";
+      sha512 = "ddac997563c6cb2c2fb9096e85aade6645667b6c719b7743a405f4390c91222a9955432cc314a5fb2cabf2a80988dcdc491708dba7c507d658a4a8ca78eca688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/or/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/or/firefox-52.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "aba2e5b466aa4f84453937f7750933be5bd0d2005843d4d3c4589fe8a08c622432ad63f59c2fd9150c47591a949a7d1da565cafb6e835ade711f882a4d21114a";
+      sha512 = "ba0f16f2b3be5c76f8d84ab92b1297597ebb6a7f33a83c37568dd0107b653678309f1eb5e5c0e48ecbfc1dd2af01854c49261cb21f264a4fbaefd25f256187ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pa-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pa-IN/firefox-52.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "698d2541b460bbda27aa1295d790e7c452d372ae32ddb311b6d80e3f90e298a836f86c4c26778ec5060913f716bf8d5bce2364d5d4df8ba74ca883a80770d461";
+      sha512 = "0bf04494a4515064cbe2a125d64c3caec94521744770337598685766266d0076316d786292e1ebda62450103d67ee13a0d99995b9eaa0d10532a71b2bf3c928b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pl/firefox-52.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "bf1025eed0a522a8fb9c05c08750d4c471c56181ade3bb3424e8031ca1510d3890484b4e911da8df5ed78956059f4d7bbffc1c82ea40864f96ec4bdc79f550e6";
+      sha512 = "d11d76ce3f088e56e882a9cf6c49997e01efc9f79635c75d1272fdb06f484ae9a634b3c52c9d15c938a657611552b54a26b67134e8c5396e6d74ad83fb3a9a69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-BR/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-BR/firefox-52.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "07dd9bfe0e4f5d1ed239d512b2af4b4153f86c5f94f6464898263e6688daec1b4da5a9e8758f819034f17857a57417afd7a5fc67439fbad1153d5d2d9cafe28b";
+      sha512 = "1a4de780de9105009d4f9549ea1be3e389e9a01ea32db30b72aaec7d90d522edae3c6ccb1061edefd2ae95f3610b7839e115e3b53884819088c70387990cc77b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-PT/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-PT/firefox-52.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "7a21921dc0a45a2967e7ece3177f014b8d84e0e08634882785f30f28860a3d56b1b5b224da101bf1bdbd322a6ce354db566a1c51e99d7266a7f532509bc21688";
+      sha512 = "29417545e0523bdcb980cb1be1a70bc3808360076f1e1a862ddecf10665a7a0e83e6f0ac29fc18a8d3b90ac9729aaae64236a091511ce930021808b4de3f6b65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/rm/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/rm/firefox-52.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "2fdc2e2ec175a6df36a26b5eb7be11455d51ef4d0d66b52f6036f4c743cbe95894aa6c9b904a3911801a798e4f7e53002879ba2f2aca3da14f23cc481276f7b4";
+      sha512 = "99a1820c89ee96bc90404d732874be0a136441d97c5302e74d5dfb38a734bdb1373f48c7af0232ab66dcde528a1480c161c0a3b8aac4a016dbeeea3c744efdd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ro/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ro/firefox-52.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "ac4731507c44d65eaf156a4a783e1dd3603e0c86b735c3a488f8b4a7ea4f506db42ceb068a917e1a8f4452213f68ad9779a894180ab7f7856b5e55791660bb14";
+      sha512 = "4ba5a9ba9fe3839ac8ca0d7428b2d1dcf05b1325d62c88ea833759f663a9cc45fd2c88e29bedb29a00e68d787e6fab6b1b5b9906acfd5b02c0cee9e18f701372";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ru/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ru/firefox-52.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "8b67edacf0fc53168074da44c7a8b2452b0e22cef093b6573333e04df9fc2402d2a55b14ec3139e4cce6eb90d611ac1bb22e4f9f548aa65523941b9786ea23bd";
+      sha512 = "2e2db4238f73f8b27e8011ba528fb3d108da5a5d59de43b38f5aaa89740cf2b6ca655446ae28b31c6c22011777bb8c13ac43cd9a2ac234e3bba729daa426c3d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/si/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/si/firefox-52.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "15b24357e2cbcc2d3903da8cac5179cf56e1b4bd68b693a154960614cca39ac0c55129905448c94f5adea063455c3edbc9b32f5f530c8979fbf48347c7fb359f";
+      sha512 = "af65f79352fb6435b0e7b37f6d88988d08f5966b406d903eb03d9ef2c6b393e7516ea3fa3150059ff0c33437f68fa3cd28528e46144f8cd2c59721d5e0d593e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sk/firefox-52.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "5d5b398b8f0157cb84ac8dd8a0bb091504ad34d1ba4b6daa02b9082fd900878d8dbdd5a8069df7d8e8938d4062145132bce9edbc81238362f761a92d6bbcbe5f";
+      sha512 = "cc0649946cd9cd2395fa399b2ee6aa9a469237cefed0db6dd65cb80ed12a18e572c33bd932985309a649b75665d4b8d65c241d0f5f9d92886315ca0cec6425cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sl/firefox-52.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "0add0946e185b8f926115f0699227b661784a94afc56b2c9c9e03f27b790da8d73748016e86ea9260b16278699cdd72b4603a5bca72e0d9955ccff2807ff82f1";
+      sha512 = "c2f746ae453ff8c3160784eb853c20a3cc48ac4ae28fe231dbcccd24b41f003d38e8e13a1fdc269e7a4ce6d77c02f9a15c7e237b35c46d22256779844638c5ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/son/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/son/firefox-52.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "97140c16c3b77352c2e3f56b4afd61c575d6e302dd98c333375a01e75a487297bbf429ff42a88e291f1dd2883d4119611a7e524e535b73ccf6de3215de29dead";
+      sha512 = "d0751c793f839cb6f334027217f164a0fca2861d62ab1d9c9c7a81fe1daf54b3fa6df03564b5d83fc3eb0bb3586f331ac7728d6dd6d2ebafeb614823088ec9b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sq/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sq/firefox-52.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "9c97f6df5b0393ce34f33ee3ec06d21a70e6221c2aee65ff7c115ca5a7f7e82e3e3ccaef5e41c33d72281109ee03664f63240f20c15f6de254a712ad8a0187c3";
+      sha512 = "31edb40d07ce79679b84ced2ec867873a73adb0439e74260934fd415789f8703b1cff717241657bebf5411592d2c12aaf0aae3fd58cc7a37112dec33b68e1d9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sr/firefox-52.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "dbe2f803ef838ea0da7188a566619cc547e272d458a138b5d3b7d1109e708d3d1c72901276f745bec2ad65ec68112ad88523400f805dad48841b9f2e6266aac5";
+      sha512 = "f670f25b2a9fefa7b8667b3d2655a80283610da9aacfcff71c0ee133513f7f21e7521e1f767748896604fb9a69a84e1c6a56063e1db9b344b9e7cd7ea2a9fa26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sv-SE/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sv-SE/firefox-52.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "555206c262c0ffd953937ffd58ed840585345739ff2868fee0e81df93d2b7bcd8b22ae567a13ea5f67cf06f7065fdc09dcd321a326e974f58f86225dbae93627";
+      sha512 = "72a2e2ccb76b6d8490d209c086c4748cc242dce4683a64d0ab30279dab09c608b9ec9d73f900f3816d00ad8d7543124624bffd51e8059a4175dfdc980a0e98e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ta/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ta/firefox-52.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "fd577c71ec42c92a88fd05fc723fba543eeee80114e90b5939d053080574ebfefb2c9d31bd6f0d2625bd4113ec4ed94aa9dcf637a17a7bc0eeb5289552f41d01";
+      sha512 = "806d6a7f1094a84b6d9408dc9a4917291af9d1b42211d5562579200231ca77fc210aefdb93ac942aa28e16f089aec9cc6e8fadc4c410716dbf43287f5dd93ca3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/te/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/te/firefox-52.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9b9f893c25394102f026d0be65173802aeee0999031cdf4a7c3e4964df5075bec2a1a3ebf029014b4a50623f8265672992ad78214a551fcaf776adf659ed5fb6";
+      sha512 = "3f2c06162eed155c1c75a4706ff4133791f7d39026936e67e320cd678e1fe843f620be8c01b822f16b4a6b51c3a42884d6015e98b1a43dcd328f01cb8cca7df5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/th/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/th/firefox-52.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "6511ec6a5c1229181849af9040fb2cdf12d13907731522312bc130880c78d698d3b8d0ec8bb31d080399de7f3beb29c2fe45b6d9d9d3a9c550996c1cf9496607";
+      sha512 = "487d30a850048207015b880ad6762181a66121002820d88d1c5629c19abdb121af6b6ad703227c8ef143786a6f9d5a5f550388703e314368562de09de54fd9c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/tr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/tr/firefox-52.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "26a076902a0eefed3f893ea72da54e233dc13d5bc0abcbb95cd75c68778526eb961d23315018456539811548ee66030d7b1ba02049574b6b2f6eed9bac16b8be";
+      sha512 = "07ea2cb754b6433d25820b5da3c388ac6d6441b15a1dbd12c442e4bb744ea94e51cd95d8147eafb57eeb6d1f689d9373425d25f3ffa67987017a98c6cc13dff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uk/firefox-52.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d9f4cc9900a77e7de0cc0859af7ed1c83447b9a3cac52c4453a6294a6b85bb3b95b6c6385b65014a73fd92fdc4b014eb5c28ed0ca1aa60a75eaccd3272f67157";
+      sha512 = "167993a0fdceec4630f6fd60f28f9f060e7449f7c514893e35ee4a6f406dfe9e330f738cd32a94c109e858a9f0a62952a4b4213774a2703e061a7dbd2c2d5f25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uz/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uz/firefox-52.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "a7cf647e57651ceee739af19008877b409791f86d75592e240dadeb0559cbce6316cca3c396f044a5b4d8daa3e0a11e96cc61e3f6c9addf3a22ef59dcaaf370f";
+      sha512 = "86d34713424a1a610a4d6955fb606d672705d4cb770a73705819600665a06c58f305ceb6eecf4f93f813a3ac8372050799c6d0c67943f5e8458ce7afc9eaead3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/vi/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/vi/firefox-52.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "84e91aa0f8e92b0bb24ff53742e19869c3757343e1c05cbf2fc90aa14bf3917d3ec357f4757dc2932ffb1dd823104c42d6020e0f156a1f7cc21e696462c5d05d";
+      sha512 = "b05f36dc75e5bb6621e430bba274a98e8d780f5491a77cb1279855582f09861f340457a2c03c69eab89f8a1b84ef0f9638434877e65bb5bf9dc101930cd73af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/xh/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/xh/firefox-52.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "cf97e6aac1723263608a29df8df9e67c9ddeea18f3043f10a4c8f22331f519e6a30d76f2e2b2d42e1f5e24a31812e57387198391b14d726c6c5dd2488e94a820";
+      sha512 = "339310357c9fe6fdb0bee54975b3a870efd687f504f0e1ca9eb1cabef2ec410100b7b6a6ce1ea0fef245220b8c8eb4a255c605c54919782c45b9a4524edbae73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-CN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-CN/firefox-52.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "74e10d0cf2e47f4133b25a9351a3a13cd634a4a17986dc896c32accd25fb4f09dab7c141faba5574015da83bb193087b64434a51fdd820b1ca6af82a2672beeb";
+      sha512 = "74b84acff05c34ed24addfc038f5273416164f635516c188787b61e1cf44b929307d01412093a861a1ca73d8a26ae192e40e89a764e285fb332690ccc1451433";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-TW/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-TW/firefox-52.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2f024be661d830f179c5e19bb36415becefcdb2a98a750a09cd80f9a3a9e09f9c3ab113e51ac16ce185f42e3e4d00bfa906f7597f58b0282f3d5a98c690fc981";
+      sha512 = "4da030da94ca0d889ccfd8192d4812231be0c075f4de5e0f1cc1d1fef2ea2c960e447a73c7dbd141130315f886843cf66b463d8cfd0261ccea55b17b76dfc7ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ach/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ach/firefox-52.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "520a791d0c86a60a7f789451f690fde6cab934e536b5acce4b47e56e95c8d775c9bb5bdeec32e4a694ddfc7bb0301758fbda5b575ca1baec6d134df39b6861ff";
+      sha512 = "ca8ffe68361681aed552bccc3141fe49fee7645865344afdac4b08aa8b8d950b5a36773495c827e0ab1095e8541cae406912dc4e539483001cfc7550b59e7194";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/af/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/af/firefox-52.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "4fa7361db2a87f5c133e262e7006844f9d734765c589f97843fdd3b95127c37e040f9634e11f295ab67a1ceb08fefafc8592658e3730be7d1be7680decdecf61";
+      sha512 = "1e08575a3727eecdfcd5a8e04a3b6667077bc7dfcf5d3b22a76dee6d09d54bf97100dcb478ff451999ad4d0fde1cbe12e2b248b7a3112b0a29d1b19a93e46228";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/an/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/an/firefox-52.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "8cd72218d6b9eff75cc009224ca28da2b668c786b111f2761190eb85e5467f980b3ff577cb1de30806b049d92a820aebb854572489140c22e4509f165fb53943";
+      sha512 = "20d6a18d4e203b016d40162e67f2f438d20f18bb923395b63c1b5b1064900ea38ef21038b6765c34dda7afed6c3463fd16cdb4506fcaa13bc963d7d9c104598a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ar/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ar/firefox-52.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a7fcfe0d20d28d15d40f15c6af83e1bef20db2ca8f74e669fb1912b3d7b411b83b8f2081e653048fcce0914800f71f3b07c8119c01f9ea9cc039f94c47681279";
+      sha512 = "a3e6088eea7a569ba3520813667d858b4073a6b4d5d0fe725539139d6747ff30e1a053bc3af37ea72ad12438db9f842ce4cae8bbe08629cdc33600a795cc84ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/as/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/as/firefox-52.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "ad2cd9bbfb85458108a2b32aa07a090d05554cf8d60e113035cd92ac877e0a0a7fa2f7ed6a3061bb17977464d635843c4e1902071496b1ba898c74458c2878b3";
+      sha512 = "9bde92cb7625e37ad287d54bdf3dc876105ab8b026d3dea2ce7121385c61d3c44c3cb7ea931e2805ecb8e345cab1d26db50075b31c19a09eb4e38a185db17c32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ast/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ast/firefox-52.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "2fa3f46e646ab0a4774f827de282b8a54f324dd801d30b256988bab79bf2356723f0e0a1d401c04e429e8e4cf91a0a4b4c0b5ac0c793cb3d2fcf82b6bb311832";
+      sha512 = "6c6ad98afd3ad8cc2ffba9bf19282efcaca160e51ad74f1c7121ca5ca44dd8cd661ed206837ad79d924c1cdb9d2e749f9edd6c9d2dff976439231568df00f785";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/az/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/az/firefox-52.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "0d63c772859254b591e62ab45c542247eca411a8230afd8b0dea6b358d6db6e0dfdde43e05337be554c922caa40f13ff6db38e0526572531f32c9f0baa400bd8";
+      sha512 = "3591e35e7627d12f27ee03f98bc05adb88d048b742e386931ae8b01fa34b977b865cb6990cad41bcc336f94b9d40d0ccb1c493d2cd5b0e3d5f413568160c5318";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bg/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bg/firefox-52.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "2eb0521db20b5cd659c733a18cbb04cf4c15ffdd89482e12df2886d388a85634848108b2ec6508637afae9e36b5ad0ae7b9ee611ba531605db4cae60f1e61ed2";
+      sha512 = "28a9646f6c135b4ad1b52a4b61fec8762d16f4f1ab9471226c88e0958cbde5a094d7a91bbd4e7385f57f45953de62b6efd943ef74899da7b7566402e1c5ef68c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-BD/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-BD/firefox-52.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f0d2ff957dfb93a11c2a374a30dfb800e39ffa309f2b50419fea33488d4098fcc7e1429d434825c4854a5d27240625f2c1643496d15eaa58853fdcc91a93a601";
+      sha512 = "a9d2e14f9218986603d4215e4b28534f60ec208898446bf5e798d921189b045bb8d9954a900545ab4c01a56d23bd21bf0075fc9eb0cacc913b7c66d4dbf20fae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-IN/firefox-52.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2ed01637decdc6e11c686665aaaf1628793590352d804b3f524778c7fc5f1af6e866d28dd1a90acdec105fca392f6aad3e37a4a8d32264e790436df401d60005";
+      sha512 = "1e3e883c9df8982809f699b176dba7176c63b9ccfc7ecd2552f1147a197f0c22671fd11be05a455c9619152f6783a95f4167547d556903b1756e458804de3483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/br/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/br/firefox-52.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "19172c0112eb0ddd67da1f2bd8b759a901f9ce29ee6a85b889317e6f8aa9ea85a9ca6bdab6bfefaa8d65a9b7081300acc5b4eb3bf69b8ffea2eb7de4ba448636";
+      sha512 = "a0bec7977f03803b29bb1ef818c0efeaeb17d0c679ad35c00357dca1c29da6a294da352d2aae751763d1c5e20d385f51bb0841c61bdb8f7dcdddf92b3774f1b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bs/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bs/firefox-52.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "eb4bf2dc8c9d74775a227254f0895d9b10c5e3f72a6c37bf9709eaef555a208b6b455e35e8122e5f96ade59956b7481df5807f4787092b642a6affaf870b8d52";
+      sha512 = "c741b54422602932086e903fe8aa1fcfa91b705236ca223a24b23eedbe4034279111eb3a4a1fbf1a431cee7f6ce8333ac01efa3cc5e3a52768bdd93bc3099359";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ca/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ca/firefox-52.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7bea06ab95279b5daba518d8d30a506f0f79c3b54f36796318213ac1c2e19aa0763774a0746315f564501930e4930105affacd4997b19f6142c1063b45e5427c";
+      sha512 = "f2f4ad205d9b256871a5252c488deb8b9dd2714d843eff0d815f3e9f5495da3269ed47cb2d1cc21aa67220ae06b4958f120be0a8bebcad296a8cb7612fd21ae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cak/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cak/firefox-52.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c5366697fa4d91ea125bf16073191174158497e548453c310292851fc582b05a70768339397a4076b5347c8f9b4d2ef0ff62a03217295f4eb8717a4027c8562a";
+      sha512 = "22a1d0d1010d93720123661599d2b259a72135637692a95ee6bcaafb32677bfda139f4265fb541f5cf571d31d23f6996594710c2d3e6c9fad7f744c443b851c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cs/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cs/firefox-52.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "80fa7b6e3bff168c3b82d3fc188ec7dd33bac07d4d2629df205ebacd7b795638d4fca0ea80aed5d2ff9128d1bbd66ee48512a6b19c8934a8949db7e85f444642";
+      sha512 = "255ad178324900c33ba15721553ec145d6045115462424c58592c2fd4572bfcd5168f3a8035da068bebc0f81c7c9a9fad29739fb09d927a2258a1e7b77139b8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cy/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cy/firefox-52.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "5d7e8741b2880f96c9778e84a07e905ce5c31df4db703ead9f5a8aa23b6ec2a478b760adc02a6747adbcb1f8098716ab0bce2a0cd00de1379961f41682e980a3";
+      sha512 = "4f5a3d8e2bf5bb88122b8593e3f97026878a5c70b9366cad2ed8f723770c583ce32b29177360ef7307bf6bde99caf1179c50fae60b2f817e84a9b4d0579ee94a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/da/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/da/firefox-52.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ca122f0ab79a17d7c07df8607fb9b0018197319f8a644aec4b56328193009e2fa7f9f0b4a9b4a78027f13702c25061443e3412f9be62bbf4eaf793676b1e7fd5";
+      sha512 = "988080ba24f31c90ee293b48def58706e08598341f274bdb378aa1f7e8a437dc2deaf7c36394d4df2043cf07494a4c30d69573afa2c12c962207521cd13febf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/de/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/de/firefox-52.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a813a51c347d34fd9c34d9d65289644946008000d8d93fc3df7ff3f7de66f3cb7fca134af2c6e139dbcb58bf5deecfbdb4b10208bd2f7c424fc00a1d48ece9ac";
+      sha512 = "a144a9d9d3f7b6e4d57c73b7d3dfb558cae47aeee0bea8a445739a1ee610d44b99aef8d1a6eea4f49dafd03677dbae637902a8c225ea31b0189da392ed3b827a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/dsb/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/dsb/firefox-52.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "bf2a32dc433dcfcf44d205ce54fe8e2697f1485abacf11fb4cb2b7a1a24d149f85b07684f3127db3a44f83b652db1d56fb416d1f809eaef83383a70dbff5bbbe";
+      sha512 = "4fa7bdf38c7c96b599243d653a0570882fc9ab704515d362fe96a56b44b863fa09b895f9be496bbbaffd10bd12dcd77839a906db81176509bcc1af05fe92b3ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/el/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/el/firefox-52.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "7d7192af4849b104c7b0c410ef27b708ecaac96fabed438baad76d086dcd2bd46e364a163f59b545d941510fbffa82c39785d9957f6cd6d99f0b3786b3d14a35";
+      sha512 = "2ab698be0d304d66b29c52f37077fabb8d9a74a4819cefd51d09e217ee38959250f92c31a9966adbc8cbbf1217f25953cadc634a385e6d956447887df869e9ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-GB/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-GB/firefox-52.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d19127e4e8ef347b50cff1c1960d0e6ad9e248810d9b346a9fa04b9ebcb8fd6207d3b313aa5ac3fb69fce1f096d5594584e9458f061948ca5efd242d779fcd33";
+      sha512 = "c97a29ff79db2ebf58370f0ae259c66dd1b275bb7bdc8dd60844bba658a4fd1f9d605f43fa9a3e3af44d1c7830b75e3a5bb18f2aa3e0b3920854fa3d455fa2af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-US/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-US/firefox-52.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "10a22069e479cf6bb63c4ddaf796b557bc3ab557e17b88fbf4acad26280df5ad46af32d1d39ab85f5d16b58b5d4be5a9b79f5a081cb23a1c4ef9bf6ff69a054b";
+      sha512 = "0b7a25e0df55a7607aa9e6478b5aa188fb545842a6a8ef2279f7997faa725555d966b276aa1201cc1be45b1428faee846d59e0af39cbadb8ae4dee92d9dbb2c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-ZA/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-ZA/firefox-52.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "d716e7f3b435234477c68c9ec92c8f1912db6d9e10b8d77519f4731e2423143ee2974fe187f69532e93d0994257844e374e05ee5829e8ffb9d73915eee8dd67d";
+      sha512 = "0124f925185f4ff2a0517dfb3b2d41c66a808dce1d3ff3cf95d90ec99892cfd7db6ecf9f8812759a91ac9123d8e1b2a1184b22306e50e1cf42dddec5a36932fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eo/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eo/firefox-52.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "088fae14d0ccac9b243e0457ee842b260051a802d3b47318b4b9d6d723af8b272a0c0c0541deca98459c928c5b271e22cc500c70992d3b2e64655ab15bb397b5";
+      sha512 = "76e0d3669243bc75abd77c0c9691291726a23346ef1facee97065e8d2dd8a99a2fd4c86d48e642877a90ae229ec5ffaee398fb8d67e77cb293ad8a4abfb12b06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-AR/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-AR/firefox-52.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "aff8ffd7a042f1ef80ba7fd725efdd022b5a8862714888af1e736a1d08ca1df5974ff39f3b465061c3f6c60bdc975432f04dde651165309f9095ef98b51a53b9";
+      sha512 = "ceb1b2a454c9c53f159bfc3e04802ffea0c0a799ccbeaac15d792c382b92037c0d447c14e373c9601a1ae22ddf6a7cc47e84f34f27c6bf36ccd107048c003db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-CL/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-CL/firefox-52.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "d8042352f0e54257ce7c96233832cd63d0cb4a0e4d6988a1299a81c9cad01190545c254045f993bff5ae5b2330a6b81baeff582a204674ec236e43ba6492e629";
+      sha512 = "5c62daf105158ab03823fc146ee58d5c0bd41f96cd2e725540992153cc8e2f0065bf0f38050f9125b4ac0fa17f5d0897fd4c9c3776eb8b7bc1dd107608a2b253";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-ES/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-ES/firefox-52.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5e6d4473335146bfdc9655b4d610ae94e5cda83e2411c495c4196690c029d7ad37775e727afebcca0ef3325f27278508fb51c61cb978392bee7723eb2e501b8d";
+      sha512 = "0365d4fdb398fb75c6b3bfde89d47f24b09224d9f2325cdb1c587519e09299fc9838c5eef96a69b5511ef384e2abef1428e51b22e8404d65e13448ea0dcf4c9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-MX/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-MX/firefox-52.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c59952163414d8a1147ea182ad70af0c2223c2f8497248e7e9585c378b95247c88a89c5c08fa6a80fd39bf71f7bbc60126fc9c103f4d8f4eb6dfd400675666b5";
+      sha512 = "b374f2437fa7319bf621a39d13c398e798e9f2e1d1bca8212bc8431d455e6b61f1f15d9ba3a853306952a8e489b37758cc68ee7e72bd7184d1b61866e4384b04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/et/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/et/firefox-52.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a2f17512791b57a94f23a5581978517a9bdf817d313fb8378e7e4e34347fe67ac525ea50d19a73436dd0d8de7ca6a227d16bbbf5458c669fffd5731b868c9854";
+      sha512 = "3372452da795fcc8bca30a370dc6c18c159e1ecc195857b6a6603f2187069ce692be96df7376136e68c92c3105795f559599a2c9d8e01ef0bb036a748ee86202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eu/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eu/firefox-52.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "df4cc75f28a3a0f58b2baa78505e4a9624301e42c3f263f0f46c73a5c36915488de98e8eeaa36544de6881a21fde33c8cb78500dd335a6e904c5fb30df3b6a85";
+      sha512 = "66c02a00d2b17dcf158be576c937aa4c74a7a341f6ab0a108bb494dacffe09141a6060431c95e92d26ceea000fb97a103044df899759c549f4dc50808277454d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fa/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fa/firefox-52.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "faf68fba10608a010bec43cc0bd994fab084de47ed7dd4908bf33fbf90369f115ab6964481558763a06ef603ce6ffc4d97db48006a3dfc92fefaf13b8c97e6d3";
+      sha512 = "850457906736be46b827ae4efe2db44235b485f86a4b0b749be9715182f1a964c3b06703b9a0a710011f74c86f6ce6f146320cd21077da1070d80d25d8bf073b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ff/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ff/firefox-52.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "199159e04b958f9e485a5d643dce371fc19840bd7e9a4f95d7f1281d5eb860e30950583e569e806e0eae90c757917d6bf1bd32d8cadf07ce7b3c82b5771e0f55";
+      sha512 = "3e81a45db8c20d46e511a94f4a59649b4949c160c4bcd4f1e9d1746c1a00bb870d5ac10d8659fa94cbca5d481ee9f589b625804276b2a29ff27cc57314391b84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fi/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fi/firefox-52.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "a5ae3dd65552ddc5c8bb843c9860ce070e793ecf67b35a77e005e54c5bfef1174beb0df114b7fb380ad3635465f84e4167f2b247c34a82b9a2208cdfe55986b6";
+      sha512 = "976920e06a5417dccc81fe44df54ec159935452c4a364a8e59772732e7cafbd99602bf38c4020d9e6e24b80c58723255e532c4a96b1500b00438a7a80561d717";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fr/firefox-52.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a6f0d89b4a6d52fddbac39db1947f8671544bea26b8ed0b2759030398fa5d1e7865fa1200b67da6a8400a470e402bac0dcb97afc49c20de6a101c224ec9d00ea";
+      sha512 = "ae997ed56e309ea4d084a05ec9be2548fedff29a4b91574326c04bb0f871aa84feaab64e1f9b9b1810288b4518aab45ed0823e3c3dc66ef19960dea1e31eaed5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fy-NL/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fy-NL/firefox-52.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "0facf3356011c6300283eff40bd8311f7e3f75f0eaf46a673f06a0aab807498758d943adc8015e4e649f66041d35107509de402a2514d108075d4398e0201300";
+      sha512 = "cc6007ecb609d9ec48c45a7ffd51a5f86fa5615f281221cc709166c56262dfe702566773a84e196abef08d2168efaec46fb8531f9d65b053252506925f45d103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ga-IE/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ga-IE/firefox-52.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7023456136343eb9aaf5ead84df355c03f5cf7d02928ae3ec8e7ba6d7ada3e6aa020bd8b79f9dbf8f8b5d9c2ea15a37d136cbcff215f77452ad75f40a3ff8001";
+      sha512 = "26e3eaa12931d9df39f23c0b32cd75c3a4b59e7e72a35836f2182775a21dd59714acaf6a598046d59b4f9e89a78dd1bb52bbebb115f68fc2fc03c011c4b2176b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gd/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gd/firefox-52.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "342b1ee75b201661fb588a5f6d8530014378512465ed9beb69608fb9fb32fc7f9308cfe4592ff16f325952b3224c27c16a6c5f0e2236b9eabf048f6b096c8510";
+      sha512 = "99684a6628291e8e4549ddd6ccbc8d53d450eeafe15d06d6aee97fa16ffe10d3c2acb3f39ec1e2f7821bef783e0551f8b4b225745ac1e015a0b504e05d300e98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gl/firefox-52.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "af25290d169e7b0a4a52e71bbfd2b635347410cd1405a3433dbd14e500d16a8ffc311c25787c2a736abab0361dd1f601de770d8080b023544573e66a14652971";
+      sha512 = "e22599c9126cf546d039ad6a3a6504791b3f29108b4936098f577142bcb29035b8a75ecaf3558601a3cedcccfbe4fe7d4d1e0a6dd5ffd6171f4fcefa4678b45e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gn/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gn/firefox-52.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "124f5bce4eecd640618e62707b16f8def80fc045c20fceba65a2dad488d60bc8a5ce2e112cb766dc2b463e3d6bd72b4eda612d7c66e727f36c4f3b85cec2b5af";
+      sha512 = "b7b174da4feea6503c3a37d676f916c199a16449854b97f8c3f8417511c8e24317e3cd93edce7702b170a35c48dcf71ec0d8566e6da335707a1bc826720c0043";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gu-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gu-IN/firefox-52.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "17d6e909835cfec67f1e3dd4971e1bdd80c07488e5390a21525604ed923be9b7bb3eae18c3d011cc85d83d10d124041c14af2cb49b79b4e8df94f6f38012963b";
+      sha512 = "2385ba4859ff208965a274d4d23fcb4fd27006b1f73cc2af057ec813d2ee1ba584d532dcbf69f581421e3070847774b0e5bb414db5aa9dcf735315cf1c293a76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/he/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/he/firefox-52.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "70de0d3266df3f9665706f693faebd8c3c29fe1fd7e8c1f391d1366cb094c1178f18baa3947593a3674c2d3c21e1713a5161118c4f241e6c88c47e9b1ec818ba";
+      sha512 = "c56a2a4da1c01a891e0eb6d11f176ad2a428fede830fcaace386c9387a11f93f0636fccbeb78ea8e2c92a20ca568a848bf24a34c270cf278c23fd76f2ae5dfb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hi-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hi-IN/firefox-52.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "fd8a3250fc495115b83b1b4d360c24ad263fe52f6333dccc527807c6a30060b1afbeda1b95e2a86b0f9ae8b6f63165e4c6c8b58f443bbc89f4c9291870a4d2de";
+      sha512 = "22645937b5d1b0e302b4facee5396685d498441d48610dff428a77645ca2a9e9b5a790fae89ee75014446d424f33fbd3ac8aa3a25d18cc92cbec9121f32951c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hr/firefox-52.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "561996e2fc7a3c2b9450b87e57cb6cdb6bcf7f454b6736c7d9ca764a85834dea40673f7142513c58624c95ee4f70c21122e54d678c1b9d5edb7273ac3d63cb6d";
+      sha512 = "41a43b8f79447d42b1c2261924955d6c0f463cadc4133069c27b865a14b73fe665104e9de21e1681402dca67ead1e80438cbf9043ce9f0e389e94feb2cfd25e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hsb/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hsb/firefox-52.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "0ef7119929a28c267e94c5fa7afe583b5da6571753a437a7213c84cbfc18c6459da36595dade5187d7e7b8cfb83efd9430ef43400b85318b661512bc8c12a1bd";
+      sha512 = "5641092c539d0d61fc550a0c49992ea8618d245da33e4091bf83f2b85f74078a7037301697430adbde85b3682c99bd6f7ecaa7b933ed7c8f3c58dad9ce8f3a16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hu/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hu/firefox-52.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2f27911819f6a625ddf77e02da900f219563e6b070aca76f2c08b9f432c1f15b83eaf09558df4cc1e8a0186938ac4a328f1ceaafa109411dcd270db66f189099";
+      sha512 = "14427a52743b9619d7e675cdcdf00d59d435c0adaa25acbce79fe127670be0d8a8f6dcb909f1d8107cc0381c53688cbe691d074d0c4368bae951abe05f0980e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hy-AM/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hy-AM/firefox-52.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "dde5aede668eda9fbc212f3b18a2326b24a50f399bc70e2c21f65a1f4df574c614d95be6ef55642829c78507d1ae360fc476e599521a39419e2eede1b6cad586";
+      sha512 = "b12a676c274bea2408a885598fca845a558bf0216a680e15e10e07da4dc45a583378c1fb76f95207fdb9ebe98b11cf956811496fcf0fa280f0d27d34b0d4045b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/id/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/id/firefox-52.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "63155285ab64209dfbd71bd5357d754889414b99ff45e9eb393b0ca8938c17152ade97251e3ef48d1d3f197cfa9f2ab1cb57000940216748c43a08174f7d9447";
+      sha512 = "a50d2c3a234c6576909b1327ad60e4a6b93cb8ded5f8e42f66947d5ca55b6eba6601a7da5d65e14c06b58aaeb6c426b839585db670cc8a1502bb0d0c1037b9b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/is/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/is/firefox-52.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "d01c9eaa33cba50f6fef6da0313eff25e2d45c025d0ed3694abaeed833cd84590ecf6d9b7bd7ee5dcfcbdf678b4ec0f39c6a8eddec670124c9a4d79711cd6d4e";
+      sha512 = "9225d6e5ef21ab486c054cfed58bb2b38cd1c4d32cbe827e221c777959db31bb5b29b6c04a072547fe0cc361e12cfe46b5d5ed44c285316bb1907a97915708bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/it/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/it/firefox-52.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "40a3934d0c9ee388f80d20ccd38a718ee782aa0a8c1e02d14d68eda8c84454c05dcb944396f5c1b092c3fe8820176314e46f232f734079f84bfd04e4b7767618";
+      sha512 = "30507cd7dbbff0871575d9dd61ca646f1e187ecb921cae1e8340f2535adcb47c96b99a84683eadc7d0ab72c3aa30b98fcc9361d2dc27f4dcc891e7bfc59ac52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ja/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ja/firefox-52.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "506302d0fe4d1198d10f6a12a38e7266585830d2648e1a4a8d5bd58c21836fcc55682137c3b706f4a3c6feee37f88828df8de850a8fba40d3d572e84381c8a1c";
+      sha512 = "1151ef2192ff26ba790243d8fad92f43eec6afaa2a4f76d0fbf0c6cb82b1a57f7e5fc361bcff8f3c2ec178bcb2039320dd9fedc6d31d0f61dbedf90852d5935b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ka/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ka/firefox-52.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "4d2719f82d245067f7c90da659081e7a5a9f083fae6456911aaeb042863a3796d739b08ff912a6c6ce163121e9b124d96ffd3e557afd2cc238ced8c62fdd4ea5";
+      sha512 = "884090864f90ad4dae20de7a366507d7d65dad097c8e0485c07bae0d343671e578024cd338cfa030f3560b4a4248d8b1cf55930b7e23ad81de6c71d3a3478cb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kab/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kab/firefox-52.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "8c173f08c9d83877fe96c270a22ed96dd101d5e7be0eb0225f592457f5a201946a4582147851058ee8c6bcf03890277ae225e145b7b6a824b412cb8ac3643a2f";
+      sha512 = "c8fb0910d031f92c898924457cc5c8062d1048eb73ee3f4136382abec6f33314a936607fd29073a9d07379f49df825bde0073dce8cacab0f84be832f757018a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kk/firefox-52.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e08260dbd8c179eccf7ecf0fd036e94542652856360ce927a9430d7c9cd8e966c9b71496ac9b98dcf1a0f10b54800bb84b382b797e2d1daf5ea3742692dc6d5c";
+      sha512 = "015f3a8266dd17fb022cb08b4e5e6a0cf250d841b43157b030af54da2acaa80100a7424df172acad78839bfa4485164d81e14f0efb15ed532eaf91dd81a78bae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/km/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/km/firefox-52.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "1bb1d99790cbe604e7c6ffc00b9e29b971391257ff3a04787bdce35d79c2c2ebde81037d4597d5f854fccebf9d8e13b73eb3caa11ec2cc50ed82a7db1da6213f";
+      sha512 = "e9c56276434897bcdff5b7895cab82b46b17f8be871ca6ec0ca36b99783da3db448fad7487093119fb0bbb3d08a6d074295684d83d5104b214c7a63b679acd21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kn/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kn/firefox-52.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "426b524506c6d50a7b4625fb3cb0737bfc0f40f1d620f8d59ca60f642d6d5072abeb279722916d285a32653c9d3dffdea480ed7b76bbe81b199082c3af88e3d0";
+      sha512 = "ce79495e3afdff69816007f4f7cd6046f7864579e0699dfc09ac19ef26790ea8fa13fdfd20ea1fe5755f0a7fc11b7588fe860306ab68ad2ba72cb5bb44edebfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ko/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ko/firefox-52.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f24bb055650deb5bafc50105e5eccd1dfd09cd114175ca727c7f955b9e7fecf2be1e9e43df80ca1b986e43c991b6e960281c33654b08ea10e1a7612306253a4b";
+      sha512 = "3c0541e19f7e5970f8e7115f66a1722af768997dfdd65fde8b36ffc938c8a241185f7d68f9e8d954c0323fb57b4662c9f6b1cba68c0171c0045bb1922def4499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lij/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lij/firefox-52.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "d53e5e7b56c38f514de40215304982fce5f1d6600ee18fb3cb1f7b9da41b419c74ce1afa2c27bc6b93fa77b7240a3eb020b016dc4f40c744c775626939982686";
+      sha512 = "3ff3966fad4e30e2132113450d31ceae884a430950a91a27b1259e287ceec1a02c67777a1576c45e7e4c40725f7114c96b714d47e1f6cf408121e23765369d06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lt/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lt/firefox-52.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0c8fe608177aa128573ee86e15788878ba431fb7436c041754d6107189bb46a323b8966402c31175089ab2b343bb44c4dceaf11ee170503817ffb0e2905fef9a";
+      sha512 = "e5191997323d0f21ce7dc50694b1fbabefbb203920de4c56e6b6374de9b59354cbcaaa8e7ef2292eadb8c70d3428aa4f237cd8e61a5eb6d8783979acde87c86e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lv/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lv/firefox-52.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "e3d831a73ced3e2e5bc41657c1d0628209f464884d44c242948e3a3c56c956af6f06e6cdd2e85b2ee25300a28aef09c755324db928ba6f7ba3582348afa44c73";
+      sha512 = "b0e5dc0f277e8764632074086dbf67238b62435fb198a0ef70c18fc45c20647f945caf9ee68f0ebb791ce5bad11002c326bd90c8810e54db29061a5cf16ba8cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mai/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mai/firefox-52.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "74cde9da097068a888894d61bcaba89ff61efa003586e01083ca06f6d69aeda1831ca68d88b7e00b9eb917e0c2c7085c6486f50190ce50879a431670e347c0e6";
+      sha512 = "8b3279e34bb0b45682e27f7db1b3a56f1abca16c16b0a852ddd70b3f614977c9d03af8dcdd84d82cfb2b29c8426382606e9469c673449859f99fe96f6d3f0476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mk/firefox-52.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "8c9394b7a4ec6cf251071eeee4ffb60ae74c2c0b0cc77ed7b87ed1933220503a9e24438d7f286bca8d667d174f0669573c55dbab961875fead0be92ac5a2ab10";
+      sha512 = "6daf8cb7e9786472872203b98f15a44bb0de1e14cd85be9547ef35e262392df1ad35d9074be0574a4df99a38668e97c8edd7f78b93bde3b227ee86c06e6c16b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ml/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ml/firefox-52.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "68c76f6b39c4e43f618aaab34dde32c0ce35c846d0992098606d0103998a0f8ebd15c296569c7afba7bc85f8916f36a3ab0142a226f2468b74b588af1ffb9bb8";
+      sha512 = "2c214f629f2549aeb145901dd79d71410fadab25f6e1f9000fc0f3710af71ddbf756275e5e491e4c9d703a7458a5444d4b6e4f7c5d2666460d0ff9399c8c45c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mr/firefox-52.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "b9732c556ef495c208dc45287d578fc508436365f067f930a9ec44e8cd0c6a9b0e668a07d206d56a9234e37bb80edd1a3b86f97e8b97f102c9b665eb95f58e3c";
+      sha512 = "5126ea191ae20227e208287b3196aed4210514cd3fcb244916f39c614cff287a011d9154f09652a92cae2cfc1a3ff2b090747864205ef8376d55a165faf4ff80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ms/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ms/firefox-52.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "4c87190253012cdf66129820d50c7e039ae846e4d22564582f9e653847e99a17c4225e3dca222e4d88ae4971756e9e6a116c00bd3d54642709d0935212880ebc";
+      sha512 = "1d24a4f378b2515a0cef0b0e83153b1ac13da2366ed43465c68b173f5d108b07953073043e23a736af9dd87616b2549f54db74bb6be6134a797eaf9704a493c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nb-NO/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nb-NO/firefox-52.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "3e2b6d33fa7bb6d955781e33c09d36db223baec583ee84bf96d5cac1ea6adad8cde1c929dab075eb1ba44e425c6bb199028536ce1da9f49583508549a806155e";
+      sha512 = "7f3d8036be432dd56ce421d0fcc9ea18ebe6a829e77cd9982e3eb461d66151ddbabb50266eecd832bfa4fcc934bca4650f9180fe7341e7dd24436ca410c5cd46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nl/firefox-52.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "d13f5483c76d27b10a1b6f95d8c6f45c1d46b606f10b73ea0f8fe182eb1e07e3a708eaf6c5f8e1cbaa8b8832f98613362f7b781f45be4ccb529e48bf25444408";
+      sha512 = "865e3793198f3a6184be1189d45a59f7fc927e461c419177419b24064b22f026c2472043fa94d5d0bf31f4766a3c7c9aa8fb0ac941e539f7a599d3057616eb63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nn-NO/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nn-NO/firefox-52.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "1e44236fe14462c0922114fc39d45c3b7ffc1d1f51a247d403447dc406820c66b4617f7646b358fb240d220ecda3317d05bb46f127f1bca0460e7be687671c1b";
+      sha512 = "146ad9571d8aa517f6f36a9e74250bc2fd18854686153b84a5e365f8a850d06fabd2d220bd99b0aeb51522fbe03f48f9021efbd157d3be32b84be1f028c4ad60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/or/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/or/firefox-52.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "609ed1aae8c84d2aa1e4c4ce034dee90aee36a01599855b91949e422d63a39aecfe3a7a7038130a9cb93e1874cd0036ad809641c84bfde2ad8893f7c46cb6d39";
+      sha512 = "1e6eea8ac94645a6d7137a841b5335cca9c018eb2c3df2685357c8003856846d06401d07417ea7cf2197a06f99ff9ef2865b200bd50607368ea062f3093f5143";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pa-IN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pa-IN/firefox-52.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "3c5689b2a6d594ceee2b52eedf22ef73fa9138a36abaf9f873b4cead3473dc51e2c53c436fcbeaf247d2b74cb7a880dce72086a99a24a3e19be8f37521d2a8ca";
+      sha512 = "1c96db3314794c5a2840fc4fbbcc46af424b45da9a7a25a47f84a6db22896094f87d523d9828e424507bef6394002c6f585aca9f0b21687957bbbae9ad6d2b5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pl/firefox-52.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3222b352e3f9bc05fa1e5cd96c763cc6b4b7b119cee94886bb6191657789f30f31a49e786b3c46607129c639de658c0d3c53494d556d7d31a17204ec338868a6";
+      sha512 = "9748ccfdceff346c1b9fd888f3b50281e1b32030446bd9e8d1fc2b3931903ecbef15d2fb6bbb895f10a66a2d103a640d8a9610d8b4e91fd6558b0608a3b9ffb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-BR/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-BR/firefox-52.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e2ec0b35ad75c2e8f4d8fea32ea84b59fcdc939d83aec878d84c1d5140d1884fa977fb767be203068a4073b5752f5a1a9b646ded10ad87a47bf8f14f8aa8bd09";
+      sha512 = "4403ed0cc168740b92bca6e24243f6797a6d604ef159fce37459d0d6a56aab57d1feddf5e382931d17cb388ce98a2f0cfb1b21f877dd4bc72d666e6e9d390d7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-PT/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-PT/firefox-52.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "bff1ff7109c1da0954685031a25c397828b2ab299f82447a46f773179bda440ab35dd687375b12524d03c48ee46f24ef54ebf02449e332fcef20c84bed7c6394";
+      sha512 = "25a08eec03fc6d09258c4c0bb545a86e0e762dfedc47551da51b35c9eae61732726a4484b44e0124fabdf4e89f5148cc435019a253d4f35740155e7c272d3516";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/rm/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/rm/firefox-52.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "98771e89b0747de5da54878fc112b4686006891dba3e213c1460f8ad4b8a97d16f68f6969105c4f6e920e78d0fba09326aaf1d4a5f3d3acb9c5aff699e3ffd73";
+      sha512 = "d378a1fa02ee8976c1545d31a3914745777c0a9246004d127d7beb5764643d1f57a237e1039d85388f9f8e4b987d2e9a2bd1b95bda2d11ff319c3bc7bf992243";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ro/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ro/firefox-52.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "87445f515ab98e5363fd613e50c920d8545feb6e8dbd18eda15fd0e383e4d1525c7d80d6ea50ecae0fde1cb9880a6daabbdded058d009da6fedd3df8d224576c";
+      sha512 = "4776dea591426d6d42c1aa9d64988b57d0b691348185e1656a6363d1ad30495601501546600bfd375513773d5b2fa2030c475254f430facfd30f54dae039fc18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ru/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ru/firefox-52.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8f7d007fbc550731a42817ae2a9e71eae660fa016e868ec076ef32404e2720d20edc9e56b54d1dff41b2d6771a96bca3052e178e8620646b9a798077135dd498";
+      sha512 = "aedb429d9cc396b71bc2eb4ee4a48fb3a35b1e3a8d0a4cd92514a864243527aadb443c3419841128253bc8700a154808281b6d54d5a455c9e8a0a986219da09c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/si/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/si/firefox-52.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "01ac64cd7a60d606ac9974b7ed1cf6a33d5ee7c99d3afd0514bad6580560e55cf5466c83b8309f09188a68335a556d9e2d5ed5e3d35da4d53fe34c31d4054f26";
+      sha512 = "5626afbbacc76c688c887e5554fe68c75ad966b1a2d968fbeab1113626e014699c7e3eb88c6cf57a79fb3167cf00132188b842e78cdace2edf6268246c0bb616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sk/firefox-52.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "516342913ad7e38f0f4ee2baeeb5cb0640a46d9aaa0d0f4fb9d0762cabb88639efaabe158bbdf1a22afed05f99b77271cb5e432eed2ff606f79fdb754d5a553e";
+      sha512 = "e923b6bff6772e85d5e92517ffdeac5fe69cafdc0253e5cdbe7e0bf8d7796048e85609cab00c68a81953dd61fee5a45cfd962efb365c1aafc2fb331d04d499df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sl/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sl/firefox-52.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "239c2137bf2b2f873874f5d58d245179b55687e69f6d170c2f6d2acdfd90d0cc1a95383ea2a03de2a6a93dae6145651fbc18aefaf4a34ffbafdb9fb6fd30b7f3";
+      sha512 = "1d719fa0a38859ce974d18288a80e4e39d2d7ac445503d1ff199087e584e716da27682a557989178fcf9ac5ffeafec520d33be467a8011ae182f1403219cb5da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/son/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/son/firefox-52.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "a4f896919679ae68abace99a38a44b0b4c97ec190fd076fb732c5f4fdaf37dcebc0ba8d8ce79273fc1118f010bdefb304a6d1d6de0aecd7404795d31501af511";
+      sha512 = "41a431f673bf3b50fc881f4f038728493204e54c01b381f65709515966457629805ee74cbcc29b15790e01e0cca12d04f1dbe89ddbb02864f771ef3afe764e29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sq/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sq/firefox-52.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "9cab63ca40a6389d55ea3cc3fed3efb545784f7f3a257b79f440b72ac891e800f52aaf02e732ad2ecf99aa1810db7b88900f1f6b77cb2c6d2daa3a61210df62e";
+      sha512 = "723b08e56396dc0a6d5de76c8740da5ce05a3cad52bd82d07b7acfc0796f24c92c9f1906788728a0c40779dd5a0370643da8f9a3b661227e0587032c7b8d0003";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sr/firefox-52.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "22ac168005c7675d32f2e9524d0356e2de305289dffd0be60334663adbcab48584fdf1dc0990381561aca65711d01b4b007546152d30716fec97bf1486fb788d";
+      sha512 = "9d217e36877985e1b16dfaef3b8d38139611c9b69ef9b6b8195c7848b7422eb8c1473ae1afbe0c72a78c7210ea1230be3f61690a691a1bdef5afa000c81d4dd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sv-SE/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sv-SE/firefox-52.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a958aebdaaf7737000a4a6ce7d86b299287bdcfa810a230334ace7a25a277cb17193d373d54724dfb5acf64e78e3c573d2d0c2ce0921ca545e133bfdb20c167d";
+      sha512 = "32d937a075de2a2e82fcd8577f5675e1021b6790188c96e236501491fc01fef8ddee119efefa6285f3453fd4b769386c3f5bb5a9768b72c113636ca209f37d8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ta/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ta/firefox-52.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "107e51b9990dd0438d6fd45fe02582474f5c14dc3a07a8fa2598cca25cacedcf7f7580f8f80c7094eeb7af9cfbda125d469d4da4c2091d8d7a6ae0eeb80fdbc2";
+      sha512 = "64950279283837ff0bc154c24f83923c5744e9373554393d7be3fcee3064677d52ac40851bdb44a5dc42ddb504b75d0f7f48ba3af85eeb0e9a227a4c4700e90e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/te/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/te/firefox-52.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "13f611011ee3c82df3aca2dfa4e6c4edf933bebe394f162e30af7c5bd27db3e141fdbb34e3491130605c6af9913a2a95d41d2b3a74cc4f31264e0bc7893bdb45";
+      sha512 = "645c17713775bb33636b67d6390e4ba419a409dc9b26c66644a61df96dba9ce1b921fdacb179a711826b71124c71d65acd64bd6f8633d26b524bc97850bab68f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/th/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/th/firefox-52.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f7d474dbd9cec1c84406ff1f56249896c37e0d7f4c2e7b513dae1e2d2f1278c88cdfa56dd291e4d63746060f0d8e9a71d34f4e5b3004165b70e274e5bfa7e1b8";
+      sha512 = "96131590a5d6c0bd06e319a35466873c08b90f7922499827e84044f5b69b10ef0d79435652487761ebad0740348244204bc5deed707b6c293e15f7b48ba254fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/tr/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/tr/firefox-52.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "51a785b556800301ad6a3dde8fee0606d74f00bab1b75fe188d83cfba67a4de2dde402e542cef62eae04059217d5e5acf29f62691c03d4e024f85264778872aa";
+      sha512 = "5b290f2e223f943b9b7c7df43df6ec01dbb5744d7db8c35256896ac5c4ae216fe0af72ffa6797d7a4b7c69eb9e742b48e2242914b52d02a99ed1c8a384030bc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uk/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uk/firefox-52.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "76f12345ce05edfebd0c5c14b894a0affdcae45899c46a229eeff1930bbd1302f7e1d80f007f0e3b831d8b1460b86a7f607924c24c39160768cf254825178a39";
+      sha512 = "112741b2048410a65d7070b2d7c8a6cc0ae2bef812d626aaf3efd907afe50bba496bd6af06edbd433140040722fc6b7999695f7e2a9cfd3049eb105219a1004f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uz/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uz/firefox-52.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "7d6ec5c13514721741cfb569769137ea28516279b494b77fc066be89ebdef629d5c15f878ad62d794e5c1e345bc8e2851dbdfb9575f09c8d848d1a61c638463a";
+      sha512 = "1cbc2e527e928d4afaf138ae0515e9d6c3c2b7bb95f097c88a697c14988b84f765eb328509f451b024e2b62596f93c85ef298d5ffc76c4a8244cc77c10d9db05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/vi/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/vi/firefox-52.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "c27e0109761f2199c7013abbd206abb24bc33a60d1b87f39ca50a05fc44c4436507b94cf72c7cac9dd30ee0613bf2b32b27272878a446185166f3c83e35ca1db";
+      sha512 = "925658b5946201243ebbb6c1a92537702e0afc1e67f990ecdc8b17c976791e671907c314b0681fef7eacd63a9ec554af25862f6a98c1b1508bc1c0fc2a282d35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/xh/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/xh/firefox-52.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "8c46324dd71f3ef17e998911100c451701fdcbecc460facffd1ea43074ceec54b1b84070168496ef38706fd52a69306de76709ba100214c3c9d11252c1fe7d9a";
+      sha512 = "0ff098e6fc96238a475cbd209f03d888bc3a23fdeb45497e2ba86f52f6aad6d69b679af83f559d9b9086f01c0fcf894025138dafe6d9250b1851769a1b262e64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-CN/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-CN/firefox-52.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "6bb1e84bdea7b61ac4cc4b145478a167993bc843a4171d97bc9f6a06969eee72f527c25f3b2add2ba5341aa1aa5995b3cfe6d691a4e1ed315cec0df522911313";
+      sha512 = "cc0bca5885820769253613f851159e91e2a982616cc84fde27d57ed0064b0e650a6239bfb8c291e2889cb2e5d1fd29de6d8e828e9e6defd65fff030d79d2ef3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-TW/firefox-52.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-TW/firefox-52.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "172364ccbacf6918571440cb9910eabb43457deba65449d95adfff550ac3d56b3118d21f862050a6df97ff173f079e8f2c48b41a01ec160da263bf7903c737b3";
+      sha512 = "f40191f32c211314a6ee4bbae6675eeeb70dddb10cf770c197440969487722ecf1543a2479cd18b3e55d927d642b54d06722822ac99851d2e1d400d9784baa38";
     }
     ];
 }

From 014d11ea96d8791b004d0627a5ce53398f253ba9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 28 Mar 2017 21:15:16 +0900
Subject: [PATCH 0303/1744] firefox: 52.0.1 -> 52.0.2

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index d44e11ec853..9021b430ef8 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -153,8 +153,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "52.0.1";
-    sha512 = "535e2cc0ee645d4ebe9f1d2d1f4fbb16ff5d1745ce493add6b2e323ca3b0907c3054705c5a15eaadb314d5d6474ba1825554fd1ff0780ab7f76fd3f9672a6974";
+    version = "52.0.2";
+    sha512 = "15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;

From 7a768e73fbf4a66e54018fbb8990506eb909e452 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 28 Mar 2017 21:15:47 +0900
Subject: [PATCH 0304/1744] firefox-esr: 52.0.1esr -> 52.0.2esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 9021b430ef8..1ca50ec8954 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -163,8 +163,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "52.0.1esr";
-    sha512 = "c1f0aea279254e7788f62bba7892840edd2b667f385a649d374c9e783b93ec7faf9e5ebfccd04cd94f46da37aeb6bd7785d17faca2ad441a0b6e8587917faab2";
+    version = "52.0.2esr";
+    sha512 = "a0f31479e5265c7f40d3013c3dc8368c6bdf03f21f1c9054fb2ae5557065584da433b288b493680d6147a3b11155f41bd33ad2a5d53c6eaa507258c7e00d7335";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";

From 6f2eca1744b4ca74f456f77a1aa6e5b4ce937793 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 28 Mar 2017 17:38:16 +0200
Subject: [PATCH 0305/1744] wordpress: replace the dbPassword option with
 dbPasswordFile (#24146)

We shouldn't force users to store passwords in the world-readable Nix store.
---
 .../web-servers/apache-httpd/wordpress.nix    | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index b94ec14308b..c6f4bcd0f66 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -9,7 +9,7 @@ let
     <?php
     define('DB_NAME',     '${config.dbName}');
     define('DB_USER',     '${config.dbUser}');
-    define('DB_PASSWORD', '${config.dbPassword}');
+    define('DB_PASSWORD', file_get_contents('${config.dbPasswordFile}'));
     define('DB_HOST',     '${config.dbHost}');
     define('DB_CHARSET',  'utf8');
     $table_prefix  = '${config.tablePrefix}';
@@ -137,9 +137,34 @@ in
     };
     dbPassword = mkOption {
       default = "wordpress";
-      description = "The mysql password to the respective dbUser.";
+      description = ''
+        The mysql password to the respective dbUser.
+
+        Warning: this password is stored in the world-readable Nix store. It's
+        recommended to use the $dbPasswordFile option since that gives you control over
+        the security of the password. $dbPasswordFile also takes precedence over $dbPassword.
+      '';
       example = "wordpress";
     };
+    dbPasswordFile = mkOption {
+      type = types.str;
+      default = toString (pkgs.writeTextFile {
+        name = "wordpress-dbpassword";
+        text = config.dbPassword;
+      });
+      example = "/run/keys/wordpress-dbpassword";
+      description = ''
+        Path to a file that contains the mysql password to the respective dbUser.
+        The file should be readable by the user: config.services.httpd.user.
+
+        $dbPasswordFile takes precedence over the $dbPassword option.
+
+        This defaults to a file in the world-readable Nix store that contains the value
+        of the $dbPassword option. It's recommended to override this with a path not in
+        the Nix store. Tip: use nixops key management:
+        <link xlink:href='https://nixos.org/nixops/manual/#idm140737318306400'/>
+      '';
+    };
     tablePrefix = mkOption {
       default = "wp_";
       description = ''
@@ -251,7 +276,7 @@ in
         sleep 1
       done
       ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'
-      ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";'
+      ${pkgs.mysql}/bin/mysql -e "GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY \"$(cat ${config.dbPasswordFile})\";"
     else
       echo "Good, no need to do anything database related."
     fi

From b31f43d7c6202e71642f69b8cb1350c1900cf69a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 28 Mar 2017 17:41:58 +0200
Subject: [PATCH 0306/1744] cpulimit: 2.4 -> 2.5

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

diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 98b91964e64..15701d3c429 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cpulimit-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
-    sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2";
+    sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp";
   };
 
   buildFlags = with stdenv;

From 85fab7ec2c1bfb9f909f56f27c3d010eb1f26cf0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 28 Mar 2017 12:59:55 -0400
Subject: [PATCH 0307/1744] kubernetes: 1.5.4 -> 1.5.6

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

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index bf69eac318d..69fe6a1730a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -18,13 +18,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.5.4";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1xhz6m6ly6ffj60id9ms1liijlrik8n2pxyzb5m77ym3zf7rxlpl";
+    sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

From a80eb80b319d060da8f730506b0107fa6023833d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Mar 2017 16:50:44 +0000
Subject: [PATCH 0308/1744] ocamlPackages.cstruct: 2.3.0 -> 2.3.2

---
 pkgs/development/ocaml-modules/cstruct/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index eb148311be0..0278b0f2655 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01";
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; }
+  then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; }
   else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; };
 in
 

From d109f3d5f67b752e4890fe8bb5c84ed0625d8fb2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Mar 2017 17:05:47 +0000
Subject: [PATCH 0309/1744] ocamlPackages.io-page: 1.5.1 -> 1.6.1

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

diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index ed058d82a0e..24aa2557082 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
 
-let version = "1.5.1"; in
+let version = "1.6.1"; in
 
 stdenv.mkDerivation {
   name = "ocaml-io-page-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz";
-    sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79";
+    sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

From 0018cd5a2ddd858f78cffd0bd8a2412d5b507088 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Mar 2017 19:13:39 +0200
Subject: [PATCH 0310/1744] libvirt packages: fix & clean up dependencies

---
 .../virtualization/virt-manager/default.nix   | 34 ++++++++++---------
 .../virtualization/virt-viewer/default.nix    | 18 +++++-----
 .../gnome-3/3.22/apps/gnome-boxes/default.nix | 20 ++++++-----
 .../development/libraries/libvirt/default.nix |  9 +++--
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 3efcf6e582c..9bc2bc3db08 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, python2Packages, intltool, curl, file
-, wrapGAppsHook, virtinst, gtkvnc, vte
-, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
-, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
+{ stdenv, fetchurl, python2Packages, intltool, file
+, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
+, gobjectIntrospection, libvirt-glib, system-libvirt
+, gsettings_desktop_schemas, glib, libosinfo, gnome3
+, spiceSupport ? true, spice_gtk ? null
 }:
 
 with stdenv.lib;
-with python2Packages;
 
-buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "virt-manager-${version}";
   version = "1.4.1";
   namePrefix = "";
@@ -17,17 +17,19 @@ buildPythonApplication rec {
     sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
   };
 
-  propagatedBuildInputs =
-    [ eventlet greenlet gflags netaddr carrot routes
-      PasteDeploy m2crypto ipy twisted
-      distutils_extra simplejson glanceclient cheetah lockfile httplib2
-      urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
-      libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
-      gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
-      wrapGAppsHook
+  nativeBuildInputs = [ wrapGAppsHook intltool file ];
+
+  buildInputs =
+    [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
+      gsettings_desktop_schemas libosinfo
     ] ++ optional spiceSupport spice_gtk;
 
-  buildInputs = [ dconf avahi intltool file ];
+  propagatedBuildInputs = with python2Packages;
+    [ eventlet greenlet gflags netaddr carrot routes PasteDeploy
+      m2crypto ipy twisted distutils_extra simplejson glanceclient
+      cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
+      pygobject3 ipaddr mox libvirt libxml2
+    ];
 
   patchPhase = ''
     sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
@@ -35,7 +37,7 @@ buildPythonApplication rec {
   '';
 
   postConfigure = ''
-    ${python.interpreter} setup.py configure --prefix=$out
+    ${python2Packages.python.interpreter} setup.py configure --prefix=$out
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index b8de872d6ff..3b8d0a7cf63 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
-, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib
-, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
+, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
+, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
+, libapparmor
+, spiceSupport ? true
+, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
 }:
 
 assert spiceSupport ->
@@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
     sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
   };
 
+  nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
-    shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
-    numactl libvirt-glib
-  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm
-  ] ++ optional (stdenv.system == "x86_64-linux") xen;
+    glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
+    libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
+    libcap_ng numactl libapparmor xen
+  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
 
   postInstall = ''
     for f in "$out"/bin/*; do
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
index a9bb4514a3a..cb8bf49254b 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev, qemu, libsecret
+, 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
 }:
 
 # TODO: ovirt (optional)
@@ -15,12 +15,16 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  nativeBuildInputs = [
+    makeWrapper pkgconfig intltool
+  ];
+
   buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl libgudev numactl xen libsecret
+    itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
+    libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
+    tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+    gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
+    libcap_ng numactl xen libapparmor
   ];
 
   preFixup = ''
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 73c2a0ae919..96649a0927e 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -23,12 +23,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
-    libxml2 gnutls perl python2 readline
-    gettext libtasn1 libgcrypt yajl attr
-    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+    libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
+    attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ optionals stdenv.isLinux [
-    libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
-    libnl numad numactl xen zfs libapparmor
+    libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
+    libapparmor libcap_ng numactl xen
   ] ++ optionals stdenv.isDarwin [
      libiconv gmp
   ];

From 6d1049fab5041807963a7ae8281c669f7754df6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 28 Mar 2017 20:04:53 +0200
Subject: [PATCH 0311/1744] minio-client: 20160821 -> 20170206

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

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 258a81570c0..303204c9c21 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "minio-client-${shortVersion}";
 
-  shortVersion = "20160821";
-  longVersion = "2016-08-21T03:02:49Z";
+  shortVersion = "20170206";
+  longVersion = "2017-02-06T20-16-19Z";
 
   src = fetchurl {
     url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "1qnslwfspbvzawxrrym27agw79x8sgcafk7d0yakncjyg6vmdkka";
+    sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f";
   };
 
   buildInputs = [ go ];

From dc832df329a33d3bd9d830f6eefacc4e707992f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 28 Mar 2017 20:05:10 +0200
Subject: [PATCH 0312/1744] minio: 20170125 -> 20170316

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index bc2bbb13c44..28b6136d90e 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "minio-${shortVersion}";
 
-  shortVersion = "20170125";
-  longVersion = "2017-01-25T03-14-52Z";
+  shortVersion = "20170316";
+  longVersion = "2017-03-16T21-50-32Z";
 
   src = fetchurl {
     url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk";
+    sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c";
   };
 
   buildInputs = [ go ];

From c4b2f9f7845c56ef648ce9f45c9475b7ec1c02e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Mar 2017 20:12:03 +0200
Subject: [PATCH 0313/1744] jool: 3.5.2 -> 3.5.3

---
 pkgs/os-specific/linux/jool/default.nix | 2 +-
 pkgs/os-specific/linux/jool/source.nix  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 260bf412062..824bc3f9a18 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, kernel }:
 
-assert stdenv.lib.versionOlder kernel.version "4.10";
+assert stdenv.lib.versionOlder kernel.version "4.11";
 
 let
   sourceAttrs = (import ./source.nix) { inherit fetchzip; };
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index ee47ee11855..2de2aeeff8f 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,9 +1,9 @@
 { fetchzip }:
 
 rec {
-  version = "3.5.2";
+  version = "3.5.3";
   src = fetchzip {
     url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
-    sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x";
+    sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp";
   };
 }

From 805d53ecdb79d6ed5c811899893c492ec3630770 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Mar 2017 20:13:07 +0200
Subject: [PATCH 0314/1744] pythonPackages.click: 6.6 -> 6.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be75c7e3f8d..d3156147d3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3841,11 +3841,11 @@ in {
   };
 
   click = buildPythonPackage rec {
-    name = "click-6.6";
+    name = "click-6.7";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/click/${name}.tar.gz";
-      sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
+      sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
     };
 
     buildInputs = with self; [ pytest ];

From c17ff912210535dab6c682dc9441cd9884155615 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Mar 2017 20:13:28 +0200
Subject: [PATCH 0315/1744] pythonPackages.libtmux: 0.6.0 -> 0.6.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3156147d3c..2435c3a704e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5759,11 +5759,11 @@ in {
 
   libtmux = buildPythonPackage rec {
     name = "libtmux-${version}";
-    version = "0.6.0";
+    version = "0.6.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/libtmux/${name}.tar.gz";
-      sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s";
+      sha256 = "0kmw7x8cxb2hj2mzibmg9nxaijhsm1kcm0vdihn99fhm5kw1phh5";
     };
 
     buildInputs = with self; [ pytest_29 ];

From 99ff5731943c5ddc77991f8333ae46628328b09a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Mar 2017 20:13:50 +0200
Subject: [PATCH 0316/1744] tmuxp: 1.2.2 -> 1.2.7

---
 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 04b42f6d722..c254490555c 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "tmuxp-${version}";
-  version = "1.2.2";
+  version = "1.2.7";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
-    sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln";
+    sha256 = "19s17frgyjvyvmr16fs0gl5mnbaxbmdffmkckadwhd5mg0pz2i4s";
   };
 
   patchPhase = ''

From 7fadcf3165051103a8467ba4eff0c124b757dc9a Mon Sep 17 00:00:00 2001
From: Jens Grunert <jens.grunert@gmail.com>
Date: Tue, 28 Mar 2017 20:17:04 +0200
Subject: [PATCH 0317/1744] pidginsipe: 1.20.0 -> 1.22.0

---
 .../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 36be2517fbd..6693550bd3b 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.20.0"; in
+let version = "1.22.0"; in
 
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
-    sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs";
+    sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3";
   };
 
   meta = with stdenv.lib; {

From f9f5bec50766a00e6fe47d7f84b0fae43b308f4b Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Tue, 28 Mar 2017 10:23:19 -0700
Subject: [PATCH 0318/1744] muchsync: fix on macOS

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 17d66ba6043..c008c478d22 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, notmuch, openssl, pkgconfig, sqlite, xapian
+, notmuch, openssl, pkgconfig, sqlite, xapian, zlib
 }:
 stdenv.mkDerivation rec {
   version = "2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     url = "http://www.muchsync.org/src/${name}.tar.gz";
     sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
   };
-  buildInputs = [ notmuch openssl pkgconfig sqlite xapian ];
+  buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ];
   meta = {
     description = "Synchronize maildirs and notmuch databases";
     platforms = stdenv.lib.platforms.unix;

From 83731242027452107bfec0e49423c0f01c89578b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 23 Mar 2017 22:45:23 +0100
Subject: [PATCH 0319/1744] gitlab-runner: make v1 runner available

gitlab-runner 9.0.0 is only compatible with gitlab >= 9.0
gitlab-runner1 1.11.1 is only compatible with gitlab < 9.4
---
 .../continuous-integration/gitlab-runner.nix  | 13 +++-
 .../gitlab-runner/v1.nix                      | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 1fe4d28f9f3..ba90b1b1a2c 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -20,6 +20,14 @@ in
       description = "The working directory used";
     };
 
+    package = mkOption {
+      description = "Gitlab Runner package to use";
+      default = pkgs.gitlab-runner;
+      defaultText = "pkgs.gitlab-runner";
+      type = types.package;
+      example = literalExample "pkgs.gitlab-runner_1_11";
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -29,7 +37,7 @@ in
       requires = [ "docker.service" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \
+        ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
           --working-directory ${cfg.workDir} \
           --config ${configFile} \
           --service gitlab-runner \
@@ -38,6 +46,9 @@ in
       };
     };
 
+    # Make the gitlab-runner command availabe so users can query the runner
+    environment.systemPackages = [ cfg.package ];
+
     users.extraUsers.gitlab-runner = {
       group = "gitlab-runner";
       extraGroups = [ "docker" ];
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
new file mode 100644
index 00000000000..d49221d6e6a
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -0,0 +1,66 @@
+{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
+
+let
+  version = "1.11.1";
+  # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
+  docker_x86_64 = fetchurl {
+    url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
+    sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m";
+  };
+
+  docker_arm = fetchurl {
+    url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
+    sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw";
+  };
+in
+buildGoPackage rec {
+  inherit version;
+  name = "gitlab-runner-${version}";
+  goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
+  commonPackagePath = "${goPackagePath}/common";
+  buildFlagsArray = ''
+    -ldflags=
+      -X ${commonPackagePath}.NAME=gitlab-runner
+      -X ${commonPackagePath}.VERSION=${version}
+      -X ${commonPackagePath}.REVISION=v${version}
+  '';
+
+  src = fetchFromGitLab {
+    owner = "gitlab-org";
+    repo = "gitlab-ci-multi-runner";
+    rev = "v${version}";
+    sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47";
+  };
+
+  buildInputs = [ go-bindata ];
+
+  preBuild = ''
+    (
+    # go-bindata names the assets after the filename thus we create a symlink with the name we want
+    cd go/src/${goPackagePath}
+    ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
+    ln -sf ${docker_arm} prebuilt-arm.tar.xz
+    go-bindata \
+        -pkg docker \
+        -nocompress \
+        -nomemcopy \
+        -o executors/docker/bindata.go \
+        prebuilt-x86_64.tar.xz \
+        prebuilt-arm.tar.xz
+    )
+  '';
+
+  postInstall = ''
+    install -d $out/bin
+    # The recommended name is gitlab-runner so we create a symlink with that name
+    ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
+  '';
+
+  meta = with lib; {
+    description = "GitLab Runner the continuous integration executor of GitLab";
+    license = licenses.mit;
+    homepage = "https://about.gitlab.com/gitlab-ci/";
+    platforms = platforms.unix;
+    maintainers = [ lib.maintainers.bachp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16576161113..b013482de91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1963,6 +1963,7 @@ with pkgs;
   gitlab = callPackage ../applications/version-management/gitlab { };
 
   gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
+  gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { };
 
   gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
 

From b603a943e53d28496a79492124e8d5f467cae990 Mon Sep 17 00:00:00 2001
From: Jens Grunert <jens.grunert@gmail.com>
Date: Tue, 28 Mar 2017 21:06:41 +0200
Subject: [PATCH 0320/1744] corebird: 1.3.3 -> 1.4.2

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

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 07d89b53fa4..36b46030577 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,24 +3,26 @@
 , glib_networking }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.3";
+  version = "1.4.2";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3";
+    sha256 = "0s28q9c7p4p4jyhb1g6gdwdphlf6yhi6yg4yn8bkd0gmyf9acakb";
   };
 
   preConfigure = ''
     ./autogen.sh
   '';
 
+  configureFlags = [ "--disable-spellcheck" ];
+
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [
-    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
 
   meta = {

From af33b23de3144b2c2085dda19dc223369683a495 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Mon, 27 Mar 2017 16:24:50 -0400
Subject: [PATCH 0321/1744] frama-c: Aluminum -> Silicon

Upgrade required to work with new ocamlgraph
---
 .../tools/analysis/frama-c/default.nix           | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                  |  4 +---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 14efe29442b..ee36a9be43b 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -8,17 +8,17 @@ in
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "20160501";
-  slang   = "Aluminium";
+  version = "20161101";
+  slang   = "Silicon";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90";
+    sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh";
   };
 
   why2 = fetchurl {
-    url    = "http://why.lri.fr/download/why-2.34.tar.gz";
-    sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg";
+    url    = "http://why.lri.fr/download/why-2.37.tar.gz";
+    sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
 
-  enableParallelBuilding = true;
+  # Experimentally, the build segfaults with high core counts
+  enableParallelBuilding = false;
 
   unpackPhase = ''
     tar xf $src
@@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     cd frama*
     ./configure --prefix=$out
-    make -j$NIX_BUILD_CORES
+    # It is not parallel safe
+    make
     make install
     cd ../why*
     FRAMAC=$out/bin/frama-c ./configure --prefix=$out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b36f9cc80ab..20cc897ae19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6513,9 +6513,7 @@ with pkgs;
     ocaml = ocaml_4_02;
   };
 
-  framac = callPackage ../development/tools/analysis/frama-c {
-    coq = coq_8_4;
-  };
+  framac = callPackage ../development/tools/analysis/frama-c { };
 
   frame = callPackage ../development/libraries/frame { };
 

From 258e3524e283abd6285b5bdb2655fa9acc1f76a9 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 26 Mar 2017 18:17:17 +0200
Subject: [PATCH 0322/1744] spark: activate R backend

---
 pkgs/applications/networking/cluster/spark/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index bdcb0a84625..7ba8a2ea1cd 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchzip, makeWrapper, jre, pythonPackages
+, RSupport? true, R
 , mesosSupport ? true, mesos
 , version
 }:
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
+    ++ optional RSupport R
     ++ optional mesosSupport mesos;
 
   untarDir = "${name}-bin-${hadoopVersion}";
@@ -46,6 +48,9 @@ stdenv.mkDerivation rec {
     export SPARK_HOME="$out/lib/${untarDir}"
     export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}"
     export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH"
+    ${optionalString RSupport
+      ''export SPARKR_R_SHELL="${R}/bin/R"
+        export PATH=$PATH:"${R}/bin/R"''}
     ${optionalString mesosSupport
       ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''}
     EOF
@@ -57,7 +62,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description      = "Lightning-fast cluster computing";
+    description      = "Apache Spark is a fast and general engine for large-scale data processing";
     homepage         = "http://spark.apache.org";
     license          = stdenv.lib.licenses.asl20;
     platforms        = stdenv.lib.platforms.all;

From c54588d250394caf14a003470a3e70279cbe02d2 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: Tue, 28 Mar 2017 21:02:30 +0100
Subject: [PATCH 0323/1744] redprl: 2016-09-22 -> 2017-03-28

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

diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix
index 0cbe1d1cb37..49245c73f2c 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchgit, mlton }:
 stdenv.mkDerivation {
-  name = "redprl-2016-09-22";
+  name = "redprl-2017-03-28";
   src = fetchgit {
     url = "https://github.com/RedPRL/sml-redprl.git";
-    rev = "3215faf0d494f4ac14d6e10172329a161df192c4";
-    sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77";
+    rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
+    sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c";
     fetchSubmodules = true;
   };
   buildInputs = [ mlton ];

From 03568b327e04ea07faac58a1d3466a537e508a3f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:04:19 -0500
Subject: [PATCH 0324/1744] fileutils: 0.5.0 -> 0.5.1

Fixes a bug with copying symlinks
---
 pkgs/development/ocaml-modules/fileutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index 9dfffbf48c5..6265a4b90ca 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation {
-  name = "ocaml-fileutils-0.5.0";
+  name = "ocaml-fileutils-0.5.1";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz;
-    sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47";
+    url = https://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz;
+    sha256 = "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ounit ];

From c46e2d1903248c546e8b6ec5f190a1f1a3515f98 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Tue, 28 Mar 2017 15:23:38 -0400
Subject: [PATCH 0325/1744] vim-plugins: bump youcompleteme version.

This fixes a bad interaction with Supertab.
---
 pkgs/misc/vim-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a0d04638504..47f58aeee85 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1528,11 +1528,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-02-27";
+    name = "youcompleteme-2017-03-28";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "39659caf34c664c7419cadb41cb813158e0749fa";
-      sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx";
+      rev = "03ba8a80cd04e2e051bb85eacaea802ca3c4d025";
+      sha256 = "1f44bxl4phk79p4n19p0qx5506hkhms77zi4x0sh0gh389xwxmv5";
     };
     dependencies = [];
     buildPhase = ''

From 33d8d1532948a54ba9d3eb438bb4503306f90f65 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Tue, 28 Mar 2017 16:03:37 -0400
Subject: [PATCH 0326/1744] ycmd: 2017-02-03 -> 2017-03-27

Now works with newer version of vim youcompleteme plugin.

Details:
- The OS X patch is no longer necessary as that code was removed upstream.
- It seems to want LLVM version 4 now.
- It annoyingly wants to symlink libclang.4 to libclang.4.0; nix already
  did this.
---
 .../tools/misc/ycmd/2-ycm-cmake.patch         | 37 -------------------
 pkgs/development/tools/misc/ycmd/default.nix  |  8 ++--
 .../tools/misc/ycmd/dont-symlink-clang.patch  | 16 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 21 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
 create mode 100644 pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch

diff --git a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
deleted file mode 100644
index baa907b2126..00000000000
--- a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
-index 2074c58e..9ecd6e57 100644
---- a/cpp/ycm/CMakeLists.txt
-+++ b/cpp/ycm/CMakeLists.txt
-@@ -335,7 +335,7 @@
-       COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
-     )
- 
--    if( APPLE )
-+  #if( APPLE )
-       # In OS X El Capitan, Apple introduced System Integrity Protection.
-       # Amongst other things, this introduces features to the dynamic loader
-       # (dyld) which cause it to "sanitise" (and complain about) embedded
-@@ -354,15 +354,15 @@
-       # simply strip the rpath entry from the dylib.  There's no way any
-       # @executable_path that python might have could be in any way useful to
-       # libclang.dylib, so this seems perfectly safe.
--      get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
--      add_custom_command( TARGET ${PROJECT_NAME}
--                          POST_BUILD
--                          COMMAND install_name_tool
--                          "-delete_rpath"
--                          "@executable_path/../lib"
--                          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
--                        )
--    endif()
-+      #    get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
-+      #add_custom_command( TARGET ${PROJECT_NAME}
-+      #                    POST_BUILD
-+      #                    COMMAND install_name_tool
-+      #                    "-delete_rpath"
-+      #                    "@executable_path/../lib"
-+      #                    "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
-+      #                  )
-+      # endif()
-   endif()
- endif()
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 9ac227ac006..eb02d0e79dd 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "ycmd-${version}";
-  version = "2017-02-03";
+  version = "2017-03-27";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
-    rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d";
-    sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi";
+    rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2";
+    sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";
   };
 
   buildInputs = [ cmake boost ]  ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ${python.interpreter} build.py --clang-completer --system-boost
   '';
 
-  patches = [ ./2-ycm-cmake.patch ];
+  patches = [ ./dont-symlink-clang.patch ];
 
   configurePhase = ":";
 
diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
new file mode 100644
index 00000000000..6af691426bb
--- /dev/null
+++ b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
@@ -0,0 +1,16 @@
+diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
+index 00e4882..8f29797 100644
+--- a/cpp/ycm/CMakeLists.txt
++++ b/cpp/ycm/CMakeLists.txt
+@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG )
+       # our libraries require, in particular the Python one (from pyenv for
+       # instance).
+       set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
+-      # When loading our library, the dynamic linker will look for
+-      # libclang.so.4, not libclang.so.4.x.
+-      file( RENAME
+-            ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION}
+-            ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} )
+     endif()
+   endif()
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7970732ce3f..b650d4f5af1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6992,7 +6992,7 @@ with pkgs;
 
   ycmd = callPackage ../development/tools/misc/ycmd {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
-    llvmPackages = llvmPackages_39;
+    llvmPackages = llvmPackages_4;
     python = python2;
   };
 

From 02e469fa045f47bde98ae0c86d5b70ae7d5427ae Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 28 Mar 2017 21:29:58 +0200
Subject: [PATCH 0327/1744] signing-party: Add 4 missing man pages + dep fix

The manual pages for the following 4 tools where still missing:
- gpgsigs
- keyanalyze
- pgpring
- process_keys

The gpgdir script needs the gpg binary.

The 19 tools are licensed under various licenses.
---
 pkgs/tools/security/signing-party/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index e6abb72b43d..7be136944c6 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
     install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1;
 
     # gpgsigs: annotates list of GnuPG keys with already done signatures
-    # Handled by 'make install'
+    # The manual page is not handled by 'make install'
+    install -D -m444 gpgsigs/gpgsigs.1 $out/share/man/man1/gpgsigs.1;
 
     # gpgparticipants: create list of party participants for the organiser
     install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants;
@@ -94,7 +95,10 @@ stdenv.mkDerivation rec {
     install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1;
 
     # keyanalyze: minimum signing distance (MSD) analysis on keyrings
-    # Handled by 'make install'
+    # Only the binaries are handled by 'make install'
+    install -D -m444 keyanalyze/keyanalyze.1 $out/share/man/man1/keyanalyze.1;
+    install -D -m444 keyanalyze/pgpring/pgpring.1 $out/share/man/man1/pgpring.1;
+    install -D -m444 keyanalyze/process_keys.1 $out/share/man/man1/process_keys.1;
 
     # keylookup: ncurses wrapper around gpg --search
     # Handled by 'make install'
@@ -139,7 +143,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/gpgdir --set PERL5LIB \
       ${with perlPackages; stdenv.lib.makePerlPath ([
         TermReadKey ]
-        ++ GnuPGInterfaceRuntimeDependencies)}
+        ++ GnuPGInterfaceRuntimeDependencies)} \
+      --prefix PATH ":" \
+      "${stdenv.lib.makeBinPath [ gnupg1 ]}"
 
     wrapProgram $out/bin/gpglist --prefix PATH ":" \
       "${stdenv.lib.makeBinPath [ gnupg1 ]}"
@@ -210,7 +216,7 @@ stdenv.mkDerivation rec {
       * keyart: creates a random ASCII art of a PGP key file
       * gpg-key2latex: generate LaTeX file with fingerprint paper slips
     '';
-    license = licenses.gpl2;
+    license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ];
     maintainers = with maintainers; [ fpletz primeos ];
     platforms = platforms.linux;
   };

From 01d8d1b062495b47c80a765a90176b70dc09a347 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 25 Mar 2017 00:59:14 +0100
Subject: [PATCH 0328/1744] rustc: use llvm_39

---
 pkgs/development/compilers/rust/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 91d7cda1c00..afab703ae5b 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform,
-  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm
+, targets ? []
+, targetToolchains ? []
+, targetPatches ? []
+}:
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
@@ -17,6 +20,7 @@ rec {
       ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
+    inherit llvm;
     inherit targets;
     inherit targetPatches;
     inherit targetToolchains;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20cc897ae19..601c1d41130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5541,7 +5541,9 @@ with pkgs;
   };
 
   rust = rustStable;
-  rustStable = callPackage ../development/compilers/rust {};
+  rustStable = callPackage ../development/compilers/rust {
+    inherit (llvmPackages_39) llvm;
+  };
   rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
   rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
     rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);

From c9ecc70880c00239b9ea5f1bbf3a9930886c9ad8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 27 Mar 2017 21:47:38 +0200
Subject: [PATCH 0329/1744] gnupg*: Improve the meta set

And use version from gnupg21 for gnupg1compat.
---
 pkgs/tools/security/gnupg/1.nix       | 21 +++++++++++++-----
 pkgs/tools/security/gnupg/1compat.nix |  7 +++---
 pkgs/tools/security/gnupg/20.nix      | 32 +++++++++++++--------------
 pkgs/tools/security/gnupg/21.nix      | 15 +++++++++++--
 4 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 0dbea652959..9c4f98a740b 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -12,10 +12,21 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
-    description = "Free implementation of the OpenPGP standard for encrypting and signing data";
-    homepage = http://www.gnupg.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+  meta = with stdenv.lib; {
+    homepage = "https://gnupg.org";
+    description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
+    license = licenses.gpl3Plus;
+    longDescription = ''
+      The GNU Privacy Guard is the GNU project's complete and free
+      implementation of the OpenPGP standard as defined by RFC4880.  GnuPG
+      "classic" (1.4) is the old standalone version which is most suitable for
+      older or embedded platforms.  GnuPG allows to encrypt and sign your data
+      and communication, features a versatile key management system as well as
+      access modules for all kind of public key directories.  GnuPG, also known
+      as GPG, is a command line tool with features for easy integration with
+      other applications.  A wealth of frontend applications and libraries are
+      available.
+    '';
+    platforms = platforms.gnu; # arbitrary choice
   };
 }
diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
index 0fe294e5a11..c4cc68dcca3 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/pkgs/tools/security/gnupg/1compat.nix
@@ -1,7 +1,7 @@
 { stdenv, gnupg, coreutils, writeScript }:
 
 stdenv.mkDerivation {
-  name = "gnupg1compat-0";
+  name = "gnupg1compat-${gnupg.version}";
 
   builder = writeScript "gnupg1compat-builder" ''
     # First symlink all top-level dirs
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
     ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = gnupg.meta // {
+    description = gnupg.meta.description +
+      " with symbolic links for gpg and gpgv";
   };
 }
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 06fdc4a2a44..6b011a00eb7 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -44,24 +44,22 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
-    homepage = "http://gnupg.org/";
-    description = "Free implementation of the OpenPGP standard for encrypting and signing data";
-    license = stdenv.lib.licenses.gpl3Plus;
-
+  meta = with stdenv.lib; {
+    homepage = "https://gnupg.org";
+    description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
+    license = licenses.gpl3Plus;
     longDescription = ''
-      GnuPG is the GNU project's complete and free implementation of
-      the OpenPGP standard as defined by RFC4880.  GnuPG allows to
-      encrypt and sign your data and communication, features a
-      versatile key management system as well as access modules for all
-      kind of public key directories.  GnuPG, also known as GPG, is a
-      command line tool with features for easy integration with other
-      applications.  A wealth of frontend applications and libraries
-      are available.  Version 2 of GnuPG also provides support for
-      S/MIME.
+      The GNU Privacy Guard is the GNU project's complete and free
+      implementation of the OpenPGP standard as defined by RFC4880.  GnuPG
+      "stable" (2.0) is the current stable version for general use.  This is
+      what most users are still using.  GnuPG allows to encrypt and sign your
+      data and communication, features a versatile key management system as well
+      as access modules for all kind of public key directories.  GnuPG, also
+      known as GPG, is a command line tool with features for easy integration
+      with other applications.  A wealth of frontend applications and libraries
+      are available.  Version 2 of GnuPG also provides support for S/MIME.
     '';
-
-    maintainers = with stdenv.lib.maintainers; [ roconnor ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ roconnor ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 0f021c6b4a1..72786247af4 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -48,9 +48,20 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://gnupg.org;
-    description = "A complete and free implementation of the OpenPGP standard";
+    homepage = "https://gnupg.org";
+    description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
+    longDescription = ''
+      The GNU Privacy Guard is the GNU project's complete and free
+      implementation of the OpenPGP standard as defined by RFC4880.  GnuPG
+      "modern" (2.1) is the latest development with a lot of new features.
+      GnuPG allows to encrypt and sign your data and communication, features a
+      versatile key management system as well as access modules for all kind of
+      public key directories.  GnuPG, also known as GPG, is a command line tool
+      with features for easy integration with other applications.  A wealth of
+      frontend applications and libraries are available.  Version 2 of GnuPG
+      also provides support for S/MIME.
+    '';
     maintainers = with maintainers; [ wkennington peti fpletz vrthra ];
     platforms = platforms.all;
   };

From ecae31a50cf160cce19c5bdb0050c1bfa5a030cc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Jan 2017 08:23:15 -0600
Subject: [PATCH 0330/1744] swift: init at 3.1

Add dependency 'libblocksruntime'.
---
 pkgs/development/compilers/swift/default.nix  | 264 ++++++++++++++++++
 ...sets-linux-don-t-require-using-Ninja.patch |  25 ++
 ...ts-linux-allow-custom-install-prefix.patch |  25 ++
 ...03-build-presets-linux-disable-tests.patch |  38 +++
 ...sets-linux-plumb-extra-cmake-options.patch |  25 ++
 .../swift/patches/build-script-pax.patch      |  32 +++
 pkgs/development/compilers/swift/purity.patch |  16 ++
 .../libraries/libblocksruntime/default.nix    |  27 ++
 pkgs/top-level/all-packages.nix               |   4 +
 9 files changed, 456 insertions(+)
 create mode 100644 pkgs/development/compilers/swift/default.nix
 create mode 100644 pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
 create mode 100644 pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
 create mode 100644 pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch
 create mode 100644 pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
 create mode 100644 pkgs/development/compilers/swift/patches/build-script-pax.patch
 create mode 100644 pkgs/development/compilers/swift/purity.patch
 create mode 100644 pkgs/development/libraries/libblocksruntime/default.nix

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
new file mode 100644
index 00000000000..da4482b463e
--- /dev/null
+++ b/pkgs/development/compilers/swift/default.nix
@@ -0,0 +1,264 @@
+{ stdenv
+, cmake
+, coreutils
+, glibc
+, which
+, perl
+, libedit
+, ninja
+, pkgconfig
+, sqlite
+, swig
+, bash
+, libxml2
+, llvm
+, clang
+, python
+, ncurses
+, libuuid
+, libbsd
+, icu
+, autoconf
+, libtool
+, automake
+, libblocksruntime
+, curl
+, rsync
+, git
+, libgit2
+, binutils
+, fetchFromGitHub
+, paxctl
+, findutils
+#, systemtap
+}:
+
+let
+  v_major = "3.1";
+  version = "${v_major}-RELEASE";
+  version_friendly = "${v_major}";
+
+  tag = "refs/tags/swift-${version}";
+  fetch = { repo, sha256, fetchSubmodules ? false }:
+    fetchFromGitHub {
+      owner = "apple";
+      inherit repo sha256 fetchSubmodules;
+      rev = tag;
+      name = "${repo}-${version}-src";
+    };
+
+sources = {
+    # FYI: SourceKit probably would work but currently requires building everything twice
+    # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
+    clang = fetch {
+      repo = "swift-clang";
+      sha256 = "0820mx1ghfnk4p5595r1f313y1699jwi61zghfbwak5wgwgy7n4x";
+    };
+    llvm = fetch {
+      repo = "swift-llvm";
+      sha256 = "0zb1zi77b2xdz5szlz2m3j3d92dc0q00dv8py2s6iaq3k435i3sq";
+    };
+    compilerrt = fetch {
+      repo = "swift-compiler-rt";
+      sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950";
+    };
+    cmark = fetch {
+      repo = "swift-cmark";
+      sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx";
+    };
+    lldb = fetch {
+      repo = "swift-lldb";
+      sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c";
+    };
+    llbuild = fetch {
+      repo = "swift-llbuild";
+      sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d";
+    };
+    pm = fetch {
+      repo = "swift-package-manager";
+      sha256 = "05zijald08z4jbppjawlc0h9n0i4dvn6jnhq0i5b9qq55l7a1lrk";
+    };
+    xctest = fetch {
+      repo = "swift-corelibs-xctest";
+      sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm";
+    };
+    foundation = fetch {
+      repo = "swift-corelibs-foundation";
+      sha256 = "0d34clr7n0kfy0l94hmgg1cailg3bml0qzlhy8wh75hrrv3n4g1v";
+    };
+    libdispatch = fetch {
+      repo = "swift-corelibs-libdispatch";
+      sha256 = "1rka7ijkdk4ybdvyk3map5mc1fm79v848v9nhpfq75m5i63r61bh";
+      fetchSubmodules = true;
+    };
+    swift = fetch {
+      repo = "swift";
+      sha256 = "172q84z70z9gpwahmlcifihldrvc3cafy9ajbz4wi5f6ncw7wbmb";
+    };
+  };
+
+  devInputs = [
+    curl
+    glibc
+    icu
+    libblocksruntime
+    libbsd
+    libedit
+    libuuid
+    libxml2
+    ncurses
+    sqlite
+    swig
+    #    systemtap?
+  ];
+
+  cmakeFlags = [
+    "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include"
+    "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
+    "-DGCC_INSTALL_PREFIX=${clang.cc.gcc}"
+  ];
+
+  builder = ''
+    $SWIFT_SOURCE_ROOT/swift/utils/build-script \
+      --preset=buildbot_linux \
+      installable_package=$INSTALLABLE_PACKAGE \
+      install_prefix=$out \
+      install_destdir=$SWIFT_INSTALL_DIR \
+      extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
+
+in
+stdenv.mkDerivation rec {
+  name = "swift-${version_friendly}";
+
+  buildInputs = devInputs ++ [
+    autoconf
+    automake
+    bash
+    clang
+    cmake
+    coreutils
+    libtool
+    ninja
+    perl
+    pkgconfig
+    python
+    rsync
+    which
+    findutils
+  ] ++ stdenv.lib.optional stdenv.needsPax paxctl;
+
+  # TODO: Revisit what's propagated and how
+  propagatedBuildInputs = [
+    libgit2
+    python
+  ];
+  propagatedUserEnvPkgs = [ git pkgconfig ];
+
+  hardeningDisable = [ "format" ]; # for LLDB
+
+  configurePhase = ''
+    cd ..
+    
+    export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz
+
+    mkdir build install
+    export SWIFT_BUILD_ROOT=$PWD/build
+    export SWIFT_INSTALL_DIR=$PWD/install
+
+    cd $SWIFT_BUILD_ROOT
+
+    unset CC
+    unset CXX
+
+    export NIX_ENFORCE_PURITY=
+  '';
+
+  unpackPhase = ''
+    mkdir src
+    cd src
+    export sourceRoot=$PWD
+    export SWIFT_SOURCE_ROOT=$PWD
+
+    cp -r ${sources.clang} clang
+    cp -r ${sources.llvm} llvm
+    cp -r ${sources.compilerrt} compiler-rt
+    cp -r ${sources.cmark} cmark
+    cp -r ${sources.lldb} lldb
+    cp -r ${sources.llbuild} llbuild
+    cp -r ${sources.pm} swiftpm
+    cp -r ${sources.xctest} swift-corelibs-xctest
+    cp -r ${sources.foundation} swift-corelibs-foundation
+    cp -r ${sources.libdispatch} swift-corelibs-libdispatch
+    cp -r ${sources.swift} swift
+
+    chmod -R u+w .
+  '';
+
+  patchPhase = ''
+    # Just patch all the things for now, we can focus this later
+    patchShebangs $SWIFT_SOURCE_ROOT
+
+    substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
+      --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
+    substituteInPlace swift/utils/build-script-impl \
+      --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
+  '' + stdenv.lib.optionalString stdenv.needsPax ''
+    patch -p1 -d swift -i ${./patches/build-script-pax.patch}
+  '' + ''
+    patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
+    patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
+    patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch}
+    patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
+
+    substituteInPlace clang/lib/Driver/ToolChains.cpp \
+      --replace '  addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
+                '  addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
+    patch -p1 -d clang -i ${./purity.patch}
+
+    # Workaround hardcoded dep on "libcurses" (vs "libncurses"):
+    sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
+    substituteInPlace llbuild/tests/BuildSystem/Build/basic.llbuild \
+      --replace /usr/bin/env $(type -p env)
+
+    # This test fails on one of my machines, not sure why.
+    # Disabling for now. 
+    rm llbuild/tests/Examples/buildsystem-capi.llbuild
+
+    substituteInPlace swift-corelibs-foundation/lib/script.py \
+      --replace /bin/cp $(type -p cp)
+
+    PREFIX=''${out/#\/}
+    substituteInPlace swift-corelibs-xctest/build_script.py \
+      --replace usr "$PREFIX"
+    substituteInPlace swiftpm/Utilities/bootstrap \
+      --replace "usr" "$PREFIX"
+  '';
+
+  doCheck = false;
+
+  buildPhase = builder;
+
+  installPhase = ''
+    mkdir -p $out
+
+    # Extract the generated tarball into the store
+    PREFIX=''${out/#\/}
+    tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
+
+    paxmark pmr $out/bin/swift
+    paxmark pmr $out/bin/*
+
+    # TODO: Use wrappers to get these on the PATH for swift tools, instead
+    ln -s ${clang}/bin/* $out/bin/
+    ln -s ${binutils}/bin/ar $out/bin/ar
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Swift Programming Language";
+    homepage = "https://github.com/apple/swift";
+    maintainers = with maintainers; [ jb55 dtzWill ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
new file mode 100644
index 00000000000..6ef83754a67
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -0,0 +1,25 @@
+From 1fc49285c7a198de14005803dfde64bda17f4120 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 28 Mar 2017 15:01:16 -0500
+Subject: [PATCH 1/4] build-presets: (linux) don't require using Ninja
+
+---
+ utils/build-presets.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 7ee57ad2df..e6b0af3581 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -686,7 +686,7 @@ swiftpm
+ xctest
+ dash-dash
+ 
+-build-ninja
++# build-ninja
+ install-swift
+ install-lldb
+ install-llbuild
+-- 
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
new file mode 100644
index 00000000000..0e18e8812a8
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -0,0 +1,25 @@
+From fca6624b7a0ad670157105336a737cc95f9ce9fb Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 28 Mar 2017 15:01:40 -0500
+Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
+
+---
+ utils/build-presets.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index e6b0af3581..1095cbaab7 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -692,7 +692,7 @@ install-lldb
+ install-llbuild
+ install-swiftpm
+ install-xctest
+-install-prefix=/usr
++install-prefix=%(install_prefix)s
+ swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
+ build-swift-static-stdlib
+ build-swift-static-sdk-overlay
+-- 
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch
new file mode 100644
index 00000000000..f647d9189dd
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch
@@ -0,0 +1,38 @@
+From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 28 Mar 2017 15:02:18 -0500
+Subject: [PATCH 3/4] build-presets: (linux) disable tests.
+
+---
+ utils/build-presets.ini | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 1095cbaab7..1739e91dc2 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra
+ 
+ # Executes the lit tests for the installable package that is created
+ # Assumes the swift-integration-tests repo is checked out
+-test-installable-package
++# test-installable-package
+ 
+ # Path to the root of the installation filesystem.
+ install-destdir=%(install_destdir)s
+@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation
+ build-subdir=buildbot_linux
+ lldb
+ release
+-test
+-validation-test
+-long-test
++#test
++#validation-test
++#long-test
+ foundation
+ libdispatch
+ lit-args=-v
+-- 
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
new file mode 100644
index 00000000000..5493196303c
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -0,0 +1,25 @@
+From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 28 Mar 2017 15:02:37 -0500
+Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options
+
+---
+ utils/build-presets.ini | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 1739e91dc2..0608fed9c1 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s
+ # Path to the .tar.gz package we would create.
+ installable-package=%(installable_package)s
+ 
++extra-cmake-options=%(extra_cmake_options)s
++
+ [preset: buildbot_linux]
+ mixin-preset=mixin_linux_installation
+ build-subdir=buildbot_linux
+-- 
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
new file mode 100644
index 00000000000..9f1976a2d88
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -0,0 +1,32 @@
+--- swift/utils/build-script-impl	2017-01-23 12:47:20.401326309 -0600
++++ swift-pax/utils/build-script-impl	2017-01-23 13:24:10.339366996 -0600
+@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() {
+     fi
+ }
+ 
++## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh
++isELF() {
++    local fn="$1"
++    local magic
++    exec {fd}< "$fn"
++    read -n 4 -u $fd magic
++    exec {fd}<&-
++    if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
++}
++
+ #
+ # Configure and build each product
+ #
+@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do
+             fi
+ 
+             call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]}
++            
++						while IFS= read -r -d $'\0' i; do
++								if ! isELF "$i"; then continue; fi
++								echo "setting pax flags on $i"
++								paxctl -czexm "$i" || true
++						done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0)
+         fi
+     done
+ done
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
new file mode 100644
index 00000000000..f5fb4c73af4
--- /dev/null
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -0,0 +1,16 @@
+--- a/lib/Driver/Tools.cpp	2016-08-25 15:48:05.187553443 +0200
++++ b/lib/Driver/Tools.cpp	2016-08-25 15:48:47.534468882 +0200
+@@ -9420,13 +9420,6 @@
+   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");
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
new file mode 100644
index 00000000000..34ab70e0adc
--- /dev/null
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, clang }:
+
+stdenv.mkDerivation {
+  name = "blocksruntime";
+
+  src = fetchFromGitHub {
+    owner = "mackyle";
+    repo = "blocksruntime";
+    rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d";
+    sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd";
+  };
+
+  buildInputs = [ clang ];
+
+  configurePhase = ''
+    export CC=clang
+    export CXX=clang++
+  '';
+
+  buildPhase = "./buildlib";
+
+  checkPhase = "./checktests";
+
+  doCheck = false; # hasdescriptor.c test fails, hrm.
+
+  installPhase = ''prefix="/" DESTDIR=$out ./installlib'';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20cc897ae19..dc2074d10be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5619,6 +5619,8 @@ with pkgs;
 
   metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
 
+  swift = callPackage ../development/compilers/swift { };
+
   swiProlog = callPackage ../development/compilers/swi-prolog { };
 
   tbb = callPackage ../development/libraries/tbb { };
@@ -8080,6 +8082,8 @@ with pkgs;
 
   libbdplus = callPackage ../development/libraries/libbdplus { };
 
+  libblocksruntime = callPackage ../development/libraries/libblocksruntime { };
+
   libbluray = callPackage ../development/libraries/libbluray { };
 
   libbs2b = callPackage ../development/libraries/audio/libbs2b { };

From 50527dbd0ef248008ee50b1e3df2024e314df611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 11:57:24 +0100
Subject: [PATCH 0331/1744] iana-etc: 2.30 -> 20170328

---
 pkgs/data/misc/iana-etc/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index f20b992ab72..01203f9b0bd 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,17 +1,21 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "iana-etc-2.30";
+  name = "iana-etc-${version}";
+  version = "20170328";
 
   src = fetchurl {
-    url = "http://sethwklein.net/${name}.tar.bz2";
-    sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr";
+    url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
+    sha256 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk";
   };
 
-  preInstall = "installFlags=\"PREFIX=$out\"";
+  installPhase = ''
+    mkdir -p $out/etc
+    cp services protocols $out/etc/
+  '';
 
   meta = {
-    homepage = http://sethwklein.net/iana-etc;
+    homepage = https://github.com/Mic92/iana-etc;
     description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
     platforms = stdenv.lib.platforms.unix;
   };

From 36fca93290156f2bc7b39a42f08ece56f0478815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 12:40:52 +0100
Subject: [PATCH 0332/1744] rename iana_etc to iana-etc

fixes #23621
---
 doc/functions.xml                     | 2 +-
 nixos/modules/config/networking.nix   | 4 ++--
 pkgs/development/compilers/go/1.4.nix | 4 ++--
 pkgs/development/compilers/go/1.6.nix | 6 +++---
 pkgs/development/compilers/go/1.7.nix | 6 +++---
 pkgs/development/compilers/go/1.8.nix | 6 +++---
 pkgs/top-level/aliases.nix            | 1 +
 pkgs/top-level/all-packages.nix       | 2 +-
 pkgs/top-level/release-small.nix      | 2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index efe2590ddfb..4e7159638ca 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -529,7 +529,7 @@
   <note>
   <para>
   If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal>
-  you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>.
+  you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
   </para>
   </note>
 
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4431dfb4085..ae30a710bf6 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -178,10 +178,10 @@ in
 
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
-        "services".source = pkgs.iana_etc + "/etc/services";
+        "services".source = pkgs.iana-etc + "/etc/services";
 
         # /etc/protocols: IP protocol numbers.
-        "protocols".source  = pkgs.iana_etc + "/etc/protocols";
+        "protocols".source  = pkgs.iana-etc + "/etc/protocols";
 
         # /etc/rpc: RPC program numbers.
         "rpc".source = pkgs.glibc.out + "/etc/rpc";
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index f60077e8962..2a1944debd9 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
+{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
 , pkgconfig
 , pcre
 , Security }:
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     # ParseInLocation fails the test
     sed -i '/TestParseInSydney/areturn' src/time/format_test.go
 
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
   '' + lib.optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
 
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 52ffbab6dcb..4a777d7b4f1 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand
+{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand
 , perl, which, pkgconfig, patch, fetchpatch
 , pcre
 , Security, Foundation, bash }:
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
     # Remove the timezone naming test
     sed -i '/TestLoadFixed/areturn' src/time/time_test.go
 
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
-    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
   '' + lib.optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
   '' + lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 6c1b868beba..76f6141e2e3 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, fetchpatch
 , pcre, cacert
 , Security, Foundation, bash }:
@@ -69,8 +69,8 @@ stdenv.mkDerivation rec {
     # Remove the timezone naming test
     sed -i '/TestLoadFixed/areturn' src/time/time_test.go
 
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
-    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
 
     # Disable cgo lookup tests not works, they depend on resolver
     rm src/net/cgo_unix_test.go
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 32e95c3c049..60125b2e22a 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, fetchpatch
 , pcre, cacert
 , Security, Foundation, bash }:
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
     # Remove the timezone naming test
     sed -i '/TestLoadFixed/areturn' src/time/time_test.go
 
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
-    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
 
     # Disable cgo lookup tests not works, they depend on resolver
     rm src/net/cgo_unix_test.go
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dfecb3f7212..324e2d35cfd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -61,6 +61,7 @@ doNotDisplayTwice rec {
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
   htmlTidy = html-tidy;  # added 2014-12-06
+  iana_etc = iana-etc;  # added 2017-03-08
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20cc897ae19..9484dc06bc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12564,7 +12564,7 @@ with pkgs;
   inherit (callPackages ../data/fonts/gdouros { })
     symbola aegyptus akkadian anatolian maya unidings musica analecta;
 
-  iana_etc = callPackage ../data/misc/iana-etc { };
+  iana-etc = callPackage ../data/misc/iana-etc { };
 
   poppler_data = callPackage ../data/misc/poppler-data { };
 
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 86fbb0bf1b8..8872d7c676e 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -68,7 +68,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   hdparm = linux;
   hello = all;
   host = linux;
-  iana_etc = linux;
+  iana-etc = linux;
   icewm = linux;
   idutils = all;
   inetutils = linux;

From cf1db9fda0eb12b53a37118c12829be368faf55b Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 28 Mar 2017 23:21:49 +0200
Subject: [PATCH 0333/1744] textadept: bombay update without version pining

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

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 1e24054b996..27d0cf445b0 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -87,7 +87,7 @@ let
   get_libluajit   = get_url libluajit_url   "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy";
   get_gtdialog    = get_url gtdialog_url    "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
   get_cdk         = get_url cdk_url         "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
-  get_bombay      = get_url_zip bombay_url  "05fnh1imxdb4sb076fzqywqszp31whdbkzmpkqxc8q2r1m5vj3hg"
+  get_bombay      = get_url_zip bombay_url  "0illabngrrxidkprgz268wgjqknrds34nhm6hav95xc1nmsdr6jj"
     + "mv tip.zip bombay.zip\n";
   get_termkey     = get_url termkey_url     "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538";
 

From 8427222eca0d5696964b66a4501a4dacc8ff6cf8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 28 Mar 2017 23:07:54 +0200
Subject: [PATCH 0334/1744] rl-notes 17.03: add note about pre-NSS
 dnscrypt-proxy

(cherry picked from commit de5d4dc14788bcf0c8e6ef8dd5d8f3500a568422)
---
 nixos/doc/manual/release-notes/rl-1703.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index cae46258b80..2ffc488c0c1 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -305,6 +305,15 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      The dnscrypt-proxy service supports synchronizing the list of public
+      resolvers without working DNS resolution.  This fixes issues caused by the
+      resolver list becoming outdated.  It also improves the viability of
+      DNSCrypt only configurations.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 9b049849bfc385604f240157e129f7a8e3530d7f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Mar 2017 17:29:42 -0500
Subject: [PATCH 0335/1744] freetype: disable PCF long family names

Backported several patches from upstream. The test suite patch for Fontconfig is
no longer necessary.
---
 .../libraries/fontconfig/default.nix          |   4 -
 .../test-pcf-family-names-freetype-2.7.patch  |  18 -
 .../libraries/freetype/default.nix            |   9 +-
 .../disable-pcf-long-family-names.patch       |  15 +
 .../pcf-config-long-family-names.patch        | 553 ++++++++++++++++++
 .../freetype/pcf-introduce-driver.patch       |  68 +++
 6 files changed, 643 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
 create mode 100644 pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
 create mode 100644 pkgs/development/libraries/freetype/pcf-config-long-family-names.patch
 create mode 100644 pkgs/development/libraries/freetype/pcf-introduce-driver.patch

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index c44373625e0..14983b744df 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -33,10 +33,6 @@ stdenv.mkDerivation rec {
       url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
       sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
     })
-
-    # FreeType 2.7 prefixes PCF font family names with the foundry name.
-    # The output of fc-list and fc-query change which breaks the tests.
-    ./test-pcf-family-names-freetype-2.7.patch
   ];
   # additionally required for the glibc-2.25 patch; avoid requiring gperf
   postPatch = ''
diff --git a/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch b/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
deleted file mode 100644
index 24aa6e5aaa1..00000000000
--- a/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nuar fontconfig-2.10.2-orig/test/out.expected fontconfig-2.10.2/test/out.expected
---- fontconfig-2.10.2-orig/test/out.expected	2017-03-06 06:45:50.876053093 -0600
-+++ fontconfig-2.10.2/test/out.expected	2017-03-06 06:48:18.012514337 -0600
-@@ -1,8 +1,8 @@
--Fixed:pixelsize=16
--Fixed:pixelsize=6
-+Misc Fixed:pixelsize=6
-+Sony Fixed:pixelsize=16
- =
--Fixed:pixelsize=16
--Fixed:pixelsize=6
-+Misc Fixed:pixelsize=6
-+Sony Fixed:pixelsize=16
- =
--Fixed:pixelsize=16
--Fixed:pixelsize=6
-+Misc Fixed:pixelsize=6
-+Sony Fixed:pixelsize=16
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index f966965fa5f..146fd66deff 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -43,8 +43,13 @@ stdenv.mkDerivation {
     ++ optional (!stdenv.isLinux) gnumake;
 
   patches =
-    [ ./enable-table-validation.patch ]
-    ++ optional useEncumberedCode ./enable-subpixel-rendering.patch;
+    [
+      ./pcf-introduce-driver.patch
+      ./pcf-config-long-family-names.patch
+      ./disable-pcf-long-family-names.patch
+      ./enable-table-validation.patch
+    ] ++
+    optional useEncumberedCode ./enable-subpixel-rendering.patch;
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
new file mode 100644
index 00000000000..e3dfe4aabd6
--- /dev/null
+++ b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
@@ -0,0 +1,15 @@
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 5676074..37a0d00 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -856,7 +856,7 @@ FT_BEGIN_HEADER
+   /* If this option is activated, it can be controlled with the            */
+   /* `no-long-family-names' property of the pcf driver module.             */
+   /*                                                                       */
+-#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+ 
+ 
+   /*************************************************************************/
+-- 
+cgit v1.0-41-gc330
\ No newline at end of file
diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch
new file mode 100644
index 00000000000..95ed83c60f8
--- /dev/null
+++ b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch
@@ -0,0 +1,553 @@
+diff --git a/devel/ftoption.h b/devel/ftoption.h
+index 3b63931..b8b0a8d 100644
+--- a/devel/ftoption.h
++++ b/devel/ftoption.h
+@@ -82,8 +82,8 @@ FT_BEGIN_HEADER
+   /* to control the various font drivers and modules.  The controllable    */
+   /* properties are listed in the section `Controlling FreeType Modules'   */
+   /* in the reference's table of contents; currently there are properties  */
+-  /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and  */
+-  /* TrueType (file `ftttdrv.h').                                          */
++  /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'),      */
++  /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h').             */
+   /*                                                                       */
+   /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
+   /* multiple lines for better readability).                               */
+@@ -835,6 +835,33 @@ FT_BEGIN_HEADER
+   /*************************************************************************/
+   /*************************************************************************/
+   /****                                                                 ****/
++  /****         P C F   D R I V E R    C O N F I G U R A T I O N        ****/
++  /****                                                                 ****/
++  /*************************************************************************/
++  /*************************************************************************/
++
++
++  /*************************************************************************/
++  /*                                                                       */
++  /* There are many PCF fonts just called `Fixed' which look completely    */
++  /* different, and which have nothing to do with each other.  When        */
++  /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */
++  /* random, the style changes often if one changes the size and one       */
++  /* cannot select some fonts at all.  This option makes the PCF module    */
++  /* prepend the foundry name (plus a space) to the family name.           */
++  /*                                                                       */
++  /* We also check whether we have `wide' characters; all put together, we */
++  /* get family names like `Sony Fixed' or `Misc Fixed Wide'.              */
++  /*                                                                       */
++  /* If this option is activated, it can be controlled with the            */
++  /* `no-long-family-names' property of the pcf driver module.             */
++  /*                                                                       */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++
++
++  /*************************************************************************/
++  /*************************************************************************/
++  /****                                                                 ****/
+   /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
+   /****                                                                 ****/
+   /*************************************************************************/
+diff --git a/docs/CHANGES b/docs/CHANGES
+index cb3b327..3823395 100644
+--- a/docs/CHANGES
++++ b/docs/CHANGES
+@@ -1,4 +1,20 @@
+ 
++CHANGES BETWEEN 2.7.1 and 2.7.2
++
++  I. IMPORTANT CHANGES
++
++    - The PCF change to show more `colourful' family names (introduced
++      in version 2.7.1) was too radical; it can now be configured with
++      PCF_CONFIG_OPTION_LONG_FAMILY_NAMES   at   compile   time.    If
++      activated, it can  be switched off at run time  with the new pcf
++      property  `no-long-family-names'.  If  the `FREETYPE_PROPERTIES'
++      environment variable is available, you can say
++
++        FREETYPE_PROPERTIES=pcf:no-long-family-names=1
++
++
++======================================================================
++
+ CHANGES BETWEEN 2.7 and 2.7.1
+ 
+   I. IMPORTANT CHANGES
+diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
+index 950d36c..d491af5 100644
+--- a/include/freetype/config/ftheader.h
++++ b/include/freetype/config/ftheader.h
+@@ -357,6 +357,19 @@
+   /*************************************************************************
+    *
+    * @macro:
++   *   FT_PCF_DRIVER_H
++   *
++   * @description:
++   *   A macro used in #include statements to name the file containing
++   *   structures and macros related to the PCF driver module.
++   *
++   */
++#define FT_PCF_DRIVER_H  <freetype/ftpcfdrv.h>
++
++
++  /*************************************************************************
++   *
++   * @macro:
+    *   FT_TYPE1_TABLES_H
+    *
+    * @description:
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index f5bc540..5676074 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -82,8 +82,8 @@ FT_BEGIN_HEADER
+   /* to control the various font drivers and modules.  The controllable    */
+   /* properties are listed in the section `Controlling FreeType Modules'   */
+   /* in the reference's table of contents; currently there are properties  */
+-  /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and  */
+-  /* TrueType (file `ftttdrv.h').                                          */
++  /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'),      */
++  /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h').             */
+   /*                                                                       */
+   /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
+   /* multiple lines for better readability).                               */
+@@ -835,6 +835,33 @@ FT_BEGIN_HEADER
+   /*************************************************************************/
+   /*************************************************************************/
+   /****                                                                 ****/
++  /****         P C F   D R I V E R    C O N F I G U R A T I O N        ****/
++  /****                                                                 ****/
++  /*************************************************************************/
++  /*************************************************************************/
++
++
++  /*************************************************************************/
++  /*                                                                       */
++  /* There are many PCF fonts just called `Fixed' which look completely    */
++  /* different, and which have nothing to do with each other.  When        */
++  /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */
++  /* random, the style changes often if one changes the size and one       */
++  /* cannot select some fonts at all.  This option makes the PCF module    */
++  /* prepend the foundry name (plus a space) to the family name.           */
++  /*                                                                       */
++  /* We also check whether we have `wide' characters; all put together, we */
++  /* get family names like `Sony Fixed' or `Misc Fixed Wide'.              */
++  /*                                                                       */
++  /* If this option is activated, it can be controlled with the            */
++  /* `no-long-family-names' property of the pcf driver module.             */
++  /*                                                                       */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++
++
++  /*************************************************************************/
++  /*************************************************************************/
++  /****                                                                 ****/
+   /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
+   /****                                                                 ****/
+   /*************************************************************************/
+diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h
+index ab43895..a0a121b 100644
+--- a/include/freetype/ftchapters.h
++++ b/include/freetype/ftchapters.h
+@@ -77,6 +77,7 @@
+ /*    auto_hinter                                                          */
+ /*    cff_driver                                                           */
+ /*    tt_driver                                                            */
++/*    pcf_driver                                                           */
+ /*                                                                         */
+ /***************************************************************************/
+ 
+diff --git a/include/freetype/ftpcfdrv.h b/include/freetype/ftpcfdrv.h
+new file mode 100644
+index 0000000..6622c93
+--- /dev/null
++++ b/include/freetype/ftpcfdrv.h
+@@ -0,0 +1,105 @@
++/***************************************************************************/
++/*                                                                         */
++/*  ftpcfdrv.h                                                             */
++/*                                                                         */
++/*    FreeType API for controlling the PCF driver (specification only).    */
++/*                                                                         */
++/*  Copyright 2017 by                                                      */
++/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
++/*                                                                         */
++/*  This file is part of the FreeType project, and may only be used,       */
++/*  modified, and distributed under the terms of the FreeType project      */
++/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
++/*  this file you indicate that you have read the license and              */
++/*  understand and accept it fully.                                        */
++/*                                                                         */
++/***************************************************************************/
++
++
++#ifndef FTPCFDRV_H_
++#define FTPCFDRV_H_
++
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
++#ifdef FREETYPE_H
++#error "freetype.h of FreeType 1 has been loaded!"
++#error "Please fix the directory search order for header files"
++#error "so that freetype.h of FreeType 2 is found first."
++#endif
++
++
++FT_BEGIN_HEADER
++
++
++  /**************************************************************************
++   *
++   * @section:
++   *   pcf_driver
++   *
++   * @title:
++   *   The PCF driver
++   *
++   * @abstract:
++   *   Controlling the PCF driver module.
++   *
++   * @description:
++   *   While FreeType's PCF driver doesn't expose API functions by itself,
++   *   it is possible to control its behaviour with @FT_Property_Set and
++   *   @FT_Property_Get.  Right now, there is a single property
++   *   `no-long-family-names' available if FreeType is compiled with
++   *   PCF_CONFIG_OPTION_LONG_FAMILY_NAMES.
++   *
++   *   The PCF driver's module name is `pcf'.
++   *
++   */
++
++
++  /**************************************************************************
++   *
++   * @property:
++   *   no-long-family-names
++   *
++   * @description:
++   *   If PCF_CONFIG_OPTION_LONG_FAMILY_NAMES is active while compiling
++   *   FreeType, the PCF driver constructs long family names.
++   *
++   *   There are many PCF fonts just called `Fixed' which look completely
++   *   different, and which have nothing to do with each other.  When
++   *   selecting `Fixed' in KDE or Gnome one gets results that appear rather
++   *   random, the style changes often if one changes the size and one
++   *   cannot select some fonts at all.  The improve this situation, the PCF
++   *   module prepends the foundry name (plus a space) to the family name. 
++   *   It also checks whether there are `wide' characters; all put together,
++   *   family names like `Sony Fixed' or `Misc Fixed Wide' are constructed.
++   *
++   *   If `no-long-family-names' is set, this feature gets switched off.
++   *
++   *   {
++   *     FT_Library  library;
++   *     FT_Bool     no_long_family_names = TRUE;
++   *
++   *
++   *     FT_Init_FreeType( &library );
++   *
++   *     FT_Property_Set( library, "pcf",
++   *                               "no-long-family-names",
++   *                               &no_long_family_names );
++   *   }
++   *
++   * @note:
++   *   This property can be used with @FT_Property_Get also.
++   *
++   *   This property can be set via the `FREETYPE_PROPERTIES' environment
++   *   variable (using values 1 and 0 for `on' and `off', respectively).
++   *
++   */
++
++
++FT_END_HEADER
++
++
++#endif /* FTPCFDRV_H_ */
++
++
++/* END */
+diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
+index 830cabe..f0390cb 100644
+--- a/src/pcf/pcf.h
++++ b/src/pcf/pcf.h
+@@ -167,6 +167,8 @@ FT_BEGIN_HEADER
+   {
+     FT_DriverRec  root;
+ 
++    FT_Bool  no_long_family_names;
++
+   } PCF_DriverRec, *PCF_Driver;
+ 
+ 
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 8f4a90d..bc65423 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -49,6 +49,8 @@ THE SOFTWARE.
+ 
+ #include FT_SERVICE_BDF_H
+ #include FT_SERVICE_FONT_FORMAT_H
++#include FT_SERVICE_PROPERTIES_H
++#include FT_PCF_DRIVER_H
+ 
+ 
+   /*************************************************************************/
+@@ -667,6 +669,110 @@ THE SOFTWARE.
+   };
+ 
+ 
++  /*
++   *  PROPERTY SERVICE
++   *
++   */
++  static FT_Error
++  pcf_property_set( FT_Module    module,         /* PCF_Driver */
++                    const char*  property_name,
++                    const void*  value,
++                    FT_Bool      value_is_string )
++  {
++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++
++    FT_Error    error  = FT_Err_Ok;
++    PCF_Driver  driver = (PCF_Driver)module;
++
++#ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
++    FT_UNUSED( value_is_string );
++#endif
++
++
++    if ( !ft_strcmp( property_name, "no-long-family-names" ) )
++    {
++#ifdef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
++      if ( value_is_string )
++      {
++        const char*  s   = (const char*)value;
++        long         lfn = ft_strtol( s, NULL, 10 );
++
++
++        if ( lfn == 0 )
++          driver->no_long_family_names = 0;
++        else if ( lfn == 1 )
++          driver->no_long_family_names = 1;
++        else
++          return FT_THROW( Invalid_Argument );
++      }
++      else
++#endif
++      {
++        FT_Bool*  no_long_family_names = (FT_Bool*)value;
++
++
++        driver->no_long_family_names = *no_long_family_names;
++      }
++
++      return error;
++    }
++
++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++
++    FT_UNUSED( module );
++    FT_UNUSED( value );
++    FT_UNUSED( value_is_string );
++
++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++
++    FT_TRACE0(( "pcf_property_set: missing property `%s'\n",
++                property_name ));
++    return FT_THROW( Missing_Property );
++  }
++
++
++  static FT_Error
++  pcf_property_get( FT_Module    module,         /* PCF_Driver */
++                    const char*  property_name,
++                    const void*  value )
++  {
++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++
++    FT_Error    error  = FT_Err_Ok;
++    PCF_Driver  driver = (PCF_Driver)module;
++
++
++    if ( !ft_strcmp( property_name, "no-long-family-names" ) )
++    {
++      FT_Bool   no_long_family_names = driver->no_long_family_names;
++      FT_Bool*  val                  = (FT_Bool*)value;
++
++
++      *val = no_long_family_names;
++
++      return error;
++    }
++
++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++
++    FT_UNUSED( module );
++    FT_UNUSED( value );
++
++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++
++    FT_TRACE0(( "pcf_property_get: missing property `%s'\n",
++                property_name ));
++    return FT_THROW( Missing_Property );
++  }
++
++
++  FT_DEFINE_SERVICE_PROPERTIESREC(
++    pcf_service_properties,
++
++    (FT_Properties_SetFunc)pcf_property_set,      /* set_property */
++    (FT_Properties_GetFunc)pcf_property_get )     /* get_property */
++
++
+  /*
+   *
+   *  SERVICE LIST
+@@ -677,6 +783,7 @@ THE SOFTWARE.
+   {
+     { FT_SERVICE_ID_BDF,         &pcf_service_bdf },
+     { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_PCF },
++    { FT_SERVICE_ID_PROPERTIES,  &pcf_service_properties },
+     { NULL, NULL }
+   };
+ 
+@@ -694,7 +801,14 @@ THE SOFTWARE.
+   FT_CALLBACK_DEF( FT_Error )
+   pcf_driver_init( FT_Module  module )      /* PCF_Driver */
+   {
++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++    PCF_Driver  driver = (PCF_Driver)module;
++
++
++    driver->no_long_family_names = 0;
++#else
+     FT_UNUSED( module );
++#endif
+ 
+     return FT_Err_Ok;
+   }
+diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
+index 38ba110..3eacf2b 100644
+--- a/src/pcf/pcfread.c
++++ b/src/pcf/pcfread.c
+@@ -1393,57 +1393,75 @@ THE SOFTWARE.
+       prop = pcf_find_property( face, "FAMILY_NAME" );
+       if ( prop && prop->isString )
+       {
+-        /* Prepend the foundry name plus a space to the family name.      */
+-        /* There are many fonts just called `Fixed' which look completely */
+-        /* different, and which have nothing to do with each other.  When */
+-        /* selecting `Fixed' in KDE or Gnome one gets results that appear */
+-        /* rather random, the style changes often if one changes the size */
+-        /* and one cannot select some fonts at all.                       */
+-        /*                                                                */
+-        /* We also check whether we have `wide' characters; all put       */
+-        /* together, we get family names like `Sony Fixed' or `Misc Fixed */
+-        /* Wide'.                                                         */
+-        PCF_Property  foundry_prop, point_size_prop, average_width_prop;
+-
+-        int  l    = ft_strlen( prop->value.atom ) + 1;
+-        int  wide = 0;
+-
+-
+-        foundry_prop       = pcf_find_property( face, "FOUNDRY" );
+-        point_size_prop    = pcf_find_property( face, "POINT_SIZE" );
+-        average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" );
+-
+-        if ( point_size_prop && average_width_prop )
++
++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
++
++        PCF_Driver  driver = (PCF_Driver)FT_FACE_DRIVER( face );
++
++
++        if ( !driver->no_long_family_names )
+         {
+-          if ( average_width_prop->value.l >= point_size_prop->value.l )
++          /* Prepend the foundry name plus a space to the family name.     */
++          /* There are many fonts just called `Fixed' which look           */
++          /* completely different, and which have nothing to do with each  */
++          /* other.  When selecting `Fixed' in KDE or Gnome one gets       */
++          /* results that appear rather random, the style changes often if */
++          /* one changes the size and one cannot select some fonts at all. */
++          /*                                                               */
++          /* We also check whether we have `wide' characters; all put      */
++          /* together, we get family names like `Sony Fixed' or `Misc      */
++          /* Fixed Wide'.                                                  */
++
++          PCF_Property  foundry_prop, point_size_prop, average_width_prop;
++
++          int  l    = ft_strlen( prop->value.atom ) + 1;
++          int  wide = 0;
++
++
++          foundry_prop       = pcf_find_property( face, "FOUNDRY" );
++          point_size_prop    = pcf_find_property( face, "POINT_SIZE" );
++          average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" );
++
++          if ( point_size_prop && average_width_prop )
+           {
+-            /* This font is at least square shaped or even wider */
+-            wide = 1;
+-            l   += ft_strlen( " Wide" );
++            if ( average_width_prop->value.l >= point_size_prop->value.l )
++            {
++              /* This font is at least square shaped or even wider */
++              wide = 1;
++              l   += ft_strlen( " Wide" );
++            }
+           }
+-        }
+ 
+-        if ( foundry_prop && foundry_prop->isString )
+-        {
+-          l += ft_strlen( foundry_prop->value.atom ) + 1;
++          if ( foundry_prop && foundry_prop->isString )
++          {
++            l += ft_strlen( foundry_prop->value.atom ) + 1;
+ 
+-          if ( FT_NEW_ARRAY( root->family_name, l ) )
+-            goto Exit;
++            if ( FT_NEW_ARRAY( root->family_name, l ) )
++              goto Exit;
++
++            ft_strcpy( root->family_name, foundry_prop->value.atom );
++            ft_strcat( root->family_name, " " );
++            ft_strcat( root->family_name, prop->value.atom );
++          }
++          else
++          {
++            if ( FT_NEW_ARRAY( root->family_name, l ) )
++              goto Exit;
+ 
+-          ft_strcpy( root->family_name, foundry_prop->value.atom );
+-          ft_strcat( root->family_name, " " );
+-          ft_strcat( root->family_name, prop->value.atom );
++            ft_strcpy( root->family_name, prop->value.atom );
++          }
++
++          if ( wide )
++            ft_strcat( root->family_name, " Wide" );
+         }
+         else
++
++#endif /* PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++
+         {
+-          if ( FT_NEW_ARRAY( root->family_name, l ) )
++          if ( FT_STRDUP( root->family_name, prop->value.atom ) )
+             goto Exit;
+-
+-          ft_strcpy( root->family_name, prop->value.atom );
+         }
+-
+-        if ( wide )
+-          ft_strcat( root->family_name, " Wide" );
+       }
+       else
+         root->family_name = NULL;
+-- 
+cgit v1.0-41-gc330
+
diff --git a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch
new file mode 100644
index 00000000000..c1685c5116c
--- /dev/null
+++ b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch
@@ -0,0 +1,68 @@
+diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
+index c726e5e..830cabe 100644
+--- a/src/pcf/pcf.h
++++ b/src/pcf/pcf.h
+@@ -163,6 +163,13 @@ FT_BEGIN_HEADER
+   } PCF_FaceRec, *PCF_Face;
+ 
+ 
++  typedef struct  PCF_DriverRec_
++  {
++    FT_DriverRec  root;
++
++  } PCF_DriverRec, *PCF_Driver;
++
++
+   /* macros for pcf font format */
+ 
+ #define LSBFirst  0
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 10d5c20..8f4a90d 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -691,22 +691,38 @@ THE SOFTWARE.
+   }
+ 
+ 
++  FT_CALLBACK_DEF( FT_Error )
++  pcf_driver_init( FT_Module  module )      /* PCF_Driver */
++  {
++    FT_UNUSED( module );
++
++    return FT_Err_Ok;
++  }
++
++
++  FT_CALLBACK_DEF( void )
++  pcf_driver_done( FT_Module  module )      /* PCF_Driver */
++  {
++    FT_UNUSED( module );
++  }
++
++
+   FT_CALLBACK_TABLE_DEF
+   const FT_Driver_ClassRec  pcf_driver_class =
+   {
+     {
+       FT_MODULE_FONT_DRIVER        |
+       FT_MODULE_DRIVER_NO_OUTLINES,
+-      sizeof ( FT_DriverRec ),
+ 
++      sizeof ( PCF_DriverRec ),
+       "pcf",
+       0x10000L,
+       0x20000L,
+ 
+-      NULL,    /* module-specific interface */
++      NULL,   /* module-specific interface */
+ 
+-      NULL,                     /* FT_Module_Constructor  module_init   */
+-      NULL,                     /* FT_Module_Destructor   module_done   */
++      pcf_driver_init,          /* FT_Module_Constructor  module_init   */
++      pcf_driver_done,          /* FT_Module_Destructor   module_done   */
+       pcf_driver_requester      /* FT_Module_Requester    get_interface */
+     },
+ 
+-- 
+cgit v1.0-41-gc330
+

From 1d52c677bec5b1ede7534455a35c035b359cb9e8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 25 Mar 2017 02:46:51 +0100
Subject: [PATCH 0336/1744] ssmtp: use the authPassFile option instead of
 authPass

This gives users the option of storing the authPass outside the
world-readable Nix store.
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/programs/ssmtp.nix              | 41 ++++++++---
 pkgs/tools/networking/ssmtp/default.nix       |  9 ++-
 ...ssmtp_support_AuthPassFile_parameter.patch | 69 +++++++++++++++++++
 4 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4f9754445fa..5ce97379a12 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -59,6 +59,7 @@
   bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
   bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 7d0cb332099..1702edab6e4 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -95,9 +95,27 @@ in
         example = "correctHorseBatteryStaple";
         description = ''
           Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)
+
+          It's recommended to use <option>authPassFile</option>
+          which takes precedence over <option>authPass</option>.
         '';
       };
-      
+
+      authPassFile = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/run/keys/ssmtp-authpass";
+        description = ''
+          Path to a file that contains the password used for SMTP auth.
+          This file should be readable by the users that need to execute ssmtp.
+
+          <option>authPassFile</option> takes precedence over <option>authPass</option>.
+
+          Warning: when <option>authPass</option> is non-empty <option>authPassFile</option>
+          defaults to a file in the WORLD-READABLE Nix store containing that password.
+        '';
+      };
+
       setSendmail = mkOption {
         type = types.bool;
         default = true;
@@ -111,21 +129,28 @@ in
 
   config = mkIf cfg.directDelivery {
 
+    networking.defaultMailServer.authPassFile = mkIf (cfg.authPass != "")
+      (mkDefault (toString (pkgs.writeTextFile {
+        name = "ssmtp-authpass";
+        text = cfg.authPass;
+      })));
+
     environment.etc."ssmtp/ssmtp.conf".text =
+      let yesNo = yes : if yes then "YES" else "NO"; in
       ''
         MailHub=${cfg.hostName}
         FromLineOverride=YES
-        ${if cfg.root != "" then "root=${cfg.root}" else ""}
-        ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
-        UseTLS=${if cfg.useTLS then "YES" else "NO"}
-        UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
+        ${optionalString (cfg.root   != "") "root=${cfg.root}"}
+        ${optionalString (cfg.domain != "") "rewriteDomain=${cfg.domain}"}
+        UseTLS=${yesNo cfg.useTLS}
+        UseSTARTTLS=${yesNo cfg.useSTARTTLS}
         #Debug=YES
-        ${if cfg.authUser != "" then "AuthUser=${cfg.authUser}" else ""}
-        ${if cfg.authPass != "" then "AuthPass=${cfg.authPass}" else ""}
+        ${optionalString (cfg.authUser != "")       "AuthUser=${cfg.authUser}"}
+        ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"}
       '';
 
     environment.systemPackages = [pkgs.ssmtp];
-    
+
     services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail {
       program = "sendmail";
       source = "${pkgs.ssmtp}/bin/sendmail";
diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index 7c47f2762dd..ceac5a58800 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation {
     sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
   };
 
+  # A request has been made to merge this patch into ssmtp.
+  # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858781
+  patches = [ ./ssmtp_support_AuthPassFile_parameter.patch ];
+
   configureFlags = "--sysconfdir=/etc ${if tlsSupport then "--enable-ssl" else ""}";
 
   postConfigure =
@@ -27,7 +31,8 @@ stdenv.mkDerivation {
   
   buildInputs = stdenv.lib.optional tlsSupport openssl;
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ basvandijk ];
   };
 }
diff --git a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch b/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch
new file mode 100644
index 00000000000..371c0f6de2b
--- /dev/null
+++ b/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch
@@ -0,0 +1,69 @@
+diff -Naurb a/ssmtp.c b/ssmtp.c
+--- a/ssmtp.c	2009-11-23 10:55:11.000000000 +0100
++++ b/ssmtp.c	2017-03-25 03:00:26.508283016 +0100
+@@ -57,6 +57,7 @@
+ char arpadate[ARPADATE_LENGTH];
+ char *auth_user = (char)NULL;
+ char *auth_pass = (char)NULL;
++char *auth_passfile = (char)NULL;
+ char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
+ char *mail_domain = (char)NULL;
+ char *from = (char)NULL;		/* Use this as the From: address */
+@@ -1053,6 +1054,15 @@
+ 					log_event(LOG_INFO, "Set AuthPass=\"%s\"\n", auth_pass);
+ 				}
+ 			}
++			else if(strcasecmp(p, "AuthPassFile") == 0 && !auth_passfile) {
++				if((auth_passfile = strdup(q)) == (char *)NULL) {
++					die("parse_config() -- strdup() failed");
++				}
++
++				if(log_level > 0) {
++					log_event(LOG_INFO, "Set AuthPassFile=\"%s\"\n", auth_passfile);
++				}
++			}
+ 			else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) {
+ 				if((auth_method = strdup(q)) == (char *)NULL) {
+ 					die("parse_config() -- strdup() failed");
+@@ -1415,6 +1425,8 @@
+ 	struct passwd *pw;
+ 	int i, sock;
+ 	uid_t uid;
++	FILE *fp;
++	char pass_buf[BUF_SZ+1];
+ 	bool_t minus_v_save, leadingdot, linestart = True;
+ 	int timeout = 0;
+ 	int bufsize = sizeof(b)-1;
+@@ -1433,6 +1445,17 @@
+ 		log_event(LOG_INFO, "%s not found", config_file);
+ 	}
+ 
++	if(auth_passfile != (char *)NULL) {
++		if((fp = fopen(auth_passfile, "r")) == (FILE *)NULL) {
++			  die("Could not open the AuthPassFile %s", auth_passfile);
++		}
++		if (fgets(pass_buf, BUF_SZ, fp) == NULL) {
++			die("Error while reading a line from the AuthPassFile %s, or it is empty", auth_passfile);
++		}
++		fclose(fp);
++		auth_pass = strdup(pass_buf);
++	}
++
+ 	if((p = strtok(pw->pw_gecos, ";,"))) {
+ 		if((gecos = strdup(p)) == (char *)NULL) {
+ 			die("ssmtp() -- strdup() failed");
+diff -Naurb a/ssmtp.conf.5 b/ssmtp.conf.5
+--- a/ssmtp.conf.5	2008-02-29 03:50:15.000000000 +0100
++++ b/ssmtp.conf.5	2017-03-25 01:45:52.890165426 +0100
+@@ -61,6 +61,11 @@
+ .Pp
+ .It Cm AuthPass
+ The password to use for SMTP AUTH.
++It is recommended to use AuthPassFile which also takes precedence over AuthPass.
++.Pp
++.It Cm AuthPassFile
++A file that should contain the password to use for SMTP AUTH.
++This takes precedence over AuthPass.
+ .Pp
+ .It Cm AuthMethod
+ The authorization method to use.

From 4a12a681efbc1f9851170be60479b598e5d28768 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Mar 2017 04:14:05 +0100
Subject: [PATCH 0337/1744] go builder: use removeReferencesTo

---
 pkgs/development/go-modules/generic/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 985b4c9b9db..adac53f7828 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }:
+{ go, govers, parallel, lib, fetchgit, fetchhg, rsync, removeReferencesTo }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -41,9 +41,7 @@ let
 
   removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
 
-  removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
-    | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
-  '');
+  removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
 
   dep2src = goDep:
     {
@@ -70,7 +68,7 @@ go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   inherit name;
-  nativeBuildInputs = [ go parallel ]
+  nativeBuildInputs = [ removeReferencesTo go parallel ]
     ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
   buildInputs = [ go ] ++ buildInputs;
 
@@ -186,11 +184,7 @@ go.stdenv.mkDerivation (
   '';
 
   preFixup = preFixup + ''
-    while read file; do
-      cat $file ${removeExpr removeReferences} > $file.tmp
-      mv $file.tmp $file
-      chmod +x $file
-    done < <(find $bin/bin -type f 2>/dev/null)
+    find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' +
   '';
 
   shellHook = ''

From 13007957e5bf8bf31f7c99a054e2f0bdb395e860 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 26 Mar 2017 04:15:42 +0200
Subject: [PATCH 0338/1744] quicklispPackages: init

The idea is to have an almost-automatic conversion from QuickLisp, the
definitive Common Lisp package repository, to Nix. The benefit over just
using lispPackages.quicklisp is automatic installation of non-Lisp
dependencies from NixPkgs (and integration with Nix package management).
The benefit over lispPackages for normal Lisp packages is packaging just
a snapshot of QuickLisp which is known to be tested for version
compatibility between libraries.

There are some packages in lispPackages that are not from QuickLisp (for
example, the installable wrapper of QuickLisp itself). My hope is to
replace the rest with the expressions converted from QuickLisp.

Note that the current commit is a mere addition.
---
 .../barebones-quicklisp-expression.sh         |   2 +-
 .../agnostic-lizard.nix                       |  14 +
 .../quicklisp-to-nix-output/alexandria.nix    |  14 +
 .../quicklisp-to-nix-output/babel.nix         |  14 +
 .../bordeaux-threads.nix                      |  14 +
 .../quicklisp-to-nix-output/cffi.nix          |  14 +
 .../quicklisp-to-nix-output/chunga.nix        |  14 +
 .../quicklisp-to-nix-output/cl+ssl.nix        |  14 +
 .../quicklisp-to-nix-output/cl-base64.nix     |  14 +
 .../quicklisp-to-nix-output/cl-fad.nix        |  14 +
 .../quicklisp-to-nix-output/cl-fuse.nix       |  14 +
 .../quicklisp-to-nix-output/cl-ppcre.nix      |  14 +
 .../quicklisp-to-nix-output/cl-utilities.nix  |  14 +
 .../quicklisp-to-nix-output/clx.nix           |  14 +
 .../quicklisp-to-nix-output/esrap.nix         |  14 +
 .../quicklisp-to-nix-output/flexi-streams.nix |  14 +
 .../quicklisp-to-nix-output/hunchentoot.nix   |  17 +
 .../quicklisp-to-nix-output/iterate.nix       |  14 +
 .../quicklisp-to-nix-output/md5.nix           |  14 +
 .../quicklisp-to-nix-output/rfc2388.nix       |  14 +
 .../split-sequence.nix                        |  15 +
 .../quicklisp-to-nix-output/stumpwm.nix       |  14 +
 .../trivial-backtrace.nix                     |  14 +
 .../trivial-features.nix                      |  14 +
 .../trivial-garbage.nix                       |  14 +
 .../trivial-gray-streams.nix                  |  14 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |  14 +
 .../quicklisp-to-nix-output/uiop.nix          |  14 +
 .../quicklisp-to-nix-output/usocket.nix       |  14 +
 .../quicklisp-to-nix-overrides.nix            |  20 ++
 .../lisp-modules/quicklisp-to-nix-systems.txt |   4 +
 .../lisp-modules/quicklisp-to-nix.nix         | 291 ++++++++++++++++++
 .../quicklisp-to-nix/invocation.emb           |   8 +
 .../quicklisp-to-nix/nix-package.emb          |  14 +
 .../quicklisp-to-nix/ql-to-nix.lisp           | 124 ++++++++
 .../quicklisp-to-nix/top-package.emb          |  11 +
 pkgs/top-level/all-packages.nix               |   6 +
 37 files changed, 875 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb

diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
index 8693a304899..d2d846b78f2 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
+++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
@@ -34,7 +34,7 @@ url="${ql_src##* }"
 
 [ "$ql_src_type" = "kmr-git" ] && {
   ql_src_type=git
-  url="http://git.b9.com/$url.git"
+  url="http://git.kpe.io/$url.git"
   export NIX_PREFETCH_GIT_DEEP_CLONE=1
 }
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
new file mode 100644
index 00000000000..8da74224ae2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+  baseName = ''agnostic-lizard'';
+  version = ''20170227-git'';
+
+  description = ''A portable code walker that makes a best effort to be correct in most cases'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/agnostic-lizard/2017-02-27/agnostic-lizard-20170227-git.tgz'';
+    sha256 = ''0gnbxfdz35z9kznnhnj9x5zzn25k1x2ifv4v9rkzb0xmi7xkx9wi'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
new file mode 100644
index 00000000000..34173f0ac4b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''alexandria'';
+  version = ''20170227-git'';
+
+  description = ''Alexandria is a collection of portable public domain utilities.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
+    sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
new file mode 100644
index 00000000000..392912d77e4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''babel'';
+  version = ''20150608-git'';
+
+  description = ''Babel, a charset conversion library.'';
+
+  deps = [ args."trivial-features" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
+    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
new file mode 100644
index 00000000000..26313457010
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''bordeaux-threads'';
+  version = ''v0.8.5'';
+
+  description = ''Bordeaux Threads makes writing portable multi-threaded apps simple'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
+    sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
new file mode 100644
index 00000000000..582b0c39493
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi'';
+  version = ''cffi_0.18.0'';
+
+  description = ''The Common Foreign Function Interface'';
+
+  deps = [ args."uiop" args."alexandria" args."trivial-features" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
new file mode 100644
index 00000000000..e737843d167
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''chunga'';
+  version = ''1.1.6'';
+
+  description = '''';
+
+  deps = [ args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
+    sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
new file mode 100644
index 00000000000..bd4f4b58fb1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl+ssl'';
+  version = ''cl+ssl-20161208-git'';
+
+  description = ''Common Lisp interface to OpenSSL.'';
+
+  deps = [ args."cffi" args."trivial-gray-streams" args."flexi-streams" args."bordeaux-threads" args."trivial-garbage" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz'';
+    sha256 = ''0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
new file mode 100644
index 00000000000..c9d62c62b01
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-base64'';
+  version = ''20150923-git'';
+
+  description = ''Base64 encoding and decoding with URI support.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
+    sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
new file mode 100644
index 00000000000..9fea4c0f01d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-fad'';
+  version = ''0.7.4'';
+
+  description = ''Portable pathname library'';
+
+  deps = [ args."bordeaux-threads" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
+    sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
new file mode 100644
index 00000000000..2f44fbc416b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-fuse'';
+  version = ''20160318-git'';
+
+  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+
+  deps = [ args."cffi" args."cl-utilities" args."bordeaux-threads" args."trivial-backtrace" args."iterate" args."trivial-utf-8" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
+    sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
new file mode 100644
index 00000000000..5e9f1a6e473
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-ppcre'';
+  version = ''2.0.11'';
+
+  description = ''Perl-compatible regular expression library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
+    sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
new file mode 100644
index 00000000000..2d24e2d87e3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-utilities'';
+  version = ''1.2.4'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
+    sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
new file mode 100644
index 00000000000..1611b7b74fe
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clx'';
+  version = ''20170227-git'';
+
+  description = ''An implementation of the X Window System protocol in Lisp.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
+    sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
new file mode 100644
index 00000000000..e05713da15b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''esrap'';
+  version = ''20170124-git'';
+
+  description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
+    sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
new file mode 100644
index 00000000000..12da2cbacb9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''flexi-streams'';
+  version = ''1.0.15'';
+
+  description = ''Flexible bivalent streams for Common Lisp'';
+
+  deps = [ args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
+    sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
new file mode 100644
index 00000000000..0eadf54320a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -0,0 +1,17 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hunchentoot'';
+  version = ''1.2.35'';
+
+  description = ''Hunchentoot is a HTTP server based on USOCKET and
+  BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
+  simple framework for user-defined handlers and can be extended
+  through subclassing.'';
+
+  deps = [ args."chunga" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."cl+ssl" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
+    sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
new file mode 100644
index 00000000000..469c8439246
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iterate'';
+  version = ''20160825-darcs'';
+
+  description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
+    sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
new file mode 100644
index 00000000000..275dd3577dd
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''md5'';
+  version = ''20150804-git'';
+
+  description = ''The MD5 Message-Digest Algorithm RFC 1321'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
+    sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
new file mode 100644
index 00000000000..82b31efea27
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''rfc2388'';
+  version = ''20130720-git'';
+
+  description = ''Implementation of RFC 2388'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
+    sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
new file mode 100644
index 00000000000..085e215e024
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -0,0 +1,15 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''split-sequence'';
+  version = ''1.2'';
+
+  description = ''Splits a sequence into a list of subsequences
+  delimited by objects satisfying a test.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
+    sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
new file mode 100644
index 00000000000..910cce74f8a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''stumpwm'';
+  version = ''20170227-git'';
+
+  description = ''A tiling, keyboard driven window manager'';
+
+  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz'';
+    sha256 = ''0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
new file mode 100644
index 00000000000..fc83804f5e1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-backtrace'';
+  version = ''20160531-git'';
+
+  description = ''trivial-backtrace'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
+    sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
new file mode 100644
index 00000000000..97d6b0cf2c0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-features'';
+  version = ''20161204-git'';
+
+  description = ''Ensures consistent *FEATURES* across multiple CLs.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
+    sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
new file mode 100644
index 00000000000..6a057bdcc10
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-garbage'';
+  version = ''20150113-git'';
+
+  description = ''Portable finalizers, weak hash-tables and weak pointers.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
+    sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
new file mode 100644
index 00000000000..b234da11c37
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-gray-streams'';
+  version = ''20140826-git'';
+
+  description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
+    sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
new file mode 100644
index 00000000000..110edbb9f18
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-utf-8'';
+  version = ''20111001-darcs'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
+    sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
new file mode 100644
index 00000000000..e80cbc99e8c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uiop'';
+  version = ''3.2.0'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
+    sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
new file mode 100644
index 00000000000..7797cb4e797
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''usocket'';
+  version = ''0.7.0.1'';
+
+  description = ''Universal socket library for Common Lisp'';
+
+  deps = [ args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
+    sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
new file mode 100644
index 00000000000..b1928c5bc77
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -0,0 +1,20 @@
+{pkgs, buildLispPackage, quicklisp-to-nix-packages}:
+{
+  iterate = x: {
+    overrides = x: {
+      configurePhase="buildPhase(){ true; }";
+    };
+  };
+  cl-fuse = x: {
+    propagatedBuildInputs = [pkgs.fuse];
+    overrides = x : {
+      configurePhase = ''
+        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
+        export makeFlags="$makeFlags LISP=common-lisp.sh"
+      '';
+    };
+  };
+  hunchentoot = x: {
+    propagatedBuildInputs = [pkgs.openssl];
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
new file mode 100644
index 00000000000..f68a6a37f8b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -0,0 +1,4 @@
+stumpwm
+cl-fuse
+esrap
+hunchentoot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
new file mode 100644
index 00000000000..99b038db961
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -0,0 +1,291 @@
+{stdenv, fetchurl, pkgs, clwrapper}:
+let quicklisp-to-nix-packages = rec {
+  inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+
+  callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
+  buildLispPackage = callPackage ./define-package.nix;
+  qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
+
+  "split-sequence" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."split-sequence" or (x: {}))
+       (import ./quicklisp-to-nix-output/split-sequence.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "trivial-garbage" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "trivial-gray-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-gray-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "babel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."babel" or (x: {}))
+       (import ./quicklisp-to-nix-output/babel.nix {
+         inherit fetchurl;
+         "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         
+       }));
+
+
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "uiop" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uiop" or (x: {}))
+       (import ./quicklisp-to-nix-output/uiop.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "usocket" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."usocket" or (x: {}))
+       (import ./quicklisp-to-nix-output/usocket.nix {
+         inherit fetchurl;
+         "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+         
+       }));
+
+
+  "rfc2388" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."rfc2388" or (x: {}))
+       (import ./quicklisp-to-nix-output/rfc2388.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "md5" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."md5" or (x: {}))
+       (import ./quicklisp-to-nix-output/md5.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "cl+ssl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl+ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl+ssl.nix {
+         inherit fetchurl;
+         "cffi" = quicklisp-to-nix-packages."cffi";
+         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+         "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+         "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+         "uiop" = quicklisp-to-nix-packages."uiop";
+         
+       }));
+
+
+  "flexi-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."flexi-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/flexi-streams.nix {
+         inherit fetchurl;
+         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+         
+       }));
+
+
+  "cl-fad" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-fad" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-fad.nix {
+         inherit fetchurl;
+         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         
+       }));
+
+
+  "cl-base64" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-base64" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-base64.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "chunga" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."chunga" or (x: {}))
+       (import ./quicklisp-to-nix-output/chunga.nix {
+         inherit fetchurl;
+         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+         
+       }));
+
+
+  "trivial-utf-8" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-utf-8" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-utf-8.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "iterate" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iterate" or (x: {}))
+       (import ./quicklisp-to-nix-output/iterate.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "trivial-backtrace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-backtrace" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-backtrace.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "bordeaux-threads" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."bordeaux-threads" or (x: {}))
+       (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
+         inherit fetchurl;
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         
+       }));
+
+
+  "cl-utilities" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-utilities" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-utilities.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "cffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi.nix {
+         inherit fetchurl;
+         "uiop" = quicklisp-to-nix-packages."uiop";
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+         "babel" = quicklisp-to-nix-packages."babel";
+         
+       }));
+
+
+  "clx" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clx" or (x: {}))
+       (import ./quicklisp-to-nix-output/clx.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "cl-ppcre" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ppcre" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ppcre.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "alexandria" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."alexandria" or (x: {}))
+       (import ./quicklisp-to-nix-output/alexandria.nix {
+         inherit fetchurl;
+         
+       }));
+
+
+  "hunchentoot" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hunchentoot" or (x: {}))
+       (import ./quicklisp-to-nix-output/hunchentoot.nix {
+         inherit fetchurl;
+         "chunga" = quicklisp-to-nix-packages."chunga";
+         "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+         "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+         "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+         "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+         "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+         "md5" = quicklisp-to-nix-packages."md5";
+         "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+         "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+         "usocket" = quicklisp-to-nix-packages."usocket";
+         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+         
+       }));
+
+
+  "esrap" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."esrap" or (x: {}))
+       (import ./quicklisp-to-nix-output/esrap.nix {
+         inherit fetchurl;
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         
+       }));
+
+
+  "cl-fuse" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-fuse" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-fuse.nix {
+         inherit fetchurl;
+         "cffi" = quicklisp-to-nix-packages."cffi";
+         "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+         "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+         "iterate" = quicklisp-to-nix-packages."iterate";
+         "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+         
+       }));
+
+
+  "stumpwm" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."stumpwm" or (x: {}))
+       (import ./quicklisp-to-nix-output/stumpwm.nix {
+         inherit fetchurl;
+         "alexandria" = quicklisp-to-nix-packages."alexandria";
+         "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+         "clx" = quicklisp-to-nix-packages."clx";
+         
+       }));
+
+
+}; in quicklisp-to-nix-packages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
new file mode 100644
index 00000000000..78e88d4b9fa
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -0,0 +1,8 @@
+  "<% @var name %>" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."<% @var name %>" or (x: {}))
+       (import ./quicklisp-to-nix-output/<% @var name %>.nix {
+         inherit fetchurl;
+         <% @loop deps %>"<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";
+         <% @endloop %>
+       }));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
new file mode 100644
index 00000000000..b54f555180d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''<% @var name %>'';
+  version = ''<% @var version %>'';
+
+  description = ''<% @var description %>'';
+
+  deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>];
+
+  src = fetchurl {
+    url = ''<% @var url %>'';
+    sha256 = ''<% @var sha256 %>'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
new file mode 100644
index 00000000000..ded802ca693
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -0,0 +1,124 @@
+; QuickLisp-to-Nix export
+; Requires QuickLisp to be loaded
+; Installs the QuickLisp version of all the packages processed (in the
+; QuickLisp instance it uses)
+
+(ql:quickload :cl-emb)
+(ql:quickload :external-program)
+(ql:quickload :cl-ppcre)
+(ql:quickload :md5)
+(ql:quickload :alexandria)
+
+(defun nix-prefetch-url (url)
+  (let*
+    ((stdout nil)
+     (stderr nil))
+    (setf
+      stdout
+      (with-output-to-string (so)
+        (setf
+          stderr
+          (with-output-to-string (se)
+            (external-program:run
+              "nix-prefetch-url"
+              (list url)
+              :search t :output so :error se)))))
+    (let*
+      ((path-line (first (last (cl-ppcre:split (format nil "~%") stderr))))
+       (path (cl-ppcre:regex-replace-all "path is .(.*)." path-line "\\1")))
+      (list
+        :sha256 (first (cl-ppcre:split (format nil "~%") stdout))
+        :path path
+        :md5 (string-downcase
+               (format nil "~{~16,2,'0r~}"
+                       (map 'list 'identity (md5:md5sum-file path))))))))
+
+(defun system-data (system)
+  (ql:quickload system)
+  (let*
+    ((asdf-system (asdf:find-system system))
+     (ql-system (ql-dist:find-system system))
+     (ql-release (ql-dist:release ql-system))
+     (url (ql-dist:archive-url ql-release))
+     (local-archive (ql-dist:local-archive-file ql-release))
+     (local-url (format nil "file://~a" (pathname local-archive)))
+     (archive-data
+       (progn
+         (ql-dist:ensure-local-archive-file ql-release)
+         (nix-prefetch-url local-url)))
+     (ideal-md5 (ql-dist:archive-md5 ql-release))
+     (file-md5 (getf archive-data :md5))
+     (raw-dependencies (asdf:system-depends-on asdf-system))
+     (dependencies (remove-if-not 'ql-dist:find-system raw-dependencies))
+     (deps (mapcar (lambda (x) (list :name x)) dependencies))
+     (name (string-downcase (format nil "~a" system)))
+     (description (asdf:system-description asdf-system))
+     (release-name (ql-dist:short-description ql-release))
+     (version (cl-ppcre:regex-replace-all
+                (format nil "~a-" name) release-name "")))
+    (assert (equal ideal-md5 file-md5))
+  (list
+    :system system
+    :description description
+    :sha256 (getf archive-data :sha256)
+    :url url
+    :md5 file-md5
+    :name name
+    :deps deps
+    :dependencies dependencies
+    :version version)))
+
+(defmacro this-file ()
+  (or *compile-file-truename*
+      *load-truename*))
+
+(defun nix-expression (system)
+  (cl-emb:execute-emb
+    (merge-pathnames #p"nix-package.emb" (this-file))
+    :env (system-data system)))
+(defun nix-invocation (system)
+  (cl-emb:execute-emb
+    (merge-pathnames #p"invocation.emb" (this-file))
+    :env (system-data system)))
+
+(defun systems-closure (systems)
+  (let*
+    ((seen (make-hash-table :test 'equal)))
+    (loop
+      with queue := systems
+      with res := nil
+      while queue
+      for next := (pop queue)
+      for deps := (getf (system-data next) :dependencies)
+      unless (gethash next seen) do
+      (progn
+        (push next res)
+        (setf queue (append queue deps)))
+      do (setf (gethash next seen) t)
+      finally (return res))))
+
+(defun ql-to-nix (target-directory)
+  (let*
+    ((systems
+       (cl-ppcre:split
+         (format nil "~%")
+         (alexandria:read-file-into-string
+           (format nil "~a/quicklisp-to-nix-systems.txt" target-directory))))
+     (closure (systems-closure systems))
+     (invocations
+       (loop for s in closure
+             collect (list :code (nix-invocation s)))))
+    (loop
+      for s in closure
+      do (alexandria:write-string-into-file
+           (nix-expression s)
+           (format nil "~a/quicklisp-to-nix-output/~a.nix" target-directory s)
+           :if-exists :supersede))
+    (alexandria:write-string-into-file
+      (cl-emb:execute-emb
+        (merge-pathnames
+          #p"top-package.emb"
+          (this-file))
+        :env (list :invocations invocations))
+      (format nil "~a/quicklisp-to-nix.nix" target-directory)
+      :if-exists :supersede)))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
new file mode 100644
index 00000000000..2cbe73c89ca
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgs, clwrapper}:
+let quicklisp-to-nix-packages = rec {
+  inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+
+  callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
+  buildLispPackage = callPackage ./define-package.nix;
+  qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
+<% @loop invocations %>
+<% @var code %>
+<% @endloop %>
+}; in quicklisp-to-nix-packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10d52275490..aa06bf990cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10387,6 +10387,12 @@ with pkgs;
   lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
   lispPackages = recurseIntoAttrs lispPackagesSBCL;
 
+  quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
+    inherit clwrapper;
+  };
+  quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp);
+  quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl);
+  quicklispPackages = quicklispPackagesSBCL;
 
   ### DEVELOPMENT / PERL MODULES
 

From ab0ea847333b122da2927afefd7448b07f8f9093 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 28 Mar 2017 19:25:02 -0400
Subject: [PATCH 0339/1744] libdc1394: patch bugs on darwin

One of these issues is in a platform-specific file for darwin, the
other may only be a breaker when using clang.
---
 .../libraries/libdc1394/darwin-fixes.patch    | 24 +++++++++++++++++++
 .../libraries/libdc1394/default.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/libdc1394/darwin-fixes.patch

diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch
new file mode 100644
index 00000000000..5356a111112
--- /dev/null
+++ b/pkgs/development/libraries/libdc1394/darwin-fixes.patch
@@ -0,0 +1,24 @@
+diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c
+--- libdc1394-2.2.5-old/dc1394/bayer.c	2016-10-11 02:19:10.000000000 -0400
++++ libdc1394-2.2.5-new/dc1394/bayer.c	2017-03-28 17:59:02.000000000 -0400
+@@ -775,7 +775,7 @@
+ {
+ 	uint8_t *outR, *outG, *outB;
+ 	register int i, j;
+-	uint tmp;
++	uint32_t tmp;
+ 	int st=sx*sy;
+ 	int p;
+ 	int sx2=sx<<1;
+diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c
+--- libdc1394-2.2.5-old/dc1394/macosx/capture.c	2016-12-20 08:10:34.000000000 -0500
++++ libdc1394-2.2.5-new/dc1394/macosx/capture.c	2017-03-28 17:58:38.000000000 -0400
+@@ -614,7 +614,7 @@
+     dc1394video_frame_t * frame_tmp = capture->frames + next;
+     char ch;
+ 
+-	if(craw->frames==NULL || craw->capture_is_set==0) {
++	if(craw->capture.frames==NULL || craw->capture_is_set==0) {
+ 		*frame=NULL;
+ 		return DC1394_CAPTURE_IS_NOT_SET;
+ 	}
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index c1d11ce87ee..036adcef74c 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux libraw1394
     ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
+
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/libdc1394/;
     description = "Capture and control API for IIDC compliant cameras";

From c87c0f21441a39d9dbfbd1c3a026075b02907dc2 Mon Sep 17 00:00:00 2001
From: Shawn Dellysse <sdellysse@gmail.com>
Date: Mon, 27 Mar 2017 20:18:28 -0400
Subject: [PATCH 0340/1744] messenger-for-desktop: init at 2.0.6

---
 lib/maintainers.nix                           |   1 +
 .../messenger-for-desktop/default.nix         | 104 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 107 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 087c2463957..4f5ee4b0801 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -462,6 +462,7 @@
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";
+  shawndellysse = "Shawn Dellysse <sdellysse@gmail.com>";
   sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>";
   sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";
diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
new file mode 100644
index 00000000000..f12a14c5c92
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
@@ -0,0 +1,104 @@
+{
+  stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat,
+  fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg
+}:
+
+with stdenv.lib;
+
+let
+
+  version = "2.0.6";
+
+  rpath = makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+    gnome2.GConf
+    gnome2.gdk_pixbuf
+    gnome2.gtk
+    gnome2.pango
+    libnotify
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb";
+        sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b";
+      }
+    else
+      throw "Messenger for Desktop is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "messenger-for-desktop-${version}";
+
+  inherit src;
+
+  buildInputs = [ dpkg ];
+  unpackPhase = "true";
+  buildCommand = ''
+    mkdir -p $out
+    dpkg -x $src $out
+
+    mv $out/usr/share $out/share
+    mv $out/opt/messengerfordesktop $out/libexec
+    rmdir $out/usr $out/opt
+
+    chmod -R g-w $out
+
+    # patch the binaries
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+      patchelf --set-rpath ${rpath}:$out/libexec $file || true
+    done
+
+    # add symlink to bin
+    mkdir -p $out/bin
+    ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/messengerfordesktop.desktop                 \
+      --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop 
+  '';
+
+  meta = {
+    description = "Bring messenger.com to your Linux desktop.";
+    longDescription = ''
+      A simple & beautiful desktop client for Facebook Messenger. Chat without
+      distractions on OS X, Windows and Linux. Not affiliated with Facebook.
+      This is NOT an official product.
+    '';
+    homepage = https://messengerfordesktop.org;
+    license = licenses.mit;
+    maintainers = [
+      maintainers.shawndellysse
+    ];
+    platforms = [
+      "x86_64-linux"
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa06bf990cc..6cac7bed908 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18392,4 +18392,6 @@ with pkgs;
   hy = callPackage ../development/interpreters/hy {};
 
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
+
+  messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 }

From 11e84f51b3efafc106904540935b9cbad0bd340b Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Wed, 29 Mar 2017 05:40:10 +0200
Subject: [PATCH 0341/1744] udunits: 2.2.23 -> 2.2.24

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

diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 09909f6546a..8fa974a95e2 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.23";
+    name = "udunits-2.2.24";
     src = fetchurl {
         url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr";
+        sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0";
     };
 
     nativeBuildInputs = [ bison flex file ];

From 750dca50243d6c7e6ddd98165c7e6a0edba180b2 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 01:51:05 -0500
Subject: [PATCH 0342/1744] ocaml-bitstring: git -> 2.1.0

---
 pkgs/development/ocaml-modules/bitstring/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 26b41a75146..d6909efe4a6 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchzip, buildOcaml, time, autoconf, automake }:
+{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }:
 
 buildOcaml rec {
   name = "bitstring";
-  version = "f1673f8"; 
-  src = fetchzip {
-    url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/bitstring/source-archive.zip;
-    sha256 = "03343yggwp3y483zj5axaalxlnl698xrjiv3hmd4c2s05g53iwas";
+  version = "2.1.0";
+  src = fetchurl {
+    url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz;
+    sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj";
   };
 
-  patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ];
+  patches = [ ./camlp4-git.patch ./srcdir.patch ];
 
   buildInputs = [time autoconf automake];
   doCheck = true;

From 5dda5a2ea2a9eaf78e70a003b68f606c520ce464 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 29 Mar 2017 05:24:58 +0000
Subject: [PATCH 0343/1744] ocamlPackages.bitstring: remove 2.0.4

---
 .../ocaml-modules/bitstring/2.0.4.nix         | 25 ------
 .../ocaml-modules/bitstring/camlp4.patch      | 84 -------------------
 .../ocaml-modules/bitstring/meta.patch        | 15 ----
 pkgs/top-level/ocaml-packages.nix             |  7 +-
 4 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/2.0.4.nix
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/camlp4.patch
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/meta.patch

diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
deleted file mode 100644
index 68ce28c40bd..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, buildOcaml, time}:
-
-buildOcaml rec {
-  name = "bitstring";
-  version = "2.0.4"; 
-  src = fetchurl {
-    url = "http://bitstring.googlecode.com/files/ocaml-bitstring-${version}.tar.gz";
-    sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5";
-  };
-
-  patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ];
-
-  buildInputs = [time];
-  doCheck = true;
-
-  createFindlibDestdir = true;
-  hasSharedObjects = true;
-
-  meta = with stdenv.lib; {
-    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
-    homepage = http://code.google.com/p/bitstring/;
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.maurer ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4.patch b/pkgs/development/ocaml-modules/bitstring/camlp4.patch
deleted file mode 100644
index 920c78007bb..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/camlp4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -rupN ocaml-bitstring-2.0.4.orig/camlp4.patch ocaml-bitstring-2.0.4/camlp4.patch
---- ocaml-bitstring-2.0.4.orig/camlp4.patch	1970-01-01 00:00:00.000000000 +0000
-+++ ocaml-bitstring-2.0.4/camlp4.patch	2015-06-10 18:06:54.016000000 +0000
-@@ -0,0 +1,31 @@
-+--- Makefile.in	2015-06-10 20:05:26.603000000 +0200
-++++ ../bs-old/Makefile.in	2013-05-14 17:42:32.000000000 +0200
-+@@ -40,10 +40,10 @@
-+ enable_coverage = @enable_coverage@
-+ 
-+ OCAMLCFLAGS	= -g
-+-OCAMLCPACKAGES	= -package camlp4
-++OCAMLCPACKAGES	=
-+ OCAMLCLIBS	= -linkpkg
-+ OCAMLOPTFLAGS	=
-+-OCAMLOPTPACKAGES = -package camlp4
-++OCAMLOPTPACKAGES =
-+ OCAMLOPTLIBS	= -linkpkg
-+ 
-+ ifneq ($(enable_coverage),no)
-+@@ -110,13 +110,12 @@
-+ 	  -I +camlp4 -pp camlp4of -c $<
-+ 
-+ pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
-+-	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+-	  bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-++	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+ 	  -pp camlp4of -c $< -o $@
-+ 
-+ bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
-+ 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
-+-	  $(OCAMLCPACKAGES) $(OCAMLCLIBS) \
-++	  $(OCAMLCLIBS) \
-+ 	  bitstring.cma bitstring_persistent.cma \
-+ 	  $< -o $@
-+ 
-diff -rupN ocaml-bitstring-2.0.4.orig/Makefile.in ocaml-bitstring-2.0.4/Makefile.in
---- ocaml-bitstring-2.0.4.orig/Makefile.in	2013-05-14 15:42:32.000000000 +0000
-+++ ocaml-bitstring-2.0.4/Makefile.in	2015-06-25 20:05:52.759000000 +0000
-@@ -40,10 +40,10 @@ pkg_extlib	= @OCAML_PKG_extlib@
- enable_coverage = @enable_coverage@
- 
- OCAMLCFLAGS	= -g
--OCAMLCPACKAGES	=
-+OCAMLCPACKAGES	= -package camlp4
- OCAMLCLIBS	= -linkpkg
- OCAMLOPTFLAGS	=
--OCAMLOPTPACKAGES =
-+OCAMLOPTPACKAGES = -package camlp4
- OCAMLOPTLIBS	= -linkpkg
- 
- ifneq ($(enable_coverage),no)
-@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_pers
- 	  -I +camlp4 -pp camlp4of -c $<
- 
- pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
--	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+	  bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
- 	  -pp camlp4of -c $< -o $@
- 
- bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
- 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
--	  $(OCAMLCLIBS) \
-+	  $(OCAMLCPACKAGES) $(OCAMLCLIBS) \
- 	  bitstring.cma bitstring_persistent.cma \
- 	  $< -o $@
- 
-@@ -158,13 +159,13 @@ tests/test.bmpp: create_test_pattern
- 
- create_test_pattern: create_test_pattern.cmo
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
--	  unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
--	  $(OCAMLCLIBS) \
-+	  unix.cma -I `$(OCAMLFIND) query camlp4` dynlink.cma camlp4lib.cma \
-+	  $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
- 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
- 
- create_test_pattern.cmo: create_test_pattern.ml
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
--	  unix.cma -I +camlp4 \
-+	  unix.cma -I `$(OCAMLFIND) query camlp4` $(OCAMLCPACKAGES) \
- 	  -I . -c $< -o $@
- 
- # Coverage of tests.
diff --git a/pkgs/development/ocaml-modules/bitstring/meta.patch b/pkgs/development/ocaml-modules/bitstring/meta.patch
deleted file mode 100644
index 78f44cbe15f..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/meta.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rupN ocaml-bitstring-2.0.4/META.in ocaml-bitstring-2.0.4.new/META.in
---- ocaml-bitstring-2.0.4/META.in	2013-05-14 17:42:32.000000000 +0200
-+++ ocaml-bitstring-2.0.4.new/META.in	2015-06-11 17:26:11.674000000 +0200
-@@ -15,8 +15,8 @@ package "persistent" (
- 
- package "syntax" (
-   version = "@PACKAGE_VERSION@"
--  requires = "camlp4"
-+  requires = "camlp4, bitstring.persistent, bitstring"
-   description = "Syntax extension: bitstring operators"
--  archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
--  archive(syntax,toploop) = "unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
-+  archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_bitstring.cmo"
-+  archive(syntax,toploop) = "pa_bitstring.cmo"
- )
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 41347a2607d..eba34692082 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -53,15 +53,12 @@ let
 
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
+    bitstring = callPackage ../development/ocaml-modules/bitstring { };
+
     bolt = callPackage ../development/ocaml-modules/bolt { };
 
     bos = callPackage ../development/ocaml-modules/bos { };
 
-    bitstring =
-      if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/bitstring { }
-      else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
-
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
 
     camlp4 =

From b4716ea7a2bd666b0c432aca43a2646fcf547b0c Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 01:53:21 -0500
Subject: [PATCH 0344/1744] camlzip: 1.06 -> 1.07

Fixes bug with modern zlib and large files
---
 .../ocaml-modules/camlzip/default.nix         | 21 ++++++++++--------
 .../ocaml-modules/camlzip/makefile_1_06.patch | 22 -------------------
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch

diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 731d66974c6..c1490c3bf19 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -4,16 +4,17 @@ let
   param =
     if stdenv.lib.versionAtLeast ocaml.version "4.02"
     then {
-      version = "1.06";
-      url = "1616";
-      sha256 = "0m6gyjw46w3qnhxfsyqyag42znl5lwargks7w7rfchr9jzwpff68";
-      patch = ./makefile_1_06.patch;
+      version = "1.07";
+      url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz";
+      sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g";
+      patches = [];
       installTargets = "install-findlib";
     } else {
       version = "1.05";
-      url = "1037";
+      download_id = "1037";
+      url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz";
       sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
-      patch = ./makefile_1_05.patch;
+      patches = [./makefile_1_05.patch];
       installTargets = "install";
     };
 in
@@ -22,13 +23,15 @@ stdenv.mkDerivation {
   name = "camlzip-${param.version}";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/${param.url}/camlzip-${param.version}.tar.gz";
+    inherit (param) url;
     inherit (param) sha256;
   };
 
-  buildInputs = [zlib ocaml findlib];
+  buildInputs = [ocaml findlib];
 
-  patches = [ param.patch ];
+  propagatedBuildInputs = [zlib];
+
+  inherit (param) patches;
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch b/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch
deleted file mode 100644
index ab0d3528c8c..00000000000
--- a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile	2016-06-10 14:37:48.000000000 +0200
-+++ b/Makefile	2016-06-23 05:10:26.000000000 +0200
-@@ -4,17 +4,13 @@
- ZLIB_LIB=-lz
- 
- # The directory containing the Zlib library (libz.a or libz.so)
--ZLIB_LIBDIR=/usr/lib
-+ZLIB_LIBDIR=@ZLIB_LIBDIR@
- # ZLIB_LIBDIR=/usr/local/lib
- 
- # The directory containing the Zlib header file (zlib.h)
--ZLIB_INCLUDE=/usr/include
-+ZLIB_INCLUDE=@ZLIB_INCLUDE@
- # ZLIB_INCLUDE=/usr/local/include
- 
--# Where to install the library.  By default: sub-directory 'zip' of
--# OCaml's standard library directory.
--INSTALLDIR=`$(OCAMLC) -where`/zip
--
- ### End of configuration section
- 
- OCAMLC=ocamlc -g -safe-string

From 078412521e4fbbec261b3a1a0a8296bfad0a47c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 29 Mar 2017 08:33:32 +0200
Subject: [PATCH 0345/1744] pythonPackages.pyudev: fix package

- the function loading the udev library was moved to another file
- the test runner did not work correctly, causing it to fail on Python
3.
- the test runner now works correctly, but there's a bunch of tests
failing and therefore tests are disabled. The package does seem to
function (as in, it can load the library again).
---
 pkgs/development/python-modules/pyudev.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
index 98607501e03..e9a3ecaac5b 100644
--- a/pkgs/development/python-modules/pyudev.nix
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, buildPythonPackage
-, six, systemd
+, six, systemd, pytest, mock, hypothesis, docutils
 }:
 
 buildPythonPackage rec {
@@ -12,12 +12,21 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace src/pyudev/_ctypeslib/libudev.py \
-      --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'"
+    substituteInPlace src/pyudev/_ctypeslib/utils.py \
+      --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'"
     '';
 
+  buildInputs = [ pytest mock hypothesis docutils ];
   propagatedBuildInputs = [ systemd six ];
 
+  checkPhase = ''
+    py.test
+  '';
+
+  # Bunch of failing tests
+  # https://github.com/pyudev/pyudev/issues/187
+  doCheck = false;
+
   meta = {
     homepage = "http://pyudev.readthedocs.org/";
     description = "Pure Python libudev binding";

From 3c7b0d37ae68b0db3b14efa079aa36742edb5714 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:05:54 -0500
Subject: [PATCH 0346/1744] ocamlgraph: 1.8.5 -> 1.8.7

---
 .../ocaml-modules/ocamlgraph/default.nix      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 4f7c7914201..f6379c8b5a7 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,24 +1,22 @@
-{stdenv, fetchurl, ocaml, findlib, ocamlPackages }:
+{stdenv, fetchurl, ocaml, findlib, lablgtk}:
 
 stdenv.mkDerivation rec {
   name = "ocamlgraph-${version}";
-  version = "1.8.5";
+  version = "1.8.7";
 
   src = fetchurl {
     url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
-    sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
+    sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz";
   };
 
-  buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
+  buildInputs = [ ocaml findlib lablgtk ];
+
+  patches = ./destdir.patch;
 
-  # some patching is required so that the lablgtk2 library is taken into account. It
-  # does not reside in a subdirectory of the default library path, hence:
-  # * configure looked in the wrong path
-  # * ocaml needs that directory and the stubs directory as -I flag
   postPatch = ''
-    sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
-    sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in
-    sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
+    sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
+    sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in
+    sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
   '';
 
   createFindlibDestdir = true;

From 4e47e8500584a6769ca4e8b0207f55d09222e803 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:06:38 -0500
Subject: [PATCH 0347/1744] piqi: missed propagated dependency

---
 pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 4 ++--
 pkgs/development/ocaml-modules/piqi/default.nix       | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 488a13ecf16..165a566b1b7 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}:
+{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
   };
 
-  buildInputs = [ocaml findlib piqi base64 camlp4];
+  buildInputs = [ ocaml findlib piqi camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 273cd8f1862..f8126f91d87 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -9,13 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
   };
 
-  buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64];
-  propagatedBuildInputs = [ulex xmlm easy-format];
+  buildInputs = [ocaml findlib camlp4 which ocaml_optcomp];
+  propagatedBuildInputs = [ulex xmlm easy-format base64];
 
   patches = [ ./no-ocamlpath-override.patch ];
 
   createFindlibDestdir = true;
 
+  buildPhase = ''
+    make
+    make -C piqilib piqilib.cma
+  '';
+
   installPhase = ''
     make install;
     make ocaml-install;

From 3e298d2536e4d0843cf5466bc19675a093e43434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Wed, 29 Mar 2017 09:48:05 +0200
Subject: [PATCH 0348/1744] non: 2016-12-07 -> 2017-03-29

---
 pkgs/applications/audio/non/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index a7252b9e28a..f4e5998c037 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2016-12-07";
+  version = "2017-03-29";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "754d113b0e3144a145d50bde8370ff2cae98169c";
-    sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0";
+    rev = "10c31e57291b6e42be53371567a722b62b32d220";
+    sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
   };
 
   buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile

From 2630e7384fa623337ca35a541eae371152d21768 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Mar 2017 11:13:06 -0300
Subject: [PATCH 0349/1744] qt5ct: add a nixos module to enable qt5ct

In order to use qt5ct (Qt5 Configuration Tool) to configure Qt5
settings (theme, font, icons, etc.) under DE/WM without Qt
integration, the environment variable QT_QPA_PLATFORMTHEME should be
set to "qt5ct".

It can be done automatically by this module, or by setting the
variable explicitly in the user or in the system configuration.
---
 nixos/modules/module-list.nix    |  1 +
 nixos/modules/programs/qt5ct.nix | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 nixos/modules/programs/qt5ct.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d1ccb2f15fc..af2f55c775c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -87,6 +87,7 @@
   ./programs/mtr.nix
   ./programs/nano.nix
   ./programs/oblogout.nix
+  ./programs/qt5ct.nix
   ./programs/screen.nix
   ./programs/shadow.nix
   ./programs/shell.nix
diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix
new file mode 100644
index 00000000000..550634e65be
--- /dev/null
+++ b/nixos/modules/programs/qt5ct.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.romildo ];
+
+  ###### interface
+  options = {
+    programs.qt5ct = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to enable the Qt5 Configuration Tool (qt5ct), a
+          program that allows users to configure Qt5 settings (theme,
+          font, icons, etc.) under desktop environments or window
+          manager without Qt integration.
+
+          Official home page: <link xlink:href="https://sourceforge.net/projects/qt5ct/">https://sourceforge.net/projects/qt5ct/</link>
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.programs.qt5ct.enable {
+    environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
+    environment.systemPackages = [ pkgs.qt5ct ];
+  };
+}

From 94c61cee6607a07a2a4ff8b5215246f9b8b71fe4 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 29 Mar 2017 17:57:46 +0800
Subject: [PATCH 0350/1744] Fix xgboost python 2.7 build.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2435c3a704e..e5f0a241178 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30681,12 +30681,11 @@ EOF
     propagatedBuildInputs = with self; [ scipy ];
     buildInputs = with self; [ nose ];
 
-    # Cannot be installed with Python 2.x, most likely due to the patch below.
-    disabled = !isPy3k;
-
     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"]

From 45788aeebed646938f525508bd75ca0319b668d9 Mon Sep 17 00:00:00 2001
From: Thomas Bach <t.bach@ilexius.de>
Date: Mon, 27 Mar 2017 10:21:19 +0200
Subject: [PATCH 0351/1744] haproxy: Provide LUA and PCRE support as
 configurable options

Both are enabled by default. Except for LUA on Darwin where
compilation fails. (See #23901.)
---
 pkgs/tools/networking/haproxy/default.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 88c750525b2..b7c8111751a 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, pkgs, fetchurl, openssl, zlib }:
+{ useLua ? false
+, usePcre ? false
+, stdenv, fetchurl
+, openssl, zlib, lua ? null, pcre ? null
+}:
+
+assert useLua -> lua != null;
+assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
@@ -12,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65";
   };
 
-  buildInputs = [ openssl zlib ];
+  buildInputs = [ openssl zlib ]
+    ++ stdenv.lib.optional useLua lua
+    ++ stdenv.lib.optional usePcre pcre;
 
   # TODO: make it work on bsd as well
   makeFlags = [
@@ -25,6 +34,13 @@ stdenv.mkDerivation rec {
   buildFlags = [
     "USE_OPENSSL=yes"
     "USE_ZLIB=yes"
+  ] ++ stdenv.lib.optionals usePcre [
+    "USE_PCRE=yes"
+    "USE_PCRE_JIT=yes"
+  ] ++ stdenv.lib.optionals useLua [
+    "USE_LUA=yes"
+    "LUA_LIB=${lua}/lib"
+    "LUA_INC=${lua}/include"
   ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc";
 
   meta = {

From ea80cd1f1101aa9553a6bdb9896e619593948cef Mon Sep 17 00:00:00 2001
From: Thomas Bach <t.bach@ilexius.de>
Date: Wed, 29 Mar 2017 12:27:50 +0200
Subject: [PATCH 0352/1744] haproxy: added fuzzy-id to the list of maintainers

---
 lib/maintainers.nix                       |  1 +
 pkgs/tools/networking/haproxy/default.nix | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e6c44aa81b1..9bc0c2fd5d2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -181,6 +181,7 @@
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
+  fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>";
   fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>";
   gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
   garbas = "Rok Garbas <rok@garbas.si>";
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index b7c8111751a..dda4452f644 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,10 +1,10 @@
-{ useLua ? false
-, usePcre ? false
+{ useLua ? !stdenv.isDarwin
+, usePcre ? true
 , stdenv, fetchurl
-, openssl, zlib, lua ? null, pcre ? null
+, openssl, zlib, lua5_3 ? null, pcre ? null
 }:
 
-assert useLua -> lua != null;
+assert useLua -> lua5_3 != null;
 assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl zlib ]
-    ++ stdenv.lib.optional useLua lua
+    ++ stdenv.lib.optional useLua lua5_3
     ++ stdenv.lib.optional usePcre pcre;
 
   # TODO: make it work on bsd as well
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     "USE_PCRE_JIT=yes"
   ] ++ stdenv.lib.optionals useLua [
     "USE_LUA=yes"
-    "LUA_LIB=${lua}/lib"
-    "LUA_INC=${lua}/include"
+    "LUA_LIB=${lua5_3}/lib"
+    "LUA_INC=${lua5_3}/include"
   ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc";
 
   meta = {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       hardware.
     '';
     homepage = http://haproxy.1wt.eu;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
     license = stdenv.lib.licenses.gpl2;
   };

From 1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:23:27 -0500
Subject: [PATCH 0353/1744] Revert "dropbox: use vendored Qt 5 libraries"

This reverts commit 9125bab708fcacbfbf7b77e44935c8ce254de3b9.

The vendored libraries have a problem with xkbcommon.
---
 .../networking/dropbox/default.nix            | 24 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 028ca2e7397..de419398ad5 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -3,6 +3,7 @@
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
 , libxml2, libxslt, ncurses, zlib
+, qtbase, qtdeclarative, qtwebkit
 }:
 
 # this package contains the daemon version of dropbox
@@ -43,6 +44,8 @@ let
       dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
       libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
       ncurses zlib
+
+      qtbase qtdeclarative qtwebkit
     ];
 
   desktopItem = makeDesktopItem {
@@ -70,8 +73,6 @@ in stdenv.mkDerivation {
   dontStrip = true; # already done
 
   installPhase = ''
-    runHook preInstall
-
     mkdir -p "$out/${appdir}"
     cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
 
@@ -80,6 +81,19 @@ in stdenv.mkDerivation {
     rm "$out/${appdir}/libGL.so.1"
     rm "$out/${appdir}/libX11-xcb.so.1"
 
+    rm "$out/${appdir}/libQt5Core.so.5"
+    rm "$out/${appdir}/libQt5DBus.so.5"
+    rm "$out/${appdir}/libQt5Gui.so.5"
+    rm "$out/${appdir}/libQt5Network.so.5"
+    rm "$out/${appdir}/libQt5OpenGL.so.5"
+    rm "$out/${appdir}/libQt5PrintSupport.so.5"
+    rm "$out/${appdir}/libQt5Qml.so.5"
+    rm "$out/${appdir}/libQt5Quick.so.5"
+    rm "$out/${appdir}/libQt5Sql.so.5"
+    rm "$out/${appdir}/libQt5WebKit.so.5"
+    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
+    rm "$out/${appdir}/libQt5XcbQpa.so.5"
+
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
 
@@ -92,13 +106,9 @@ in stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox
-
-    runHook postInstall
   '';
 
   fixupPhase = ''
-    runHook preFixup
-
     INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
     RPATH="${ldpath}:$out/${appdir}"
     getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
@@ -138,8 +148,6 @@ in stdenv.mkDerivation {
     done
 
     paxmark m $out/${appdir}/dropbox
-
-    runHook postFixup
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61ff664d446..a487579e41c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15403,7 +15403,7 @@ with pkgs;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  dropbox = callPackage ../applications/networking/dropbox { };
+  dropbox = libsForQt5.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 

From 3c96a536086ad4af2291eee1f1f7fb866eca39d0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:33:23 -0500
Subject: [PATCH 0354/1744] dropbox: wrap as any other Qt application

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index de419398ad5..9e1469d95b2 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -3,7 +3,7 @@
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
 , libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit
+, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
 }:
 
 # this package contains the daemon version of dropbox
@@ -68,8 +68,8 @@ in stdenv.mkDerivation {
 
   sourceRoot = ".dropbox-dist";
 
-  nativeBuildInputs = [ makeWrapper patchelf ];
   dontPatchELF = true; # patchelf invoked explicitly below
+  nativeBuildInputs = [ makeQtWrapper patchelf ];
   dontStrip = true; # already done
 
   installPhase = ''
@@ -102,7 +102,7 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/bin"
     RPATH="${ldpath}:$out/${appdir}"
-    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+    makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox

From c076b9326ffa66ef125d64cefe3ba68dac3d8399 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:33:46 -0500
Subject: [PATCH 0355/1744] dropbox: remove more useless vendored libraries

---
 .../applications/networking/dropbox/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9e1469d95b2..c262d901443 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -76,23 +76,16 @@ in stdenv.mkDerivation {
     mkdir -p "$out/${appdir}"
     cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
 
+    # Vendored libraries interact poorly with our graphics drivers
     rm "$out/${appdir}/libdrm.so.2"
     rm "$out/${appdir}/libffi.so.6"
     rm "$out/${appdir}/libGL.so.1"
     rm "$out/${appdir}/libX11-xcb.so.1"
 
-    rm "$out/${appdir}/libQt5Core.so.5"
-    rm "$out/${appdir}/libQt5DBus.so.5"
-    rm "$out/${appdir}/libQt5Gui.so.5"
-    rm "$out/${appdir}/libQt5Network.so.5"
-    rm "$out/${appdir}/libQt5OpenGL.so.5"
-    rm "$out/${appdir}/libQt5PrintSupport.so.5"
-    rm "$out/${appdir}/libQt5Qml.so.5"
-    rm "$out/${appdir}/libQt5Quick.so.5"
-    rm "$out/${appdir}/libQt5Sql.so.5"
-    rm "$out/${appdir}/libQt5WebKit.so.5"
-    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
-    rm "$out/${appdir}/libQt5XcbQpa.so.5"
+    # Cannot use vendored Qt libraries due to problem with xkbcommon
+    rm "$out/${appdir}/"libQt5*.so.5
+    rm "$out/${appdir}/qt.conf"
+    rm -fr "$out/${appdir}/plugins"
 
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications

From 096c72e255d30cffaf4f62eec94a7c29f72db6dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:35:21 -0500
Subject: [PATCH 0356/1744] dropbox: set INTERP for some DYN objects

---
 pkgs/applications/networking/dropbox/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index c262d901443..6b6c31d9db6 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -107,23 +107,15 @@ in stdenv.mkDerivation {
     getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
     find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do
         dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
-
         if [[ -n "$dynamic" ]]; then
-            type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
-
-            if [[ "$type" == "EXEC" ]]; then
 
+            if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
                 echo "patching interpreter path in $type $obj"
                 patchelf --set-interpreter "$INTERP" "$obj"
+            fi
 
-                echo "patching RPATH in $type $obj"
-                oldRPATH=$(patchelf --print-rpath "$obj")
-                patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
-
-                echo "shrinking RPATH in $type $obj"
-                patchelf --shrink-rpath "$obj"
-
-            elif [[ "$type" == "DYN" ]]; then
+            type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
+            if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
 
                 echo "patching RPATH in $type $obj"
                 oldRPATH=$(patchelf --print-rpath "$obj")

From 2e591bac0d24def29e0b1091758a5f2c35d777fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:35:52 -0500
Subject: [PATCH 0357/1744] dropbox: leave RPATH-shrinking to patchelf setup
 hook

---
 pkgs/applications/networking/dropbox/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 6b6c31d9db6..1a9a83ac957 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -68,7 +68,6 @@ in stdenv.mkDerivation {
 
   sourceRoot = ".dropbox-dist";
 
-  dontPatchELF = true; # patchelf invoked explicitly below
   nativeBuildInputs = [ makeQtWrapper patchelf ];
   dontStrip = true; # already done
 
@@ -121,9 +120,6 @@ in stdenv.mkDerivation {
                 oldRPATH=$(patchelf --print-rpath "$obj")
                 patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
 
-                echo "shrinking RPATH in $type $obj"
-                patchelf --shrink-rpath "$obj"
-
             else
 
                 echo "unknown ELF type \"$type\"; not patching $obj"

From 97518649fbd567a12a4cd54a10380fc45f3359be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 29 Mar 2017 07:36:10 -0500
Subject: [PATCH 0358/1744] dropbox: patch all files in output

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 1a9a83ac957..097ff84a704 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -104,7 +104,7 @@ in stdenv.mkDerivation {
     INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
     RPATH="${ldpath}:$out/${appdir}"
     getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
-    find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do
+    find "$out/${appdir}" -type f -print | while read obj; do
         dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
         if [[ -n "$dynamic" ]]; then
 

From bccc5ae82cef591b4f496bf58e1a104e448a9312 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 29 Mar 2017 07:42:16 -0500
Subject: [PATCH 0359/1744] swift: remove i686-linux from platforms, limit to
 x86-64-linux

Don't know that other platforms will fail but it seems likely
since we're using build profile intended for 64bit Ubuntu.
---
 pkgs/development/compilers/swift/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index da4482b463e..9764ede7281 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -258,7 +258,8 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/apple/swift";
     maintainers = with maintainers; [ jb55 dtzWill ];
     license = licenses.asl20;
-    platforms = platforms.linux;
+    # Swift doesn't support 32bit Linux, unknown on other platforms.
+    platforms = [ "x86_64-linux" ];
   };
 }
 

From 6f721ce534d18730a29e3b632274ed11e20b42fd Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Wed, 29 Mar 2017 15:47:51 +0200
Subject: [PATCH 0360/1744] suitesparse: add CUDA support

---
 .../science/math/suitesparse/default.nix      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 99f54cebddd..10fc7bf10ac 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gfortran, openblas }:
+{ stdenv, fetchurl, gfortran, openblas
+, enableCuda  ? false, cudatoolkit
+}:
 
 let
   version = "4.4.4";
@@ -28,6 +30,21 @@ stdenv.mkDerivation {
   + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
+  ''
+  + stdenv.lib.optionalString enableCuda ''
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
+        -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(GPU_CONFIG    =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
+        -e 's|^[[:space:]]*\(CUDA_PATH     =\)|CUDA_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
+        -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
+        -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
+        -e 's|^[[:space:]]*\(NV_20         =\)|NV_20 = -arch=sm_20 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV_30         =\)|NV_30 = -arch=sm_30 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV_35         =\)|NV_35 = -arch=sm_35 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
+        -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
   '';
 
   makeFlags = [

From 35dfdc9277511351cb757317e9cac0dc47473596 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Mar 2017 14:55:26 +0000
Subject: [PATCH 0361/1744] dd-agent: fix by adding uptime as dependency.

(cherry picked from commit f79be2cfa321617314aa253a8a6341a2f0ab7816)
---
 pkgs/tools/networking/dd-agent/default.nix |  1 +
 pkgs/top-level/python-packages.nix         | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index fa18e6c0ce5..10b7b47b3f4 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -20,6 +20,7 @@ let
       ipaddress
       backports_ssl_match_hostname
       docker_pycreds
+      uptime
     ];
 
     # due to flake8
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2435c3a704e..4d0b08c508b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26619,6 +26619,23 @@ in {
     };
   };
 
+  uptime = buildPythonPackage rec {
+    name = "uptime-${version}";
+    version = "3.0.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/u/uptime/${name}.tar.gz";
+      sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/Cairnarvon/uptime;
+      description = "Cross-platform way to retrieve system uptime and boot time";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ rob ];
+    };
+  };
+
   urlgrabber =  buildPythonPackage rec {
     name = "urlgrabber-3.9.1";
     disabled = isPy3k;

From 3e2335bc458a80926f24e048e0f790a45280cfd0 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Wed, 29 Mar 2017 08:55:17 -0700
Subject: [PATCH 0362/1744] opera: 43.0.2442.991 -> 44.0.2510.857

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

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 30e8af85b2a..2863ee876e7 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "43.0.2442.991";
+  version = "44.0.2510.857";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
-        sha256 = "0gd30b5gs2n4ypyn2ky2dlz648akmss2kixb8dqsy4yfd0mz7xqr";
+        sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "1pj2d3zhzyavv2gj3v5w07m14679k2vlbfk6sd9bjdy6g7fb5f7x";
+        sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

From ffd29517dd05e92dbc8a71d3dde835862b48f121 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 29 Mar 2017 18:03:44 +0200
Subject: [PATCH 0363/1744] spotify: unbreak

after the upgrade in 3c090f0e5a61b9b16a95059c6bfaa6a59abe2ccd
---
 pkgs/applications/audio/spotify/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 8821da4362b..1d1d0d6a6f0 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -42,6 +42,7 @@ let
     xorg.libXrender
     xorg.libXScrnSaver
     xorg.libXtst
+    xorg.libxcb
     zlib
   ];
 

From a57bcd38b49bfe9d048b12de3c839bc72b298d2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 29 Mar 2017 18:10:20 +0200
Subject: [PATCH 0364/1744] update-users-groups.pl: Keep track of deallocated
 UIDs/GIDs

When a user or group is revived, this allows it to be allocated the
UID/GID it had before.

A consequence is that UIDs and GIDs are no longer reused.

Fixes #24010.
---
 nixos/modules/config/update-users-groups.pl | 70 ++++++++++++++++-----
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 4ca8a83554a..ef5e6346f02 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -6,6 +6,21 @@ use JSON;
 make_path("/var/lib/nixos", { mode => 0755 });
 
 
+# Keep track of deleted uids and gids.
+my $uidMapFile = "/var/lib/nixos/uid-map";
+my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {};
+
+my $gidMapFile = "/var/lib/nixos/gid-map";
+my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {};
+
+
+sub updateFile {
+    my ($path, $contents, $perms) = @_;
+    write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents);
+    rename("$path.tmp", $path) or die;
+}
+
+
 sub hashPassword {
     my ($password) = @_;
     my $salt = "";
@@ -18,10 +33,10 @@ sub hashPassword {
 # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in
 # /etc/login.defs.
 sub allocId {
-    my ($used, $idMin, $idMax, $up, $getid) = @_;
+    my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_;
     my $id = $up ? $idMin : $idMax;
     while ($id >= $idMin && $id <= $idMax) {
-        if (!$used->{$id} && !defined &$getid($id)) {
+        if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) {
             $used->{$id} = 1;
             return $id;
         }
@@ -31,23 +46,36 @@ sub allocId {
     die "$0: out of free UIDs or GIDs\n";
 }
 
-my (%gidsUsed, %uidsUsed);
+my (%gidsUsed, %uidsUsed, %gidsPrevUsed, %uidsPrevUsed);
 
 sub allocGid {
-    return allocId(\%gidsUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) });
+    my ($name) = @_;
+    my $prevGid = $gidMap->{$name};
+    if (defined $prevGid && !defined $gidsUsed{$prevGid}) {
+        print STDERR "reviving group '$name' with GID $prevGid\n";
+        $gidsUsed{$prevGid} = 1;
+        return $prevGid;
+    }
+    return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) });
 }
 
 sub allocUid {
-    my ($isSystemUser) = @_;
+    my ($name, $isSystemUser) = @_;
     my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1);
-    return allocId(\%uidsUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) });
+    my $prevUid = $uidMap->{$name};
+    if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) {
+        print STDERR "reviving user '$name' with UID $prevUid\n";
+        $uidsUsed{$prevUid} = 1;
+        return $prevUid;
+    }
+    return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) });
 }
 
 
 # Read the declared users/groups.
 my $spec = decode_json(read_file($ARGV[0]));
 
-# Don't allocate UIDs/GIDs that are already in use.
+# Don't allocate UIDs/GIDs that are manually assigned.
 foreach my $g (@{$spec->{groups}}) {
     $gidsUsed{$g->{gid}} = 1 if defined $g->{gid};
 }
@@ -56,6 +84,11 @@ foreach my $u (@{$spec->{users}}) {
     $uidsUsed{$u->{uid}} = 1 if defined $u->{uid};
 }
 
+# Likewise for previously used but deleted UIDs/GIDs.
+$uidsPrevUsed{$_} = 1 foreach values %{$uidMap};
+$gidsPrevUsed{$_} = 1 foreach values %{$gidMap};
+
+
 # Read the current /etc/group.
 sub parseGroup {
     chomp;
@@ -114,16 +147,18 @@ foreach my $g (@{$spec->{groups}}) {
             }
         }
     } else {
-        $g->{gid} = allocGid if !defined $g->{gid};
+        $g->{gid} = allocGid($name) if !defined $g->{gid};
         $g->{password} = "x";
     }
 
     $g->{members} = join ",", sort(keys(%members));
     $groupsOut{$name} = $g;
+
+    $gidMap->{$name} = $g->{gid};
 }
 
 # Update the persistent list of declarative groups.
-write_file($declGroupsFile, { binmode => ':utf8' }, join(" ", sort(keys %groupsOut)));
+updateFile($declGroupsFile, join(" ", sort(keys %groupsOut)));
 
 # Merge in the existing /etc/group.
 foreach my $name (keys %groupsCur) {
@@ -140,8 +175,8 @@ foreach my $name (keys %groupsCur) {
 # Rewrite /etc/group. FIXME: acquire lock.
 my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }
     (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));
-write_file("/etc/group.tmp", { binmode => ':utf8' }, @lines);
-rename("/etc/group.tmp", "/etc/group") or die;
+updateFile($gidMapFile, encode_json($gidMap));
+updateFile("/etc/group", \@lines);
 system("nscd --invalidate group");
 
 # Generate a new /etc/passwd containing the declared users.
@@ -167,7 +202,7 @@ foreach my $u (@{$spec->{users}}) {
             $u->{uid} = $existing->{uid};
         }
     } else {
-        $u->{uid} = allocUid($u->{isSystemUser}) if !defined $u->{uid};
+        $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid};
 
         if (defined $u->{initialPassword}) {
             $u->{hashedPassword} = hashPassword($u->{initialPassword});
@@ -195,10 +230,12 @@ foreach my $u (@{$spec->{users}}) {
 
     $u->{fakePassword} = $existing->{fakePassword} // "x";
     $usersOut{$name} = $u;
+
+    $uidMap->{$name} = $u->{uid};
 }
 
 # Update the persistent list of declarative users.
-write_file($declUsersFile, { binmode => ':utf8' }, join(" ", sort(keys %usersOut)));
+updateFile($declUsersFile, join(" ", sort(keys %usersOut)));
 
 # Merge in the existing /etc/passwd.
 foreach my $name (keys %usersCur) {
@@ -214,8 +251,8 @@ foreach my $name (keys %usersCur) {
 # Rewrite /etc/passwd. FIXME: acquire lock.
 @lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }
     (sort { $a->{uid} <=> $b->{uid} } (values %usersOut));
-write_file("/etc/passwd.tmp", { binmode => ':utf8' }, @lines);
-rename("/etc/passwd.tmp", "/etc/passwd") or die;
+updateFile($uidMapFile, encode_json($uidMap));
+updateFile("/etc/passwd", \@lines);
 system("nscd --invalidate passwd");
 
 
@@ -242,5 +279,4 @@ foreach my $u (values %usersOut) {
     push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
 }
 
-write_file("/etc/shadow.tmp", { binmode => ':utf8', perms => 0600 }, @shadowNew);
-rename("/etc/shadow.tmp", "/etc/shadow") or die;
+updateFile("/etc/shadow", \@shadowNew, 0600);

From 5030fafdeeffbe5e74413457767065e9441d951c Mon Sep 17 00:00:00 2001
From: Aleksey Zhukov <drdaeman@drdaeman.pp.ru>
Date: Wed, 29 Mar 2017 19:53:40 +0300
Subject: [PATCH 0365/1744] pycharm-community: 2016.3.2 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e4589088e7f..e914b6964b5 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -256,12 +256,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2016.3.2";
+    version = "2017.1";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1";
+      sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
     };
     wmClass = "jetbrains-pycharm-ce";
   };

From 43dc7604c18cf0855390a7d1a82135ff790b023d Mon Sep 17 00:00:00 2001
From: Aleksey Zhukov <drdaeman@drdaeman.pp.ru>
Date: Wed, 29 Mar 2017 19:53:55 +0300
Subject: [PATCH 0366/1744] pycharm-professional: 2016.3.2 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e914b6964b5..df84a0188c9 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -268,12 +268,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2016.3.2";
+    version = "2017.1";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63";
+      sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
     };
     wmClass = "jetbrains-pycharm";
   };

From 1af70c331ce54687faa3e8aeb31b8dde43ac6b8e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 29 Mar 2017 19:18:26 +0200
Subject: [PATCH 0367/1744] Add a couple of quicklisp packages

---
 .../quicklisp-to-nix-output/chipz.nix         |  14 ++
 .../quicklisp-to-nix-output/drakma.nix        |  14 ++
 .../external-program.nix                      |  14 ++
 .../quicklisp-to-nix-output/puri.nix          |  14 ++
 .../lisp-modules/quicklisp-to-nix-systems.txt |   2 +
 .../lisp-modules/quicklisp-to-nix.nix         | 162 ++++++++++--------
 .../quicklisp-to-nix/invocation.emb           |   5 +-
 7 files changed, 148 insertions(+), 77 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
new file mode 100644
index 00000000000..02d8ba70baf
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''chipz'';
+  version = ''20160318-git'';
+
+  description = ''A library for decompressing deflate, zlib, and gzip data'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
+    sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
new file mode 100644
index 00000000000..a64a62078ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''drakma'';
+  version = ''2.0.2'';
+
+  description = ''Full-featured http/https client based on usocket'';
+
+  deps = [ args."puri" args."cl-base64" args."chunga" args."flexi-streams" args."cl-ppcre" args."chipz" args."usocket" args."cl+ssl" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
+    sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
new file mode 100644
index 00000000000..1b8378d5d55
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''external-program'';
+  version = ''20160825-git'';
+
+  description = '''';
+
+  deps = [ args."trivial-features" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
+    sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
new file mode 100644
index 00000000000..b86c4205407
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''puri'';
+  version = ''20150923-git'';
+
+  description = ''Portable Universal Resource Indentifier Library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
+    sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index f68a6a37f8b..c5c075f1ebd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -2,3 +2,5 @@ stumpwm
 cl-fuse
 esrap
 hunchentoot
+external-program
+drakma
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 99b038db961..da30352e718 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -11,7 +11,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."split-sequence" or (x: {}))
        (import ./quicklisp-to-nix-output/split-sequence.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -20,7 +19,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."trivial-garbage" or (x: {}))
        (import ./quicklisp-to-nix-output/trivial-garbage.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -29,7 +27,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."trivial-gray-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -38,18 +35,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-         "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         
-       }));
-
-
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-         
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -58,7 +45,30 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."uiop" or (x: {}))
        (import ./quicklisp-to-nix-output/uiop.nix {
          inherit fetchurl;
-         
+       }));
+
+
+  "chipz" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."chipz" or (x: {}))
+       (import ./quicklisp-to-nix-output/chipz.nix {
+         inherit fetchurl;
+       }));
+
+
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
        }));
 
 
@@ -67,8 +77,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."usocket" or (x: {}))
        (import ./quicklisp-to-nix-output/usocket.nix {
          inherit fetchurl;
-         "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-         
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
        }));
 
 
@@ -77,7 +86,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."rfc2388" or (x: {}))
        (import ./quicklisp-to-nix-output/rfc2388.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -86,7 +94,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."md5" or (x: {}))
        (import ./quicklisp-to-nix-output/md5.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -95,13 +102,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl+ssl" or (x: {}))
        (import ./quicklisp-to-nix-output/cl+ssl.nix {
          inherit fetchurl;
-         "cffi" = quicklisp-to-nix-packages."cffi";
-         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-         "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-         "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-         "uiop" = quicklisp-to-nix-packages."uiop";
-         
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -110,8 +116,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."flexi-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/flexi-streams.nix {
          inherit fetchurl;
-         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-         
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -120,9 +125,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-fad" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-fad.nix {
          inherit fetchurl;
-         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -131,7 +135,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-base64" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-base64.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -140,8 +143,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."chunga" or (x: {}))
        (import ./quicklisp-to-nix-output/chunga.nix {
          inherit fetchurl;
-         "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-         
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -150,7 +152,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."trivial-utf-8" or (x: {}))
        (import ./quicklisp-to-nix-output/trivial-utf-8.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -159,7 +160,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iterate" or (x: {}))
        (import ./quicklisp-to-nix-output/iterate.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -168,7 +168,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."trivial-backtrace" or (x: {}))
        (import ./quicklisp-to-nix-output/trivial-backtrace.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -177,8 +176,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."bordeaux-threads" or (x: {}))
        (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
          inherit fetchurl;
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -187,7 +185,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-utilities" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-utilities.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -196,11 +193,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cffi" or (x: {}))
        (import ./quicklisp-to-nix-output/cffi.nix {
          inherit fetchurl;
-         "uiop" = quicklisp-to-nix-packages."uiop";
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-         "babel" = quicklisp-to-nix-packages."babel";
-         
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "babel" = quicklisp-to-nix-packages."babel";
        }));
 
 
@@ -209,7 +205,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clx" or (x: {}))
        (import ./quicklisp-to-nix-output/clx.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -218,7 +213,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre.nix {
          inherit fetchurl;
-         
        }));
 
 
@@ -227,7 +221,31 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."alexandria" or (x: {}))
        (import ./quicklisp-to-nix-output/alexandria.nix {
          inherit fetchurl;
-         
+       }));
+
+
+  "drakma" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."drakma" or (x: {}))
+       (import ./quicklisp-to-nix-output/drakma.nix {
+         inherit fetchurl;
+           "puri" = quicklisp-to-nix-packages."puri";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+       }));
+
+
+  "external-program" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."external-program" or (x: {}))
+       (import ./quicklisp-to-nix-output/external-program.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -236,18 +254,17 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."hunchentoot" or (x: {}))
        (import ./quicklisp-to-nix-output/hunchentoot.nix {
          inherit fetchurl;
-         "chunga" = quicklisp-to-nix-packages."chunga";
-         "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-         "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-         "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-         "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-         "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-         "md5" = quicklisp-to-nix-packages."md5";
-         "rfc2388" = quicklisp-to-nix-packages."rfc2388";
-         "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-         "usocket" = quicklisp-to-nix-packages."usocket";
-         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-         
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
        }));
 
 
@@ -256,8 +273,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -266,13 +282,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-fuse" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-fuse.nix {
          inherit fetchurl;
-         "cffi" = quicklisp-to-nix-packages."cffi";
-         "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-         "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-         "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-         "iterate" = quicklisp-to-nix-packages."iterate";
-         "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
-         
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
 
@@ -281,10 +296,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
-         "alexandria" = quicklisp-to-nix-packages."alexandria";
-         "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-         "clx" = quicklisp-to-nix-packages."clx";
-         
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index 78e88d4b9fa..d3e8e91bfbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -2,7 +2,6 @@
     ((f: x: (x // (f x)))
        (qlOverrides."<% @var name %>" or (x: {}))
        (import ./quicklisp-to-nix-output/<% @var name %>.nix {
-         inherit fetchurl;
-         <% @loop deps %>"<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";
-         <% @endloop %>
+         inherit fetchurl;<% @loop deps %>
+           "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
        }));

From 2ab1c0611f2230e40c1c7866f83694ee4199f139 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Mar 2017 14:16:43 +0200
Subject: [PATCH 0368/1744] LTS Haskell 8.6

---
 .../configuration-hackage2nix.yaml            | 135 +++++++++---------
 1 file changed, 68 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b8ff822726d..5f6a7470a7c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
 
 default-package-overrides:
   - store < 0.4.1               # https://github.com/fpco/store/issues/104
-  # LTS Haskell 8.5
+  # LTS Haskell 8.6
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -163,7 +163,7 @@ default-package-overrides:
   - ansi-terminal ==0.6.2.3
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.3.0.2
-  - app-settings ==0.2.0.10
+  - app-settings ==0.2.0.11
   - appar ==0.1.4
   - arbtt ==0.9.0.12
   - arithmoi ==0.4.3.0
@@ -197,7 +197,7 @@ default-package-overrides:
   - b9 ==0.5.31
   - bake ==0.5
   - bank-holidays-england ==0.1.0.5
-  - base-compat ==0.9.1
+  - base-compat ==0.9.2
   - base-noprelude ==4.9.1.0
   - base-orphans ==0.5.4
   - base-prelude ==1.0.1.1
@@ -244,7 +244,7 @@ default-package-overrides:
   - bitcoin-tx ==0.13.1
   - bitcoin-types ==0.9.2
   - bits ==0.5
-  - bitx-bitcoin ==0.11.0.0
+  - bitx-bitcoin ==0.11.0.1
   - blake2 ==0.2.0
   - blank-canvas ==0.6
   - BlastHTTP ==1.2.1
@@ -253,7 +253,7 @@ default-package-overrides:
   - blaze-builder ==0.4.0.2
   - blaze-html ==0.8.1.3
   - blaze-markup ==0.7.1.1
-  - blaze-svg ==0.3.6
+  - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - BlogLiterately ==0.8.4.3
   - BlogLiterately-diagrams ==0.2.0.5
@@ -272,7 +272,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.4
-  - brick ==0.17.1
+  - brick ==0.17.2
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
@@ -300,13 +300,13 @@ default-package-overrides:
   - cabal-doctest ==1
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
-  - cabal-rpm ==0.11
+  - cabal-rpm ==0.11.1
   - cache ==0.1.0.0
   - cacophony ==0.9.2
   - cairo ==0.13.3.1
   - call-stack ==0.1.0
   - camfort ==0.901
-  - carray ==0.1.6.5
+  - carray ==0.1.6.6
   - cartel ==0.18.0.2
   - case-insensitive ==1.2.0.8
   - cased ==0.1.0.0
@@ -368,12 +368,12 @@ default-package-overrides:
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.1
   - clustering ==0.3.1
-  - cmark ==0.5.5
+  - cmark ==0.5.5.1
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
-  - cmdargs ==0.10.15
+  - cmdargs ==0.10.16
   - code-builder ==0.1.3
-  - code-page ==0.1.2
+  - code-page ==0.1.3
   - codo-notation ==0.5.2
   - colorful-monoids ==0.2.1.0
   - colour ==2.3.3
@@ -397,10 +397,10 @@ default-package-overrides:
   - configuration-tools ==0.2.15
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
-  - connection ==0.2.7
+  - connection ==0.2.8
   - connection-pool ==0.2.1
   - console-style ==0.0.2.1
-  - constraints ==0.9
+  - constraints ==0.9.1
   - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
   - contravariant ==1.4
@@ -512,9 +512,9 @@ default-package-overrides:
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
-  - disposable ==0.2.0.0
+  - disposable ==0.2.0.3
   - distance ==0.1.0.0
-  - distributed-closure ==0.3.3.0
+  - distributed-closure ==0.3.4.0
   - distributed-process ==0.6.6
   - distributed-process-simplelocalnet ==0.2.3.3
   - distributed-static ==0.3.5.0
@@ -605,7 +605,7 @@ default-package-overrides:
   - exceptional ==0.3.0.0
   - exceptions ==0.8.3
   - executable-hash ==0.2.0.4
-  - executable-path ==0.0.3
+  - executable-path ==0.0.3.1
   - exhaustive ==1.1.3
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
@@ -631,7 +631,7 @@ default-package-overrides:
   - feature-flags ==0.1.0.1
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
-  - fft ==0.1.8.4
+  - fft ==0.1.8.5
   - fgl ==5.5.3.1
   - fgl-arbitrary ==0.2.0.3
   - file-embed ==0.0.10
@@ -657,7 +657,7 @@ default-package-overrides:
   - focus ==0.1.5
   - fold-debounce ==0.2.0.5
   - fold-debounce-conduit ==0.1.0.5
-  - foldl ==1.2.3
+  - foldl ==1.2.4
   - foldl-statistics ==0.1.4.2
   - folds ==0.7.1
   - FontyFruity ==0.5.3.2
@@ -682,7 +682,7 @@ default-package-overrides:
   - fuzzcheck ==0.1.1
   - gd ==3000.7.3
   - Genbank ==1.0.3
-  - general-games ==1.0.3
+  - general-games ==1.0.5
   - generic-aeson ==0.2.0.8
   - generic-deriving ==1.11.1
   - generic-random ==0.4.1.0
@@ -705,6 +705,7 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.2.3
   - ghc-typelits-natnormalise ==0.5.2
   - ghcid ==0.6.6
+  - ghcjs-base-stub ==0.1.0.2
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-hplay ==0.3.4.2
   - ghcjs-perch ==0.3.3.1
@@ -892,8 +893,8 @@ default-package-overrides:
   - happy ==1.19.5
   - HaRe ==0.8.4.0
   - harp ==0.4.2
-  - hasbolt ==0.1.1.1
-  - hashable ==1.2.5.0
+  - hasbolt ==0.1.1.2
+  - hashable ==1.2.6.0
   - hashable-time ==0.2
   - hashmap ==1.3.2
   - hashtables ==1.2.1.0
@@ -972,7 +973,7 @@ default-package-overrides:
   - hjsonpointer ==1.1.0.2
   - hjsonschema ==1.5.0.1
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.5.0
+  - hlibsass ==0.1.6.0
   - hlint ==1.9.41
   - hmatrix ==0.18.0.0
   - hmatrix-gsl ==0.18.0.1
@@ -1004,7 +1005,7 @@ default-package-overrides:
   - hruby ==0.3.4.3
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
-  - hsass ==0.4.0
+  - hsass ==0.4.1
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
   - hsdns ==1.7
@@ -1013,21 +1014,21 @@ default-package-overrides:
   - hsemail ==1.7.7
   - HSet ==0.0.0
   - hset ==2.2.0
-  - hsexif ==0.6.1.0
+  - hsexif ==0.6.1.1
   - hsignal ==0.2.7.5
   - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.1
+  - HsOpenSSL ==0.11.4.4
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.2
+  - hspec ==2.4.3
   - hspec-attoparsec ==0.1.0.2
   - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.2
-  - hspec-discover ==2.4.2
+  - hspec-core ==2.4.3
+  - hspec-discover ==2.4.3
   - hspec-expectations ==0.8.2
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
@@ -1050,7 +1051,7 @@ default-package-overrides:
   - html-conduit ==1.2.1.1
   - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.5
+  - HTTP ==4000.3.6
   - http-api-data ==0.3.5
   - http-client ==0.5.6.1
   - http-client-openssl ==0.2.0.4
@@ -1060,7 +1061,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
-  - http-reverse-proxy ==0.4.3.2
+  - http-reverse-proxy ==0.4.3.3
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
   - http2 ==1.6.3
@@ -1134,7 +1135,7 @@ default-package-overrides:
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
-  - io-streams ==1.3.6.0
+  - io-streams ==1.3.6.1
   - io-streams-haproxy ==1.0.0.1
   - ip6addr ==0.5.2
   - iproute ==1.7.1
@@ -1143,7 +1144,7 @@ default-package-overrides:
   - irc-client ==0.4.4.1
   - irc-conduit ==0.2.2.1
   - irc-ctcp ==0.1.3.0
-  - irc-dcc ==2.0.0
+  - irc-dcc ==2.0.1
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
@@ -1201,10 +1202,10 @@ default-package-overrides:
   - language-javascript ==0.6.0.9
   - language-lua2 ==0.1.0.5
   - language-nix ==2.1.0.1
-  - language-puppet ==1.3.6
+  - language-puppet ==1.3.7
   - language-python ==0.5.4
   - language-thrift ==0.10.0.0
-  - large-hashable ==0.1.0.3
+  - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - lattices ==1.5.0
   - lazy-csv ==0.5.1
@@ -1248,7 +1249,7 @@ default-package-overrides:
   - lmdb ==0.2.5
   - loch-th ==0.2.1
   - log ==0.7
-  - log-base ==0.7
+  - log-base ==0.7.1
   - log-domain ==0.11
   - log-elasticsearch ==0.7
   - log-postgres ==0.7
@@ -1280,7 +1281,7 @@ default-package-overrides:
   - marvin-interpolate ==1.1
   - math-functions ==0.2.1.0
   - mathexpr ==0.3.0.0
-  - matplotlib ==0.4.1
+  - matplotlib ==0.4.3
   - matrices ==0.4.4
   - matrix ==0.3.5.0
   - matrix-market-attoparsec ==0.1.0.5
@@ -1290,7 +1291,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
-  - memory ==0.14.1
+  - memory ==0.14.2
   - MemoTrie ==0.6.7
   - mersenne-random ==1.0.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1312,7 +1313,7 @@ default-package-overrides:
   - mime-mail ==0.4.13.1
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
-  - mintty ==0.1
+  - mintty ==0.1.1
   - misfortune ==0.1.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
@@ -1326,7 +1327,7 @@ default-package-overrides:
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
   - monad-journal ==0.7.2
-  - monad-logger ==0.3.20.2
+  - monad-logger ==0.3.21
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.3.0
@@ -1338,7 +1339,7 @@ default-package-overrides:
   - monad-peel ==0.2.1.2
   - monad-primitive ==0.1
   - monad-products ==4.0.1
-  - monad-skeleton ==0.1.3
+  - monad-skeleton ==0.1.3.2
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.0
@@ -1433,7 +1434,7 @@ default-package-overrides:
   - ObjectName ==1.1.0.1
   - octane ==0.18.2
   - Octree ==0.5.4.3
-  - oeis ==0.3.8
+  - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
@@ -1482,7 +1483,7 @@ default-package-overrides:
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2
   - patat ==0.5.0.0
-  - path ==0.5.12
+  - path ==0.5.13
   - path-extra ==0.0.3
   - path-io ==1.2.2
   - path-pieces ==0.2.1
@@ -1536,7 +1537,7 @@ default-package-overrides:
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
   - plan-b ==0.2.0
-  - plot ==0.2.3.6
+  - plot ==0.2.3.7
   - plot-gtk ==0.2.0.4
   - plot-gtk-ui ==0.3.0.2
   - plot-gtk3 ==0.1.0.2
@@ -1557,8 +1558,8 @@ default-package-overrides:
   - postgresql-simple-migration ==0.1.9.0
   - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
-  - postgresql-typed ==0.5.0
-  - pqueue ==1.3.2
+  - postgresql-typed ==0.5.1
+  - pqueue ==1.3.2.2
   - pred-set ==0.0.1
   - prednote ==0.36.0.4
   - prefix-units ==0.2.0
@@ -1577,7 +1578,7 @@ default-package-overrides:
   - printcess ==0.1.0.3
   - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.4.2.1
+  - profiteur ==0.4.2.2
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1626,13 +1627,13 @@ default-package-overrides:
   - range ==0.1.2.0
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.3.3.0
-  - Rasterific ==0.7.1
+  - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.2.1
   - ratel ==0.3.2
   - ratel-wai ==0.2.0
   - rattletrap ==2.1.5
   - raw-strings-qq ==1.1
-  - rawfilepath ==0.1.0.0
+  - rawfilepath ==0.1.1
   - rawstring-qm ==0.2.3.0
   - rdf ==0.1.0.1
   - read-editor ==0.1.0.2
@@ -1670,7 +1671,7 @@ default-package-overrides:
   - reinterpret-cast ==0.1.0
   - relational-query ==0.8.3.5
   - relational-query-HDBC ==0.6.0.2
-  - relational-record ==0.1.6.1
+  - relational-record ==0.1.7.1
   - relational-schemas ==0.1.3.1
   - renderable ==0.2.0.1
   - repa ==3.4.1.2
@@ -1701,7 +1702,7 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.1.0
   - riak-protobuf ==0.22.0.0
-  - RNAlien ==1.3.1
+  - RNAlien ==1.3.7
   - rng-utils ==0.2.1
   - rose-trees ==0.0.4.3
   - rot13 ==0.1.0.2
@@ -1714,7 +1715,7 @@ default-package-overrides:
   - safe ==0.3.14
   - safe-exceptions ==0.1.5.0
   - safe-exceptions-checked ==0.1.0
-  - safecopy ==0.9.3
+  - safecopy ==0.9.3.1
   - SafeSemaphore ==0.10.1
   - sampling ==0.3.2
   - sandi ==0.4.0
@@ -1774,7 +1775,7 @@ default-package-overrides:
   - sets ==0.0.5.2
   - SHA ==1.6.4.2
   - shake ==0.15.11
-  - shake-language-c ==0.10.0
+  - shake-language-c ==0.10.1
   - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
   - shelly ==1.6.8.3
@@ -1805,7 +1806,7 @@ default-package-overrides:
   - smoothie ==0.4.2.6
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
-  - snap-core ==1.0.1.0
+  - snap-core ==1.0.2.0
   - snap-server ==1.0.1.1
   - snowflake ==0.1.1.1
   - soap ==0.2.3.3
@@ -1839,7 +1840,7 @@ default-package-overrides:
   - sqlite-simple ==0.4.13.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.0
-  - stache ==0.2.1
+  - stache ==0.2.2
   - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
   - state-plus ==0.1.2
@@ -1894,7 +1895,7 @@ default-package-overrides:
   - sundown ==0.6
   - superbuffer ==0.2.0.1
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.6
+  - svg-tree ==0.6.1
   - SVGFonts ==1.6.0.1
   - swagger ==0.3.0
   - swagger2 ==2.1.3
@@ -1959,7 +1960,7 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
-  - texmath ==0.9.3
+  - texmath ==0.9.4
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
@@ -2011,7 +2012,7 @@ default-package-overrides:
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
   - titlecase ==0.1.0.3
-  - tls ==1.3.9
+  - tls ==1.3.10
   - tls-debug ==0.4.4
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
@@ -2031,7 +2032,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.3.1
+  - turtle ==1.3.2
   - turtle-options ==0.1.0.4
   - twitter-feed ==0.2.0.11
   - type-aligned ==0.9.6
@@ -2078,7 +2079,7 @@ default-package-overrides:
   - unix-time ==0.3.7
   - Unixutils ==1.54.1
   - unlit ==0.4.0.0
-  - unordered-containers ==0.2.7.2
+  - unordered-containers ==0.2.8.0
   - uri-bytestring ==0.2.3.1
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
@@ -2090,7 +2091,7 @@ default-package-overrides:
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
   - utf8-string ==1.0.1.1
-  - utility-ht ==0.0.12
+  - utility-ht ==0.0.13
   - uu-interleaved ==0.2.0.0
   - uu-parsinglib ==2.9.1.1
   - uuid ==1.3.13
@@ -2112,7 +2113,7 @@ default-package-overrides:
   - vector-space ==0.10.4
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0.2
+  - vectortiles ==1.2.0.4
   - verbosity ==0.2.3.0
   - versions ==3.0.0
   - vhd ==0.2.2
@@ -2120,7 +2121,7 @@ default-package-overrides:
   - viewprof ==0.0.0.1
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
-  - void ==0.7.1
+  - void ==0.7.2
   - vty ==5.15
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
@@ -2130,7 +2131,7 @@ default-package-overrides:
   - wai-extra ==3.0.19.1
   - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
-  - wai-middleware-auth ==0.1.1.1
+  - wai-middleware-auth ==0.1.1.2
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2154,7 +2155,7 @@ default-package-overrides:
   - warp ==3.2.11.1
   - warp-tls ==3.2.3
   - wave ==0.1.4
-  - wavefront ==0.7.0.3
+  - wavefront ==0.7.1
   - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
@@ -2183,7 +2184,7 @@ default-package-overrides:
   - wire-streams ==0.1.1.0
   - with-location ==0.1.0
   - withdependencies ==0.2.4
-  - witherable ==0.1.3.3
+  - witherable ==0.1.3.4
   - witness ==0.4
   - wizards ==1.0.2
   - wl-pprint ==1.2
@@ -2212,7 +2213,7 @@ default-package-overrides:
   - x509-system ==1.6.4
   - x509-validation ==1.6.5
   - Xauth ==0.1
-  - xdcc ==1.1.3
+  - xdcc ==1.1.4
   - xdg-basedir ==0.2.2
   - xeno ==0.1
   - xenstore ==0.1.1
@@ -2247,7 +2248,7 @@ default-package-overrides:
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-hashdb ==1.6.0.1
-  - yesod-bin ==1.5.2.1
+  - yesod-bin ==1.5.2.2
   - yesod-core ==1.4.32
   - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0

From c356cd69c8eca5404cd65104ebf29246ec11617a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 26 Mar 2017 17:32:50 +0200
Subject: [PATCH 0369/1744] hackage2nix: disable broken builds

---
 .../configuration-hackage2nix.yaml            | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5f6a7470a7c..91460eb4019 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2738,6 +2738,7 @@ dont-distribute-packages:
   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 ]
+  axiom:                                        [ 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 ]
@@ -2976,6 +2977,7 @@ dont-distribute-packages:
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringreadp:                              [ 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 ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3259,6 +3261,7 @@ dont-distribute-packages:
   comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-socket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3657,6 +3660,7 @@ dont-distribute-packages:
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  disjoint-set-stateful:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   distance-of-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,6 +3803,7 @@ dont-distribute-packages:
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ 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:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3948,6 +3953,7 @@ dont-distribute-packages:
   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 ]
   FerryCore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Feval:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4120,6 +4126,7 @@ dont-distribute-packages:
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-javascript:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  g4ip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-of-life:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4212,6 +4219,7 @@ 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-usage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4270,6 +4278,9 @@ dont-distribute-packages:
   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 ]
+  glazier-react-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glazier-react:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glazier-react-widget:                         [ 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 ]
@@ -4288,8 +4299,11 @@ dont-distribute-packages:
   GlomeVec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-accelerate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-algorithms:                             [ 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-raster:                                 [ 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 ]
@@ -4580,6 +4594,7 @@ dont-distribute-packages:
   haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   harvest-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasbolt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HasCacBDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4762,6 +4777,7 @@ dont-distribute-packages:
   HCL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcltest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcoord:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcron:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hCsound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcube:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5072,6 +5088,7 @@ dont-distribute-packages:
   hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hriemann:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-graf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-hist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5395,6 +5412,7 @@ dont-distribute-packages:
   implicit-params:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   imports:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   impossible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imprevu-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5442,6 +5460,7 @@ dont-distribute-packages:
   intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ 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:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5569,6 +5588,7 @@ dont-distribute-packages:
   json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsontsv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsonxlsx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   juandelacosa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5715,6 +5735,8 @@ dont-distribute-packages:
   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:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5806,6 +5828,7 @@ dont-distribute-packages:
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libzfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5874,6 +5897,7 @@ dont-distribute-packages:
   llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-pure:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-quote:                           [ 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:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6016,6 +6040,7 @@ dont-distribute-packages:
   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 ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6044,6 +6069,7 @@ dont-distribute-packages:
   mech:                                         [ 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:                                     [ i686-linux ]
   mediabus-rtp:                                 [ i686-linux ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6115,6 +6141,7 @@ dont-distribute-packages:
   mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ml-w:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmtf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mnist-idx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6142,6 +6169,7 @@ dont-distribute-packages:
   MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                 [ 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 ]
@@ -6208,6 +6236,7 @@ dont-distribute-packages:
   mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mqtt-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mqtt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6263,6 +6292,7 @@ dont-distribute-packages:
   mustache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6395,10 +6425,15 @@ dont-distribute-packages:
   nntp:                                         [ 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-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-library:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                    [ 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 ]
@@ -6503,6 +6538,7 @@ dont-distribute-packages:
   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 ]
+  optparse-applicative-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6698,6 +6734,7 @@ dont-distribute-packages:
   pitchtrack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pixelated-avatar-generator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plailude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7056,6 +7093,7 @@ dont-distribute-packages:
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexdot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-genex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7068,6 +7106,7 @@ dont-distribute-packages:
   regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-with-pcre:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regional-pointers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7346,6 +7385,7 @@ dont-distribute-packages:
   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:                           [ 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-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7380,6 +7420,7 @@ dont-distribute-packages:
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   setdown:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  setoid:                                       [ 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 ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7734,6 +7775,7 @@ dont-distribute-packages:
   structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stutter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   styx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7997,6 +8039,7 @@ dont-distribute-packages:
   tkhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tkyprof:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tld:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tldr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   toboggan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8040,6 +8083,7 @@ dont-distribute-packages:
   transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TransformersStepByStep:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   transient-universe:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8116,6 +8160,7 @@ dont-distribute-packages:
   typed-process:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8627,12 +8672,19 @@ dont-distribute-packages:
   zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter-git:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter-hindent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter-hlint:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter-stack:                                 [ 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 ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip:                                          [ i686-linux ]
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ziptastic-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]

From b0136d38f614282085df1d602ed51bf98efb4770 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Mar 2017 17:36:33 +0100
Subject: [PATCH 0370/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1-8-geba56da from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/976e3524ee49ac45ff9d9db760d513730bd64047.
---
 .../haskell-modules/hackage-packages.nix      | 2609 ++++++++++-------
 1 file changed, 1477 insertions(+), 1132 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0b033b61b3a..d52c47bbe9e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.6";
-       sha256 = "81728f5329327dce9f586fad4fc6c8d2da30964f6f9b5a1309c4d20f9eed3ac5";
+       version = "1.0.7";
+       sha256 = "935925dabec9ebabc50947ffcb9c355639a2c1939bf68c712b3c32773a1c5685";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -3697,6 +3697,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Data-Angle" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Data-Angle";
+       version = "0.9";
+       sha256 = "e1540b8f8d3601ca48bf45a4867e4aad66036d98c53296724a6f620f89e16052";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/deadmanswitch/Data.Angle";
+       description = "Geometric angles";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Data-Hash-Consistent" = callPackage
     ({ mkDerivation, base, bytestring, digest, utf8-string, vector
      , vector-algorithms
@@ -3843,6 +3855,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "DeepDarkFantasy" = callPackage
+    ({ mkDerivation, base, mtl, random }:
+     mkDerivation {
+       pname = "DeepDarkFantasy";
+       version = "0.0.1.1";
+       sha256 = "c8e7e54cbddd22603d8df947229bc904f6129d2ed6286c1dd15a091a84089552";
+       libraryHaskellDepends = [ base mtl random ];
+       description = "A DSL for creating neural network";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "DefendTheKing" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP
      , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib
@@ -8276,31 +8299,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.5";
-       sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed";
-       revision = "2";
-       editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       homepage = "https://github.com/haskell/HTTP";
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_6" = 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
@@ -8321,7 +8319,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
@@ -8387,6 +8384,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_6_0_0" = callPackage
+    ({ mkDerivation, base, call-stack, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.6.0.0";
+       sha256 = "7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de";
+       libraryHaskellDepends = [ base call-stack deepseq ];
+       testHaskellDepends = [ base call-stack deepseq filepath ];
+       homepage = "https://github.com/hspec/HUnit#readme";
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -8824,6 +8835,7 @@ self: {
        homepage = "https://github.com/m4lvin/HasCacBDD";
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {CacBDD = null;};
 
   "HasGP" = callPackage
@@ -9576,27 +9588,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4.1";
-       sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd";
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_2" = callPackage
-    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
-     , time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.2";
-       sha256 = "dc937f7119c00b5c8cc96038185d6078bfd37f968ee4534e207b9aa393ee5767";
+       version = "0.11.4.4";
+       sha256 = "efb284b5a3c55c2c83ba3ede5810bdd1efabf1939b40317023a090046a6849eb";
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -10989,6 +10982,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Limit" = callPackage
@@ -12245,6 +12239,7 @@ self: {
        homepage = "https://github.com/choener/MutationOrder";
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MyPrimes" = callPackage
@@ -13820,8 +13815,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.11.0.0";
-       sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9";
+       version = "0.11.2.0";
+       sha256 = "923509dbb3b7ca051770c8f75a0e312640925c68eede5d5ad60f909548dbbdcb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14575,39 +14570,6 @@ self: {
      }) {};
 
   "RNAlien" = callPackage
-    ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
-     , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
-     , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
-     , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
-     , matrix, network, parsec, process, pureMD5, random, split
-     , Taxonomy, text, text-metrics, time, transformers, vector
-     , ViennaRNAParser
-     }:
-     mkDerivation {
-       pname = "RNAlien";
-       version = "1.3.1";
-       sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
-         ClustalParser cmdargs containers directory edit-distance
-         either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
-         http-conduit http-types hxt matrix network parsec process pureMD5
-         random Taxonomy text text-metrics transformers vector
-         ViennaRNAParser
-       ];
-       executableHaskellDepends = [
-         base biocore biofasta bytestring cassava cmdargs containers
-         directory either-unwrap filepath process random split text time
-         vector ViennaRNAParser
-       ];
-       description = "Unsupervized construction of RNA family models";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "RNAlien_1_3_7" = callPackage
     ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
      , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
@@ -14816,10 +14778,8 @@ self: {
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.7.1";
-       sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef";
-       revision = "1";
-       editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089";
+       version = "0.7.2.1";
+       sha256 = "7f6d86495a5a3aa72dd9c13f2dd8d93526cd5166889f39c5e7dde529cef44d74";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -15680,8 +15640,8 @@ self: {
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.4.5";
-       sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7";
+       version = "0.4.6";
+       sha256 = "11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19208,8 +19168,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-cuda";
-       version = "0.15.1.1";
-       sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d";
+       version = "0.16.0.0";
+       sha256 = "a5856713e24d2441823f3e53b7edaff3808b9757c687ca0c9fcf014a8001f7e5";
        libraryHaskellDepends = [
          accelerate array base binary bytestring cryptohash cuda directory
          fclabels filepath hashable hashtables language-c-quote
@@ -19256,8 +19216,8 @@ self: {
        pname = "accelerate-examples";
        version = "0.15.1.0";
        sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2";
-       revision = "1";
-       editedCabalFile = "77df83db322287253ea831448eced5c2adff5fe3edc413392cfb0eb8bdb0833b";
+       revision = "2";
+       editedCabalFile = "bcebd104b948308a60f7f5ff63cdacb7e4b07d84be73fe3a83c5ef641a2b41f4";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
@@ -19287,6 +19247,8 @@ self: {
        pname = "accelerate-fft";
        version = "0.15.1.0";
        sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702";
+       revision = "1";
+       editedCabalFile = "c283fc3767bf4281da75b958ae0c8a404ba0e26f7c7b746158355e6824e2d22d";
        libraryHaskellDepends = [
          accelerate accelerate-cuda base cuda cufft
        ];
@@ -20644,15 +20606,15 @@ self: {
      }) {};
 
   "aeson-diff" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
      , optparse-applicative, QuickCheck, quickcheck-instances
      , scientific, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-diff";
-       version = "1.1.0.0";
-       sha256 = "eeeb97b3f40485e7234427f192c66d044c0a25a1b7a24d91870e85fb226c1086";
+       version = "1.1.0.2";
+       sha256 = "2d7b0ce01d261690058c4c49d2b6e91f39f32920125a54adda9328fd9dfd7716";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20663,8 +20625,8 @@ self: {
          aeson base bytestring optparse-applicative text
        ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath Glob hlint QuickCheck
-         quickcheck-instances text unordered-containers vector
+         aeson base bytestring directory doctest filepath Glob hlint
+         QuickCheck quickcheck-instances text unordered-containers vector
        ];
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
@@ -21128,16 +21090,17 @@ self: {
 
   "affection" = callPackage
     ({ mkDerivation, babl, base, clock, containers, gegl, glib
-     , monad-loops, mtl, sdl2, text
+     , monad-loops, monad-parallel, mtl, sdl2, text
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.5";
-       sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7";
+       version = "0.0.0.6";
+       sha256 = "bf4993ebf47cabd6126feace83ce954443e06b5361931903a84c21437f388039";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         babl base clock containers gegl glib monad-loops mtl sdl2 text
+         babl base clock containers gegl glib monad-loops monad-parallel mtl
+         sdl2 text
        ];
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
@@ -21728,8 +21691,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.1.1.0";
-       sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86";
+       version = "0.2.0.0";
+       sha256 = "6ffbfafcc03ec27a825ec4f488ec4d0c7323e3e7f72463b4920fa2111ac2186e";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -21869,6 +21832,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "algebraic-graphs" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, extra
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "algebraic-graphs";
+       version = "0.0.4";
+       sha256 = "f59348961d74eeba4195cc7ee473ab5df2ad9c13a94f8c4e99401e4cb7480eb5";
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ base containers extra QuickCheck ];
+       benchmarkHaskellDepends = [ base containers criterion ];
+       homepage = "https://github.com/snowleopard/alga";
+       description = "A library for algebraic graph construction and transformation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "algebraic-prelude" = callPackage
     ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
      mkDerivation {
@@ -25349,8 +25328,8 @@ self: {
      }:
      mkDerivation {
        pname = "app-settings";
-       version = "0.2.0.10";
-       sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28";
+       version = "0.2.0.11";
+       sha256 = "6a14c69aca4e55cf27933475f5ae0ffead3a83f69f4233896eb13c41dccd50b1";
        libraryHaskellDepends = [
          base containers directory mtl parsec text
        ];
@@ -27526,15 +27505,22 @@ self: {
      }) {};
 
   "audacity" = callPackage
-    ({ mkDerivation, base, deepseq, utility-ht }:
+    ({ mkDerivation, base, bytestring, deepseq, directory
+     , explicit-exception, filepath, non-empty, storable-record
+     , storablevector, tagchup, transformers, utility-ht, xml-basic
+     }:
      mkDerivation {
        pname = "audacity";
-       version = "0.0";
-       sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
+       version = "0.0.1.1";
+       sha256 = "f1d333e19a70af7be5d0bc99640b2d8ebb29bf4c6f707cf5639f5a4fe041abc2";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base deepseq utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/audacity";
+       libraryHaskellDepends = [
+         base bytestring deepseq directory explicit-exception filepath
+         non-empty storable-record storablevector tagchup transformers
+         utility-ht xml-basic
+       ];
+       homepage = "http://hub.darcs.net/thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28659,6 +28645,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "axiom" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , ghcjs-perch, mtl, transformers, transient, transient-universe
+     }:
+     mkDerivation {
+       pname = "axiom";
+       version = "0.4.4";
+       sha256 = "84f8b0b843c67cd34c28f4fa3fac1ef6abbdf0b141615ca29d8cc7f292895002";
+       libraryHaskellDepends = [
+         base bytestring containers directory ghcjs-perch mtl transformers
+         transient transient-universe
+       ];
+       homepage = "https://github.com/transient-haskell/axiom";
+       description = "Web EDSL for running in browsers and server nodes using transient";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "axiomatic-classes" = callPackage
     ({ mkDerivation, base, containers, control-invariants, lens
      , monad-loops, mtl, portable-template-haskell-lens, QuickCheck
@@ -29326,18 +29330,6 @@ self: {
      }) {};
 
   "base-compat" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, unix }:
-     mkDerivation {
-       pname = "base-compat";
-       version = "0.9.1";
-       sha256 = "1033b48146b9ffcf4f7c75a321ea0b1525c1b662230f46c41957a1b501b6464a";
-       libraryHaskellDepends = [ base unix ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-compat_0_9_2" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
@@ -29347,7 +29339,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-generics" = callPackage
@@ -32800,30 +32791,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.0";
-       sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20";
-       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_11_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, directory
      , doctest, exceptions, hspec, http-client, http-client-tls
      , http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -32845,7 +32812,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
@@ -33384,18 +33350,6 @@ self: {
      }) {};
 
   "blaze-svg" = callPackage
-    ({ mkDerivation, base, blaze-markup, mtl }:
-     mkDerivation {
-       pname = "blaze-svg";
-       version = "0.3.6";
-       sha256 = "90dff37d78bffe5ee2587bab4281c158d5d1bd3901fe359bfdcc1cb6fb387179";
-       libraryHaskellDepends = [ base blaze-markup mtl ];
-       homepage = "https://github.com/deepakjois/blaze-svg";
-       description = "SVG combinator library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-svg_0_3_6_1" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -33405,7 +33359,6 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-textual" = callPackage
@@ -33485,8 +33438,10 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.2.0.0";
-       sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1";
+       version = "0.3.1.0";
+       sha256 = "d3ef2722c649903a26ddbc4d78bf8b7121d5f0bac84fc71ebad4c02e8f9e798c";
+       revision = "1";
+       editedCabalFile = "7ff3ee0a435f1d611c4ae67323913260a53fc3e22947c1db00bdf721bba7d45b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33495,7 +33450,7 @@ self: {
          uuid
        ];
        executableHaskellDepends = [
-         base bytestring cereal containers d-bus data-default-class
+         base bytestring cereal containers d-bus data-default-class hslogger
          microlens microlens-ghc microlens-th mtl random stm text
          transformers uuid
        ];
@@ -34702,27 +34657,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, containers, contravariant, deepseq, dlist
-     , microlens, microlens-mtl, microlens-th, stm, template-haskell
-     , text, text-zipper, transformers, vector, vty
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.17.1";
-       sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers contravariant deepseq dlist microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         vector vty
-       ];
-       homepage = "https://github.com/jtdaugherty/brick/";
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_17_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, deepseq, dlist
      , microlens, microlens-mtl, microlens-th, stm, template-haskell
      , text, text-zipper, transformers, vector, vty
@@ -34741,7 +34675,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;
      }) {};
 
   "brillig" = callPackage
@@ -35379,8 +35312,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.2.3.0";
-       sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c";
+       version = "0.2.4.0";
+       sha256 = "82433a4629c3ff2f538914100fc6747f6552c3497e4f64223dc9e24791967eef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35764,6 +35697,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-strict-builder" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, criterion
+     , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "bytestring-strict-builder";
+       version = "0.4.3";
+       sha256 = "d56f6bc42518565f9310eaa13ce1d35cf29879bdae995d9b893fd309c093d231";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups
+       ];
+       testHaskellDepends = [
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/bytestring-strict-builder";
+       description = "An efficient strict bytestring builder";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bytestring-time" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec
      , QuickCheck, text, time
@@ -36643,6 +36599,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabal-plan" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
+     , bytestring, containers, directory, filepath, mtl, text
+     }:
+     mkDerivation {
+       pname = "cabal-plan";
+       version = "0.1.0.0";
+       sha256 = "14181990a168231a74b5f277e33f55c3dce8b58e0cb9f7bd828cb06d82326eae";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring containers directory
+         filepath text
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base bytestring containers mtl text
+       ];
+       homepage = "https://github.com/hvr/cabal-plan";
+       description = "Library and utiltity for processing cabal's plan.json file";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "cabal-progdeps" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
@@ -36676,24 +36654,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.11";
-       sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_11_1" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, old-locale
      , process, time, unix
      }:
@@ -36709,7 +36669,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -37930,8 +37889,8 @@ self: {
      }:
      mkDerivation {
        pname = "carray";
-       version = "0.1.6.5";
-       sha256 = "6b253bd77cbe3cf1ed05ed60fa45f72f2ed5f6a0db5395ba26d58317b146786b";
+       version = "0.1.6.6";
+       sha256 = "9f50136c01e6a58e7195c5c72fa3e13a76c81933467ae74177dfcc8b91b142c0";
        libraryHaskellDepends = [
          array base binary bytestring ix-shapable QuickCheck syb
        ];
@@ -41314,8 +41273,8 @@ self: {
      }:
      mkDerivation {
        pname = "clean-home";
-       version = "0.0.4";
-       sha256 = "42307b2fdcf750a64cae131845e39964a47adb1e1b16ba19497f4ab907250969";
+       version = "0.0.5";
+       sha256 = "c1c54d4579c557936b455768bc4f0e52181d845b93aec01e14898d3533b0cfb0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41575,21 +41534,21 @@ self: {
      }) {};
 
   "clit" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
+    ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, data-default, directory, http-client, http-client-tls
      , http-types, lens, megaparsec, MissingH, optparse-applicative
      , split, text
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.4.0.3";
-       sha256 = "de42b5f458969a651aa4b40bb47f169eefbf2195f21f31586a39e249ecbc7d6c";
+       version = "0.4.0.6";
+       sha256 = "09463f9525829b9fa7d8cef461ae3d9ce163bdab04e9cfa0afc88318b0163493";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint authenticate-oauth base bytestring
-         data-default directory http-client http-client-tls http-types lens
-         megaparsec MissingH optparse-applicative split text
+         ansi-wl-pprint authenticate-oauth base bytestring data-default
+         directory http-client http-client-tls http-types lens megaparsec
+         MissingH optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
@@ -41916,8 +41875,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark";
-       version = "0.5.5";
-       sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2";
+       version = "0.5.5.1";
+       sha256 = "62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        benchmarkHaskellDepends = [
@@ -42031,8 +41990,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmdargs";
-       version = "0.10.15";
-       sha256 = "c80306ee127532fe4f852b690da470e7f5d8e58dce7122368c7e1b5b4629a55f";
+       version = "0.10.16";
+       sha256 = "fb194adb76f6f464ff38df8a6644c6ed7375cc7054278492145a705a87526fbd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42204,19 +42163,6 @@ self: {
      }) {};
 
   "code-page" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "code-page";
-       version = "0.1.2";
-       sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/code-page";
-       description = "Windows code page library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "code-page_0_1_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "code-page";
@@ -42227,7 +42173,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/code-page";
        description = "Windows code page library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec" = callPackage
@@ -42951,8 +42896,8 @@ self: {
      }:
      mkDerivation {
        pname = "comfort-graph";
-       version = "0.0.1";
-       sha256 = "81487e3610993d2939bf1777823357095645f710d1bee94dd4dd0fa052b428a0";
+       version = "0.0.2";
+       sha256 = "ec69c1718ac3f790953912262d261a10bd3515a3c809b0671e108c3958e8fb3e";
        libraryHaskellDepends = [
          base containers QuickCheck transformers utility-ht
        ];
@@ -42965,6 +42910,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "comic" = callPackage
+    ({ mkDerivation, aeson, base, text }:
+     mkDerivation {
+       pname = "comic";
+       version = "0";
+       sha256 = "e3c1b2ad7814d6ad252f7239e77c0b26457805086e72a0df8b9adc6bda1dc203";
+       libraryHaskellDepends = [ aeson base text ];
+       homepage = "https://oss.xkcd.com/";
+       description = "A format for describing comics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "comma" = callPackage
     ({ mkDerivation, attoparsec, base, QuickCheck, text }:
      mkDerivation {
@@ -43257,6 +43214,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compactmap" = callPackage
@@ -43293,6 +43251,8 @@ self: {
        pname = "compdata";
        version = "0.10.1";
        sha256 = "61572f134ec555695905c28db76c8f1f50df531337e56d5c74a16a52c58840cb";
+       revision = "1";
+       editedCabalFile = "beac5f52bb9a37fdfe168d354a51b915d01b8837c51394358347d35483f530eb";
        libraryHaskellDepends = [
          base containers deepseq derive mtl QuickCheck template-haskell
          th-expand-syns transformers tree-view
@@ -43507,18 +43467,27 @@ self: {
      }) {};
 
   "composite-aeson" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, base, basic-prelude
-     , composite-base, containers, contravariant, generic-deriving, lens
-     , profunctors, scientific, text, unordered-containers, vinyl
+    ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base
+     , basic-prelude, composite-base, containers, contravariant, Frames
+     , generic-deriving, hspec, lens, profunctors, QuickCheck
+     , scientific, tagged, template-haskell, text, time
+     , unordered-containers, vector, vinyl
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.1.0.0";
-       sha256 = "dbefe06c854762ec1f9fe0920cd9e2373caf20c49c1cbe9c0641d8c2ce36f288";
+       version = "0.2.0.0";
+       sha256 = "57319e561a9b8d52dcaff3ef5fda46de8128e39ed2a7bbae212b32f8652f21a6";
        libraryHaskellDepends = [
          aeson aeson-better-errors base basic-prelude composite-base
-         containers contravariant generic-deriving lens profunctors
-         scientific text unordered-containers vinyl
+         containers contravariant Frames generic-deriving lens profunctors
+         scientific tagged template-haskell text time unordered-containers
+         vector vinyl
+       ];
+       testHaskellDepends = [
+         aeson aeson-better-errors aeson-qq base basic-prelude
+         composite-base containers contravariant Frames generic-deriving
+         hspec lens profunctors QuickCheck scientific tagged
+         template-haskell text time unordered-containers vector vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "JSON for Vinyl/Frames records";
@@ -43526,21 +43495,42 @@ self: {
      }) {};
 
   "composite-base" = callPackage
-    ({ mkDerivation, base, basic-prelude, Frames, lens
-     , template-haskell, text, vinyl
+    ({ mkDerivation, base, basic-prelude, Frames, hspec, lens
+     , QuickCheck, template-haskell, text, vinyl
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.1.0.0";
-       sha256 = "18686bd5a539a5ca82be8ebc6ffb374578d9ff5334cf4959e00c1998e1cd18ea";
+       version = "0.2.0.0";
+       sha256 = "b18c0b286d4d8dfd8771df540dba9f8e9d0fc58484650d7434ed24e95d6428b1";
        libraryHaskellDepends = [
          base basic-prelude Frames lens template-haskell text vinyl
        ];
+       testHaskellDepends = [
+         base basic-prelude Frames hspec lens QuickCheck template-haskell
+         text vinyl
+       ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composite-ekg" = callPackage
+    ({ mkDerivation, base, basic-prelude, composite-base, ekg, ekg-core
+     , Frames, lens, text, vinyl
+     }:
+     mkDerivation {
+       pname = "composite-ekg";
+       version = "0.2.0.0";
+       sha256 = "bb836d7e938e18848ae3bae573c4e7ec47b4dfdd56e5ebfdb556033e1a62c095";
+       libraryHaskellDepends = [
+         base basic-prelude composite-base ekg ekg-core Frames lens text
+         vinyl
+       ];
+       homepage = "https://github.com/ConferHealth/composite#readme";
+       description = "EKG Metrics for Vinyl/Frames records";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "composite-opaleye" = callPackage
     ({ mkDerivation, base, basic-prelude, bytestring, composite-base
      , Frames, lens, opaleye, postgresql-simple, product-profunctors
@@ -43548,8 +43538,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.1.0.0";
-       sha256 = "1a2687c59106ebbd3d4ec0b8d9bd31f63b19d1a328a458bb05e9083c7a32008c";
+       version = "0.2.0.0";
+       sha256 = "e1f018cd598679e2a79d9ce4b99463cdf0a2720ff3df57be2e1025731417ef37";
        libraryHaskellDepends = [
          base basic-prelude bytestring composite-base Frames lens opaleye
          postgresql-simple product-profunctors profunctors template-haskell
@@ -43762,6 +43752,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concise" = callPackage
+    ({ mkDerivation, base, bytestring, lens, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "concise";
+       version = "0.1.0.0";
+       sha256 = "b5760c71b0968fb7e6aa683d81c1563776b7239f5fc5e2d819b6b0da6503413d";
+       libraryHaskellDepends = [ base bytestring lens text ];
+       testHaskellDepends = [
+         base bytestring lens QuickCheck quickcheck-instances tasty
+         tasty-quickcheck text
+       ];
+       homepage = "https://github.com/frasertweedal/hs-concise";
+       description = "Utilities for Control.Lens.Cons";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "concorde" = callPackage
     ({ mkDerivation, base, containers, process, safe, temporary }:
      mkDerivation {
@@ -44376,6 +44384,8 @@ self: {
        pname = "conduit-extra";
        version = "1.1.15";
        sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d";
+       revision = "1";
+       editedCabalFile = "94498d0883d567317ebd300ed3efcd1712ae0b444e35f50a941b3b62f57b164f";
        libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit directory
          exceptions filepath monad-control network primitive process
@@ -44902,8 +44912,8 @@ self: {
      }:
      mkDerivation {
        pname = "connection";
-       version = "0.2.7";
-       sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235";
+       version = "0.2.8";
+       sha256 = "70b1f44e8786320c18b26fc5d4ec115fc8ac016ba1f852fa8137f55d785a93eb";
        libraryHaskellDepends = [
          base byteable bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
@@ -45072,23 +45082,6 @@ self: {
      }) {};
 
   "constraints" = callPackage
-    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "constraints";
-       version = "0.9";
-       sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d";
-       libraryHaskellDepends = [
-         base binary deepseq ghc-prim hashable mtl transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/constraints/";
-       description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "constraints_0_9_1" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
      }:
@@ -45103,7 +45096,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -46476,6 +46468,8 @@ self: {
        pname = "cpphs";
        version = "1.20.4";
        sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e";
+       revision = "1";
+       editedCabalFile = "9304f73fec5750ee55b381f925d34c73cc1f660f5adaa6490d9d8dabf4ae1880";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48127,8 +48121,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.6.1";
-       sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1";
+       version = "0.7.0";
+       sha256 = "1e00985b6e618c873dc5ddf46c14397302fdf0fbeb13236597dfeb891877b5bb";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -48146,8 +48140,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.1.0";
-       sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885";
+       version = "5.2.0";
+       sha256 = "54431ddf02de0ce6205853eea81cd6177db50295ab6d840326c56f481897d6d2";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -48164,8 +48158,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.2.0";
-       sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475";
+       version = "0.3.0";
+       sha256 = "5836c4fe387f84e0d042b6a57bfa5969135c64c1840b6a989cabd6eefe8026f4";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
@@ -48181,8 +48175,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-opcodes";
-       version = "0.0.3.1";
-       sha256 = "c725eab85daca0de9dd689b40013f5af95089ef09539c009c58ebd020b161136";
+       version = "0.0.3.2";
+       sha256 = "44139db6b4ddbe2f5e632eebabd106b42eb11340dbf665f5162d9a29a2da7e27";
        libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
@@ -48197,8 +48191,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.1.0.0";
-       sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866";
+       version = "0.2.0.0";
+       sha256 = "282e20fe3a1272f56b3376fa3d8789a657d21fee8a266843ca16d5256ba21cc6";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim hashable temporal-media transformers
@@ -48213,8 +48207,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.7.0";
-       sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870";
+       version = "0.0.8.0";
+       sha256 = "394811198d15d102542d4d34d3d9536e0854c5c5b0352778c1866564795c2fa2";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -48586,10 +48580,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.7.5.2";
-       sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6";
-       revision = "1";
-       editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee";
+       version = "0.7.5.3";
+       sha256 = "c6cf3a3047d13042f81b822c54683fedb989fe844b3f8e528ecda29da0f7a7f5";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -48859,6 +48851,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cutter" = callPackage
+    ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "cutter";
+       version = "0.0";
+       sha256 = "117319c36a20efea6d9edd0a8d902e37ec0386512f2eb8a6e5563411c00c6ac2";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring explicit-exception spreadsheet utility-ht
+       ];
+       description = "Cut files according to a position list";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cv-combinators" = callPackage
     ({ mkDerivation, allocated-processor, base, HOpenCV, vector-space
      }:
@@ -50547,6 +50556,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-msgpack-types" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, hashable
+     , QuickCheck, text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack-types";
+       version = "0.0.1";
+       sha256 = "529f139f089643a240c6e139b76c4ca1f18bce24dd352615584ebf041e94a898";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq hashable QuickCheck text
+         unordered-containers vector void
+       ];
+       homepage = "http://msgpack.org/";
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-named" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, text }:
      mkDerivation {
@@ -53536,8 +53562,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.0.1";
        sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
-       revision = "1";
-       editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8";
+       revision = "2";
+       editedCabalFile = "f48239089189d320f3f48f25d2381f5d1e931ed7cdbdd70eb2ce246a9d04fda5";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -55030,6 +55056,7 @@ self: {
        homepage = "https://github.com/clintonmead/disjoint-set-stateful";
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -55071,28 +55098,15 @@ self: {
      }) {};
 
   "disposable" = callPackage
-    ({ mkDerivation, base, dlist }:
-     mkDerivation {
-       pname = "disposable";
-       version = "0.2.0.0";
-       sha256 = "d931d76f4a6ce0596f82cc7ae608cd43ea28bae5e6b0864e632b70ac2fc1e684";
-       libraryHaskellDepends = [ base dlist ];
-       homepage = "https://github.com/louispan/disposable#readme";
-       description = "Allows storing different resource-releasing actions together";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "disposable_0_2_0_1" = callPackage
     ({ mkDerivation, base, dlist, ghcjs-base-stub }:
      mkDerivation {
        pname = "disposable";
-       version = "0.2.0.1";
-       sha256 = "0b033cad06890ad3aed574f7980efef238795fdf6b51707e53908397e3c9bbd3";
+       version = "0.2.0.3";
+       sha256 = "6d1b6d12d1f742f204effb46c204a596cd3aeeae42bebacb86c37e60db202351";
        libraryHaskellDepends = [ base dlist ghcjs-base-stub ];
        homepage = "https://github.com/louispan/disposable#readme";
        description = "Allows storing different resource-releasing actions together";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dist-upload" = callPackage
@@ -55143,8 +55157,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-closure";
-       version = "0.3.3.0";
-       sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f";
+       version = "0.3.4.0";
+       sha256 = "efb5bb1afca02c9ae4df081cb9f5665e4f9ba4273270250425c229f59970f2b0";
        libraryHaskellDepends = [
          base binary bytestring constraints syb template-haskell
        ];
@@ -55244,8 +55258,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.2.0";
-       sha256 = "de26c3cfcf8c290c0ffd8f8fa330cdd85c421e237dc0ce0530ede71a58b09b15";
+       version = "0.2.1";
+       sha256 = "1be8b6ea3468b063b3e30fc6cb027c3293373eedb073c70894ac21d937f52d93";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras exceptions
@@ -55348,6 +55362,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process-fsm" = callPackage
+    ({ mkDerivation, ansi-terminal, base, binary, bytestring
+     , containers, data-accessor, deepseq, distributed-process
+     , distributed-process-client-server, distributed-process-extras
+     , distributed-process-systest, distributed-static, exceptions
+     , fingertree, ghc-prim, hashable, HUnit, mtl, network
+     , network-transport, network-transport-tcp, QuickCheck, rematch
+     , stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "distributed-process-fsm";
+       version = "0.0.1";
+       sha256 = "c639ad24d035b47df926deec89b92243058503d7852ee905df2bb6fb00eb60bb";
+       libraryHaskellDepends = [
+         base binary containers deepseq distributed-process
+         distributed-process-client-server distributed-process-extras
+         exceptions mtl stm time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         ansi-terminal base binary bytestring containers data-accessor
+         deepseq distributed-process distributed-process-extras
+         distributed-process-systest distributed-static fingertree ghc-prim
+         hashable HUnit mtl network network-transport network-transport-tcp
+         QuickCheck rematch stm test-framework test-framework-hunit
+         test-framework-quickcheck2 time transformers unordered-containers
+       ];
+       homepage = "http://github.com/haskell-distributed/distributed-process-fsm";
+       description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process-lifted" = callPackage
     ({ mkDerivation, base, binary, deepseq, distributed-process
      , distributed-process-monad-control, HUnit, lifted-base
@@ -56134,20 +56181,26 @@ self: {
      }) {};
 
   "docker" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
-     , containers, data-default-class, http-client, http-client-tls
-     , http-types, lens, lens-aeson, mtl, network, process, QuickCheck
-     , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time, tls
-     , transformers, unordered-containers, x509, x509-store, x509-system
+    ({ 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, x509, x509-store, x509-system, zlib
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.3.0.1";
-       sha256 = "410054ae9a047caff47af15a72d26a699b500f59cca3d6a66f54a5fc505a4ec7";
+       version = "0.4.0.0";
+       sha256 = "61f68e9e1335e7d625b2c7476619f3f4dba7e67faf9738d26e9b73b89cf18f39";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         http-client http-types mtl network scientific text time tls
-         unordered-containers x509 x509-store x509-system
+         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
+         x509 x509-store x509-system zlib
        ];
        testHaskellDepends = [
          aeson base bytestring connection containers http-client
@@ -57164,6 +57217,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dsc" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, hspec
+     , QuickCheck, SimpleAES, string-conversions
+     }:
+     mkDerivation {
+       pname = "dsc";
+       version = "0.2.0";
+       sha256 = "ef44a52479a8945abe392192cde1cb09211b25e0afe1aa949dc0589ec922d513";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring SimpleAES string-conversions
+       ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring hspec QuickCheck SimpleAES
+         string-conversions
+       ];
+       homepage = "https://github.com/qoelet/dsc#readme";
+       description = "Helper functions for setting up Double Submit Cookie defense for forms";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dsh-sql" = callPackage
     ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring
      , bytestring-lexing, containers, Decimal, DSH, either, HDBC
@@ -58629,21 +58702,21 @@ self: {
 
   "egison" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
-     , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit
-     , monad-parallel, mtl, parsec, process, random, regex-tdfa
-     , test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector
+     , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl
+     , parallel, parsec, process, random, regex-tdfa, test-framework
+     , test-framework-hunit, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.6.4";
-       sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3";
+       version = "3.6.5";
+       sha256 = "56ffcb0beb846026eb73cbf541c1b6e287daa13e13f8698be4ad251fcabcb4b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers directory ghc ghc-paths haskeline
-         monad-parallel mtl parsec process random regex-tdfa text
-         transformers unordered-containers vector
+         array base containers directory ghc ghc-paths haskeline mtl
+         parallel parsec process random regex-tdfa text transformers
+         unordered-containers vector
        ];
        executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
@@ -59532,6 +59605,7 @@ self: {
        homepage = "http://github.com/ucsd-progsys/elsa";
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emacs-keys" = callPackage
@@ -60454,8 +60528,8 @@ self: {
      }:
      mkDerivation {
        pname = "equal-files";
-       version = "0.0.5.2";
-       sha256 = "1c391e4f2e813d5aaaa77c849ce96f070fd0846d192fd0784fdf021075ebc91e";
+       version = "0.0.5.3";
+       sha256 = "e5b785c286c557c57dba7107d913b220781aa2549ba4b7685da494b20a0172aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60909,6 +60983,8 @@ self: {
        pname = "esqueleto";
        version = "2.5.1";
        sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9";
+       revision = "1";
+       editedCabalFile = "d612bc43e57e7d69561a7d88ad5cb564999c202ddaffe8460bff1979402710b8";
        libraryHaskellDepends = [
          base blaze-html bytestring conduit monad-logger persistent
          resourcet tagged text transformers unordered-containers
@@ -61329,8 +61405,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.1";
-       sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848";
+       version = "0.8.2.2";
+       sha256 = "20681dea13cfc53e4b8e0b27c4e8ec62462a0c0886a797eb773370db1ca0e00e";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -61727,8 +61803,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, unix }:
      mkDerivation {
        pname = "executable-path";
-       version = "0.0.3";
-       sha256 = "8c7215ed4c3cd558f89dc862d21cf9dab3c6b762f4f90c0c1be9e3141c46e5c9";
+       version = "0.0.3.1";
+       sha256 = "9cc742b6d40a487b3af38dca6852ca3b50a0db94d42fe819576c84beb5adbc6f";
        libraryHaskellDepends = [ base directory filepath unix ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Finding out the full path of the executable";
@@ -63300,6 +63376,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.2";
        sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0";
+       revision = "1";
+       editedCabalFile = "9e2c00e02216a9ba54f4798c9c68e88b0b94440e9ebd583d126404e8f7fe8c90";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -63412,6 +63490,8 @@ self: {
        pname = "feed";
        version = "0.3.12.0";
        sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942";
+       revision = "1";
+       editedCabalFile = "f4f8a8372bb2337c23c91e9fb5e29b379def01dba7234db0e44b9e753c25cc8c";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -63707,6 +63787,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {raptor = null;};
 
+  "fernet" = callPackage
+    ({ mkDerivation, aeson, base, binary, byteable, bytestring
+     , cryptonite, HUnit, memory, optparse-applicative, QuickCheck
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, time, unix
+     }:
+     mkDerivation {
+       pname = "fernet";
+       version = "0.1.0.0";
+       sha256 = "3ed511803b0754f56948dd172888ad51314cfb41ea029f92306d89b03dac1119";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary byteable bytestring cryptonite memory time
+       ];
+       executableHaskellDepends = [
+         base bytestring memory optparse-applicative time unix
+       ];
+       testHaskellDepends = [
+         aeson base bytestring HUnit memory QuickCheck tasty tasty-golden
+         tasty-hunit tasty-quickcheck time
+       ];
+       homepage = "https://github.com/rvl/fernet-hs";
+       description = "Generate and verify HMAC-based authentication tokens";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fez-conf" = callPackage
     ({ mkDerivation, base, containers, regex-compat }:
      mkDerivation {
@@ -63813,8 +63920,8 @@ self: {
      }:
      mkDerivation {
        pname = "fft";
-       version = "0.1.8.4";
-       sha256 = "2ea96d3150c1fca6ae2d8f0cead263ea1deddc0be18727a0cf4030f2ef07e1b4";
+       version = "0.1.8.5";
+       sha256 = "fa290a4d7e2f356237e8d450a5a945cf2bde1b281b08a703d101ccc2e959aa1f";
        libraryHaskellDepends = [
          array base carray ix-shapable storable-complex syb transformers
        ];
@@ -65502,8 +65609,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.4";
-       sha256 = "a512cfb0cdad3873c4457eec90c25e7e8a8042e6b98fedb50d883235a55711e3";
+       version = "0.5.1.5";
+       sha256 = "74cdfdc677fe52b1c551fed125a7fb38b3858e0256be2c512929a9cd0c3d45f0";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -65781,8 +65888,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.2.3";
-       sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25";
+       version = "1.2.4";
+       sha256 = "1c9777b172422aa0a184a44fdd20ee74f2d5e9d735b127fcc7ee1e61647ce3b5";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
@@ -67286,8 +67393,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday-juicypixels";
-       version = "0.1.2";
-       sha256 = "2f8fca7cf49c86af592691bdaaada94ae768a9e054956759a860c9b59ae16ed1";
+       version = "0.1.2.1";
+       sha256 = "ca861884ede7a37567fc291e8e98515f3ec5cc8dfc0200944e5fd5fa49251af4";
        libraryHaskellDepends = [ base friday JuicyPixels vector ];
        testHaskellDepends = [
          base bytestring file-embed friday hspec JuicyPixels
@@ -68295,6 +68402,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "g4ip" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "g4ip";
+       version = "0.1.0.0";
+       sha256 = "fc280273fd9e6324d1b304bf553ae43f69202ae8619a74fa2b4bd7fa069ec086";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/cacay/G4ip";
+       description = "A theorem prover for propositional logic that uses G4ip";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gact" = callPackage
     ({ mkDerivation, base, biopsl, bytestring, cmdargs, hashable
      , unordered-containers
@@ -68808,8 +68929,8 @@ self: {
      }:
      mkDerivation {
        pname = "general-games";
-       version = "1.0.3";
-       sha256 = "3be96a6b56f39e6d122b57759802cd8de36210f72192a1dfee24247bdfe0c7ef";
+       version = "1.0.5";
+       sha256 = "427d0319c4aa99d8071d25bc4df7e7f1eff341b05d8f5ed85a735b1b6c032a53";
        libraryHaskellDepends = [
          base monad-loops MonadRandom random random-shuffle
        ];
@@ -69468,6 +69589,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-binary" = callPackage
+    ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
+     , genvalidity-hspec, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-binary";
+       version = "0.0.0.0";
+       sha256 = "fdb91ed09a3e486508d8180dc4fcc3f229d376838576c5a0a271b4dbbd2937b6";
+       libraryHaskellDepends = [
+         base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard spec's for binary-related Instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-hspec-cereal" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
@@ -70656,6 +70794,7 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-vis" = callPackage
@@ -71992,8 +72131,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170301.1";
-       sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de";
+       version = "6.20170321";
+       sha256 = "f86351a99bbfff0285914c4639d2bc68ffcc172a6dacdef164254261cf1f0795";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -72918,16 +73057,18 @@ self: {
      }) {};
 
   "gl" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, fixed, half
-     , hxt, mesa, split, transformers
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , fixed, half, hxt, mesa, transformers
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.8.1";
-       sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a";
+       version = "0.8.0";
+       sha256 = "aa4d2838157c86da920bda651458a4266fccc7c291ea93a69558ab02540e1439";
+       setupHaskellDepends = [
+         base Cabal containers directory filepath hxt transformers
+       ];
        libraryHaskellDepends = [
-         base containers directory filepath fixed half hxt split
-         transformers
+         base containers fixed half transformers
        ];
        librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
@@ -73092,19 +73233,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glazier_0_11_0_0" = callPackage
+  "glazier_0_11_0_1" = callPackage
     ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
      , transformers
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.11.0.0";
-       sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff";
+       version = "0.11.0.1";
+       sha256 = "1151031c7943140b19fc3b319f6e1c648cc75fa0fd619f17d64dfe7857b60b46";
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids transformers
        ];
        homepage = "https://github.com/louispan/glazier#readme";
-       description = "Composable widgets framework";
+       description = "Composable widgets framework with enhanced with transformers and lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -73151,8 +73292,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier-react";
-       version = "0.2.0.0";
-       sha256 = "ab19e2b5fc513c2be8d6ea5ec361eefc6be338ec76dd081566be344b41261467";
+       version = "0.4.0.0";
+       sha256 = "2486f02a5c8375cc2b7f75d53279ef96257067e24bc1b946c9ab304cf3b7b883";
        libraryHaskellDepends = [
          base containers deepseq disposable dlist free ghcjs-base-stub
          glazier javascript-extras lens mmorph mtl pipes-concurrency
@@ -73162,6 +73303,31 @@ self: {
        homepage = "https://github.com/louispan/glazier-react#readme";
        description = "ReactJS binding using Glazier and Pipes.Fluid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "glazier-react-examples" = callPackage
+    ({ mkDerivation, base, containers, disposable, dlist, free
+     , ghcjs-base-stub, glazier, glazier-react, glazier-react-widget
+     , javascript-extras, lens, mmorph, mtl, pipes, pipes-concurrency
+     , pipes-misc, stm, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "glazier-react-examples";
+       version = "0.4.0.0";
+       sha256 = "2bff5dbf10e7f78bf61f93a8abe210d0cafcf634f3973e78aa2b1e7fd8188152";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers disposable dlist free ghcjs-base-stub glazier
+         glazier-react glazier-react-widget javascript-extras lens mmorph
+         mtl pipes pipes-concurrency pipes-misc stm text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/louispan/glazier-react#readme";
+       description = "Examples of using glazier-react";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -73171,8 +73337,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier-react-widget";
-       version = "0.2.0.0";
-       sha256 = "5326958b5590c76cfee47eac0445cc66cca0a85480c6dee4c80fc736f4329fa4";
+       version = "0.4.0.0";
+       sha256 = "f60ebf2ff016382dda3d5808eef28eb900fc62f86b5f7c6be98c92186bce2d68";
        libraryHaskellDepends = [
          base containers disposable dlist free ghcjs-base-stub glazier
          glazier-react javascript-extras lens mmorph mtl pipes-concurrency
@@ -73181,6 +73347,7 @@ self: {
        homepage = "https://github.com/louispan/glazier-react-widget#readme";
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gli" = callPackage
@@ -73499,6 +73666,7 @@ self: {
        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
@@ -73546,6 +73714,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
@@ -73594,6 +73763,7 @@ self: {
        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
@@ -73897,8 +74067,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.4";
-       sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd";
+       version = "0.2.5";
+       sha256 = "fdb2f813be0fe972855910100b544f7dbf3a2cd69d79e99bcffc9f60e761ec02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74130,6 +74300,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gochan" = callPackage
+    ({ mkDerivation, array, base, criterion, ghc-prim, hspec
+     , hspec-core, primitive, random, vector, vector-algorithms, weigh
+     }:
+     mkDerivation {
+       pname = "gochan";
+       version = "0.0.2";
+       sha256 = "f3c7e4f9c355f59725a46f3723360bc778d8306192b205b218a0074dd1be1ae5";
+       revision = "1";
+       editedCabalFile = "05736bf5e4d1080b23156bd7acd6f24925641a7c0a911bf15992a7232f0554a7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base ghc-prim primitive random vector vector-algorithms
+       ];
+       executableHaskellDepends = [ base criterion random weigh ];
+       testHaskellDepends = [ base hspec hspec-core ];
+       homepage = "http://github.com/cstrahan/gochan";
+       description = "Go-style channels";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gofer-prelude" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -76885,15 +77077,15 @@ self: {
 
   "google-oauth2-for-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
-     , hspec, http-types, req, time, wai, warp
+     , hspec, http-types, req, time, unix, wai, warp
      }:
      mkDerivation {
        pname = "google-oauth2-for-cli";
-       version = "0.1.0.0";
-       sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d";
+       version = "0.1.0.1";
+       sha256 = "811b7daf819be3afdad8e7fda31ec8ff1ec8a79476de687d14229e5e43aa37d8";
        libraryHaskellDepends = [
-         aeson base bytestring directory filepath http-types req time wai
-         warp
+         aeson base bytestring directory filepath http-types req time unix
+         wai warp
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme";
@@ -78520,6 +78712,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "group-by-date" = callPackage
+    ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
+     , pathtype, time, transformers, unix-compat, utility-ht
+     }:
+     mkDerivation {
+       pname = "group-by-date";
+       version = "0.1";
+       sha256 = "6660c6bd7be563375b5bacf6c3d0a0499678896808b1843e62e94c7bebb7f3ee";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base explicit-exception filemanip hsshellscript pathtype time
+         transformers unix-compat utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/group-by-date/";
+       description = "Shell command for grouping files by dates into folders";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "group-with" = callPackage
     ({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations
      , QuickCheck
@@ -80857,10 +81068,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.17.3";
-       sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7";
-       revision = "1";
-       editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8";
+       version = "2.17.3.1";
+       sha256 = "ed8c5282260d3300dc06e45e2f9a5d53606315a15a2336db749d3faa64d564ba";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -81913,6 +82122,8 @@ self: {
        pname = "hamtmap";
        version = "0.3";
        sha256 = "d4d107ece7ffa69528a720763a0741dcab4773646df974596220d745250fd911";
+       revision = "1";
+       editedCabalFile = "bbdcebe83e12f704a0b6611b1a9e7aa22db20023c6e3d44505617410f53733b6";
        libraryHaskellDepends = [ array base deepseq hashable ];
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
@@ -83244,8 +83455,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.1.1";
-       sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1";
+       version = "0.1.1.2";
+       sha256 = "a89161c4a2939f92906d67c85133c82d2295f8f53577ad210260463411fb2a8f";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -83423,32 +83634,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
-     , integer-gmp, QuickCheck, random, siphash, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.5.0";
-       sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       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_6_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
@@ -83457,6 +83642,8 @@ self: {
        pname = "hashable";
        version = "1.2.6.0";
        sha256 = "429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52";
+       revision = "1";
+       editedCabalFile = "8f8a4f7b788fb1ea04636634c7e1c9cd0a4a6cfe66cdb808dc24f56c187451df";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83472,7 +83659,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
@@ -86431,27 +86617,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_0_19_17_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
+  "hasql_0_19_18" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, deepseq, dlist, either, hashable
-     , hashtables, loch-th, mtl, network-ip, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, rebase, rerebase, scientific, semigroups
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     , time, transformers, uuid, vector
+     , hashtables, loch-th, mtl, placeholders, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.17.1";
-       sha256 = "d9e9a38256637f1bebb96898a91780f1b977c737c5933903b582f2e93bd81156";
+       version = "0.19.18";
+       sha256 = "a67e8bc48197e36e1d9906d4bba3779913e44105e58703169db914207315224d";
        libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring
-         bytestring-tree-builder contravariant contravariant-extras
-         data-default-class dlist either hashable hashtables loch-th mtl
-         network-ip placeholders postgresql-binary postgresql-libpq
-         profunctors scientific semigroups text time transformers uuid
-         vector
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras data-default-class dlist either
+         hashable hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors semigroups text transformers vector
        ];
        testHaskellDepends = [
          data-default-class QuickCheck quickcheck-instances rebase rerebase
@@ -86519,8 +86703,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-cursor-query";
-       version = "0.4.1";
-       sha256 = "9f0b1bf2ea1634f2f2da0727bfab331722c71573a3574f65423cada54da7c902";
+       version = "0.4.2";
+       sha256 = "9cf2c8ea63f69fbe5c989c6c8c9dac6043da781bb08e65950399a8e7abb07556";
        libraryHaskellDepends = [
          base base-prelude bytestring contravariant foldl hasql
          hasql-cursor-transaction hasql-transaction profunctors
@@ -86537,16 +86721,16 @@ self: {
 
   "hasql-cursor-transaction" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, hasql, hasql-transaction
-     , transformers
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , hasql, hasql-transaction, transformers
      }:
      mkDerivation {
        pname = "hasql-cursor-transaction";
-       version = "0.6";
-       sha256 = "07b991914a5664378ab358536ba36ea9c54f7771c41c7eed6688053fa289c2f6";
+       version = "0.6.1";
+       sha256 = "4f68d7f004212712cbde02e037a4f539410ff77070112be2d268402c9e6b85bf";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder contravariant
-         hasql hasql-transaction transformers
+         contravariant-extras hasql hasql-transaction transformers
        ];
        homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction";
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
@@ -87642,6 +87826,7 @@ self: {
        homepage = "https://github.com/danfran/hcoord#readme";
        description = "Easily convert between latitude/longitude, UTM and OSGB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcron" = callPackage
@@ -88037,10 +88222,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.1.0";
-       sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df";
-       revision = "1";
-       editedCabalFile = "5be14f612b7dfcc066e9fceeac312deb162c08f043f8929b0d2649c76d4f6b0f";
+       version = "0.5.2.0";
+       sha256 = "aca302d1b972c6623b03091e965af6f259b5b81ff383d66c6511027d53ba8a90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89930,8 +90113,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.2.0";
-       sha256 = "d1a976e0e8373e9448944200b77408dabbb04fb2221232832574244bb19935cc";
+       version = "0.1.3.1";
+       sha256 = "1616cb332092457e7649ea02687cfc7a5a7d777ac426207870a4df2afc32d6ab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91387,6 +91570,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjsonschema_1_6_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , directory, file-embed, filepath, hashable, hjsonpointer, hspec
+     , http-client, http-types, pcre-heavy, profunctors, protolude
+     , QuickCheck, scientific, semigroups, text, unordered-containers
+     , vector, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "hjsonschema";
+       version = "1.6.1";
+       sha256 = "c3816837b0ff64d32db0e575bf25cf3c23866b4bd1825e51172e1f964c81bc9e";
+       libraryHaskellDepends = [
+         aeson base bytestring containers file-embed filepath hashable
+         hjsonpointer http-client http-types pcre-heavy profunctors
+         protolude QuickCheck 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;
+     }) {};
+
   "hkdf" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
      mkDerivation {
@@ -91846,12 +92057,13 @@ self: {
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, hspec, libsass }:
+    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.5.0";
-       sha256 = "ce3e9a15d01c1b61d41b03e9b05ecd9b4b9aaf6da7d591086181b74e18d25bb8";
+       version = "0.1.6.0";
+       sha256 = "3d8826ce12d8e1179ff226f38f860355e40601cf9fd7955f93d97613734a9cde";
        configureFlags = [ "-fexternallibsass" ];
+       setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
@@ -94741,6 +94953,7 @@ self: {
        homepage = "https://github.com/shmish111/hriemann";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hruby" = callPackage
@@ -95454,8 +95667,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsass";
-       version = "0.4.0";
-       sha256 = "512faf0e01e720395699066139379fb2e5e5f456f465c72d58282b75b6ec0f9d";
+       version = "0.4.1";
+       sha256 = "67db51178ebd99cd69c232b04a2d2a319b6a8b73c2713d172caf81344915fbcc";
        libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
@@ -96155,10 +96368,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.2.0";
-       sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932";
-       revision = "1";
-       editedCabalFile = "18e2c175baf6aa0fef8e7fcf7126e19d8df085bab6ed405bb4d55b6f98121a3b";
+       version = "0.2.2.2";
+       sha256 = "39fa69fb48273f81c6a6683544720cf9b61d41374901e8e1730609c1a189d1d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96357,8 +96568,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.1.0";
-       sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f";
+       version = "0.6.1.1";
+       sha256 = "37702ce6939a7c1d1780185285ae9353abcbc3c59552d06a2e1bcaa820a33f09";
        libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -96743,6 +96954,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
+  "hslua_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit
+     , lua5_1, QuickCheck, quickcheck-instances, text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "0.5.0";
+       sha256 = "6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b";
+       configureFlags = [ "-fsystem-lua" ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ lua5_1 ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-contrib HUnit QuickCheck
+         quickcheck-instances text
+       ];
+       description = "A Lua language interpreter embedding in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) lua5_1;};
+
   "hslua-aeson" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
@@ -96750,8 +96981,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-aeson";
-       version = "0.1.0.0";
-       sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7";
+       version = "0.1.0.3";
+       sha256 = "f10c7fc9fdcc1c41964eb5ab170ce233be99343eb73ddaff5c175bea5bfcf1ea";
        libraryHaskellDepends = [
          aeson base hashable hslua scientific text unordered-containers
          vector
@@ -96973,29 +97204,27 @@ self: {
      }) {};
 
   "hsoz" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, byteable, bytestring, case-insensitive
-     , containers, cryptonite, data-default, either, errors, exceptions
-     , hashable, http-client, http-conduit, http-types, HUnit, lens
-     , lucid, memory, mtl, network, optparse-applicative, QuickCheck
-     , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , uri-bytestring, vault, wai, warp
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , case-insensitive, containers, cryptonite, data-default, either
+     , errors, exceptions, hashable, http-client, http-conduit
+     , http-types, HUnit, lens, lucid, memory, mtl, network
+     , optparse-applicative, QuickCheck, scientific, scotty, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, uri-bytestring, vault, wai
+     , warp
      }:
      mkDerivation {
        pname = "hsoz";
-       version = "0.0.0.4";
-       sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058";
-       revision = "1";
-       editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073";
+       version = "0.0.1.0";
+       sha256 = "c524eef8566f37cc8bee4717088cbb32a440df3b2304da465090819ebbea2d64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring byteable
-         bytestring case-insensitive containers cryptonite data-default
-         either errors exceptions hashable http-client http-types lens
-         memory mtl network scientific scotty securemem text time
-         transformers unordered-containers uri-bytestring vault wai warp
+         aeson attoparsec base bytestring case-insensitive containers
+         cryptonite data-default either errors exceptions hashable
+         http-client http-types lens memory mtl network scientific scotty
+         text time transformers unordered-containers uri-bytestring vault
+         wai warp
        ];
        executableHaskellDepends = [
          aeson base bytestring case-insensitive containers cryptonite
@@ -97099,8 +97328,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.2";
-       sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484";
+       version = "2.4.3";
+       sha256 = "3a7388e3471461e09f49dd37a64d29769b406448b8365ce1538f6da1fdaf6e37";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -97167,8 +97396,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.4.2";
-       sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318";
+       version = "2.4.3";
+       sha256 = "7c9d6f34799b3f0221d016f73509be147bb9deb1161321ccdc19f2af0809e155";
        libraryHaskellDepends = [
          ansi-terminal array async base call-stack deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -97189,8 +97418,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.4.2";
-       sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c";
+       version = "2.4.3";
+       sha256 = "aa3d75c891dd134020dcb6afe547f15d055e6c304c2cd1a5c723f7602868b44e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -98038,6 +98267,8 @@ self: {
        pname = "hsshellscript";
        version = "3.3.4";
        sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e";
+       revision = "2";
+       editedCabalFile = "29ba42acbe811deb1bf36828db57e8063c8e733e39e7d848fc29c0aca184602b";
        libraryHaskellDepends = [ base directory parsec random unix ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -99678,33 +99909,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.4.3.2";
-       sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a";
-       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;
-     }) {};
-
-  "http-reverse-proxy_0_4_3_3" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -99729,7 +99933,6 @@ 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-server" = callPackage
@@ -100222,12 +100425,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_0_4_0_0" = callPackage
+  "hunit-dejafu_0_4_0_1" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit, random }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "0.4.0.0";
-       sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216";
+       version = "0.4.0.1";
+       sha256 = "b0e97ecb22eb7b0b1552daad8cd7ddab4e91c255e7fc8183e0ee2536fa7d8caf";
        libraryHaskellDepends = [ base dejafu exceptions HUnit random ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -102135,6 +102338,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hzenhan" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, text }:
+     mkDerivation {
+       pname = "hzenhan";
+       version = "0.0.1";
+       sha256 = "13350850717d2691ad30dbbfe76a8506d726fae278b6079bb1258dfcecccf6d8";
+       libraryHaskellDepends = [ base containers text ];
+       testHaskellDepends = [ base containers QuickCheck text ];
+       homepage = "https://github.com/karky7/hzenhan#readme";
+       description = "Zenhan library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hzk" = callPackage
     ({ mkDerivation, base, bytestring, resource-pool, tasty
      , tasty-hunit, time, zookeeper_mt
@@ -102277,6 +102493,8 @@ self: {
        pname = "iban";
        version = "0.1.1.1";
        sha256 = "e9e2ef69259edb58988ab147fbd71d75f7c1a1015220e40cca4e1c68d5fc9c91";
+       revision = "1";
+       editedCabalFile = "6feb3674edd88f6a5d6de76bd3ee726d39564309c148249762ee02a657434cbf";
        libraryHaskellDepends = [
          base containers iso3166-country-codes text unordered-containers
        ];
@@ -102639,8 +102857,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.99.1";
-       sha256 = "199018612112180778da0d6b75f602848e6b8b4ce4747163a385daac44217c8a";
+       version = "0.99.2";
+       sha256 = "c3ff38dfeecab2edb7afee907ccbc9b3f348c658ceff686d0617aa3b661d8c3a";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -102757,8 +102975,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
        pname = "iff";
-       version = "0.0.5";
-       sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3";
+       version = "0.0.6";
+       sha256 = "6b8845808481307e2d374fd8d17e82a5de1284e612cf8ade27db8785e9e12837";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
@@ -103413,6 +103631,41 @@ self: {
        license = "unknown";
      }) {};
 
+  "imm_1_2_0_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
+     , blaze-html, blaze-markup, bytestring, case-insensitive
+     , chunked-data, comonad, conduit, conduit-combinators, connection
+     , containers, directory, dyre, fast-logger, filepath, free
+     , hashable, HaskellNet, HaskellNet-SSL, http-client
+     , http-client-tls, http-types, mime-mail, mono-traversable
+     , monoid-subclasses, network, opml-conduit, optparse-applicative
+     , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text
+     , time, timerep, tls, transformers, uri-bytestring, xml
+     , xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "imm";
+       version = "1.2.0.0";
+       sha256 = "29256d69fb797031bbcb2307d230e3a988491de604a9f76f5098b8fda1d2ecae";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
+         bytestring case-insensitive chunked-data comonad conduit
+         conduit-combinators connection containers directory dyre
+         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
+         http-client http-client-tls http-types mime-mail mono-traversable
+         monoid-subclasses network opml-conduit optparse-applicative rainbow
+         rainbox rss-conduit safe-exceptions tagged text time timerep tls
+         transformers uri-bytestring xml xml-conduit xml-types
+       ];
+       executableHaskellDepends = [ base free ];
+       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
     ({ mkDerivation, base, lifted-base, monad-control, stm, tasty
      , tasty-hunit, transformers, transformers-base
@@ -103632,6 +103885,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Imprevu support for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "improve" = callPackage
@@ -104185,8 +104439,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.0.0";
-       sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad";
+       version = "1.1.0";
+       sha256 = "3be3e60a8ac3b280f183e6ffad81a534556740de6b22784c47f1fb5c24817c2e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105033,15 +105287,15 @@ self: {
     ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
      mkDerivation {
        pname = "interpolation";
-       version = "0.1";
-       sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
+       version = "0.1.0.1";
+       sha256 = "ac693e487d2097c6997d3bf82113deaac5562ec97bda692e69fc684f24982948";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [
          array base containers QuickCheck utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/interpolation/";
+       homepage = "http://hub.darcs.net/thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105107,20 +105361,21 @@ self: {
 
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , cryptohash, directory, filepath, hscurses, mtl, network-fancy
-     , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time
-     , transformers, vector
+     , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
+     , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx
+     , SDL-mixer, SDL-ttf, stm, time, transformers, vector
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.6.2";
-       sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7";
+       version = "0.7";
+       sha256 = "0ec6a1cc5b37eca4a6d9794227d77f6d41c1eb30e2ad01981bc810aa53155237";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base binary bytestring containers cryptohash directory
-         filepath hscurses mtl network-fancy random safe SDL SDL-gfx
-         SDL-mixer SDL-ttf stm time transformers vector
+         array base binary bytestring containers crypto-api
+         crypto-pubkey-types cryptohash directory filepath hscurses mtl
+         network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm
+         time transformers vector
        ];
        homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
@@ -105300,6 +105555,7 @@ self: {
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-hxt" = callPackage
@@ -105455,10 +105711,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.3.6.0";
-       sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d";
-       revision = "1";
-       editedCabalFile = "2e5ea27945eb6c0f4260a482cc77c6ebebdf160cd00fa86130f4d31342fa994f";
+       version = "1.3.6.1";
+       sha256 = "28dcd4abc4b132aa4689c2f9c455ca6777b792f1ffef682576e0978793c83628";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -105958,18 +106212,18 @@ self: {
      }) {};
 
   "irc-dcc" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, errors
+    ({ mkDerivation, attoparsec, base, binary, bytestring
      , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network
      , path, safe-exceptions, tasty, tasty-hspec, tasty-quickcheck
      , transformers, utf8-string
      }:
      mkDerivation {
        pname = "irc-dcc";
-       version = "2.0.0";
-       sha256 = "af21bb0929ead7439e0d45ce4db1c35799949d91c8dd8f25f048826498483115";
+       version = "2.0.1";
+       sha256 = "6408a28733743d3463664677c5e3ad72e46c168799dad458988067039f25d2df";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring errors io-streams iproute
-         irc-ctcp mtl network path safe-exceptions transformers utf8-string
+         attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
+         network path safe-exceptions transformers utf8-string
        ];
        testHaskellDepends = [
          base bytestring hspec-attoparsec iproute network path tasty
@@ -106263,6 +106517,8 @@ self: {
        pname = "iso3166-country-codes";
        version = "0.20140203.8";
        sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36";
+       revision = "1";
+       editedCabalFile = "ee03b7547119da3be9afb040b2e93d06ad65d63c3bc401044d1c443c77bd0158";
        libraryHaskellDepends = [ base ];
        description = "A datatype for ISO 3166 country codes";
        license = "LGPL";
@@ -106675,8 +106931,8 @@ self: {
        pname = "ivory-backend-c";
        version = "0.1.0.5";
        sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535";
-       revision = "1";
-       editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a";
+       revision = "3";
+       editedCabalFile = "896caeaf7836e16c1e75400cb0d4be531cfdf5bac4c87740c54319b9964c2027";
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
          ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
@@ -106772,6 +107028,8 @@ self: {
        pname = "ivory-opts";
        version = "0.1.0.5";
        sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340";
+       revision = "1";
+       editedCabalFile = "f64e49dfa4b60729864f1a33acfb53df1465c19b200a92786537d4cf6f96c1d6";
        libraryHaskellDepends = [
          base base-compat containers data-reify dlist fgl filepath ivory
          monadLib pretty
@@ -107289,8 +107547,8 @@ self: {
     ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
      mkDerivation {
        pname = "javascript-extras";
-       version = "0.2.0.0";
-       sha256 = "28a191b67d0047a34d1d1f7dc8c8ad03abe725a9a75319746b9eecfbf1cb96e1";
+       version = "0.2.0.2";
+       sha256 = "45075e3abfe658311f209110701c02fa57dddd36b1df9405cb7ae5abdb3d6c83";
        libraryHaskellDepends = [
          base deepseq ghcjs-base-stub parallel text
        ];
@@ -107734,6 +107992,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "js-jquery_3_2_1" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "3.2.1";
+       sha256 = "60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jsaddle" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, containers, deepseq, filepath, ghc-prim, http-types
@@ -108387,8 +108660,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "6";
-       editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2";
+       revision = "7";
+       editedCabalFile = "c3b107899b4297971b6b2cb913b3ace26f6d847844c6a7a6b6fe9f8dc2a9a6f7";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -108563,6 +108836,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jsonextfilter" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , monads-tf, optparse-applicative, process, scientific, string-qq
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jsonextfilter";
+       version = "0.1.0.0";
+       sha256 = "6c2dc674133e3a6304a0803c3e823d1210b50cd4d1c711b1182f767addc0a156";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring containers monads-tf
+         optparse-applicative process scientific string-qq text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/mackeyrms/jsonextfilter#readme";
+       description = "Filter select values in JSON objects to unix programs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jsonresume" = callPackage
     ({ mkDerivation, aeson, base, bytestring, old-locale, text, time
      , unordered-containers
@@ -108666,6 +108960,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jsonxlsx" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , HUnit, old-time, optparse-applicative, scientific, string-qq
+     , text, time, unordered-containers, vector, xlsx
+     }:
+     mkDerivation {
+       pname = "jsonxlsx";
+       version = "0.1.0.1";
+       sha256 = "4778267befeec6c792da44faa7e81b4c7649f8f2983501fea523d7c4e1f9c460";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring containers HUnit old-time
+         optparse-applicative scientific string-qq text time
+         unordered-containers vector xlsx
+       ];
+       homepage = "https://github.com/mackeyrms/jsonxlsx#readme";
+       description = "json to xlsx converter";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jspath" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, JSONb
      , utf8-string
@@ -108729,8 +109045,8 @@ self: {
      }:
      mkDerivation {
        pname = "juicy-gcode";
-       version = "0.1.0.2";
-       sha256 = "6088c4602591b4f9b94e17ef42a6fada27abacb1e2ddd3a666848020d3b0ca0b";
+       version = "0.1.0.3";
+       sha256 = "fbef1579a9561b62b308e5f172cee2dc4d11e7b5fb6e51fae7c1721bd60eeb33";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -110359,8 +110675,8 @@ self: {
      }:
      mkDerivation {
        pname = "knead";
-       version = "0.2.0.1";
-       sha256 = "767515c8db0abff908d927354a027cb4f2cac929cb768302ba3900c050ad945c";
+       version = "0.2.1";
+       sha256 = "0aa766ebd9b72370dd18b1f7e3bef2d67c6575b36d9f47467ab54997bfe88f0d";
        libraryHaskellDepends = [
          base llvm-extra llvm-tf storable-record storable-tuple transformers
          utility-ht
@@ -111786,6 +112102,8 @@ self: {
        pname = "language-c-quote";
        version = "0.11.7.3";
        sha256 = "8e1bdc55d7c146e3d58feba03388f679933a8e033aaf15087e73d4d45e344152";
+       revision = "1";
+       editedCabalFile = "33b48f16c0cb1e3476c76828c61c9faed896f1bba16336903bd2bafbae94145c";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -112331,8 +112649,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.6";
-       sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
+       version = "1.3.7";
+       sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112361,50 +112679,6 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_7" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, either, exceptions, filecache, formatting
-     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
-     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
-     , memory, mtl, operational, optparse-applicative, parallel-io
-     , parsec, pcre-utils, process, random, regex-pcre-builtin
-     , scientific, semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.7";
-       sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory either exceptions
-         filecache formatting hashable hruby hslogger hspec http-api-data
-         http-client lens lens-aeson megaparsec memory mtl operational
-         parsec pcre-utils process random regex-pcre-builtin scientific
-         semigroups servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers Glob hslogger http-client lens
-         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
-         servant-client strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl scientific strict-base-types temporary text
-         transformers unix unordered-containers vector
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -112420,6 +112694,7 @@ self: {
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python-colour" = callPackage
@@ -112451,6 +112726,7 @@ self: {
        homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-qux" = callPackage
@@ -112612,8 +112888,8 @@ self: {
      }:
      mkDerivation {
        pname = "large-hashable";
-       version = "0.1.0.3";
-       sha256 = "ece9da94f91dfb97f3507035f280fe89a9bed50cf1071aae1afbd5d288682d89";
+       version = "0.1.0.4";
+       sha256 = "e9c3345d9fa0161f1b809f2c57e00b4c687ebd48ea42623fe480cc85339a628e";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytes bytestring containers scientific
          strict template-haskell text time transformers unordered-containers
@@ -112909,6 +113185,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "layout-rules" = callPackage
+    ({ mkDerivation, alex-tools, base, text }:
+     mkDerivation {
+       pname = "layout-rules";
+       version = "0.1.0.1";
+       sha256 = "b00a77aec2f4d8dcd71b29b5c399a7668158ae7bc05d1c7fb09e414ec3354934";
+       libraryHaskellDepends = [ alex-tools base text ];
+       homepage = "https://github.com/elliottt/layout-rules";
+       description = "A collection of different layout implementations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lazy-csv" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -113345,19 +113633,19 @@ self: {
   "legion" = callPackage
     ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring
      , canteven-http, conduit, conduit-extra, containers
-     , data-default-class, data-dword, directory, exceptions, http-types
+     , data-default-class, data-dword, exceptions, http-types
      , monad-logger, network, Ranged-sets, scotty, scotty-resource, text
      , time, transformers, unix, uuid, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.9.0.1";
-       sha256 = "413e8097861e841555335c0c0027eb4291a6aead9bf41d8799d7626a0d9890bd";
+       version = "0.9.0.2";
+       sha256 = "784005d0ca6875192b9837ea169b4b768e0fd34881f913809c2e7310044191eb";
        libraryHaskellDepends = [
          aeson base binary binary-conduit bytestring canteven-http conduit
-         conduit-extra containers data-default-class data-dword directory
-         exceptions http-types monad-logger network Ranged-sets scotty
-         scotty-resource text time transformers unix uuid wai wai-extra warp
+         conduit-extra containers data-default-class data-dword exceptions
+         http-types monad-logger network Ranged-sets scotty scotty-resource
+         text time transformers unix uuid wai wai-extra warp
        ];
        homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
@@ -113374,8 +113662,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.3.0.2";
-       sha256 = "4e9b4ece222d4cc3eb0a0f14bfba1b0f9f2a517d3471d9f61936faf953f74191";
+       version = "1.0.0.0";
+       sha256 = "7be93501fda9e9f37fbd90db3692ea1bf36069b1bb80f34f6663e339f3104854";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113419,8 +113707,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.2.0";
-       sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec";
+       version = "0.1.2.1";
+       sha256 = "696c33bc6dd19dbc6320a637359675bfc3090b9ad05d92fd356b4242f8832519";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring canteven-log conduit
          containers data-default-class data-dword directory legion network
@@ -113876,10 +114164,8 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, transformers }:
      mkDerivation {
        pname = "lenz";
-       version = "0.1";
-       sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397";
-       revision = "1";
-       editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07";
+       version = "0.1.2.1";
+       sha256 = "086dc7dd29cdc7f8166f2248bd9cebbfe0f926ec5f6a6d99e6ac81cfe62b1215";
        libraryHaskellDepends = [ base base-unicode-symbols transformers ];
        description = "Van Laarhoven lenses";
        license = "unknown";
@@ -114419,8 +114705,8 @@ self: {
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.18.3";
-       sha256 = "55b460995913b582f3f4df876bb9877598e7b8b27bae49fa1a2a4af4b08645d3";
+       version = "0.19.1";
+       sha256 = "e2d5e56b411098adcd139d6aae5f9226f8951b0a932af8cbfa178ffa626f326c";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
@@ -116563,8 +116849,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-extra";
-       version = "0.7.0.1";
-       sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573";
+       version = "0.7.1";
+       sha256 = "02b54ca12c6dbcb24589bbc93819a4857f169b811e15a6d00d05b7e42f1f6505";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116686,6 +116972,54 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "llvm-hs" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , llvm-config, llvm-hs-pure, mtl, parsec, pretty-show, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary
+     , transformers, transformers-compat, utf8-string
+     }:
+     mkDerivation {
+       pname = "llvm-hs";
+       version = "4.0.0.0";
+       sha256 = "9f67758f1a0f73d9f1182251f0ded41cf9bd82382aa7b767d0b7ed6ee46c93b5";
+       setupHaskellDepends = [ base Cabal containers ];
+       libraryHaskellDepends = [
+         array base bytestring containers llvm-hs-pure mtl parsec
+         template-haskell transformers transformers-compat utf8-string
+       ];
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
+         base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
+         tasty tasty-hunit tasty-quickcheck temporary transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "General purpose LLVM bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {llvm-config = null;};
+
+  "llvm-hs-pure" = callPackage
+    ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit
+     , template-haskell, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "llvm-hs-pure";
+       version = "4.0.0.0";
+       sha256 = "7452314aac955bd9afb4e93df2fc235788d069b18b16872878681cf91d0639fd";
+       libraryHaskellDepends = [
+         base containers mtl parsec template-haskell transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers mtl tasty tasty-hunit transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "Pure Haskell LLVM functionality (no FFI)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "llvm-ht" = callPackage
     ({ mkDerivation, base, bytestring, directory, mtl, process
      , type-level
@@ -116763,8 +117097,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "3.1.0.1";
-       sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5";
+       version = "3.1.0.2";
+       sha256 = "566a16989cdb64a87a78287341aa71379db88c6072683219c2853dff2afabf98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117146,25 +117480,6 @@ self: {
      }) {};
 
   "log-base" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
-     , time, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "log-base";
-       version = "0.7";
-       sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring deepseq exceptions monad-control
-         monad-time mtl semigroups stm text time transformers-base
-         unordered-containers
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-base_0_7_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
      , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
      , time, transformers-base, unordered-containers
@@ -117181,7 +117496,6 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-domain" = callPackage
@@ -119118,8 +119432,8 @@ self: {
      }:
      mkDerivation {
        pname = "mackerel-client";
-       version = "0.0.3";
-       sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269";
+       version = "0.0.4";
+       sha256 = "2f63c376f93d771a8ac9fbd531cf4ad208459423bd3cc2a9cddb44ae0e9724d0";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory filepath htoml
          http-client http-client-tls http-types parsec split text
@@ -119180,24 +119494,25 @@ self: {
      }) {};
 
   "madlang" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
+    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion, hspec
      , hspec-megaparsec, lens, megaparsec, mtl, mwc-random
-     , optparse-applicative, text
+     , optparse-applicative, text, tibetan-utils
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.0.0.1";
-       sha256 = "c7723b24bb564f3a5b4a3ab5641a4264005476bf59d19d91ee074c92f5ee62bf";
+       version = "2.0.1.1";
+       sha256 = "f58b9a47a8f213c030ffbee9c8b2ed71443b32b832eaa761fd06ac3c37a0dccb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base containers lens megaparsec mtl mwc-random
-         optparse-applicative text
+         optparse-applicative text tibetan-utils
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec mtl text
        ];
+       benchmarkHaskellDepends = [ base criterion megaparsec text ];
        homepage = "https://github.com/vmchale/madlang#readme";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -120670,27 +120985,6 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matplotlib" = callPackage
-    ({ mkDerivation, ad, aeson, base, bytestring, containers, process
-     , random, raw-strings-qq, split, tasty, tasty-expected-failure
-     , tasty-golden, tasty-hunit, temporary
-     }:
-     mkDerivation {
-       pname = "matplotlib";
-       version = "0.4.1";
-       sha256 = "7a0d0ac10ff394c8ee4a673dbc6454cb5218c9189d9312a4c4af64efe255b97b";
-       libraryHaskellDepends = [
-         aeson base bytestring containers process temporary
-       ];
-       testHaskellDepends = [
-         ad base bytestring process random raw-strings-qq split tasty
-         tasty-expected-failure tasty-golden tasty-hunit temporary
-       ];
-       homepage = "https://github.com/abarbu/matplotlib-haskell";
-       description = "Bindings to Matplotlib; a Python plotting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "matplotlib_0_4_3" = callPackage
     ({ mkDerivation, ad, aeson, base, bytestring, containers, process
      , random, raw-strings-qq, split, tasty, tasty-expected-failure
      , tasty-golden, tasty-hunit, temporary
@@ -120965,6 +121259,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mbox-utility" = callPackage
+    ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time
+     , parsec, spreadsheet, utility-ht
+     }:
+     mkDerivation {
+       pname = "mbox-utility";
+       version = "0.0";
+       sha256 = "b17881a3674b55bf361c3ae7e6164a2106087900e665f44c8d55371078c2cb39";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring hsemail non-empty old-time parsec spreadsheet
+         utility-ht
+       ];
+       description = "List contents of an mbox file containing e-mails";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mcm" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, filepath, hostname, MissingH, polyparse, process, text
@@ -121276,6 +121588,7 @@ self: {
        homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
@@ -121765,21 +122078,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.1";
-       sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825";
-       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_2" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -121792,7 +122090,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
@@ -122475,8 +122772,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-music-box";
-       version = "0.0.0.1";
-       sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9";
+       version = "0.0.0.3";
+       sha256 = "e698cefeee56bc3561376a6dfab990e0a48388938d80fb3410ed017f6b4ae141";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123172,18 +123469,6 @@ self: {
      }) {};
 
   "mintty" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "mintty";
-       version = "0.1";
-       sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/mintty";
-       description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mintty_0_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mintty";
@@ -123193,7 +123478,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/mintty";
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mios" = callPackage
@@ -123406,6 +123690,8 @@ self: {
        pname = "mmorph";
        version = "1.0.9";
        sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563";
+       revision = "1";
+       editedCabalFile = "4dd6d1966746918b7503dafa8b78b75df2245406baa083858e1a2310313aaef7";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -123413,6 +123699,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmtf" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-msgpack
+     , hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "mmtf";
+       version = "0.1.0.1";
+       sha256 = "29404fe3eff386a044f1c750eadc80b98b51d377020a27b8c253a285cdf61080";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-msgpack text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       homepage = "https://github.com/zmactep/mmtf#readme";
+       description = "Macromolecular Transmission Format implementation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -123513,8 +123817,10 @@ self: {
      }:
      mkDerivation {
        pname = "model";
-       version = "0.2.1";
-       sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d";
+       version = "0.2.4";
+       sha256 = "9ff1ea0de33416c070d47cc3aaf565818f01006cc61e5b822a966862b7a12d0b";
+       revision = "1";
+       editedCabalFile = "ab32dfd91043557c42073acf6e9687c849fab77564358e09cf2e5bf654f5d3d4";
        libraryHaskellDepends = [
          base containers deepseq ListLike pretty transformers
        ];
@@ -123910,6 +124216,7 @@ self: {
        homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme";
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-codec" = callPackage
@@ -124175,8 +124482,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.20.2";
-       sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737";
+       version = "0.3.21";
+       sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c";
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -124188,7 +124495,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "monad-logger_0_3_21" = callPackage
+  "monad-logger_0_3_22" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -124197,8 +124504,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.21";
-       sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c";
+       version = "0.3.22";
+       sha256 = "997152368c9200cff7547cc2037ed4f2b34e6e56de97d1aaac6b5a888a9b01e6";
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -124542,18 +124849,6 @@ self: {
      }) {};
 
   "monad-skeleton" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "monad-skeleton";
-       version = "0.1.3";
-       sha256 = "4de3aee29408f98fe0f3dc6161d98e13a5292a67b23cb80e7f1875eead7d8a40";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/monad-skeleton";
-       description = "Monads of program skeleta";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-skeleton_0_1_3_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monad-skeleton";
@@ -124563,7 +124858,6 @@ self: {
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "Monads of program skeleta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-st" = callPackage
@@ -125889,6 +126183,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mqtt" = callPackage
+    ({ mkDerivation, async, attoparsec, base, binary, bytestring
+     , case-insensitive, clock, containers, criterion, deepseq
+     , exceptions, hslogger, network-uri, random, socket, tasty
+     , tasty-hunit, tasty-quickcheck, text, tls, uuid, websockets, x509
+     , x509-validation
+     }:
+     mkDerivation {
+       pname = "mqtt";
+       version = "0.1.1.0";
+       sha256 = "7b6dbb9ebd768f208c78b270086abbbfb9543a3735e8c2e9671900ff6ba8e432";
+       libraryHaskellDepends = [
+         async attoparsec base binary bytestring case-insensitive clock
+         containers hslogger socket text tls uuid websockets x509
+         x509-validation
+       ];
+       testHaskellDepends = [
+         async attoparsec base binary bytestring containers deepseq
+         exceptions network-uri random tasty tasty-hunit tasty-quickcheck
+         text tls uuid
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion text
+       ];
+       homepage = "https://github.com/lpeterse/haskell-mqtt";
+       description = "An MQTT protocol implementation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mqtt-hs" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring, monad-loops
      , mtl, network, singletons, stm, text, transformers
@@ -128668,22 +128992,23 @@ self: {
      }) {};
 
   "nested-routes" = callPackage
-    ({ mkDerivation, 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, transformers, tries
-     , unordered-containers, wai-middleware-content-type
-     , wai-middleware-verbs, wai-transformers
+    ({ mkDerivation, attoparsec, base, bifunctors, 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
+     , transformers, tries, unordered-containers
+     , wai-middleware-content-type, wai-middleware-verbs
+     , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "7.2.2";
-       sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9";
+       version = "8.0.0";
+       sha256 = "ad7c65559f6324f533f9c58607b46651253759f390815802c1cff2e02c01805f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring composition-extra errors exceptions
-         hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
+         attoparsec base bifunctors bytestring errors exceptions hashable
+         hashtables mtl poly-arity pred-set pred-trie regex-compat
          semigroups text transformers tries unordered-containers
          wai-middleware-content-type wai-middleware-verbs wai-transformers
        ];
@@ -130797,6 +131122,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "REST API for Nomyx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nomyx-core" = callPackage
@@ -130825,6 +131151,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nomyx-language" = callPackage
@@ -130844,6 +131171,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nomyx-library" = callPackage
@@ -130861,6 +131189,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Library of rules for Nomyx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nomyx-server" = callPackage
@@ -130883,6 +131212,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nomyx-web" = callPackage
@@ -132229,8 +132559,10 @@ self: {
      }:
      mkDerivation {
        pname = "oeis";
-       version = "0.3.8";
-       sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93";
+       version = "0.3.9";
+       sha256 = "8a692c0b898f5d89e607f9593697a24827981a1cfee53045c192084015061b8e";
+       revision = "1";
+       editedCabalFile = "524984744830f3a5d6709b9fe20faab0f27de42be3daaf7854c82bbaf0a06665";
        libraryHaskellDepends = [ base HTTP network network-uri ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -133833,6 +134165,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/optparse-applicative-simple";
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -134178,8 +134511,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.0.2";
-       sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d";
+       version = "0.0.3";
+       sha256 = "28f2e870e547e0e2a452cadbd509aef6e054dee9e57f96c859383b7776b3b8b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134851,8 +135184,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
-       revision = "1";
-       editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa";
+       revision = "2";
+       editedCabalFile = "5dc6d0e5637a60e185b91d0540ba0c729ff9413bb852abd94fe9ac19fa3f1227";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -135121,8 +135454,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
-       revision = "1";
-       editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949";
+       revision = "2";
+       editedCabalFile = "7a12dacfadc507c1e7992acdceeba8a1a12ca682724dd1cc4faefaf985b8c2ea";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -136583,19 +136916,21 @@ self: {
   "patch-image" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
      , accelerate-cufft, accelerate-fourier, accelerate-io
-     , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix
-     , JuicyPixels, utility-ht, vector
+     , accelerate-utility, array, base, Cabal, carray, containers
+     , enumset, fft, filepath, gnuplot, hmatrix, JuicyPixels, knead
+     , llvm-extra, llvm-tf, pqueue, tfp, utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.1.0.2";
-       sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35";
+       version = "0.2";
+       sha256 = "23517289417a46873182c45091da803df80942758b38dca89303c0d066546450";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
-         accelerate-fourier accelerate-io accelerate-utility base Cabal
-         filepath gnuplot hmatrix JuicyPixels utility-ht vector
+         accelerate-fourier accelerate-io accelerate-utility array base
+         Cabal carray containers enumset fft filepath gnuplot hmatrix
+         JuicyPixels knead llvm-extra llvm-tf pqueue tfp utility-ht vector
        ];
        homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
@@ -136624,27 +136959,6 @@ self: {
      }) {};
 
   "path" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , filepath, hashable, hspec, HUnit, mtl, QuickCheck
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "path";
-       version = "0.5.12";
-       sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d";
-       revision = "2";
-       editedCabalFile = "b4b398831f283efea1eb8dd53cb41ddf0c0fe25eab8b809f82f463a7d72496b9";
-       libraryHaskellDepends = [
-         aeson base deepseq exceptions filepath hashable template-haskell
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath hspec HUnit mtl QuickCheck
-       ];
-       description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path_0_5_13" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
      , filepath, hashable, hspec, mtl, template-haskell
      }:
@@ -136658,7 +136972,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring filepath hspec mtl ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-extra" = callPackage
@@ -136909,6 +137222,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pb-next" = callPackage
+    ({ mkDerivation, base, data-default, either, optparse-applicative
+     , parsec, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "pb-next";
+       version = "0.1.0.0";
+       sha256 = "0c62eb075cdef80c0393162925369476fe6469d8a252cd0c298c5f05fb6ba3aa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base either parsec text transformers ];
+       executableHaskellDepends = [
+         base data-default either optparse-applicative text
+       ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
+       homepage = "https://github.com/githubuser/pb-next#readme";
+       description = "Utility CLI for working with protobuf files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pbc4hs" = callPackage
     ({ mkDerivation, base, hslua, string-qq }:
      mkDerivation {
@@ -138540,8 +138873,8 @@ self: {
      }:
      mkDerivation {
        pname = "phash";
-       version = "0.0.5";
-       sha256 = "7b199d520b4b08562532ab968853c701ecb868df35862ba6db5c8be299fdcdae";
+       version = "0.0.6";
+       sha256 = "f575e0aadb3fbf185defc6ded00efc150ed162dd8ef4e311575e012e6ab221bb";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ pHash ];
        testHaskellDepends = [
@@ -140307,6 +140640,7 @@ self: {
        homepage = "https://github.com/ExcaliburZero/pixelated-avatar-generator";
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs1" = callPackage
@@ -140581,8 +140915,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot";
-       version = "0.2.3.6";
-       sha256 = "ad606de1d746f26cea36f1818209adab83bb32bf46b562465930f64c975afdfd";
+       version = "0.2.3.7";
+       sha256 = "918611e37c6c2a01c00621b079e4de63dbe24a63936b64cd923f3bdb6e9757a4";
        libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
@@ -141214,12 +141548,12 @@ self: {
      }) {};
 
   "poly-arity" = callPackage
-    ({ mkDerivation, base, constraints, HList }:
+    ({ mkDerivation, base, constraints }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.7";
-       sha256 = "8a11a127ef8aa3d9cbf773623930c710a7c0e92ac602957c891ed6a385540b66";
-       libraryHaskellDepends = [ base constraints HList ];
+       version = "0.1.0";
+       sha256 = "cb10a644fe04de8e703942f4bd0d97c4df0f9e3915d33a494994e85830cfdd29";
+       libraryHaskellDepends = [ base constraints ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141302,6 +141636,8 @@ self: {
        pname = "polynomial";
        version = "0.7.2";
        sha256 = "e19fff25579b5882da6d7ec0f3e344b88ee320ae8284fc1afefed04385ba3ff0";
+       revision = "1";
+       editedCabalFile = "9acba2e7f5f4e3ec6989c9670a92a6b9033ee9331b2c9bc114890b8929f45b35";
        libraryHaskellDepends = [
          base deepseq pretty vector vector-space vector-th-unbox
        ];
@@ -141967,22 +142303,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "postgresql-binary_0_10" = callPackage
+  "postgresql-binary_0_12_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, conversion, conversion-bytestring, conversion-text
-     , criterion, foldl, json-ast, loch-th, network-ip, placeholders
-     , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase
-     , scientific, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, time, transformers, uuid, vector
+     , bytestring, bytestring-strict-builder, containers, conversion
+     , conversion-bytestring, conversion-text, criterion, json-ast
+     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
+     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.10";
-       sha256 = "28816184fb287ddafcd8344f4d8cdba678be2fb29f06005cc7f597ee4386e7c6";
+       version = "0.12.1";
+       sha256 = "a20a9f6c102d09f220e5f08357b3cd0a06a5f8d22eff4dd7f9e6fc668e1165cd";
        libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring foldl loch-th
-         network-ip placeholders scientific text time transformers uuid
-         vector
+         aeson base base-prelude binary-parser bytestring
+         bytestring-strict-builder containers loch-th network-ip
+         placeholders scientific text time transformers unordered-containers
+         uuid vector
        ];
        testHaskellDepends = [
          aeson conversion conversion-bytestring conversion-text json-ast
@@ -142339,8 +142677,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.5.0";
-       sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff";
+       version = "0.5.1";
+       sha256 = "9b0f95824a14391f2d1cb39af3740ceebb93d0676bdb8817a8fa6f89ff5a792f";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptonite
          haskell-src-meta HDBC memory network old-locale postgresql-binary
@@ -142351,7 +142689,7 @@ self: {
          QuickCheck time
        ];
        homepage = "https://github.com/dylex/postgresql-typed";
-       description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend";
+       description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -142703,17 +143041,6 @@ self: {
      }) {};
 
   "pqueue" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "pqueue";
-       version = "1.3.2";
-       sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1";
-       libraryHaskellDepends = [ base deepseq ];
-       description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pqueue_1_3_2_2" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "pqueue";
@@ -142723,7 +143050,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
@@ -142864,8 +143190,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.5.1";
-       sha256 = "821e1cefa47a3090808af5c39d9997f6471e05aa4f98b46e05eccb9c4a99cdd1";
+       version = "0.5.1.1";
+       sha256 = "7342dab0c18f25b023da8613798dcb3e75fceb8b082a1feb57e5597de9827ecf";
        libraryHaskellDepends = [
          base composition-extra containers hashable hashtables mtl
          poly-arity pred-set QuickCheck semigroups tries
@@ -143208,8 +143534,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "present";
-       version = "4.0.2";
-       sha256 = "1eae62ac47ca11a2f13d8bebf7930b0f11e1197a5f0d8628bafce279e000600f";
+       version = "4.1.0";
+       sha256 = "bae8b334817a31572cc0e771f40e89b976e72b2b55d0955e4e198502dd8a427b";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/chrisdone/present";
        description = "Make presentations for data types";
@@ -144170,8 +144496,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.4.2.1";
-       sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916";
+       version = "0.4.2.2";
+       sha256 = "caa7a1c197dc94b0343755506fa657ae40dd155534379adccf39701d8c0a953f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144541,8 +144867,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.0";
-       sha256 = "da1b4e26e28232907d351dc7e1abe7cfcef77e31b723a49da7822557472ba074";
+       version = "4.0.2";
+       sha256 = "cb659ab34b22126c0c07075e556a6f56170af3896f2e23dcd16035d70e578624";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145622,25 +145948,23 @@ self: {
      }) {};
 
   "purescript" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
-     , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html
-     , bower-json, boxes, bytestring, cheapskate, clock, containers
-     , data-ordlist, deepseq, directory, dlist, edit-distance
-     , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec
-     , hspec-discover, http-client, http-types, HUnit
-     , language-javascript, lens, lifted-base, monad-control
-     , monad-logger, mtl, network, optparse-applicative, parallel
-     , parsec, pattern-arrows, pipes, pipes-http, process, protolude
-     , regex-tdfa, safe, scientific, semigroups, silently, sourcemap
-     , spdx, split, stm, syb, system-filepath, text, time, transformers
-     , transformers-base, transformers-compat, turtle
-     , unordered-containers, utf8-string, vector, wai, wai-websockets
-     , warp, websockets
+    ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
+     , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes
+     , bytestring, cheapskate, clock, containers, data-ordlist, deepseq
+     , directory, dlist, edit-distance, file-embed, filepath, fsnotify
+     , gitrev, Glob, haskeline, hspec, hspec-discover, http-client
+     , http-types, HUnit, language-javascript, lens, lifted-base
+     , monad-control, monad-logger, mtl, network, optparse-applicative
+     , parallel, parsec, pattern-arrows, pipes, pipes-http, process
+     , protolude, regex-tdfa, safe, scientific, semigroups, silently
+     , sourcemap, spdx, split, stm, syb, text, time, transformers
+     , transformers-base, transformers-compat, unordered-containers
+     , utf8-string, vector, wai, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.7";
-       sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d";
+       version = "0.11.0";
+       sha256 = "811e55bfc87e2ec65f57b134980866a5924a3f5c7967bf83fac19c7f9fd12cdd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145655,12 +145979,12 @@ self: {
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
-         boxes bytestring containers directory file-embed filepath foldl
+         aeson ansi-terminal ansi-wl-pprint base base-compat blaze-html
+         boxes bytestring containers directory file-embed filepath gitrev
          Glob haskeline http-types monad-logger mtl network
          optparse-applicative parsec process protolude sourcemap split stm
-         system-filepath text time transformers transformers-compat turtle
-         utf8-string wai wai-websockets warp websockets
+         text time transformers transformers-compat utf8-string wai
+         wai-websockets warp websockets
        ];
        testHaskellDepends = [
          aeson aeson-better-errors base base-compat bower-json boxes
@@ -146307,8 +146631,10 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.0.2";
-       sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504";
+       version = "1.0.0.3";
+       sha256 = "ff97d131702a42710d3c9a4a211055499495bd3319697908b4fa83c4a01381f4";
+       revision = "1";
+       editedCabalFile = "9011708b42c261b2ec8a2f7a39315fbdff193d61c8d70c73f32b60e3428fe067";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
@@ -148253,6 +148579,8 @@ self: {
        pname = "rasa";
        version = "0.1.12";
        sha256 = "5ae77122fd34c6c87ec9137c7d686106ee57baaef164090c55efd2d0bbe85f21";
+       revision = "1";
+       editedCabalFile = "79e6edef2ef82c0a65343db171bfddb85cbf23d45420ccffb97383e031d3979f";
        libraryHaskellDepends = [
          async base bifunctors containers data-default eve free hspec lens
          mtl pipes pipes-concurrency pipes-parse profunctors text text-lens
@@ -148602,6 +148930,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rattletrap_2_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754
+     , filepath, tasty, tasty-hspec, template-haskell, temporary, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "rattletrap";
+       version = "2.2.0";
+       sha256 = "fe1ba54cce7d1d6c2b4bfe54f433bc61a31b15b866abae7ae2ee4a53b384f2c8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bimap binary binary-bits bytestring
+         containers data-binary-ieee754 template-haskell text vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring filepath tasty tasty-hspec temporary
+       ];
+       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
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
      , network, random, text, time, unordered-containers, uuid
@@ -148683,13 +149037,15 @@ self: {
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "rawfilepath";
-       version = "0.1.0.0";
-       sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614";
+       version = "0.1.1";
+       sha256 = "fc5c0a6177abece59cc962d08ab019d98aac2b61b4495630f00280b029988c66";
+       revision = "1";
+       editedCabalFile = "39c576d107385d8d240d32673c8dfd702e2e17ef87ece13f86010d1a3411c693";
        libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/xtendo-org/rawfilepath#readme";
        description = "Use RawFilePath instead of FilePath";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "rawr" = callPackage
@@ -148763,22 +149119,26 @@ self: {
      }) {};
 
   "rbpcp-api" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal
-     , haskoin-core, servant, string-conversions, text
+    ({ mkDerivation, aeson, base, base16-bytestring
+     , bitcoin-payment-protocol, bytestring, cereal, haskoin-core
+     , http-api-data, servant, servant-client, string-conversions, text
+     , time
      }:
      mkDerivation {
        pname = "rbpcp-api";
-       version = "0.1.0.0";
-       sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06";
+       version = "0.2.0.0";
+       sha256 = "958f1067973daaa1fcba4afab2bd6dbb09bd6b84aa6c342246103b442a4c1855";
        libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cereal haskoin-core servant
-         string-conversions text
+         aeson base base16-bytestring bitcoin-payment-protocol bytestring
+         cereal haskoin-core http-api-data servant servant-client
+         string-conversions text time
        ];
        homepage = "http://paychandoc.runeks.me/";
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {bitcoin-payment-protocol = null;};
 
   "rbr" = callPackage
     ({ mkDerivation, base, bio, bytestring, containers }:
@@ -149377,6 +149737,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "read-env-var_1_0_0_0" = callPackage
+    ({ mkDerivation, base, doctest, exceptions, Glob, transformers }:
+     mkDerivation {
+       pname = "read-env-var";
+       version = "1.0.0.0";
+       sha256 = "03f3c8176fc08ce838ae772f13991258e2b496712cc71edb1a00336e7ce0b75c";
+       libraryHaskellDepends = [ base exceptions transformers ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/read-env-var#readme";
+       description = "Functions for safely reading environment variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "read-io" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hspec }:
      mkDerivation {
@@ -150568,19 +150942,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "regex_0_8_0_0" = callPackage
+  "regex_0_10_0_2" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, heredoc, regex-base, regex-tdfa, regex-tdfa-text
+     , hashable, regex-base, regex-tdfa, regex-tdfa-text
      , template-haskell, text, time, time-locale-compat, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.8.0.0";
-       sha256 = "6bd9c5aefde6010c0ab1fd0ed60c969b3ade609d23553221810330d287fe9062";
+       version = "0.10.0.2";
+       sha256 = "5ecb41e7bfc60aaad2bfca8d07ea84088c46fce881f70eccb87fbd02b8bf417b";
        libraryHaskellDepends = [
-         array base base-compat bytestring containers hashable heredoc
-         regex-base regex-tdfa regex-tdfa-text template-haskell text time
+         array base base-compat bytestring containers hashable regex-base
+         regex-tdfa regex-tdfa-text template-haskell text time
          time-locale-compat transformers unordered-containers
        ];
        homepage = "http://regex.uk";
@@ -150734,8 +151108,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.8.0.0";
-       sha256 = "0ba7b0c30259818a48952d3218b0b89bba19979f4d2882c77e752091f654dddd";
+       version = "0.10.0.2";
+       sha256 = "d92f00f991ccc2597f0cc62eba00a0b22aeb075717baa1e24d581d5df34603ba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -150755,6 +151129,7 @@ self: {
        homepage = "http://regex.uk";
        description = "Tutorial, tests and example programs for regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-genex" = callPackage
@@ -151007,19 +151382,22 @@ self: {
 
   "regex-with-pcre" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, regex
-     , regex-base, regex-pcre-builtin, template-haskell, transformers
+     , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "0.8.0.0";
-       sha256 = "c965675df2d1b52bc9e0f1a5df0da150f47103a41494deba0ae985b2707ecd6b";
+       version = "0.10.0.2";
+       sha256 = "645a63d6174c15bcf10274f08df68b85090e816492bd9e01b871aa8fe5b53b64";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
-         regex-pcre-builtin template-haskell transformers
+         regex-pcre-builtin regex-tdfa template-haskell transformers
+         unordered-containers
        ];
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -151414,8 +151792,8 @@ self: {
      }:
      mkDerivation {
        pname = "relapse";
-       version = "0.1.1.1";
-       sha256 = "613a385a54ba9d9fa95562121aa0ef94614fbb984b319477e2ef49512ef1a20a";
+       version = "1.0.0.0";
+       sha256 = "65c68af5e3d18e67bd6f81ab62ea9cc271d8283d876f7baf1c4ee64515a9aa19";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [
          aeson base base16-bytestring bytestring containers include-file
@@ -151507,8 +151885,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.1.6.1";
-       sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada";
+       version = "0.1.7.1";
+       sha256 = "18fa0712dc906c056d0c21cfc262a97673906348fa37130761688b16f9cd7a2c";
        libraryHaskellDepends = [
          base persistable-types-HDBC-pg relational-query
          relational-query-HDBC
@@ -152744,8 +153122,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
-       revision = "4";
-       editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a";
+       revision = "6";
+       editedCabalFile = "38c82ac051ac1cda463e93d4704be00680ee24fc044eb1cabcf48789306a8635";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -152797,8 +153175,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "5";
-       editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a";
+       revision = "7";
+       editedCabalFile = "8cd3ba2ec87976c3118b1de8d9172104e3a136f0afd9443e935130435fbc4c7d";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -154088,13 +154466,13 @@ self: {
      }:
      mkDerivation {
        pname = "rose-trie";
-       version = "1.0.0.2";
-       sha256 = "94eb35048ea15968f66aed88e1598b4e742f129928a880ddbbd4e6a2b38ff99e";
+       version = "1.0.0.5";
+       sha256 = "9d6328c9a639585edf2777b2e2ec6aab025f6fda9132222316caa078efb6a31c";
        libraryHaskellDepends = [
          base containers deepseq minilens mtl transformers
        ];
        homepage = "https://github.com/RaminHAL9001/rose-trie";
-       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures.";
+       description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -154690,6 +155068,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) rtl-sdr;};
 
+  "rtnetlink" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl
+     , pretty-hex, random, socket, transformers, unix
+     }:
+     mkDerivation {
+       pname = "rtnetlink";
+       version = "0.1.0.2";
+       sha256 = "090a563053b83e624e7de7e161c2bffc239a72db926ed64229cb1cc9d78a02e4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal monad-loops mtl pretty-hex random socket
+         transformers unix
+       ];
+       testHaskellDepends = [ base hspec socket unix ];
+       homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
+       description = "Manipulate network devices, addresses, and routes on Linux";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rtorrent-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
      , bytestring, deepseq, haxr, mtl, network, split, utf8-string
@@ -155243,8 +155641,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.9.3";
-       sha256 = "7ec166f50363eef698c884b3495405f1705e974c8dfaf54b9374977b334f6ec8";
+       version = "0.9.3.1";
+       sha256 = "63ee973ad84c0a4440934b726bc066aa571d27014bc27f2dd93bc9839340471a";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -155570,8 +155968,8 @@ self: {
     ({ mkDerivation, base, numeric-prelude, sample-frame }:
      mkDerivation {
        pname = "sample-frame-np";
-       version = "0.0.4";
-       sha256 = "cdec6e95f9b3739ca5031dfa914465d5e82b9b6bb09c95529728c92efb21e4d0";
+       version = "0.0.4.1";
+       sha256 = "b1db7621b07503f5fe49390bf1e1b4257c49f4760d617121a23d845278f93624";
        libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Orphan instances for types from sample-frame and numericprelude";
@@ -156579,6 +156977,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_4_11" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.11";
+       sha256 = "990f4ba464606eb2bf07059c527b8e1e7aa11e2f0d9e2f3c0b4e6aec9f9e7ed4";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp integer-logarithms text vector
+       ];
+       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
@@ -157419,8 +157842,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.2.0.0";
-       sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac";
+       version = "0.2.0.1";
+       sha256 = "c214ab985c0bb5174acceaec0d5952e3bd01f6b998dbfd4025203bf4a78643b9";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -157624,6 +158047,8 @@ self: {
        pname = "secret-sharing";
        version = "1.0.0.3";
        sha256 = "62af2ba181d30e6d6c6cfd01f83a5082b6bc378a745c90497cff42ebea2b6160";
+       revision = "1";
+       editedCabalFile = "61cd19283cfa3fb48b92ac636aead422be5120efb8a77b4390a1ca2d571819e1";
        libraryHaskellDepends = [
          base binary bytestring dice-entropy-conduit finite-field polynomial
          vector
@@ -158462,8 +158887,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.5.0";
-       sha256 = "c8dbcdf8c6650a45fa6c5bf2a95a1d754818ac2dd276a29291fa942e831bc74a";
+       version = "0.1.5.3";
+       sha256 = "049c553f26e9e8e59273851abb7897d2e6d1554b21d66a035ee43983796d3c16";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra ansi-terminal base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -158775,47 +159200,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-auth-server_0_2_1_0" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, bytestring-conversion, case-insensitive, cookie
-     , crypto-api, data-default-class, entropy, hspec, http-api-data
-     , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
-     , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
-     , time, transformers, unordered-containers, wai, warp, wreq
-     }:
-     mkDerivation {
-       pname = "servant-auth-server";
-       version = "0.2.1.0";
-       sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy http-api-data jose lens monad-time mtl
-         servant-auth servant-server text time unordered-containers wai
-       ];
-       executableHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy http-api-data jose lens markdown-unlit
-         monad-time mtl servant-auth servant-server text time transformers
-         unordered-containers wai warp
-       ];
-       testHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy hspec http-api-data http-client
-         http-types jose lens lens-aeson monad-time mtl QuickCheck
-         servant-auth servant-server text time unordered-containers wai warp
-         wreq
-       ];
-       homepage = "http://github.com/plow-technologies/servant-auth#readme";
-       description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "servant-auth-server" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
@@ -158958,6 +159342,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
@@ -159744,6 +160129,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-ruby" = callPackage
+    ({ mkDerivation, base, casing, doctest, lens, servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-ruby";
+       version = "0.2.0.0";
+       sha256 = "5ac0095edc4254edc3db4f4a0913669391f838a8a6b4c9f78ff00daa2b467e17";
+       libraryHaskellDepends = [ base casing lens servant-foreign text ];
+       testHaskellDepends = [ base doctest ];
+       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-scotty" = callPackage
     ({ mkDerivation, aeson, base, http-types, scotty, servant
      , servant-response, text, transformers
@@ -159980,7 +160379,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_1_1_2_1" = callPackage
@@ -160036,7 +160434,6 @@ self: {
        homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -160432,6 +160829,7 @@ self: {
        ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setops" = callPackage
@@ -160587,18 +160985,21 @@ self: {
      }) {};
 
   "sext" = callPackage
-    ({ mkDerivation, base, bytestring, template-haskell, text, vector
+    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
+     , template-haskell, text, vector
      }:
      mkDerivation {
        pname = "sext";
-       version = "0.1.2";
-       sha256 = "c046a0613bc8275f9e0c4c0052c2a9e9e7468fa20a1fd7f64a6d6ce5f02f46a1";
+       version = "0.1.3";
+       sha256 = "6b1cc147120f0730ed2aa199033c9840fde2ed235d2d243667ceceb2e123ca7c";
        libraryHaskellDepends = [
          base bytestring template-haskell text vector
        ];
-       testHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit template-haskell
+       ];
        homepage = "https://github.com/dzhus/sext#readme";
-       description = "Lists, Texts, ByteStrings, and Vectors with type-encoded length";
+       description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -160874,25 +161275,6 @@ self: {
      }) {};
 
   "shake-language-c" = callPackage
-    ({ mkDerivation, base, data-default-class, directory, doctest
-     , fclabels, hspec, process, shake, split, unordered-containers
-     }:
-     mkDerivation {
-       pname = "shake-language-c";
-       version = "0.10.0";
-       sha256 = "1b0f031c37db7ac320f80e09ab79dca2bdb85ba922a48c10f0954efd6d407888";
-       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;
-     }) {};
-
-  "shake-language-c_0_10_1" = callPackage
     ({ mkDerivation, base, data-default-class, directory, doctest
      , fclabels, hspec, process, shake, split, unordered-containers
      }:
@@ -160909,7 +161291,6 @@ self: {
        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
@@ -164345,31 +164726,31 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , case-insensitive, containers, deepseq, directory, filepath
      , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
-     , 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
+     , 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.1.0";
-       sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c";
-       revision = "1";
-       editedCabalFile = "ef248be20bc9d535defbc2f091db3f48dd02e5b233a8305f8ad3c83f2f4548c8";
+       version = "1.0.2.0";
+       sha256 = "e48eba4727169b9c599c6de1791deb881eeee12e25658a30590116b450e5b65c";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
-         containers directory filepath HUnit io-streams lifted-base
-         monad-control mtl old-locale random readable regex-posix text time
-         transformers transformers-base unix-compat unordered-containers
-         vector
+         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 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
+         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)";
@@ -166219,20 +166600,20 @@ self: {
      }) {};
 
   "sound-collage" = callPackage
-    ({ mkDerivation, array, base, carray, directory, fft, filepath
-     , numeric-prelude, optparse-applicative, sample-frame, soxlib
-     , storablevector, storablevector-carray, synthesizer-core
-     , temporary, transformers, utility-ht
+    ({ mkDerivation, array, base, Cabal, carray, containers, fft
+     , filepath, numeric-prelude, optparse-applicative, pathtype
+     , sample-frame, soxlib, storablevector, storablevector-carray
+     , synthesizer-core, temporary, transformers, utility-ht
      }:
      mkDerivation {
        pname = "sound-collage";
-       version = "0.1";
-       sha256 = "b584afca2dc682dfa7e5350b8eb3877b7cf6cedfb5f7ed9a7af006910b86fc87";
+       version = "0.2";
+       sha256 = "5c07cfaa39450292f4649d62c9e9d938a23ffd0baadd94feeb9db10a7e853ac2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base carray directory fft filepath numeric-prelude
-         optparse-applicative sample-frame soxlib storablevector
+         array base Cabal carray containers fft filepath numeric-prelude
+         optparse-applicative pathtype sample-frame soxlib storablevector
          storablevector-carray synthesizer-core temporary transformers
          utility-ht
        ];
@@ -166874,6 +167255,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sphinxesc" = callPackage
+    ({ mkDerivation, base, MissingH, optparse-applicative, parsec
+     , split
+     }:
+     mkDerivation {
+       pname = "sphinxesc";
+       version = "0.1.0.1";
+       sha256 = "f26952487373f7b14f3e3990b76dd5e81686b0d4dbaf76508e334213b997ea7c";
+       revision = "1";
+       editedCabalFile = "85317b910b35a1970e97bf69405bac67eb9ede00d54c27002caafbe742f2224a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base MissingH parsec split ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       homepage = "https://github.com/mackeyrms/sphinxesc#readme";
+       description = "Transform queries for sphinx input";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "spice" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, elerea
      , GLFW, JuicyPixels, JuicyPixels-repa, OpenGL
@@ -167070,8 +167470,8 @@ self: {
      }:
      mkDerivation {
        pname = "split-record";
-       version = "0.1.1.2";
-       sha256 = "8d87da014bbf612290335c4f2df31e77c30882ac3a2b8daae4158eab3483877e";
+       version = "0.1.1.3";
+       sha256 = "12df38229ac15f8851951d3be685f9b8941ae1d9d7541c3366ffa179856bba79";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167971,8 +168371,8 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "0.2.1";
-       sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f";
+       version = "0.2.2";
+       sha256 = "66c75aaf078dc778b2e33ddef4850107b5b488fd966c81c7e2f133539276b86e";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -168016,6 +168416,8 @@ self: {
        pname = "stack";
        version = "1.4.0";
        sha256 = "f10d6f031aa0e682da3e1f61fa12b9c31f1617150b0f99f691c873a0ce19e8b6";
+       revision = "4";
+       editedCabalFile = "13605cb5121333a73a680f622b29003ad03fbc720522119f740881ba1ecd4343";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169342,6 +169744,8 @@ self: {
        pname = "stm-io-hooks";
        version = "1.1.0";
        sha256 = "35014012b671a6964ec0d5f5de2ab13a61d8ee01cb0bbd685a3cc17385fae235";
+       revision = "1";
+       editedCabalFile = "b74a4d65fd2f5bbcdb0e1c52318d88db3240c513bb3fb9b2aa7a00ec00f39aa9";
        libraryHaskellDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
@@ -169662,8 +170066,8 @@ self: {
      }:
      mkDerivation {
        pname = "storablevector";
-       version = "0.2.11";
-       sha256 = "b2edb8234ae9de08baa4dc7b292314a2a9edaee5c090cedd7f3db405ab27c65e";
+       version = "0.2.12";
+       sha256 = "cb7e9eba213b609c8e08d1e84164976bba680d8450f43747d3c9edaacef7e8a6";
        libraryHaskellDepends = [
          base deepseq non-negative QuickCheck syb transformers unsafe
          utility-ht
@@ -171069,6 +171473,7 @@ self: {
        homepage = "https://github.com/nmattia/stutter#readme";
        description = "(Stutter Text|String)-Utterer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylish-haskell" = callPackage
@@ -171676,8 +172081,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.6";
-       sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732";
+       version = "0.6.1";
+       sha256 = "9bf58c55557d3e2675e16b17d1d77455a6f79946b087b3fdd8b4b96568045751";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -172510,8 +172915,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-core";
-       version = "0.8.0.2";
-       sha256 = "1ad216fe5cd2f22223349d584bd32be44bb12f76fcfa13e5198fc2e3108ee54f";
+       version = "0.8.1";
+       sha256 = "e928dc2138315d84c4057ee3eea1fe2a5c6568ebef980cab1eab07dec7781ad2";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq event-list
          explicit-exception filepath non-empty non-negative numeric-prelude
@@ -175702,8 +176107,8 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.2";
        sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
-       revision = "2";
-       editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62";
+       revision = "3";
+       editedCabalFile = "7fd007e9cb082cd64a2213a6d36acf057f7d6df6b5343a088e81b2b3a9a23545";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -176172,8 +176577,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.9.3";
-       sha256 = "541624a64a2dee55e87ce361a66fdd3c82856437b19e2a7c113a04cb7cbc8a7e";
+       version = "0.9.4";
+       sha256 = "da665d069708679fb40ee2e981dcdede55e79f3165c0ae09c55621273e682195";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177533,8 +177938,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.2.0";
-       sha256 = "c4dc8038b004f192854c5e8341c8cc4637f6c9d340a76e77f9e36ee412a7eb88";
+       version = "1.1.3.0";
+       sha256 = "2c3480876a2dda192edd72ba1ecc5fd8200b80b3a35f8b98b6cd0c4877f0832f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177930,6 +178335,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "threepenny-gui-flexbox_0_4_0_2" = callPackage
+    ({ mkDerivation, base, clay, text, threepenny-gui }:
+     mkDerivation {
+       pname = "threepenny-gui-flexbox";
+       version = "0.4.0.2";
+       sha256 = "6edbd91b86e3711bd9198e9747cbcc49603b5f852bfb175f24abceef90ce0918";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base clay text threepenny-gui ];
+       executableHaskellDepends = [ base threepenny-gui ];
+       homepage = "https://github.com/barischj/threepenny-gui-flexbox";
+       description = "Flexbox layouts for Threepenny-gui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "thrift" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network
@@ -178114,8 +178535,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.1.1";
-       sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a";
+       version = "0.1.1.2";
+       sha256 = "8dd09d6346d04736a03965d6c4c3146edcffaf017055941cab056f3fe1dac082";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -179370,35 +179791,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, criterion, cryptonite, data-default-class, hourglass
-     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
-     , transformers, x509, x509-store, x509-validation
+  "tldr" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
+     , filepath, optparse-applicative, semigroups, shell-conduit, text
      }:
      mkDerivation {
-       pname = "tls";
-       version = "1.3.9";
-       sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b";
+       pname = "tldr";
+       version = "0.2.0";
+       sha256 = "2abf1633a568f61c786ec3cfefeec3fa372b3e9d3301b9916516f6fbf0e6f69d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         asn1-encoding asn1-types async base bytestring cereal cryptonite
-         data-default-class memory mtl network transformers x509 x509-store
-         x509-validation
+         ansi-terminal base bytestring cmark text
        ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default-class hourglass mtl
-         QuickCheck tasty tasty-quickcheck x509 x509-validation
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative semigroups
+         shell-conduit
        ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion cryptonite data-default-class hourglass
-         mtl QuickCheck tasty-quickcheck x509 x509-validation
-       ];
-       homepage = "http://github.com/vincenthz/hs-tls";
-       description = "TLS/SSL protocol native implementation (Server and Client)";
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/psibi/tldr-hs#readme";
+       description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tls_1_3_10" = callPackage
+  "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, criterion, cryptonite, data-default-class, hourglass
      , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
@@ -179426,7 +179843,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls-debug" = callPackage
@@ -179820,8 +180236,8 @@ self: {
      }:
      mkDerivation {
        pname = "torrent";
-       version = "10000.0.1";
-       sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725";
+       version = "10000.1.1";
+       sha256 = "2009964210e229ee67254a73fead3413f60299415238887fa7ef30e40e06fa54";
        libraryHaskellDepends = [
          base bencode binary bytestring containers filepath syb
        ];
@@ -180583,6 +180999,7 @@ self: {
        homepage = "http://github.com/transient-haskell/transient-universe-tls";
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "translatable-intset" = callPackage
@@ -180878,25 +181295,18 @@ self: {
      }:
      mkDerivation {
        pname = "tries";
-       version = "0.0.4";
-       sha256 = "6be9638a03b35effe69c9bbfc33b00fe92156211945b83dee871e70cf266f94a";
+       version = "0.0.4.1";
+       sha256 = "c0b8ba913f98dd0732efe37bc29bacc28d2ed6d6ac23584102865e0cbeaab28a";
        libraryHaskellDepends = [
          base bytestring bytestring-trie composition composition-extra
          containers deepseq hashable keys QuickCheck quickcheck-instances
          rose-trees semigroups sets unordered-containers
        ];
        testHaskellDepends = [
-         base bytestring bytestring-trie composition composition-extra
-         containers deepseq hashable keys mtl QuickCheck
-         quickcheck-instances rose-trees semigroups sets tasty
-         tasty-quickcheck unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring bytestring-trie composition composition-extra
-         containers criterion deepseq hashable keys mtl QuickCheck
-         quickcheck-instances rose-trees semigroups sets
-         unordered-containers
+         base containers mtl QuickCheck quickcheck-instances tasty
+         tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181090,6 +181500,8 @@ self: {
        pname = "tskiplist";
        version = "1.0.0";
        sha256 = "aa20f823c787122858513b38207bc74e9eb032435ac7e6624569f1411d825e2d";
+       revision = "1";
+       editedCabalFile = "27204b6f7657f68fcab0bb7585905fe8d45177d2105352d17dec060b22115a98";
        libraryHaskellDepends = [ array base containers random stm ];
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
@@ -181561,29 +181973,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , criterion, directory, doctest, foldl, hostname, managed
-     , optional-args, optparse-applicative, process, stm, system-fileio
-     , system-filepath, temporary, text, time, transformers, unix
-     , unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.3.1";
-       sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock directory foldl hostname
-         managed optional-args optparse-applicative process stm
-         system-fileio system-filepath temporary text time transformers unix
-         unix-compat
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_3_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , criterion, directory, doctest, foldl, hostname, managed
      , optional-args, optparse-applicative, process, stm, system-fileio
@@ -181604,7 +181993,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -181674,6 +182062,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tweet-hs" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
+     , bytestring, composition, criterion, data-default, directory
+     , extra, hspec, hspec-megaparsec, http-client, http-client-tls
+     , http-types, lens, megaparsec, MissingH, optparse-applicative
+     , split, text
+     }:
+     mkDerivation {
+       pname = "tweet-hs";
+       version = "0.5.3.2";
+       sha256 = "749ac037384f0f9e09526cffcb7c1a55375480effeb3d586b19bcbb1f1c6e40e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint authenticate-oauth base bytestring composition
+         data-default directory extra http-client http-client-tls http-types
+         lens megaparsec MissingH optparse-applicative split text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
+       homepage = "https://github.com/vmchale/command-line-tweeter#readme";
+       description = "Command-line tool for twitter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twentefp" = callPackage
     ({ mkDerivation, base, gloss, parsec, time }:
      mkDerivation {
@@ -182860,6 +183276,7 @@ self: {
        ];
        description = "A stream based replacement for lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-wire" = callPackage
@@ -184740,30 +185157,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.7.2";
-       sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e";
-       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_8_0" = callPackage
     ({ mkDerivation, base, bytestring, ChasingBottoms, containers
      , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
      , mtl, QuickCheck, random, test-framework, test-framework-hunit
@@ -184785,7 +185178,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
@@ -184928,10 +185320,8 @@ self: {
      }:
      mkDerivation {
        pname = "unsequential";
-       version = "0.5.2";
-       sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a";
-       revision = "1";
-       editedCabalFile = "c74a7fd593a4e843d8d77e57180a71e5ed13a91fa8bfc2ea70453fc0f448f49e";
+       version = "0.5.2.1";
+       sha256 = "758767a7fe4757b5397e23a3c5344850298eec73414ca72f4f25397bf47e4302";
        libraryHaskellDepends = [ base base-prelude dlist transformers ];
        testHaskellDepends = [
          attoparsec interspersed QuickCheck quickcheck-instances rebase
@@ -185746,8 +186136,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "utility-ht";
-       version = "0.0.12";
-       sha256 = "a4445f436354599c1f3e923dfb3e4463b6f65e7c1dabea1e2d34d11c4a5b05ef";
+       version = "0.0.13";
+       sha256 = "952b77f060177f2eca3f61e2deec0e30693bb4471e936e13a7494a3e57f94cbe";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -187253,8 +187643,8 @@ self: {
      }:
      mkDerivation {
        pname = "vectortiles";
-       version = "1.2.0.2";
-       sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886";
+       version = "1.2.0.4";
+       sha256 = "0624b74d6c02f7add5cba5f3410c156a50a38fd170aeda5224ab4ceb596ec3c4";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq protobuf text
          transformers vector
@@ -187535,8 +187925,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.2.2.0";
-       sha256 = "ce63a34e2c7fd31b2ad2a9f1e9b8c3d2c10c70e1ba5ccf2b06e8dc99770b065d";
+       version = "0.2.3.0";
+       sha256 = "e4450254730743448d4462907b8ee0249edc4725d81277b57f3cf85a6c964300";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187893,14 +188283,12 @@ self: {
      }) {};
 
   "void" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, hashable, semigroups }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "void";
-       version = "0.7.1";
-       sha256 = "c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4";
-       libraryHaskellDepends = [
-         base deepseq ghc-prim hashable semigroups
-       ];
+       version = "0.7.2";
+       sha256 = "d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b";
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
        license = stdenv.lib.licenses.bsd3;
@@ -188748,8 +189136,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-auth";
-       version = "0.1.1.1";
-       sha256 = "591a7c723aac4916eec000d81c14c593d7ffbc497fc5afe7f41affa0f6975988";
+       version = "0.1.1.2";
+       sha256 = "f14016ba27f24a11395661cd2969cc41cf5a5043045468c584a0e03c4ddfa896";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189901,8 +190289,8 @@ self: {
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.7.0.3";
-       sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65";
+       version = "0.7.1";
+       sha256 = "a7598a4237dbb9008cf2c33b324fdc1625308b090b7bf969c66dba82ec442f6f";
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];
@@ -191402,16 +191790,17 @@ self: {
      }) {};
 
   "wires" = callPackage
-    ({ mkDerivation, base, deepseq, profunctors, semigroupoids, these
+    ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids
+     , these
      }:
      mkDerivation {
        pname = "wires";
-       version = "0.1.0";
-       sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65";
+       version = "0.2.0";
+       sha256 = "dd062d0863c401b3d54c404f95392d56a358fc4615fa614db60ae73cf66091b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base deepseq profunctors semigroupoids these
+         base deepseq mtl profunctors semigroupoids these
        ];
        homepage = "https://github.com/esoeylemez/wires";
        description = "Functional reactive programming library";
@@ -191483,23 +191872,6 @@ self: {
      }) {};
 
   "witherable" = callPackage
-    ({ mkDerivation, base, base-orphans, containers, hashable
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "witherable";
-       version = "0.1.3.3";
-       sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c";
-       libraryHaskellDepends = [
-         base base-orphans containers hashable transformers
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/fumieval/witherable";
-       description = "Generalization of filter and catMaybes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "witherable_0_1_3_4" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, unordered-containers, vector
      }:
@@ -191514,7 +191886,6 @@ self: {
        homepage = "https://github.com/fumieval/witherable";
        description = "filterable traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witness" = callPackage
@@ -192970,8 +193341,8 @@ self: {
      }:
      mkDerivation {
        pname = "xdcc";
-       version = "1.1.3";
-       sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e";
+       version = "1.1.4";
+       sha256 = "a9c4f4c904bb6d4c634b224eb0587babc60cbee51a9d7ed6a487f138df266464";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -195372,8 +195743,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql";
-       version = "2.2.0.0";
-       sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d";
+       version = "3.0.0.1";
+       sha256 = "659327284a2293694684134911b9f7a705f05520b2cd8cf0d1b519c72e079de2";
        libraryHaskellDepends = [
          base containers convertible filepath HDBC parsec syb-with-class
          template-haskell
@@ -195813,40 +196184,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, typed-process, unix-compat
-     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.5.2.1";
-       sha256 = "21e10e0f15af8505ae575103e3bad4f660a9ded28baccf275255c3f55d59ce57";
-       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
-         typed-process unix-compat unordered-containers wai wai-extra warp
-         warp-tls yaml zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-bin_1_5_2_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -195878,7 +196215,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
@@ -195995,6 +196331,8 @@ self: {
        pname = "yesod-core";
        version = "1.4.32";
        sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869";
+       revision = "1";
+       editedCabalFile = "570c6168c84e518cc4978bfbbfd7a2cc23a04879937f66a8729eb592a9492af8";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -198316,26 +198654,27 @@ self: {
 
   "zifter" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , filepath, genvalidity, genvalidity-hspec, hspec
+     , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec
      , optparse-applicative, path, path-io, process, QuickCheck, safe
      , stm, validity, validity-path
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.0";
-       sha256 = "f161fdbc1db3ccfe65bb47552cabc883a7b5a99e12fb4c27015264fab7ac958a";
+       version = "0.0.1.1";
+       sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
          validity-path
        ];
        testHaskellDepends = [
-         ansi-terminal base genvalidity genvalidity-hspec hspec path path-io
-         QuickCheck stm
+         ansi-terminal base directory genvalidity genvalidity-hspec
+         genvalidity-path hspec path path-io QuickCheck stm
        ];
        homepage = "http://cs-syd.eu";
        description = "zifter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zifter-cabal" = callPackage
@@ -198352,6 +198691,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zifter-git" = callPackage
@@ -198364,6 +198704,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zifter-hindent" = callPackage
@@ -198380,6 +198721,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zifter-hlint" = callPackage
@@ -198395,6 +198737,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zifter-stack" = callPackage
@@ -198411,6 +198754,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -198627,6 +198971,7 @@ self: {
        homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ziptastic-core" = callPackage

From e749fb1cfd6003fb1b82971ee61eadda9d55f565 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Mar 2017 14:14:11 +0200
Subject: [PATCH 0371/1744] Disable integer-simple variant of GHC 7.6.3 since
 it does not compile.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2ca2ff7e75e..2f21d2a5d74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -8,6 +8,7 @@ let # These are attributes in compiler and packages that don't support integer-s
       "ghc6104"
       "ghc6123"
       "ghc704"
+      "ghc763"
       "ghcjs"
       "ghcjsHEAD"
       "ghcCross"

From c8375914adc1f3bf614e4e3e97bc2bf19e8bee80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Mar 2017 17:42:13 +0100
Subject: [PATCH 0372/1744] haskell-arithmoi: re-enable test suite

---
 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 fe11b990156..d189ba2aeb8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -871,9 +871,6 @@ self: super: {
   # https://github.com/diagrams/diagrams-lib/issues/288
   diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
 
-  # https://github.com/cartazio/arithmoi/issues/49
-  arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; });
-
   # https://github.com/danidiaz/streaming-eversion/issues/1
   streaming-eversion = dontCheck super.streaming-eversion;
 

From 4c9306f4aad4e21f590dc1e3b0dcc101695fa144 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Mar 2017 17:46:21 +0100
Subject: [PATCH 0373/1744] haskell-haddock-api: drop obsolete patches

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d189ba2aeb8..edd4760140c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -486,14 +486,6 @@ self: super: {
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 
-  # https://github.com/haskell/haddock/issues/571
-  haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch {
-    url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch";
-    sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m";
-    stripLen = 2;
-    addPrefixes = true;
-  });
-
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 

From 80a52e22b3b017610f0d710f6fa257b0b601ebc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Mar 2017 17:48:33 +0100
Subject: [PATCH 0374/1744] haskell-haddock-library: enable test suite again

---
 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 edd4760140c..ef3725fb50f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -483,9 +483,6 @@ self: super: {
   # https://github.com/afcowie/locators/issues/1
   locators = dontCheck super.locators;
 
-  # https://github.com/haskell/haddock/issues/378
-  haddock-library = dontCheck super.haddock-library;
-
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 

From 2553ceb9820761e3c22c50db74513d5a0e1ba6d1 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sat, 25 Mar 2017 05:23:01 +0100
Subject: [PATCH 0375/1744] haskell: use GHCJS to build Setup.hs for GHCJS
 packages

Closes https://github.com/NixOS/nixpkgs/pull/23614.
---
 pkgs/development/compilers/ghcjs/stage2.nix         |  1 +
 .../haskell-modules/configuration-ghcjs.nix         |  8 ++++++++
 pkgs/development/haskell-modules/default.nix        |  1 +
 .../development/haskell-modules/generic-builder.nix | 13 +++++++++++--
 pkgs/development/haskell-modules/lib.nix            |  3 +++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix
index 8c68b6f15a6..b88051113b5 100644
--- a/pkgs/development/compilers/ghcjs/stage2.nix
+++ b/pkgs/development/compilers/ghcjs/stage2.nix
@@ -327,6 +327,7 @@
         version = "1.22.8.0";
         src = "${ghcjsBoot}/boot/cabal/Cabal";
         doCheck = false;
+        hyperlinkSource = false;
         libraryHaskellDepends = [
           array base binary bytestring containers deepseq directory filepath
           pretty process time unix
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 4ed6d8a957f..d6d7277cc9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -53,6 +53,14 @@ self: super:
   terminfo = self.terminfo_0_4_0_2;
   xhtml = self.xhtml_3000_2_1;
 
+  # Cabal isn't part of the stage1 packages which form the default package-db
+  # that GHCJS provides.
+  # Almost all packages require Cabal to build their Setup.hs,
+  # but usually they don't declare it explicitly as they don't need to for normal GHC.
+  # To account for that we add Cabal by default.
+  mkDerivation = args:
+    if args.pname == "Cabal" then super.mkDerivation args else super.mkDerivation (args //
+      { setupHaskellDepends = (args.setupHaskellDepends or []) ++ [ self.Cabal ]; });
 
 ## OTHER PACKAGES
 
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index df17c769ea2..8242990fe74 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,6 +15,7 @@ let
       mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
         inherit stdenv;
         inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
+        nodejs = pkgs.nodejs-slim;
         jailbreak-cabal = if (self.ghc.cross or null) != null
           then self.ghc.bootPkgs.jailbreak-cabal
           else self.jailbreak-cabal;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 42678e342be..1f5d97941ce 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs
+, jailbreak-cabal, hscolour, cpphs, nodejs
 }: let isCross = (ghc.cross or null) != null; in
 
 { pname
@@ -133,6 +133,7 @@ let
 
   setupCompileFlags = [
     (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
+    (optionalString isGhcjs "-build-runner")
     (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
     # https://github.com/haskell/cabal/issues/2398
     (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
@@ -157,7 +158,7 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
   setupCommand = "./Setup";
   ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
   crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
@@ -294,6 +295,14 @@ stdenv.mkDerivation ({
       local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
+    ${optionalString isGhcjs ''
+      for exeDir in "$out/bin/"*.jsexe; do
+        exe="''${exeDir%.jsexe}"
+        printf '%s\n' '#!${nodejs}/bin/node' > "$exe"
+        cat "$exeDir/all.js" >> "$exe"
+        chmod +x "$exe"
+      done
+    ''}
     ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
     ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
       for exe in "$out/bin/"* ; do
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 2093ec2b218..912d26c806c 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -38,6 +38,9 @@ rec {
   addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
   addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
 
+  addSetupDepend = drv: x: addSetupDepends drv [x];
+  addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; });
+
   enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
   disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
 

From a77e74d4091e077fadf89a1493405ea7c5474c64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Mar 2017 16:03:27 +0200
Subject: [PATCH 0376/1744] haskell-QuickCheck: fix build with GHC 7.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1be8f16a7d5..13ce111c8f8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -139,10 +139,15 @@ self: super: {
   conduit = addBuildDepend super.conduit self.void;
   conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void;
 
+  # Breaks a dependency cycle between QuickCheck and semigroups
+  hashable = dontCheck super.hashable;
+  unordered-containers = dontCheck super.unordered-containers;
+
   # Needs additional inputs on pre 7.10.x compilers.
   semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
+  QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;

From f79cb54cee61d09f627326a739097701a8ad70d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Mar 2017 16:09:11 +0200
Subject: [PATCH 0377/1744] haskell-extra: disable failing test suite on GHC
 7.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 13ce111c8f8..f63d31c9efd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -152,4 +152,7 @@ self: super: {
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;
 
+  # extra-test: <stdout>: hFlush: invalid argument (Bad file descriptor)
+  extra = dontCheck super.extra;
+
 }

From a4ce475b61b4c7fb611cbcf6480ce4f03690220c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Mar 2017 16:11:38 +0200
Subject: [PATCH 0378/1744] haskell-void: fix build with GHC 7.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index f63d31c9efd..1a151efcf38 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -148,6 +148,7 @@ self: super: {
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
+  void = addBuildDepends super.void (with self; [hashable semigroups]);
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;

From 4753a00caaf8f914e22947d10d182b9afbba2ca9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Mar 2017 16:16:20 +0200
Subject: [PATCH 0379/1744] haskell-QuickCheck: fix build with GHC 7.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 3bbfa34fb50..4c2fb69ec80 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -92,7 +92,8 @@ self: super: {
   # Needs tagged on pre 7.6.x compilers.
   reflection = addBuildDepend super.reflection self.tagged;
 
-  # Needs nats on pre 7.6.x compilers.
-  semigroups = addBuildDepend super.semigroups self.nats;
+  # These builds Need additional dependencies on pre 7.6.x compilers.
+  semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
+  QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
 
 }

From 1258bf9d2cb29e414b3cea488e16be7a190049f9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 29 Mar 2017 22:29:19 +0200
Subject: [PATCH 0380/1744] lispPackages.clwrapper: allow to replace the code
 to load ASDF

---
 pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 5bf375a4eff..90fa48814a2 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -46,7 +46,7 @@ NIX_LISP_ASDF_REGISTRY_CODE="
 NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}"
 
 [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
-	$NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \
+	$NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \
 	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
 	$NIX_LISP_FINAL_PARAMETERS \
 	"$@"

From 08c87eed00c7478a03d965570feb50c8f317ce5f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 29 Mar 2017 18:39:34 +0000
Subject: [PATCH 0381/1744] ocamlPackages.extlib: 1.6.1 -> 1.7.2

---
 pkgs/development/ocaml-modules/extlib/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 492b10bb09b..6c2cb894b54 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}:
+{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
 
 stdenv.mkDerivation {
-  name = "ocaml-extlib-1.6.1";
+  name = "ocaml-extlib-1.7.2";
 
   src = fetchurl {
-    url = http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz;
-    sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
+    url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz;
+    sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm";
   };
 
-  buildInputs = [ocaml findlib camlp4];
+  buildInputs = [ ocaml findlib cppo ];
 
   createFindlibDestdir = true;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   installPhase   = "make ${if minimal then "minimal=1" else ""} install";
 
   meta = {
-    homepage = http://code.google.com/p/ocaml-extlib/;
+    homepage = https://github.com/ygrek/ocaml-extlib;
     description = "Enhancements to the OCaml Standard Library modules";
     license = stdenv.lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];

From 97941b54f9e272a0e1702e1d128ca41d097ad907 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Thu, 30 Mar 2017 00:06:47 +0300
Subject: [PATCH 0382/1744] webstorm: 2016.3.3 -> 2017.1

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e4589088e7f..dc40d40d14e 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -304,12 +304,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2016.3.3";
+    version = "2017.1";
     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 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y";
+      sha256 = "e651ad78ff9de92bb5b76698eeca1e02ab0f0c36209908074fa4a6b48586071c";
     };
     wmClass = "jetbrains-webstorm";
   };

From b083a374aae922d840cade623c435dcccb791bbc Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 29 Mar 2017 21:58:16 +0000
Subject: [PATCH 0383/1744] rustRegistry: 2017-03-22 -> 2017-03-29

Update the `rustRegistry` to a more recent version. I have tested this
change per nixpkgs manual section 11.1 ("Making patches").
---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 6fcd0fca17a..6ca18ed4668 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-03-22";
-  rev = "2458be6157706b6c92e37baa19703c15d89f6b3a";
-  sha256 = "19ij0fqy5j4lz73w4p29wv4gsxhs345ajxm4bxpq6gx2h4x6qk06";
+  version = "2017-03-29";
+  rev = "d9dbb2fc117bf730d1f54b090b3af407e8e5ff20";
+  sha256 = "1vrzr4v8qp5jy3xmqrcyk9naik3rngk8hzxif42y687ncppzrsdl";
 
   src = fetchFromGitHub {
       inherit rev;

From eb6a1f1f4103869df6fd948c8c1e7dc46a99a7e1 Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 29 Mar 2017 22:24:38 +0000
Subject: [PATCH 0384/1744] rustfmt: 0.8 -> 0.8.1

Update the `rustfmt` package from version 0.8 to version 0.8.1.

I have tested this change per nixpkgs manual section 11.1 ("Making
patches").
---
 pkgs/development/tools/rust/rustfmt/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index e636c72b420..a7164b14d3f 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "0.8";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = version;
-    sha256 = "0a613x1ckwl30yamba9m7xi3xrn8pg92p2w3v7k723whyivmjk1s";
+    rev = "v${version}";
+    sha256 = "05rjx7i4wn3z3j8bgqsn146a9vbni6xhxaim9nq13c6dm4nrx96b";
   };
 
-  depsSha256 = "1vach2xf0cs7nivbakhmrm2aqdif3i5vg1syffrs2ghcix9hd21p";
+  depsSha256 = "1rnk33g85r1hkw9l9c52dzr4zka5kghbci9qwni3ph19rfqf0a73";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From 49f1abec15ce5fd081df196caf86554bcc82643b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 17 Mar 2017 22:17:02 +0200
Subject: [PATCH 0385/1744] U-Boot: 2017.01 -> 2017,03

---
 pkgs/misc/uboot/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9e133e9f332..d2fadad8852 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -10,17 +10,21 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.01";
+    version = "2017.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc";
+      sha256 = "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm";
     };
 
     nativeBuildInputs = [ bc dtc python2 ];
 
     hardeningDisable = [ "all" ];
 
+    postPatch = ''
+      patchShebangs tools
+    '';
+
     configurePhase = ''
       make ${defconfig}
     '';

From adb460b30f161a223e82efdfa9d341f78f560daf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 29 Mar 2017 13:02:36 +0300
Subject: [PATCH 0386/1744] mesa: Enable imx gallium driver on ARM

And lighten the aarch64 build by disabling drivers for hardware that
doesn't run on aarch64 processors.
---
 pkgs/development/libraries/mesa/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index eac07ddbfb1..ea8bd57766b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -32,8 +32,10 @@ else
 
 let
   defaultGalliumDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
-    then ["nouveau" "freedreno" "vc4" "etnaviv"]
+    if stdenv.isArm
+    then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
+    else if stdenv.isAarch64
+    then ["nouveau" "vc4" ]
     else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
     if (stdenv.isArm || stdenv.isAarch64)

From da16238077e64cc86164e2fd205e3f51c04b1227 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 29 Mar 2017 19:07:54 -0500
Subject: [PATCH 0387/1744] sylpheed: 3.5.0 -> 3.5.1

---
 .../networking/mailreaders/sylpheed/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index b1cdd509f98..509a2ab0118 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, pkgconfig, gtk2
-
 , openssl ? null
 , gpgme ? null
 , sslSupport ? true
@@ -13,15 +12,16 @@ assert gpgSupport -> gpgme != null;
 
 stdenv.mkDerivation rec {
   name = "sylpheed-${version}";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2";
-    sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa";
+    sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs =
-    [ pkgconfig gtk2 ]
+    [ gtk2 ]
     ++ optional sslSupport openssl
     ++ optional gpgSupport gpgme;
 

From 24c616c4b67b0be370938868ca2f995ee651ace7 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:01:53 -0500
Subject: [PATCH 0388/1744] ctypes: 0.4.1 -> 0.11.2

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

diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index e64310f6db8..aaddc7b08d5 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -2,13 +2,13 @@
 
 buildOcaml rec {
   name = "ctypes";
-  version = "0.4.1";
+  version = "0.11.2";
 
   minimumSupportedOcamlVersion = "4";
 
   src = fetchurl {
     url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
-    sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5";
+    sha256 = "1ml80i8j5lpg3qwc074fks2hgxjq5cfdm9r6cznv605s05ajr3kh";
   };
 
   buildInputs = [ ncurses pkgconfig ];

From 401c284af0571ae7a1937bf6ab9eb6b27bc1e61e Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Fri, 24 Mar 2017 19:34:02 -0400
Subject: [PATCH 0389/1744] ocaml-async_ssl: 112.24.03 -> 113.33.07

---
 .../ocaml-modules/async_ssl/default.nix       | 25 -------------------
 .../ocaml-modules/janestreet/async_ssl.nix    | 16 ++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +--
 3 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/async_ssl/default.nix
 create mode 100644 pkgs/development/ocaml-modules/janestreet/async_ssl.nix

diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix
deleted file mode 100644
index 2bace35aa8b..00000000000
--- a/pkgs/development/ocaml-modules/async_ssl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, comparelib, core_p4, ctypes, openssl,
- fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}:
-
-buildOcaml rec {
-  name = "async_ssl";
-  version = "112.24.03";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz";
-    sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68";
-  };
-
-  buildInputs = [ pa_bench pa_test ];
-  propagatedBuildInputs = [ ctypes async_p4 comparelib core_p4 fieldslib_p4 pa_ounit
-                            herelib pipebang sexplib_p4 openssl ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/janestreet/async_ssl;
-    description = "Async wrappers for ssl";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
new file mode 100644
index 00000000000..5cd4c6064e0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -0,0 +1,16 @@
+{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl,
+ fieldslib, herelib, pipebang, sexplib, ocaml_oasis}:
+
+buildOcamlJane rec {
+  name = "async_ssl";
+  version = "113.33.07";
+  hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
+  propagatedBuildInputs = [ ctypes async comparelib core fieldslib
+                            herelib pipebang sexplib openssl ocaml_oasis ];
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_ssl;
+    description = "Async wrappers for ssl";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index eba34692082..7adf1495eb2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -36,8 +36,6 @@ let
 
     async_shell = callPackage ../development/ocaml-modules/async_shell { };
 
-    async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
-
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
 
     async_p4 =
@@ -767,6 +765,8 @@ let
       then callPackage ../development/ocaml-modules/janestreet/async.nix {}
       else async_p4;
 
+    async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+
     # Apps / from all-packages
 
     wyrd = callPackage ../tools/misc/wyrd { };

From f67ec45de6cd503d175c46c74465c72c61846984 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 10:41:25 +0800
Subject: [PATCH 0390/1744] gcalcli: fix notifications on linux

Couple of things:

 - fix the path to notify-send
 - add a standard icon to the notification
 - rename the notification from "gcalcli" to "Calendar"

Lastly, there are no tests, so do not try to run them.
---
 pkgs/applications/misc/gcalcli/default.nix | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 7560a8bfeb4..d3ba5a97333 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,13 +1,14 @@
-{ fetchFromGitHub, lib, pythonPackages }:
+{ stdenv, lib, fetchFromGitHub, pythonPackages
+, libnotify ? null }:
 
 pythonPackages.buildPythonApplication rec {
   version = "3.4.0";
   name = "gcalcli-${version}";
 
   src = fetchFromGitHub {
-    owner = "insanum";
-    repo = "gcalcli";
-    rev = "v${version}";
+    owner  = "insanum";
+    repo   = "gcalcli";
+    rev    = "v${version}";
     sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
   };
 
@@ -20,12 +21,23 @@ pythonPackages.buildPythonApplication rec {
     parsedatetime
     six
     vobject
-  ] ++ lib.optional (!pythonPackages.isPy3k) futures;
+  ]
+  ++ lib.optional (!pythonPackages.isPy3k) futures;
+
+  # there are no tests as of 3.4.0
+  doCheck = false;
+
+  postInstall = lib.optionalString stdenv.isLinux ''
+    substituteInPlace $out/bin/gcalcli \
+      --replace "command = 'notify-send -u critical -a gcalcli %s'" \
+                "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
+  '';
 
   meta = with lib; {
     homepage = https://github.com/insanum/gcalcli;
     description = "CLI for Google Calendar";
     license = licenses.mit;
-    maintainers = [ maintainers.nocoolnametom ];
+    maintainers = with maintainers; [ nocoolnametom ];
+    inherit version;
   };
 }

From 2cef2c58ead2a9469495c08b8e49087f9b3d28cd Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Wed, 29 Mar 2017 22:19:07 +0200
Subject: [PATCH 0391/1744] =?UTF-8?q?bitlbee-facebook:=202015-08-27=20?=
 =?UTF-8?q?=E2=86=92=201.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instant-messengers/bitlbee-facebook/default.nix   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index bfd4e11ccac..5645e1cebaa 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -2,16 +2,19 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-facebook-2015-08-27";
+  name = "bitlbee-facebook-${version}";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
-    rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";
+    rev = "v${version}";
     owner = "jgeboski";
     repo = "bitlbee-facebook";
-    sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";
+    sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s";
   };
 
-  buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];
+  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+
+  buildInputs = [ bitlbee glib json_glib ];
 
   preConfigure = ''
     export BITLBEE_PLUGINDIR=$out/lib/bitlbee

From 2f020cf7c1aba4e2b02f55395f069e8072d75b68 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 23 Mar 2017 08:40:21 +0100
Subject: [PATCH 0392/1744] ocamlPackages.ocf: init at 0.5.0

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

diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
new file mode 100644
index 00000000000..11be8a13a57
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
+
+if stdenv.lib.versionOlder ocaml.version "4.03"
+then throw "ocf not supported for ocaml ${ocaml.version}"
+else
+stdenv.mkDerivation rec {
+  name = "ocf-${version}";
+  version = "0.5.0";
+  src = fetchFromGitHub {
+    owner = "zoggy";
+    repo = "ocf";
+    rev = "release-${version}";
+    sha256 = "1fhq9l2nmr39hxzpavc0jssmba71nnmhsncdn4dsbh2ylv29w56y";
+  };
+
+  buildInputs = [ ocaml findlib ppx_tools ];
+  propagatedBuildInputs = [ yojson ];
+
+  createFindlibDestdir = true;
+
+  patches = [(fetchpatch {
+    url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch";
+    sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5";
+  })
+  ];
+  meta = with stdenv.lib; {
+    description = "OCaml library to read and write configuration options in JSON syntax";
+    homepage = "https://zoggy.github.io/ocf/";
+    license = licenses.lgpl3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [ regnat ];
+  };
+}
+
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7adf1495eb2..aa2c8fd87da 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -371,6 +371,8 @@ let
 
     ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
 
+    ocf = callPackage ../development/ocaml-modules/ocf { };
+
     ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
 
     ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };

From 40158137fd427a8d76eb157962e7dea152605ee7 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 23 Mar 2017 08:56:01 +0100
Subject: [PATCH 0393/1744] ocamlPackages.xtmpl: init at 0.16.0

---
 .../ocaml-modules/xtmpl/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/xtmpl/default.nix

diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
new file mode 100644
index 00000000000..c3d7637e870
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml
+, re }:
+
+if stdenv.lib.versionOlder ocaml.version "4.03"
+then throw "xtmpl not supported for ocaml ${ocaml.version}"
+else
+stdenv.mkDerivation rec {
+  name = "xtmpl-${version}";
+  version = "0.16.0";
+  src = fetchFromGitHub {
+    owner = "zoggy";
+    repo = "xtmpl";
+    rev = version;
+    sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k";
+  };
+
+  buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ];
+  propagatedBuildInputs = [ sedlex uutf re ];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "Xml template library for OCaml";
+    homepage = "https://zoggy.github.io/xtmpl/";
+    license = licenses.lgpl3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [ regnat ];
+  };
+}
+
+
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index aa2c8fd87da..9c105847581 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -555,6 +555,8 @@ let
 
     xml-light = callPackage ../development/ocaml-modules/xml-light { };
 
+    xtmpl = callPackage ../development/ocaml-modules/xtmpl { };
+
     yojson = callPackage ../development/ocaml-modules/yojson { };
 
     zarith = callPackage ../development/ocaml-modules/zarith { };

From 89e5963f2ca90ebfe66609a0ccb1a5c0ea6643d1 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 23 Mar 2017 08:58:25 +0100
Subject: [PATCH 0394/1744] ocamlPackages.higlo: init at 0.6

---
 .../ocaml-modules/higlo/default.nix           | 29 +++++++++++++++++++
 .../ocaml-modules/higlo/install.patch         | 14 +++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/higlo/default.nix
 create mode 100644 pkgs/development/ocaml-modules/higlo/install.patch

diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
new file mode 100644
index 00000000000..1e3a9713406
--- /dev/null
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
+
+stdenv.mkDerivation rec {
+  name = "higlo-${version}";
+  version = "0.6";
+  src = fetchFromGitHub {
+    owner = "zoggy";
+    repo = "higlo";
+    rev = "release-${version}";
+    sha256 = "0m0qyk2ydivai54502s45sdw9w4xr0j3jpwyc4vqk62a7iz9ihxh";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ xtmpl ulex ];
+
+  createFindlibDestdir = true;
+
+  patches = ./install.patch;
+
+  meta = with stdenv.lib; {
+    description = "OCaml library for syntax highlighting";
+    homepage = "https://zoggy.github.io/higlo/";
+    license = licenses.lgpl3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [ regnat ];
+  };
+}
+
+
diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/pkgs/development/ocaml-modules/higlo/install.patch
new file mode 100644
index 00000000000..bbdaace293b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/higlo/install.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index b8c2e01..fcd07ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -149,7 +149,8 @@ webdoc:
+ install: install-lib install-bin
+ 
+ install-bin:
+-	$(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) `dirname \`which ocamlfind\``/
++	mkdir -p $(out)/bin
++	$(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) $(out)/bin
+ 
+ install-lib: higlo.cmo higlo.cmx higlo.cmxs $(HIGLO) $(HIGLO_BYTE)
+ 	ocamlfind install higlo META LICENSE \
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9c105847581..54a8c533879 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -203,6 +203,8 @@ let
 
     herelib = callPackage ../development/ocaml-modules/herelib { };
 
+    higlo = callPackage ../development/ocaml-modules/higlo { };
+
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
     ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { };

From 4e9e1bc7ba2a950542b3b330fd14bb4ce6dceb8f Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 23 Mar 2017 09:02:21 +0100
Subject: [PATCH 0395/1744] stog: init at 0.17.0

---
 pkgs/applications/misc/stog/default.nix   | 31 +++++++++++++++++++++++
 pkgs/applications/misc/stog/install.patch | 18 +++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/ocaml-packages.nix         |  2 ++
 4 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/misc/stog/default.nix
 create mode 100644 pkgs/applications/misc/stog/install.patch

diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
new file mode 100644
index 00000000000..fa160c51fe2
--- /dev/null
+++ b/pkgs/applications/misc/stog/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime,
+  uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd
+}:
+
+stdenv.mkDerivation rec {
+  name = "stog-${version}";
+  version = "0.17.0";
+  src = fetchFromGitHub {
+    owner = "zoggy";
+    repo = "stog";
+    rev = "release-${version}";
+    sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d";
+  };
+
+  buildInputs = [ ocaml camlp4 uutf ];
+  propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ];
+
+  createFindlibDestdir = true;
+
+  patches = [ ./install.patch ];
+
+  meta = with stdenv.lib; {
+    description = "XML documents and web site compiler";
+    homepage = "https://zoggy.github.io/stog/";
+    license = licenses.lgpl3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [ regnat ];
+  };
+}
+
+
diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch
new file mode 100644
index 00000000000..a2407d3079f
--- /dev/null
+++ b/pkgs/applications/misc/stog/install.patch
@@ -0,0 +1,18 @@
+diff --git a/src/Makefile b/src/Makefile
+index 736dd037..79a85b9c 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -431,11 +431,12 @@ install-lib:
+ install-share:
+ 
+ install-bin:
++	mkdir $(out)/bin
+ 	$(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \
+ 		$(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \
+ 	  $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \
+ 	  $(LATEX2STOG) $(LATEX2STOG_BYTE) \
+-		`dirname \`which $(OCAMLC)\``/
++	  $(out)/bin
+ 
+ uninstall: uninstall-lib uninstall-share uninstall-bin
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7567b54977f..4d7ee99c688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15507,6 +15507,8 @@ with pkgs;
 
   stalonetray = callPackage ../applications/window-managers/stalonetray {};
 
+  inherit (ocamlPackages_4_03) stog;
+
   stp = callPackage ../applications/science/logic/stp {};
 
   stumpwm = callPackage ../applications/window-managers/stumpwm {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 54a8c533879..232f1331865 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -517,6 +517,8 @@ let
 
     stdio = callPackage ../development/ocaml-modules/stdio { };
 
+    stog = callPackage ../applications/misc/stog { };
+
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
     topkg = callPackage ../development/ocaml-modules/topkg { };

From 5bb5ce050bce7b388694e733bed4f60a09896daf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 30 Mar 2017 11:14:42 +0800
Subject: [PATCH 0396/1744] dynamic-colors: 0.2.1 -> 0.2.2

---
 pkgs/tools/misc/dynamic-colors/default.nix | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index b32f8f43146..33990921786 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dynamic-colors-${version}";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
-    owner = "peterhoeg";
-    repo = "dynamic-colors";
-    rev = "v${version}";
-    sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5";
+    owner  = "peterhoeg";
+    repo   = "dynamic-colors";
+    rev    = "v${version}";
+    sha256 = "1f1h3sywwlr5qc35pg7vvgk0f90n0vmxva4jxg4m2p63b4b91n7f";
   };
 
   dontBuild = true;
@@ -17,24 +17,24 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p \
       $out/bin \
-      $out/share/colorschemes \
+      $out/share/dynamic-colors/colorschemes \
       $out/share/bash-completion/completions \
       $out/share/zsh/site-packages
 
     install -m755 bin/dynamic-colors              $out/bin/
     install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors
     install -m644 completions/dynamic-colors.zsh  $out/share/zsh/site-packages/_dynamic-colors
-    install -m644 colorschemes/*               -t $out/share/colorschemes
+    install -m644 colorschemes/*               -t $out/share/dynamic-colors/colorschemes
 
-    sed -e "s|/usr/share/dynamic-colors|$out/share|g" \
-        -i $out/bin/dynamic-colors
+    substituteInPlace $out/bin/dynamic-colors \
+      --replace /usr/share/dynamic-colors $out/share/dynamic-colors
   '';
 
-  meta = {
-    homepage = https://github.com/peterhoeg/dynamic-colors;
-    license = stdenv.lib.licenses.mit;
+  meta = with stdenv.lib; {
     description = "Change terminal colors on the fly";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peterhoeg ];
+    homepage    = https://github.com/peterhoeg/dynamic-colors;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
   };
 }

From 0843ad10fd5cf984b36cf7e6533a518cab299af4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 30 Mar 2017 11:52:35 +0800
Subject: [PATCH 0397/1744] dynamic-colors: 0.2.2 -> 0.2.2.1

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

diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index 33990921786..e2f2f51ccfb 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dynamic-colors-${version}";
-  version = "0.2.2";
+  version = "0.2.2.1";
 
   src = fetchFromGitHub {
     owner  = "peterhoeg";
     repo   = "dynamic-colors";
     rev    = "v${version}";
-    sha256 = "1f1h3sywwlr5qc35pg7vvgk0f90n0vmxva4jxg4m2p63b4b91n7f";
+    sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw";
   };
 
   dontBuild = true;

From fdd654a7a9fafccf1b920b4395b36c5318347dcd Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 29 Mar 2017 06:47:30 -0300
Subject: [PATCH 0398/1744] openshot-qt: 2.1.0 -> 2.2.0

Also, libopenshot and libopenshot-audio
are now directly referenced on all-packages.nix.
---
 .../video/openshot-qt/default.nix             | 39 +++++++++-------
 .../video/openshot-qt/libopenshot-audio.nix   | 29 +++++++-----
 .../video/openshot-qt/libopenshot.nix         | 45 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 ++-
 4 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index a1d8cb0f01e..3232e9c089b 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,26 +1,24 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
-, ffmpeg, python3Packages, libopenshot, qtbase, qtmultimedia }:
+{ stdenv, fetchFromGitHub
+, doxygen, python3Packages, ffmpeg, libopenshot
+, qtbase, qtmultimedia, makeQtWrapper }:
 
 with stdenv.lib;
-
 stdenv.mkDerivation rec {
   name = "openshot-qt-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
     rev = "v${version}";
-    sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c";
+    sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037";
   };
+    
+  buildInputs =
+  [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ];
 
-  buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
-
-  propagatedBuildInputs = [
-    qtbase
-    qtmultimedia
-    libopenshot
-  ];
+  nativeBuildInputs =
+  [ doxygen makeQtWrapper ];
 
   installPhase = ''
     mkdir -p $(toPythonPath $out)
@@ -29,17 +27,24 @@ stdenv.mkDerivation rec {
     echo "#/usr/bin/env sh" >$out/bin/openshot-qt
     echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt
     chmod +x $out/bin/openshot-qt
-    wrapProgram $out/bin/openshot-qt \
+    wrapQtProgram $out/bin/openshot-qt \
       --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
   '';
 
   doCheck = false;
 
   meta = {
-    homepage = "http://openshot.org/";
+    homepage = http://openshot.org/;
     description = "Free, open-source video editor";
-    license = licenses.gpl3Plus;
-    maintainers = [];
-    platforms = platforms.linux;
+    longDescription = ''
+      OpenShot Video Editor is a free, open-source video editor for Linux.
+      OpenShot can take your videos, photos, and music files and help you
+      create the film you have always dreamed of. Easily add sub-titles,
+      transitions, and effects, and then export your film to DVD, YouTube,
+      Vimeo, Xbox 360, and many other common formats.
+    '';
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 069c3ba7800..82c7f247189 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -1,8 +1,7 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, doxygen
-, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor, alsaLib}:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib
+, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
 
 with stdenv.lib;
-
 stdenv.mkDerivation rec {
   name = "libopenshot-audio-${version}";
   version = "0.1.2";
@@ -14,18 +13,24 @@ stdenv.mkDerivation rec {
     sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
   };
 
-  buildInputs = [
-    cmake doxygen
-    libX11 libXft libXrandr libXinerama libXext libXcursor alsaLib
-  ];
+  nativeBuildInputs =
+  [ pkgconfig cmake doxygen ];
+
+  buildInputs =
+  [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ];
 
   doCheck = false;
 
   meta = {
-    homepage = "http://openshot.org/";
-    description = "Free, open-source video editor";
-    license = licenses.gpl3Plus;
-    maintainers = [];
-    platforms = platforms.linux;
+    homepage = http://openshot.org/;
+    description = "High-quality sound editing library";
+    longDescription = ''
+      OpenShot Audio Library (libopenshot-audio) is a program that allows the
+      high-quality editing and playback of audio, and is based on the amazing
+      JUCE library.
+    '';
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index de4a0cf1dcd..dd141043169 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
-, cppzmq, czmqpp
-}:
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake, doxygen
+, libopenshot-audio, imagemagick, ffmpeg
+, swig, python3, ruby
+, unittest-cpp, cppzmq, czmqpp
+, qtbase, qtmultimedia }:
 
 with stdenv.lib;
-
-let
-  libopenshot_audio = callPackage ./libopenshot-audio.nix {};
-in
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm";
+    sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f";
   };
 
   patchPhase = ''
@@ -27,22 +25,27 @@ stdenv.mkDerivation rec {
     export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
   '';
 
-  buildInputs = [
-    cmake doxygen
-    imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
-    unittest-cpp cppzmq czmqpp
-  ];
+  nativeBuildInputs = [ pkgconfig cmake doxygen ];
 
-  LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";
+  buildInputs =
+  [ imagemagick ffmpeg swig python3 ruby unittest-cpp
+    cppzmq czmqpp qtbase qtmultimedia ];
+
+  LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
   "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
 
   doCheck = false;
 
   meta = {
-    homepage = "http://openshot.org/";
-    description = "Free, open-source video editor";
-    license = licenses.gpl3Plus;
-    maintainers = [];
-    platforms = platforms.linux;
+    homepage = http://openshot.org/;
+    description = "Free, open-source video editor library";
+    longDescription = ''
+      OpenShot Library (libopenshot) is an open-source project dedicated to
+      delivering high quality video editing, animation, and playback solutions
+      to the world. API currently supports C++, Python, and Ruby.
+    '';
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61ff664d446..995cd24662e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5329,7 +5329,7 @@ with pkgs;
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;
-
+  
   openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
@@ -9517,7 +9517,9 @@ with pkgs;
 
     libktorrent = callPackage ../development/libraries/libktorrent { };
 
-    libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {};
+    libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
+
+    libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
 
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;

From 835a692e9c588411e6292b25e942375d2c4ea656 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 30 Mar 2017 08:16:23 +0200
Subject: [PATCH 0399/1744] vim-elixir: 2017-02-21 -> 2017-03-29

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 47f58aeee85..4f6db509a57 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,11 +647,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-02-21";
+    name = "vim-elixir-2017-03-29";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e";
-      sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2";
+      rev = "9482415ab27fddf8125524f54d9e500bb9541756";
+      sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq";
     };
     dependencies = [];
 

From 4c0d7da1837356047aabfed4661daf4307821b75 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 8 Feb 2017 20:52:13 -0500
Subject: [PATCH 0400/1744] Get rid of all `with { inherit... }` and just used
 `let inherit...`

The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
---
 lib/attrsets.nix                                          | 4 ++--
 lib/types.nix                                             | 2 +-
 pkgs/applications/editors/codeblocks/default.nix          | 2 --
 pkgs/applications/networking/p2p/transmission/default.nix | 2 +-
 pkgs/applications/office/libreoffice/default.nix          | 2 +-
 pkgs/applications/office/libreoffice/still.nix            | 2 +-
 pkgs/development/libraries/cairo/default.nix              | 2 +-
 pkgs/development/libraries/freetype/default.nix           | 8 ++++----
 pkgs/development/libraries/gmp/5.1.x.nix                  | 2 +-
 pkgs/development/libraries/gmp/6.x.nix                    | 2 +-
 pkgs/development/libraries/libav/default.nix              | 2 +-
 pkgs/development/libraries/libgsf/default.nix             | 2 +-
 pkgs/development/libraries/nghttp2/default.nix            | 2 +-
 pkgs/development/mobile/androidenv/androidsdk.nix         | 2 +-
 pkgs/development/tools/misc/binutils/default.nix          | 2 +-
 pkgs/games/oilrush/default.nix                            | 2 +-
 pkgs/servers/coturn/default.nix                           | 2 +-
 pkgs/servers/dns/knot-dns/default.nix                     | 2 +-
 pkgs/tools/misc/hdf5/default.nix                          | 2 +-
 19 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index c1bd764c70d..f9e6b7495fc 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1,12 +1,12 @@
 # Operations on attribute sets.
 
-with {
+let
   inherit (builtins) head tail length;
   inherit (import ./trivial.nix) or;
   inherit (import ./default.nix) fold;
   inherit (import ./strings.nix) concatStringsSep;
   inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
-};
+in
 
 rec {
   inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr;
diff --git a/lib/types.nix b/lib/types.nix
index 175cb7472bf..c834cc8e653 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -6,7 +6,7 @@ with import ./attrsets.nix;
 with import ./options.nix;
 with import ./trivial.nix;
 with import ./strings.nix;
-with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; };
+let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in
 
 rec {
 
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 8ee08f57655..20c2623e034 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -4,8 +4,6 @@
 
 with stdenv.lib;
 
-with { inherit (stdenv.lib) optionalString optional optionals; };
-
 stdenv.mkDerivation rec {
   name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
   version = "16.01";
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 12692b9566f..6feeacc675a 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -10,7 +10,7 @@ let
   version = "2.92";
 in
 
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let inherit (stdenv.lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
   name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 59389a69e7c..c43a06838b8 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -22,7 +22,7 @@ let
   primary-src = import ./default-primary-src.nix { inherit fetchurl; };
 in
 
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
 
 let
   lib = stdenv.lib;
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index b973a4192bb..7a2174b557e 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -22,7 +22,7 @@ let
   primary-src = import ./still-primary-src.nix { inherit fetchurl; };
 in
 
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
 
 let
   lib = stdenv.lib;
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e1b87fafd8e..3db8b719f77 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,7 +9,7 @@
 
 assert glSupport -> mesa_noglu != null;
 
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   name = "cairo-1.14.8";
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index f966965fa5f..6a2d226e608 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -9,11 +9,11 @@
   useEncumberedCode ? true,
 }:
 
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+  version = "2.7.1"; name = "freetype-" + version;
 
-let version = "2.7.1"; name = "freetype-" + version; in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   inherit name;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index b5cd936ce4f..14104b30d12 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
 
-with { inherit (stdenv.lib) optional optionalString; };
+let inherit (stdenv.lib) optional optionalString; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 4d12ed8a8b1..bb4e40dd3a7 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
 
-with { inherit (stdenv.lib) optional optionalString; };
+let inherit (stdenv.lib) optional optionalString; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-6.1.1";
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 6d81a284040..e0b4babc970 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -17,7 +17,7 @@
 
 assert faacSupport -> enableUnfree;
 
-with { inherit (stdenv.lib) optional optionals hasPrefix; };
+let inherit (stdenv.lib) optional optionals hasPrefix; in
 
 /* ToDo:
     - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index a22b99be8da..588d0b8dadc 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
 , python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
 
-with { inherit (stdenv.lib) optionals; };
+let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
   name = "libgsf-1.14.41";
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 5fb9cc36e96..3033c4301af 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -13,7 +13,7 @@ assert enableAsioLib -> boost != null;
 assert enableGetAssets -> libxml2 != null;
 assert enableJemalloc -> jemalloc != null;
 
-with { inherit (stdenv.lib) optional; };
+let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 52a2ab8f36a..7587fb3e0c4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -7,7 +7,7 @@
 }:
 { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
 
-with { inherit (stdenv.lib) makeLibraryPath; };
+let inherit (stdenv.lib) makeLibraryPath; in
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 89faa1d952d..7b71a8e95d9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@
 
 let basename = "binutils-2.28"; in
 
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let inherit (stdenv.lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
   name = basename + optionalString (cross != null) "-${cross.config}";
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index 7a23c4dc966..d637c159595 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -1,7 +1,7 @@
 { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr
 , libXrender, fontconfig, freetype, openal }:
 
-with { inherit (stdenv.lib) makeLibraryPath; };
+let inherit (stdenv.lib) makeLibraryPath; in
 
 stdenv.mkDerivation {
   name = "oilrush";
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 8dc062b7504..ab14ee92a24 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
-with { inherit (stdenv.lib) optional; };
+let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 1174f5badba..97c0da86ec9 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -2,7 +2,7 @@
 , systemd, nettle, libedit, zlib, libiconv, fetchpatch
 }:
 
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
 
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 7215cccbfed..176f8aa1f51 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -12,7 +12,7 @@
 # (--enable-unsupported could be used to force the build)
 assert !cpp || mpi == null;
 
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   version = "1.8.18";

From c916e2ce98c81fec87ccbc7bdf7f5ff71502e1de Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 30 Mar 2017 09:18:07 +0200
Subject: [PATCH 0401/1744] vim-go: 2017-02-19 -> 1.12

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 47f58aeee85..a6440634e50 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -702,11 +702,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-02-19";
+    name = "vim-go-1.12";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9";
-      sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a";
+      rev = "26362e4bfcd7601da5b8fcf0041744962766ef0c";
+      sha256 = "19073xxam34vkwdsrqv170f6f6vc9yy8m4034r1l8m9lf67zqla9";
     };
     dependencies = [];
 

From 2a3cd13d732ca8e49518a0314d1e003bf16af0bf Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Thu, 30 Mar 2017 03:20:22 -0400
Subject: [PATCH 0402/1744] slang: 2.3.0 -> 2.3.1a

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

diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index c4db48248f3..553ddb7d3b7 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "slang-2.3.0";
+  name = "slang-2.3.1a";
   src = fetchurl {
-    url = "http://www.jedsoft.org/releases/slang/${name}.tar.gz";
-    sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy";
+    url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
+    sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 29d9f0e624811cb3255302f773e61c36d1c8c03d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 16:28:48 +0800
Subject: [PATCH 0403/1744] qsyncthingtray: fix program paths

We need this for qsyncthingtray to be able to detect the processes as well.
---
 .../misc/qsyncthingtray/default.nix           | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 0aeb7d7eb8f..4f95879d5eb 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,25 +1,44 @@
-{ stdenv, fetchFromGitHub
-, qtbase, qtwebengine
-, qmakeHook }:
+{ stdenv, lib, fetchFromGitHub, procps ? null
+, qtbase, qtwebengine, qtwebkit
+, cmake, makeQtWrapper
+, syncthing, syncthing-inotify ? null
+, preferQWebView ? false }:
 
 stdenv.mkDerivation rec {
   version = "0.5.7";
   name = "qsyncthingtray-${version}";
 
   src = fetchFromGitHub {
-    owner = "sieren";
-    repo = "QSyncthingTray";
-    rev = "${version}";
+    owner  = "sieren";
+    repo   = "QSyncthingTray";
+    rev    = "${version}";
     sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq";
   };
 
-  buildInputs = [ qtbase qtwebengine ];
-  nativeBuildInputs = [ qmakeHook ];
+  buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
+  nativeBuildInputs = [ cmake makeQtWrapper ];
   enableParallelBuilding = true;
 
-  postInstall = ''
+  cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
+
+  postPatch = ''
+    ${lib.optionalString stdenv.isLinux ''
+      substituteInPlace includes/platforms/linux/posixUtils.hpp \
+        --replace '"/usr/local/bin/syncthing"'         '"${syncthing}/bin/syncthing"' \
+        --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \
+        --replace '"pgrep -x'                          '"${procps}/bin/pgrep -x'
+    ''}
+
+    ${lib.optionalString stdenv.isDarwin ''
+      substituteInPlace includes/platforms/darwin/macUtils.hpp \
+        --replace '"/usr/local/bin/syncthing"'         '"${syncthing}/bin/syncthing"'
+    ''}
+  '';
+
+  installPhase = let qst = "qsyncthingtray"; in ''
     mkdir -p $out/bin
-    cp binary/QSyncthingTray $out/bin
+    install -m755 QSyncthingTray $out/bin/${qst}
+    ln -s $out/bin/${qst} $out/bin/QSyncthingTray
   '';
 
   meta = with stdenv.lib; {
@@ -31,7 +50,7 @@ stdenv.mkDerivation rec {
         Written in C++ with Qt.
     '';
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ zraexy ];
+    maintainers = with maintainers; [ zraexy peterhoeg ];
     platforms = platforms.all;
     broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
   };

From 04223369e37e1c7c59737d546741dee583534b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Mar 2017 11:01:12 +0200
Subject: [PATCH 0404/1744] gspell: 1.0.3 -> 1.2.1

also enable vala bindings
---
 pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
index fbb95efb27a..3024d3ed59f 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glib gtk3 enchant isocodes ];
+  buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
index 248e3915152..850e13fb011 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
@@ -1,10 +1,10 @@
 fetchurl: rec {
-  major = "1.0";
-  minor = "3";
+  major = "1.2";
+  minor = "1";
   name = "gspell-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-    sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr";
+    sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
   };
 }

From ca87b3a130da099b207ef1b5d5ca72e824883533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Mar 2017 11:01:50 +0200
Subject: [PATCH 0405/1744] corebird: fix spell check

---
 pkgs/applications/networking/corebird/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 36b46030577..b4197a12db3 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  configureFlags = [ "--disable-spellcheck" ];
-
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [

From db329251b44b7871d3fa436c4df9353e78931093 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 01:17:47 +0200
Subject: [PATCH 0406/1744] guileLint: mark as broken

---
 pkgs/development/tools/guile/guile-lint/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index 156def09187..7ca54365be5 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "Guile-Lint checks syntax and semantics in a Guile program or module";
     homepage = http://user42.tuxfamily.org/guile-lint/index.html;
     license = "GPL";
+    broken = true;
   };
 }

From b5ad5c3d809a99a047af47e6bea7c9888d28645f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 01:20:20 +0200
Subject: [PATCH 0407/1744] hawkthorne: mark as broken

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

diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 5cb79fa9299..4c3d22571b1 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.reddit.com/r/hawkthorne";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ campadrenalin ];
+    broken = true;
   };
 }

From 2b7128808d4c0755ccb08b500966278c22b1be6c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 01:28:14 +0200
Subject: [PATCH 0408/1744] jclasslib: remove

---
 .../tools/java/jclasslib/builder.sh           | 22 -------------------
 .../tools/java/jclasslib/default.nix          | 13 -----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 37 deletions(-)
 delete mode 100755 pkgs/development/tools/java/jclasslib/builder.sh
 delete mode 100644 pkgs/development/tools/java/jclasslib/default.nix

diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh
deleted file mode 100755
index 35e94d0fab9..00000000000
--- a/pkgs/development/tools/java/jclasslib/builder.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar zxf $src || exit 1
-cd jclasslib || exit 1
-
-xpf-rm -f build.xml "//taskdef"
-
-ant clean || exit 1
-ant jar || exit 1
-
-mkdir -p $out/bin
-mv build/jclasslib.jar $out/bin/ || exit 1
-
-cat >> $out/bin/jclasslib <<EOF
-#! /bin/sh
-
-export JAVA_HOME=$jre
-
-$jre/bin/java -jar $out/bin/jclasslib.jar \$@
-EOF
-
-chmod a+x $out/bin/jclasslib || exit 1
diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
deleted file mode 100644
index 1d8ae80572a..00000000000
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, xpf, jre, ant}:
-
-stdenv.mkDerivation {
-  name = "jclasslib-2.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz;
-    sha256 = "1y2fbg5h2p3fwcp7h5n1qib7x9svyrilq3i58vm6vany1xzg7nx5";
-  };
-
-  inherit jre xpf ant;
-  buildInputs = [xpf ant];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d7ee99c688..23b1c2c1c11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10306,8 +10306,6 @@ with pkgs;
 
   javaCup = callPackage ../development/libraries/java/cup { };
 
-  jclasslib = callPackage ../development/tools/java/jclasslib { };
-
   jdom = callPackage ../development/libraries/java/jdom { };
 
   jflex = callPackage ../development/libraries/java/jflex { };

From f87de53883a183d9d249e9a613b72a7e04dfc034 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 11:35:36 +0200
Subject: [PATCH 0409/1744] sage: mark as broken

---
 pkgs/applications/science/math/sage/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index af4cda87473..e6630815ba1 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.sagemath.org";
     description = "A free open source mathematics software system";
     license = stdenv.lib.licenses.gpl2Plus;
+    broken = true;
   };
 }

From a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 11:56:42 +0200
Subject: [PATCH 0410/1744] sitecopy: remove

---
 nixos/modules/module-list.nix                 |   1 -
 .../services/backup/sitecopy-backup.nix       | 106 ------------------
 pkgs/tools/networking/sitecopy/default.nix    |  16 ---
 pkgs/tools/networking/sitecopy/neon-29.patch  |  15 ---
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 140 deletions(-)
 delete mode 100644 nixos/modules/services/backup/sitecopy-backup.nix
 delete mode 100644 pkgs/tools/networking/sitecopy/default.nix
 delete mode 100644 pkgs/tools/networking/sitecopy/neon-29.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4e9154f1740..9d25cc680f8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -138,7 +138,6 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/rsnapshot.nix
-  ./services/backup/sitecopy-backup.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
   ./services/cluster/fleet.nix
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
deleted file mode 100644
index 6e4721ded68..00000000000
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  inherit (pkgs) sitecopy;
-
-  stateDir = "/var/spool/sitecopy";
-
-  sitecopyCron = backup : ''
-    ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1
-  '';
-in
-
-{
-
-  options = {
-
-    services.sitecopy = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable <command>sitecopy</command> backups of specified
-          directories.
-        '';
-      };
-
-      period = mkOption {
-        default = "15 04 * * *";
-        description = ''
-          This option defines (in the format used by <command>cron</command>)
-          when the <command>sitecopy</command> backups are to be run.
-          The default is to update at 04:15 (at night) every day.
-        '';
-      };
-
-      backups = mkOption {
-        example = [
-          { name = "test";
-            local = "/tmp/backup";
-            remote = "/staff-groups/ewi/st/strategoxt/backup/test";
-            server = "webdata.tudelft.nl";
-            protocol = "webdav";
-            https = true ;
-            symlinks = "maintain" ;
-          }
-        ];
-        default = [];
-        description = ''
-           List of attribute sets describing the backups.
-
-           Username/password are extracted from
-           <filename>${stateDir}/sitecopy.secrets</filename> at activation
-           time. The secrets file lines should have the following structure:
-           <screen>
-             server username password
-           </screen>
-        '';
-      };
-
-    };
-
-  };
-
-  config = mkIf config.services.sitecopy.enable {
-    environment.systemPackages = [ sitecopy ];
-
-    services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
-
-    system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ]
-      ''
-        mkdir -m 0700 -p ${stateDir}
-        chown root ${stateDir}
-        touch ${stateDir}/sitecopy.secrets
-        chown root ${stateDir}/sitecopy.secrets
-
-        ${lib.concatStrings (map ( b: ''
-            unset secrets
-            unset secret
-            secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
-            secret=($secrets)
-            cat > ${stateDir}/${b.name}.conf << EOF
-              site ${b.name}
-              server ${b.server}
-              protocol ${b.protocol}
-              username ''${secret[1]}
-              password ''${secret[2]}
-              local ${b.local}
-              remote ${b.remote}
-              symlinks ${b.symlinks}
-              ${if b.https then "http secure" else ""}
-            EOF
-            chmod 0600 ${stateDir}/${b.name}.conf
-            if ! test -e ${stateDir}/${b.name} ; then
-              echo " * Initializing sitecopy '${b.name}'"
-              ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
-            else
-              echo " * Sitecopy '${b.name}' already initialized"
-            fi
-          '' ) config.services.sitecopy.backups
-        )}
-      '';
-  };
-
-}
diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix
deleted file mode 100644
index 5667744ef22..00000000000
--- a/pkgs/tools/networking/sitecopy/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  name = "sitecopy-0.16.6";
-
-  src = fetchurl {
-    url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";
-    sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
-  };
-
-  patches = [ ./neon-29.patch ];
-
-  buildInputs = [ openssl neon zlib autoreconfHook ]; 
-
-  configureFlags= "--with-ssl=openssl"; 
-}
diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch
deleted file mode 100644
index bddcbde95e1..00000000000
--- a/pkgs/tools/networking/sitecopy/neon-29.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in
---- sitecopy-0.16.6-orig/configure.in	2008-04-02 13:59:30.000000000 +0200
-+++ sitecopy-0.16.6/configure.in	2010-08-26 15:07:04.000000000 +0200
-@@ -112,8 +112,8 @@
-    AC_LIBOBJ(lib/fnmatch)
- fi
- 
--# Support neon 0.24 through 0.28
--NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.29
-+#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
- 
- dnl But we don't use zlib or ACL support
- NEON_WITHOUT_ZLIB
-Only in sitecopy-0.16.6/: configure.in~
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23b1c2c1c11..cdfb4e6d997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4083,8 +4083,6 @@ with pkgs;
     pythonPackages = python3Packages;
    };
 
-  sitecopy = callPackage ../tools/networking/sitecopy { };
-
   stricat = callPackage ../tools/security/stricat { };
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };

From d7f3e5a8f0bddc8eaf9e0cffd9183bd28f71e26b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 29 Mar 2017 22:57:46 +0200
Subject: [PATCH 0411/1744] =?UTF-8?q?rXrs:=20mark=20as=20broken=20(X=20?=
 =?UTF-8?q?=E2=88=88=20{3,=204,=205})?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/data/documentation/rnrs/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 8053020a3f2..bd38389eb47 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://swiss.csail.mit.edu/~jaffer/Scheme;
+
+    broken = true;
   };
 }

From 8641a0ace93265e38872c709a1fe2b0f2353d0b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 12:15:08 +0200
Subject: [PATCH 0412/1744] quicklisp-to-nix: support / in the system name

Add some more packages
---
 .../lisp-modules/define-package.nix           |   2 +
 .../quicklisp-to-nix-output/idna.nix          |  14 ++
 .../quicklisp-to-nix-output/iolib.nix         |  14 ++
 .../iolib_slash_asdf.nix                      |  14 ++
 .../iolib_slash_base.nix                      |  14 ++
 .../iolib_slash_common-lisp.nix               |  14 ++
 .../iolib_slash_conf.nix                      |  14 ++
 .../iolib_slash_grovel.nix                    |  14 ++
 .../iolib_slash_multiplex.nix                 |  14 ++
 .../iolib_slash_sockets.nix                   |  14 ++
 .../iolib_slash_streams.nix                   |  14 ++
 .../iolib_slash_syscalls.nix                  |  14 ++
 .../quicklisp-to-nix-output/swap-bytes.nix    |  14 ++
 .../quicklisp-to-nix-overrides.nix            |   3 +
 .../lisp-modules/quicklisp-to-nix-systems.txt |   1 +
 .../lisp-modules/quicklisp-to-nix.nix         | 142 ++++++++++++++++++
 .../quicklisp-to-nix/invocation.emb           |   5 +-
 .../quicklisp-to-nix/nix-package.emb          |   2 +-
 .../quicklisp-to-nix/ql-to-nix.lisp           |  15 +-
 19 files changed, 334 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix

diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 8623032ed37..a3368e336e6 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -6,6 +6,7 @@ let
     mkdir -p "$(dirname "$config_script")"
     touch "$config_script"
     chmod a+x "$config_script"
+    echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ $NIX_CFLAGS_COMPILE}\"" >> "$config_script"
     echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
     echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
     echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script"
@@ -46,6 +47,7 @@ basePackage = {
     ++ (args.propagatedBuildInputs or []);
   buildInputs = buildInputs;
   dontStrip=true;
+
   meta = {
     inherit description version;
   } // meta;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
new file mode 100644
index 00000000000..feacb1264af
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''idna'';
+  version = ''20120107-git'';
+
+  description = ''IDNA (international domain names) string encoding and decoding routines'';
+
+  deps = [ args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
+    sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
new file mode 100644
index 00000000000..5badc04f201
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib'';
+  version = ''v0.8.1'';
+
+  description = ''I/O library.'';
+
+  deps = [ args."iolib/base" args."iolib/multiplex" args."iolib/streams" args."iolib/sockets" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
new file mode 100644
index 00000000000..f6a78c85da9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_asdf'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''A few ASDF component classes.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
new file mode 100644
index 00000000000..642e26e278a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_base'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Base IOlib package, used instead of CL.'';
+
+  deps = [ args."iolib/common-lisp" args."alexandria" args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
new file mode 100644
index 00000000000..59fdbdc85d0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_common-lisp'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Slightly modified Common Lisp.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
new file mode 100644
index 00000000000..0a0631caf44
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_conf'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Compile-time configuration for IOLib.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
new file mode 100644
index 00000000000..e7c2d780f4e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_grovel'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''The CFFI Groveller'';
+
+  deps = [ args."iolib/asdf" args."iolib/base" args."iolib/conf" args."alexandria" args."split-sequence" args."cffi" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
new file mode 100644
index 00000000000..07324035052
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_multiplex'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''I/O multiplexing library.'';
+
+  deps = [ args."iolib/base" args."iolib/syscalls" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
new file mode 100644
index 00000000000..b956d3ece21
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_sockets'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Socket library.'';
+
+  deps = [ args."iolib/base" args."iolib/syscalls" args."iolib/streams" args."babel" args."cffi" args."iolib/grovel" args."bordeaux-threads" args."idna" args."swap-bytes" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
new file mode 100644
index 00000000000..267dbd8e6de
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_streams'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Gray streams.'';
+
+  deps = [ args."iolib/base" args."iolib/multiplex" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
new file mode 100644
index 00000000000..395b3d53934
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_syscalls'';
+  version = ''iolib-v0.8.1'';
+
+  description = ''Syscalls and foreign types.'';
+
+  deps = [ args."trivial-features" args."cffi" args."iolib/base" args."iolib/grovel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
new file mode 100644
index 00000000000..cb1e293919b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''swap-bytes'';
+  version = ''v1.1'';
+
+  description = ''Optimized byte-swapping primitives.'';
+
+  deps = [ args."trivial-features" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
+    sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index b1928c5bc77..cf1cdec327b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -17,4 +17,7 @@
   hunchentoot = x: {
     propagatedBuildInputs = [pkgs.openssl];
   };
+  iolib = x: {
+    propagatedBuildInputs = [pkgs.libfixposix pkgs.gcc];
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index c5c075f1ebd..12ec2d1f4e5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -4,3 +4,4 @@ esrap
 hunchentoot
 external-program
 drakma
+iolib
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index da30352e718..0f7f58df4b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,6 +6,82 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
+  "iolib/conf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/conf" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_conf.nix {
+         inherit fetchurl;
+       }));
+  "iolib_slash_conf" = quicklisp-to-nix-packages."iolib/conf";
+
+
+  "iolib/asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_asdf.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+  "iolib_slash_asdf" = quicklisp-to-nix-packages."iolib/asdf";
+
+
+  "swap-bytes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swap-bytes" or (x: {}))
+       (import ./quicklisp-to-nix-output/swap-bytes.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
+  "idna" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."idna" or (x: {}))
+       (import ./quicklisp-to-nix-output/idna.nix {
+         inherit fetchurl;
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+
+
+  "iolib/grovel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_grovel.nix {
+         inherit fetchurl;
+           "iolib/asdf" = quicklisp-to-nix-packages."iolib/asdf";
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/conf" = quicklisp-to-nix-packages."iolib/conf";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+  "iolib_slash_grovel" = quicklisp-to-nix-packages."iolib/grovel";
+
+
+  "iolib/syscalls" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/syscalls" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
+       }));
+  "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+
+
+  "iolib/common-lisp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/common-lisp" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_common-lisp.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+  "iolib_slash_common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
+
+
   "split-sequence" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."split-sequence" or (x: {}))
@@ -48,6 +124,60 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "iolib/sockets" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/sockets" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix {
+         inherit fetchurl;
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+           "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "idna" = quicklisp-to-nix-packages."idna";
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+       }));
+  "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib/sockets";
+
+
+  "iolib/streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_streams.nix {
+         inherit fetchurl;
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+  "iolib_slash_streams" = quicklisp-to-nix-packages."iolib/streams";
+
+
+  "iolib/multiplex" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/multiplex" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix {
+         inherit fetchurl;
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+  "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+
+
+  "iolib/base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib/base" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_base.nix {
+         inherit fetchurl;
+           "iolib/common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+  "iolib_slash_base" = quicklisp-to-nix-packages."iolib/base";
+
+
   "chipz" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."chipz" or (x: {}))
@@ -224,6 +354,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "iolib" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib.nix {
+         inherit fetchurl;
+           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+           "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+           "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
+           "iolib/sockets" = quicklisp-to-nix-packages."iolib/sockets";
+       }));
+
+
   "drakma" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."drakma" or (x: {}))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index d3e8e91bfbd..a13cedf3dfe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -1,7 +1,8 @@
   "<% @var name %>" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."<% @var name %>" or (x: {}))
-       (import ./quicklisp-to-nix-output/<% @var name %>.nix {
+       (import ./quicklisp-to-nix-output/<% @var filename %>.nix {
          inherit fetchurl;<% @loop deps %>
            "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
-       }));
+       }));<% @ifequal name filename %><% @else %>
+  "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %>
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index b54f555180d..1be5345b327 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -1,6 +1,6 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''<% @var name %>'';
+  baseName = ''<% @var filename %>'';
   version = ''<% @var version %>'';
 
   description = ''<% @var description %>'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index ded802ca693..dc4b14c1f60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -33,6 +33,17 @@
                (format nil "~{~16,2,'0r~}"
                        (map 'list 'identity (md5:md5sum-file path))))))))
 
+(defun escape-filename (s)
+  (format nil "~{~a~}"
+       (loop
+         for x in (map 'list 'identity s)
+         collect
+         (case x
+           (#\/ "_slash_")
+           (#\\ "_backslash_")
+           (#\_ "__")
+           (t x)))))
+
 (defun system-data (system)
   (ql:quickload system)
   (let*
@@ -64,6 +75,7 @@
     :url url
     :md5 file-md5
     :name name
+    :filename (escape-filename name)
     :deps deps
     :dependencies dependencies
     :version version)))
@@ -112,7 +124,8 @@
       for s in closure
       do (alexandria:write-string-into-file
            (nix-expression s)
-           (format nil "~a/quicklisp-to-nix-output/~a.nix" target-directory s)
+           (format nil "~a/quicklisp-to-nix-output/~a.nix"
+                   target-directory (escape-filename s))
            :if-exists :supersede))
     (alexandria:write-string-into-file
       (cl-emb:execute-emb

From c1f922b0b5641433f1aba67ab7c9a319391b0975 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 12:59:40 +0200
Subject: [PATCH 0413/1744] asdf: add pinned versions 2.26, 3.1; provide
 quicklispPackages with ASDF 3.1

---
 pkgs/development/lisp-modules/asdf/2.26.nix | 40 +++++++++++++++++++++
 pkgs/development/lisp-modules/asdf/3.1.nix  | 39 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 11 ++++++
 3 files changed, 90 insertions(+)
 create mode 100644 pkgs/development/lisp-modules/asdf/2.26.nix
 create mode 100644 pkgs/development/lisp-modules/asdf/3.1.nix

diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
new file mode 100644
index 00000000000..01cfca0d1fd
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, texinfo, texLive, perl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="asdf";
+    version="2.26";
+    name="${baseName}-${version}";
+    url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
+    sha256="1qzp444rgnqf1cz9v48nh0yvz7wjq9fjdpimifsfcjswaqi2xrdn";
+  };
+  buildInputs = [
+    texinfo texLive perl
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  buildPhase = ''
+    make asdf.lisp
+    mkdir build
+    ln -s ../asdf.lisp build
+  '';
+  installPhase = ''
+    mkdir -p "$out"/lib/common-lisp/asdf/
+    mkdir -p "$out"/share/doc/asdf/
+    cp -r ./* "$out"/lib/common-lisp/asdf/
+    cp -r doc/* "$out"/share/doc/asdf/
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''Standard software-system definition library for Common Lisp'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix
new file mode 100644
index 00000000000..f3da61e286e
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, texinfo, texLive, perl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="asdf";
+    version="3.1.7";
+    name="${baseName}-${version}";
+    url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
+    sha256="1g8wp3vi7gwrs22gnjy9lvrxqag3m8apxnryfs8n5bv6rln8bzzq";
+  };
+  buildInputs = [
+    texinfo texLive perl
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  buildPhase = ''
+    make build/asdf.lisp
+    make -C doc asdf.info asdf.html
+  '';
+  installPhase = ''
+    mkdir -p "$out"/lib/common-lisp/asdf/
+    mkdir -p "$out"/share/doc/asdf/
+    cp -r ./* "$out"/lib/common-lisp/asdf/
+    cp -r doc/* "$out"/share/doc/asdf/
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''Standard software-system definition library for Common Lisp'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdfb4e6d997..d4a38faed28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10377,6 +10377,15 @@ with pkgs;
     texLive = null;
   };
 
+  # QuickLisp minimal version
+  asdf_2_26 = callPackage ../development/lisp-modules/asdf/2.26.nix {
+    texLive = null;
+  };
+  # Currently most popular
+  asdf_3_1 = callPackage ../development/lisp-modules/asdf/3.1.nix {
+    texLive = null;
+  };
+
   clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
 
   wrapLisp = lisp: clwrapperFunction { inherit lisp; };
@@ -10395,6 +10404,8 @@ with pkgs;
   quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp);
   quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl);
   quicklispPackages = quicklispPackagesSBCL;
+  quicklispPackages_asdf_3_1 = quicklispPackagesFor
+    ((wrapLisp sbcl).override { asdf = asdf_3_1; });
 
   ### DEVELOPMENT / PERL MODULES
 

From 953fc6c0a057797c225f8cda787c4348f2b6c2cd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 13:00:43 +0200
Subject: [PATCH 0414/1744] clwrapper: better support for ensuring
 noninteractive execution

---
 .../lisp-modules/clwrapper/cl-wrapper.sh      | 19 ++++++++++++++++---
 .../lisp-modules/clwrapper/default.nix        |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 90fa48814a2..d7485936941 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!@stdenv_shell@
 # Part of NixPkgs package collection
 # This script can be used at your option under the same license as NixPkgs or 
 # under MIT/X11 license
@@ -15,38 +15,51 @@ export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_
 test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH"
 
+declare -a NIX_LISP_FINAL_PARAMETERS;
+
 case "$NIX_LISP" in
 	sbcl)
 		NIX_LISP_LOAD_FILE="--load"
 		NIX_LISP_EXEC_CODE="--eval"
                 NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG='--non-interactive'
 		NIX_LISP_FINAL_PARAMETERS=
 		;;
 	ecl)
 		NIX_LISP_LOAD_FILE="-load"
 		NIX_LISP_EXEC_CODE="-eval"
                 NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG='--nodebug'
 		NIX_LISP_FINAL_PARAMETERS=
 		;;
 	clisp)
 		NIX_LISP_LOAD_FILE="-c -l"
 		NIX_LISP_EXEC_CODE="-x"
                 NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG='-on-error exit'
 		NIX_LISP_FINAL_PARAMETERS="-repl"
 		;;
 esac
 
 NIX_LISP_ASDF_REGISTRY_CODE="
   (progn
-    (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry))
+    #+asdf3 (setf asdf:*default-source-registries*
+      '(asdf/source-registry:environment-source-registry))
     (asdf:initialize-source-registry)
     )
 "
 
 NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}"
 
+nix_lisp_run_single_form(){
+  NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1"
+    "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG)
+}
+
+eval "$NIX_LISP_PRELAUNCH_HOOK"
+
 [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
 	$NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \
 	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
-	$NIX_LISP_FINAL_PARAMETERS \
+	"${NIX_LISP_FINAL_PARAMETERS[@]}" \
 	"$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 172af31f834..978e16fd998 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
   '';
 
   inherit asdf lisp;
+  stdenv_shell = stdenv.shell;
 
   setupHook = ./setup-hook.sh;
 

From 5d83ef6a91db6668814b13f6829774ba4c04b72a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 13:01:30 +0200
Subject: [PATCH 0415/1744] quicklispPackages.iolib: try loading the system

---
 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index cf1cdec327b..1c6b1e05adf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -19,5 +19,10 @@
   };
   iolib = x: {
     propagatedBuildInputs = [pkgs.libfixposix pkgs.gcc];
+    overrides = y: {
+      postBuild = ''
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iolib)"' common-lisp.sh ""
+      '';
+    };
   };
 }

From 9a75c6234a4ee50a9534113c0720573d180e6bfc Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 30 Mar 2017 07:11:36 -0400
Subject: [PATCH 0416/1744] elpa-packages: 2017-03-29

---
 .../editors/emacs-modes/elpa-generated.nix      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e80e8db08f0..868f9619ce2 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -358,15 +358,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+    company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "company";
-        version = "0.9.2";
+        version = "0.9.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.9.2.tar";
-          sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z";
+          url = "https://elpa.gnu.org/packages/company-0.9.3.tar";
+          sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/company.html";
           license = lib.licenses.free;
@@ -821,10 +820,10 @@
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
-        version = "1.1.5";
+        version = "1.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.1.5.tar";
-          sha256 = "128ag8zkfxspf6szxfd7dcscm1zzzcibx7p9dpbpk036cr7m5i1p";
+          url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
+          sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
         };
         packageRequires = [ cl-lib ];
         meta = {

From f58c753ff333c739d280b7cef2a5469c798954d4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 30 Mar 2017 07:17:00 -0400
Subject: [PATCH 0417/1744] melpa-stable-packages: 2017-03-29

Removals:
 - vimgolf - new repo lacks tags
---
 .../emacs-modes/melpa-stable-generated.nix    | 477 +++++++++++++-----
 1 file changed, 354 insertions(+), 123 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index e63c11a9da5..488699f8a79 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -860,6 +860,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "add-node-modules-path";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "codesuki";
+          repo = "add-node-modules-path";
+          rev = "9ed240e05dcb9628ba380151b54b02688be5e78e";
+          sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
+          sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl";
+          name = "add-node-modules-path";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/add-node-modules-path";
+          license = lib.licenses.free;
+        };
+      }) {};
     adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
     melpaBuild {
         pname = "adoc-mode";
@@ -1166,12 +1187,12 @@
     android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "android-mode";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "android-mode";
-          rev = "146476c5ae958715520bec2b7f8de6b30c48c19f";
-          sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
+          rev = "f274da87429617b0b9c5889d46b36de64d982da4";
+          sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
@@ -1480,12 +1501,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "0.2";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
-          sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
+          rev = "ca9d94c2a55c3cbbcc77b6818cc386dbd2f36d39";
+          sha256 = "0j1fm1ngd9vg3qrv9ks53ha9aijnl6mvx2sxsvlvn1libg7ym3zz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2452,12 +2473,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "de3833a1a651532e76df668bd92cfa07893501f1";
-          sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
+          rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4";
+          sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -2764,22 +2785,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "1.22";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "4c49b2046647ed187920c885e175ed388f4833dc";
-          sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
+          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/boxquote";
           license = lib.licenses.free;
@@ -3061,12 +3082,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "1.5";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "657acef2132a6fdf0796f8ec62c5f261c1beebf0";
-          sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082";
+          rev = "c95b95fe8d93eeed510c281990842718a21e53b3";
+          sha256 = "077hxzichvr406m9grdxjf31k0l33g6wh9zdvx73f7crsmzxhkzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -4185,12 +4206,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0pre2";
+        version = "3.8.0pre3";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "e1adec32b8325fb731da084e99acd6070f5e39bf";
-          sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm";
+          rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc";
+          sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4434,22 +4455,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "0.9.2";
+        version = "0.9.3";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e";
-          sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k";
+          rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
+          sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/company";
           license = lib.licenses.free;
@@ -4968,12 +4989,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
-          sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -7076,8 +7097,8 @@
         version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "c4f10d72febc";
-          sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
+          rev = "6f4b44fb1966";
+          sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7258,6 +7279,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-hugo";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-easy-hugo";
+          rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370";
+          sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
+          sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+          name = "easy-hugo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/easy-hugo";
+          license = lib.licenses.free;
+        };
+      }) {};
     easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-kill";
@@ -7366,12 +7408,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "2.10.1";
+        version = "2.10.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "d415b91c91581ff39364384fec35c219cb89d43a";
-          sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd";
+          rev = "558097220099505994b7e9a2ea9e1208da6c5668";
+          sha256 = "1v9x69jzsfl7kh5nnbax218xykylz6ib0f73f9yrsjbmgap3fvva";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -11528,12 +11570,12 @@
     flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
     melpaBuild {
         pname = "flycheck-package";
-        version = "0.11";
+        version = "0.12";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
-          sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
+          rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
+          sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -11714,15 +11756,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-yamllint";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "flycheck-yamllint";
+          rev = "aa211b1243168a4f752888c0014c5b9d2da178b1";
+          sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
+          sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
+          name = "flycheck-yamllint";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-yamllint";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
-          sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -15070,12 +15133,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.3";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
-          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
+          rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
+          sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15235,6 +15298,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-books";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "grugrut";
+          repo = "helm-books";
+          rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76";
+          sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
+          sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
+          name = "helm-books";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-books";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bundle-show";
@@ -15364,12 +15448,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.3";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
-          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
+          rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
+          sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -15448,12 +15532,12 @@
     helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dired-history";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-dired-history";
-          rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
-          sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
+          rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
+          sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -16435,12 +16519,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.2";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523";
-          sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v";
+          rev = "604e4630070ce2e345cbd21c2fbd8414eb064ef2";
+          sha256 = "09nbg890ppjvz1v2a3zcb198k1zq9gaa04ai4v3xynz6c3kvzyr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -19813,12 +19897,12 @@
     linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "linum-relative";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "linum-relative";
-          rev = "1074e12904d08e00dda438d9700f2a3bff238bd5";
-          sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
+          rev = "b8a99dcfe38a491172a8193053fb7849634b43c0";
+          sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
@@ -21073,12 +21157,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
-          sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
+          rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
+          sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -21531,6 +21615,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "mocha-snippets";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "cowboyd";
+          repo = "mocha-snippets.el";
+          rev = "e054137bd78f0d236e983874da1f345d30a71816";
+          sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
+          sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
+          name = "mocha-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/mocha-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mocker";
@@ -22479,12 +22584,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.7";
+        version = "1.11.8";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51";
-          sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv";
+          rev = "206b61b07405229979ed9a1518da1560930d05ee";
+          sha256 = "1qlddlzkpavhsrb7h3cyqhif5qc2qhkhjwnv4pbzg9hamqbd45wc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -22581,6 +22686,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nord-theme";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "arcticicestudio";
+          repo = "nord-emacs";
+          rev = "5327be91c155eb9fed19061a0f02619dd4284c64";
+          sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
+          sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
+          name = "nord-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nord-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "nose";
         version = "0.1.1";
@@ -22955,6 +23081,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "obfusurl";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "obfusurl.el";
+          rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e";
+          sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
+          sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
+          name = "obfusurl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/obfusurl";
+          license = lib.licenses.free;
+        };
+      }) {};
     ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
     melpaBuild {
         pname = "ocodo-svg-modelines";
@@ -23151,8 +23298,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
-          sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
+          rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
+          sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -23408,12 +23555,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "1000";
+        version = "1011";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
-          sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+          rev = "53469a2f0577924de1c7d887fecea409d17fd588";
+          sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -23910,12 +24057,12 @@
     org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-random-todo";
-        version = "0.4.1";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-random-todo";
-          rev = "7398b8dff09bef54f579d158ce47b0090f00201e";
-          sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9";
+          rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
+          sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -24739,12 +24886,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8";
-          sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm";
+          rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
+          sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -25094,12 +25241,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "2.0.3";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "748d6a179fcbbc4af77c7b96059a66d579f34dc8";
-          sha256 = "0f8rcifzfp4fs52pjgfly39vqz54kgjb3yqyxlh4adq12zbq11cd";
+          rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717";
+          sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -26203,12 +26350,12 @@
     popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-imenu";
-        version = "0.5";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "popup-imenu";
-          rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
-          sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
+          rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
+          sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
@@ -26724,6 +26871,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "protocols";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "protocols.el";
+          rev = "f5549f5d873a683af45a0e19c732524d5b964026";
+          sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
+          sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
+          name = "protocols";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/protocols";
+          license = lib.licenses.free;
+        };
+      }) {};
     psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
     melpaBuild {
         pname = "psci";
@@ -28008,12 +28176,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "0.4.0";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "27364959798de0f019da799975027842c07e7829";
-          sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
+          rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
+          sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -28365,12 +28533,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.8";
+        version = "2.9";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b";
-          sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi";
+          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -28810,8 +28978,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
-          sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
+          rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
+          sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -29032,6 +29200,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "services";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "services.el";
+          rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa";
+          sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
+          sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
+          name = "services";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/services";
+          license = lib.licenses.free;
+        };
+      }) {};
     session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "session";
@@ -29077,12 +29266,12 @@
     sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "nuncostans";
           repo = "sexy-monochrome-theme";
-          rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
-          sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
+          rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
+          sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -30064,12 +30253,12 @@
     snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
     melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "snapshot-timemachine-rsnapshot";
-          rev = "4ff6b96219f4da576141e376b0348813c1c25615";
-          sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+          rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
+          sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
@@ -31947,6 +32136,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thinks";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "thinks.el";
+          rev = "370d399703d232010599d24a242b5f91e25a1b9d";
+          sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
+          sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
+          name = "thinks";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/thinks";
+          license = lib.licenses.free;
+        };
+      }) {};
     thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thrift";
@@ -32031,6 +32241,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "timonier";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "timonier";
+          rev = "33ca5887a1d1b63349177237e9edfb73546511a5";
+          sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
+          sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
+          name = "timonier";
+        };
+        packageRequires = [ all-the-icons dash hydra pkg-info request s ];
+        meta = {
+          homepage = "https://melpa.org/#/timonier";
+          license = lib.licenses.free;
+        };
+      }) {};
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
@@ -32666,6 +32897,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uptimes";
+        version = "3.1";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "uptimes.el";
+          rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
+          sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
+          sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
+          name = "uptimes";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/uptimes";
+          license = lib.licenses.free;
+        };
+      }) {};
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
@@ -32918,27 +33170,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "vimgolf";
-        version = "0.10.0";
-        src = fetchFromGitHub {
-          owner = "timvisher";
-          repo = "vimgolf";
-          rev = "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9";
-          sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf";
-          sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
-          name = "vimgolf";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/vimgolf";
-          license = lib.licenses.free;
-        };
-      }) {};
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
@@ -33152,12 +33383,12 @@
     wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "wandbox";
-        version = "0.6.0";
+        version = "0.6.2";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "70728ba1bfa425dee7a66fd86c7bbf2747b2514c";
-          sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l";
+          rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815";
+          sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -33341,12 +33572,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d";
-          sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q";
+          rev = "f6583397a4f8c9cde6b556175a6e05303d6238de";
+          sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -33785,8 +34016,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "3447d48e8562";
-          sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
+          rev = "c5c0bb98b281";
+          sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -34493,12 +34724,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
-          sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";

From b49e3db19b34766866cb712bc4babbd63e1a506a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 30 Mar 2017 07:18:36 -0400
Subject: [PATCH 0418/1744] melpa-packages: 2017-03-29

---
 .../editors/emacs-modes/melpa-generated.nix   | 1510 ++++++++++-------
 1 file changed, 942 insertions(+), 568 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 3cd7db90654..70ea1d58cf8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -355,12 +355,12 @@
     ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-dcd";
-        version = "20160311.617";
+        version = "20170323.601";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "ac-dcd";
-          rev = "bfb4fe768c8bf6fc7b7ee880f54e2052ebb23e3b";
-          sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98";
+          rev = "1614aa624252e3445b0392c8a9b7197084f3e422";
+          sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd";
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
-          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+          rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+          sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
-          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170304.704";
+        version = "20170327.542";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
-          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1299,12 +1299,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20170314.1428";
+        version = "20170321.1300";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "d5417f449af0dc13c402e6d9949ba002aa8b83af";
-          sha256 = "0sn7706b9zfj0ry9mzml7rmxprg9q01bkyp9v68xx767jgl9mcf8";
+          rev = "9dfde9ccef6dffbfa68219d91703d779cfe7016a";
+          sha256 = "1aslsq5jjvg0hywk4qzk30k6kaics1xslpqd38n24w37872b70jn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1549,12 +1549,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170314.112";
+        version = "20170328.2313";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "ceba445b3307822309b10a7de54bd500e9ec3be9";
-          sha256 = "08gfr9wixnpmz7pvf3yg0qwbzrffhn8vja2nzvvci6qk1b0sy2zc";
+          rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c";
+          sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1684,12 +1684,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20170313.343";
+        version = "20170329.836";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "b76345e0ba398c03347b6af4fa087f346eb32174";
-          sha256 = "105m01hnkm2asq900c8ndcpim6a2dgndcl83669vb5v39alm17g6";
+          rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0";
+          sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1745,12 +1745,12 @@
     android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "android-mode";
-        version = "20170131.2347";
+        version = "20170323.115";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "android-mode";
-          rev = "76711e73b459de1ee639a49733e4f3f245b8fb41";
-          sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0";
+          rev = "f274da87429617b0b9c5889d46b36de64d982da4";
+          sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
@@ -2269,12 +2269,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170313.257";
+        version = "20170325.1036";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
-          sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
+          rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b";
+          sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2513,12 +2513,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170212.1229";
+        version = "20170321.907";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e";
-          sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55";
+          rev = "09f2f184445f179c3c888a4a9b6cafea82a0ca99";
+          sha256 = "000bihb4i07d5djf2b1hdyxm2yynnq5sirry1qgvn5wmrvny586l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -3906,12 +3906,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170208.148";
+        version = "20170326.1157";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542";
-          sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4";
+          rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042";
+          sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4284,12 +4284,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170317.1130";
+        version = "20170326.1839";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "858c067dd05b1e1ef57e083504b094972ad3a318";
-          sha256 = "08fsil8k7m2rs7471basxwpaihrjys1g4fdv3fb2xf2wwfcv08s3";
+          rev = "87b91379661f627cb1cecabfd648d6a3838cd448";
+          sha256 = "1fb4mhz17x235lasqqwzb0jacvl96h3lsjf7mkhdwzxp3p26l4gf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4699,12 +4699,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20150607.1001";
+        version = "20170324.728";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197";
-          sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry";
+          rev = "2d8908922fadc1e29938703593a77da6456dc276";
+          sha256 = "0h6i56pa92x89rilgb7kgfpnsx57d157r284q0icm4xj990svg21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4994,8 +4994,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
-          sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
+          rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
+          sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5548,22 +5548,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "20081011.1326";
+        version = "20170329.406";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "4c49b2046647ed187920c885e175ed388f4833dc";
-          sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
+          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/boxquote";
           license = lib.licenses.free;
@@ -6109,12 +6109,12 @@
     build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "build-status";
-        version = "20170226.655";
+        version = "20170323.1621";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "build-status";
-          rev = "25c61f445502699d18fda7eb2010a38cbf8085a2";
-          sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf";
+          rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b";
+          sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
@@ -6825,8 +6825,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
-          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6867,8 +6867,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
-          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7094,7 +7094,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12069";
+          rev = "12088";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7675,12 +7675,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170310.735";
+        version = "20170322.155";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "d528100ecb1441933b0c9ef1920d147cf6c9a40b";
-          sha256 = "0a5vbiajw602i83f1j95jiqn1gyv0srmbnf2l878n2ha3qcgx9mr";
+          rev = "0816372ff483dd92eb8775c76929835b0955ae70";
+          sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7801,12 +7801,12 @@
     ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ciel";
-        version = "20161230.2212";
+        version = "20170323.2203";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc";
-          sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw";
+          rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804";
+          sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7951,7 +7951,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "298328";
+          rev = "299036";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8425,8 +8425,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922";
-          sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0";
+          rev = "0c7793b52166730a563c3318cdcb9f2b423bc675";
+          sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8593,8 +8593,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3be5896e013492cbe1cf65c1c61822b68d9d59c4";
-          sha256 = "1ka86imvs9wx4bx3k8dmkg4sm83pvzcajfv84qld2i20j2f5qbsn";
+          rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701";
+          sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8800,8 +8800,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "codesearch.el";
-          rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c";
-          sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+          rev = "7013d933cd9d3c04f19a6572176483b48a311807";
+          sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch";
@@ -8859,12 +8859,12 @@
     coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coffee-mode";
-        version = "20170315.2046";
+        version = "20170324.240";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "ea6dc5fb2b3ba3818b91a4e5ca5d593145fb571f";
-          sha256 = "0bjxvw000r95vzic38savispx3j5dx3d3ni9w7j4zb9hv78kjbnr";
+          rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5";
+          sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
@@ -9357,12 +9357,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170315.1754";
+        version = "20170328.1748";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "e19e53eacca9624981068939b00b8d630c987d53";
-          sha256 = "1nxk64pnq4a7flazyrk179v9m25jm2sw2bn0s9viw26vhvm7y3lk";
+          rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
+          sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9533,12 +9533,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170227.644";
+        version = "20170327.827";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f";
-          sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371";
+          rev = "daec3ad0f3119f04108574ce48cd77068a850392";
+          sha256 = "04fv3713sgy8c5y9blgx2xyjdg5qvg5idhvsf2p5lk9gjxbslp29";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9649,8 +9649,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
-          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+          rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+          sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9708,12 +9708,12 @@
     company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flow";
-        version = "20170226.1930";
+        version = "20170325.810";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "company-flow";
-          rev = "e2183e247720c1e252e04300313f386749997f5b";
-          sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav";
+          rev = "339f502e46e7d9214b61498d539b17f8f0322d17";
+          sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -10006,8 +10006,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
-          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10285,8 +10285,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
-          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10637,12 +10637,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170320.434";
+        version = "20170328.737";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "beffa78885517beaad2da50accc339f9346f94ee";
-          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10700,12 +10700,12 @@
     counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-gtags";
-        version = "20170310.536";
+        version = "20170326.559";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "4ef27b1cf1075097e11c3bcfee43e0710950dbcb";
-          sha256 = "14rnccz8sm8zyghkh93id4iv65qwdix75rb5f6i2y23k94h2483f";
+          rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2";
+          sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -11677,8 +11677,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "c94245482141cf891a1cd8a4fa57b8bd61359a5d";
-          sha256 = "1vm8ijk6x0h20366mdnwf5hxj8zbyms06c3dh8msrchvrhd52prz";
+          rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182";
+          sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11778,12 +11778,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170227.251";
+        version = "20170322.1007";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "5a52c5eca997655b7db349962d056daba64219cb";
-          sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0";
+          rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9";
+          sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11799,12 +11799,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170207.234";
+        version = "20170328.232";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61";
-          sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls";
+          rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512";
+          sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11988,12 +11988,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170313.317";
+        version = "20170328.1604";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "dde50661210d8610cd03526a6c9a922bb0e494a6";
-          sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6";
+          rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96";
+          sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12282,12 +12282,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170318.2238";
+        version = "20170322.401";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
-          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -13321,12 +13321,12 @@
     dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-launch";
-        version = "20170227.1532";
+        version = "20170328.809";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "58cf696c396c12d143387f4bf446ccb8398837b6";
-          sha256 = "1i7a3rjf62ksyfd161jw4x1zx3apjmra42vas7xpllkkhrk0cz08";
+          rev = "036204d3b86d4fbbd479f65d9af243cca079a47f";
+          sha256 = "1g7kn9c2w165rchjbrkllvykj4952f7zgrhlr3lnfnf5dampy20k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13383,10 +13383,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170221.1620";
+        version = "20170324.1112";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63";
+          sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13629,8 +13629,8 @@
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "120d6e15cfef64b10ed599a5f748e7580eacaeac";
-          sha256 = "0vma9ar82841gwlgx3x2qywqwdm9ydx28di7k6c56v9z500jf9ra";
+          rev = "72340994841db19083eb1226cd09abe75d1c1e13";
+          sha256 = "0dx63z3cmpcbn1lr9baqhh78j5xfyv1n5yp6fs210hmrbhlfpr8d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14731,8 +14731,8 @@
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "3c9efcc81ecb18c2ebd71aeb8da691a47a1fd49a";
-          sha256 = "10gz1pmpdxk2c7r47ac4vxc57bs703l9yqa9jp6q6wnldi2k0snd";
+          rev = "3ba76624318944cbadd95865dc3f50af01cb6241";
+          sha256 = "1x74nxxdv87sw0prd20nz2i0mxna29spy9dwm5qp6skl09bjwrfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14936,7 +14936,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1787893";
+          rev = "1789422";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15037,12 +15037,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170318.1423";
+        version = "20170328.2013";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "05fa8564d5f9a567f682e1efcc2d3bcdb9ba247d";
-          sha256 = "0pwlz8g170x7dp46cshjvqsxsrz7snqy0dhpwf61ysbapflylyi8";
+          rev = "1df89e837d4c28c941db879b028f92b3378745d8";
+          sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15100,11 +15100,11 @@
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20170215.333";
+        version = "20170324.419";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "c4f10d72febc";
-          sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
+          rev = "6f4b44fb1966";
+          sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15411,6 +15411,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-hugo";
+        version = "20170328.2015";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-easy-hugo";
+          rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a";
+          sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
+          sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+          name = "easy-hugo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/easy-hugo";
+          license = lib.licenses.free;
+        };
+      }) {};
     easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-kill";
@@ -15498,12 +15519,12 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20161231.1559";
+        version = "20170327.2229";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "c0df139972c52200db417cc18e65f8748969fb79";
-          sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w";
+          rev = "e47c9eb6b8d6d2bc16c17f9d1dfa9fa2fc00124f";
+          sha256 = "00d4i1y9z3gaw01cgccsk6q4qcbn9sg8lzs0im4dh6hzg27w12qm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15540,12 +15561,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170222.1459";
+        version = "20170327.141";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b";
-          sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck";
+          rev = "1eea156ea6f1376d474274ce76b1d6864223c47e";
+          sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15600,12 +15621,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170317.1328";
+        version = "20170328.1807";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
-          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+          rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+          sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16258,12 +16279,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170320.1222";
+        version = "20170322.650";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "12e522c05f215ecf75541b07cc77cf89fea63c2d";
-          sha256 = "18hb0b3wh681nqmlfn0xysr933mpb3cphlkp88rq8jg0wgw9psni";
+          rev = "2547226f2ee32726809a3a603e6797492896f170";
+          sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16318,22 +16339,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
+    ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170221.33";
+        version = "20170328.706";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "4663cd80af74d8e29001adc696568de5d3d8717c";
-          sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy";
+          rev = "9595e72e85e7edef0d9df5accf166d232824cd3d";
+          sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
           sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
           name = "ejc-sql";
         };
-        packageRequires = [ auto-complete cider clomacs dash emacs spinner ];
+        packageRequires = [
+          auto-complete
+          cider
+          clomacs
+          dash
+          direx
+          emacs
+          spinner
+        ];
         meta = {
           homepage = "https://melpa.org/#/ejc-sql";
           license = lib.licenses.free;
@@ -17120,12 +17149,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20161210.49";
+        version = "20170322.1347";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
-          sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
+          rev = "3d36c16bbe1cebc285341452a60da578afbb2804";
+          sha256 = "1aywgkf5505hx7qd0r4b8k89xmskkrz9imlmhp6xnwj31qs7ix63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17351,12 +17380,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170303.621";
+        version = "20170324.227";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e";
-          sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6";
+          rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f";
+          sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18049,12 +18078,12 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20170213.655";
+        version = "20170322.830";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "6897e43223eac133f0c2d9101932fec6479e58b6";
-          sha256 = "1qjrnh25rv4n0cvdd8ynjlmvnb7zqibz1ky0x8ahkml72g672f5i";
+          rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff";
+          sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18217,12 +18246,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170313.640";
+        version = "20170323.730";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "00e8d01f114ad5ca95d5e9509ef327afa0087e0f";
-          sha256 = "171ic2qcrc0mwfjjn2v8894m0r5waq3qpmw80lqqc1a05yn656si";
+          rev = "9ce171d38915c81ba0f387e013aad2e089d61d48";
+          sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -19034,12 +19063,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20170112.1108";
+        version = "20170328.832";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6";
-          sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh";
+          rev = "87fe85ac20a6ac32b41df5e7464d6ace5528445b";
+          sha256 = "0s2yf8hkigbzp5rhkznlkg4jqx3darj4i7h3dpbajc2lnc1c9nmc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19080,8 +19109,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a85efc31824b4d59f4ed1eefcd19e9d7c6ef021f";
-          sha256 = "1w8m12s8cjy20nssp5ya83zi3jkxk4f6fv4d7xr9gzgvrsqcq2rx";
+          rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c";
+          sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19660,12 +19689,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170227.802";
+        version = "20170327.248";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "e7e52d2c07d374209261d207293caa391db7b398";
-          sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz";
+          rev = "dd623f1c67c54fb1f9c20403fa976cb1272a5074";
+          sha256 = "033rsdxrmcjcmjpdkbqykr0zir7ycy0f706q5x6m3vn13wm5hgfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20032,12 +20061,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170306.334";
+        version = "20170323.1140";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "56e92f7cb4e04e665670460093b41f58446b7a2b";
-          sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145";
+          rev = "273a714e2d073257f6604d03be53c5fd784117c4";
+          sha256 = "0vrvfgrl1pdmvphscsf9zyy9yvl25xm53h5k1wiw7v3kb66x7s88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20473,12 +20502,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170319.143";
+        version = "20170328.21";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "039c82f5183a01b6e008b1028b48f1ec33f74eff";
-          sha256 = "1zgk0xmvfnqvh0d0925c8sfpr53frgk5ixbxis72r04p0hz4833v";
+          rev = "da324d54e539f042a85344d1c168b69106896b8b";
+          sha256 = "0sfs09bm6p55xz5f71370zika0qcmlph6mgcc9mzyvpx31vsyfg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -20914,12 +20943,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170104.1209";
+        version = "20170328.1011";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "e8acacd31466def1e8fa1eac0c5ccbbcd5a0ba2e";
-          sha256 = "1x8qwvpjv87sv2lyda57k0l47mjvn0ichpgjs0vc7q8kmhww5k5h";
+          rev = "3579123acb130e18e9bd8ff3b3029f7052528a32";
+          sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21541,12 +21570,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170320.325";
+        version = "20170321.608";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "2cc09d6041dfef6e86113aef21897b9536fbfb54";
-          sha256 = "181chqhqh3n6yh24qki3x8if1xgvqr739v8dags0kq8xbsnlzkcv";
+          rev = "c53e4b4ba21bd00196a28746a900f3fc1a9d1cbc";
+          sha256 = "0dbh9q0s1vps5nwdy16jcq5sqw9ilk0s9qlmbkiy0cvs4z08wgd1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22943,12 +22972,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170309.145";
+        version = "20170324.340";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "f8addaf0529a3060de65de9a86db26976d2a8372";
-          sha256 = "1k2slk6h3av7hiqhzk8gpamd8r23r79y8jap9vy9xcl81z47l5g0";
+          rev = "794e339ab3bae5fa033b3c4913ab24ddad49dc2e";
+          sha256 = "099ffl46z046vzk1qhgcsn5b54zw6yjp9hnp6w7v4rr8pn4r1jlk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23136,8 +23165,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44";
-          sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3";
+          rev = "2a0e96889b128808866a1e2e98694be1b251fd37";
+          sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23363,12 +23392,12 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20161223.856";
+        version = "20170323.634";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "8c6220f45c24d662f1c4afae54f311139f0242b1";
-          sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq";
+          rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3";
+          sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -23468,12 +23497,12 @@
     flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flow";
-        version = "20170207.605";
+        version = "20170325.504";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-flow";
-          rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795";
-          sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g";
+          rev = "e51aff467edf2d86e7b315d79d6f2f4d8408ea78";
+          sha256 = "1w1s7rcbmiikb7f80rf9d77gzszjcfyymx75x20vvq3rw4wvdnyj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23510,12 +23539,12 @@
     flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-gometalinter";
-        version = "20161225.1721";
+        version = "20170321.732";
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b";
-          sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6";
+          rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2";
+          sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
@@ -23930,12 +23959,12 @@
     flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pyflakes";
-        version = "20140630.1521";
+        version = "20170325.1258";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pyflakes";
-          rev = "026ef070f1589bc0ae8f86a02072fa36e57b9912";
-          sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
+          rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43";
+          sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes";
@@ -23972,12 +24001,12 @@
     flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-rust";
-        version = "20161019.1103";
+        version = "20170322.306";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-rust";
-          rev = "f8ae845d4d7a18c1873ee1edd1a4db272fde5dd3";
-          sha256 = "1p7ijqcbrflaxqk7r5zvgxznsvd8kcr8hfnzlymdylwbgy04j6wy";
+          rev = "ae7c14758c3d33615d981f15951500feb2881b06";
+          sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -24137,15 +24166,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-yamllint";
+        version = "20170325.1035";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "flycheck-yamllint";
+          rev = "c2b273d84f15bd03464d6722391e595d7c179a5c";
+          sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
+          sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
+          name = "flycheck-yamllint";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-yamllint";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "20160913.130";
+        version = "20170327.1418";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
-          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -25709,22 +25759,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170314.1321";
+        version = "20170329.953";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "a06f0fb63c3ddf2d66128f0dcfb32040472fbf0a";
-          sha256 = "0k5mb8sss2smdr45lhxhvck2pcbscgidjfdr7b7jb7i2l9jfc8jp";
+          rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e";
+          sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ company dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/fstar-mode";
           license = lib.licenses.free;
@@ -25736,8 +25786,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "692f49d92ec108f15159da220ad8a7e79984a5a7";
-          sha256 = "1czx0c1yb338wxm8njsgx6qdx23ym52nvcx7jp38zlp5h5lzw9p1";
+          rev = "30f73d63f4031b35b52ecb28652aebf1a8e430f1";
+          sha256 = "0yn1sk2fp3bvw79r9lalpcxkcnj70prn56gr82hmkd2n0lq5lzi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25862,8 +25912,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "37097c273d9100e66b97755054f71366f30ef60b";
-          sha256 = "027id8r9vsksdnbd4j9pb67zmjlfp8v7y9227xby4hqxxzzgxiv8";
+          rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9";
+          sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26186,12 +26236,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20170201.1455";
+        version = "20170325.1956";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "166593c68b66276e36c7d91a9653bb1c44650afc";
-          sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h";
+          rev = "b75e0376942c1ee54f7d173362d4a38e665342f9";
+          sha256 = "1mbip1w35mjcl4048a1aglvpqwkkf0h990i9yjr6w9p7wlxb8car";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26207,12 +26257,12 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170317.2017";
+        version = "20170328.954";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "a0d994ce04e66f17dadf17f985433ccb1581d58c";
-          sha256 = "16h668kf90plf460yn2kc40vqysd0rappblyr680sdn2b08k0sbw";
+          rev = "fa0e6e2d2a9c06671fd44b5d938ea24387654525";
+          sha256 = "0wnh24jnnf0kl291l36hykx86nrn74kqwxlwzd2llydbhk07sq8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26673,8 +26723,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0344413a09537d1063917527634987bb4e0d9c31";
-          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26900,12 +26950,12 @@
     git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20170226.24";
+        version = "20170325.220";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "efa6752397101739c6abb53a0ca7a904d1c7898d";
-          sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx";
+          rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743";
+          sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -28431,8 +28481,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "c6b709f23dc29a0ad6204ce05e88def4acffad6e";
-          sha256 = "14569d8bi0ibk8pq6fdbbbmagzx5lnm2791ndpyn6y62h54lyhq8";
+          rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3";
+          sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28557,8 +28607,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
-          sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
+          rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827";
+          sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28937,12 +28987,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170305.813";
+        version = "20170323.817";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
-          sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
+          rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827";
+          sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29147,12 +29197,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170313.813";
+        version = "20170322.704";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "61d6ce9b133fb57d4b7a12d007b2e2c8bc6a645f";
-          sha256 = "0jlzb06vcgdmj5yp0wnfq81bjdasnbrffvm3019b5yyx0cc7ysn3";
+          rev = "e1dfd9655b69e5e27a040cae5aeff25afec383f1";
+          sha256 = "19z6hapaj9nw238lyd7ivnhfhpxy6wnjkcn93jgdhdx4k3q9aq73";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29256,8 +29306,8 @@
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "emacs-habitica";
-          rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc";
-          sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn";
+          rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce";
+          sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -29273,12 +29323,12 @@
     hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hack-time-mode";
-        version = "20170319.412";
+        version = "20170322.844";
         src = fetchFromGitLab {
           owner = "marcowahl";
           repo = "hack-time-mode";
-          rev = "87dda91b314ad2bde31b3b2fd405059dcecba52c";
-          sha256 = "1hy07laa12r7gcfsc03b1qggqsm2zriahravj0ydix99jcjyikbv";
+          rev = "02ee6c5c1f691564399a0c76b9c606d7d7dbfe05";
+          sha256 = "0gxlmdf9gy2z3c0nswyac7g4j6cswgf7hd3ccb2bn25v67jb3y6c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -29651,12 +29701,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170228.730";
+        version = "20170325.553";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "775ff42884c0baab9da01fcdc87707c6c90480c8";
-          sha256 = "1w6sc6klkr5b9fbp38pngmn0icps5hi6z6cbs59zlzz5lmq7jr9d";
+          rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a";
+          sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29919,12 +29969,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170320.1242";
+        version = "20170329.1221";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
-          sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
+          rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
+          sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30129,12 +30179,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20170308.36";
+        version = "20170321.1306";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
-          sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
+          rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
+          sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30210,6 +30260,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-books";
+        version = "20170324.2331";
+        src = fetchFromGitHub {
+          owner = "grugrut";
+          repo = "helm-books";
+          rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f";
+          sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
+          sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
+          name = "helm-books";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-books";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bundle-show";
@@ -30486,12 +30557,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170320.231";
+        version = "20170329.1221";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
-          sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
+          rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
+          sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30507,12 +30578,12 @@
     helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
     melpaBuild {
         pname = "helm-cscope";
-        version = "20150609.649";
+        version = "20170326.22";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "helm-cscope.el";
-          rev = "ddc3f750a92044d6712585e29d3dbaface2e34db";
-          sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
+          rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a";
+          sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope";
@@ -30654,12 +30725,12 @@
     helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dired-history";
-        version = "20161023.806";
+        version = "20170321.2201";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-dired-history";
-          rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6";
-          sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15";
+          rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
+          sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -31745,12 +31816,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170320.1620";
+        version = "20170322.1209";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "aa628be91f6f2c492891b102cda0f27023661ee6";
-          sha256 = "1dnws9fpf33hp561kgr1ybax13xj4ci6qabvyn0qkm3ihw0cbfdp";
+          rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904";
+          sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -31955,12 +32026,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20170202.1000";
+        version = "20170328.2152";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b";
-          sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk";
+          rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54";
+          sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32522,12 +32593,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170313.139";
+        version = "20170325.1029";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "affc1299eed800713bef422a72780c00cbfb3a65";
-          sha256 = "1lb1vlqcj3139yp1h19d96izpxy6ybhkbdqgy52igk1v904ab44a";
+          rev = "9c7204ea9d7ce232ce3ff88107854c219397528c";
+          sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -34443,12 +34514,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170108.148";
+        version = "20170325.815";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "36fb5e0149795404d0271419fd4354ba58f81dbc";
-          sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q";
+          rev = "38ce88a9c3be11b0431080078095159b2211ca7a";
+          sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -34894,6 +34965,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "ido-flex-with-migemo";
+        version = "20170319.431";
+        src = fetchFromGitHub {
+          owner = "ROCKTAKEY";
+          repo = "ido-flex-with-migemo";
+          rev = "c620934f50b9713693eba8e23f88c2aaa8510708";
+          sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo";
+          sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7";
+          name = "ido-flex-with-migemo";
+        };
+        packageRequires = [ emacs flx-ido migemo ];
+        meta = {
+          homepage = "https://melpa.org/#/ido-flex-with-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
     ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-gnus";
@@ -35749,12 +35841,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20161220.856";
+        version = "20170322.1001";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "b6b8bf42bf50c8b0b1aff56894d8265df79361cc";
-          sha256 = "007102am1q2dkp18p1vlsy34i28lvvq4n8b3grz7nyblbik1v5wp";
+          rev = "d50c762d9f6f66cd1b4b72f1b5d024284b378aa9";
+          sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools";
@@ -35812,12 +35904,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170319.24";
+        version = "20170325.2346";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "5ef6bdf09e8716340f09a08d5fa957ca3ebeef18";
-          sha256 = "1n9jrdad3jcn94x1wrkwzd0dk7p09nhnvww2j151bpj2ggzpyqbr";
+          rev = "4e802769559153b975f1b24d5a28bc80d212c807";
+          sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36103,12 +36195,12 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20170203.2120";
+        version = "20170325.221";
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280";
-          sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs";
+          rev = "cbe5ead0b5993e290ee88d7a07a6ead46f2d0697";
+          sha256 = "07qdg72i5na466gka1x50swlipy4d0k1pkhw1d1p6s3xwq7cfm2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -36312,12 +36404,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170317.1852";
+        version = "20170321.129";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "d33d4a44b130595658439f1274db91a544792704";
-          sha256 = "17slghcgvqb80ffl31g6a6z7b5hza1dbqybqhl37qjpfxa3i6pak";
+          rev = "04265e68647bbf27772df7b71c9927d451e6256f";
+          sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36582,12 +36674,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170313.1437";
+        version = "20170322.1438";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "4d64ecc0970ff43290b4b27e0c7d2176d1890c71";
-          sha256 = "0g0m19x2flzm3pz9k19j9hp41wqihk1hbzbmrihn2sz4cgbrg98f";
+          rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb";
+          sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36644,10 +36736,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170303.1503";
+        version = "20170321.1306";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj";
+          sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -36870,12 +36962,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170320.422";
+        version = "20170328.1957";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "beffa78885517beaad2da50accc339f9346f94ee";
-          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36891,12 +36983,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170308.36";
+        version = "20170321.1306";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
-          sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
+          rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
+          sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -36912,12 +37004,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170316.2112";
+        version = "20170324.401";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "9d67a7e65408c5e218bff24b2dd6ce78257a66e4";
-          sha256 = "06p14ga0k687mnavxczdmkij0945cm70zhcbm93b1a6gykbzvd0j";
+          rev = "1dcb258a0207053a33ac207c11f2414aa89daba2";
+          sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36979,8 +37071,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "beffa78885517beaad2da50accc339f9346f94ee";
-          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37246,12 +37338,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20170320.655";
+        version = "20170321.214";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "3e41fa6f132f2b3130d9abd250a52cfea7655d17";
-          sha256 = "1sqpb227qky1lj552nwmyxjmbjqp0agxjs3arq329xi3c7ywkhj9";
+          rev = "7cd363187a8d41fe604925df51169ca9ed32f798";
+          sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37624,12 +37716,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170319.26";
+        version = "20170326.1333";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "e3a3ba35be0dcf5fef1bff965c6cfe92386c0835";
-          sha256 = "11g73qclz1l77h7prrrl3akh7skxbz325yc4yb65cbnbz0bm30m3";
+          rev = "940069c397b6db841acfd21ffd15495388deba7c";
+          sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38125,12 +38217,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170221.1636";
+        version = "20170321.153";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527";
-          sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k";
+          rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7";
+          sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38688,12 +38780,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170320.530";
+        version = "20170329.649";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "236d827c68d502d1ee8866d6038518590a5f7449";
-          sha256 = "1kq0km53ysl7xapc7ayhav2k69yvgpf402hgri5522v01cmmfgg9";
+          rev = "be544a81cff86ab1b54ad673b9229185882ca998";
+          sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39193,8 +39285,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b1248776c6ffc9f91a7c862dd2c1650a3de7f990";
-          sha256 = "0pi805ii3w38vy3064yvf845m05wpnj2fmfwkngdx9jwpifgsavq";
+          rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44";
+          sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39645,22 +39737,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    lastpass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170318.205";
+        version = "20170327.352";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "d65d0e0b03d39556d998fb3843058b1ab2addd45";
-          sha256 = "0kdzklnmcwyy0l0564rxjc0frn9333syip5048l5q86fxm5y46vw";
+          rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0";
+          sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
           sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj";
           name = "lastpass";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs seq ];
         meta = {
           homepage = "https://melpa.org/#/lastpass";
           license = lib.licenses.free;
@@ -40004,12 +40096,12 @@
     lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lenlen-theme";
-        version = "20150307.11";
+        version = "20170328.1945";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "lenlen-theme";
-          rev = "05202458fa0a5242e5c6e4451e375f6c16920272";
-          sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
+          rev = "b8a6412c81633b10fb98ba0930f55b25071c084a";
+          sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme";
@@ -40486,12 +40578,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170320.1442";
+        version = "20170326.801";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "0d2f382dca335d4b65bc91d840293ff2a83db999";
-          sha256 = "14xshiwv3hqp68w297kjcvx1gmnd6v3yqhbs7ynm1i24xmgznigg";
+          rev = "15301856dbefe5138f14ade673df4a574cf15eae";
+          sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40820,12 +40912,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170225.2207";
+        version = "20170326.934";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "0c253d6547008202c20eba2cb5649dd1f44b3126";
-          sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav";
+          rev = "b2ff3b041697d56dbc7bfd70d94f708e551a970a";
+          sha256 = "1xpwsajfr2ddn68w2d6j206m4g6h05b6n3xig5flk845899954a4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40907,8 +40999,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "9fe7c740276213df8a0a2eb419b227bf3a7f3227";
-          sha256 = "0zr8hpc7dlmyd1x1xlwampjhw1k99jyrnh28kxqjw59nv3x1hpbx";
+          rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57";
+          sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41316,22 +41408,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "luarocks";
-        version = "20170226.1430";
+        version = "20170326.941";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "luarocks.el";
-          rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce";
-          sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp";
+          rev = "e0e52ba395432e18508740cc3d097b2918f55b9b";
+          sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks";
           sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x";
           name = "luarocks";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/luarocks";
           license = lib.licenses.free;
@@ -41589,12 +41681,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170317.903";
+        version = "20170329.221";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0344413a09537d1063917527634987bb4e0d9c31";
-          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41789,8 +41881,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0344413a09537d1063917527634987bb4e0d9c31";
-          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42037,12 +42129,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170320.415";
+        version = "20170328.216";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "b20bac2335596302d70a1dd9575517a81363966c";
-          sha256 = "1xhg5pfm5qds6njdm464w95z9zfsf84ihkj68nvzr2qv73ihqzqg";
+          rev = "1f2015cb131d69ffd7994dcc153abef969999027";
+          sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -42247,12 +42339,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170308.2031";
+        version = "20170325.1917";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "67c15f292515142c2417f147117ea2a3172cd195";
-          sha256 = "1kbr2x4s0ynwizm5hy3q4xdjs1jmfdsnpndcs0dlh0di0mhld6x0";
+          rev = "ab6cccaccea2d0d26fc461942b4ae3ea65bd8f39";
+          sha256 = "0k4dcm4gkjy82nhcg00wgk2hipzbzvrwn8qyvjjn5r6h1jcpmfb3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -42963,12 +43055,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170315.1652";
+        version = "20170324.222";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
-          sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
+          rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
+          sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44302,6 +44394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monokai-alt-theme";
+        version = "20170325.1430";
+        src = fetchFromGitHub {
+          owner = "dawidof";
+          repo = "emacs-monokai-theme";
+          rev = "584aaf88b83a40bbbfeb6a7c89c5feecebf5a52b";
+          sha256 = "1709f2gf8gdz5ppb0k3gxcg4z0r7kgcm2hpymji9gnag87nnx1m6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
+          sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v";
+          name = "monokai-alt-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/monokai-alt-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
@@ -44511,10 +44624,10 @@
       }) {};
     mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse3";
-        version = "20170307.858";
+        version = "20170324.1050";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse3.el";
-          sha256 = "0as1d26m3r1vacccsdlbw0rp6jyhj054wv1lssiky6d0kqzn6wa6";
+          sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -44845,12 +44958,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20170220.2245";
+        version = "20170323.2254";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "38452683b2cb4448de13062d47264f9e9d35e7c8";
-          sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij";
+          rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047";
+          sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -44968,11 +45081,11 @@
     multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-project";
-        version = "20170221.232";
+        version = "20170322.332";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
-          rev = "c04d5bdeb213";
-          sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2";
+          rev = "c03cafbbfba9";
+          sha256 = "0v0q4v3pnqmm89hix90pfx4hpfpc9iv1r5ldn3zwzwhbs0jvgj3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -46134,8 +46247,8 @@
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "d06d8af34c1e74a7c7a8601233f5e42c38420035";
-          sha256 = "0nz1lrx0iiapmhy78d17m8v91nly11hlykg00xvj91y1iw0713ql";
+          rev = "e48698fd474fb1b76356101fc97df00eaa610ddd";
+          sha256 = "0k356rw2ack1bf5f0km7fljws5iml9f8scp1ykpf86kskrl2gygq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -46255,12 +46368,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20161001.2336";
+        version = "20170326.144";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "2ddac4faa12fc405fcb2148f7d045be83cae5f3d";
-          sha256 = "1iaf03791x3jw1vgp2pc4aa01xw5kfr7mk87x7bg1py88pljkh7l";
+          rev = "dc81622d899976cb7d4515b592972d17d590ca20";
+          sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -46276,12 +46389,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170320.1512";
+        version = "20170329.538";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "3a05714be2a5f1e87ba1dcd30959c7ec03900a3a";
-          sha256 = "0hfqhcy9bzw5jsbcz11dh1b94l9m5jishdywxy3javlcjwqhjdi4";
+          rev = "94c08d19c94924b5f549aff61be84efc46e41126";
+          sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46343,8 +46456,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "dc931fe1cd6e426bbb8392872a10f3b308ed008a";
-          sha256 = "1dmavg2w3gdbg0607llzgl45h42m1pcnidfmgalmwb29snk9b33m";
+          rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
+          sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46609,6 +46722,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nord-theme";
+        version = "20170325.2314";
+        src = fetchFromGitHub {
+          owner = "arcticicestudio";
+          repo = "nord-emacs";
+          rev = "8df429d20d69e5fd914881a71ae3a044d02b392a";
+          sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
+          sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
+          name = "nord-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nord-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "nose";
         version = "20140520.948";
@@ -46633,8 +46767,8 @@
         version = "20170313.1712";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "c39f6361d0798aa8d0dcd0b91f6b86ab9dc21c75";
-          sha256 = "0dknkvpwa9fvvn512rij4vfdm7ifyddls5fh06i6cydw3id7dbid";
+          rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88";
+          sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47192,12 +47326,12 @@
     ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
-        version = "20170302.849";
+        version = "20170324.932";
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e";
-          sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1";
+          rev = "1f582d5c16ff032207a40d49be0727190a227912";
+          sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -47630,6 +47764,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "obfusurl";
+        version = "20170325.802";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "obfusurl.el";
+          rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb";
+          sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
+          sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
+          name = "obfusurl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/obfusurl";
+          license = lib.licenses.free;
+        };
+      }) {};
     objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "objc-font-lock";
@@ -48078,8 +48233,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
-          sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
+          rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
+          sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -48540,12 +48695,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170318.754";
+        version = "20170327.1337";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
-          sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+          rev = "53469a2f0577924de1c7d887fecea409d17fd588";
+          sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48708,12 +48863,12 @@
     org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-clock-csv";
-        version = "20170130.2213";
+        version = "20170326.1041";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "59482e800700e66db5381661c1e6b3edb2c03a34";
-          sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx";
+          rev = "0bae215df11e5602b07294e83b595447ae73ca0d";
+          sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -48978,6 +49133,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-edit-latex";
+        version = "20170327.1847";
+        src = fetchFromGitHub {
+          owner = "et2010";
+          repo = "org-edit-latex";
+          rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7";
+          sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex";
+          sha256 = "0bnpr6plndz3q8515lni0mjwlpxy05jkg4bqifmrd52qh91x7j17";
+          name = "org-edit-latex";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-edit-latex";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
     melpaBuild {
         pname = "org-ehtml";
@@ -49277,8 +49453,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
-          sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
+          rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
+          sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49297,8 +49473,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
-          sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
+          rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
+          sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49356,12 +49532,12 @@
     org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mru-clock";
-        version = "20170314.1357";
+        version = "20170323.308";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "471d206fb2f1d4fd974ec51474bf952141dfde5b";
-          sha256 = "1zjn0knncj9yizhw664yg0a0n2qmjpjs6zn4jiqgd5452mambjy4";
+          rev = "98691aac779001d50516b12679e2a53b5192f164";
+          sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -49398,12 +49574,12 @@
     org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-notebook";
-        version = "20170311.1302";
+        version = "20170321.2152";
         src = fetchFromGitHub {
           owner = "Rahi374";
           repo = "org-notebook";
-          rev = "ea6e477015a5f25d41df25af25252f521b12691a";
-          sha256 = "1i1jchigh70z0ymil85plfx6wf9hwxlkl7jx9kxhv70zpc3m9mlg";
+          rev = "d90c4aeca2442161e6dd89de175561af85aace03";
+          sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
@@ -49636,12 +49812,12 @@
     org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-protocol-jekyll";
-        version = "20151119.838";
+        version = "20170328.939";
         src = fetchFromGitHub {
           owner = "vonavi";
           repo = "org-protocol-jekyll";
-          rev = "f41902baaa62c8de3f81ad67a5f36d6aa5781578";
-          sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
+          rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334";
+          sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll";
@@ -49657,12 +49833,12 @@
     org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-random-todo";
-        version = "20161018.219";
+        version = "20170321.804";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-random-todo";
-          rev = "10293cc751b13ef13ebdacb22968b4ffdcadb163";
-          sha256 = "1fjlrs12kwybpx9zqrvyhalp4macx7v3vw739nd7bqsl1srwwr4f";
+          rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
+          sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -49726,12 +49902,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170320.728";
+        version = "20170325.703";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "292a6d5ef0e169f41d745ea2d3083f189a59444b";
-          sha256 = "0skj5f73qa5qxzpjhpkx65fk2pzhkn63ji3kgw7k76p5mw56i90h";
+          rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4";
+          sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49859,6 +50035,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-sync-snippets";
+        version = "20170319.902";
+        src = fetchFromGitHub {
+          owner = "abrochard";
+          repo = "org-sync-snippets";
+          rev = "80d89985ae52c3adf445deba851b6eadc794eef3";
+          sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
+          sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp";
+          name = "org-sync-snippets";
+        };
+        packageRequires = [ emacs f org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-sync-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-table-comment";
@@ -50177,12 +50374,12 @@
     org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org2elcomment";
-        version = "20170313.1845";
+        version = "20170324.245";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org2elcomment";
-          rev = "e10e159d502aa7ab9c0d988c50c298a340ba2fcc";
-          sha256 = "022ayjrsc2v5qw4xd7jxjw45lbryibwc6b68qi5555gjwd0mi3f5";
+          rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0";
+          sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -50853,8 +51050,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "170a9d843f990f45c167ab62c12e342459110d19";
-          sha256 = "1397s2qfn4b9b1b7s93sh131a36ifv9ydnpg6j5ihrwwa7556nng";
+          rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903";
+          sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50870,12 +51067,12 @@
     ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-epub";
-        version = "20170304.1600";
+        version = "20170328.1131";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
-          sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+          rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3";
+          sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -50975,12 +51172,12 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20170320.621";
+        version = "20170326.47";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "700736da7a42a56cc24864efa9863393c966121e";
-          sha256 = "1x7k1pwjh4y07c0ln7d4rl10kvgfjddqd57414d6a010n7xr92m3";
+          rev = "638a9a44c96f5b21e2e36121465645e586910713";
+          sha256 = "12is86csnix270rnyf9q0l7ds70g128fn9nzgjgjgfylsp5nk9rf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -51035,6 +51232,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ox-minutes";
+        version = "20170323.835";
+        src = fetchFromGitHub {
+          owner = "kaushalmodi";
+          repo = "ox-minutes";
+          rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1";
+          sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes";
+          sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj";
+          name = "ox-minutes";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ox-minutes";
+          license = lib.licenses.free;
+        };
+      }) {};
     ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }:
     melpaBuild {
         pname = "ox-nikola";
@@ -51374,12 +51592,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170305.2112";
+        version = "20170324.1727";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb";
-          sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk";
+          rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
+          sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51936,12 +52154,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "20170317.706";
+        version = "20170326.2344";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "96e9320c3d09923fd4bd3bfbca3d4d4891273cfd";
-          sha256 = "0nja6nmw5sqnaryr8f7isyp8iliz4y6kml4nc11cs88zpr6fq40q";
+          rev = "73327c471d92c7716484d8c3cbcdeed1d70ae468";
+          sha256 = "18g7mir5ynik5ryg0hl6vpjpajz6d6j0xd9ni54h3h60vvhciwmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -52065,8 +52283,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "6f867674272a03273212259b9039c9356a6ed90f";
-          sha256 = "1cn6iwkh19brz0wzxgf65lnb6wg4v87g66kbzd7fw52qv0xh4q7j";
+          rev = "caaa5f0f85fd93c1651d4c74c8bb8287a18c4e88";
+          sha256 = "10nqf5l320p61pajx7pj5yh7hxf666zsj1kcdb91ddb367kcwzzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -53172,12 +53390,12 @@
     phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phoenix-dark-pink-theme";
-        version = "20161206.1519";
+        version = "20170324.1144";
         src = fetchFromGitHub {
           owner = "j0ni";
           repo = "phoenix-dark-pink";
-          rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15";
-          sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac";
+          rev = "219edf69adb7e911394c5849c310ca0f4201a917";
+          sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -53193,12 +53411,12 @@
     php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
     melpaBuild {
         pname = "php-auto-yasnippets";
-        version = "20141128.1411";
+        version = "20170324.914";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-auto-yasnippets";
-          rev = "7da250a0d40f3ec44c7249997436ee8c5cae04ef";
-          sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
+          rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032";
+          sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
@@ -53634,12 +53852,12 @@
     pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pippel";
-        version = "20170320.1703";
+        version = "20170325.649";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "pippel";
-          rev = "a96b5cb4d6e74766d8d92b343aa4f86fd45d208a";
-          sha256 = "0ryw6cd1snjb1jyzbddx0c2gxfpvxyzw1ilbzhr8xd0hc87z01iw";
+          rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f";
+          sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8dbdb25c8344c96048a7863333ace6dc07d8154c/recipes/pippel";
@@ -54068,12 +54286,12 @@
     pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
     melpaBuild {
         pname = "pocket-mode";
-        version = "20170320.627";
+        version = "20170327.438";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "pocket-mode";
-          rev = "36128b4c1785f94da52e3c7d98ca44da8911996e";
-          sha256 = "0mr1acblwfm67x1v7wgz77djr81gv8bb8jd2giwbs8qxqic56zcn";
+          rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46";
+          sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
@@ -54398,15 +54616,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "popup-edit-menu";
+        version = "20170329.452";
+        src = fetchFromGitHub {
+          owner = "debugfan";
+          repo = "popup-edit-menu";
+          rev = "bd823ae3068e053804258697848392492538914c";
+          sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu";
+          sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf";
+          name = "popup-edit-menu";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/popup-edit-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-imenu";
-        version = "20160409.510";
+        version = "20170326.340";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "popup-imenu";
-          rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
-          sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
+          rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
+          sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
@@ -54689,12 +54928,12 @@
     prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prassee-theme";
-        version = "20170228.618";
+        version = "20170329.758";
         src = fetchFromGitHub {
           owner = "prassee";
           repo = "prassee-emacs-theme";
-          rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2";
-          sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32";
+          rev = "5be0ad067182881012bea5ae352636eaff06b01b";
+          sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -55191,8 +55430,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "codesearch.el";
-          rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c";
-          sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+          rev = "7013d933cd9d3c04f19a6572176483b48a311807";
+          sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch";
@@ -55271,12 +55510,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170315.730";
+        version = "20170323.210";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
-          sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
+          rev = "6f866e1e7cd50db563a16ae9237ad10f3be97fef";
+          sha256 = "1fs5pcqk1zfhgbh2k9kdyi7sm089iy2mwaqipa1k91lvmqawz5i6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -55569,8 +55808,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "ffa932bf10d958fc3dff3ac9153f1b4ef55d6024";
-          sha256 = "1d6j2al7vz1a4dpzmn3vl62f2vsprjiddjlj4ww4j6g2lpphrik0";
+          rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182";
+          sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55583,15 +55822,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "protocols";
+        version = "20170327.758";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "protocols.el";
+          rev = "1c93a48d4173635a7b742248797f424e7ce851e3";
+          sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
+          sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
+          name = "protocols";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/protocols";
+          license = lib.licenses.free;
+        };
+      }) {};
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170131.23";
+        version = "20170324.243";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "4a78aac90d84ea7aef6219497bd75c3ead988806";
-          sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j";
+          rev = "28a3a95890243993b20c2c2bf66d6c00a2f0fd21";
+          sha256 = "0kajvmfyaxma9mh7mbrc3hiilzkdjwmgvv6zdfv39r9llwkrv80k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -55806,12 +56066,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170315.1112";
+        version = "20170323.331";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "d7f25ade2266927356ae20053eb353c099ab233e";
-          sha256 = "0hk5ikf5jnbmwn6jm2drpn3wv9agmcl2wp9dhlhc8c23pqrjv1hk";
+          rev = "ce098468af9e7dc50a3979b0f4b7de54abe0aa78";
+          sha256 = "1vap7vk6fsslpijy2iq3y0fb94naxjm60mcyf3xlz1gym3hfrwl5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -56312,8 +56572,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "d78e0130720aba010a55e388ba16bd58debef828";
-          sha256 = "0my3a7h7v6x1b19d8fd6lpdzn32zav4nwpmc8f8pypf076kjaf82";
+          rev = "da2e9724a195ea48451222457e56fbb9311186da";
+          sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -57866,8 +58126,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca";
-          sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n";
+          rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
+          sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -57945,12 +58205,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "20170311.114";
+        version = "20170322.1527";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "e46948a3567a462094fcda227daa0f462e9f9120";
-          sha256 = "1damy0y5c4qnfvdmv9qzr7w6vs88dm71wsfv918p79a0drp7xrdb";
+          rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1";
+          sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -58466,12 +58726,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "20170130.1926";
+        version = "20170329.1644";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "194805787694194cf713ff15ee52a78c8da2d1fa";
-          sha256 = "1g2vyi53sna5416q1sgc74yaw8vpqwwhxas4r5xcp8qyxxk5zspy";
+          rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
+          sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -58905,8 +59165,8 @@
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8";
-          sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz";
+          rev = "5347e3609c5ea8b767f9ec0c08969467d288c516";
+          sha256 = "1gnbphf4ldi60wdfwpcyyyhgj2scj0wmlxp10014cwz9xcdqnfl5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -58985,12 +59245,12 @@
     rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rope-read-mode";
-        version = "20170131.217";
+        version = "20170325.831";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "a3810cf223c92353338418058153a466657a2dca";
-          sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by";
+          rev = "a43d56d79a0595374a8414979b758fbea3cab0a8";
+          sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -59069,12 +59329,12 @@
     rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "rpn-calc";
-        version = "20150302.534";
+        version = "20170328.349";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "rpn-calc";
-          rev = "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594";
-          sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
+          rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62";
+          sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -59132,12 +59392,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170303.1422";
+        version = "20170329.1245";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "81ac739febae408d593e2d743ac64c8c068fdb78";
-          sha256 = "161nbshas80qxgpck5mnpa0y0v9bx9rdph2g87wr95lzw9dm3cyb";
+          rev = "8d868af718f29e7428658fe56979e05659f3a9c3";
+          sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -59198,7 +59458,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58039";
+          rev = "58216";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59278,7 +59538,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58039";
+          rev = "58216";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59967,12 +60227,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20170131.2121";
+        version = "20170323.502";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
-          sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
+          rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
+          sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -60855,6 +61115,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "services";
+        version = "20170327.835";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "services.el";
+          rev = "87d65bf9fd8b02101f751846c650fc518355d1ea";
+          sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
+          sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
+          name = "services";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/services";
+          license = lib.licenses.free;
+        };
+      }) {};
     session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "session";
@@ -60921,12 +61202,12 @@
     sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "20170225.346";
+        version = "20170324.510";
         src = fetchFromGitHub {
           owner = "nuncostans";
           repo = "sexy-monochrome-theme";
-          rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
-          sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
+          rev = "c221231bb8a0d60413d710efe6226683326d57b0";
+          sha256 = "0zjy6d4fqg08dwbn1y360514pzzj3nrg3wzm656n7sg90mffh22i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -61337,8 +61618,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9";
-          sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72";
+          rev = "45b32a79d90a4e23064f0ca18d4ff9283b01ef03";
+          sha256 = "189vx1kjrdr0lxbfbvfvrxvr1y216px23rfa52ysha5av2khr39v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -61892,12 +62173,12 @@
     skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "skeletor";
-        version = "20151220.2054";
+        version = "20170327.1529";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "skeletor.el";
-          rev = "78df0da39bdf0d3e78f8d672a3486c02baa9dbd0";
-          sha256 = "1sabk2ly80k67hwypm5g292n3c4hjlcmvc61n3ixlkm4nq8dp6sy";
+          rev = "cf643ea320e172b3727f897f05e87a8e5a02c589";
+          sha256 = "1l3gjzzvrbkiapk41jxp1hwx2z2wc69m8bsy179nwvv9gsnxvwv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
@@ -62018,12 +62299,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170318.627";
+        version = "20170328.2044";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "0474bbf2d446ef706c5779b2f42d0d10375bdd7e";
-          sha256 = "1q0bq9s38q0wba34gdngs3zhybdnzb2c840sivnqdlj5kp74wcq8";
+          rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8";
+          sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -62753,8 +63034,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "a212f777eea775a5c106b5022dea3bbb215bf98a";
-          sha256 = "19fpal1r0x11515s1lwgr5cjs0jk7pggfnv6y7jj4bvrvq87imnk";
+          rev = "2acdee84701021049bea0925988df61e340c2311";
+          sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63105,12 +63386,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20170226.1852";
+        version = "20170326.1920";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab";
-          sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n";
+          rev = "349980879a66493ed421e9c83f4857662267b8df";
+          sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -63147,12 +63428,12 @@
     snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
     melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
-        version = "20161008.305";
+        version = "20170324.513";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "snapshot-timemachine-rsnapshot";
-          rev = "4ff6b96219f4da576141e376b0348813c1c25615";
-          sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+          rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
+          sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
@@ -65189,12 +65470,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20170320.113";
+        version = "20170326.321";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "c0470316543091b4f64b334c51538acd95dffc9c";
-          sha256 = "1f3w6qzbw1ksm9sxqcxygr1n6g9ddd7xx0b29yvp2s94mia3rbs7";
+          rev = "d23e9e86c413561177f7f0704056627ee3c0eb15";
+          sha256 = "0p02sjrhlcjbprw4s2gy8rccgm0k9ds4haj6hmg48gsbahxiz59v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -65561,12 +65842,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170320.358";
+        version = "20170328.737";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "beffa78885517beaad2da50accc339f9346f94ee";
-          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66291,12 +66572,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170301.557";
+        version = "20170327.1017";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "1d68f51db69ed096a6e13b036755f0c4b6ad3e8f";
-          sha256 = "0nh0yrn2jgccifh2xvrfly6n145flvxx76wxc5jjdkgg2xy7alys";
+          rev = "0b89755a5d985c27378795ec017c00b8bdd78f55";
+          sha256 = "04v6lb4mz802g72565ar8h2vx4fxfvs5y8hkiimr7r04y3b73d5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -66736,8 +67017,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
-          sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
+          rev = "e5a3f048ee7c7729434918648cafc564cbb3046a";
+          sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -66757,8 +67038,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
-          sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
+          rev = "e5a3f048ee7c7729434918648cafc564cbb3046a";
+          sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -66984,12 +67265,12 @@
     textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "textx-mode";
-        version = "20161106.1243";
+        version = "20170329.339";
         src = fetchFromGitHub {
           owner = "novakboskov";
           repo = "textx-mode";
-          rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca";
-          sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z";
+          rev = "cd47daf9737479ff06e2fa43fbb45ada2d7386e8";
+          sha256 = "165m6p18nzpqvdvx2a6hf94blsa2r947wdf1x6jicqflfpki45cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
@@ -67180,6 +67461,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thinks";
+        version = "20170325.430";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "thinks.el";
+          rev = "122c0dcafa79bb1d9b37dc5bf6045e9f62666e6c";
+          sha256 = "05jczr3vj7j7b83sv2w79hrd4hq8xip79yx4z9g1v8lr3j3l4gzq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
+          sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
+          name = "thinks";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/thinks";
+          license = lib.licenses.free;
+        };
+      }) {};
     thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thread-dump";
@@ -67229,8 +67531,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "6582757752e62efea3f9786dddf0260efaa1f450";
-          sha256 = "1c9miaq60d0l352yyxc2l3v927wzgadsyvfxyvs88qdk6pmz59ig";
+          rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7";
+          sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -67286,12 +67588,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170318.822";
+        version = "20170325.602";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "96b35dda1ff9fe5b185618edddd4787b4821f9e5";
-          sha256 = "1jq1iyg0h4ddgkbsba0yw1h95xjh5dqnjdjdjsyx3ky8ir562la2";
+          rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23";
+          sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67427,6 +67729,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "timonier";
+        version = "20170328.116";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "timonier";
+          rev = "f5d42f0a234b906f72da759240b9fc2067de1e80";
+          sha256 = "1dl99zwcps8n22pf60mp47r8px98a9ihyf95j1y6dfivnzm7kjy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
+          sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
+          name = "timonier";
+        };
+        packageRequires = [
+          all-the-icons
+          dash
+          emacs
+          f
+          hydra
+          pkg-info
+          request
+          s
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/timonier";
+          license = lib.licenses.free;
+        };
+      }) {};
     timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }:
     melpaBuild {
         pname = "timp";
@@ -67598,12 +67930,12 @@
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "20170131.558";
+        version = "20170324.103";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "cda8f73640ae26c476990eae421e42627445f9d0";
-          sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm";
+          rev = "f0b94e07bb4b32db039088a58578bced29256431";
+          sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -68119,12 +68451,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170312.1927";
+        version = "20170326.1044";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "fd6334f795df409d8d854a0762ef2d2ac74556c0";
-          sha256 = "0mi3xrgsshds09j70mv42ngn1f702wswvrn4wm3xh8gv6sqfbz5m";
+          rev = "5b88e643e93115af3a96c8cf558eb506b34a64fc";
+          sha256 = "1zcpy3628s9cm9am92imwhp31fdnd6146hz0x4qaazia4gbhp66z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -68657,12 +68989,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170314.658";
+        version = "20170324.1301";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "5931f2776d07f361a9aa58075dcea721b9480416";
-          sha256 = "12cw0nphc7xkzphwmflp2r2jbvixqhmb4lvvgp52qsy8b8n1hamr";
+          rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
+          sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -68861,12 +69193,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170309.131";
+        version = "20170321.1016";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "c9ae717f38a7d01de30a8030f80032a5782aa88c";
-          sha256 = "0jx8rfm8jrpn7b8q0wkabjsnvlbzmgn2q60qscmvz1bggb01r9ak";
+          rev = "2db6f0ab6054e9d6893d65bb239cdae5c2decf5f";
+          sha256 = "10m4bic1n8vmz1gr81cpr1cwyamyvp6iw3wdc0vwfma2fskd1pq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68946,8 +69278,8 @@
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "465e339749f924606df71e250ae10d1f910f71a9";
-          sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm";
+          rev = "3d69b33a0b52ba25415ba8ad8552b0cfb250435d";
+          sha256 = "15h2nabbi6ysr6xrf35p8zs0mi00ifk645kskhhfyn3hm103j052";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -69369,6 +69701,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uptimes";
+        version = "20170326.515";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "uptimes.el";
+          rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
+          sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
+          sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
+          name = "uptimes";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/uptimes";
+          license = lib.licenses.free;
+        };
+      }) {};
     url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "url-shortener";
@@ -69432,12 +69785,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170319.12";
+        version = "20170327.1449";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
-          sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
+          rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
+          sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69478,8 +69831,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0";
-          sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6";
+          rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309";
+          sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70104,16 +70457,16 @@
     vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimgolf";
-        version = "20140814.1448";
+        version = "20170323.600";
         src = fetchFromGitHub {
           owner = "timvisher";
-          repo = "vimgolf";
-          rev = "289bef87963b660c0cf6ea1f648ac2440c609c88";
-          sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
+          repo = "vimgolf.el";
+          rev = "741e414ec24072af05471058a5719271bfcfe766";
+          sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf";
-          sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf";
+          sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f";
           name = "vimgolf";
         };
         packageRequires = [];
@@ -70476,22 +70829,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20170206.120";
+        version = "20170329.612";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "0b159770abc865796a1fa02be2f5959138b2f8a6";
-          sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7";
+          rev = "cbd1e35375309f0c813b5689a765c483caef6d60";
+          sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
           sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
           name = "vue-mode";
         };
-        packageRequires = [ mmm-mode ];
+        packageRequires = [ mmm-mode ssass-mode vue-html-mode ];
         meta = {
           homepage = "https://melpa.org/#/vue-mode";
           license = lib.licenses.free;
@@ -70598,12 +70951,12 @@
     wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wakatime-mode";
-        version = "20170319.2117";
+        version = "20170324.2348";
         src = fetchFromGitHub {
           owner = "wakatime";
           repo = "wakatime-mode";
-          rev = "ac31d0def2a9c03c3aa2cbe9cdd94d61de5a6ecc";
-          sha256 = "07grqwh71x4jd1vpah6lxz3vh3q9rxkn4dli2165db7cazpv1ym8";
+          rev = "7172a92df66a69537c849182c22404715ddd9bfe";
+          sha256 = "0scayq5vwxsilm90zbma8lc6fvmm6w7p3gfyphcvvsm93rx5601r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -70640,12 +70993,12 @@
     wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "wandbox";
-        version = "20160418.1114";
+        version = "20170324.1014";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "c5c4f1279f48e7871407d0fca2409512f427107e";
-          sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445";
+          rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815";
+          sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -70661,12 +71014,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20170309.1426";
+        version = "20170325.357";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "40ea87cc62ac6d858235edf2e5d10e5867aa230e";
-          sha256 = "0kmw7rhx7d1a9vhabrfks5l95jafya4lw6yl937imkyxjb6kqdf5";
+          rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a";
+          sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -70976,12 +71329,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170320.1251";
+        version = "20170328.1448";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "8e9f4e05503b8751736ee4db78e78cc8edbe9f8a";
-          sha256 = "0gs1b2yvg2742vpjc4gaj5g2yf81br3456pi5yfz6cwkxk4adfyi";
+          rev = "382e01d787c4a0fa6bd4c58bed1810ed5b7787e2";
+          sha256 = "1nz4ri36k49gwdkc9sb886avpijijssrj4frjyrw27ff9aj9q9h0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -71439,8 +71792,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "92d6b0e8d81715c33b9926fc51adb74d8fa8a323";
-          sha256 = "02ny5ygm7hlm5jx8hl0r10pf3bfvlyfnp2cvkhqz66mfhrv6f7yj";
+          rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6";
+          sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71807,8 +72160,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "3447d48e8562";
-          sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
+          rev = "c5c0bb98b281";
+          sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72034,12 +72387,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170306.1230";
+        version = "20170326.712";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "9dc5a0f5077e20ea3177376823a1fed18840d5f2";
-          sha256 = "076mz72qqfcbrs2gw9ng8gbzhr9kzc9mnjmv51n67dmd7hi5mmyc";
+          rev = "820fe2316d672e7bb2be7a2ead8ad5ed027f1a9a";
+          sha256 = "13d089n9y8y7ka708byg9704rq0slxvdzfhw8vk0yzzd3jrbfgs3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -72115,6 +72468,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "wotd";
+        version = "20170328.1248";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "emacs-word-of-the-day";
+          rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64";
+          sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd";
+          sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5";
+          name = "wotd";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/wotd";
+          license = lib.licenses.free;
+        };
+      }) {};
     wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wrap-region";
@@ -72160,12 +72534,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "20170228.1521";
+        version = "20170324.1514";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "f853350da848d0814f822587ae310e52d895f523";
-          sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
+          rev = "071ebbecf6bc9dc40c5d1a120a9aa3d27ddaa81b";
+          sha256 = "1w4bhp9b3jm6gqj4lvxbljr2xw05xldsxb8xaddj3ac82afq7kh5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -72223,12 +72597,12 @@
     wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
     melpaBuild {
         pname = "wttrin";
-        version = "20160414.837";
+        version = "20170322.2041";
         src = fetchFromGitHub {
           owner = "bcbcarl";
           repo = "emacs-wttrin";
-          rev = "e2a02cc58920a4f34ba01f7015c9e6bfcce51f61";
-          sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m";
+          rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5";
+          sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin";
@@ -73147,12 +73521,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "20170213.154";
+        version = "20170323.1104";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "46c201b1d5195842fdf540d4c153127f91b1a125";
-          sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk";
+          rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
+          sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -73188,10 +73562,10 @@
       }) {};
     yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yaoddmuse";
-        version = "20160717.2212";
+        version = "20170325.1752";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el";
-          sha256 = "0j73zkzk1iyxpxca6zvjwq5iig8a6la6hm6i5kwwnbc9c681acqx";
+          sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse";
@@ -73312,12 +73686,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170310.1724";
+        version = "20170326.1030";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "7f337f4488da6e3ea4b92057ca1576d17bc51743";
-          sha256 = "0g1irdas5vvzjfrzvvzpz7kii52smn4aa58s6v10kchppxrrikzc";
+          rev = "5043a961215158619199cf03a85a0c063a28c644";
+          sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -73415,12 +73789,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170227.2341";
+        version = "20170329.1433";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
-          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -74048,11 +74422,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170307.1646";
+        version = "20170326.1630";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "f79f9e8247da";
-          sha256 = "0mdajrwwcfgy6g330ca3s6a240wnj56ryag6h2ghwwclzy81nwdc";
+          rev = "ef1de4ed0def";
+          sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From 543f5263d2bcd6d35a61d8aa84e31179c2a0a32f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Mar 2017 13:25:34 +0200
Subject: [PATCH 0419/1744] nixos/dnscrypt-proxy test: exercise plugin loading

---
 nixos/tests/dnscrypt-proxy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 26409949ec6..84562336825 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -15,6 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       services.dnscrypt-proxy.enable = true;
       services.dnscrypt-proxy.localPort = localProxyPort;
+      services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example.so" ];
 
       services.dnsmasq.enable = true;
       services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ];

From c504e14c874d10512a81c9e81a84d2d69dbc4408 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Mar 2017 13:27:55 +0200
Subject: [PATCH 0420/1744] rl-notes 17.03: add notes about changes to the
 dnscrypt-proxy interface

(cherry picked from commit 961367717662ca84daf01a1f9ee3f9404ae659d0)
---
 nixos/doc/manual/release-notes/rl-1703.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 2ffc488c0c1..e0c7d0c25e2 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -247,6 +247,17 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      The dnscrypt-proxy module interface has been streamlined around the
+      <option>extraArgs</option> option.  Where possible, legacy option
+      declarations are mapped to <option>extraArgs</option> but will emit
+      warnings.  The <option>resolverList</option> has been outright
+      removed: to use an unlisted resolver, use the
+      <option>customResolver</option> option.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From ad902fbba1b6720fb37664b5726184d9586334c3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Mar 2017 13:51:06 +0200
Subject: [PATCH 0421/1744] aliceml: mark as broken

Tried fixing it, but gave up ... Has likely been non-functional for a
while, without anybody noticing.
---
 pkgs/development/compilers/aliceml/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index 0c8b0f5ce60..15c51af005f 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation {
     homepage = http://www.ps.uni-saarland.de/alice/;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.doublec ];
+    broken = true;
   };
 }

From 09f24f628b64ada599616271ff4809eddb59eb0c Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Thu, 30 Mar 2017 15:15:49 +0200
Subject: [PATCH 0422/1744] buildRustPackage: Fix "warning: file ... may be
 generated" (#24471)

Every Rust derivation used to emit a warning like the following:

```
setting SOURCE_DATE_EPOCH to timestamp 1490877042 of file cargo-6e0c18c/Cargo.lock
warning: file cargo-6e0c18c/Cargo.lock may be generated; SOURCE_DATE_EPOCH may be non-deterministic
```

The reason is that the dependencies are copied without preserving
timestamps. Changing the build script to timestamp-preserving copy
removes the warning.
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a69ef5c6b07..91569d0c070 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // {
 
     echo "Using cargo deps from $cargoDeps"
 
-    cp -r "$cargoDeps" deps
+    cp -a "$cargoDeps" deps
     chmod +w deps -R
 
     # It's OK to use /dev/null as the URL because by the time we do this, cargo

From ce953d0bc90f17dfc35f0e498cfe192bfad0cc20 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 12:21:32 +0200
Subject: [PATCH 0423/1744] panomatic: remove

---
 nixos/tests/gnome3-gdm.nix                |  1 +
 pkgs/tools/graphics/panomatic/default.nix | 18 ------------------
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/graphics/panomatic/default.nix

diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 42425b57ba3..2c9c745021a 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
+      services.xserver.displayManager.slim.enable = false;
       services.xserver.displayManager.gdm = {
         enable = true;
         autoLogin = {
diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix
deleted file mode 100644
index f14c16775f8..00000000000
--- a/pkgs/tools/graphics/panomatic/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, boost, zlib}:
-
-stdenv.mkDerivation {
-  name = "panomatic-0.9.4";
-
-  src = fetchurl {
-    url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2;
-    sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn";
-  };
-
-  buildInputs = [ boost zlib ];
-
-  meta = {
-    homepage = http://aorlinsk2.free.fr/panomatic/;
-    description = "Tool that automates the creation of control points in Hugin";
-    license = stdenv.lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4a38faed28..2fb97372a48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3346,8 +3346,6 @@ with pkgs;
     buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs];
   });
 
-  panomatic = callPackage ../tools/graphics/panomatic { };
-
   pamtester = callPackage ../tools/security/pamtester { };
 
   paper-gtk-theme = callPackage ../misc/themes/paper { };

From 8a18e1f7f12abbf10bec46f74290eb75543cfb0a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 12:29:20 +0200
Subject: [PATCH 0424/1744] quagga service: disable

---
 nixos/modules/module-list.nix | 2 +-
 nixos/release.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9d25cc680f8..0035368273c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -455,7 +455,7 @@
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
   ./services/networking/prosody.nix
-  ./services/networking/quagga.nix
+  # ./services/networking/quagga.nix
   ./services/networking/quassel.nix
   ./services/networking/racoon.nix
   ./services/networking/radicale.nix
diff --git a/nixos/release.nix b/nixos/release.nix
index 523d6e291ac..5f9a5b0e064 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -293,7 +293,7 @@ in rec {
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   tests.pumpio = callTest tests/pump.io.nix {};
-  tests.quagga = callTest tests/quagga.nix {};
+  # tests.quagga = callTest tests/quagga.nix {};
   tests.quake3 = callTest tests/quake3.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.samba = callTest tests/samba.nix {};

From 877aaeff6157236f846f0e7b794cfedb517d63d5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 14:52:22 +0200
Subject: [PATCH 0425/1744] boomerang: mark as broken

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

diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 6ecf6546e36..cfd8c03af6d 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "http://boomerang.sourceforge.net/";
     license = stdenv.lib.licenses.bsd3;
     description = "A general, open source, retargetable decompiler";
+    broken = true;
   };
 }

From cc82423366f25db6ced8b6da4d8a3d06645e5a45 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 14:58:42 +0200
Subject: [PATCH 0426/1744] freestyle: mark as broken

---
 pkgs/misc/freestyle/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index 231b8eabb07..6d022220794 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -45,9 +45,10 @@ stdenv.mkDerivation {
 
   installPhase = ":";
 
-  meta = { 
+  meta = {
     description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
     homepage = http://freestyle.sourceforge.net;
-    license = stdenv.lib.licenses.gpl2;
+    license  = stdenv.lib.licenses.gpl2;
+    broken = true;
   };
 }

From 536b782450328fe582a9667940cbf53a7cb7628d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:04:17 +0200
Subject: [PATCH 0427/1744] libsingular: does not build on i686

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

diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 6cd66c62a0a..9cd72c2fd50 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -44,9 +44,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A CAS for polynomial computations";
-    maintainers = with maintainers;
-      [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = subtractLists platforms.i686 platforms.linux;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
     homepage = "http://www.singular.uni-kl.de/index.php";
     downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";

From 13ab07d95a85c3e2abed8eae58ead920c8e6232f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:37:16 +0200
Subject: [PATCH 0428/1744] maxima-ecl: mark as broken

---
 pkgs/applications/science/math/maxima/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 85a13f7ac37..5a19f73d9cf 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation ({
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
+    broken = ecl != null;
   };
 } // (stdenv.lib.optionalAttrs ecl-fasl {
   preConfigure = ''

From 9b89d68ef0cdd8035102b87cbef942a206f93240 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:42:26 +0200
Subject: [PATCH 0429/1744] murmur_git: mark as broken

---
 pkgs/applications/networking/mumble/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 7c773b0db8b..0de567e7a74 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -132,5 +132,7 @@ in {
   mumble     = client stableSource;
   mumble_git = client gitSource;
   murmur     = server stableSource;
-  murmur_git = server gitSource;
+  murmur_git = (server gitSource).overrideAttrs (old: {
+    meta = old.meta // { broken = true; };
+  });
 }

From b9948fedc636daddd5851e71b634314fb0c34830 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:44:20 +0200
Subject: [PATCH 0430/1744] ncbi_tools: mark as broken and remove -fPIC

PIC is used by default since 16.09
---
 pkgs/applications/science/biology/ncbi-tools/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix
index 775e2ec3cc8..e9d99aeb254 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@@ -9,16 +9,14 @@
 
 stdenv.mkDerivation rec {
   name = "ncbi_tools";
-  ncbi_version="Dec_31_2008";
+  ncbi_version = "Dec_31_2008";
   src = fetchurl {
     url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz";
     sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
   };
 
   configureFlags = "--without-debug --with-bin-release --with-dll --without-static";
-  # PIC flag (position independent code for shared libraries)
-  NIX_CXXFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
-  buildInputs = [cpio];
+  buildInputs = [ cpio ];
 
   meta = {
     description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
@@ -26,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/; 
     license = "GPL";
     priority = "5";   # zlib.so gives a conflict with zlib
+    broken = true;
   };
 }

From 84db2dffe963b98fef0ec4a9083648bdd533328c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:48:24 +0200
Subject: [PATCH 0431/1744] nix-exec: fix build

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

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 296176148c7..78eb04601cd 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, nix, git }: let
+{ stdenv, fetchurl, pkgconfig, nix, git, gcc6 }: let
   version = "4.1.6";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
-
     sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
   };
 
-  buildInputs = [ pkgconfig nix git ];
+  buildInputs = [ pkgconfig nix git gcc6 ];
+
+  NIX_CFLAGS_COMPILE = "-std=c++1y";
 
   meta = {
     description = "Run programs defined in nix expressions";
-
     homepage = https://github.com/shlevy/nix-exec;
-
     license = stdenv.lib.licenses.mit;
-
     platforms = nix.meta.platforms;
   };
 }

From c47cc7e163982f74cac9d188fb3bbe87f1094ca4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 15:56:08 +0200
Subject: [PATCH 0432/1744] qt-gstreamer: fix build

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

diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index 72068bb1f7b..a2630b9343e 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From 9f86136cefbd3e050b96a307346278fe9ad8a5bf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:03:14 +0200
Subject: [PATCH 0433/1744] rustc: don't build on i686

---
 pkgs/development/compilers/rust/rustc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a693afb8b59..f2fe7fbca7a 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -153,6 +153,6 @@ stdenv.mkDerivation {
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
     license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin);
   };
 }

From 8e3a595eb12e962c8771ecb408745884082ffbbc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:06:19 +0200
Subject: [PATCH 0434/1744] tkabber: remove

---
 .../instant-messengers/tkabber/default.nix    | 68 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 70 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/tkabber/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
deleted file mode 100644
index b4403a780ed..00000000000
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, xlibsWrapper
-, withSitePlugins ? true
-, theme ? null
-}:
-
-with stdenv.lib;
-
-let
-  version = "1.1";
-
-  main = {
-    name = "tkabber";
-    sha256 = "1ip0mi2icqkjxiam4qj1qcynnz9ck1ggzcbcqyjj132hakd855a2";
-  };
-
-  plugins = {
-    name = "tkabber-plugins";
-    sha256 = "1dr12rh4vs1w1bga45k4ijgxs39801c1k4z3b892pn1dwv84il5y";
-  };
-
-  tclLibraries = [ bwidget tcllib tcltls tclgpg ];
-
-  getTclLibPath = p: "${p}/lib/${p.libPrefix}";
-
-  tclLibPaths = stdenv.lib.concatStringsSep " "
-    (map getTclLibPath tclLibraries);
-
-  mkTkabber = attrs: stdenv.mkDerivation (rec {
-    name = "${attrs.name}-${version}";
-
-    src = fetchurl {
-      url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
-      inherit (attrs) sha256;
-    };
-
-    prePatch = ''
-      sed -e "s@/usr/local@$out@" -i Makefile
-    '';
-  } // removeAttrs attrs [ "name" "sha256" ]);
-
-in mkTkabber (main // {
-  postPatch = optionalString (theme != null) ''
-    themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
-    sed -i '/^if.*load_default_xrdb/,/^}$/ {
-      s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
-    }' tkabber.tcl
-  '';
-
-  postInstall = ''
-    for prog in $out/bin/*; do
-      wrapProgram "$prog" \
-        --prefix PATH : "${tk}/bin" \
-        --set TCLLIBPATH '${tclLibPaths}' \
-        ${optionalString withSitePlugins ''
-        --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
-        ''}
-    done
-  '';
-
-  buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;
-
-  meta = {
-    homepage = "http://tkabber.jabber.ru/";
-    description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
-    license = stdenv.lib.licenses.gpl2;
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fb97372a48..d12ac401fca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4419,8 +4419,6 @@ with pkgs;
 
   time = callPackage ../tools/misc/time { };
 
-  tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
-
   qfsm = callPackage ../applications/science/electronics/qfsm { };
 
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };

From 4a702e8b74e9b208f3b5d51893b70731cf548e4a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:06:51 +0200
Subject: [PATCH 0435/1744] tclgpg: remove

---
 pkgs/development/libraries/tclgpg/default.nix | 37 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/tclgpg/default.nix

diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix
deleted file mode 100644
index d8bea7f14e3..00000000000
--- a/pkgs/development/libraries/tclgpg/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }:
-
-stdenv.mkDerivation rec {
-  name = "tclgpg-${version}";
-  version = "1.0pre";
-
-  src = fetchsvn {
-    url = "http://tclgpg.googlecode.com/svn/trunk";
-    rev = 74;
-    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5";
-  };
-
-  configureFlags = "--with-tcl=" + tcl + "/lib "
-                 + "--with-tclinclude=" + tcl + "/include ";
-
-  preConfigure = ''
-    configureFlags="--exec_prefix=$prefix $configureFlags"
-    sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in
-    autoreconf -vfi
-  '';
-
-  prePatch = ''
-    sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl
-  '';
-
-  passthru = {
-    libPrefix = "gpg1.0";
-  };
-
-  buildInputs = [ autoconf automake tcl tcllib ];
-
-  meta = {
-    homepage = http://code.google.com/p/tclgpg/;
-    description = "A Tcl interface to GNU Privacy Guard";
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d12ac401fca..e797ae3402f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9869,8 +9869,6 @@ with pkgs;
 
   tclap = callPackage ../development/libraries/tclap {};
 
-  tclgpg = callPackage ../development/libraries/tclgpg { };
-
   tcllib = callPackage ../development/libraries/tcllib { };
 
   tcltls = callPackage ../development/libraries/tcltls { };

From 9330991a37086beac82f73fc97809fcaab75dc74 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:14:48 +0200
Subject: [PATCH 0436/1744] telepathy_rakia: remove

---
 .../telepathy/rakia/default.nix               | 19 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
deleted file mode 100644
index 7d06d57ca9a..00000000000
--- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
-, sofia_sip }:
-
-stdenv.mkDerivation rec {
-  pname = "telepathy-rakia";
-  name = "${pname}-0.8.0";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
-    sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
-  };
-
-  nativeBuildInputs = [pkgconfigUpstream libxslt ];
-  buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
-
-  meta = {
-    homepage = http://telepathy.freedesktop.org;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e797ae3402f..51bf8bb4dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15616,8 +15616,6 @@ with pkgs;
 
   telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
 
-  telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
-
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
   telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};

From c38d6b493ef5e072ee529aa9d42cd4df2a2ca3c2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:16:33 +0200
Subject: [PATCH 0437/1744] ultrastardx: mark as broken

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

diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index 5027abedcf4..9810d5186b0 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://ultrastardx.sourceforge.net/;
     description = "Free and open source karaoke game";
     license = stdenv.lib.licenses.gpl2Plus;
+    broken = true;
   };
 }

From 62303628cef40fef0a73db1c8ba2dc5416fe760b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:18:36 +0200
Subject: [PATCH 0438/1744] vimiv: mark as broken

cc @aszlig
---
 pkgs/applications/graphics/vimiv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 39db1dd1f6d..023008183ff 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -68,5 +68,6 @@ python3Packages.buildPythonApplication rec {
     description = "An image viewer with Vim-like keybindings";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
+    broken = true;
   };
 }

From 5c04b32b6cae196eb531ef84d8c6351c586a64b3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:21:19 +0200
Subject: [PATCH 0439/1744] wxmupen64plus: mark as broken

---
 pkgs/misc/emulators/wxmupen64plus/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
index aec498b899e..ff0dc5164b5 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2";
     sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
   };
-  
+
   buildInputs = [ python wxGTK29 SDL libX11 mesa ];
 
   configurePhase = ''
@@ -19,10 +19,11 @@ stdenv.mkDerivation {
 
   buildPhase = "python waf";
   installPhase = "python waf install";
-  
+
   meta = {
     description = "GUI for the Mupen64Plus 2.0 emulator";
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
+    broken = true
   };
 }

From 520ce40bb3daf6464feafb5218eb88ed68f4d70d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:22:49 +0200
Subject: [PATCH 0440/1744] zeroad: do not build on i686

---
 pkgs/games/0ad/game.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index f038673f4c0..3a50196456c 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
       gpl2 lgpl21 mit cc-by-sa-30
       licenses.zlib # otherwise masked by pkgs.zlib
     ];
-    platforms = platforms.linux;
+    platforms = subtractLists platforms.i686 platforms.linux;
   };
 }

From 4d4488e793396a6ee938e758d501f3cceae16f1a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Mar 2017 16:28:15 +0200
Subject: [PATCH 0441/1744] grsecurity: 4.9.18-201703261106 ->
 4.9.19-201703300917

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index d009a4fd11f..70cda750279 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.18";
+  version = "4.9.19";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "0l60ny68qwjf585x84yxipndv2g00g08rm4k6hd7k8s93kf3h7lvspsbdg1g1nw50g8dc3n0w31pqads7b2ha6zf39jh77cx7449rn3";
+    sha512 = "13wzalzrhgvs6jfzrh8y9c90scliw6rl1vpyyh95va5wph5b8fczr136pbzpwzjaql7x5xyn3s57rmakpc5k8b34ng8hr6jzj6kiyq0";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cd535a522d3..ee4c161d739 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.18";
-      grrev  = "201703261106";
-      sha512 = "2zr38i847fpxi631kv4l88zgj9xzc8fvyjyk5db4d53n35pp7vxdw4iq89wp6z1n5hmzwdp5kqvq3z3hn9va3yvhh88aq0dza48lgfx";
+    { kver   = "4.9.19";
+      grrev  = "201703300917";
+      sha512 = "04fyrxyxa817qw2fbpdrw2z5xmfhjaf9kgzrfdqg1rnxnwwp1x9alm3qwkvlw0s9hcph3jln7z19jiw0fh6s82pb337cnhr1iiikax4";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 30 Mar 2017 11:02:57 -0400
Subject: [PATCH 0442/1744] qt4: fix to work on clang 4

The new clang is more strict about signed comparisons against pointers,
so this adds a couple of ad-hoc patches to appease it.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b03b8896a5f..46bb7a4e8fa 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
     # there might be more references, but this is the only one I could find
     substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \
       --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"
+  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \
+      --replace 'optionalHeight > 0' 'optionalHeight != NULL'
+
+    substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \
+      --replace 'm->comment()) >= 0' 'm->comment()) != NULL'
   '';
 
   patches =

From 8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 30 Mar 2017 11:36:30 -0400
Subject: [PATCH 0443/1744] caf: fix on clang4

Also, enable parallel builds because I got sick of waiting :)
---
 pkgs/development/libraries/caf/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index d3e655676e6..d3b6722b36c 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2";
   };
 
+  # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this
+  patches = [ (fetchpatch {
+    url    = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch";
+    sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj";
+  }) ];
+
   nativeBuildInputs = [ cmake ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "An open source implementation of the actor model in C++";
     homepage = http://actor-framework.org/;

From f0512f4ceb3441c9fef688ef78b41dfa6ec5802a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 17:36:22 +0200
Subject: [PATCH 0444/1744] wxmupen64plus: fix eval

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

diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
index ff0dc5164b5..e13abb6fe2b 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     description = "GUI for the Mupen64Plus 2.0 emulator";
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
-    broken = true
+    broken = true;
   };
 }

From 80c916b6ced0c2adc054ef14e63b28cb2dc40b89 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 16:28:38 +0200
Subject: [PATCH 0445/1744] docs: 16.09 -> 17.03

---
 README.md                                  | 8 ++++----
 maintainers/scripts/hydra-eval-failures.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 002caa3a171..1d5fbd218e2 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
 ```
 
 For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest
+custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest
 release and `nixos-unstable` for the latest successful build of master:
 
 ```
 % git remote update channels
-% git rebase channels/nixos-16.09
+% git rebase channels/nixos-17.03
 ```
 
 For pull-requests, please rebase onto nixpkgs `master`.
@@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
 * [Manual (NixOS)](https://nixos.org/nixos/manual/)
 * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09)
+* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents)
+* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents)
 
 Communication:
 
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 6122dabb1e8..6bbc0a45e44 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -48,8 +48,8 @@ def get_maintainers(attr_name):
 @click.command()
 @click.option(
     '--jobset',
-    default="nixos/release-16.09",
-    help='Hydra project like nixos/release-16.09')
+    default="nixos/release-17.03",
+    help='Hydra project like nixos/release-17.03')
 def cli(jobset):
     """
     Given a Hydra project, inspect latest evaluation

From f9a10601990de8eada3470eda50f7cff8277bd0e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 18:01:40 +0200
Subject: [PATCH 0446/1744] qt-gstreamer: fix build and do not mark wrong pkgs
 as broken

---
 .../libraries/gstreamer/legacy/qt-gstreamer/default.nix       | 4 ++--
 pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index d298fbd7fc3..74b1417e069 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake
+{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
-  propagatedBuildInputs = [ boost ];
+  propagatedBuildInputs = [ boost155 ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
 
   cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index a2630b9343e..72068bb1f7b 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
-    broken = true;
   };
 }

From fd3a99633bbbb7fb314dd532d9f154340547f821 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Fri, 24 Mar 2017 15:25:31 +0100
Subject: [PATCH 0447/1744] 2bwm: init at 0.2

---
 .../services/x11/window-managers/2bwm.nix     | 37 +++++++++++++++++++
 .../services/x11/window-managers/default.nix  |  1 +
 .../window-managers/2bwm/default.nix          | 30 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 4 files changed, 72 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/2bwm.nix
 create mode 100644 pkgs/applications/window-managers/2bwm/default.nix

diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix
new file mode 100644
index 00000000000..e3f5ec7dbe6
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/2bwm.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xserver.windowManager."2bwm";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm";
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "2bwm";
+        start =
+          ''
+            ${pkgs."2bwm"}/bin/2bwm &
+            waitPID=$!
+          '';
+      };
+
+    environment.systemPackages = [ pkgs."2bwm" ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index f005decfa33..42785b25158 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -8,6 +8,7 @@ in
 
 {
   imports = [
+    ./2bwm.nix
     ./afterstep.nix
     ./bspwm.nix
     ./compiz.nix
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
new file mode 100644
index 00000000000..50c342269c7
--- /dev/null
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, patches
+, libxcb, xcbutilkeysyms, xcbutilwm
+, libX11, xcbutil, xcbutilxrm }:
+
+stdenv.mkDerivation rec {
+  version = "0.2";
+  name = "2bwm-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "venam";
+    repo   = "2bwm";
+    rev    = "v${version}";
+    sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici";
+  };
+
+  # Allow users set their own list of patches
+  inherit patches;
+
+  buildInputs = [ libxcb xcbutilkeysyms xcbutilwm libX11 xcbutil xcbutilxrm ];
+
+  installPhase = "make install DESTDIR=$out PREFIX=\"\"";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/venam/2bwm";
+    description = "A fast floating WM written over the XCB library and derived from mcwm";
+    license = licenses.mit;
+    maintainers =  [ maintainers.sternenseemann ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51bf8bb4dba..8c9b87a3afe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12675,6 +12675,10 @@ with pkgs;
 
   ### APPLICATIONS
 
+  "2bwm" = callPackage ../applications/window-managers/2bwm {
+    patches = config."2bwm".patches or [];
+  };
+
   a2jmidid = callPackage ../applications/audio/a2jmidid { };
 
   aacgain = callPackage ../applications/audio/aacgain { };

From b6c93177e7d0f258b6707b181a9d738637c0e905 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Mar 2017 20:33:00 +0200
Subject: [PATCH 0448/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/16a802d4af5c39b9b907d008fa74161fd7f2e9fa.
---
 .../haskell-modules/hackage-packages.nix      | 556 ++++++++++++++----
 1 file changed, 454 insertions(+), 102 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d52c47bbe9e..e709108e9d8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3856,12 +3856,12 @@ self: {
      }) {};
 
   "DeepDarkFantasy" = callPackage
-    ({ mkDerivation, base, mtl, random }:
+    ({ mkDerivation, base, constraints, mtl, random }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.0.1.1";
-       sha256 = "c8e7e54cbddd22603d8df947229bc904f6129d2ed6286c1dd15a091a84089552";
-       libraryHaskellDepends = [ base mtl random ];
+       version = "0.2017.3.28";
+       sha256 = "e9dd1618c3e002cbf4fc6da18ad06202488b673b5d9e3ee5569830c5fc512f2d";
+       libraryHaskellDepends = [ base constraints mtl random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -15575,6 +15575,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SelectSequencesFromMSA" = callPackage
+    ({ mkDerivation, base, biocore, biofasta, bytestring, ClustalParser
+     , cmdargs, containers, directory, either-unwrap, filepath, matrix
+     , parsec, process, text, text-metrics, transformers, vector
+     , ViennaRNAParser
+     }:
+     mkDerivation {
+       pname = "SelectSequencesFromMSA";
+       version = "1.0.2";
+       sha256 = "e0bcbec57109cd8528e2fd511b4ca5ea17cbffad4bac4f7a71bad90e0ba2271c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base biocore biofasta bytestring ClustalParser cmdargs containers
+         directory either-unwrap filepath matrix parsec process text
+         text-metrics transformers vector ViennaRNAParser
+       ];
+       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";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Semantique" = callPackage
     ({ mkDerivation, base, bytestring, classify, containers, mongoDB
      , mtl, network, process, split, tagsoup, text
@@ -36922,8 +36946,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.1";
-       sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e";
+       version = "2.1.1";
+       sha256 = "1f628410eb6a1a8cba4a80c6ba0d9aa75f495594360fed83cd2223be548854bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38201,8 +38225,10 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "casing";
-       version = "0.1.1.0";
-       sha256 = "db3ba2aa997885da68348ff8c71e98434edc5a80e8e665154ccbf6f9ee3b63fb";
+       version = "0.1.2.0";
+       sha256 = "82fa20ff56d52349a9d0ee0c095f1aad384c8d5046a3563b956c4add841465a7";
+       revision = "1";
+       editedCabalFile = "fe967eec15b788744d08ffa34b33baa7e765764dcf2feb642c5985ca543dd804";
        libraryHaskellDepends = [ base split ];
        description = "Convert between various source code casing conventions";
        license = stdenv.lib.licenses.mit;
@@ -50210,8 +50236,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-fix";
-       version = "0.0.3";
-       sha256 = "f6c69e973a110c36c738d9f37bf3092eff5d25ec11782c301e255844b5010e57";
+       version = "0.0.4";
+       sha256 = "85e2d23ab0030c3c2aff4b2cc15deb7896b03189de0d53598fdaf582df7e8690";
+       revision = "1";
+       editedCabalFile = "e784f9bb1f2b758fbd41f5ff535ba911081182f89a81c19e36735f0e5e8d59f8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
@@ -53519,6 +53547,8 @@ self: {
        pname = "diagrams-cairo";
        version = "1.4";
        sha256 = "a94ec8bfdba325cf317368355eaa282bef3c75ed78e153ef400b8627575cea81";
+       revision = "1";
+       editedCabalFile = "c7830d8248ab40cb8724f3d3b0fce53b9b5be7a06c4dba0510ac900977e71277";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -55258,8 +55288,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.2.1";
-       sha256 = "1be8b6ea3468b063b3e30fc6cb027c3293373eedb073c70894ac21d937f52d93";
+       version = "0.2.3";
+       sha256 = "04ddbb27cca0d6599424c11695701d25921cbe83e05b0f4b58e78856bf9dc29f";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras exceptions
@@ -55342,8 +55372,10 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.3.1";
-       sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc";
+       version = "0.3.2";
+       sha256 = "3333113881efd9c6ca78df62168bb81097e503e52dfe71b760ec42cac309dcb3";
+       revision = "2";
+       editedCabalFile = "0ce943845b07c684bdaa074bbd1afc7e5fc680b2c37d4415c28d60df49d9a311";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process exceptions
          fingertree hashable mtl stm time transformers unordered-containers
@@ -63874,18 +63906,19 @@ self: {
      }) {};
 
   "ffmpeg-light" = callPackage
-    ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels
-     , libavcodec, libavdevice, libavformat, libswscale, mtl
-     , transformers, vector
+    ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg
+     , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale
+     , mtl, transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.11.3";
-       sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb";
+       version = "0.12.0";
+       sha256 = "9ff53c44c03562218ad04f3ac76c0e7fe8a7a91ed446743d20fb021705966833";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base either exceptions JuicyPixels mtl transformers vector
+         base bytestring either exceptions JuicyPixels mtl transformers
+         vector
        ];
        libraryPkgconfigDepends = [
          ffmpeg libavcodec libavdevice libavformat libswscale
@@ -64679,20 +64712,18 @@ self: {
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
-    ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts
-     , leancheck, pretty, template-haskell
+    ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell
      }:
      mkDerivation {
        pname = "fitspec";
-       version = "0.4.0";
-       sha256 = "73dae591138ff5390be2b7f373a4f3bed89d4d39d26ac665f5f8cf5326aad5da";
+       version = "0.4.1";
+       sha256 = "e4b0d7b33ab7b1e3acfdb5c3d170c5c3977e50fd05c124aec3e492374341bb6a";
        libraryHaskellDepends = [
          base cmdargs leancheck template-haskell
        ];
        testHaskellDepends = [ base cmdargs leancheck template-haskell ];
        benchmarkHaskellDepends = [
-         base cmdargs haskell-src haskell-src-exts leancheck pretty
-         template-haskell
+         base cmdargs leancheck pretty template-haskell
        ];
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
@@ -68064,6 +68095,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "functor-classes-compat" = callPackage
+    ({ mkDerivation, base, containers, hashable, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "functor-classes-compat";
+       version = "1";
+       sha256 = "ef11f94f44a74d6657ee61dcd2cfbc6d0889d233a2fb4caae6a29d9c59a1366f";
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/functor-classes-compat#readme";
+       description = "Data.Functor.Classes instances for core packages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "functor-combo" = callPackage
     ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub
      , type-unary, TypeCompose
@@ -78955,8 +79002,8 @@ self: {
      }:
      mkDerivation {
        pname = "gssapi-wai";
-       version = "0.1.0.0";
-       sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f";
+       version = "0.1.0.1";
+       sha256 = "12ec5a79ae4da85c7117edefc2a6b37790c7d4cf65ae04e89541de7709ee7a8e";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive gssapi
          http-types vault wai wai-extra
@@ -83867,6 +83914,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashtables_1_2_1_1" = callPackage
+    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
+     mkDerivation {
+       pname = "hashtables";
+       version = "1.2.1.1";
+       sha256 = "227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951";
+       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
@@ -84475,6 +84537,34 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
+  "haskell-gi_0_20_1" = 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.1";
+       sha256 = "7ff1d57f01386c6b32c788a599928b6a209922fa254d49e0607523c44984cd12";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -84488,6 +84578,20 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_20_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.20.1";
+       sha256 = "e9d8d3d75e0ea91108339daa172bc938512432509caeafdf5bd96551a380f046";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "haskell-google-trends" = callPackage
     ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
      , regex-base, regex-posix, tagsoup, text, wreq
@@ -92322,6 +92426,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-nlopt" = callPackage
+    ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }:
+     mkDerivation {
+       pname = "hmatrix-nlopt";
+       version = "0.1.0.0";
+       sha256 = "c2e9a63256018d6e867c957e05d953975f4b32430ea418774c6c8d2eead6028a";
+       libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/peddie/hmatrix-nlopt";
+       description = "Interface HMatrix with the NLOPT minimizer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hmatrix-quadprogpp" = callPackage
     ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
      mkDerivation {
@@ -97739,8 +97856,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "1.0.0.0";
-       sha256 = "e3afa22d1c68a9db41463b115f432ac01d80fee706ae58bf2cf00d6d4f7b0e65";
+       version = "1.0.0.1";
+       sha256 = "4c97bd2c2d81feffd21d848b7682aecbf77d36418c126bb6d50ab181cd1f4cce";
        libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core hxt lens mtl snap snap-core text transformers
@@ -102749,6 +102866,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "identicon_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
+     , QuickCheck, random, tf-random
+     }:
+     mkDerivation {
+       pname = "identicon";
+       version = "0.2.1";
+       sha256 = "b86796d03b0480a59f9889244aa3df6459c2def0666a2656219a306d1e25c13f";
+       libraryHaskellDepends = [ base bytestring JuicyPixels ];
+       testHaskellDepends = [
+         base bytestring hspec JuicyPixels QuickCheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion JuicyPixels random tf-random
+       ];
+       homepage = "https://github.com/mrkkrp/identicon";
+       description = "Flexible generation of identicons";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "identifiers" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers
      , criterion, deepseq, hashable, ListLike, QuickCheck
@@ -104439,8 +104577,10 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.1.0";
-       sha256 = "3be3e60a8ac3b280f183e6ffad81a534556740de6b22784c47f1fb5c24817c2e";
+       version = "1.1.1";
+       sha256 = "7dead9ab13e8feca491f5444d6d42383f948b347c7ceb44942a21c21f8b3a522";
+       revision = "1";
+       editedCabalFile = "5f2759927fa334b8991455100079701ef0064764715e42c82f5b469325e2174d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105126,8 +105266,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.1.0.8";
-       sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100";
+       version = "0.2.0.0";
+       sha256 = "39707b2d0ad546aa6ff34ad072ab0a231e23dc3c009708c63b0331c3c7f14270";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -105367,8 +105507,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.7";
-       sha256 = "0ec6a1cc5b37eca4a6d9794227d77f6d41c1eb30e2ad01981bc810aa53155237";
+       version = "0.7.0.1";
+       sha256 = "27920afacec2929700d4a1a152ea12d416b2e498bcb52604cc57fa47be18df16";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105408,25 +105548,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_2_0_1" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
-     , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck
-     , quickcheck-instances, safe, tagged, text, transformers
-     , unordered-containers, writer-cps-mtl
+  "intro_0_2_0_2" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
+     , bytestring, cassava, containers, contravariant, deepseq, dlist
+     , extra, filepath, hashable, lens, megaparsec, mtl, profunctors
+     , QuickCheck, quickcheck-instances, safe, tagged, text
+     , transformers, unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.2.0.1";
-       sha256 = "d26082b3304e6940f6a486b0a00aa95264b4045762c3586fac4de7cbf60a4073";
+       version = "0.2.0.2";
+       sha256 = "24a45432efcf9920391465723fde8c20384dcd2d2c4c0e7ca921f4aeb14c88d7";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe tagged text transformers unordered-containers
          writer-cps-mtl
        ];
        testHaskellDepends = [
-         base bifunctors binary bytestring containers deepseq dlist extra
-         hashable lens mtl QuickCheck quickcheck-instances safe tagged text
-         transformers unordered-containers writer-cps-mtl
+         aeson async attoparsec base bifunctors binary bytestring cassava
+         containers contravariant deepseq dlist extra filepath hashable lens
+         megaparsec mtl profunctors QuickCheck quickcheck-instances safe
+         tagged text transformers unordered-containers writer-cps-mtl
        ];
        homepage = "https://github.com/minad/intro#readme";
        description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
@@ -113485,8 +113627,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.6.1";
-       sha256 = "0a298956b9f26dafae56c377f3a30e48dca2f9bc91084076344ad81f54399d18";
+       version = "0.6.2";
+       sha256 = "f422d9b18382d338814f6435330ed68340ac5294a4b9a6af6f6cc12763721377";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/rudymatela/leancheck#readme";
@@ -113957,6 +114099,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.1.0.0";
+       sha256 = "cde729cf0f9024417d17234a933a54e0a4f3e2073e84f00e8ad60da5fc39e67c";
+       libraryHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-prelude" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , either, hashable, lens, mtl, text, time, transformers
@@ -115531,6 +115685,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "line-size" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "line-size";
+       version = "0.1.0.0";
+       sha256 = "ba7b29516152e13756eed1593c0f33332ee7fae9f7da268429c9684ec85a79db";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       homepage = "xy30.com";
+       description = "Display the number of bytes of each line";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "line2pdf" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -117443,6 +117611,8 @@ self: {
        pname = "log";
        version = "0.7";
        sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b";
+       revision = "1";
+       editedCabalFile = "e5202dc6af8bc3ecfffe0ef5d49c71dc2049a05f0f584d514c609af7702f111c";
        libraryHaskellDepends = [
          base log-base log-elasticsearch log-postgres
        ];
@@ -117466,6 +117636,8 @@ self: {
        pname = "log";
        version = "0.8";
        sha256 = "3c48e377d8e25cb6874c1496d8635342dc3c57843d45f1347b4fdfb110d42a52";
+       revision = "1";
+       editedCabalFile = "110b0297ddce3744cffe2749373311677df01d27531bbec528a27744d7aed1ea";
        libraryHaskellDepends = [
          base log-base log-elasticsearch log-postgres
        ];
@@ -117561,7 +117733,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log-elasticsearch_0_8" = callPackage
+  "log-elasticsearch_0_8_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
      , log-base, semigroups, text, text-show, time, transformers
@@ -117569,8 +117741,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-elasticsearch";
-       version = "0.8";
-       sha256 = "b63079eec72b56b5ab0078ca83609ecc0620eee3b253a6657a4df79fa8b44d95";
+       version = "0.8.1";
+       sha256 = "b0a67b2335f2d1a075bf611b723572db81075c69a3f4a4a06ab35906341f8281";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client http-client-tls log-base semigroups text
@@ -119547,6 +119719,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) file;};
 
+  "magicbane" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
+     , conduit, conduit-combinators, data-default, data-has, either
+     , 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.0";
+       sha256 = "8449c50e3abe937f235ce806c0f8dd193b2172949e7a2111f5b7d78b4aa38d94";
+       revision = "1";
+       editedCabalFile = "0da48eedc8e65efecfd5b41191ec1f27c198c35334af15baea2febf759659656";
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base classy-prelude conduit
+         conduit-combinators data-default data-has either 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";
+       description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
@@ -120380,6 +120584,8 @@ self: {
        pname = "map-syntax";
        version = "0.2.0.2";
        sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a";
+       revision = "1";
+       editedCabalFile = "f8205f1f917f16053960ba89576a8420d744f03bfbe8539d153153c257e2474c";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -122092,6 +122298,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_3" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.3";
+       sha256 = "e729f2693c100e92000dece9643ab8daf28648e7bb587b3120ba3ef0df4eb879";
+       libraryHaskellDepends = [
+         base bytestring deepseq foundation ghc-prim
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -123746,10 +123970,8 @@ self: {
      }:
      mkDerivation {
        pname = "mnist-idx";
-       version = "0.1.2.6";
-       sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae";
-       revision = "1";
-       editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6";
+       version = "0.1.2.8";
+       sha256 = "42ff167e84414821ed47d783042cad20a0bd198f935648aa6cdf97bdc291b2fe";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/mnist-idx/";
@@ -128514,8 +128736,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, smallcheck }:
      mkDerivation {
        pname = "nat-sized-numbers";
-       version = "0.1.0.0";
-       sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144";
+       version = "0.2.0.0";
+       sha256 = "b3c907665ff1107da9c0acb9404766f6ded98e3cfd51c2348ff7434eaa32e23c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck smallcheck ];
        homepage = "https://github.com/oisdk/nat-sized-numbers#readme";
@@ -130946,6 +131168,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nlopt-haskell" = callPackage
+    ({ mkDerivation, base, nlopt, vector }:
+     mkDerivation {
+       pname = "nlopt-haskell";
+       version = "0.1.0.0";
+       sha256 = "d23e9c4e6faffb613dcc1695a03c6277ad748a962b92c8dbe0da0a5df502706a";
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ nlopt ];
+       testHaskellDepends = [ base vector ];
+       homepage = "https://github.com/peddie/nlopt-haskell";
+       description = "Low-level bindings to the NLOPT optimization library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) nlopt;};
+
   "nlp-scores" = callPackage
     ({ mkDerivation, base, containers, strict }:
      mkDerivation {
@@ -133257,8 +133493,8 @@ self: {
     ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
        pname = "opencog-atomspace";
-       version = "0.1.0.7";
-       sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b";
+       version = "0.1.0.8";
+       sha256 = "0ba5d6d681d4dc2960a596b13d2027dc9b48ac087ebd02bce58403ee1241b3c0";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -143095,8 +143331,8 @@ self: {
      }:
      mkDerivation {
        pname = "praglude";
-       version = "0.4.0.1";
-       sha256 = "70996dbad7defd09b26ad792150205f878c6158a372cc2544ea1bfd7d2a74dec";
+       version = "0.4.1.0";
+       sha256 = "6cbbb2f06a00c3d18ed39206c654c92cd39b2a72a59a5b2a44992a76c6de5cb0";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          data-default deepseq directory filepath hashable lens mtl random
@@ -144987,8 +145223,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.1.0.5";
-       sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e";
+       version = "0.2.0.0";
+       sha256 = "db1ce1c786941c98ac67885d583731eed5bf6998022985e699915f5aa757b07f";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class
          lens-family parsec pretty text transformers void
@@ -145005,8 +145241,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-arbitrary";
-       version = "0.1.0.1";
-       sha256 = "df1ef1741af1d37d87063392ed0ce2e67bc2435a5754bdf35d0c65c8fb1e4d50";
+       version = "0.1.0.2";
+       sha256 = "ff1629693e57ee664489af14a430db8189febcb73cec1e1d526f3a2fab621a5f";
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
@@ -145018,20 +145254,20 @@ self: {
 
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, data-default-class, HUnit, lens-family
-     , proto-lens, proto-lens-protoc, test-framework
+     , lens-family-core, proto-lens, proto-lens-protoc, test-framework
      , test-framework-hunit, transformers
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.4";
-       sha256 = "3d153caff241c45097d2acac97176d2dc54af626b4895678f51069ce7ceb66fb";
+       version = "0.1.0.6";
+       sha256 = "6ceafc1d8d03120b6c57f26154899520afd292bdfa8a46c76ddb30615de6cc7f";
        libraryHaskellDepends = [
          base data-default-class lens-family proto-lens proto-lens-protoc
          transformers
        ];
        testHaskellDepends = [
-         base HUnit lens-family proto-lens proto-lens-protoc test-framework
-         test-framework-hunit
+         base HUnit lens-family lens-family-core proto-lens
+         proto-lens-protoc test-framework test-framework-hunit
        ];
        homepage = "https://github.com/google/proto-lens";
        description = "Utilities functions to proto-lens";
@@ -145041,15 +145277,15 @@ self: {
 
   "proto-lens-descriptors" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
-     , lens-family, proto-lens, text
+     , lens-family, lens-labels, proto-lens, text
      }:
      mkDerivation {
        pname = "proto-lens-descriptors";
-       version = "0.1.0.5";
-       sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a";
+       version = "0.2.0.0";
+       sha256 = "1fca9713d7678b2328e5f330eebfc690b487ccca719fe2cdf84f24af71d98bb5";
        libraryHaskellDepends = [
          base bytestring containers data-default-class lens-family
-         proto-lens text
+         lens-labels proto-lens text
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
@@ -145059,8 +145295,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
-       version = "0.1.0.1";
-       sha256 = "1ab3ac9137c05f6041fa2ff8527da4e80875d94eff97c77cdc43e65cc0c5dc28";
+       version = "0.1.0.2";
+       sha256 = "d6afb604f1b26d903648ab57b5d50c5670b70ec8d15ca49799f4ff1383c024d6";
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
@@ -145073,18 +145309,19 @@ self: {
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, process, proto-lens, proto-lens-descriptors, text
+     , lens-family, lens-labels, process, proto-lens
+     , proto-lens-descriptors, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.1.0.5";
-       sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e";
+       version = "0.2.0.0";
+       sha256 = "60df593b670ca8f984e67ac784a97425e5056b0cdf16f231f53cc228ada85376";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family process proto-lens
-         proto-lens-descriptors text
+         filepath haskell-src-exts lens-family lens-labels process
+         proto-lens proto-lens-descriptors text
        ];
        executableHaskellDepends = [
          base bytestring containers data-default-class filepath
@@ -145963,8 +146200,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.0";
-       sha256 = "811e55bfc87e2ec65f57b134980866a5924a3f5c7967bf83fac19c7f9fd12cdd";
+       version = "0.11.1";
+       sha256 = "359894f7b8d6ba28e3150fbba3988a14aedf68d55b1eb7d6b69111a4a119ec86";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146020,6 +146257,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "purescript-bridge_0_11_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.11.0.0";
+       sha256 = "6e4f2ea1d550d1d3ee4ede18a18d95aa37c587c2aef54d4aee22306550a45878";
+       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
@@ -150942,7 +151200,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "regex_0_10_0_2" = callPackage
+  "regex_0_10_0_3" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , hashable, regex-base, regex-tdfa, regex-tdfa-text
      , template-haskell, text, time, time-locale-compat, transformers
@@ -150950,8 +151208,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.10.0.2";
-       sha256 = "5ecb41e7bfc60aaad2bfca8d07ea84088c46fce881f70eccb87fbd02b8bf417b";
+       version = "0.10.0.3";
+       sha256 = "304230caeb624689d05e41350bfbfa02d3a49f4087088c3017eb35ce6832ba3a";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable regex-base
          regex-tdfa regex-tdfa-text template-haskell text time
@@ -151108,8 +151366,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.10.0.2";
-       sha256 = "d92f00f991ccc2597f0cc62eba00a0b22aeb075717baa1e24d581d5df34603ba";
+       version = "0.10.0.3";
+       sha256 = "88a3ead02eed5054aaa19c09671b24e5ba0e3892f2e64e8bec5ba948d428bb54";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -151387,8 +151645,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "0.10.0.2";
-       sha256 = "645a63d6174c15bcf10274f08df68b85090e816492bd9e01b871aa8fe5b53b64";
+       version = "0.10.0.3";
+       sha256 = "0fed51f7ee7d142b090c1f71a38c99fa51aa7cf74ec05bfea55fdb4a6feb10da";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
          regex-pcre-builtin regex-tdfa template-haskell transformers
@@ -155074,8 +155332,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtnetlink";
-       version = "0.1.0.2";
-       sha256 = "090a563053b83e624e7de7e161c2bffc239a72db926ed64229cb1cc9d78a02e4";
+       version = "0.1.0.4";
+       sha256 = "3972a04b0b3ad757e368b6d809120a375d07b23e9f52a20ed48ef929f364077c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164983,6 +165241,8 @@ self: {
        pname = "snap-templates";
        version = "1.0.0.0";
        sha256 = "f6289348179d07721f6edc1dbe19bcfe989de0dd2945962c455e2ce113d2561b";
+       revision = "1";
+       editedCabalFile = "6a57896a679dc58684cb1b8321fa19bf778d48beeeac125434362ac2d5fa0679";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -170274,6 +170534,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_4_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.4.2";
+       sha256 = "37947aaff44e8732625e31f3c2e75e7e0ed380ad0ba459cbd461b93059347a66";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hashable hlint lens
+         tasty tasty-hspec template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -171915,6 +172200,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "superbuffer_0_3_1_0" = callPackage
+    ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
+     , HTF, QuickCheck
+     }:
+     mkDerivation {
+       pname = "superbuffer";
+       version = "0.3.1.0";
+       sha256 = "b5b747cbdd46fc9cb413a5ca2729473ce7e5daeb695b59a3a16125e59f9d35aa";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ async base bytestring HTF QuickCheck ];
+       benchmarkHaskellDepends = [
+         async base buffer-builder bytestring criterion
+       ];
+       homepage = "https://github.com/agrafix/superbuffer#readme";
+       description = "Efficiently build a bytestring from smaller chunks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "supercollider-ht" = callPackage
     ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process
      , random, transformers
@@ -180905,20 +181209,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_1" = callPackage
+  "transient_0_5_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.1";
-       sha256 = "a6b90bed245013a7ffe61f8d6e5b0f5798dd64999c914c1f956b0d3a1c3a8d25";
+       version = "0.5.3";
+       sha256 = "e3b4ae35933e4452745f257f2043356b00611b0772d73085d9af75e1bdd28d3e";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
        ];
        homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Making composable programs with multithreading, events and distributed computing";
+       description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182528,8 +182832,8 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.11";
        sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
-       revision = "1";
-       editedCabalFile = "3d0a5d8976c482b401003571812052a97cd0d77fb3d6f0619615c30c93a0b79e";
+       revision = "2";
+       editedCabalFile = "40c6941bd4bc222ad94a0963036f74f66fc1ef084b8d7c5c07f5dc9f3d861a59";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -184049,6 +184353,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unbounded-delays_0_1_0_10" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unbounded-delays";
+       version = "0.1.0.10";
+       sha256 = "1c3621437c267f313231a56cf85136bbe7ff6fea0c08a016240d482cc69ca123";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/basvandijk/unbounded-delays";
+       description = "Unbounded thread delays and timeouts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unbounded-delays-units" = callPackage
     ({ mkDerivation, base, unbounded-delays, units, units-defs }:
      mkDerivation {
@@ -188687,8 +189004,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-cli";
-       version = "0.1.0";
-       sha256 = "220d8b3eb52e7b045844be37682f09823a9730115f33ea718717896f74673007";
+       version = "0.1.1";
+       sha256 = "0643ebd8cbd4fcedd2076450b635d020aa2101b26e80f69ade10acd2c3252862";
        libraryHaskellDepends = [
          ansi-terminal base http-types monads-tf network options
          socket-activation stm streaming-commons unix wai wai-extra warp
@@ -190490,6 +190807,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "web-output" = callPackage
+    ({ mkDerivation, base, directory, filepath, open-browser, temporary
+     , text
+     }:
+     mkDerivation {
+       pname = "web-output";
+       version = "0.3.0.0";
+       sha256 = "db201c91c1c96db59670142d1ca1e63d31cbc0bdf495538994eab1b585894ead";
+       libraryHaskellDepends = [
+         base directory filepath open-browser temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath open-browser temporary text
+       ];
+       homepage = "https://github.com/danse/web-output";
+       description = "Library to present content to an user via their browser";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "web-page" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, clay
      , containers, jmacro, lens, mtl, Stream, text, vector
@@ -191829,8 +192165,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "wiringPi";
-       version = "1.0";
-       sha256 = "78449f9f48bab82bf8e268e0b858171e7539d7b9a61dd92c75a9ea7c1a7523d0";
+       version = "1.0.1";
+       sha256 = "b3acd5319bccde3142fba1a84b805099516f4b20643393520976570e618b9ac4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -192700,6 +193036,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-mtl_0_1_1_3" = callPackage
+    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-mtl";
+       version = "0.1.1.3";
+       sha256 = "b7a37f1e3183fdbd381149dbf3e55e727e7af19fef9136b0201df2600691a7f3";
+       libraryHaskellDepends = [
+         base mtl transformers writer-cps-transformers
+       ];
+       homepage = "https://github.com/minad/writer-cps-mtl#readme";
+       description = "MonadWriter orphan instances for writer-cps-transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "writer-cps-transformers" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {

From 8765d1edda48d7f2c8a5125898df05f8a166b5a6 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 30 Mar 2017 14:36:02 -0300
Subject: [PATCH 0449/1744] gnustep.back: add runtime dependency on libXmu

Fix the failure of running applications like GWorkspace, which depends
on 'back'. It fails with a message similar to the one below:

Error (objc-load):/nix/store/fpxksxkl26qd5a7ay52mzv5qbj8di6b5-gnustep-back-0.25.0/lib/GNUstep/Bundles/libgnustep-back-025.bundle/./libgnustep-back-025: undefined symbol: XmuLookupStandardColormap
---
 pkgs/desktops/gnustep/back/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 8e11a286284..6678b11df02 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -5,6 +5,7 @@
 , x11
 , freetype
 , pkgconfig
+, libXmu
 }:
 let
   version = "0.25.0";
@@ -15,7 +16,7 @@ gsmakeDerivation {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
     sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
   };
-  buildInputs = [ cairo base gui freetype pkgconfig x11 ];
+  buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ];
   meta = {
     description = "A generic backend for GNUstep";
   };

From 1f9e7f3aa72ee69a4910675d9e2ae2803bcd076f Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 30 Mar 2017 14:37:03 -0300
Subject: [PATCH 0450/1744] gworkspace: 0.9.3 -> 0.9.4

---
 pkgs/desktops/gnustep/gworkspace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix
index 67fffd10a0f..210b72292fd 100644
--- a/pkgs/desktops/gnustep/gworkspace/default.nix
+++ b/pkgs/desktops/gnustep/gworkspace/default.nix
@@ -4,13 +4,13 @@
 , system_preferences
 }:
 let
-  version = "0.9.3";
+  version = "0.9.4";
 in
 gsmakeDerivation {
   name = "gworkspace-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz";
-    sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3";
+    sha256 = "0cjn83m7qmbwdpldlyhs239nwswgip3yaz01ahls130dq5qq7hgk";
   };
   # additional dependencies:
   # - PDFKit framework from http://gap.nongnu.org/

From 3d5e451f0543108c6cabb028e64c5704dc1f3574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Mar 2017 20:06:37 +0200
Subject: [PATCH 0451/1744] luaPackages.vicious 2.1.3 -> 2.2.0

I also became new project maintainer
---
 pkgs/top-level/lua-packages.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index ea3a849c7ac..71aef7544dd 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -293,7 +293,7 @@ let
       maintainers = [ maintainers.koral ];
     };
   };
-      
+
 
   luastdlib = buildLuaPackage {
     name = "stdlib";
@@ -468,18 +468,20 @@ let
 
   vicious = stdenv.mkDerivation rec {
     name = "vicious-${version}";
-    version = "2.1.3";
+    version = "2.2.0";
 
-    src = fetchzip {
-      url    = "http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz";
-      sha256 = "1c901siza5vpcbkgx99g1vkqiki5qgkzx2brnj4wrpbsbfzq0bcq";
+    src = fetchFromGitHub {
+      owner = "Mic92";
+      repo = "vicious";
+      rev = "v${version}";
+      sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj";
     };
 
     meta = with stdenv.lib; {
       description = "Vicious widgets for window managers";
-      homepage    = http://git.sysphere.org/vicious/;
+      homepage    = https://github.com/Mic92/vicious;
       license     = licenses.gpl2;
-      maintainers = with maintainers; [ makefu ];
+      maintainers = with maintainers; [ makefu mic92 ];
       platforms   = platforms.linux;
     };
 

From 1e295260e2101ef33e475df28c3dcac3c3e6c950 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Mar 2017 21:55:05 +0200
Subject: [PATCH 0452/1744] geogebra: 5-0-346-0 -> 5-0-350-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 916f0dc360f..d37d5c16091 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-346-0";
+  version = "5-0-350-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "13yiksdk5qwa7c5zp5l0h3czqq31qlf04ncgrh8mn7z70ng1f3l4";
+    sha256 = "0lr2calglad5d17p5sl1jbjdfsdsmn4dxgy8s89lyh0d4aihy54d";
   };
 
   srcIcon = fetchurl {

From 4df59beb017ce23465862890ffe6f6848e3a8a1b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 30 Mar 2017 23:19:45 +0300
Subject: [PATCH 0453/1744] fontconfig_210: Remove reference to obsolete patch

Commit 9b049849bfc385604f240157e129f7a8e3530d7f deleted the patch file
(and reference to it from fontconfig default.nix), but left the one in
2.10.nix which break evaluation.

As the package seems to build fine without the patch, just remove the
reference.

cc @ttuegel in case this was not the correct thing to do.
---
 pkgs/development/libraries/fontconfig/2.10.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 222dfc27256..302992fc8c8 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -8,12 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
   };
 
-  patches = [
-    # FreeType 2.7 prefixes PCF font family names with the foundry name.
-    # The output of fc-list and fc-query change which breaks the tests.
-    ./test-pcf-family-names-freetype-2.7.patch
-  ];
-
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
   propagatedBuildInputs = [ freetype ];

From 7a46312f1ccf677e5632c66434b21975fb3fb3f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 19:56:12 +0200
Subject: [PATCH 0454/1744] xorg-rgb: init at 1.0.6

---
 pkgs/data/misc/xorg-rgb/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/data/misc/xorg-rgb/default.nix

diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
new file mode 100644
index 00000000000..9a3db92adcc
--- /dev/null
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, xproto}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "rgb";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
+    sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
+  };
+
+  nativeBuildInputs = [pkgconfig];
+  buildInputs = [xproto];
+  meta = {
+    inherit version;
+    description = "X11 colorname to RGB mapping database";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = http://xorg.freedesktop.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c9b87a3afe..6a8ea3a623c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12670,6 +12670,8 @@ with pkgs;
 
   xlsx2csv = pythonPackages.xlsx2csv;
 
+  xorg-rgb = callPackage ../data/misc/xorg-rgb {};
+
   zeal = libsForQt5.callPackage ../data/documentation/zeal { };
 
 

From 6f904bd9ecb89066bd459b5c07982bfbfe6f2165 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 22:52:21 +0200
Subject: [PATCH 0455/1744] clwrapper: setup-hook: correctly handle multiple
 additions to registry

---
 pkgs/development/lisp-modules/clwrapper/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
index b48f916ac7a..bc5a6b34866 100644
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@@ -1,6 +1,6 @@
 NIX_LISP_ASDF="@asdf@"
 
-CL_SOURCE_REGISTRY="@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/"
+CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/"
 
 addASDFPaths () {
     for j in "$1"/lib/common-lisp/*; do

From 5032d477a02f58c2f266e50ad1d6b702e6d28596 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 22:54:19 +0200
Subject: [PATCH 0456/1744] quicklisp-to-nix: check that the package is
 loadable

---
 .../lisp-modules/quicklisp-to-nix/nix-package.emb          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 1be5345b327..3a007050924 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -11,4 +11,11 @@ rec {
     url = ''<% @var url %>'';
     sha256 = ''<% @var sha256 %>'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :<% @ifnotempty testname %><% @var testname %><% @else %><% @var name %><% @endif %>)"' "$out/bin/<% @var filename %>-lisp-launcher.sh" ""
+    '';
+  };
 }

From 0f695737315e1edf9285a6f7fbca55abb2c160cf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Mar 2017 22:54:56 +0200
Subject: [PATCH 0457/1744] quicklispPackages: add a basic set of packages,
 make sure that quicklispPackages_asdf_3_1 can be built completely

---
 .../agnostic-lizard.nix                       |   14 -
 .../quicklisp-to-nix-output/alexandria.nix    |    7 +
 .../quicklisp-to-nix-output/anaphora.nix      |   21 +
 .../quicklisp-to-nix-output/array-utils.nix   |   21 +
 .../quicklisp-to-nix-output/babel-streams.nix |   21 +
 .../quicklisp-to-nix-output/babel.nix         |    9 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   21 +
 .../bordeaux-threads.nix                      |    9 +-
 .../quicklisp-to-nix-output/caveman.nix       |   21 +
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   21 +
 .../cffi-toolchain.nix                        |   21 +
 .../quicklisp-to-nix-output/cffi.nix          |    9 +-
 .../quicklisp-to-nix-output/chipz.nix         |    7 +
 .../quicklisp-to-nix-output/chunga.nix        |    7 +
 .../circular-streams.nix                      |   21 +
 .../quicklisp-to-nix-output/cl+ssl.nix        |    9 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   21 +
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   21 +
 .../quicklisp-to-nix-output/cl-async-base.nix |   21 +
 .../quicklisp-to-nix-output/cl-async-util.nix |   21 +
 .../quicklisp-to-nix-output/cl-async.nix      |   21 +
 .../quicklisp-to-nix-output/cl-base64.nix     |    7 +
 .../quicklisp-to-nix-output/cl-colors.nix     |   21 +
 .../quicklisp-to-nix-output/cl-cookie.nix     |   21 +
 .../quicklisp-to-nix-output/cl-emb.nix        |   21 +
 .../quicklisp-to-nix-output/cl-fad.nix        |    9 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |    9 +-
 .../quicklisp-to-nix-output/cl-json.nix       |   21 +
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   21 +
 .../quicklisp-to-nix-output/cl-l10n.nix       |   21 +
 .../quicklisp-to-nix-output/cl-libuv.nix      |   21 +
 .../quicklisp-to-nix-output/cl-ppcre.nix      |    7 +
 .../quicklisp-to-nix-output/cl-project.nix    |   21 +
 .../quicklisp-to-nix-output/cl-reexport.nix   |   21 +
 .../cl-syntax-annot.nix                       |   21 +
 .../quicklisp-to-nix-output/cl-syntax.nix     |   21 +
 .../quicklisp-to-nix-output/cl-unicode.nix    |   21 +
 .../quicklisp-to-nix-output/cl-utilities.nix  |    7 +
 .../quicklisp-to-nix-output/cl-who.nix        |   21 +
 .../clack-v1-compat.nix                       |   21 +
 .../quicklisp-to-nix-output/clack.nix         |   21 +
 .../quicklisp-to-nix-output/closer-mop.nix    |   21 +
 .../closure-common.nix                        |   21 +
 .../quicklisp-to-nix-output/clss.nix          |   21 +
 .../quicklisp-to-nix-output/clx.nix           |    7 +
 .../quicklisp-to-nix-output/css-lite.nix      |   21 +
 .../quicklisp-to-nix-output/cxml-dom.nix      |   21 +
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   21 +
 .../quicklisp-to-nix-output/cxml-test.nix     |   21 +
 .../quicklisp-to-nix-output/cxml-xml.nix      |   21 +
 .../quicklisp-to-nix-output/cxml.nix          |   21 +
 .../quicklisp-to-nix-output/dexador.nix       |   21 +
 .../quicklisp-to-nix-output/do-urlencode.nix  |   21 +
 .../documentation-utils.nix                   |   21 +
 .../quicklisp-to-nix-output/drakma.nix        |    9 +-
 .../quicklisp-to-nix-output/esrap.nix         |    7 +
 .../external-program.nix                      |    7 +
 .../quicklisp-to-nix-output/fast-http.nix     |   21 +
 .../quicklisp-to-nix-output/fast-io.nix       |   21 +
 .../quicklisp-to-nix-output/flexi-streams.nix |    7 +
 .../quicklisp-to-nix-output/form-fiddle.nix   |   21 +
 .../quicklisp-to-nix-output/http-body.nix     |   21 +
 .../quicklisp-to-nix-output/hunchentoot.nix   |    9 +-
 .../quicklisp-to-nix-output/idna.nix          |    7 +
 .../quicklisp-to-nix-output/iolib.nix         |    9 +-
 .../iolib_slash_asdf.nix                      |   14 -
 .../iolib_slash_base.nix                      |   14 -
 .../iolib_slash_common-lisp.nix               |   14 -
 .../iolib_slash_conf.nix                      |   14 -
 .../iolib_slash_grovel.nix                    |   14 -
 .../iolib_slash_multiplex.nix                 |   14 -
 .../iolib_slash_sockets.nix                   |   14 -
 .../iolib_slash_streams.nix                   |   14 -
 .../iolib_slash_syscalls.nix                  |   14 -
 .../quicklisp-to-nix-output/ironclad.nix      |   21 +
 .../quicklisp-to-nix-output/iterate.nix       |    7 +
 .../quicklisp-to-nix-output/jonathan.nix      |   21 +
 .../lack-component.nix                        |   21 +
 .../quicklisp-to-nix-output/lack-util.nix     |   21 +
 .../quicklisp-to-nix-output/lack.nix          |   21 +
 .../quicklisp-to-nix-output/let-plus.nix      |   21 +
 .../quicklisp-to-nix-output/lev.nix           |   21 +
 .../quicklisp-to-nix-output/local-time.nix    |   21 +
 .../quicklisp-to-nix-output/lquery.nix        |   21 +
 .../quicklisp-to-nix-output/map-set.nix       |   21 +
 .../quicklisp-to-nix-output/marshal.nix       |   21 +
 .../quicklisp-to-nix-output/md5.nix           |    7 +
 .../quicklisp-to-nix-output/metabang-bind.nix |   21 +
 .../quicklisp-to-nix-output/myway.nix         |   21 +
 .../named-readtables.nix                      |   22 +
 .../quicklisp-to-nix-output/nibbles.nix       |   21 +
 .../quicklisp-to-nix-output/optima.nix        |   21 +
 .../quicklisp-to-nix-output/parenscript.nix   |   21 +
 .../quicklisp-to-nix-output/plump-dom.nix     |   21 +
 .../quicklisp-to-nix-output/plump-lexer.nix   |   21 +
 .../quicklisp-to-nix-output/plump-parser.nix  |   21 +
 .../quicklisp-to-nix-output/plump.nix         |   21 +
 .../quicklisp-to-nix-output/proc-parse.nix    |   21 +
 .../quicklisp-to-nix-output/prove.nix         |   21 +
 .../quicklisp-to-nix-output/puri.nix          |    7 +
 .../quicklisp-to-nix-output/quri.nix          |   21 +
 .../quicklisp-to-nix-output/rfc2388.nix       |    7 +
 .../quicklisp-to-nix-output/salza2.nix        |   22 +
 .../quicklisp-to-nix-output/smart-buffer.nix  |   21 +
 .../split-sequence.nix                        |    7 +
 .../static-vectors.nix                        |   21 +
 .../quicklisp-to-nix-output/stumpwm.nix       |    9 +-
 .../quicklisp-to-nix-output/swap-bytes.nix    |    7 +
 .../trivial-backtrace.nix                     |    7 +
 .../trivial-features.nix                      |    7 +
 .../trivial-garbage.nix                       |    7 +
 .../trivial-gray-streams.nix                  |    7 +
 .../trivial-indent.nix                        |   21 +
 .../quicklisp-to-nix-output/trivial-mimes.nix |   21 +
 .../quicklisp-to-nix-output/trivial-types.nix |   21 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |    7 +
 .../quicklisp-to-nix-output/uiop.nix          |    7 +
 .../quicklisp-to-nix-output/usocket.nix       |    7 +
 .../quicklisp-to-nix-output/vom.nix           |   21 +
 .../quicklisp-to-nix-output/woo.nix           |   21 +
 .../quicklisp-to-nix-output/wookie.nix        |   21 +
 .../quicklisp-to-nix-output/xmls.nix          |   21 +
 .../quicklisp-to-nix-output/xsubseq.nix       |   21 +
 .../quicklisp-to-nix-output/yason.nix         |   21 +
 .../quicklisp-to-nix-overrides.lisp           |    9 +
 .../quicklisp-to-nix-overrides.nix            |   71 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |   65 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 1221 +++++++++++++----
 .../quicklisp-to-nix/ql-to-nix.lisp           |    4 +-
 129 files changed, 3012 insertions(+), 438 deletions(-)
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
deleted file mode 100644
index 8da74224ae2..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ fetchurl }:
-rec {
-  baseName = ''agnostic-lizard'';
-  version = ''20170227-git'';
-
-  description = ''A portable code walker that makes a best effort to be correct in most cases'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/agnostic-lizard/2017-02-27/agnostic-lizard-20170227-git.tgz'';
-    sha256 = ''0gnbxfdz35z9kznnhnj9x5zzn25k1x2ifv4v9rkzb0xmi7xkx9wi'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 34173f0ac4b..8404bd0717d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
     sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :alexandria)"' "$out/bin/alexandria-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
new file mode 100644
index 00000000000..2319134b32e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''anaphora'';
+  version = ''20170227-git'';
+
+  description = ''The Anaphoric Macro Package from Hell'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
+    sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :anaphora)"' "$out/bin/anaphora-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
new file mode 100644
index 00000000000..d26282accaf
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''array-utils'';
+  version = ''20160929-git'';
+
+  description = ''A few utilities for working with arrays.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz'';
+    sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :array-utils)"' "$out/bin/array-utils-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
new file mode 100644
index 00000000000..70e4b600c97
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''babel-streams'';
+  version = ''babel-20150608-git'';
+
+  description = ''Some useful streams based on Babel's encoding code'';
+
+  deps = [ args."alexandria" args."babel" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
+    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :babel-streams)"' "$out/bin/babel-streams-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 392912d77e4..e6a4fad3b26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."trivial-features" args."alexandria" ];
+  deps = [ args."alexandria" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
     sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :babel)"' "$out/bin/babel-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
new file mode 100644
index 00000000000..91200e4e2ce
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''blackbird'';
+  version = ''20160531-git'';
+
+  description = ''A promise implementation for Common Lisp.'';
+
+  deps = [ args."vom" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
+    sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :blackbird)"' "$out/bin/blackbird-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index 26313457010..819e3c0bc46 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''bordeaux-threads'';
   version = ''v0.8.5'';
 
-  description = ''Bordeaux Threads makes writing portable multi-threaded apps simple'';
+  description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.'';
 
   deps = [ args."alexandria" ];
 
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
     sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :bordeaux-threads)"' "$out/bin/bordeaux-threads-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
new file mode 100644
index 00000000000..a10ec469376
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''caveman'';
+  version = ''20161031-git'';
+
+  description = ''Web Application Framework for Common Lisp'';
+
+  deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
+    sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :caveman)"' "$out/bin/caveman-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
new file mode 100644
index 00000000000..aaf511fa27a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-grovel'';
+  version = ''cffi_0.18.0'';
+
+  description = ''The CFFI Groveller'';
+
+  deps = [ args."alexandria" args."cffi" args."cffi-toolchain" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi-grovel)"' "$out/bin/cffi-grovel-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
new file mode 100644
index 00000000000..fefbef57f7e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-toolchain'';
+  version = ''cffi_0.18.0'';
+
+  description = ''The CFFI toolchain'';
+
+  deps = [ args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi-toolchain)"' "$out/bin/cffi-toolchain-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 582b0c39493..c303727ba6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''The Common Foreign Function Interface'';
 
-  deps = [ args."uiop" args."alexandria" args."trivial-features" args."babel" ];
+  deps = [ args."alexandria" args."babel" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi)"' "$out/bin/cffi-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 02d8ba70baf..fb7922a689a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
     sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :chipz)"' "$out/bin/chipz-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index e737843d167..e29d6818f01 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
     sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :chunga)"' "$out/bin/chunga-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
new file mode 100644
index 00000000000..95438b96c73
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''circular-streams'';
+  version = ''20161204-git'';
+
+  description = ''Circularly readable streams for Common Lisp'';
+
+  deps = [ args."fast-io" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
+    sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :circular-streams)"' "$out/bin/circular-streams-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index bd4f4b58fb1..004afe7bd04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''Common Lisp interface to OpenSSL.'';
 
-  deps = [ args."cffi" args."trivial-gray-streams" args."flexi-streams" args."bordeaux-threads" args."trivial-garbage" args."uiop" ];
+  deps = [ args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz'';
     sha256 = ''0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl+ssl)"' "$out/bin/cl+ssl-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
new file mode 100644
index 00000000000..9bdb4f65c42
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-annot'';
+  version = ''20150608-git'';
+
+  description = ''Python-like Annotation Syntax for Common Lisp'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
+    sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-annot)"' "$out/bin/cl-annot-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
new file mode 100644
index 00000000000..bf706f957d9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-ansi-text'';
+  version = ''20150804-git'';
+
+  description = ''ANSI control string characters, focused on color'';
+
+  deps = [ args."alexandria" args."cl-colors" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
+    sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-ansi-text)"' "$out/bin/cl-ansi-text-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
new file mode 100644
index 00000000000..1e0a6e7a50a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-async-base'';
+  version = ''cl-async-20160825-git'';
+
+  description = ''Base system for cl-async.'';
+
+  deps = [ args."bordeaux-threads" args."cffi" args."cl-libuv" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
+    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-base-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
new file mode 100644
index 00000000000..58a459031c6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-async-util'';
+  version = ''cl-async-20160825-git'';
+
+  description = ''Internal utilities for cl-async.'';
+
+  deps = [ args."cffi" args."cl-async-base" args."cl-libuv" args."cl-ppcre" args."fast-io" args."vom" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
+    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-util-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
new file mode 100644
index 00000000000..9c53b3d43f5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-async'';
+  version = ''20160825-git'';
+
+  description = ''Asynchronous operations for Common Lisp.'';
+
+  deps = [ args."babel" args."cffi" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
+    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index c9d62c62b01..81e5920a0c6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
     sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-base64)"' "$out/bin/cl-base64-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
new file mode 100644
index 00000000000..d7d0bf211ea
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-colors'';
+  version = ''20151218-git'';
+
+  description = ''Simple color library for Common Lisp'';
+
+  deps = [ args."alexandria" args."let-plus" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
+    sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-colors)"' "$out/bin/cl-colors-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
new file mode 100644
index 00000000000..eca4c14edda
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-cookie'';
+  version = ''20150804-git'';
+
+  description = ''HTTP cookie manager'';
+
+  deps = [ args."alexandria" args."cl-ppcre" args."local-time" args."proc-parse" args."quri" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
+    sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-cookie)"' "$out/bin/cl-cookie-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
new file mode 100644
index 00000000000..f42d4d6bff4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-emb'';
+  version = ''20170227-git'';
+
+  description = ''A templating system for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
+    sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-emb)"' "$out/bin/cl-emb-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 9fea4c0f01d..3c4c1e72e19 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''Portable pathname library'';
 
-  deps = [ args."bordeaux-threads" args."alexandria" ];
+  deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
     sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fad)"' "$out/bin/cl-fad-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 2f44fbc416b..6beba38befd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
-  deps = [ args."cffi" args."cl-utilities" args."bordeaux-threads" args."trivial-backtrace" args."iterate" args."trivial-utf-8" ];
+  deps = [ args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
     sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fuse)"' "$out/bin/cl-fuse-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
new file mode 100644
index 00000000000..babfcf6e3a5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-json'';
+  version = ''20141217-git'';
+
+  description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
+    sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-json)"' "$out/bin/cl-json-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
new file mode 100644
index 00000000000..0bb3c38312a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-l10n-cldr'';
+  version = ''20120909-darcs'';
+
+  description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
+    sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-l10n-cldr)"' "$out/bin/cl-l10n-cldr-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
new file mode 100644
index 00000000000..72d3a294aa7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-l10n'';
+  version = ''20161204-darcs'';
+
+  description = ''Portable CL Locale Support'';
+
+  deps = [ args."alexandria" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."cxml" args."flexi-streams" args."iterate" args."local-time" args."metabang-bind" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
+    sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-l10n)"' "$out/bin/cl-l10n-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
new file mode 100644
index 00000000000..bb100cc393f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-libuv'';
+  version = ''20160825-git'';
+
+  description = ''Low-level libuv bindings for Common Lisp.'';
+
+  deps = [ args."alexandria" args."cffi" args."cffi-grovel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
+    sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-libuv)"' "$out/bin/cl-libuv-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 5e9f1a6e473..257417af0fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-ppcre)"' "$out/bin/cl-ppcre-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
new file mode 100644
index 00000000000..3573bbb5251
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-project'';
+  version = ''20160531-git'';
+
+  description = ''Generate a skeleton for modern project'';
+
+  deps = [ args."cl-emb" args."cl-ppcre" args."local-time" args."prove" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
+    sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-project)"' "$out/bin/cl-project-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
new file mode 100644
index 00000000000..1d523f55087
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-reexport'';
+  version = ''20150709-git'';
+
+  description = ''Reexport external symbols in other packages.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
+    sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-reexport)"' "$out/bin/cl-reexport-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
new file mode 100644
index 00000000000..e6673ecddbc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-syntax-annot'';
+  version = ''cl-syntax-20150407-git'';
+
+  description = ''CL-Syntax Reader Syntax for cl-annot'';
+
+  deps = [ args."cl-annot" args."cl-syntax" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-syntax-annot)"' "$out/bin/cl-syntax-annot-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
new file mode 100644
index 00000000000..6c76f0ea380
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-syntax'';
+  version = ''20150407-git'';
+
+  description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
+
+  deps = [ args."named-readtables" args."trivial-types" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-syntax)"' "$out/bin/cl-syntax-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
new file mode 100644
index 00000000000..e2144a41fb0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-unicode'';
+  version = ''0.1.5'';
+
+  description = ''Portable Unicode Library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
+    sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-unicode)"' "$out/bin/cl-unicode-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 2d24e2d87e3..edb7fc3efc9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
     sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-utilities)"' "$out/bin/cl-utilities-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
new file mode 100644
index 00000000000..33a4ae2f38f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-who'';
+  version = ''1.1.4'';
+
+  description = ''(X)HTML generation macros'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
+    sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-who)"' "$out/bin/cl-who-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
new file mode 100644
index 00000000000..4d96ad8c86f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clack-v1-compat'';
+  version = ''clack-20170227-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz'';
+    sha256 = ''1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clack-v1-compat)"' "$out/bin/clack-v1-compat-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
new file mode 100644
index 00000000000..c812f485ceb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clack'';
+  version = ''20170227-git'';
+
+  description = ''Web application environment for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz'';
+    sha256 = ''1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clack)"' "$out/bin/clack-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
new file mode 100644
index 00000000000..a231a245483
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''closer-mop'';
+  version = ''20170227-git'';
+
+  description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-02-27/closer-mop-20170227-git.tgz'';
+    sha256 = ''1hdnbryh6gd8kn20yr5ldgkcs8i71c6awwf6a32nmp9l42gwv9k3'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :closer-mop)"' "$out/bin/closer-mop-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
new file mode 100644
index 00000000000..f176bb6e1df
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''closure-common'';
+  version = ''20101107-git'';
+
+  description = '''';
+
+  deps = [ args."babel" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
+    sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :closure-common)"' "$out/bin/closure-common-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
new file mode 100644
index 00000000000..3c89603d9cb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clss'';
+  version = ''20170124-git'';
+
+  description = ''A DOM tree searching engine based on CSS selectors.'';
+
+  deps = [ args."array-utils" args."plump" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz'';
+    sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clss)"' "$out/bin/clss-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 1611b7b74fe..e4303bca2d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
     sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clx)"' "$out/bin/clx-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
new file mode 100644
index 00000000000..8b2357fc7e0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''css-lite'';
+  version = ''20120407-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
+    sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :css-lite)"' "$out/bin/css-lite-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
new file mode 100644
index 00000000000..56d6a42d93d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml-dom'';
+  version = ''cxml-20110619-git'';
+
+  description = '''';
+
+  deps = [ args."cxml-xml" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
+    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-dom-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
new file mode 100644
index 00000000000..b118d276dd2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml-klacks'';
+  version = ''cxml-20110619-git'';
+
+  description = '''';
+
+  deps = [ args."cxml-xml" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
+    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-klacks-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
new file mode 100644
index 00000000000..e8f2bb5d8b3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml-test'';
+  version = ''cxml-20110619-git'';
+
+  description = '''';
+
+  deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-xml" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
+    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-test-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
new file mode 100644
index 00000000000..85d60abf746
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml-xml'';
+  version = ''cxml-20110619-git'';
+
+  description = '''';
+
+  deps = [ args."closure-common" args."puri" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
+    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-xml-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
new file mode 100644
index 00000000000..54d02e035bc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml'';
+  version = ''20110619-git'';
+
+  description = '''';
+
+  deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-test" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
+    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
new file mode 100644
index 00000000000..d4c3ff3a1c4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dexador'';
+  version = ''20170227-git'';
+
+  description = ''Yet another HTTP client for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-02-27/dexador-20170227-git.tgz'';
+    sha256 = ''0fc3hlckxfwz1ymindb9p44c6idfz8z6w5zk8cbd4nvvd0f2a8kz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :dexador)"' "$out/bin/dexador-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
new file mode 100644
index 00000000000..699e5a1458f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''do-urlencode'';
+  version = ''20130720-git'';
+
+  description = ''Percent Encoding (aka URL Encoding) library'';
+
+  deps = [ args."babel" args."babel-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz'';
+    sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :do-urlencode)"' "$out/bin/do-urlencode-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
new file mode 100644
index 00000000000..37a7e979058
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''documentation-utils'';
+  version = ''20161204-git'';
+
+  description = ''A few simple tools to help you with documenting your library.'';
+
+  deps = [ args."trivial-indent" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz'';
+    sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :documentation-utils)"' "$out/bin/documentation-utils-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index a64a62078ec..c9845af9764 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''Full-featured http/https client based on usocket'';
 
-  deps = [ args."puri" args."cl-base64" args."chunga" args."flexi-streams" args."cl-ppcre" args."chipz" args."usocket" args."cl+ssl" ];
+  deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
     sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :drakma)"' "$out/bin/drakma-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index e05713da15b..93864948f11 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
     sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :esrap)"' "$out/bin/esrap-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 1b8378d5d55..4143957416a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
     sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :external-program)"' "$out/bin/external-program-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
new file mode 100644
index 00000000000..17cc9bc020a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''fast-http'';
+  version = ''20170227-git'';
+
+  description = ''A fast HTTP protocol parser in Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz'';
+    sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :fast-http)"' "$out/bin/fast-http-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
new file mode 100644
index 00000000000..69201b7044b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''fast-io'';
+  version = ''20170124-git'';
+
+  description = ''Alternative I/O mechanism to a stream or vector'';
+
+  deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz'';
+    sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :fast-io)"' "$out/bin/fast-io-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 12da2cbacb9..90dcbbc83f8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
     sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :flexi-streams)"' "$out/bin/flexi-streams-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
new file mode 100644
index 00000000000..7aa65c3b84b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''form-fiddle'';
+  version = ''20160929-git'';
+
+  description = ''A collection of utilities to destructure lambda forms.'';
+
+  deps = [ args."documentation-utils" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz'';
+    sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :form-fiddle)"' "$out/bin/form-fiddle-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
new file mode 100644
index 00000000000..958c899bbe9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''http-body'';
+  version = ''20161204-git'';
+
+  description = ''HTTP POST data parser for Common Lisp'';
+
+  deps = [ args."babel" args."cl-ppcre" args."cl-utilities" args."fast-http" args."flexi-streams" args."jonathan" args."quri" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
+    sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :http-body)"' "$out/bin/http-body-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index 0eadf54320a..6f0aa151c15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -8,10 +8,17 @@ rec {
   simple framework for user-defined handlers and can be extended
   through subclassing.'';
 
-  deps = [ args."chunga" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."cl+ssl" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" args."bordeaux-threads" ];
+  deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
     sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :hunchentoot)"' "$out/bin/hunchentoot-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index feacb1264af..c0b325123cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
     sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :idna)"' "$out/bin/idna-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 5badc04f201..4d76399a911 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''I/O library.'';
 
-  deps = [ args."iolib/base" args."iolib/multiplex" args."iolib/streams" args."iolib/sockets" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
     sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iolib)"' "$out/bin/iolib-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
deleted file mode 100644
index f6a78c85da9..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_asdf'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''A few ASDF component classes.'';
-
-  deps = [ args."alexandria" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
deleted file mode 100644
index 642e26e278a..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_base'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Base IOlib package, used instead of CL.'';
-
-  deps = [ args."iolib/common-lisp" args."alexandria" args."split-sequence" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
deleted file mode 100644
index 59fdbdc85d0..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_common-lisp'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Slightly modified Common Lisp.'';
-
-  deps = [ args."alexandria" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
deleted file mode 100644
index 0a0631caf44..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_conf'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Compile-time configuration for IOLib.'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
deleted file mode 100644
index e7c2d780f4e..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_grovel'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''The CFFI Groveller'';
-
-  deps = [ args."iolib/asdf" args."iolib/base" args."iolib/conf" args."alexandria" args."split-sequence" args."cffi" args."uiop" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
deleted file mode 100644
index 07324035052..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_multiplex'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''I/O multiplexing library.'';
-
-  deps = [ args."iolib/base" args."iolib/syscalls" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
deleted file mode 100644
index b956d3ece21..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_sockets'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Socket library.'';
-
-  deps = [ args."iolib/base" args."iolib/syscalls" args."iolib/streams" args."babel" args."cffi" args."iolib/grovel" args."bordeaux-threads" args."idna" args."swap-bytes" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
deleted file mode 100644
index 267dbd8e6de..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_streams'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Gray streams.'';
-
-  deps = [ args."iolib/base" args."iolib/multiplex" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
deleted file mode 100644
index 395b3d53934..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_syscalls'';
-  version = ''iolib-v0.8.1'';
-
-  description = ''Syscalls and foreign types.'';
-
-  deps = [ args."trivial-features" args."cffi" args."iolib/base" args."iolib/grovel" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
new file mode 100644
index 00000000000..cf1d4ac077c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ironclad'';
+  version = ''ironclad_0.33.0'';
+
+  description = ''A cryptographic toolkit written in pure Common Lisp'';
+
+  deps = [ args."nibbles" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz'';
+    sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :ironclad)"' "$out/bin/ironclad-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 469c8439246..5fffe95309e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
     sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iterate)"' "$out/bin/iterate-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
new file mode 100644
index 00000000000..6f77708ade5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''jonathan'';
+  version = ''20170124-git'';
+
+  description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
+
+  deps = [ args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."proc-parse" args."trivial-types" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz'';
+    sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :jonathan)"' "$out/bin/jonathan-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
new file mode 100644
index 00000000000..6580fc6760b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-component'';
+  version = ''lack-20161204-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
+    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack-component)"' "$out/bin/lack-component-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
new file mode 100644
index 00000000000..113a920348e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-util'';
+  version = ''lack-20161204-git'';
+
+  description = '''';
+
+  deps = [ args."ironclad" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
+    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack-util)"' "$out/bin/lack-util-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
new file mode 100644
index 00000000000..7f41d0ac276
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack'';
+  version = ''20161204-git'';
+
+  description = ''A minimal Clack'';
+
+  deps = [ args."lack-component" args."lack-util" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
+    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack)"' "$out/bin/lack-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
new file mode 100644
index 00000000000..f99372a37ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''let-plus'';
+  version = ''20170124-git'';
+
+  description = ''Destructuring extension of LET*.'';
+
+  deps = [ args."alexandria" args."anaphora" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz'';
+    sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :let-plus)"' "$out/bin/let-plus-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
new file mode 100644
index 00000000000..61e6703dea4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lev'';
+  version = ''20150505-git'';
+
+  description = ''libev bindings for Common Lisp'';
+
+  deps = [ args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
+    sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lev)"' "$out/bin/lev-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
new file mode 100644
index 00000000000..f2cab2b59fb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''local-time'';
+  version = ''20170124-git'';
+
+  description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
+
+  deps = [ args."cl-fad" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz'';
+    sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :local-time)"' "$out/bin/local-time-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
new file mode 100644
index 00000000000..0b8d97def2f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lquery'';
+  version = ''20160929-git'';
+
+  description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
+
+  deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz'';
+    sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lquery)"' "$out/bin/lquery-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
new file mode 100644
index 00000000000..a9a4a2d5852
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''map-set'';
+  version = ''20160628-hg'';
+
+  description = ''Set-like data structure.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
+    sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :map-set)"' "$out/bin/map-set-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
new file mode 100644
index 00000000000..65b7465873f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''marshal'';
+  version = ''cl-20170124-git'';
+
+  description = ''marshal: Simple (de)serialization of Lisp datastructures.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz'';
+    sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :marshal)"' "$out/bin/marshal-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 275dd3577dd..bf39f4b3c3b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
     sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :md5)"' "$out/bin/md5-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
new file mode 100644
index 00000000000..daf966dadab
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''metabang-bind'';
+  version = ''20170124-git'';
+
+  description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz'';
+    sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :metabang-bind)"' "$out/bin/metabang-bind-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
new file mode 100644
index 00000000000..7f0a2fe1139
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''myway'';
+  version = ''20150302-git'';
+
+  description = ''Sinatra-compatible routing library.'';
+
+  deps = [ args."alexandria" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
+    sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :myway)"' "$out/bin/myway-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
new file mode 100644
index 00000000000..636f4cea7c7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -0,0 +1,22 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''named-readtables'';
+  version = ''20170124-git'';
+
+  description = ''Library that creates a namespace for named readtable
+  akin to the namespace of packages.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz'';
+    sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :named-readtables)"' "$out/bin/named-readtables-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
new file mode 100644
index 00000000000..cfd8dba13fb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''nibbles'';
+  version = ''20161204-git'';
+
+  description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/nibbles/2016-12-04/nibbles-20161204-git.tgz'';
+    sha256 = ''06cdnivq2966crpj8pidqmwagaif848yvq4fjqq213f3wynwknh4'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :nibbles)"' "$out/bin/nibbles-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
new file mode 100644
index 00000000000..6d6981c8586
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''optima'';
+  version = ''20150709-git'';
+
+  description = ''Optimized Pattern Matching Library'';
+
+  deps = [ args."alexandria" args."closer-mop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
+    sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :optima)"' "$out/bin/optima-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
new file mode 100644
index 00000000000..a81494bc88f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''parenscript'';
+  version = ''Parenscript-2.6'';
+
+  description = ''Lisp to JavaScript transpiler'';
+
+  deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
+    sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :parenscript)"' "$out/bin/parenscript-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
new file mode 100644
index 00000000000..99cc86ea6fa
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-dom'';
+  version = ''plump-20170124-git'';
+
+  description = ''A DOM for use with the Plump parser.'';
+
+  deps = [ args."array-utils" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
+    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-dom)"' "$out/bin/plump-dom-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
new file mode 100644
index 00000000000..fe3bdb8649e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-lexer'';
+  version = ''plump-20170124-git'';
+
+  description = ''A very simple toolkit to help with lexing used mainly in Plump.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
+    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-lexer)"' "$out/bin/plump-lexer-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
new file mode 100644
index 00000000000..47d253b16be
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-parser'';
+  version = ''plump-20170124-git'';
+
+  description = ''Plump's core parser component.'';
+
+  deps = [ args."plump-dom" args."plump-lexer" args."trivial-indent" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
+    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-parser)"' "$out/bin/plump-parser-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
new file mode 100644
index 00000000000..2c2865b8bde
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump'';
+  version = ''20170124-git'';
+
+  description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
+
+  deps = [ args."plump-dom" args."plump-lexer" args."plump-parser" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
+    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump)"' "$out/bin/plump-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
new file mode 100644
index 00000000000..6c780e5a541
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''proc-parse'';
+  version = ''20160318-git'';
+
+  description = ''Procedural vector parser'';
+
+  deps = [ args."alexandria" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
+    sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :proc-parse)"' "$out/bin/proc-parse-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
new file mode 100644
index 00000000000..fb9f5d7d564
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''prove'';
+  version = ''20170124-git'';
+
+  description = '''';
+
+  deps = [ args."alexandria" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz'';
+    sha256 = ''1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :prove)"' "$out/bin/prove-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index b86c4205407..2ae7b5e8703 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
     sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :puri)"' "$out/bin/puri-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
new file mode 100644
index 00000000000..a96d145b2af
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''quri'';
+  version = ''20161204-git'';
+
+  description = ''Yet another URI library for Common Lisp'';
+
+  deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
+    sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :quri)"' "$out/bin/quri-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 82b31efea27..8216bcca9f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
     sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :rfc2388)"' "$out/bin/rfc2388-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
new file mode 100644
index 00000000000..c4be68aa80b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -0,0 +1,22 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''salza2'';
+  version = ''2.0.9'';
+
+  description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP
+  data formats'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
+    sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :salza2)"' "$out/bin/salza2-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
new file mode 100644
index 00000000000..689f83a93a6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''smart-buffer'';
+  version = ''20160628-git'';
+
+  description = ''Smart octets buffer'';
+
+  deps = [ args."flexi-streams" args."uiop" args."xsubseq" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
+    sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :smart-buffer)"' "$out/bin/smart-buffer-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 085e215e024..afb5a59fc89 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -12,4 +12,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
     sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :split-sequence)"' "$out/bin/split-sequence-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
new file mode 100644
index 00000000000..ed2aa3ab487
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''static-vectors'';
+  version = ''v1.8.2'';
+
+  description = ''Create vectors allocated in static memory.'';
+
+  deps = [ args."alexandria" args."cffi" args."cffi-grovel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz'';
+    sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :static-vectors)"' "$out/bin/static-vectors-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 910cce74f8a..2927e6f8b38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -5,10 +5,17 @@ rec {
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+  deps = [ ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz'';
     sha256 = ''0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :stumpwm)"' "$out/bin/stumpwm-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index cb1e293919b..8dc37b52342 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
     sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :swap-bytes)"' "$out/bin/swap-bytes-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index fc83804f5e1..ef3c2754a04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
     sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-backtrace)"' "$out/bin/trivial-backtrace-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 97d6b0cf2c0..d9f4a0bba06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
     sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-features)"' "$out/bin/trivial-features-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 6a057bdcc10..93ecccf6fd2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
     sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-garbage)"' "$out/bin/trivial-garbage-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index b234da11c37..91390088eba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
     sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-gray-streams)"' "$out/bin/trivial-gray-streams-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
new file mode 100644
index 00000000000..47c0468617a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-indent'';
+  version = ''20160929-git'';
+
+  description = ''A very simple library to allow indentation hints for SWANK.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz'';
+    sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-indent)"' "$out/bin/trivial-indent-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
new file mode 100644
index 00000000000..75be29e69ce
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-mimes'';
+  version = ''20160929-git'';
+
+  description = ''Tiny library to detect mime types in files.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz'';
+    sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-mimes)"' "$out/bin/trivial-mimes-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
new file mode 100644
index 00000000000..6d59de6fbe5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-types'';
+  version = ''20120407-git'';
+
+  description = ''Trivial type definitions'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
+    sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-types)"' "$out/bin/trivial-types-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 110edbb9f18..80c320dffbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
     sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-utf-8)"' "$out/bin/trivial-utf-8-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index e80cbc99e8c..f14e70f3c0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
     sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :uiop)"' "$out/bin/uiop-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 7797cb4e797..3e121514fc0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -11,4 +11,11 @@ rec {
     url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
     sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
   };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :usocket)"' "$out/bin/usocket-lisp-launcher.sh" ""
+    '';
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
new file mode 100644
index 00000000000..d18e1f116ed
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''vom'';
+  version = ''20160825-git'';
+
+  description = ''A tiny logging utility.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
+    sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :vom)"' "$out/bin/vom-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
new file mode 100644
index 00000000000..8674970d0c1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''woo'';
+  version = ''20170227-git'';
+
+  description = ''An asynchronous HTTP server written in Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz'';
+    sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :woo)"' "$out/bin/woo-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
new file mode 100644
index 00000000000..91325de816d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''wookie'';
+  version = ''20170227-git'';
+
+  description = ''An evented webserver for Common Lisp.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
+    sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :wookie)"' "$out/bin/wookie-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
new file mode 100644
index 00000000000..a0700c19087
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''xmls'';
+  version = ''1.7'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
+    sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :xmls)"' "$out/bin/xmls-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
new file mode 100644
index 00000000000..7eab70d4d8f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''xsubseq'';
+  version = ''20150113-git'';
+
+  description = ''Efficient way to manage "subseq"s in Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz'';
+    sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :xsubseq)"' "$out/bin/xsubseq-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
new file mode 100644
index 00000000000..c2b1ed9b556
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''yason'';
+  version = ''v0.7.6'';
+
+  description = ''JSON parser/encoder'';
+
+  deps = [ args."alexandria" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
+    sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :yason)"' "$out/bin/yason-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
new file mode 100644
index 00000000000..f03c34f5331
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
@@ -0,0 +1,9 @@
+(defparameter testnames (make-hash-table :test 'equal))
+(setf
+  (gethash "cxml-xml" testnames) "cxml"
+  (gethash "cxml-dom" testnames) "cxml"
+  (gethash "cxml-test" testnames) "cxml"
+  (gethash "cxml-klacks" testnames) "cxml"
+  (gethash "cl-async-base" testnames) "cl-async"
+  (gethash "cl-async-util" testnames) "cl-async"
+  )
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 1c6b1e05adf..c073b40b14c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,28 +1,65 @@
 {pkgs, buildLispPackage, quicklisp-to-nix-packages}:
-{
-  iterate = x: {
-    overrides = x: {
-      configurePhase="buildPhase(){ true; }";
-    };
+let
+  addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
+  addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
+  skipBuildPhase = x: { 
+    overrides = y: ((x.overrides y) // { buildPhase = "true"; });
   };
+  qlnp = quicklisp-to-nix-packages;
+  multiOverride = l: x: if l == [] then {} else
+    ((builtins.head l) x) // (multiOverride (builtins.tail l) x);
+in
+{
+  stumpwm = addDeps (with qlnp; [alexandria cl-ppcre clx]);
+  iterate = skipBuildPhase;
   cl-fuse = x: {
     propagatedBuildInputs = [pkgs.fuse];
-    overrides = x : {
+    overrides = y : (x.overrides y) // {
       configurePhase = ''
         export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
         export makeFlags="$makeFlags LISP=common-lisp.sh"
       '';
     };
   };
-  hunchentoot = x: {
-    propagatedBuildInputs = [pkgs.openssl];
-  };
-  iolib = x: {
-    propagatedBuildInputs = [pkgs.libfixposix pkgs.gcc];
-    overrides = y: {
-      postBuild = ''
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iolib)"' common-lisp.sh ""
-      '';
-    };
-  };
+  hunchentoot = addNativeLibs [pkgs.openssl];
+  iolib = addNativeLibs [pkgs.libfixposix pkgs.gcc];
+  cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
+  clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
+  clack-v1-compat =  addDeps (with qlnp;[
+    lack bordeaux-threads prove usocket dexador http-body trivial-backtrace
+    marshal local-time cl-base64 cl-ppcre quri trivial-mimes trivial-types
+    flexi-streams circular-streams ironclad cl-syntax-annot alexandria
+    split-sequence
+  ]);
+  cxml = skipBuildPhase;
+  cxml-xml = skipBuildPhase;
+  cxml-dom = skipBuildPhase;
+  cxml-klacks = skipBuildPhase;
+  cxml-test = skipBuildPhase;
+  wookie = multiOverride [(addDeps (with qlnp; [
+      alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
+      cl-fad fast-io vom do-urlencode
+    ])) 
+    (addNativeLibs (with pkgs; [libuv openssl]))];
+  woo = addDeps (with qlnp; [
+    cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io
+    trivial-utf-8 vom
+  ]);
+  lev = addNativeLibs [pkgs.libev];
+  dexador = addDeps (with qlnp; [
+    usocket fast-http quri fast-io chunga cl-ppcre cl-cookie trivial-mimes
+    chipz cl-base64 cl-reexport qlnp."cl+ssl" alexandria bordeaux-threads
+  ]);
+  fast-http = addDeps (with qlnp; [
+    alexandria cl-utilities proc-parse xsubseq smart-buffer
+  ]);
+  cl-emb = addDeps (with qlnp; [cl-ppcre]);
+  "cl+ssl" = addNativeLibs [pkgs.openssl];
+  cl-colors = skipBuildPhase;
+  cl-libuv = addNativeLibs [pkgs.libuv];
+  cl-async-base = addDeps (with qlnp; [
+    cffi fast-io vom cl-libuv cl-ppcre trivial-features static-vectors
+    trivial-gray-streams babel
+  ]);
+  css-lite = addDeps (with qlnp; [parenscript]);
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 12ec2d1f4e5..a32dd823a7e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,7 +1,64 @@
-stumpwm
+alexandria
+babel
+blackbird
+bordeaux-threads
+caveman
+cffi
+chipz
+circular-streams
+clack
+cl-async
+cl-base64
+cl-cookie
 cl-fuse
-esrap
-hunchentoot
-external-program
+cl-json
+cl-l10n
+closer-mop
+cl-ppcre
+cl-reexport
+cl-syntax-annot
+cl-unicode
+cl-utilities
+cl-who
+clx
+parenscript
+css-lite
+cxml
+dexador
 drakma
+esrap
+external-program
+fast-http
+fast-io
+flexi-streams
+http-body
+hunchentoot
 iolib
+ironclad
+iterate
+lack
+lev
+local-time
+lquery
+marshal
+optima
+parenscript
+plump
+proc-parse
+prove
+quri
+salza2
+smart-buffer
+split-sequence
+static-vectors
+stumpwm
+trivial-backtrace
+trivial-mimes
+trivial-types
+trivial-utf-8
+usocket
+woo
+wookie
+xmls
+xsubseq
+yason
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 0f7f58df4b8..2b9afcf286e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,23 +6,188 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "iolib/conf" = buildLispPackage
+  "closure-common" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib/conf" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_conf.nix {
+       (qlOverrides."closure-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-common.nix {
          inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
-  "iolib_slash_conf" = quicklisp-to-nix-packages."iolib/conf";
 
 
-  "iolib/asdf" = buildLispPackage
+  "let-plus" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib/asdf" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_asdf.nix {
+       (qlOverrides."let-plus" or (x: {}))
+       (import ./quicklisp-to-nix-output/let-plus.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+       }));
+
+
+  "trivial-indent" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-indent" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+         inherit fetchurl;
+       }));
+
+
+  "documentation-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."documentation-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+         inherit fetchurl;
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "trivial-garbage" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cxml-xml" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-xml" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-xml.nix {
+         inherit fetchurl;
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "cffi-toolchain" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-toolchain" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "map-set" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."map-set" or (x: {}))
+       (import ./quicklisp-to-nix-output/map-set.nix {
+         inherit fetchurl;
+       }));
+
+
+  "babel-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."babel-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/babel-streams.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "cl-colors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-colors" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-colors.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+       }));
+
+
+  "cl-ansi-text" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ansi-text" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ansi-text.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+       }));
+
+
+  "plump-parser" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-parser" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-parser.nix {
+         inherit fetchurl;
+           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
+           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "plump-lexer" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-lexer" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-lexer.nix {
+         inherit fetchurl;
+       }));
+
+
+  "plump-dom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-dom" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-dom.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+       }));
+
+
+  "form-fiddle" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."form-fiddle" or (x: {}))
+       (import ./quicklisp-to-nix-output/form-fiddle.nix {
+         inherit fetchurl;
+           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+       }));
+
+
+  "clss" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "plump" = quicklisp-to-nix-packages."plump";
+       }));
+
+
+  "array-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."array-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/array-utils.nix {
+         inherit fetchurl;
+       }));
+
+
+  "lack-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-util.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+       }));
+
+
+  "lack-component" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-component" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-component.nix {
+         inherit fetchurl;
+       }));
+
+
+  "nibbles" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."nibbles" or (x: {}))
+       (import ./quicklisp-to-nix-output/nibbles.nix {
+         inherit fetchurl;
        }));
-  "iolib_slash_asdf" = quicklisp-to-nix-packages."iolib/asdf";
 
 
   "swap-bytes" = buildLispPackage
@@ -43,174 +208,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "iolib/grovel" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/grovel" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_grovel.nix {
-         inherit fetchurl;
-           "iolib/asdf" = quicklisp-to-nix-packages."iolib/asdf";
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/conf" = quicklisp-to-nix-packages."iolib/conf";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-  "iolib_slash_grovel" = quicklisp-to-nix-packages."iolib/grovel";
-
-
-  "iolib/syscalls" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/syscalls" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix {
-         inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
-       }));
-  "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
-
-
-  "iolib/common-lisp" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/common-lisp" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_common-lisp.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-  "iolib_slash_common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
-
-
-  "split-sequence" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."split-sequence" or (x: {}))
-       (import ./quicklisp-to-nix-output/split-sequence.nix {
-         inherit fetchurl;
-       }));
-
-
-  "trivial-garbage" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-garbage" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
-         inherit fetchurl;
-       }));
-
-
-  "trivial-gray-streams" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-gray-streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
-         inherit fetchurl;
-       }));
-
-
-  "babel" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."babel" or (x: {}))
-       (import ./quicklisp-to-nix-output/babel.nix {
-         inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
-  "uiop" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."uiop" or (x: {}))
-       (import ./quicklisp-to-nix-output/uiop.nix {
-         inherit fetchurl;
-       }));
-
-
-  "iolib/sockets" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/sockets" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix {
-         inherit fetchurl;
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
-           "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "idna" = quicklisp-to-nix-packages."idna";
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-       }));
-  "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib/sockets";
-
-
-  "iolib/streams" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_streams.nix {
-         inherit fetchurl;
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-       }));
-  "iolib_slash_streams" = quicklisp-to-nix-packages."iolib/streams";
-
-
-  "iolib/multiplex" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/multiplex" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix {
-         inherit fetchurl;
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-       }));
-  "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
-
-
-  "iolib/base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib/base" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_base.nix {
-         inherit fetchurl;
-           "iolib/common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-       }));
-  "iolib_slash_base" = quicklisp-to-nix-packages."iolib/base";
-
-
-  "chipz" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."chipz" or (x: {}))
-       (import ./quicklisp-to-nix-output/chipz.nix {
-         inherit fetchurl;
-       }));
-
-
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
-         inherit fetchurl;
-       }));
-
-
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-       }));
-
-
-  "usocket" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."usocket" or (x: {}))
-       (import ./quicklisp-to-nix-output/usocket.nix {
-         inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-       }));
-
-
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -227,44 +224,41 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "jonathan" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."jonathan" or (x: {}))
+       (import ./quicklisp-to-nix-output/jonathan.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+       }));
+
+
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl+ssl" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl+ssl" or (x: {}))
        (import ./quicklisp-to-nix-output/cl+ssl.nix {
          inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "flexi-streams" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."flexi-streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/flexi-streams.nix {
-         inherit fetchurl;
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "cl-fad" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-fad" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-fad.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
-  "cl-base64" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-base64" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-base64.nix {
-         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -277,6 +271,278 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cxml-test" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-test" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-test.nix {
+         inherit fetchurl;
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
+  "cxml-klacks" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-klacks" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
+  "cxml-dom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-dom" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-dom.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
+  "named-readtables" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."named-readtables" or (x: {}))
+       (import ./quicklisp-to-nix-output/named-readtables.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-annot" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-annot" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-annot.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "metabang-bind" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."metabang-bind" or (x: {}))
+       (import ./quicklisp-to-nix-output/metabang-bind.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-l10n-cldr" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-l10n-cldr" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-l10n-cldr.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-fad" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-fad" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-fad.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "cffi-grovel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+       }));
+
+
+  "cl-libuv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-libuv" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-libuv.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+       }));
+
+
+  "cl-async-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async-util.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "vom" = quicklisp-to-nix-packages."vom";
+       }));
+
+
+  "cl-async-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async-base.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+       }));
+
+
+  "trivial-gray-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-gray-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
+         inherit fetchurl;
+       }));
+
+
+  "uiop" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uiop" or (x: {}))
+       (import ./quicklisp-to-nix-output/uiop.nix {
+         inherit fetchurl;
+       }));
+
+
+  "myway" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."myway" or (x: {}))
+       (import ./quicklisp-to-nix-output/myway.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "map-set" = quicklisp-to-nix-packages."map-set";
+           "quri" = quicklisp-to-nix-packages."quri";
+       }));
+
+
+  "do-urlencode" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."do-urlencode" or (x: {}))
+       (import ./quicklisp-to-nix-output/do-urlencode.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "babel-streams" = quicklisp-to-nix-packages."babel-streams";
+       }));
+
+
+  "clack-v1-compat" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-v1-compat" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-syntax" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-syntax" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax.nix {
+         inherit fetchurl;
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+       }));
+
+
+  "cl-project" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-project" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-project.nix {
+         inherit fetchurl;
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "cl-emb" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-emb" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-emb.nix {
+         inherit fetchurl;
+       }));
+
+
+  "anaphora" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."anaphora" or (x: {}))
+       (import ./quicklisp-to-nix-output/anaphora.nix {
+         inherit fetchurl;
+       }));
+
+
+  "vom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."vom" or (x: {}))
+       (import ./quicklisp-to-nix-output/vom.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
+       }));
+
+
+  "yason" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."yason" or (x: {}))
+       (import ./quicklisp-to-nix-output/yason.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "xsubseq" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xsubseq" or (x: {}))
+       (import ./quicklisp-to-nix-output/xsubseq.nix {
+         inherit fetchurl;
+       }));
+
+
+  "xmls" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xmls" or (x: {}))
+       (import ./quicklisp-to-nix-output/xmls.nix {
+         inherit fetchurl;
+       }));
+
+
+  "wookie" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."wookie" or (x: {}))
+       (import ./quicklisp-to-nix-output/wookie.nix {
+         inherit fetchurl;
+       }));
+
+
+  "woo" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."woo" or (x: {}))
+       (import ./quicklisp-to-nix-output/woo.nix {
+         inherit fetchurl;
+       }));
+
+
+  "usocket" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."usocket" or (x: {}))
+       (import ./quicklisp-to-nix-output/usocket.nix {
+         inherit fetchurl;
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+
+
   "trivial-utf-8" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-utf-8" or (x: {}))
@@ -285,10 +551,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "iterate" = buildLispPackage
+  "trivial-types" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iterate" or (x: {}))
-       (import ./quicklisp-to-nix-output/iterate.nix {
+       (qlOverrides."trivial-types" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-types.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivial-mimes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-mimes" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-mimes.nix {
          inherit fetchurl;
        }));
 
@@ -301,56 +575,170 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "bordeaux-threads" = buildLispPackage
+  "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."bordeaux-threads" or (x: {}))
-       (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
+       (qlOverrides."stumpwm" or (x: {}))
+       (import ./quicklisp-to-nix-output/stumpwm.nix {
+         inherit fetchurl;
+       }));
+
+
+  "static-vectors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."static-vectors" or (x: {}))
+       (import ./quicklisp-to-nix-output/static-vectors.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
        }));
 
 
-  "cl-utilities" = buildLispPackage
+  "split-sequence" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl-utilities" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-utilities.nix {
+       (qlOverrides."split-sequence" or (x: {}))
+       (import ./quicklisp-to-nix-output/split-sequence.nix {
          inherit fetchurl;
        }));
 
 
-  "cffi" = buildLispPackage
+  "smart-buffer" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi.nix {
+       (qlOverrides."smart-buffer" or (x: {}))
+       (import ./quicklisp-to-nix-output/smart-buffer.nix {
          inherit fetchurl;
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "uiop" = quicklisp-to-nix-packages."uiop";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+       }));
+
+
+  "salza2" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."salza2" or (x: {}))
+       (import ./quicklisp-to-nix-output/salza2.nix {
+         inherit fetchurl;
+       }));
+
+
+  "quri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."quri" or (x: {}))
+       (import ./quicklisp-to-nix-output/quri.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+
+
+  "prove" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."prove" or (x: {}))
+       (import ./quicklisp-to-nix-output/prove.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "proc-parse" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."proc-parse" or (x: {}))
+       (import ./quicklisp-to-nix-output/proc-parse.nix {
+         inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "babel" = quicklisp-to-nix-packages."babel";
        }));
 
 
-  "clx" = buildLispPackage
+  "plump" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."clx" or (x: {}))
-       (import ./quicklisp-to-nix-output/clx.nix {
+       (qlOverrides."plump" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump.nix {
+         inherit fetchurl;
+           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
+           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
+           "plump-parser" = quicklisp-to-nix-packages."plump-parser";
+       }));
+
+
+  "optima" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."optima" or (x: {}))
+       (import ./quicklisp-to-nix-output/optima.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+       }));
+
+
+  "marshal" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."marshal" or (x: {}))
+       (import ./quicklisp-to-nix-output/marshal.nix {
          inherit fetchurl;
        }));
 
 
-  "cl-ppcre" = buildLispPackage
+  "lquery" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl-ppcre" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-ppcre.nix {
+       (qlOverrides."lquery" or (x: {}))
+       (import ./quicklisp-to-nix-output/lquery.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "clss" = quicklisp-to-nix-packages."clss";
+           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
+           "plump" = quicklisp-to-nix-packages."plump";
+       }));
+
+
+  "local-time" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."local-time" or (x: {}))
+       (import ./quicklisp-to-nix-output/local-time.nix {
+         inherit fetchurl;
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+       }));
+
+
+  "lev" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lev" or (x: {}))
+       (import ./quicklisp-to-nix-output/lev.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "lack" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack.nix {
+         inherit fetchurl;
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+       }));
+
+
+  "iterate" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iterate" or (x: {}))
+       (import ./quicklisp-to-nix-output/iterate.nix {
          inherit fetchurl;
        }));
 
 
-  "alexandria" = buildLispPackage
+  "ironclad" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."alexandria" or (x: {}))
-       (import ./quicklisp-to-nix-output/alexandria.nix {
+       (qlOverrides."ironclad" or (x: {}))
+       (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -359,26 +747,78 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
-           "iolib/base" = quicklisp-to-nix-packages."iolib/base";
-           "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
-           "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
-           "iolib/sockets" = quicklisp-to-nix-packages."iolib/sockets";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "idna" = quicklisp-to-nix-packages."idna";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
-  "drakma" = buildLispPackage
+  "hunchentoot" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."drakma" or (x: {}))
-       (import ./quicklisp-to-nix-output/drakma.nix {
+       (qlOverrides."hunchentoot" or (x: {}))
+       (import ./quicklisp-to-nix-output/hunchentoot.nix {
          inherit fetchurl;
-           "puri" = quicklisp-to-nix-packages."puri";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "chunga" = quicklisp-to-nix-packages."chunga";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "usocket" = quicklisp-to-nix-packages."usocket";
            "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
+  "http-body" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."http-body" or (x: {}))
+       (import ./quicklisp-to-nix-output/http-body.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "flexi-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."flexi-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/flexi-streams.nix {
+         inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "fast-io" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."fast-io" or (x: {}))
+       (import ./quicklisp-to-nix-output/fast-io.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "fast-http" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."fast-http" or (x: {}))
+       (import ./quicklisp-to-nix-output/fast-http.nix {
+         inherit fetchurl;
        }));
 
 
@@ -391,25 +831,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hunchentoot" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."hunchentoot" or (x: {}))
-       (import ./quicklisp-to-nix-output/hunchentoot.nix {
-         inherit fetchurl;
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-       }));
-
-
   "esrap" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."esrap" or (x: {}))
@@ -419,28 +840,296 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "drakma" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."drakma" or (x: {}))
+       (import ./quicklisp-to-nix-output/drakma.nix {
+         inherit fetchurl;
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
+  "dexador" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dexador" or (x: {}))
+       (import ./quicklisp-to-nix-output/dexador.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cxml" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml.nix {
+         inherit fetchurl;
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+       }));
+
+
+  "css-lite" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."css-lite" or (x: {}))
+       (import ./quicklisp-to-nix-output/css-lite.nix {
+         inherit fetchurl;
+       }));
+
+
+  "parenscript" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parenscript" or (x: {}))
+       (import ./quicklisp-to-nix-output/parenscript.nix {
+         inherit fetchurl;
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+       }));
+
+
+  "clx" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clx" or (x: {}))
+       (import ./quicklisp-to-nix-output/clx.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-who" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-who" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-who.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-utilities" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-utilities" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-utilities.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-unicode" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-unicode" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-unicode.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-syntax-annot" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-syntax-annot" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax-annot.nix {
+         inherit fetchurl;
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+       }));
+
+
+  "cl-reexport" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-reexport" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-reexport.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "cl-ppcre" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ppcre" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ppcre.nix {
+         inherit fetchurl;
+       }));
+
+
+  "closer-mop" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closer-mop" or (x: {}))
+       (import ./quicklisp-to-nix-output/closer-mop.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-l10n" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-l10n" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-l10n.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-l10n-cldr" = quicklisp-to-nix-packages."cl-l10n-cldr";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+       }));
+
+
+  "cl-json" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-json" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-json.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-fuse" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-fuse" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-fuse.nix {
          inherit fetchurl;
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
            "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
 
-  "stumpwm" = buildLispPackage
+  "cl-cookie" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."stumpwm" or (x: {}))
-       (import ./quicklisp-to-nix-output/stumpwm.nix {
+       (qlOverrides."cl-cookie" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-cookie.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "clx" = quicklisp-to-nix-packages."clx";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "quri" = quicklisp-to-nix-packages."quri";
+       }));
+
+
+  "cl-base64" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-base64" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-base64.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-async" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "clack" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack.nix {
+         inherit fetchurl;
+       }));
+
+
+  "circular-streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."circular-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/circular-streams.nix {
+         inherit fetchurl;
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "chipz" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."chipz" or (x: {}))
+       (import ./quicklisp-to-nix-output/chipz.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "caveman" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."caveman" or (x: {}))
+       (import ./quicklisp-to-nix-output/caveman.nix {
+         inherit fetchurl;
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-project" = quicklisp-to-nix-packages."cl-project";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
+           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "myway" = quicklisp-to-nix-packages."myway";
+       }));
+
+
+  "bordeaux-threads" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."bordeaux-threads" or (x: {}))
+       (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "blackbird" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."blackbird" or (x: {}))
+       (import ./quicklisp-to-nix-output/blackbird.nix {
+         inherit fetchurl;
+           "vom" = quicklisp-to-nix-packages."vom";
+       }));
+
+
+  "babel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."babel" or (x: {}))
+       (import ./quicklisp-to-nix-output/babel.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
+  "alexandria" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."alexandria" or (x: {}))
+       (import ./quicklisp-to-nix-output/alexandria.nix {
+         inherit fetchurl;
        }));
 
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index dc4b14c1f60..3711ab957e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -59,7 +59,7 @@
          (nix-prefetch-url local-url)))
      (ideal-md5 (ql-dist:archive-md5 ql-release))
      (file-md5 (getf archive-data :md5))
-     (raw-dependencies (asdf:system-depends-on asdf-system))
+     (raw-dependencies (ql-dist:required-systems ql-system))
      (dependencies (remove-if-not 'ql-dist:find-system raw-dependencies))
      (deps (mapcar (lambda (x) (list :name x)) dependencies))
      (name (string-downcase (format nil "~a" system)))
@@ -75,6 +75,7 @@
     :url url
     :md5 file-md5
     :name name
+    :testname (gethash name testnames)
     :filename (escape-filename name)
     :deps deps
     :dependencies dependencies
@@ -110,6 +111,7 @@
       finally (return res))))
 
 (defun ql-to-nix (target-directory)
+  (load (format nil "~a/quicklisp-to-nix-overrides.lisp" target-directory))
   (let*
     ((systems
        (cl-ppcre:split

From f9cb8775b3ef6706bbdc232d7844645ca96bf08f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 30 Mar 2017 22:47:42 +0200
Subject: [PATCH 0458/1744] linux_4_9: 4.9.18 -> 4.9.19

---
 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 586627c5925..54358a06491 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.18";
+  version = "4.9.19";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1lb18b29ykia9v2ryj1w6chwh19hmv6ynfjhl9p66rsnm09fl3m1";
+    sha256 = "004qj678i7y951b48yb199hh0kjwicj784c6sbkyvy2y3162fykg";
   };
 
   kernelPatches = args.kernelPatches;

From 163668f6c4ca3db6690eeaba54afc1e755833b4e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 19:14:56 +0200
Subject: [PATCH 0459/1744] Release Notes 17.03: update on master

---
 nixos/doc/manual/release-notes/rl-1703.xml | 227 +++++++++++++++++++--
 1 file changed, 205 insertions(+), 22 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index e0c7d0c25e2..8bee9e63bb7 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -4,7 +4,15 @@
          version="5.0"
          xml:id="sec-release-17.03">
 
-<title>Release 17.03 (“XXX”, 2017/03/??)</title>
+<title>Release 17.03 (“Gorilla”, 2017/03/31)</title>
+
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-17.03-highlights">
+
+<title>Highlights</title>
 
 <para>In addition to numerous new and upgraded packages, this release
 has the following highlights: </para>
@@ -16,19 +24,40 @@ has the following highlights: </para>
     manual</link> for more information.</para>
   </listitem>
 
+  <listitem>
+    <para>This release is based on Glibc 2.25, GCC 5.4.0 and systemd
+    232. The default Linux kernel is 4.9 and Nix is at 1.11.8.</para>
+  </listitem>
+
+  <listitem>
+    <para>The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed</para>
+  </listitem>
+
   <listitem>
     <para>The setuid wrapper functionality now supports setting
     capabilities.</para>
   </listitem>
 
   <listitem>
-    <para>X.org server uses branch 1.19.  Due to ABI incompatibilities,
+    <para>X.org server uses branch 1.19. Due to ABI incompatibilities,
       <literal>ati_unfree</literal> keeps forcing 1.17
       and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
   </listitem>
 
   <listitem>
-    <para>PHP now defaults to PHP 7.1</para>
+    <para>
+      Cross compilation has been rewritten. See the nixpkgs manual for
+      details. The most obvious breaking change is that in derivations there is no
+      <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
+      cross by default, not native.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>The <literal>overridePackages</literal> function has been rewritten
+    to be replaced by <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
+    overlays</link></para>
   </listitem>
 
   <listitem>
@@ -38,16 +67,123 @@ has the following highlights: </para>
     manual</link> for more information.</para>
   </listitem>
 
+  <listitem>
+    <para>PHP now defaults to PHP 7.1</para>
+  </listitem>
+
+  <listitem>
+    <para>
+      The user handling now keeps track of deallocated UIDs/GIDs. When a user
+      or group is revived, this allows it to be allocated the UID/GID it had before.
+      A consequence is that UIDs and GIDs are no longer reused.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
+</section>
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-17.03-new-services">
+
+<title>New Services</title>
+
 <para>The following new services were added since the last release:</para>
 
 <itemizedlist>
-  <listitem>
-    <para></para>
-  </listitem>
+  <listitem><para><literal>hardware/ckb.nix</literal></para></listitem>
+  <listitem><para><literal>hardware/mcelog.nix</literal></para></listitem>
+  <listitem><para><literal>hardware/usb-wwan.nix</literal></para></listitem>
+  <listitem><para><literal>hardware/video/capture/mwprocapture.nix</literal></para></listitem>
+  <listitem><para><literal>programs/adb.nix</literal></para></listitem>
+  <listitem><para><literal>programs/chromium.nix</literal></para></listitem>
+  <listitem><para><literal>programs/gphoto2.nix</literal></para></listitem>
+  <listitem><para><literal>programs/java.nix</literal></para></listitem>
+  <listitem><para><literal>programs/mtr.nix</literal></para></listitem>
+  <listitem><para><literal>programs/oblogout.nix</literal></para></listitem>
+  <listitem><para><literal>programs/vim.nix</literal></para></listitem>
+  <listitem><para><literal>programs/wireshark.nix</literal></para></listitem>
+  <listitem><para><literal>security/dhparams.nix</literal></para></listitem>
+  <listitem><para><literal>services/audio/ympd.nix</literal></para></listitem>
+  <listitem><para><literal>services/computing/boinc/client.nix</literal></para></listitem>
+  <listitem><para><literal>services/continuous-integration/buildbot/master.nix</literal></para></listitem>
+  <listitem><para><literal>services/continuous-integration/buildbot/worker.nix</literal></para></listitem>
+  <listitem><para><literal>services/continuous-integration/gitlab-runner.nix</literal></para></listitem>
+  <listitem><para><literal>services/databases/riak-cs.nix</literal></para></listitem>
+  <listitem><para><literal>services/databases/stanchion.nix</literal></para></listitem>
+  <listitem><para><literal>services/desktops/gnome3/gnome-terminal-server.nix</literal></para></listitem>
+  <listitem><para><literal>services/editors/infinoted.nix</literal></para></listitem>
+  <listitem><para><literal>services/hardware/illum.nix</literal></para></listitem>
+  <listitem><para><literal>services/hardware/trezord.nix</literal></para></listitem>
+  <listitem><para><literal>services/logging/journalbeat.nix</literal></para></listitem>
+  <listitem><para><literal>services/mail/offlineimap.nix</literal></para></listitem>
+  <listitem><para><literal>services/mail/postgrey.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/couchpotato.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/docker-registry.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/errbot.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/geoip-updater.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/gogs.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/leaps.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/nix-optimise.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/ssm-agent.nix</literal></para></listitem>
+  <listitem><para><literal>services/misc/sssd.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/arbtt.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/netdata.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/default.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/alertmanager.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/blackbox-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/json-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/nginx-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/node-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/snmp-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/unifi-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/prometheus/varnish-exporter.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/sysstat.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/telegraf.nix</literal></para></listitem>
+  <listitem><para><literal>services/monitoring/vnstat.nix</literal></para></listitem>
+  <listitem><para><literal>services/network-filesystems/cachefilesd.nix</literal></para></listitem>
+  <listitem><para><literal>services/network-filesystems/glusterfs.nix</literal></para></listitem>
+  <listitem><para><literal>services/network-filesystems/ipfs.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/dante.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/dnscrypt-wrapper.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/fakeroute.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/flannel.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/htpdate.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/miredo.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/nftables.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/powerdns.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/pdns-recursor.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/quagga.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/redsocks.nix</literal></para></listitem>
+  <listitem><para><literal>services/networking/wireguard.nix</literal></para></listitem>
+  <listitem><para><literal>services/system/cgmanager.nix</literal></para></listitem>
+  <listitem><para><literal>services/torrent/opentracker.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/atlassian/confluence.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/atlassian/crowd.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/atlassian/jira.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/frab.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/nixbot.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/selfoss.nix</literal></para></listitem>
+  <listitem><para><literal>services/web-apps/quassel-webserver.nix</literal></para></listitem>
+  <listitem><para><literal>services/x11/unclutter-xfixes.nix</literal></para></listitem>
+  <listitem><para><literal>services/x11/urxvtd.nix</literal></para></listitem>
+  <listitem><para><literal>system/boot/systemd-nspawn.nix</literal></para></listitem>
+  <listitem><para><literal>virtualisation/ecs-agent.nix</literal></para></listitem>
+  <listitem><para><literal>virtualisation/lxcfs.nix</literal></para></listitem>
+  <listitem><para><literal>virtualisation/openstack/keystone.nix</literal></para></listitem>
+  <listitem><para><literal>virtualisation/openstack/glance.nix</literal></para></listitem>
 </itemizedlist>
 
+</section>
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-17.03-incompatibilities">
+
+<title>Backward Incompatibilities</title>
 
 <para>When upgrading from a previous release, please be aware of the
 following incompatible changes:</para>
@@ -55,10 +191,8 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
-      Cross compilation has been rewritten. See the nixpkgs manual for
-      details. The most obvious breaking change is that derivations absent a
-      <literal>.nativeDrv</literal> or <literal>.crossDrv</literal> are now
-      cross by default, not native.
+      Derivations have no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> 
+      and are now cross by default, not native.
     </para>
   </listitem>
 
@@ -174,7 +308,7 @@ following incompatible changes:</para>
     <para><literal>overridePackages</literal> function no longer exists.
     It is replaced by <link
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
-    overlays</link>.  For example, the following code:
+    overlays</link>. For example, the following code:
 
 <programlisting>
   let
@@ -250,18 +384,38 @@ following incompatible changes:</para>
   <listitem>
     <para>
       The dnscrypt-proxy module interface has been streamlined around the
-      <option>extraArgs</option> option.  Where possible, legacy option
+      <option>extraArgs</option> option. Where possible, legacy option
       declarations are mapped to <option>extraArgs</option> but will emit
-      warnings.  The <option>resolverList</option> has been outright
+      warnings. The <option>resolverList</option> has been outright
       removed: to use an unlisted resolver, use the
       <option>customResolver</option> option.
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      torbrowser now stores local state under
+      <filename>~/.local/share/tor-browser</filename> by default. Any
+      browser profile data from the old location,
+      <filename>~/.torbrowser4</filename>, must be migrated manually.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      The ihaskell, monetdb, offlineimap and sitecopy services have been removed.
+    </para>
+  </listitem>
 </itemizedlist>
 
+</section>
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-17.03-notable-changes">
 
-<para>Other notable changes:</para>
+<title>Other Notable Changes</title>
 
 <itemizedlist>
 
@@ -287,7 +441,11 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
-    <para>The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set.</para>
+    <para>
+      The Python 2.7 interpreter does not use modules anymore. Instead, all
+      CPython interpreters now include the whole standard library except for `tkinter`,
+      which is available in the Python package set.
+    </para>
   </listitem>
 
   <listitem>
@@ -301,17 +459,23 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
-    <para>The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters.</para>
+    <para>
+      The Python package sets now use a fixed-point combinator and the sets are
+      available as attributes of the interpreters.
+    </para>
   </listitem>
 
   <listitem>
-    <para>The Python function `buildPythonPackage` has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels.</para>
+    <para>
+      The Python function <literal>buildPythonPackage</literal> has been improved and can be
+      used to build from Setuptools source, Flit source, and precompiled Wheels.
+    </para>
   </listitem>
 
   <listitem>
     <para>
       When adding new or updating current Python libraries, the expressions should be put
-      in separate files in <literal>pkgs/development/python-modules</literal> and 
+      in separate files in <literal>pkgs/development/python-modules</literal> and
       called from <literal>python-packages.nix</literal>.
     </para>
   </listitem>
@@ -319,13 +483,32 @@ following incompatible changes:</para>
   <listitem>
     <para>
       The dnscrypt-proxy service supports synchronizing the list of public
-      resolvers without working DNS resolution.  This fixes issues caused by the
-      resolver list becoming outdated.  It also improves the viability of
+      resolvers without working DNS resolution. This fixes issues caused by the
+      resolver list becoming outdated. It also improves the viability of
       DNSCrypt only configurations.
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Containers using bridged networking no longer lose their connection after
+      changes to the host networking.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      ZFS supports pool auto scrubbing.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      The bind DNS utilities (e.g. dig) have been split into their own output and
+      are now also available in <literal>pkgs.dnsutils</literal> and it is no longer
+      necessary to pull in all of <literal>bind</literal> to use them.
+    </para>
+  </listitem>
 </itemizedlist>
-
-
+</section>
 </section>

From 7138b559189defc1426df800ca713d43a9aacbe7 Mon Sep 17 00:00:00 2001
From: "Scott R. Parish" <srparish@gmail.com>
Date: Thu, 30 Mar 2017 14:22:31 -0700
Subject: [PATCH 0460/1744] slock: needs the ability to be install with suid
 privileges

---
 nixos/modules/module-list.nix    |  1 +
 nixos/modules/programs/slock.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/modules/programs/slock.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0035368273c..7730f81cfa7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -89,6 +89,7 @@
   ./programs/nano.nix
   ./programs/oblogout.nix
   ./programs/screen.nix
+  ./programs/slock.nix
   ./programs/shadow.nix
   ./programs/shell.nix
   ./programs/spacefm.nix
diff --git a/nixos/modules/programs/slock.nix b/nixos/modules/programs/slock.nix
new file mode 100644
index 00000000000..0e1281e62cd
--- /dev/null
+++ b/nixos/modules/programs/slock.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.slock;
+
+in
+{
+  options = {
+    programs.slock = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to install slock screen locker with setuid wrapper.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.slock ];
+    security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock";
+  };
+}

From ae696ba3d6ffbd3c5c285363dbd0b0f9db846909 Mon Sep 17 00:00:00 2001
From: pmahoney <pat@polycrystal.org>
Date: Thu, 30 Mar 2017 17:09:42 -0500
Subject: [PATCH 0461/1744] wrk: use packaged openssl, luajit (#24481)

This has the side effect of now building on darwin. Previously, the
vendored luajit would fail to build.
---
 pkgs/tools/networking/wrk/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index c8315d0c3f5..226180196fd 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, perl }:
+{ stdenv, fetchFromGitHub, luajit, openssl, perl }:
 
 stdenv.mkDerivation rec {
   name = "wrk-${version}";
@@ -11,7 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w";
   };
 
-  buildInputs = [ openssl perl ];
+  buildInputs = [ luajit openssl perl ];
+
+  makeFlags = [ "WITH_LUAJIT=${luajit}" "WITH_OPENSSL=${openssl.dev}" "VER=${version}" ];
+
+  preBuild = ''
+    for f in src/*.h; do
+      substituteInPlace $f \
+        --replace "#include <luajit-2.0/" "#include <"
+    done
+  '';
   
   installPhase = ''
     mkdir -p $out/bin
@@ -29,6 +38,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.asl20;
     maintainers = with maintainers; [ ragge ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From d023239bb7ab004f88418eb5c648f656d6a915b5 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 26 Mar 2017 19:16:12 -0500
Subject: [PATCH 0462/1744] hdparm: 9.48 -> 9.51

hdparm: Fixed mandir
---
 pkgs/os-specific/linux/hdparm/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index 538d8d4ab83..ab40099fc2c 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,22 +1,24 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hdparm-9.48";
+  name = "hdparm-9.51";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/${name}.tar.gz";
-    sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf";
+    sha256 = "14ax5lyzhigx58ing7adbfyzisv0fqajbmzphg149rnb3s4xiyhs";
+
   };
 
   preBuild = ''
     makeFlagsArray=(sbindir=$out/sbin manprefix=$out)
-  '';
+    '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to get/set ATA/SATA drive parameters under Linux";
     homepage = http://sourceforge.net/projects/hdparm/;
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.fuuzetsu ];
   };
+
 }

From 5eece284a164e8eba3f9c3b29e78703a1c32cea9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 30 Mar 2017 17:41:55 -0500
Subject: [PATCH 0463/1744] parcellite: 1.1.9 -> 1.2.1

---
 pkgs/tools/misc/parcellite/default.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 9cd8c28c7f0..0865044eac6 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+{ stdenv, fetchFromGitHub, autoreconfHook
+, gtk2, intltool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "parcellite-1.1.9";
+  name = "parcellite-${version}";
+  version = "1.2.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/parcellite/${name}.tar.gz";
-    sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b";
+  src = fetchFromGitHub {
+    owner = "rickyrockrat";
+    repo = "parcellite";
+    rev = version;
+    sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy";
   };
 
-  buildInputs = [ pkgconfig intltool gtk2 ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  buildInputs = [ gtk2 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight GTK+ clipboard manager";
-    homepage = "http://parcellite.sourceforge.net";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/rickyrockrat/parcellite;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }

From 09e4ece6e18dbc7dea92245f36fadb6b0a0cfac2 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 30 Mar 2017 15:58:48 -0400
Subject: [PATCH 0464/1744] latte-dock: init at 0.5.98

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

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
new file mode 100644
index 00000000000..8792a07e3e9
--- /dev/null
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }:
+
+let version = "0.5.98"; in
+
+stdenv.mkDerivation {
+  name = "latte-dock-${version}";
+
+  src = fetchFromGitHub {
+    owner = "psifidotos";
+    repo = "Latte-Dock";
+    rev = version;
+    sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh";
+  };
+
+  buildInputs = [ plasma-framework ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Dock-style app launcher based on Plasma frameworks";
+    homepage = https://github.com/psifidotos/Latte-Dock;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.benley ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c9b87a3afe..c41c5ebff5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17049,6 +17049,8 @@ with pkgs;
 
   redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
 
+  latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
+
   orion = callPackage ../misc/themes/orion {};
 
   albatross = callPackage ../misc/themes/albatross { };

From 6b5193bcd9de2404023b3a0639ea25240263ee31 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 30 Mar 2017 22:12:05 -0400
Subject: [PATCH 0465/1744] linux: 4.4.57 -> 4.4.58

---
 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 c6a220b9c52..dfa5093bedc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.57";
+  version = "4.4.58";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jmjb7pmk8mjy7pyz58a3xs5rx2m7p6kzy4n9mp000b4zqb2kzwj";
+    sha256 = "1kdgd3pbpscpn5fd34m0djw4h69wcab5qnrji63dal2q74fn1pn2";
   };
 
   kernelPatches = args.kernelPatches;

From ecca15288706bfa40d02c4e6ec5f990eca87a3ef Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 30 Mar 2017 22:12:26 -0400
Subject: [PATCH 0466/1744] linux: 4.10.6 -> 4.10.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index 01fa2a8fb63..fb2ddcca5be 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.6";
+  version = "4.10.7";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vjdd0i4k6m8nx5npwz5p3czg61j93wchw5amggrqfaarwy2j6j5";
+    sha256 = "18928ylwwwq37q6znw1r3fbdrw46740v74y0ml03vvpr9mfgqw7x";
   };
 
   kernelPatches = args.kernelPatches;

From 2f73d5f856d2448a4779401d54a64b55ba6f6bae Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 31 Mar 2017 11:49:59 +0800
Subject: [PATCH 0467/1744] libguestfs: add missing libapparmor buildInput

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

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 69bd6702ef5..02e75788d01 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor }:
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt numactl xen
+    SysVirt numactl xen libapparmor
   ];
 
   configureFlags = "--disable-appliance --disable-daemon";

From 560d4152effe9e72e31d8c5366001df7a53b0657 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 31 Mar 2017 03:48:00 +0000
Subject: [PATCH 0468/1744] openvswitch: 2.5.0 -> 2.5.2

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

diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index b1e24884557..9abb20a1c6a 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -7,12 +7,12 @@ with stdenv.lib;
 let
   _kernel = kernel;
 in stdenv.mkDerivation rec {
-  version = "2.5.0";
+  version = "2.5.2";
   name = "openvswitch-${version}";
 
   src = fetchurl {
     url = "http://openvswitch.org/releases/${name}.tar.gz";
-    sha256 = "08bgsqjjn2q5hvxsjqs7n3jir7k7291wlj3blsqhacjhmpxm9nil";
+    sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q";
   };
 
   kernel = optional (_kernel != null) _kernel.dev;

From 0848d1c2e1d36ecf3a78ee14ae8d393c050578e6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 20 Mar 2017 09:24:35 +0100
Subject: [PATCH 0469/1744] gnuapl: 1.6 -> 1.7

See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00007.html
for release announcement.
---
 .../development/interpreters/gnu-apl/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index bfb975f152a..4d38545a44f 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,36 +1,32 @@
 { stdenv, fetchurl, readline, gettext, ncurses }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchurl {
     url = "mirror://gnu/apl/apl-${version}.tar.gz";
-    sha256 = "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay";
+    sha256 = "07xq8ddlmz8psvsmwr23gar108ri0lwmw0n6kpxcv8ypas1f5xlg";
   };
 
   buildInputs = [ readline gettext ncurses ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = optionalString stdenv.isDarwin ''
     substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
   '';
 
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
-    "--disable-dependency-tracking"
-    "--disable-silent-rules"
-  ];
-
   postInstall = ''
     cp -r support-files/ $out/share/doc/
     find $out/share/doc/support-files -name 'Makefile*' -delete
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Free interpreter for the APL programming language";
     homepage    = http://www.gnu.org/software/apl/;
     license     = licenses.gpl3Plus;
     maintainers = [ maintainers.kovirobi ];
-    platforms   = with stdenv.lib.platforms; linux ++ darwin;
+    platforms   = with platforms; linux ++ darwin;
     inherit version;
 
     longDescription = ''

From caade79100ca9df22f7f5592811b05b34bef5cd6 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 30 Mar 2017 20:21:31 +0200
Subject: [PATCH 0470/1744] ponyc: 0.11.4 -> 0.12.2

https://github.com/ponylang/ponyc/issues/1786
---
 pkgs/development/compilers/ponyc/default.nix     | 4 ++--
 pkgs/development/compilers/ponyc/pony-stable.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index a386abec95b..6cd407374db 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.11.4";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0csssmc9dcm2ib9k5qhglnjyrqsmci9b5q0b5cxwvl5z1llib9hg";
+    sha256 = "1gp92fwfq9ic43c525p0idap99jq5fkjbijf0s8bxif3kng7rxbp";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 6e669c97300..9bee8e299c0 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation {
-  name = "pony-stable-unstable-2017-01-03";
+  name = "pony-stable-unstable-2017-03-30";
 
   src = fetchFromGitHub {
     owner = "jemc";
     repo = "pony-stable";
-    rev = "0054b429a54818d187100ed40f5525ec7931b31b";
-    sha256 = "0libx8byzwqjjgxxyiiahiprzzp845xgbk09sx9bzban5cd5j0g5";
+    rev = "39890c7f11f79009630de6b551bd076868f7f5a2";
+    sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc";
   };
 
   buildInputs = [ ponyc ];

From 50f7a7ca2e2c35667591f2c16733bb09f7f786b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 31 Mar 2017 10:41:34 +0200
Subject: [PATCH 0471/1744] rtl8192su-firmware: init at unstable-2016-10-05

---
 nixos/modules/hardware/all-firmware.nix       |  1 +
 .../firmware/rtl8192su-firmware/default.nix   | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index fb8e1ccab66..bc82bfd066c 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -26,6 +26,7 @@ with lib;
       firmwareLinuxNonfree
       intel2200BGFirmware
       rtl8723bs-firmware
+      rtl8192su-firmware
     ];
   };
 
diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
new file mode 100644
index 00000000000..d8d4c37fd88
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub }:
+with stdenv.lib;
+stdenv.mkDerivation {
+  name = "rtl8192su-unstable-2016-10-05";
+
+  src = fetchFromGitHub {
+    owner = "chunkeey";
+    repo = "rtl8192su";
+    rev = "c00112c9a14133290fe30bd3b44e45196994cb1c";
+    sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    for i in rtl8192sfw.bin \
+             rtl8192sufw-ap.bin \
+             rtl8192sufw-apple.bin \
+             rtl8192sufw-windows.bin \
+             rtl8712u-linux-firmware-bad.bin \
+             rtl8712u-most-recent-v2.6.6-bad.bin \
+             rtl8712u-most-recent-v2.6.6-bad.bin \
+             rtl8712u-oldest-but-good.bin;
+    do
+      install -D -pm644 firmwares/$i $out/lib/firmware/rtlwifi/$i
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU";
+    homepage = https://github.com/chunkeey/rtl8192su;
+    license = licenses.unfreeRedistributableFirmware;
+    maintainers = with maintainers; [ mic92 ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a487579e41c..14a6b54c3de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -741,7 +741,7 @@ with pkgs;
   catclock = callPackage ../applications/misc/catclock { };
 
   cde = callPackage ../tools/package-management/cde { };
-  
+
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
 
   cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
@@ -12023,6 +12023,8 @@ with pkgs;
 
   rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
 
+  rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };
+
   rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };
 
   rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { };

From f10fc5a13cbae371ef6e8efb26f25bf8f8c6ca95 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 11:13:29 +0200
Subject: [PATCH 0472/1744] lispPackages.clwrapper: fix array expansion to
 produce no arguments when empty

---
 pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index d7485936941..2e136530cd1 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -61,5 +61,5 @@ eval "$NIX_LISP_PRELAUNCH_HOOK"
 [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
 	$NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \
 	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
-	"${NIX_LISP_FINAL_PARAMETERS[@]}" \
+	${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \
 	"$@"

From 37847f263c71994e981bf1518527eb41936f8abe Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 31 Mar 2017 11:15:17 +0200
Subject: [PATCH 0473/1744] haskellPackages.tailfile-hinotify: Disable test
 suite

---
 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 ef3725fb50f..d84db527951 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -866,4 +866,7 @@ self: super: {
   # strict-io is too cautious with it's deepseq dependency
   # strict-io doesn't have a working bug tracker, the author has been emailed however.
   strict-io = doJailbreak super.strict-io;
+
+  # https://github.com/danidiaz/tailfile-hinotify/issues/2
+  tailfile-hinotify = dontCheck super.tailfile-hinotify;
 }

From 02f58311ec8f2ac376beaf6ef79f3ecad6ac1a15 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 12:06:05 +0200
Subject: [PATCH 0474/1744] lispPackages: migrate to quicklispPackages where
 possible

---
 .../lisp-modules/lisp-packages.nix            | 549 +-----------------
 .../quicklisp-to-nix-output/cl-aa.nix         |  21 +
 .../cl-fuse-meta-fs.nix                       |  21 +
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  21 +
 .../quicklisp-to-nix-output/cl-paths.nix      |  21 +
 .../quicklisp-to-nix-output/cl-smtp.nix       |  21 +
 .../quicklisp-to-nix-output/cl-store.nix      |  21 +
 .../cl-unification.nix                        |  23 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  21 +
 .../quicklisp-to-nix-output/clsql.nix         |  21 +
 .../quicklisp-to-nix-output/clx-truetype.nix  |  21 +
 .../command-line-arguments.nix                |  21 +
 .../quicklisp-to-nix-output/pcall-queue.nix   |  21 +
 .../quicklisp-to-nix-output/pcall.nix         |  21 +
 .../quicklisp-to-nix-output/query-fs.nix      |  21 +
 .../quicklisp-to-nix-output/uffi.nix          |  21 +
 .../quicklisp-to-nix-output/zpb-ttf.nix       |  21 +
 .../quicklisp-to-nix-overrides.nix            |  23 +
 .../lisp-modules/quicklisp-to-nix-systems.txt |   8 +
 .../lisp-modules/quicklisp-to-nix.nix         | 204 ++++++-
 pkgs/top-level/all-packages.nix               |   5 +-
 21 files changed, 555 insertions(+), 572 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 537e754d57a..70234d385a6 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -6,63 +6,11 @@ let lispPackages = rec {
 
   buildLispPackage =  callPackage ./define-package.nix;
 
-  cl-ppcre = buildLispPackage rec {
-    baseName = "cl-ppcre";
-    version = "2.0.4";
-    description = "Regular expression library for Common Lisp";
-    deps = [];
-    src = pkgs.fetchurl {
-      url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz";
-      sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97";
-    };
-  };
-
-  clx = buildLispPackage rec {
-    baseName = "clx";
-    version = "git-20170201";
-    description = "An implementation of the X Window System protocol in Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/sharplispers/clx'';
-      sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m";
-      rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc'';
-      name = "clx-git-checkout-${version}";
-    };
-  };
-
-  iterate = buildLispPackage rec {
-    baseName = "iterate";
-    version = "darcs-2014-11-01";
-    description = "Iteration package for Common Lisp";
-    deps = [];
-    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
-      url = "https://common-lisp.net/project/iterate/darcs/iterate";
-      sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
-      context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
-    overrides = x: {
-      configurePhase="buildPhase(){ true; }";
-    };
-  };
-
-  alexandria = buildLispPackage rec {
-    baseName = "alexandria";
-    version = "git-20131029";
-    description = "A collection of portable public domain utilities";
-    deps = [];
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/alexandria/alexandria.git";
-      sha256 = "1gx642w00cnnkbkcsnzmg1w147r6yvc0ayns7ha4k0qcvfnb1zvs";
-      rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb'';
-    };
-  };
-
   esrap-peg = buildLispPackage rec {
     baseName = "esrap-peg";
     version = "git-20131029";
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
-    deps = [alexandria cl-unification esrap iterate];
+    deps = with pkgs.quicklispPackages; [alexandria cl-unification esrap iterate];
     src = pkgs.fetchgit {
       url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1";
@@ -70,503 +18,11 @@ let lispPackages = rec {
     };
   };
 
-  cl-unification = buildLispPackage rec {
-    baseName = "cl-unification";
-    version = "git-2015-07-01";
-    description = "";
-    deps = [];
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/cl-unification/cl-unification.git";
-      sha256 = "0b7yik1ma7ciwscald624325dl6265fbq52iwy6jh46nvv085dqk";
-      rev = ''283c94d38d11c806a1fc9db022f0b54dced93bab'';
-    };
-  };
-
-  esrap = buildLispPackage rec {
-    baseName = "esrap";
-    version = "git-20131029";
-    description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp";
-    deps = [alexandria];
-    src = pkgs.fetchgit {
-      url = "https://github.com/scymtym/esrap.git";
-      sha256 = "175jsv309yir0yi03aa2995xg84zjgk34kgnbql5l4vy4as5x665";
-      rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26'';
-    };
-  };
-
-  clx-truetype = buildLispPackage rec {
-    baseName = "clx-truetype";
-    version = "git-20141112";
-    description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension";
-    deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/filonenko-mikhail/clx-truetype'';
-      sha256 = "14wx9s1fd56l25ms2ns1w9a5rxgqr00vgw6jdarfkqk7mfrxxzs1";
-      rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d'';
-    };
-    overrides = x:{
-      configurePhase = "rm Makefile";
-    };
-  };
-
-  cl-fad = buildLispPackage rec {
-    baseName = "cl-fad";
-    version = "v0.7.2";
-    description = "Portable pathname library";
-    deps = [alexandria bordeaux-threads];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/cl-fad'';
-      sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4";
-      rev = ''refs/tags/v0.7.2'';
-    };
-  };
-
-  bordeaux-threads = buildLispPackage rec {
-    baseName = "bordeaux-threads";
-    version = "0.8.3";
-    description = "Bordeaux Threads makes writing portable multi-threaded apps simple";
-    deps = [alexandria];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz'';
-      sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy";
-    };
-  };
-
-  zpb-ttf = buildLispPackage rec {
-    baseName = "zpb-ttf";
-    version = "release-1.0.3";
-    description = "Access TrueType font metrics and outlines from Common Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/xach/zpb-ttf'';
-      sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2";
-      rev = ''refs/tags/release-1.0.3'';
-    };
-  };
-
-  cl-store = buildLispPackage rec {
-    baseName = "cl-store";
-    version = "git-20141112";
-    description = "Serialization package";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/skypher/cl-store'';
-      sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472";
-      rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab'';
-    };
-  };
-
-  cl-vectors = buildLispPackage rec {
-    baseName = "cl-vectors";
-    version = "git-20141112";
-    description = "cl-paths: vectorial paths manipulation";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fjolliton/cl-vectors'';
-      sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7";
-      rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29'';
-    };
-  };
-
-  trivial-features = buildLispPackage rec {
-    baseName = "trivial-features";
-    version = "git-20141112";
-    description = "Ensures consistent *FEATURES* across multiple CLs";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-features/trivial-features'';
-      sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc";
-      rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9'';
-    };
-  };
-
-  clsql = buildLispPackage rec {
-    baseName = "clsql";
-    version = "git-20150514";
-    description = "Common Lisp SQL Interface library";
-    deps = [uffi];
-    buildInputs = [pkgs.mysql.client pkgs.zlib];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url =
-        #''http://git.kpe.io/clsql.git''
-	"http://repo.or.cz/r/clsql.git"
-	;
-      sha256 = "073rh2zxwkcd417qfcflv14j273d1j174slsbzidxvy4zgq5r3n6";
-      rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89'';
-    };
-    overrides = x:{
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
-      '';
-    };
-  };
-
-  uffi = buildLispPackage rec {
-    baseName = "uffi";
-    version = "git-20141112";
-    description = "Universal Foreign Function Library for Common Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/uffi.git'';
-      sha256 = "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry";
-      rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b'';
-    };
-  };
-
-  query-fs = buildLispPackage rec {
-    baseName = "query-fs";
-    version = "git-20150523";
-    description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
-    deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/query-fs'';
-      sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6";
-      rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2'';
-    };
-    overrides = x: {
-      linkedSystems = [];
-      postInstall = ''
-        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
-	export HOME=$PWD
-	build-with-lisp.sh sbcl \
-	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
-	  "$out/bin/query-fs" \
-	  "(query-fs:run-fs-with-cmdline-args)"
-      '';
-    };
-  };
-
-  cl-fuse = buildLispPackage rec {
-    baseName = "cl-fuse";
-    version = "git-20141113";
-    description = "CFFI bindings to FUSE (Filesystem in user space)";
-    deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/cl-fuse'';
-      sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99";
-      rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3'';
-    };
-    propagatedBuildInputs = [pkgs.fuse];
-    overrides = x : {
-      configurePhase = ''
-        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
-        export makeFlags="$makeFlags LISP=common-lisp.sh"
-      '';
-    };
-  };
-
-  cffi = buildLispPackage rec {
-    baseName = "cffi";
-    version = "0.14.0";
-    description = "The Common Foreign Function Interface";
-    deps = [alexandria babel trivial-features];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz'';
-      sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw";
-    };
-  };
-
-  babel = buildLispPackage rec {
-    baseName = "babel";
-    version = "git-20141113";
-    description = "A charset conversion library";
-    deps = [alexandria trivial-features];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/cl-babel/babel'';
-      sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc";
-      rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab'';
-    };
-  };
-
-  cl-utilities = buildLispPackage rec {
-    baseName = "cl-utilities";
-    version = "1.2.4";
-    description = "A collection of Common Lisp utility functions";
-    deps = [];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz'';
-      sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
-    };
-  };
-
-  trivial-utf-8 = buildLispPackage rec {
-    baseName = "trivial-utf-8";
-    version = "2011-09-08";
-    description = "A UTF-8 encoding library";
-    deps = [];
-    # Source type: darcs
-    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
-      url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/'';
-      sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1";
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
-  };
-
-  cl-fuse-meta-fs = buildLispPackage rec {
-    baseName = "cl-fuse-meta-fs";
-    version = "git-20150523";
-    description = "CFFI bindings to FUSE (Filesystem in user space)";
-    deps = [bordeaux-threads cl-fuse iterate pcall];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/cl-fuse-meta-fs'';
-      sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9";
-      rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03'';
-    };
-  };
-
-  pcall = buildLispPackage rec {
-    baseName = "pcall";
-    version = "0.3";
-    description = "Common Lisp library intended to simplify 'result-oriented' parallelism";
-    deps = [bordeaux-threads];
-    # Source type: http
-    src = pkgs.fetchgit {
-      url = ''https://github.com/marijnh/pcall'';
-      sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
-      rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578";
-    };
-  };
-
-  command-line-arguments = buildLispPackage rec {
-    baseName = "command-line-arguments";
-    version = "git-20151120";
-    description = "Small library to deal with command-line arguments";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git'';
-      sha256 = "0qx33j0bq8dshiyyv8rjwd0zvhqhqx5gby6xrghfy8ylcwf11r5j";
-      rev = ''003bdbc05e2816e43293530f58efb529e9e89a20'';
-    };
-  };
-
-  trivial-backtrace = buildLispPackage rec {
-    baseName = "trivial-backtrace";
-    version = "git-2014-11-01";
-    description = "trivial-backtrace";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git'';
-      sha256 = "0bclk05lqijpp72yfzrz0wmw142z0mwnpfl4gqv6gl4fpz1qr56s";
-      rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9'';
-    };
-  };
-
-  drakma = buildLispPackage rec {
-    baseName = "drakma";
-    version = "v1.3.10";
-    description = "Full-featured http/https client based on usocket";
-    deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/drakma'';
-      sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a";
-      rev = ''refs/tags/v1.3.10'';
-    };
-  };
-
-  chipz = buildLispPackage rec {
-    baseName = "chipz";
-    version = "git-20141113";
-    description = "A library for decompressing deflate, zlib, and gzip data";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/froydnj/chipz'';
-      sha256 = "0963nyg8173q0svqhk0ggbvfr4i57jk3swkf0r87jh3yi2l983sl";
-      rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2'';
-    };
-  };
-
-  chunga = buildLispPackage rec {
-    baseName = "chunga";
-    version = "v1.1.5";
-    description = "Portable chunked streams";
-    deps = [trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/chunga'';
-      sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446";
-      rev = ''refs/tags/v1.1.5'';
-    };
-  };
-
-  trivial-gray-streams = buildLispPackage rec {
-    baseName = "trivial-gray-streams";
-    version = "git-20141113";
-    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-gray-streams/trivial-gray-streams'';
-      sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954";
-      rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb'';
-    };
-  };
-
-  cl-ssl = buildLispPackage rec {
-    baseName = "cl+ssl";
-    version = "git-20141113";
-    description = "Common Lisp interface to OpenSSL";
-    deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/cl-plus-ssl/cl-plus-ssl'';
-      sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040";
-      rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2'';
-    };
-    propagatedBuildInputs = [pkgs.openssl];
-  };
-
-  flexi-streams = buildLispPackage rec {
-    baseName = "flexi-streams";
-    version = "v1.0.13";
-    description = "Flexible bivalent streams for Common Lisp";
-    deps = [trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/flexi-streams'';
-      sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab";
-      rev = ''refs/tags/v1.0.13'';
-    };
-  };
-
-  trivial-garbage = buildLispPackage rec {
-    baseName = "trivial-garbage";
-    version = "git-20141113";
-    description = "Portable finalizers, weak hash-tables and weak pointers";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-garbage/trivial-garbage'';
-      sha256 = "0r029lfl5srmhanmmh7bb692pdwb32cnbq2navx6cm3iqda9q87i";
-      rev = ''2721d36d71748d9736a82fe5afe333c52bae3084'';
-    };
-  };
-
-  cl-base64 = buildLispPackage rec {
-    baseName = "cl-base64";
-    version = "git-20141113";
-    description = "Base64 encoding and decoding with URI support";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/cl-base64.git'';
-      sha256 = "0cq3dxac3l0z2xp3c3gkgj893hvaz4vvxdz0nsc8c9q28q3nwf4p";
-      rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13'';
-    };
-  };
-
-  puri = buildLispPackage rec {
-    baseName = "puri";
-    version = "git-20141113";
-    description = "Portable Universal Resource Indentifier Library";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/puri.git'';
-      sha256 = "1l7d8i9615kyi7n69l07a6ri0d1k13cya0kbg3fmfqanwn5kzv2i";
-      rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f'';
-    };
-  };
-
-  usocket = buildLispPackage rec {
-    baseName = "usocket";
-    version = "0.6.1";
-    description = "Universal socket library for Common Lisp";
-    deps = [];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz'';
-      sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a";
-    };
-  };
-
-  cl-html-parse = buildLispPackage rec {
-    baseName = "cl-html-parse";
-    version = "git-20141113";
-    description = "HTML Parser";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/gwkkwg/cl-html-parse'';
-      sha256 = "0s8jjn3s55m59nihc8qiw2s71gn09sxsaii343rzfwdrkdwk9vzh";
-      rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579'';
-    };
-  };
-
-  nibbles = buildLispPackage rec {
-    baseName = "nibbles";
-    version = "git-20141116";
-    description = "A library for accessing octet-addressed blocks of data";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/froydnj/nibbles'';
-      sha256 = "0p0swss7xjx74sr95wqak5hfhfw13bwkzncy4l4hbfy130gncv8b";
-      rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2'';
-    };
-  };
-
-  ironclad = buildLispPackage rec {
-    baseName = "ironclad";
-    version = "0.33.0";
-    description = "A cryptographic toolkit written in pure Common Lisp";
-    deps = [nibbles];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz'';
-      sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7";
-    };
-  };
-
-  cl-smtp = buildLispPackage rec {
-    baseName = "cl-smtp";
-    version = "git-2015-07-01";
-    description = "SMTP client library";
-    deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/cl-smtp/cl-smtp.git";
-      sha256 = "0kvb34jzb3hgvzqlwwwmnyaqj0ghlgmi1x2zll5qw5089gbhfv10";
-      rev = ''2bf946c1d561c0085dba6d6337e3e53d9711a5d2'';
-    };
-  };
-
-  md5 = buildLispPackage rec {
-    baseName = "md5";
-    version = "git-20150415";
-    description = "The MD5 Message-Digest Algorithm RFC 1321";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/pmai/md5'';
-      sha256 = "18k6k04cqx9zx0q8x3hk5icvjhihra1za7k2jx82xb19jfnjli1y";
-      rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6'';
-    };
-  };
-
   clx-xkeyboard = buildLispPackage rec {
     baseName = "clx-xkeyboard";
     version = "git-20150523";
     description = "CLX support for X Keyboard extensions";
-    deps = [clx];
+    deps = with pkgs.quicklispPackages; [clx];
     # Source type: git
     src = pkgs.fetchgit {
       url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
@@ -601,6 +57,5 @@ let lispPackages = rec {
       '';
     };
   };
-
 };
 in lispPackages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
new file mode 100644
index 00000000000..0606f887821
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-aa'';
+  version = ''cl-vectors-20150407-git'';
+
+  description = ''cl-aa: polygon rasterizer'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-aa)"' "$out/bin/cl-aa-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
new file mode 100644
index 00000000000..e0722a8a7bb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-fuse-meta-fs'';
+  version = ''20150608-git'';
+
+  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+
+  deps = [ args."bordeaux-threads" args."cl-fuse" args."iterate" args."pcall" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
+    sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fuse-meta-fs)"' "$out/bin/cl-fuse-meta-fs-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
new file mode 100644
index 00000000000..e26f205c4f4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-paths-ttf'';
+  version = ''cl-vectors-20150407-git'';
+
+  description = ''cl-paths-ttf: vectorial paths manipulation'';
+
+  deps = [ args."cl-paths" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths-ttf)"' "$out/bin/cl-paths-ttf-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
new file mode 100644
index 00000000000..836b523f556
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-paths'';
+  version = ''cl-vectors-20150407-git'';
+
+  description = ''cl-paths: vectorial paths manipulation'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths)"' "$out/bin/cl-paths-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
new file mode 100644
index 00000000000..fff81d9411f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-smtp'';
+  version = ''20160825-git'';
+
+  description = ''Common Lisp smtp client.'';
+
+  deps = [ args."cl+ssl" args."cl-base64" args."flexi-streams" args."trivial-gray-streams" args."usocket" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
+    sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-smtp)"' "$out/bin/cl-smtp-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
new file mode 100644
index 00000000000..79a841314f7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-store'';
+  version = ''20160531-git'';
+
+  description = ''Serialization package'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
+    sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-store)"' "$out/bin/cl-store-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
new file mode 100644
index 00000000000..88ca12f7bfb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -0,0 +1,23 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-unification'';
+  version = ''20170124-git'';
+
+  description = ''The CL-UNIFICATION system.
+
+The system contains the definitions for the 'unification' machinery.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
+    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-unification)"' "$out/bin/cl-unification-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
new file mode 100644
index 00000000000..5b399bfc9ee
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-vectors'';
+  version = ''20150407-git'';
+
+  description = ''cl-paths: vectorial paths manipulation'';
+
+  deps = [ args."cl-aa" args."cl-paths" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-vectors)"' "$out/bin/cl-vectors-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
new file mode 100644
index 00000000000..4bb11260f2b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clsql'';
+  version = ''20160208-git'';
+
+  description = ''Common Lisp SQL Interface library'';
+
+  deps = [ args."uffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
+    sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clsql)"' "$out/bin/clsql-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
new file mode 100644
index 00000000000..1c672aaa4be
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clx-truetype'';
+  version = ''20160825-git'';
+
+  description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
+
+  deps = [ args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
+    sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clx-truetype)"' "$out/bin/clx-truetype-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
new file mode 100644
index 00000000000..5cbef72e3dc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''command-line-arguments'';
+  version = ''20151218-git'';
+
+  description = ''small library to deal with command-line arguments'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
+    sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :command-line-arguments)"' "$out/bin/command-line-arguments-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
new file mode 100644
index 00000000000..6e19879b29d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pcall-queue'';
+  version = ''pcall-0.3'';
+
+  description = '''';
+
+  deps = [ args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall-queue)"' "$out/bin/pcall-queue-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
new file mode 100644
index 00000000000..06068e36dfb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pcall'';
+  version = ''0.3'';
+
+  description = '''';
+
+  deps = [ args."bordeaux-threads" args."pcall-queue" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall)"' "$out/bin/pcall-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
new file mode 100644
index 00000000000..8962c687d86
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''query-fs'';
+  version = ''20160531-git'';
+
+  description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
+
+  deps = [ args."bordeaux-threads" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."command-line-arguments" args."iterate" args."trivial-backtrace" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
+    sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :query-fs)"' "$out/bin/query-fs-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
new file mode 100644
index 00000000000..ee860285e7b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uffi'';
+  version = ''20150923-git'';
+
+  description = ''Universal Foreign Function Library for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
+    sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :uffi)"' "$out/bin/uffi-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
new file mode 100644
index 00000000000..896b9bba8a6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''zpb-ttf'';
+  version = ''1.0.3'';
+
+  description = ''Access TrueType font metrics and outlines from Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
+    sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :zpb-ttf)"' "$out/bin/zpb-ttf-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index c073b40b14c..f4ccf19d2d9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -62,4 +62,27 @@ in
     trivial-gray-streams babel
   ]);
   css-lite = addDeps (with qlnp; [parenscript]);
+  clsql = x: {
+    propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];
+    overrides = y: (x.overrides y) // {
+      preConfigure = ((x.overrides y).preConfigure or "") + ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql"
+      '';
+    };
+  };
+  clx-truetype = skipBuildPhase;
+  query-fs = x: {
+    overrides = y: (x.overrides y) // {
+      linkedSystems = [];
+      postInstall = ''
+        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
+	export HOME=$PWD
+	build-with-lisp.sh sbcl \
+	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
+	  "$out/bin/query-fs" \
+	  "(query-fs:run-fs-with-cmdline-args)"
+      '';
+    };
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index a32dd823a7e..581ccf77d99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -11,16 +11,22 @@ cl-async
 cl-base64
 cl-cookie
 cl-fuse
+cl-fuse-meta-fs
 cl-json
 cl-l10n
 closer-mop
 cl-ppcre
 cl-reexport
+cl-smtp
 cl-syntax-annot
 cl-unicode
+cl-unification
 cl-utilities
 cl-who
+clsql
 clx
+clx-truetype
+command-line-arguments
 parenscript
 css-lite
 cxml
@@ -43,9 +49,11 @@ lquery
 marshal
 optima
 parenscript
+pcall
 plump
 proc-parse
 prove
+query-fs
 quri
 salza2
 smart-buffer
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2b9afcf286e..672dda1b096 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -43,14 +43,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-garbage" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-garbage" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
-         inherit fetchurl;
-       }));
-
-
   "cxml-xml" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml-xml" or (x: {}))
@@ -62,6 +54,22 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-paths" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-paths" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-paths.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivial-garbage" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+       }));
+
+
   "cffi-toolchain" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cffi-toolchain" or (x: {}))
@@ -138,6 +146,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pcall-queue" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pcall-queue" or (x: {}))
+       (import ./quicklisp-to-nix-output/pcall-queue.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
   "form-fiddle" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."form-fiddle" or (x: {}))
@@ -248,20 +265,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl+ssl" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl+ssl" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl+ssl.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
   "chunga" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."chunga" or (x: {}))
@@ -308,6 +311,58 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "zpb-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."zpb-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-vectors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-vectors" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-vectors.nix {
+         inherit fetchurl;
+           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
+       }));
+
+
+  "cl-store" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-store" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-store.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-paths-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-paths-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
+         inherit fetchurl;
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
+  "cl-aa" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-aa" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-aa.nix {
+         inherit fetchurl;
+       }));
+
+
+  "uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/uffi.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-annot" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-annot" or (x: {}))
@@ -317,6 +372,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl+ssl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl+ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl+ssl.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "metabang-bind" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."metabang-bind" or (x: {}))
@@ -633,6 +702,21 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "query-fs" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."query-fs" or (x: {}))
+       (import ./quicklisp-to-nix-output/query-fs.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
+           "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+       }));
+
+
   "prove" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."prove" or (x: {}))
@@ -667,6 +751,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pcall" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pcall" or (x: {}))
+       (import ./quicklisp-to-nix-output/pcall.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
+       }));
+
+
   "optima" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."optima" or (x: {}))
@@ -894,6 +988,30 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "command-line-arguments" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."command-line-arguments" or (x: {}))
+       (import ./quicklisp-to-nix-output/command-line-arguments.nix {
+         inherit fetchurl;
+       }));
+
+
+  "clx-truetype" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clx-truetype" or (x: {}))
+       (import ./quicklisp-to-nix-output/clx-truetype.nix {
+         inherit fetchurl;
+           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf";
+           "cl-store" = quicklisp-to-nix-packages."cl-store";
+           "cl-vectors" = quicklisp-to-nix-packages."cl-vectors";
+           "clx" = quicklisp-to-nix-packages."clx";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "clx" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clx" or (x: {}))
@@ -902,6 +1020,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clsql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql.nix {
+         inherit fetchurl;
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
   "cl-who" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-who" or (x: {}))
@@ -918,6 +1045,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-unification" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-unification" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-unification.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-unicode" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-unicode" or (x: {}))
@@ -936,6 +1071,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-smtp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-smtp" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-smtp.nix {
+         inherit fetchurl;
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "cl-reexport" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-reexport" or (x: {}))
@@ -987,6 +1135,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-fuse-meta-fs" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-fuse-meta-fs" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-fuse-meta-fs.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "pcall" = quicklisp-to-nix-packages."pcall";
+       }));
+
+
   "cl-fuse" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-fuse" or (x: {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42de4fd80e1..6e6471ca83a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10390,9 +10390,8 @@ with pkgs;
     inherit clwrapper;
   };
 
-  lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
-  lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
-  lispPackages = recurseIntoAttrs lispPackagesSBCL;
+  lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 //
+    lispPackagesFor (wrapLisp sbcl));
 
   quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
     inherit clwrapper;

From e0f6bd6cfb4c5da3e9bce8c7280f743f721b109e Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Fri, 31 Mar 2017 13:15:31 +0100
Subject: [PATCH 0475/1744] ibus-table: 1.9.14 -> 1.9.16

---
 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 8900ebc120c..8c842dbc841 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.14";
+  version = "1.9.16";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw";
+    sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb";
   };
 
   postPatch = ''

From 00689b20a8a1c9c6c24891c46669b0e6b0f7d68c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 31 Mar 2017 13:49:14 +0200
Subject: [PATCH 0476/1744] emby: 3.2.8 -> 3.2.10

---
 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 780baa018a7..9e0de290143 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.8";
+  version = "3.2.10";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0jscbaznacp44cz9mjswd3fkyf2y9cx78mqm2dkf26rnfmwbx7vq";
+    sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25";
   };
 
   buildInputs = with pkgs; [

From e241fb87a1ab6df11980f8c321cd26a901975d3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 31 Mar 2017 15:00:30 +0200
Subject: [PATCH 0477/1744] Update 17.03 release notes

---
 nixos/doc/manual/release-notes/rl-1703.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 8bee9e63bb7..639b23b229b 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -71,14 +71,6 @@ has the following highlights: </para>
     <para>PHP now defaults to PHP 7.1</para>
   </listitem>
 
-  <listitem>
-    <para>
-      The user handling now keeps track of deallocated UIDs/GIDs. When a user
-      or group is revived, this allows it to be allocated the UID/GID it had before.
-      A consequence is that UIDs and GIDs are no longer reused.
-    </para>
-  </listitem>
-
 </itemizedlist>
 
 </section>
@@ -353,7 +345,7 @@ following incompatible changes:</para>
   <listitem>
     <para>
     Iputils no longer provide ping6 and traceroute6. The functionality of
-    these tools have been integrated into ping and traceroute respectively. To
+    these tools has been integrated into ping and traceroute respectively. To
     enforce an address family the new flags <literal>-4</literal> and
     <literal>-6</literal> have been added. One notable incompatibility is that
     specifying an interface (for link-local IPv6 for instance) is no longer done

From 501429d120f93775d4460aaf6ea8e50fa3429378 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 31 Mar 2017 09:14:19 -0400
Subject: [PATCH 0478/1744] linux: 4.9.19 -> 4.9.20

---
 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 54358a06491..e8facc96ebc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.19";
+  version = "4.9.20";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "004qj678i7y951b48yb199hh0kjwicj784c6sbkyvy2y3162fykg";
+    sha256 = "0h8km3z5c3qyhwq24dvh00j2jzfcyqdjjcjrrz5qvyrjvl30hrj8";
   };
 
   kernelPatches = args.kernelPatches;

From bff456bd55cecb9325beccb70cdd45665701e5f2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 31 Mar 2017 09:16:52 -0400
Subject: [PATCH 0479/1744] linux: 4.10.7 -> 4.10.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index fb2ddcca5be..a4fa8f65c39 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.7";
+  version = "4.10.8";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18928ylwwwq37q6znw1r3fbdrw46740v74y0ml03vvpr9mfgqw7x";
+    sha256 = "12wf3nzhs0hbl87ckwc15b492z50lg4c7rxwqw50px3zhh5mvf8a";
   };
 
   kernelPatches = args.kernelPatches;

From cb791371c542ff2018916b84dccd43c7c7afd302 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 31 Mar 2017 09:19:07 -0400
Subject: [PATCH 0480/1744] linux: 4.4.58 -> 4.4.59

---
 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 dfa5093bedc..da633753e70 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.58";
+  version = "4.4.59";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1kdgd3pbpscpn5fd34m0djw4h69wcab5qnrji63dal2q74fn1pn2";
+    sha256 = "1jlnm6msxdhm7l6all91rd1rkqsqpd0rblbdl68z7nkz9hy55sb4";
   };
 
   kernelPatches = args.kernelPatches;

From e872abe872a1c6b888ecdc9b3265a7c5c1b568a8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 31 Mar 2017 09:22:00 -0400
Subject: [PATCH 0481/1744] oh-my-zsh: 2017-02-27 -> 2017-03-30

---
 pkgs/shells/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 25dec429ff0..ea1aa6ed26c 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2017-02-27";
+  version = "2017-03-30";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "b908feebcfb0ca8a9a80360d177e716c24c317d6";
-    sha256 = "0b7gir2llv5212nwh9arzva2p714s39qzgk385s9pmalhspfc6c1";
+    rev = "66bae5a5deb7a053adfb05b38a93fe47295841eb";
+    sha256 = "0rlk39shfh1mamif67smcw6wsc7p1kw64cvk9z3nvlysv6w02q1f";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From cbd6fb1b3a665ecbf79332a45319d6d1873838dd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 31 Mar 2017 15:49:53 +0200
Subject: [PATCH 0482/1744] Release Notes: tracking UIDs/GIDs is in 17.09

---
 nixos/doc/manual/release-notes/rl-1709.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 66b88eab09b..bd999b60013 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -11,7 +11,11 @@ has the following highlights: </para>
 
 <itemizedlist>
   <listitem>
-    <para></para>
+    <para>
+      The user handling now keeps track of deallocated UIDs/GIDs. When a user
+      or group is revived, this allows it to be allocated the UID/GID it had before.
+      A consequence is that UIDs and GIDs are no longer reused.
+    </para>
   </listitem>
 
 </itemizedlist>

From 4e79b0b0751e84c845da8ed4062a501a48335dc1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 31 Mar 2017 16:05:35 +0200
Subject: [PATCH 0483/1744] Revert "sshd: separate key generation into another
 service"

This reverts commit 1a74eedd074fac69d12cecb767dc207a4bfea1bb. It
breaks NixOps, which expects that

  rm -f /etc/ssh/ssh_host_ed25519_key*
  systemctl restart sshd
  cat /etc/ssh/ssh_host_ed25519_key.pub

works.
---
 .../modules/services/networking/ssh/sshd.nix  | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 80659f19c59..7e43ab98674 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -240,7 +240,7 @@ in
 
     systemd =
       let
-        sshd-service =
+        service =
           { description = "SSH Daemon";
 
             wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
@@ -251,8 +251,16 @@ in
 
             environment.LD_LIBRARY_PATH = nssModulesPath;
 
-            wants = [ "sshd-keygen.service" ];
-            after = [ "sshd-keygen.service" ];
+            preStart =
+              ''
+                mkdir -m 0755 -p /etc/ssh
+
+                ${flip concatMapStrings cfg.hostKeys (k: ''
+                  if ! [ -f "${k.path}" ]; then
+                      ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
+                  fi
+                '')}
+              '';
 
             serviceConfig =
               { ExecStart =
@@ -267,26 +275,6 @@ in
                 Type = "simple";
               });
           };
-
-        sshd-keygen-service =
-          { description = "SSH Host Key Generation";
-            path = [ cfgc.package ];
-            script =
-            ''
-              mkdir -m 0755 -p /etc/ssh
-              ${flip concatMapStrings cfg.hostKeys (k: ''
-                if ! [ -f "${k.path}" ]; then
-                  ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
-                fi
-              '')}
-            '';
-
-            serviceConfig = {
-              Type = "oneshot";
-              RemainAfterExit = "yes";
-            };
-          };
-
       in
 
       if cfg.startWhenNeeded then {
@@ -298,13 +286,11 @@ in
             socketConfig.Accept = true;
           };
 
-        services.sshd-keygen = sshd-keygen-service;
-        services."sshd@" = sshd-service;
+        services."sshd@" = service;
 
       } else {
 
-        services.sshd-keygen = sshd-keygen-service;
-        services.sshd = sshd-service;
+        services.sshd = service;
 
       };
 

From 80b40fdf03411a26c0340f28636fe9b5e0afc73b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 31 Mar 2017 16:16:27 +0200
Subject: [PATCH 0484/1744] sshd.nix: Alternative fix for #19589

AFAICT, this issue only occurs when sshd is socket-activated. It turns
out that the preStart script's stdout and stderr are connected to the
socket, not just the main command's. So explicitly connect stderr to
the journal and redirect stdout to stderr.
---
 nixos/modules/services/networking/ssh/sshd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 7e43ab98674..42b50d0426a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -253,6 +253,10 @@ in
 
             preStart =
               ''
+                # Make sure we don't write to stdout, since in case of
+                # socket activation, it goes to the remote side (#19589).
+                exec >&2
+
                 mkdir -m 0755 -p /etc/ssh
 
                 ${flip concatMapStrings cfg.hostKeys (k: ''
@@ -270,6 +274,7 @@ in
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {
                 StandardInput = "socket";
+                StandardError = "journal";
               } else {
                 Restart = "always";
                 Type = "simple";

From c923c6c7c5ca947ed27f95749885b9f7871e9a0f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 31 Mar 2017 05:51:43 -0700
Subject: [PATCH 0485/1744] webkitgtk24x: Fix build on darwin

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

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 33f8fa64a0f..603df0407ea 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
     "--disable-x11-target"
     "--enable-quartz-target"
     "--disable-web-audio"
+    "CFLAGS=-DJSC_OBJC_API_ENABLED=0"
+    "CXXFLAGS=-DJSC_OBJC_API_ENABLED=0"
   ] ++ optionals (!enableCredentialStorage) [
     "--disable-credential-storage"
   ];

From 1afd3ceaaab5d11e17f47a473c6e6642aa074f18 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 31 Mar 2017 12:19:22 +0100
Subject: [PATCH 0486/1744] terraform: 0.9.1 -> 0.9.2

* makes the generic builder open for extension
* upgrades terraform and set the 0_9 series by default
---
 .../networking/cluster/terraform/default.nix  | 82 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ab0771656b5..42a8465bf8a 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,43 +1,44 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }:
 
 let
-  generic = { version, sha256 }:
-  buildGoPackage rec {
-    name = "terraform-${version}";
+  goPackagePath = "github.com/hashicorp/terraform";
 
-    goPackagePath = "github.com/hashicorp/terraform";
+  generic = { version, sha256, ... }@attrs:
+    let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+    buildGoPackage ({
+      name = "terraform-${version}";
 
-    src = fetchFromGitHub {
-      owner  = "hashicorp";
-      repo   = "terraform";
-      rev    = "v${version}";
-      inherit sha256;
-    };
+      inherit goPackagePath;
 
-    postInstall = ''
-      # remove all plugins, they are part of the main binary now
-      for i in $bin/bin/*; do
-        if [[ $(basename $i) != terraform ]]; then
-          rm "$i"
-        fi
-      done
-    '';
+      src = fetchFromGitHub {
+        owner  = "hashicorp";
+        repo   = "terraform";
+        rev    = "v${version}";
+        inherit sha256;
+      };
 
-    preCheck = ''
-      export HOME=$TMP
-    '';
+      postInstall = ''
+        # remove all plugins, they are part of the main binary now
+        for i in $bin/bin/*; do
+          if [[ $(basename $i) != terraform ]]; then
+            rm "$i"
+          fi
+        done
+      '';
 
-    doCheck = builtins.compareVersions version "0.9.0" >= 0;
+      preCheck = ''
+        export HOME=$TMP
+      '';
 
-    meta = with stdenv.lib; {
-      description = "Tool for building, changing, and versioning infrastructure";
-      homepage = https://www.terraform.io/;
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
-    };
-  };
+      meta = with stdenv.lib; {
+        description = "Tool for building, changing, and versioning infrastructure";
+        homepage = https://www.terraform.io/;
+        license = licenses.mpl20;
+        maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
+      };
+    } // attrs');
 
-in rec {
+in {
   terraform_0_8_5 = generic {
     version = "0.8.5";
     sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@@ -48,8 +49,21 @@ in rec {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_1 = generic {
-    version = "0.9.1";
-    sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh";
+  terraform_0_9_2 = generic {
+    version = "0.9.2";
+    sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
+
+    patches = [
+      (fetchurl {
+        url = "https://github.com/hashicorp/terraform/pull/13237.patch";
+        sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x";
+      })
+      (fetchurl {
+        url = "https://github.com/hashicorp/terraform/pull/13248.patch";
+        sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr";
+      })
+    ];
+
+    doCheck = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e6471ca83a..ae7f46acea8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18115,11 +18115,11 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_1;
+    terraform_0_9_2;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_1;
-  terraform = terraform_0_8;
+  terraform_0_9 = terraform_0_9_2;
+  terraform = terraform_0_9;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {
     terraform = terraform_0_8;

From 011c907383128d3f6596fa3890c807da6568a22f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 17:52:01 +0200
Subject: [PATCH 0487/1744] lispPackages: pin to asdf_3_1 by default

---
 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 6e6471ca83a..e403f303d12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10391,7 +10391,7 @@ with pkgs;
   };
 
   lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 //
-    lispPackagesFor (wrapLisp sbcl));
+    lispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; }));
 
   quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
     inherit clwrapper;

From 739ecca4b55faecc3dba88dbdbf470a214570f9e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 17:56:14 +0200
Subject: [PATCH 0488/1744] esrap-peg: 20131029 -> 20170320

---
 pkgs/development/lisp-modules/lisp-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 70234d385a6..67decd721fb 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -8,13 +8,13 @@ let lispPackages = rec {
 
   esrap-peg = buildLispPackage rec {
     baseName = "esrap-peg";
-    version = "git-20131029";
+    version = "git-20170320";
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
     deps = with pkgs.quicklispPackages; [alexandria cl-unification esrap iterate];
     src = pkgs.fetchgit {
       url = "https://github.com/fb08af68/esrap-peg.git";
-      sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1";
-      rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8'';
+      sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby";
+      rev = ''5a559b0030ecbf5e14cb070b0dc240535faa3402'';
     };
   };
 

From c9d02b7c573774d2ffd2add2192ec92d60a12396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20H=C3=B6ppner?= <till@hoeppner.ws>
Date: Fri, 31 Mar 2017 20:19:55 +0200
Subject: [PATCH 0489/1744] vscode: Fix relocation errors

LD_PRELOAD was inherited by spawned processes, and caused
issues with systems that have older system packages while
using fresh user packages.

Links out the wrapper script instead of electron binary to
expose CLI like on other systems

Breaks anything that relies on vscode not detaching
---
 pkgs/applications/editors/vscode/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 3031fa1cb0c..c4664060214 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -55,7 +55,7 @@ in
       '' else ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
-        ln -s $out/lib/vscode/code $out/bin
+        ln -s $out/lib/vscode/bin/code $out/bin
 
         mkdir -p $out/share/applications
         cp $desktopItem/share/applications/* $out/share/applications
@@ -67,11 +67,8 @@ in
     postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \
+        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1:$out/lib/vscode" \
         $out/lib/vscode/code
-
-      wrapProgram $out/bin/code \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
     '';
 
     meta = with stdenv.lib; {

From 117797367a0f16f62c10eb1f5d83040c58185a1d Mon Sep 17 00:00:00 2001
From: Jordan Woehr <jordanwoehr@gmail.com>
Date: Fri, 31 Mar 2017 12:39:12 -0600
Subject: [PATCH 0490/1744] ghcjs (head): Fix infinite recursion ...

... in hscolour when building packages.
---
 pkgs/development/compilers/ghcjs/head_stage2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
index d4247f51b3e..5808891d430 100644
--- a/pkgs/development/compilers/ghcjs/head_stage2.nix
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -382,6 +382,7 @@
         version = "1.24.0.0";
         src = "${ghcjsBoot}/boot/cabal/Cabal";
         doCheck = false;
+        hyperlinkSource = false;
         libraryHaskellDepends = [
           array base binary bytestring containers deepseq directory filepath
           pretty process time unix

From 7408aca5284cb3bc86bdb8e08990fe604f6b8d9c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 31 Mar 2017 20:51:14 +0200
Subject: [PATCH 0491/1744] Regenerate NPM expressions with node2nix 1.2.0

---
 .../node-packages/composition-v4.nix          |    4 +-
 .../node-packages/composition-v6.nix          |    4 +-
 pkgs/development/node-packages/generate.sh    |    3 +-
 pkgs/development/node-packages/node-env.nix   |  160 +-
 .../node-packages/node-packages-v4.nix        | 6472 ++++++++++-------
 .../node-packages/node-packages-v6.nix        | 4937 +++++++------
 .../web/remarkjs/node-packages.nix            |  810 +--
 pkgs/development/web/remarkjs/nodepkgs.nix    |    4 +-
 pkgs/servers/web-apps/pump.io/composition.nix |    4 +-
 .../web-apps/pump.io/node-packages.nix        |  409 +-
 pkgs/tools/package-management/nixui/nixui.nix |    4 +-
 .../nixui/node-packages.nix                   |    2 +-
 12 files changed, 7194 insertions(+), 5619 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index b78bbda5d5e..8c4a5390f55 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 1c21b47b92c..ea30c5b04c4 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 613293e850b..f5675623c2c 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -2,5 +2,4 @@
 
 rm -f node-env.nix
 node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix
-# node2nix doesn't explicitely support node v6 so far
-node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix
+node2nix -6 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index e8328252a11..356e78f027b 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,60 +57,6 @@ let
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    let
-      fixImpureDependencies = writeTextFile {
-        name = "fixDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var url = require('url');
-
-          /*
-           * Replaces an impure version specification by *
-           */
-          function replaceImpureVersionSpec(versionSpec) {
-              var parsedUrl = url.parse(versionSpec);
-
-              if(versionSpec == "latest" || versionSpec == "unstable" ||
-                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
-                  return '*';
-              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || parsedUrl.protocol == "github:" ||
-                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
-                  return '*';
-              else
-                  return versionSpec;
-          }
-
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Replace dependencies */
-          if(packageObj.dependencies !== undefined) {
-              for(var dependency in packageObj.dependencies) {
-                  var versionSpec = packageObj.dependencies[dependency];
-                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Replace development dependencies */
-          if(packageObj.devDependencies !== undefined) {
-              for(var dependency in packageObj.devDependencies) {
-                  var versionSpec = packageObj.devDependencies[dependency];
-                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Replace optional dependencies */
-          if(packageObj.optionalDependencies !== undefined) {
-              for(var dependency in packageObj.optionalDependencies) {
-                  var versionSpec = packageObj.optionalDependencies[dependency];
-                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Write the fixed JSON file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj));
-        '';
-      };
-    in
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -150,17 +96,97 @@ let
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
 
-      # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
-      # The following JavaScript replaces these by * to prevent that
-      cd "$DIR/${packageName}"
-      node ${fixImpureDependencies}
-
       # Include the dependencies of the package
+      cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
+  pinpointDependencies = {dependencies, production}:
+    let
+      pinpointDependenciesFromPackageJSON = writeTextFile {
+        name = "pinpointDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var path = require('path');
+          
+          function resolveDependencyVersion(location, name) {
+              if(location == process.env['NIX_STORE']) {
+                  return null;
+              } else {
+                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+                  
+                  if(fs.existsSync(dependencyPackageJSON)) {
+                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+                      
+                      if(dependencyPackageObj.name == name) {
+                          return dependencyPackageObj.version;
+                      }
+                  } else {
+                      return resolveDependencyVersion(path.resolve(location, ".."), name);
+                  }
+              }
+          }
+          
+          function replaceDependencies(dependencies) {
+              if(typeof dependencies == "object" && dependencies !== null) {
+                  for(var dependency in dependencies) {
+                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+                      
+                      if(resolvedVersion === null) {
+                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+                      } else {
+                          dependencies[dependency] = resolvedVersion;
+                      }
+                  }
+              }
+          }
+          
+          /* Read the package.json configuration */
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+          
+          /* Pinpoint all dependencies */
+          replaceDependencies(packageObj.dependencies);
+          if(process.argv[2] == "development") {
+              replaceDependencies(packageObj.devDependencies);
+          }
+          replaceDependencies(packageObj.optionalDependencies);
+          
+          /* Write the fixed package.json file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+        '';
+      };
+    in
+    ''
+      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+      
+      ${stdenv.lib.optionalString (dependencies != [])
+        ''
+          if [ -d node_modules ]
+          then
+              cd node_modules
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              cd ..
+          fi
+        ''}
+    '';
+  
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+  
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+    ''
+      if [ -d "${packageName}" ]
+      then
+          cd "${packageName}"
+          ${pinpointDependencies { inherit dependencies production; }}
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      fi
+    '';
+
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
   nodeSources = runCommand "node-sources" {} ''
@@ -183,7 +209,9 @@ let
       buildPhase = args.buildPhase or "true";
 
       compositionScript = composePackage args;
-      passAsFile = [ "compositionScript" ];
+      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+      
+      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
 
       installPhase = args.installPhase or ''
         # Create and enter a root node_modules/ folder
@@ -192,6 +220,10 @@ let
 
         # Compose the package and all its dependencies
         source $compositionScriptPath
+        
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
 
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
@@ -254,12 +286,18 @@ let
         buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
 
         includeScript = includeDependencies { inherit dependencies; };
-        passAsFile = [ "includeScript" ];
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+        
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
 
         buildCommand = ''
           mkdir -p $out/lib
           cd $out/lib
           source $includeScriptPath
+          
+          # Pinpoint the versions of all dependencies to the ones that are actually being used
+          echo "pinpointing versions of dependencies..."
+          source $pinpointDependenciesScriptPath
 
           # Create fake package.json to make the npm commands work properly
           cat > package.json <<EOF
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index af5e09054e2..a9bdefd03a4 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -337,13 +337,13 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "is-buffer-1.1.4" = {
+    "is-buffer-1.1.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
       };
     };
     "path-parse-1.0.5" = {
@@ -418,13 +418,13 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "which-1.2.12" = {
+    "which-1.2.14" = {
       name = "which";
       packageName = "which";
-      version = "1.2.12";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
-        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -436,13 +436,13 @@ let
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
-    "isexe-1.1.2" = {
+    "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
-      version = "1.1.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz";
-        sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
     "amdefine-1.0.1" = {
@@ -517,13 +517,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.2" = {
+    "azure-arm-cdn-1.0.3" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
-        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz";
+        sha1 = "39db281679dcdd33cb6ce032383b192430476412";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -886,6 +886,15 @@ let
         sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
       };
     };
+    "date-utils-1.2.21" = {
+      name = "date-utils";
+      packageName = "date-utils";
+      version = "1.2.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
+        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
+      };
+    };
     "easy-table-0.0.1" = {
       name = "easy-table";
       packageName = "easy-table";
@@ -967,6 +976,15 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
+    "jwt-decode-2.2.0" = {
+      name = "jwt-decode";
+      packageName = "jwt-decode";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
+        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
+      };
+    };
     "kuduscript-1.0.13" = {
       name = "kuduscript";
       packageName = "kuduscript";
@@ -976,22 +994,31 @@ let
         sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
       };
     };
-    "ms-rest-1.15.5" = {
-      name = "ms-rest";
-      packageName = "ms-rest";
-      version = "1.15.5";
+    "moment-2.18.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz";
-        sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d";
+        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
+        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
-    "ms-rest-azure-1.15.5" = {
+    "ms-rest-1.15.7" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "1.15.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
+        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
+      };
+    };
+    "ms-rest-azure-1.15.7" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.5";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz";
-        sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
+        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
     "node-forge-0.6.23" = {
@@ -1183,15 +1210,6 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
-    "date-utils-1.2.21" = {
-      name = "date-utils";
-      packageName = "date-utils";
-      version = "1.2.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
-        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
-      };
-    };
     "jws-3.1.4" = {
       name = "jws";
       packageName = "jws";
@@ -1381,6 +1399,15 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
+    "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";
+      };
+    };
     "readable-stream-2.0.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -1480,13 +1507,13 @@ let
         sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
       };
     };
-    "from-0.1.3" = {
+    "from-0.1.7" = {
       name = "from";
       packageName = "from";
-      version = "0.1.3";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz";
-        sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
       };
     };
     "map-stream-0.1.0" = {
@@ -1912,13 +1939,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.15" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
+        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1930,13 +1957,13 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.2.2" = {
+    "qs-6.2.3" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.2";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz";
-        sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586";
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
+        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
       };
     };
     "stringstream-0.0.5" = {
@@ -1975,13 +2002,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.5" = {
+    "async-2.2.0" = {
       name = "async";
       packageName = "async";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
-        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
+        url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz";
+        sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32";
       };
     };
     "lodash-4.17.4" = {
@@ -2191,22 +2218,31 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.3.1" = {
+    "jsprim-1.4.0" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
-        sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.10.2" = {
+    "sshpk-1.11.0" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.2";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
-        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+        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" = {
@@ -2245,15 +2281,6 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "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";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -2317,13 +2344,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.27.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
+        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
       };
     };
     "punycode-1.4.1" = {
@@ -2416,13 +2443,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.3" = {
+    "readable-stream-2.2.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.3";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz";
-        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
+        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2452,13 +2479,13 @@ let
         sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
       };
     };
-    "qs-6.3.1" = {
+    "qs-6.4.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.3.1";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz";
-        sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d";
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
     "asap-2.0.5" = {
@@ -2857,13 +2884,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "normalize-package-data-2.3.5" = {
+    "normalize-package-data-2.3.6" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
-      version = "2.3.5";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz";
-        sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz";
+        sha1 = "498fa420c96401f787402ba21e600def9f981fff";
       };
     };
     "object-assign-4.1.1" = {
@@ -2938,13 +2965,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.2.0" = {
+    "hosted-git-info-2.4.1" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.2.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
+        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3082,13 +3109,13 @@ let
         sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
       };
     };
-    "error-ex-1.3.0" = {
+    "error-ex-1.3.1" = {
       name = "error-ex";
       packageName = "error-ex";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz";
-        sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9";
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz";
+        sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -3208,22 +3235,22 @@ let
         sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
-    "q-1.4.1" = {
+    "q-1.5.0" = {
       name = "q";
       packageName = "q";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz";
-        sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
+        url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz";
+        sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1";
       };
     };
-    "debug-2.6.1" = {
+    "debug-2.6.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.1";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz";
+        sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d";
       };
     };
     "ms-0.7.2" = {
@@ -3550,13 +3577,13 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "syntax-error-1.1.6" = {
+    "syntax-error-1.3.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
-      version = "1.1.6";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz";
-        sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
+        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz";
+        sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1";
       };
     };
     "through2-2.0.3" = {
@@ -3730,13 +3757,13 @@ let
         sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
       };
     };
-    "browserify-sign-4.0.0" = {
+    "browserify-sign-4.0.4" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.0.0";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz";
-        sha1 = "10773910c3c206d5420a46aad8694f820b85968f";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
     "create-ecdh-4.0.0" = {
@@ -3892,13 +3919,13 @@ let
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "parse-asn1-5.0.0" = {
+    "parse-asn1-5.1.0" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz";
-        sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
+        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
       };
     };
     "brorand-1.1.0" = {
@@ -3991,22 +4018,22 @@ let
         sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
       };
     };
-    "astw-2.0.0" = {
+    "astw-2.2.0" = {
       name = "astw";
       packageName = "astw";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz";
-        sha1 = "08121ac8288d35611c0ceec663f6cd545604897d";
+        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
+        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
       };
     };
-    "acorn-1.2.2" = {
+    "acorn-4.0.11" = {
       name = "acorn";
       packageName = "acorn";
-      version = "1.2.2";
+      version = "4.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
-        sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
       };
     };
     "stream-splicer-2.0.0" = {
@@ -4018,13 +4045,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.3.2" = {
+    "detective-4.5.0" = {
       name = "detective";
       packageName = "detective";
-      version = "4.3.2";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz";
-        sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c";
+        url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz";
+        sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -4036,15 +4063,6 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -4117,15 +4135,6 @@ let
         sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
       };
     };
-    "acorn-2.7.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
-        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
-      };
-    };
     "punycode-1.3.2" = {
       name = "punycode";
       packageName = "punycode";
@@ -4630,13 +4639,13 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "parse-torrent-5.8.1" = {
+    "parse-torrent-5.8.2" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.1";
+      version = "5.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.1.tgz";
-        sha1 = "29452b9eae4a1b497f12e580c1cf6fa9682e5c68";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz";
+        sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9";
       };
     };
     "pump-0.3.5" = {
@@ -5089,13 +5098,13 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
-    "ip-1.1.4" = {
+    "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz";
-        sha1 = "de8247ffef940451832550fba284945e6e039bfb";
+        url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz";
+        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
     "magnet-uri-4.2.3" = {
@@ -5332,13 +5341,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.4.3" = {
+    "simple-peer-6.4.4" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.4.3";
+      version = "6.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz";
-        sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz";
+        sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
     "simple-websocket-4.3.1" = {
@@ -5359,22 +5368,22 @@ let
         sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
       };
     };
-    "ws-1.1.2" = {
+    "ws-1.1.4" = {
       name = "ws";
       packageName = "ws";
-      version = "1.1.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
-        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz";
+        sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61";
       };
     };
-    "ipaddr.js-1.2.0" = {
+    "ipaddr.js-1.3.0" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz";
-        sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
+        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
       };
     };
     "get-browser-rtc-1.0.2" = {
@@ -5386,13 +5395,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.1.0" = {
+    "ws-2.2.2" = {
       name = "ws";
       packageName = "ws";
-      version = "2.1.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz";
-        sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92";
+        url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz";
+        sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01";
       };
     };
     "ultron-1.1.0" = {
@@ -5962,13 +5971,13 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "init-package-json-1.9.4" = {
+    "init-package-json-1.9.5" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.9.4";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz";
-        sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz";
+        sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09";
       };
     };
     "nopt-3.0.6" = {
@@ -5980,13 +5989,13 @@ let
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
-    "npm-2.15.11" = {
+    "npm-2.15.12" = {
       name = "npm";
       packageName = "npm";
-      version = "2.15.11";
+      version = "2.15.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz";
-        sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c";
+        url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz";
+        sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
       };
     };
     "opener-1.4.1" = {
@@ -6088,6 +6097,15 @@ let
         sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4";
       };
     };
+    "acorn-1.2.2" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+        sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+      };
+    };
     "foreach-2.0.5" = {
       name = "foreach";
       packageName = "foreach";
@@ -6133,22 +6151,31 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.6" = {
+    "shelljs-0.7.7" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.6";
+      version = "0.7.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
-        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
+        sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
       };
     };
-    "interpret-1.0.1" = {
+    "q-1.4.1" = {
+      name = "q";
+      packageName = "q";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz";
+        sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
+      };
+    };
+    "interpret-1.0.2" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz";
-        sha1 = "d579fb7f693b858004947af39fa0db49f795602c";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz";
+        sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d";
       };
     };
     "rechoir-0.6.2" = {
@@ -6187,13 +6214,13 @@ let
         sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
       };
     };
-    "express-4.14.1" = {
+    "express-4.15.2" = {
       name = "express";
       packageName = "express";
-      version = "4.14.1";
+      version = "4.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
-        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
+        url = "https://registry.npmjs.org/express/-/express-4.15.2.tgz";
+        sha1 = "af107fc148504457f2dca9a6f2571d7129b97b35";
       };
     };
     "accepts-1.3.3" = {
@@ -6214,13 +6241,13 @@ let
         sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
       };
     };
-    "compressible-2.0.9" = {
+    "compressible-2.0.10" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.9";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
-        sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz";
+        sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
       };
     };
     "debug-2.2.0" = {
@@ -6241,13 +6268,13 @@ let
         sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
       };
     };
-    "vary-1.1.0" = {
+    "vary-1.1.1" = {
       name = "vary";
       packageName = "vary";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
-        sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz";
+        sha1 = "67535ebb694c1d52257457984665323f587e8d37";
       };
     };
     "negotiator-0.6.1" = {
@@ -6313,6 +6340,15 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
+    "debug-2.6.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+      };
+    };
     "depd-1.1.0" = {
       name = "depd";
       packageName = "depd";
@@ -6340,31 +6376,31 @@ let
         sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
       };
     };
-    "etag-1.7.0" = {
+    "etag-1.8.0" = {
       name = "etag";
       packageName = "etag";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
-        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz";
+        sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-0.5.1" = {
+    "finalhandler-1.0.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.1";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.1.tgz";
+        sha1 = "bcd15d1689c0e5ed729b6f7f541a6df984117db8";
       };
     };
-    "fresh-0.3.0" = {
+    "fresh-0.5.0" = {
       name = "fresh";
       packageName = "fresh";
-      version = "0.3.0";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
-        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz";
+        sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -6412,40 +6448,40 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.3" = {
+    "proxy-addr-1.1.4" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
-        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz";
+        sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3";
       };
     };
-    "qs-6.2.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
-        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
-      };
-    };
-    "send-0.14.2" = {
+    "send-0.15.1" = {
       name = "send";
       packageName = "send";
-      version = "0.14.2";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
-        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
+        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
+        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
       };
     };
-    "serve-static-1.11.2" = {
+    "serve-static-1.12.1" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.11.2";
+      version = "1.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
-        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
+        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
+      };
+    };
+    "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";
       };
     };
     "type-is-1.6.14" = {
@@ -6502,22 +6538,13 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.5.1" = {
+    "http-errors-1.6.1" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.5.1";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
-        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
-      };
-    };
-    "setprototypeof-1.0.2" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
-        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
+        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
       };
     };
     "media-typer-0.3.0" = {
@@ -6547,13 +6574,13 @@ let
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
-    "npm-package-arg-4.2.0" = {
+    "npm-package-arg-4.2.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz";
-        sha1 = "809bc61cabf54bd5ff94f6165c89ba8ee88c115c";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
+        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
       };
     };
     "promzard-0.3.0" = {
@@ -6565,22 +6592,22 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "read-package-json-2.0.4" = {
+    "read-package-json-2.0.5" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz";
-        sha1 = "61ed1b2256ea438d8008895090be84b8e799c853";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz";
+        sha1 = "f93a64e641529df68a08c64de46389e8a3f88845";
       };
     };
-    "validate-npm-package-name-2.2.2" = {
+    "validate-npm-package-name-3.0.0" = {
       name = "validate-npm-package-name";
       packageName = "validate-npm-package-name";
-      version = "2.2.2";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
-        sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
+        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
     "json-parse-helpfulerror-1.0.3" = {
@@ -6601,13 +6628,13 @@ let
         sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
       };
     };
-    "builtins-0.0.7" = {
+    "builtins-1.0.3" = {
       name = "builtins";
       packageName = "builtins";
-      version = "0.0.7";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
+        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
       };
     };
     "abbrev-1.1.0" = {
@@ -6745,31 +6772,31 @@ let
         sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742";
       };
     };
-    "fs-vacuum-1.2.9" = {
+    "fs-vacuum-1.2.10" = {
       name = "fs-vacuum";
       packageName = "fs-vacuum";
-      version = "1.2.9";
+      version = "1.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz";
-        sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d";
+        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz";
+        sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36";
       };
     };
-    "fs-write-stream-atomic-1.0.8" = {
+    "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz";
-        sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b";
-      };
-    };
-    "fstream-1.0.10" = {
-      name = "fstream";
-      packageName = "fstream";
       version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz";
-        sha1 = "604e8a92fe26ffd9f6fae30399d4984e1ab22822";
+        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+      };
+    };
+    "fstream-1.0.11" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz";
+        sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
       };
     };
     "fstream-npm-1.1.1" = {
@@ -6835,13 +6862,13 @@ let
         sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
-    "node-gyp-3.4.0" = {
+    "node-gyp-3.6.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.4.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz";
+        sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6";
       };
     };
     "normalize-git-url-3.0.2" = {
@@ -7024,6 +7051,15 @@ let
         sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
       };
     };
+    "validate-npm-package-name-2.2.2" = {
+      name = "validate-npm-package-name";
+      packageName = "validate-npm-package-name";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
+        sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
+      };
+    };
     "write-file-atomic-1.1.4" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -7105,67 +7141,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "yallist-2.0.0" = {
+    "yallist-2.1.2" = {
       name = "yallist";
       packageName = "yallist";
-      version = "2.0.0";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz";
-        sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4";
-      };
-    };
-    "path-array-1.0.1" = {
-      name = "path-array";
-      packageName = "path-array";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
-        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
-      };
-    };
-    "array-index-1.0.0" = {
-      name = "array-index";
-      packageName = "array-index";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
-        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
-      };
-    };
-    "es6-symbol-3.1.0" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz";
-        sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa";
-      };
-    };
-    "d-0.1.1" = {
-      name = "d";
-      packageName = "d";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz";
-        sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
-      };
-    };
-    "es5-ext-0.10.12" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz";
-        sha1 = "aa84641d4db76b62abba5e45fd805ecbab140047";
-      };
-    };
-    "es6-iterator-2.0.0" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz";
-        sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
     "are-we-there-yet-1.1.2" = {
@@ -7258,6 +7240,15 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
+    "builtins-0.0.7" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      };
+    };
     "bl-0.9.5" = {
       name = "bl";
       packageName = "bl";
@@ -7501,13 +7492,13 @@ let
         sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
       };
     };
-    "request-2.79.0" = {
+    "request-2.81.0" = {
       name = "request";
       packageName = "request";
-      version = "2.79.0";
+      version = "2.81.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
     "uuid-2.0.3" = {
@@ -7663,6 +7654,15 @@ let
         sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
       };
     };
+    "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";
+      };
+    };
     "form-data-2.1.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -7672,6 +7672,33 @@ let
         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";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7681,6 +7708,42 @@ let
         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";
+      };
+    };
     "is-npm-1.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -7780,13 +7843,13 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.1.7" = {
+    "rc-1.2.0" = {
       name = "rc";
       packageName = "rc";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
-        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz";
+        sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -7798,13 +7861,13 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "clone-2.1.0" = {
+    "clone-2.1.1" = {
       name = "clone";
       packageName = "clone";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
-        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz";
+        sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb";
       };
     };
     "parserlib-1.1.1" = {
@@ -8468,13 +8531,13 @@ let
         sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
-    "cors-2.8.1" = {
+    "cors-2.8.3" = {
       name = "cors";
       packageName = "cors";
-      version = "2.8.1";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
-        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz";
+        sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802";
       };
     };
     "docker-parse-image-3.0.1" = {
@@ -8486,13 +8549,13 @@ let
         sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4";
       };
     };
-    "end-of-stream-1.1.0" = {
+    "end-of-stream-1.4.0" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
-      version = "1.1.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
-        sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz";
+        sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206";
       };
     };
     "from2-1.3.0" = {
@@ -9161,13 +9224,13 @@ let
         sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
-    "doctrine-1.5.0" = {
+    "doctrine-2.0.0" = {
       name = "doctrine";
       packageName = "doctrine";
-      version = "1.5.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
-        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz";
+        sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63";
       };
     };
     "escope-3.6.0" = {
@@ -9188,6 +9251,15 @@ let
         sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
       };
     };
+    "esquery-1.0.0" = {
+      name = "esquery";
+      packageName = "esquery";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz";
+        sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa";
+      };
+    };
     "estraverse-4.2.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -9215,22 +9287,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.16.0" = {
+    "globals-9.17.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.16.0";
+      version = "9.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz";
-        sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80";
+        url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz";
+        sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
       };
     };
-    "ignore-3.2.4" = {
+    "ignore-3.2.6" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.4";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz";
-        sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz";
+        sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c";
       };
     };
     "inquirer-0.12.0" = {
@@ -9251,22 +9323,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.1" = {
+    "js-yaml-3.8.2" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.1";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
-        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
+        sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
       };
     };
     "levn-0.3.0" = {
@@ -9341,22 +9404,22 @@ let
         sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
       };
     };
-    "es6-map-0.1.4" = {
+    "es6-map-0.1.5" = {
       name = "es6-map";
       packageName = "es6-map";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz";
-        sha1 = "a34b147be224773a4d7da8072794cefa3632b897";
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
       };
     };
-    "es6-weak-map-2.0.1" = {
+    "es6-weak-map-2.0.2" = {
       name = "es6-weak-map";
       packageName = "es6-weak-map";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz";
-        sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81";
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
+        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
       };
     };
     "esrecurse-4.1.0" = {
@@ -9368,22 +9431,58 @@ let
         sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
       };
     };
-    "es6-set-0.1.4" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.4";
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz";
-        sha1 = "9516b6761c2964b92ff479456233a247dc707ce8";
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "event-emitter-0.3.4" = {
+    "es5-ext-0.10.15" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.15.tgz";
+        sha1 = "c330a5934c1ee21284a7c081a86e5fd937c91ea6";
+      };
+    };
+    "es6-iterator-2.0.1" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
+        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "event-emitter-0.3.5" = {
       name = "event-emitter";
       packageName = "event-emitter";
-      version = "0.3.4";
+      version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz";
-        sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5";
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
       };
     };
     "estraverse-4.1.1" = {
@@ -9413,6 +9512,15 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
     "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -9629,15 +9737,6 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.3" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
-        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
-      };
-    };
     "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
@@ -9665,15 +9764,6 @@ let
         sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
       };
     };
-    "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";
-      };
-    };
     "is-fullwidth-code-point-2.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -9971,13 +10061,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "normalize-path-2.0.1" = {
+    "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
-      version = "2.0.1";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz";
-        sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a";
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
     "object.omit-2.0.1" = {
@@ -10088,6 +10178,15 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
+    "remove-trailing-separator-1.0.1" = {
+      name = "remove-trailing-separator";
+      packageName = "remove-trailing-separator";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz";
+        sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4";
+      };
+    };
     "for-own-0.1.5" = {
       name = "for-own";
       packageName = "for-own";
@@ -10106,13 +10205,13 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
-    "for-in-1.0.1" = {
+    "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz";
-        sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa";
+        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz";
+        sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
       };
     };
     "glob-base-0.3.0" = {
@@ -10169,13 +10268,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.33" = {
+    "node-pre-gyp-0.6.34" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.33";
+      version = "0.6.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
-        sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
+        sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+      };
+    };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
     "npmlog-4.0.2" = {
@@ -10187,13 +10295,13 @@ let
         sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
-    "tar-pack-3.3.0" = {
+    "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
-        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz";
+        sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -10322,6 +10430,15 @@ let
         sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
       };
     };
+    "lodash.groupby-4.6.0" = {
+      name = "lodash.groupby";
+      packageName = "lodash.groupby";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz";
+        sha1 = "0b08a1dcf68397c397855c3239783832df7403d1";
+      };
+    };
     "minilog-2.0.8" = {
       name = "minilog";
       packageName = "minilog";
@@ -10331,6 +10448,15 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
+    "simple-git-1.69.0" = {
+      name = "simple-git";
+      packageName = "simple-git";
+      version = "1.69.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz";
+        sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177";
+      };
+    };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
       name = "tabtab";
       packageName = "tabtab";
@@ -10458,13 +10584,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-2.8.20" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "2.8.20";
       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.20.tgz";
+        sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
       };
     };
     "void-elements-2.0.1" = {
@@ -10503,6 +10629,15 @@ let
         sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
       };
     };
+    "acorn-2.7.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "2.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
+      };
+    };
     "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
@@ -10674,13 +10809,13 @@ let
         sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a";
       };
     };
-    "v8flags-2.0.11" = {
+    "v8flags-2.0.12" = {
       name = "v8flags";
       packageName = "v8flags";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz";
-        sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881";
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.12.tgz";
+        sha1 = "73235d9f7176f8e8833fb286795445f7938d84e5";
       };
     };
     "vinyl-fs-0.3.14" = {
@@ -11367,13 +11502,13 @@ let
         sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
       };
     };
-    "eventemitter3-2.0.2" = {
+    "eventemitter3-2.0.3" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz";
-        sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz";
+        sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba";
       };
     };
     "csslint-0.10.0" = {
@@ -11601,22 +11736,22 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.7" = {
+    "bluebird-3.5.0" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.7";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
-        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
+        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
-    "body-parser-1.16.1" = {
+    "body-parser-1.17.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.1";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
-        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz";
+        sha1 = "75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11727,13 +11862,13 @@ let
         sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
-    "useragent-2.1.12" = {
+    "useragent-2.1.13" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.12";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
-        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz";
+        sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10";
       };
     };
     "bytes-2.4.0" = {
@@ -11754,15 +11889,6 @@ let
         sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
-    "qs-6.2.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz";
-        sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625";
-      };
-    };
     "raw-body-2.2.0" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -11943,6 +12069,15 @@ let
         sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
+    "ws-1.1.2" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
+        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
+      };
+    };
     "after-0.8.2" = {
       name = "after";
       packageName = "after";
@@ -12213,6 +12348,24 @@ let
         sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
       };
     };
+    "etag-1.7.0" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+      };
+    };
+    "fresh-0.3.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+      };
+    };
     "merge-descriptors-1.0.0" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -12330,13 +12483,13 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.7" = {
+    "method-override-2.3.8" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.7";
+      version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
-        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz";
+        sha1 = "178234bf4bab869f89df9444b06fc6147b44828c";
       };
     };
     "morgan-1.6.1" = {
@@ -12447,22 +12600,13 @@ let
         sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
       };
     };
-    "csrf-3.0.4" = {
+    "csrf-3.0.6" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.4";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
-        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
+        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
       };
     };
     "rndm-1.2.0" = {
@@ -12483,13 +12627,13 @@ let
         sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "uid-safe-2.1.3" = {
+    "uid-safe-2.1.4" = {
       name = "uid-safe";
       packageName = "uid-safe";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
-        sha1 = "077e264a00b3187936b270bb7376a26473631071";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
+        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
       };
     };
     "random-bytes-1.0.0" = {
@@ -12807,13 +12951,13 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "convert-source-map-1.4.0" = {
+    "convert-source-map-1.5.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz";
-        sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
+        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
       };
     };
     "express-2.5.11" = {
@@ -13167,13 +13311,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "serve-favicon-2.4.0" = {
+    "serve-favicon-2.4.2" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.4.0";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz";
-        sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.2.tgz";
+        sha1 = "aed1d8de67d5b83192cf31fdf53d2ea29464363e";
       };
     };
     "strong-data-uri-1.0.4" = {
@@ -13185,22 +13329,22 @@ let
         sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0";
       };
     };
-    "v8-debug-0.7.7" = {
+    "v8-debug-1.0.1" = {
       name = "v8-debug";
       packageName = "v8-debug";
-      version = "0.7.7";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz";
-        sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935";
+        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz";
+        sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe";
       };
     };
-    "v8-profiler-5.6.5" = {
+    "v8-profiler-5.7.0" = {
       name = "v8-profiler";
       packageName = "v8-profiler";
-      version = "5.6.5";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz";
-        sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be";
+        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz";
+        sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d";
       };
     };
     "yargs-3.32.0" = {
@@ -13284,22 +13428,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "etag-1.8.0" = {
-      name = "etag";
-      packageName = "etag";
-      version = "1.8.0";
+    "ms-1.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz";
-        sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
-      };
-    };
-    "fresh-0.4.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz";
-        sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553";
+        url = "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz";
+        sha1 = "59adcd22edc543f7b5381862d31387b1f4bc9473";
       };
     };
     "truncate-1.0.5" = {
@@ -13500,6 +13635,15 @@ let
         sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
       };
     };
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
     "cookie-parser-1.4.3" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13509,6 +13653,15 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
+    "cors-2.8.1" = {
+      name = "cors";
+      packageName = "cors";
+      version = "2.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
+        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
+      };
+    };
     "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
@@ -13635,6 +13788,15 @@ let
         sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
+    "uglify-js-2.7.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+      };
+    };
     "when-3.7.7" = {
       name = "when";
       packageName = "when";
@@ -13671,13 +13833,13 @@ let
         sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
       };
     };
-    "node-red-node-twitter-0.1.9" = {
+    "node-red-node-twitter-0.1.10" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
-        sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz";
+        sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
       };
     };
     "node-red-node-rbe-0.1.6" = {
@@ -13698,6 +13860,33 @@ let
         sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
+    "http-errors-1.5.1" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
+      };
+    };
+    "qs-6.2.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+      };
+    };
+    "setprototypeof-1.0.2" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
+      };
+    };
     "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -13878,6 +14067,24 @@ let
         sha1 = "a954984325392f51532a7760760e459598c89f7a";
       };
     };
+    "serve-static-1.11.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
+        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
+      };
+    };
+    "send-0.14.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
+        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
+      };
+    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -13941,13 +14148,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-packet-5.2.1" = {
+    "mqtt-packet-5.2.2" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.1";
+      version = "5.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
-        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz";
+        sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a";
       };
     };
     "reinterval-1.1.0" = {
@@ -14247,6 +14454,24 @@ let
         sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
+    "rc-1.1.7" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
+        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
+      };
+    };
+    "tar-pack-3.3.0" = {
+      name = "tar-pack";
+      packageName = "tar-pack";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
+        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14832,6 +15057,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "call-limit-1.1.0" = {
+      name = "call-limit";
+      packageName = "call-limit";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
+        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14841,6 +15075,15 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
+    "hosted-git-info-2.2.0" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+      };
+    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -14904,6 +15147,15 @@ let
         sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
+    "move-concurrently-1.0.1" = {
+      name = "move-concurrently";
+      packageName = "move-concurrently";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+      };
+    };
     "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
@@ -14913,15 +15165,6 @@ let
         sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
-    "nopt-4.0.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14931,13 +15174,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.5" = {
+    "npm-registry-client-7.4.6" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.5";
+      version = "7.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
-        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz";
+        sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717";
       };
     };
     "opener-1.4.3" = {
@@ -14985,6 +15228,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "update-notifier-2.1.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
+        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15066,6 +15318,24 @@ let
         sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
       };
     };
+    "copy-concurrently-1.0.3" = {
+      name = "copy-concurrently";
+      packageName = "copy-concurrently";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
+        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
+      };
+    };
+    "run-queue-1.0.3" = {
+      name = "run-queue";
+      packageName = "run-queue";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15084,6 +15354,186 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
+    "boxen-1.0.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz";
+        sha1 = "b2694baf1f605f708ff0177c12193b22f29aaaab";
+      };
+    };
+    "configstore-3.0.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz";
+        sha1 = "e1b8669c1803ccc50b545e92f8e6e79aa80e0196";
+      };
+    };
+    "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-req-2.0.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
+        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+      };
+    };
+    "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";
+      };
+    };
+    "ansi-align-1.1.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
+        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "term-size-0.1.1" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
+        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+      };
+    };
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+      };
+    };
+    "execa-0.4.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
+        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+      };
+    };
+    "cross-spawn-async-2.2.5" = {
+      name = "cross-spawn-async";
+      packageName = "cross-spawn-async";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
+        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+      };
+    };
+    "npm-run-path-1.0.0" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
+        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
+      };
+    };
+    "path-key-1.0.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
+        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
+      };
+    };
+    "dot-prop-4.1.1" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
+        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "package-json-4.0.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.0.tgz";
+        sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998";
+      };
+    };
+    "registry-auth-token-3.1.0" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
+        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+      };
+    };
     "argparse-0.1.15" = {
       name = "argparse";
       packageName = "argparse";
@@ -15336,6 +15786,15 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
+    "snyk-1.26.1" = {
+      name = "snyk";
+      packageName = "snyk";
+      version = "1.26.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz";
+        sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5";
+      };
+    };
     "spawn-please-0.2.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
@@ -15363,6 +15822,15 @@ let
         sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
       };
     };
+    "node-gyp-3.4.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
+        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      };
+    };
     "request-2.75.0" = {
       name = "request";
       packageName = "request";
@@ -15381,6 +15849,24 @@ let
         sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
+    "path-array-1.0.1" = {
+      name = "path-array";
+      packageName = "path-array";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
+        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
+      };
+    };
+    "array-index-1.0.0" = {
+      name = "array-index";
+      packageName = "array-index";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
+        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
+      };
+    };
     "form-data-2.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -15390,13 +15876,220 @@ let
         sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
       };
     };
-    "boxen-0.6.0" = {
+    "hasbin-1.2.3" = {
+      name = "hasbin";
+      packageName = "hasbin";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz";
+        sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
+      };
+    };
+    "inquirer-1.0.3" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
+        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
+      };
+    };
+    "snyk-config-1.0.1" = {
+      name = "snyk-config";
+      packageName = "snyk-config";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
+        sha1 = "f27aec2498b24027ac719214026521591111508f";
+      };
+    };
+    "snyk-module-1.7.0" = {
+      name = "snyk-module";
+      packageName = "snyk-module";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz";
+        sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a";
+      };
+    };
+    "snyk-policy-1.7.0" = {
+      name = "snyk-policy";
+      packageName = "snyk-policy";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz";
+        sha1 = "2151c751ab1edc040fc6b94a872aa989db492324";
+      };
+    };
+    "snyk-recursive-readdir-2.0.0" = {
+      name = "snyk-recursive-readdir";
+      packageName = "snyk-recursive-readdir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz";
+        sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3";
+      };
+    };
+    "snyk-resolve-1.0.0" = {
+      name = "snyk-resolve";
+      packageName = "snyk-resolve";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
+        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+      };
+    };
+    "snyk-resolve-deps-1.7.0" = {
+      name = "snyk-resolve-deps";
+      packageName = "snyk-resolve-deps";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
+        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+      };
+    };
+    "snyk-tree-1.0.0" = {
+      name = "snyk-tree";
+      packageName = "snyk-tree";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz";
+        sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
+      };
+    };
+    "snyk-try-require-1.2.0" = {
+      name = "snyk-try-require";
+      packageName = "snyk-try-require";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
+        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+      };
+    };
+    "tempfile-1.1.1" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
+        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
+      };
+    };
+    "then-fs-2.0.0" = {
+      name = "then-fs";
+      packageName = "then-fs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz";
+        sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2";
+      };
+    };
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    };
+    "rx-4.1.0" = {
+      name = "rx";
+      packageName = "rx";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+      };
+    };
+    "nconf-0.7.2" = {
+      name = "nconf";
+      packageName = "nconf";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz";
+        sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00";
+      };
+    };
+    "yargs-3.15.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz";
+        sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
+      };
+    };
+    "minimatch-3.0.2" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz";
+        sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a";
+      };
+    };
+    "clite-0.3.0" = {
+      name = "clite";
+      packageName = "clite";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz";
+        sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441";
+      };
+    };
+    "lodash.defaultsdeep-4.6.0" = {
+      name = "lodash.defaultsdeep";
+      packageName = "lodash.defaultsdeep";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz";
+        sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81";
+      };
+    };
+    "lodash.mergewith-4.6.0" = {
+      name = "lodash.mergewith";
+      packageName = "lodash.mergewith";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz";
+        sha1 = "150cf0a16791f5903b8891eab154609274bdea55";
+      };
+    };
+    "update-notifier-0.6.3" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
+        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+      };
+    };
+    "yargs-4.8.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "4.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+      };
+    };
+    "boxen-0.3.1" = {
       name = "boxen";
       packageName = "boxen";
-      version = "0.6.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
+        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
       };
     };
     "configstore-2.1.0" = {
@@ -15417,33 +16110,6 @@ let
         sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
       };
     };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
-      };
-    };
-    "ansi-align-1.1.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
-      };
-    };
-    "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";
-      };
-    };
     "filled-array-1.1.0" = {
       name = "filled-array";
       packageName = "filled-array";
@@ -15453,15 +16119,6 @@ let
         sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
-      };
-    };
     "dot-prop-3.0.0" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -15471,15 +16128,6 @@ let
         sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
       };
     };
-    "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";
-      };
-    };
     "package-json-2.4.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -15498,15 +16146,6 @@ let
         sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "registry-auth-token-3.1.0" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
-        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
-      };
-    };
     "node-status-codes-1.0.0" = {
       name = "node-status-codes";
       packageName = "node-status-codes";
@@ -15534,6 +16173,96 @@ let
         sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
       };
     };
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
+    "window-size-0.2.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+      };
+    };
+    "yargs-parser-2.4.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "boxen-0.6.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
+        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+      };
+    };
+    "lazy-req-1.1.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
+        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
+      };
+    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -15580,6 +16309,15 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
+    "finalhandler-0.5.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+      };
+    };
     "gelf-stream-0.2.4" = {
       name = "gelf-stream";
       packageName = "gelf-stream";
@@ -15627,13 +16365,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.2.4" = {
+    "service-runner-2.2.5" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.2.4";
+      version = "2.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz";
-        sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.5.tgz";
+        sha1 = "95a55084f939110b3f201549c1afedf900ec4850";
       };
     };
     "simplediff-0.1.1" = {
@@ -15645,15 +16383,6 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
-      };
-    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -15717,13 +16446,13 @@ let
         sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
       };
     };
-    "bunyan-1.8.5" = {
+    "bunyan-1.8.9" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.5";
+      version = "1.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
-        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz";
+        sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a";
       };
     };
     "bunyan-syslog-udp-0.1.0" = {
@@ -15744,13 +16473,13 @@ let
         sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
       };
     };
-    "hot-shots-4.3.1" = {
+    "hot-shots-4.4.0" = {
       name = "hot-shots";
       packageName = "hot-shots";
-      version = "4.3.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
-        sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.4.0.tgz";
+        sha1 = "ab3f3b3df2f4b2ff0d716837569241ede81d9175";
       };
     };
     "limitation-0.2.0" = {
@@ -15780,13 +16509,13 @@ let
         sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
       };
     };
-    "dtrace-provider-0.8.0" = {
+    "dtrace-provider-0.8.1" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.0";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
-        sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz";
+        sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f";
       };
     };
     "mv-2.1.1" = {
@@ -15798,13 +16527,13 @@ let
         sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
       };
     };
-    "safe-json-stringify-1.0.3" = {
+    "safe-json-stringify-1.0.4" = {
       name = "safe-json-stringify";
       packageName = "safe-json-stringify";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
-        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz";
+        sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911";
       };
     };
     "ncp-2.0.0" = {
@@ -15889,6 +16618,15 @@ let
         sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
       };
     };
+    "ms-0.7.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
+        sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
+      };
+    };
     "msgpack5-3.4.1" = {
       name = "msgpack5";
       packageName = "msgpack5";
@@ -15907,51 +16645,6 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "get-caller-file-1.0.2" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
-        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
-      };
-    };
-    "require-directory-2.1.1" = {
-      name = "require-directory";
-      packageName = "require-directory";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
-      };
-    };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -15979,33 +16672,6 @@ let
         sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "airplayer-2.0.0" = {
       name = "airplayer";
       packageName = "airplayer";
@@ -16186,13 +16852,13 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
-    "multicast-dns-6.1.0" = {
+    "multicast-dns-6.1.1" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz";
-        sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf";
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz";
+        sha1 = "6e7de86a570872ab17058adea7160bbeca814dde";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -16222,33 +16888,6 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "mute-stream-0.0.6" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
-      };
-    };
-    "run-async-2.3.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
-      };
-    };
-    "rx-4.1.0" = {
-      name = "rx";
-      packageName = "rx";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
-        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
-      };
-    };
     "spawn-sync-1.0.15" = {
       name = "spawn-sync";
       packageName = "spawn-sync";
@@ -16942,22 +17581,22 @@ let
         sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.22" = {
+    "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.22";
+      version = "0.11.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz";
-        sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz";
+        sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
       };
     };
-    "ast-types-0.9.5" = {
+    "ast-types-0.9.6" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.5";
+      version = "0.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
-        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz";
+        sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9";
       };
     };
     "base62-0.1.1" = {
@@ -17240,13 +17879,13 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "express-5.0.0-alpha.3" = {
+    "express-5.0.0-alpha.5" = {
       name = "express";
       packageName = "express";
-      version = "5.0.0-alpha.3";
+      version = "5.0.0-alpha.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz";
-        sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz";
+        sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6";
       };
     };
     "express-json5-0.1.0" = {
@@ -17312,22 +17951,13 @@ let
         sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
       };
     };
-    "http-errors-1.6.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
-        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
-      };
-    };
-    "fs-ext-0.5.0" = {
+    "fs-ext-0.6.0" = {
       name = "fs-ext";
       packageName = "fs-ext";
-      version = "0.5.0";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz";
-        sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e";
+        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz";
+        sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66";
       };
     };
     "crypt3-0.2.0" = {
@@ -17339,13 +17969,13 @@ let
         sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "router-1.1.5" = {
+    "router-1.3.0" = {
       name = "router";
       packageName = "router";
-      version = "1.1.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz";
-        sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387";
+        url = "https://registry.npmjs.org/router/-/router-1.3.0.tgz";
+        sha1 = "15b24075c1de4a3d3f39808c5d7344a1564417c8";
       };
     };
     "raw-body-1.3.4" = {
@@ -17438,13 +18068,13 @@ let
         sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
-    "setprototypeof-1.0.3" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.3";
+    "async-2.1.5" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
-        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
     "lru-cache-2.2.0" = {
@@ -17816,31 +18446,22 @@ let
         sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
       };
     };
-    "csso-2.3.1" = {
+    "csso-2.3.2" = {
       name = "csso";
       packageName = "csso";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz";
-        sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9";
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
+        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
       };
     };
-    "clap-1.1.2" = {
+    "clap-1.1.3" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
-        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz";
+        sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -17924,22 +18545,22 @@ let
         sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
       };
     };
-    "node-appc-0.2.39" = {
+    "node-appc-0.2.41" = {
       name = "node-appc";
       packageName = "node-appc";
-      version = "0.2.39";
+      version = "0.2.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
-        sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz";
+        sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52";
       };
     };
-    "request-2.78.0" = {
+    "request-2.79.0" = {
       name = "request";
       packageName = "request";
-      version = "2.78.0";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
     "sprintf-0.1.5" = {
@@ -17960,13 +18581,13 @@ let
         sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
-    "wrench-1.5.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.5.9";
+    "fs-extra-2.1.2" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
-        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz";
+        sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35";
       };
     };
     "source-map-support-0.3.2" = {
@@ -17996,58 +18617,49 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "diff-2.2.1" = {
+    "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";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
-        sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "request-2.69.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.69.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
-        sha1 = "cf91d2e000752b1217155c005241911991a2346a";
-      };
-    };
-    "semver-5.1.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
-        sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
-      };
-    };
-    "wrench-1.5.8" = {
+    "wrench-1.5.9" = {
       name = "wrench";
       packageName = "wrench";
-      version = "1.5.8";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
-        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
       };
     };
-    "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";
-      };
-    };
-    "qs-6.0.3" = {
+    "qs-6.3.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.0.3";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz";
-        sha1 = "95f870b23e70268fba18704e80667515905af06c";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
+        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
+      };
+    };
+    "bluebird-3.4.7" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
     "blueimp-md5-2.6.0" = {
@@ -18077,13 +18689,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-2.0.12" = {
+    "diff2html-2.3.0" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.0.12";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz";
-        sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz";
+        sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
+      };
+    };
+    "express-4.14.1" = {
+      name = "express";
+      packageName = "express";
+      version = "4.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
+        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
       };
     };
     "express-session-1.14.2" = {
@@ -18131,13 +18752,13 @@ let
         sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
       };
     };
-    "knockout-3.4.1" = {
+    "knockout-3.4.2" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.4.1";
+      version = "3.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
-        sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz";
+        sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937";
       };
     };
     "node-cache-4.1.1" = {
@@ -18176,13 +18797,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.2" = {
+    "raven-1.1.5" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.2";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
-        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz";
+        sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf";
       };
     };
     "signals-1.0.0" = {
@@ -18221,22 +18842,22 @@ let
         sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-1.5.0" = {
+    "color-string-1.5.2" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.5.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz";
-        sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz";
+        sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "color-name-1.1.1" = {
+    "color-name-1.1.2" = {
       name = "color-name";
       packageName = "color-name";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
-        sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
       };
     };
     "simple-swizzle-0.2.2" = {
@@ -18257,15 +18878,6 @@ let
         sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
       };
     };
-    "diff-3.2.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
-      };
-    };
     "hogan.js-3.0.2" = {
       name = "hogan.js";
       packageName = "hogan.js";
@@ -18275,13 +18887,13 @@ let
         sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "whatwg-fetch-2.0.2" = {
+    "whatwg-fetch-2.0.3" = {
       name = "whatwg-fetch";
       packageName = "whatwg-fetch";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz";
-        sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
+        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
       };
     };
     "crc-3.4.1" = {
@@ -18491,13 +19103,13 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "acorn-dynamic-import-2.0.1" = {
+    "acorn-dynamic-import-2.0.2" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz";
-        sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz";
+        sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
       };
     };
     "enhanced-resolve-3.1.0" = {
@@ -18563,13 +19175,13 @@ let
         sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
-    "webpack-sources-0.1.4" = {
+    "webpack-sources-0.2.3" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "0.1.4";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz";
-        sha1 = "ccc2c817e08e5fa393239412690bb481821393cd";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz";
+        sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb";
       };
     };
     "big.js-3.1.3" = {
@@ -18626,13 +19238,13 @@ let
         sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
-    "source-list-map-0.1.8" = {
+    "source-list-map-1.1.1" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.8";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
-        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.1.tgz";
+        sha1 = "1a33ac210ca144d1e561f906ebccab5669ff4cb4";
       };
     };
     "babel-runtime-6.23.0" = {
@@ -18644,6 +19256,15 @@ let
         sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
+    "bytes-2.5.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
+        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
+      };
+    };
     "death-1.1.0" = {
       name = "death";
       packageName = "death";
@@ -18662,22 +19283,13 @@ let
         sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
       };
     };
-    "diff-2.2.3" = {
-      name = "diff";
-      packageName = "diff";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
-      };
-    };
-    "inquirer-3.0.5" = {
+    "inquirer-3.0.6" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz";
-        sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz";
+        sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347";
       };
     };
     "invariant-2.2.2" = {
@@ -18734,13 +19346,13 @@ let
         sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55";
       };
     };
-    "request-capture-har-1.1.4" = {
+    "request-capture-har-1.2.2" = {
       name = "request-capture-har";
       packageName = "request-capture-har";
-      version = "1.1.4";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
-        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz";
+        sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d";
       };
     };
     "roadrunner-1.1.0" = {
@@ -18797,13 +19409,13 @@ let
         sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
       };
     };
-    "onetime-2.0.0" = {
+    "onetime-2.0.1" = {
       name = "onetime";
       packageName = "onetime";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz";
-        sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6";
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
     "loose-envify-1.3.1" = {
@@ -18950,15 +19562,6 @@ let
         sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
       };
     };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
-      };
-    };
     "yeoman-character-1.1.0" = {
       name = "yeoman-character";
       packageName = "yeoman-character";
@@ -19094,15 +19697,6 @@ let
         sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c";
       };
     };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
-      };
-    };
     "bin-version-check-2.1.0" = {
       name = "bin-version-check";
       packageName = "bin-version-check";
@@ -19184,6 +19778,15 @@ let
         sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
       };
     };
+    "diff-2.2.3" = {
+      name = "diff";
+      packageName = "diff";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+      };
+    };
     "globby-4.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -19307,7 +19910,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -19323,7 +19926,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -19359,9 +19962,9 @@ in
                     ];
                   })
                   sources."ini-1.3.4"
-                  (sources."which-1.2.12" // {
+                  (sources."which-1.2.14" // {
                     dependencies = [
-                      sources."isexe-1.1.2"
+                      sources."isexe-2.0.0"
                     ];
                   })
                 ];
@@ -19404,15 +20007,14 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.10";
+    version = "0.10.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz";
-      sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz";
+      sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
         dependencies = [
-          sources."date-utils-1.2.21"
           (sources."jws-3.1.4" // {
             dependencies = [
               sources."base64url-2.0.0"
@@ -19445,7 +20047,7 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.2"
+      sources."azure-arm-cdn-1.0.3"
       sources."azure-arm-commerce-0.2.0"
       sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
@@ -19501,7 +20103,7 @@ in
               sources."inherits-2.0.3"
             ];
           })
-          sources."node-uuid-1.4.7"
+          sources."node-uuid-1.4.8"
           (sources."readable-stream-2.0.6" // {
             dependencies = [
               sources."core-util-is-1.0.2"
@@ -19535,11 +20137,12 @@ in
           sources."keypress-0.1.0"
         ];
       })
+      sources."date-utils-1.2.21"
       sources."easy-table-0.0.1"
       (sources."event-stream-3.1.5" // {
         dependencies = [
           sources."duplexer-0.1.1"
-          sources."from-0.1.3"
+          sources."from-0.1.7"
           sources."map-stream-0.1.0"
           sources."pause-stream-0.0.11"
           sources."split-0.2.10"
@@ -19569,6 +20172,7 @@ in
       })
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
+      sources."jwt-decode-2.2.0"
       (sources."kuduscript-1.0.13" // {
         dependencies = [
           (sources."commander-1.1.1" // {
@@ -19579,13 +20183,13 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.1"
-      (sources."ms-rest-1.15.5" // {
+      sources."moment-2.18.1"
+      (sources."ms-rest-1.15.7" // {
         dependencies = [
           sources."duplexer-0.1.1"
         ];
       })
-      (sources."ms-rest-azure-1.15.5" // {
+      (sources."ms-rest-azure-1.15.7" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -19695,7 +20299,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.5" // {
+              (sources."async-2.2.0" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -19756,14 +20360,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -19781,14 +20386,14 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
-          sources."node-uuid-1.4.7"
+          sources."node-uuid-1.4.8"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.2"
+          sources."qs-6.2.3"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -19822,7 +20427,7 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -19844,7 +20449,7 @@ in
                   sources."asap-2.0.5"
                 ];
               })
-              sources."qs-6.3.1"
+              sources."qs-6.4.0"
             ];
           })
         ];
@@ -19944,7 +20549,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -19969,7 +20574,7 @@ in
                       sources."prepend-http-1.0.4"
                       (sources."read-all-stream-2.2.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -20008,9 +20613,9 @@ in
                   })
                   sources."map-obj-1.0.1"
                   sources."minimist-1.2.0"
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -20048,7 +20653,7 @@ in
                               sources."graceful-fs-4.1.11"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
-                                  (sources."error-ex-1.3.0" // {
+                                  (sources."error-ex-1.3.1" // {
                                     dependencies = [
                                       sources."is-arrayish-0.2.1"
                                     ];
@@ -20169,8 +20774,8 @@ in
       sources."lodash-4.2.1"
       (sources."promised-temp-0.1.0" // {
         dependencies = [
-          sources."q-1.4.1"
-          (sources."debug-2.6.1" // {
+          sources."q-1.5.0"
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -20312,7 +20917,7 @@ in
               sources."evp_bytestokey-1.0.0"
             ];
           })
-          (sources."browserify-sign-4.0.0" // {
+          (sources."browserify-sign-4.0.4" // {
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
@@ -20325,7 +20930,7 @@ in
                   sources."minimalistic-crypto-utils-1.0.1"
                 ];
               })
-              (sources."parse-asn1-5.0.0" // {
+              (sources."parse-asn1-5.1.0" // {
                 dependencies = [
                   (sources."asn1.js-4.9.1" // {
                     dependencies = [
@@ -20380,7 +20985,7 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."parse-asn1-5.0.0" // {
+              (sources."parse-asn1-5.1.0" // {
                 dependencies = [
                   (sources."asn1.js-4.9.1" // {
                     dependencies = [
@@ -20450,12 +21055,12 @@ in
               sources."source-map-0.5.6"
             ];
           })
-          sources."is-buffer-1.1.4"
+          sources."is-buffer-1.1.5"
           (sources."lexical-scope-1.2.0" // {
             dependencies = [
-              (sources."astw-2.0.0" // {
+              (sources."astw-2.2.0" // {
                 dependencies = [
-                  sources."acorn-1.2.2"
+                  sources."acorn-4.0.11"
                 ];
               })
             ];
@@ -20470,9 +21075,9 @@ in
       })
       (sources."module-deps-4.1.1" // {
         dependencies = [
-          (sources."detective-4.3.2" // {
+          (sources."detective-4.5.0" // {
             dependencies = [
-              sources."acorn-3.3.0"
+              sources."acorn-4.0.11"
             ];
           })
           sources."stream-combiner2-1.1.1"
@@ -20489,7 +21094,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.3" // {
+      (sources."readable-stream-2.2.6" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -20534,9 +21139,9 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      (sources."syntax-error-1.1.6" // {
+      (sources."syntax-error-1.3.0" // {
         dependencies = [
-          sources."acorn-2.7.0"
+          sources."acorn-4.0.11"
         ];
       })
       sources."through2-2.0.3"
@@ -20648,7 +21253,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -20684,9 +21289,9 @@ in
                 ];
               })
               sources."map-obj-1.0.1"
-              (sources."normalize-package-data-2.3.5" // {
+              (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
-                  sources."hosted-git-info-2.2.0"
+                  sources."hosted-git-info-2.4.1"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -20725,7 +21330,7 @@ in
                           sources."graceful-fs-4.1.11"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
-                              (sources."error-ex-1.3.0" // {
+                              (sources."error-ex-1.3.1" // {
                                 dependencies = [
                                   sources."is-arrayish-0.2.1"
                                 ];
@@ -20844,7 +21449,7 @@ in
               sources."minimist-0.0.10"
             ];
           })
-          (sources."parse-torrent-5.8.1" // {
+          (sources."parse-torrent-5.8.2" // {
             dependencies = [
               sources."blob-to-buffer-1.2.6"
               sources."get-stdin-5.0.1"
@@ -20934,7 +21539,7 @@ in
               sources."immediate-chunk-store-1.0.8"
               (sources."ip-set-1.0.1" // {
                 dependencies = [
-                  sources."ip-1.1.4"
+                  sources."ip-1.1.5"
                 ];
               })
               sources."mkdirp-0.3.5"
@@ -21053,10 +21658,10 @@ in
                       sources."bn.js-4.11.6"
                       (sources."compact2string-1.4.0" // {
                         dependencies = [
-                          sources."ipaddr.js-1.2.0"
+                          sources."ipaddr.js-1.3.0"
                         ];
                       })
-                      sources."ip-1.1.4"
+                      sources."ip-1.1.5"
                       (sources."once-1.4.0" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
@@ -21070,11 +21675,11 @@ in
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.4.3" // {
+                      (sources."simple-peer-6.4.4" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -21089,7 +21694,7 @@ in
                       (sources."simple-websocket-4.3.1" // {
                         dependencies = [
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -21099,7 +21704,7 @@ in
                               sources."util-deprecate-1.0.2"
                             ];
                           })
-                          (sources."ws-2.1.0" // {
+                          (sources."ws-2.2.2" // {
                             dependencies = [
                               sources."ultron-1.1.0"
                             ];
@@ -21109,11 +21714,11 @@ in
                       (sources."string2compact-1.2.2" // {
                         dependencies = [
                           sources."addr-to-ip-port-1.4.2"
-                          sources."ipaddr.js-1.2.0"
+                          sources."ipaddr.js-1.3.0"
                         ];
                       })
                       sources."uniq-1.0.1"
-                      (sources."ws-1.1.2" // {
+                      (sources."ws-1.1.4" // {
                         dependencies = [
                           sources."options-0.0.6"
                           sources."ultron-1.0.2"
@@ -21205,7 +21810,7 @@ in
                   sources."sntp-0.1.4"
                 ];
               })
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."cookie-jar-0.2.0"
               sources."aws-sign-0.2.0"
               sources."oauth-sign-0.2.0"
@@ -21227,7 +21832,7 @@ in
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -21359,7 +21964,7 @@ in
               sources."util-deprecate-1.0.2"
             ];
           })
-          sources."q-1.4.1"
+          sources."q-1.5.0"
           sources."semver-5.3.0"
           sources."shelljs-0.5.3"
           sources."underscore-1.8.3"
@@ -21392,10 +21997,14 @@ in
           })
           (sources."cordova-fetch-1.0.2" // {
             dependencies = [
-              sources."dependency-ls-1.0.0"
+              (sources."dependency-ls-1.0.0" // {
+                dependencies = [
+                  sources."q-1.4.1"
+                ];
+              })
               sources."is-url-1.2.2"
-              sources."q-1.4.1"
-              (sources."shelljs-0.7.6" // {
+              sources."q-1.5.0"
+              (sources."shelljs-0.7.7" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -21424,7 +22033,7 @@ in
                       sources."path-is-absolute-1.0.1"
                     ];
                   })
-                  sources."interpret-1.0.1"
+                  sources."interpret-1.0.2"
                   (sources."rechoir-0.6.2" // {
                     dependencies = [
                       (sources."resolve-1.3.2" // {
@@ -21522,7 +22131,7 @@ in
                           sources."evp_bytestokey-1.0.0"
                         ];
                       })
-                      (sources."browserify-sign-4.0.0" // {
+                      (sources."browserify-sign-4.0.4" // {
                         dependencies = [
                           sources."bn.js-4.11.6"
                           sources."browserify-rsa-4.0.1"
@@ -21535,7 +22144,7 @@ in
                               sources."minimalistic-crypto-utils-1.0.1"
                             ];
                           })
-                          (sources."parse-asn1-5.0.0" // {
+                          (sources."parse-asn1-5.1.0" // {
                             dependencies = [
                               (sources."asn1.js-4.9.1" // {
                                 dependencies = [
@@ -21590,7 +22199,7 @@ in
                         dependencies = [
                           sources."bn.js-4.11.6"
                           sources."browserify-rsa-4.0.1"
-                          (sources."parse-asn1-5.0.0" // {
+                          (sources."parse-asn1-5.1.0" // {
                             dependencies = [
                               (sources."asn1.js-4.9.1" // {
                                 dependencies = [
@@ -21660,12 +22269,12 @@ in
                           sources."source-map-0.5.6"
                         ];
                       })
-                      sources."is-buffer-1.1.4"
+                      sources."is-buffer-1.1.5"
                       (sources."lexical-scope-1.2.0" // {
                         dependencies = [
-                          (sources."astw-2.0.0" // {
+                          (sources."astw-2.2.0" // {
                             dependencies = [
-                              sources."acorn-1.2.2"
+                              sources."acorn-4.0.11"
                             ];
                           })
                         ];
@@ -21680,9 +22289,9 @@ in
                   })
                   (sources."module-deps-4.1.1" // {
                     dependencies = [
-                      (sources."detective-4.3.2" // {
+                      (sources."detective-4.5.0" // {
                         dependencies = [
-                          sources."acorn-3.3.0"
+                          sources."acorn-4.0.11"
                         ];
                       })
                       sources."stream-combiner2-1.1.1"
@@ -21699,7 +22308,7 @@ in
                   sources."punycode-1.4.1"
                   sources."querystring-es3-0.2.1"
                   sources."read-only-stream-2.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -21744,9 +22353,9 @@ in
                       sources."minimist-1.2.0"
                     ];
                   })
-                  (sources."syntax-error-1.1.6" // {
+                  (sources."syntax-error-1.3.0" // {
                     dependencies = [
-                      sources."acorn-2.7.0"
+                      sources."acorn-4.0.11"
                     ];
                   })
                   sources."through2-2.0.3"
@@ -21797,18 +22406,18 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
                     ];
                   })
                   sources."bytes-2.3.0"
-                  (sources."compressible-2.0.9" // {
+                  (sources."compressible-2.0.10" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   (sources."debug-2.2.0" // {
@@ -21817,16 +22426,16 @@ in
                     ];
                   })
                   sources."on-headers-1.0.1"
-                  sources."vary-1.1.0"
+                  sources."vary-1.1.1"
                 ];
               })
-              (sources."express-4.14.1" // {
+              (sources."express-4.15.2" // {
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -21837,22 +22446,26 @@ in
                   sources."content-type-1.0.2"
                   sources."cookie-0.3.1"
                   sources."cookie-signature-1.0.6"
-                  (sources."debug-2.2.0" // {
+                  (sources."debug-2.6.1" // {
                     dependencies = [
-                      sources."ms-0.7.1"
+                      sources."ms-0.7.2"
                     ];
                   })
                   sources."depd-1.1.0"
                   sources."encodeurl-1.0.1"
                   sources."escape-html-1.0.3"
-                  sources."etag-1.7.0"
-                  (sources."finalhandler-0.5.1" // {
+                  sources."etag-1.8.0"
+                  (sources."finalhandler-1.0.1" // {
                     dependencies = [
-                      sources."statuses-1.3.1"
+                      (sources."debug-2.6.3" // {
+                        dependencies = [
+                          sources."ms-0.7.2"
+                        ];
+                      })
                       sources."unpipe-1.0.0"
                     ];
                   })
-                  sources."fresh-0.3.0"
+                  sources."fresh-0.5.0"
                   sources."merge-descriptors-1.0.1"
                   sources."methods-1.1.2"
                   (sources."on-finished-2.3.0" // {
@@ -21862,44 +22475,44 @@ in
                   })
                   sources."parseurl-1.3.1"
                   sources."path-to-regexp-0.1.7"
-                  (sources."proxy-addr-1.1.3" // {
+                  (sources."proxy-addr-1.1.4" // {
                     dependencies = [
                       sources."forwarded-0.1.0"
-                      sources."ipaddr.js-1.2.0"
+                      sources."ipaddr.js-1.3.0"
                     ];
                   })
-                  sources."qs-6.2.0"
+                  sources."qs-6.4.0"
                   sources."range-parser-1.2.0"
-                  (sources."send-0.14.2" // {
+                  (sources."send-0.15.1" // {
                     dependencies = [
                       sources."destroy-1.0.4"
-                      (sources."http-errors-1.5.1" // {
+                      (sources."http-errors-1.6.1" // {
                         dependencies = [
                           sources."inherits-2.0.3"
-                          sources."setprototypeof-1.0.2"
                         ];
                       })
                       sources."mime-1.3.4"
                       sources."ms-0.7.2"
-                      sources."statuses-1.3.1"
                     ];
                   })
-                  sources."serve-static-1.11.2"
+                  sources."serve-static-1.12.1"
+                  sources."setprototypeof-1.0.3"
+                  sources."statuses-1.3.1"
                   (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                     ];
                   })
                   sources."utils-merge-1.0.0"
-                  sources."vary-1.1.0"
+                  sources."vary-1.1.1"
                 ];
               })
-              sources."q-1.4.1"
+              sources."q-1.5.0"
             ];
           })
           (sources."dep-graph-1.1.0" // {
@@ -21938,10 +22551,11 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          (sources."init-package-json-1.9.4" // {
+          (sources."init-package-json-1.9.5" // {
             dependencies = [
-              (sources."glob-6.0.4" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
+                  sources."fs.realpath-1.0.0"
                   (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
@@ -21966,9 +22580,9 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."npm-package-arg-4.2.0" // {
+              (sources."npm-package-arg-4.2.1" // {
                 dependencies = [
-                  sources."hosted-git-info-2.2.0"
+                  sources."hosted-git-info-2.4.1"
                   sources."semver-5.3.0"
                 ];
               })
@@ -21978,16 +22592,16 @@ in
                   sources."mute-stream-0.0.7"
                 ];
               })
-              (sources."read-package-json-2.0.4" // {
+              (sources."read-package-json-2.0.5" // {
                 dependencies = [
                   (sources."json-parse-helpfulerror-1.0.3" // {
                     dependencies = [
                       sources."jju-1.3.0"
                     ];
                   })
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -22008,9 +22622,9 @@ in
                   sources."spdx-expression-parse-1.0.4"
                 ];
               })
-              (sources."validate-npm-package-name-2.2.2" // {
+              (sources."validate-npm-package-name-3.0.0" // {
                 dependencies = [
-                  sources."builtins-0.0.7"
+                  sources."builtins-1.0.3"
                 ];
               })
             ];
@@ -22020,7 +22634,7 @@ in
               sources."abbrev-1.1.0"
             ];
           })
-          (sources."npm-2.15.11" // {
+          (sources."npm-2.15.12" // {
             dependencies = [
               sources."abbrev-1.0.9"
               sources."ansi-0.3.1"
@@ -22057,13 +22671,13 @@ in
                 ];
               })
               sources."editor-1.0.0"
-              sources."fs-vacuum-1.2.9"
-              (sources."fs-write-stream-atomic-1.0.8" // {
+              sources."fs-vacuum-1.2.10"
+              (sources."fs-write-stream-atomic-1.0.10" // {
                 dependencies = [
                   sources."iferr-0.1.5"
                 ];
               })
-              sources."fstream-1.0.10"
+              sources."fstream-1.0.11"
               (sources."fstream-npm-1.1.1" // {
                 dependencies = [
                   sources."fstream-ignore-1.0.5"
@@ -22086,7 +22700,7 @@ in
               (sources."lru-cache-4.0.2" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
-                  sources."yallist-2.0.0"
+                  sources."yallist-2.1.2"
                 ];
               })
               (sources."minimatch-3.0.3" // {
@@ -22104,35 +22718,13 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."node-gyp-3.4.0" // {
+              (sources."node-gyp-3.6.0" // {
                 dependencies = [
-                  (sources."path-array-1.0.1" // {
-                    dependencies = [
-                      (sources."array-index-1.0.0" // {
-                        dependencies = [
-                          (sources."debug-2.6.1" // {
-                            dependencies = [
-                              sources."ms-0.7.2"
-                            ];
-                          })
-                          (sources."es6-symbol-3.1.0" // {
-                            dependencies = [
-                              sources."d-0.1.1"
-                              (sources."es5-ext-0.10.12" // {
-                                dependencies = [
-                                  sources."es6-iterator-2.0.0"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                    ];
-                  })
+                  sources."semver-5.3.0"
                 ];
               })
               sources."normalize-git-url-3.0.2"
-              (sources."normalize-package-data-2.3.5" // {
+              (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
@@ -22149,7 +22741,7 @@ in
                   (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -22201,10 +22793,11 @@ in
                   sources."util-extend-1.0.3"
                 ];
               })
-              (sources."read-package-json-2.0.4" // {
+              (sources."read-package-json-2.0.5" // {
                 dependencies = [
-                  (sources."glob-6.0.4" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
+                      sources."fs.realpath-1.0.0"
                       sources."path-is-absolute-1.0.1"
                     ];
                   })
@@ -22253,7 +22846,7 @@ in
                   sources."forever-agent-0.6.1"
                   (sources."form-data-1.0.1" // {
                     dependencies = [
-                      (sources."async-2.1.5" // {
+                      (sources."async-2.2.0" // {
                         dependencies = [
                           sources."lodash-4.17.4"
                         ];
@@ -22305,14 +22898,15 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.3.1" // {
+                      (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.10.2" // {
+                      (sources."sshpk-1.11.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -22330,14 +22924,14 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
-                  sources."node-uuid-1.4.7"
+                  sources."node-uuid-1.4.8"
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.2.2"
+                  sources."qs-6.2.3"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -22370,9 +22964,9 @@ in
                   sources."builtins-0.0.7"
                 ];
               })
-              (sources."which-1.2.12" // {
+              (sources."which-1.2.14" // {
                 dependencies = [
-                  sources."isexe-1.1.2"
+                  sources."isexe-2.0.0"
                 ];
               })
               sources."wrappy-1.0.2"
@@ -22419,7 +23013,7 @@ in
               })
               sources."json-stringify-safe-5.0.1"
               sources."mime-types-1.0.2"
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."qs-2.3.3"
               sources."tunnel-agent-0.4.3"
               (sources."tough-cookie-2.3.2" // {
@@ -22457,7 +23051,7 @@ in
           (sources."tar-1.0.2" // {
             dependencies = [
               sources."block-stream-0.0.9"
-              (sources."fstream-1.0.10" // {
+              (sources."fstream-1.0.11" // {
                 dependencies = [
                   sources."graceful-fs-4.1.11"
                   (sources."mkdirp-0.5.1" // {
@@ -22634,11 +23228,11 @@ in
               })
             ];
           })
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -22651,30 +23245,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."commander-2.9.0" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."is-property-1.0.2"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -22688,14 +23271,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -22713,15 +23297,17 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              sources."performance-now-0.2.0"
+              sources."qs-6.4.0"
+              sources."safe-buffer-5.0.1"
               sources."stringstream-0.0.5"
-              sources."tunnel-agent-0.4.3"
+              sources."tunnel-agent-0.6.0"
             ];
           })
           (sources."tough-cookie-2.3.2" // {
@@ -22806,7 +23392,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -22837,7 +23423,7 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -22855,7 +23441,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -22911,7 +23497,7 @@ in
       sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-2.1.0"
+      sources."clone-2.1.1"
       sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -22937,7 +23523,7 @@ in
         dependencies = [
           sources."through-2.3.8"
           sources."duplexer-0.1.1"
-          sources."from-0.1.3"
+          sources."from-0.1.7"
           sources."map-stream-0.1.0"
           sources."pause-stream-0.0.11"
           sources."split-0.3.3"
@@ -22948,9 +23534,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -23047,7 +23633,7 @@ in
       sources."lodash-3.1.0"
       (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // {
         dependencies = [
-          sources."ipaddr.js-1.2.0"
+          sources."ipaddr.js-1.3.0"
           (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // {
             dependencies = [
               sources."binaryheap-0.0.3"
@@ -23098,7 +23684,7 @@ in
               })
             ];
           })
-          sources."ipaddr.js-1.2.0"
+          sources."ipaddr.js-1.3.0"
         ];
       })
       (sources."nconf-0.7.1" // {
@@ -23134,7 +23720,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -23187,15 +23773,16 @@ in
       })
       sources."basic-auth-1.1.0"
       sources."cookie-signature-1.0.6"
-      (sources."cors-2.8.1" // {
+      (sources."cors-2.8.3" // {
         dependencies = [
-          sources."vary-1.1.0"
+          sources."object-assign-4.1.1"
+          sources."vary-1.1.1"
         ];
       })
       sources."docker-parse-image-3.0.1"
-      (sources."end-of-stream-1.1.0" // {
+      (sources."end-of-stream-1.4.0" // {
         dependencies = [
-          (sources."once-1.3.3" // {
+          (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -23228,7 +23815,7 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -23363,7 +23950,7 @@ in
           sources."split2-2.1.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -23400,7 +23987,7 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -23449,7 +24036,7 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -23500,7 +24087,7 @@ in
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.1.5" // {
+      (sources."async-2.2.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -23514,10 +24101,10 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -23530,47 +24117,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -23584,14 +24143,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -23609,20 +24169,22 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
@@ -23665,12 +24227,12 @@ in
                   (sources."lru-cache-4.0.2" // {
                     dependencies = [
                       sources."pseudomap-1.0.2"
-                      sources."yallist-2.0.0"
+                      sources."yallist-2.1.2"
                     ];
                   })
-                  (sources."which-1.2.12" // {
+                  (sources."which-1.2.14" // {
                     dependencies = [
-                      sources."isexe-1.1.2"
+                      sources."isexe-2.0.0"
                     ];
                   })
                 ];
@@ -23767,9 +24329,9 @@ in
           })
           sources."map-obj-1.0.1"
           sources."minimist-1.2.0"
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -23808,7 +24370,7 @@ in
                       sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
-                          (sources."error-ex-1.3.0" // {
+                          (sources."error-ex-1.3.1" // {
                             dependencies = [
                               sources."is-arrayish-0.2.1"
                             ];
@@ -23880,10 +24442,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.16.1";
+    version = "3.18.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz";
-      sha1 = "9bc31fc7341692cf772e80607508f67d711c5609";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz";
+      sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
@@ -23912,7 +24474,7 @@ in
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -23924,34 +24486,34 @@ in
           })
         ];
       })
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
       })
-      (sources."doctrine-1.5.0" // {
+      (sources."doctrine-2.0.0" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
       })
       (sources."escope-3.6.0" // {
         dependencies = [
-          (sources."es6-map-0.1.4" // {
+          (sources."es6-map-0.1.5" // {
             dependencies = [
-              sources."d-0.1.1"
-              sources."es5-ext-0.10.12"
-              sources."es6-iterator-2.0.0"
-              sources."es6-set-0.1.4"
-              sources."es6-symbol-3.1.0"
-              sources."event-emitter-0.3.4"
+              sources."d-1.0.0"
+              sources."es5-ext-0.10.15"
+              sources."es6-iterator-2.0.1"
+              sources."es6-set-0.1.5"
+              sources."es6-symbol-3.1.1"
+              sources."event-emitter-0.3.5"
             ];
           })
-          (sources."es6-weak-map-2.0.1" // {
+          (sources."es6-weak-map-2.0.2" // {
             dependencies = [
-              sources."d-0.1.1"
-              sources."es5-ext-0.10.12"
-              sources."es6-iterator-2.0.0"
-              sources."es6-symbol-3.1.0"
+              sources."d-1.0.0"
+              sources."es5-ext-0.10.15"
+              sources."es6-iterator-2.0.1"
+              sources."es6-symbol-3.1.1"
             ];
           })
           (sources."esrecurse-4.1.0" // {
@@ -23972,6 +24534,7 @@ in
           })
         ];
       })
+      sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       (sources."file-entry-cache-2.0.0" // {
@@ -24040,8 +24603,8 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."globals-9.16.0"
-      sources."ignore-3.2.4"
+      sources."globals-9.17.0"
+      sources."ignore-3.2.6"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
         dependencies = [
@@ -24116,7 +24679,7 @@ in
           sources."tryit-1.0.3"
         ];
       })
-      (sources."js-yaml-3.8.1" // {
+      (sources."js-yaml-3.8.2" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -24166,9 +24729,9 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      (sources."shelljs-0.7.6" // {
+      (sources."shelljs-0.7.7" // {
         dependencies = [
-          sources."interpret-1.0.1"
+          sources."interpret-1.0.2"
           (sources."rechoir-0.6.2" // {
             dependencies = [
               (sources."resolve-1.3.2" // {
@@ -24184,7 +24747,7 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.11.3" // {
+          (sources."ajv-4.11.5" // {
             dependencies = [
               sources."co-4.6.0"
             ];
@@ -24388,15 +24951,19 @@ in
                       sources."is-extglob-1.0.0"
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
+                        ];
+                      })
+                      (sources."normalize-path-2.1.1" // {
+                        dependencies = [
+                          sources."remove-trailing-separator-1.0.1"
                         ];
                       })
-                      sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
                           (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-1.0.1"
+                              sources."for-in-1.0.2"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -24434,7 +25001,7 @@ in
               (sources."readdirp-2.1.0" // {
                 dependencies = [
                   sources."graceful-fs-4.1.11"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -24450,16 +25017,22 @@ in
               (sources."fsevents-1.1.1" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.33" // {
+                  (sources."node-pre-gyp-0.6.34" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
                           sources."minimist-0.0.8"
                         ];
                       })
-                      (sources."nopt-3.0.6" // {
+                      (sources."nopt-4.0.1" // {
                         dependencies = [
                           sources."abbrev-1.1.0"
+                          (sources."osenv-0.1.4" // {
+                            dependencies = [
+                              sources."os-homedir-1.0.2"
+                              sources."os-tmpdir-1.0.2"
+                            ];
+                          })
                         ];
                       })
                       (sources."npmlog-4.0.2" // {
@@ -24467,7 +25040,7 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.3" // {
+                              (sources."readable-stream-2.2.6" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -24507,7 +25080,7 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -24515,11 +25088,11 @@ in
                           sources."strip-json-comments-2.0.1"
                         ];
                       })
-                      (sources."request-2.79.0" // {
+                      (sources."request-2.81.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
                           sources."aws4-1.6.0"
-                          sources."caseless-0.11.0"
+                          sources."caseless-0.12.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
                               sources."delayed-stream-1.0.0"
@@ -24532,47 +25105,19 @@ in
                               sources."asynckit-0.4.0"
                             ];
                           })
-                          (sources."har-validator-2.0.6" // {
+                          (sources."har-validator-4.2.1" // {
                             dependencies = [
-                              (sources."chalk-1.1.3" // {
+                              (sources."ajv-4.11.5" // {
                                 dependencies = [
-                                  sources."ansi-styles-2.2.1"
-                                  sources."escape-string-regexp-1.0.5"
-                                  (sources."has-ansi-2.0.0" // {
+                                  sources."co-4.6.0"
+                                  (sources."json-stable-stringify-1.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.1.1"
+                                      sources."jsonify-0.0.0"
                                     ];
                                   })
-                                  (sources."strip-ansi-3.0.1" // {
-                                    dependencies = [
-                                      sources."ansi-regex-2.1.1"
-                                    ];
-                                  })
-                                  sources."supports-color-2.0.0"
-                                ];
-                              })
-                              (sources."commander-2.9.0" // {
-                                dependencies = [
-                                  sources."graceful-readlink-1.0.1"
-                                ];
-                              })
-                              (sources."is-my-json-valid-2.16.0" // {
-                                dependencies = [
-                                  sources."generate-function-2.0.0"
-                                  (sources."generate-object-property-1.2.0" // {
-                                    dependencies = [
-                                      sources."is-property-1.0.2"
-                                    ];
-                                  })
-                                  sources."jsonpointer-4.0.1"
-                                  sources."xtend-4.0.1"
-                                ];
-                              })
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
                                 ];
                               })
+                              sources."har-schema-1.0.5"
                             ];
                           })
                           (sources."hawk-3.1.3" // {
@@ -24586,14 +25131,15 @@ in
                           (sources."http-signature-1.1.1" // {
                             dependencies = [
                               sources."assert-plus-0.2.0"
-                              (sources."jsprim-1.3.1" // {
+                              (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.10.2" // {
+                              (sources."sshpk-1.11.0" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
@@ -24611,24 +25157,26 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.14" // {
+                          (sources."mime-types-2.1.15" // {
                             dependencies = [
-                              sources."mime-db-1.26.0"
+                              sources."mime-db-1.27.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.3.1"
+                          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.4.3"
+                          sources."tunnel-agent-0.6.0"
                           sources."uuid-3.0.1"
                         ];
                       })
-                      (sources."rimraf-2.5.4" // {
+                      (sources."rimraf-2.6.1" // {
                         dependencies = [
                           (sources."glob-7.1.1" // {
                             dependencies = [
@@ -24651,32 +25199,32 @@ in
                       (sources."tar-2.2.1" // {
                         dependencies = [
                           sources."block-stream-0.0.9"
-                          (sources."fstream-1.0.10" // {
+                          (sources."fstream-1.0.11" // {
                             dependencies = [
                               sources."graceful-fs-4.1.11"
                             ];
                           })
                         ];
                       })
-                      (sources."tar-pack-3.3.0" // {
+                      (sources."tar-pack-3.4.0" // {
                         dependencies = [
-                          (sources."debug-2.2.0" // {
+                          (sources."debug-2.6.3" // {
                             dependencies = [
-                              sources."ms-0.7.1"
+                              sources."ms-0.7.2"
                             ];
                           })
-                          (sources."fstream-1.0.10" // {
+                          (sources."fstream-1.0.11" // {
                             dependencies = [
                               sources."graceful-fs-4.1.11"
                             ];
                           })
                           sources."fstream-ignore-1.0.5"
-                          (sources."once-1.3.3" // {
+                          (sources."once-1.4.0" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
                             ];
                           })
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -24837,17 +25385,24 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.3";
+    version = "0.5.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
-      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz";
+      sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
+      (sources."async-2.2.0" // {
+        dependencies = [
+          sources."lodash-4.17.4"
+        ];
+      })
+      sources."lodash.groupby-4.6.0"
       (sources."minilog-2.0.8" // {
         dependencies = [
           sources."microee-0.0.2"
         ];
       })
+      sources."simple-git-1.69.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -24991,11 +25546,9 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.7.5" // {
+          (sources."uglify-js-2.8.20" // {
             dependencies = [
-              sources."async-0.2.10"
               sources."source-map-0.5.6"
-              sources."uglify-to-browserify-1.0.2"
               (sources."yargs-3.10.0" // {
                 dependencies = [
                   sources."camelcase-1.2.1"
@@ -25007,7 +25560,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -25023,7 +25576,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -25039,6 +25592,7 @@ in
                   sources."window-size-0.1.0"
                 ];
               })
+              sources."uglify-to-browserify-1.0.2"
             ];
           })
           sources."void-elements-2.0.1"
@@ -25182,7 +25736,7 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -25204,7 +25758,7 @@ in
           })
         ];
       })
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       (sources."liftoff-2.3.0" // {
         dependencies = [
           sources."extend-3.0.0"
@@ -25260,15 +25814,19 @@ in
                   sources."is-extglob-1.0.0"
                   (sources."kind-of-3.1.0" // {
                     dependencies = [
-                      sources."is-buffer-1.1.4"
+                      sources."is-buffer-1.1.5"
+                    ];
+                  })
+                  (sources."normalize-path-2.1.1" // {
+                    dependencies = [
+                      sources."remove-trailing-separator-1.0.1"
                     ];
                   })
-                  sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-1.0.1"
+                          sources."for-in-1.0.2"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -25309,9 +25867,9 @@ in
                             ];
                           })
                           sources."ini-1.3.4"
-                          (sources."which-1.2.12" // {
+                          (sources."which-1.2.14" // {
                             dependencies = [
-                              sources."isexe-1.1.2"
+                              sources."isexe-2.0.0"
                             ];
                           })
                         ];
@@ -25394,7 +25952,7 @@ in
           sources."os-homedir-1.0.2"
         ];
       })
-      (sources."v8flags-2.0.11" // {
+      (sources."v8flags-2.0.12" // {
         dependencies = [
           sources."user-home-1.1.1"
         ];
@@ -25524,7 +26082,7 @@ in
     dependencies = [
       (sources."http-proxy-1.0.2" // {
         dependencies = [
-          sources."eventemitter3-2.0.2"
+          sources."eventemitter3-2.0.3"
         ];
       })
       sources."redis-0.10.3"
@@ -25749,11 +26307,9 @@ in
               sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.7.5" // {
+          (sources."uglify-js-2.8.20" // {
             dependencies = [
-              sources."async-0.2.10"
               sources."source-map-0.5.6"
-              sources."uglify-to-browserify-1.0.2"
               (sources."yargs-3.10.0" // {
                 dependencies = [
                   sources."camelcase-1.2.1"
@@ -25765,7 +26321,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -25781,7 +26337,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -25797,11 +26353,12 @@ in
                   sources."window-size-0.1.0"
                 ];
               })
+              sources."uglify-to-browserify-1.0.2"
             ];
           })
         ];
       })
-      (sources."js-yaml-3.8.1" // {
+      (sources."js-yaml-3.8.2" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -25828,9 +26385,9 @@ in
           sources."has-flag-1.0.0"
         ];
       })
-      (sources."which-1.2.12" // {
+      (sources."which-1.2.14" // {
         dependencies = [
-          sources."isexe-1.1.2"
+          sources."isexe-2.0.0"
         ];
       })
       sources."wordwrap-1.0.0"
@@ -25948,15 +26505,15 @@ in
   json = nodeEnv.buildNodePackage {
     name = "json";
     packageName = "json";
-    version = "9.0.4";
+    version = "9.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz";
-      sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce";
+      url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz";
+      sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "a 'json' command for massaging and processing JSON on the command line";
-      homepage = https://github.com/trentm/json;
+      homepage = "https://github.com/trentm/json#readme";
     };
     production = true;
   };
@@ -25978,10 +26535,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.1";
+    version = "3.8.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
-      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
+      sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
     };
     dependencies = [
       (sources."argparse-1.0.9" // {
@@ -26008,8 +26565,8 @@ in
       sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
-      (sources."body-parser-1.16.1" // {
+      sources."bluebird-3.5.0"
+      (sources."body-parser-1.17.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
@@ -26019,10 +26576,10 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.1" // {
+          (sources."http-errors-1.6.1" // {
             dependencies = [
               sources."inherits-2.0.3"
-              sources."setprototypeof-1.0.2"
+              sources."setprototypeof-1.0.3"
               sources."statuses-1.3.1"
             ];
           })
@@ -26032,7 +26589,7 @@ in
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.1"
+          sources."qs-6.4.0"
           (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
@@ -26041,9 +26598,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -26095,15 +26652,19 @@ in
                   sources."is-extglob-1.0.0"
                   (sources."kind-of-3.1.0" // {
                     dependencies = [
-                      sources."is-buffer-1.1.4"
+                      sources."is-buffer-1.1.5"
+                    ];
+                  })
+                  (sources."normalize-path-2.1.1" // {
+                    dependencies = [
+                      sources."remove-trailing-separator-1.0.1"
                     ];
                   })
-                  sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-1.0.1"
+                          sources."for-in-1.0.2"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -26141,7 +26702,7 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -26157,16 +26718,22 @@ in
           (sources."fsevents-1.1.1" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.33" // {
+              (sources."node-pre-gyp-0.6.34" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."nopt-3.0.6" // {
+                  (sources."nopt-4.0.1" // {
                     dependencies = [
                       sources."abbrev-1.1.0"
+                      (sources."osenv-0.1.4" // {
+                        dependencies = [
+                          sources."os-homedir-1.0.2"
+                          sources."os-tmpdir-1.0.2"
+                        ];
+                      })
                     ];
                   })
                   (sources."npmlog-4.0.2" // {
@@ -26174,7 +26741,7 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -26214,7 +26781,7 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.1.7" // {
+                  (sources."rc-1.2.0" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
@@ -26222,11 +26789,11 @@ in
                       sources."strip-json-comments-2.0.1"
                     ];
                   })
-                  (sources."request-2.79.0" // {
+                  (sources."request-2.81.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
                       sources."aws4-1.6.0"
-                      sources."caseless-0.11.0"
+                      sources."caseless-0.12.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
                           sources."delayed-stream-1.0.0"
@@ -26239,47 +26806,19 @@ in
                           sources."asynckit-0.4.0"
                         ];
                       })
-                      (sources."har-validator-2.0.6" // {
+                      (sources."har-validator-4.2.1" // {
                         dependencies = [
-                          (sources."chalk-1.1.3" // {
+                          (sources."ajv-4.11.5" // {
                             dependencies = [
-                              sources."ansi-styles-2.2.1"
-                              sources."escape-string-regexp-1.0.5"
-                              (sources."has-ansi-2.0.0" // {
+                              sources."co-4.6.0"
+                              (sources."json-stable-stringify-1.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."jsonify-0.0.0"
                                 ];
                               })
-                              (sources."strip-ansi-3.0.1" // {
-                                dependencies = [
-                                  sources."ansi-regex-2.1.1"
-                                ];
-                              })
-                              sources."supports-color-2.0.0"
-                            ];
-                          })
-                          (sources."commander-2.9.0" // {
-                            dependencies = [
-                              sources."graceful-readlink-1.0.1"
-                            ];
-                          })
-                          (sources."is-my-json-valid-2.16.0" // {
-                            dependencies = [
-                              sources."generate-function-2.0.0"
-                              (sources."generate-object-property-1.2.0" // {
-                                dependencies = [
-                                  sources."is-property-1.0.2"
-                                ];
-                              })
-                              sources."jsonpointer-4.0.1"
-                              sources."xtend-4.0.1"
-                            ];
-                          })
-                          (sources."pinkie-promise-2.0.1" // {
-                            dependencies = [
-                              sources."pinkie-2.0.4"
                             ];
                           })
+                          sources."har-schema-1.0.5"
                         ];
                       })
                       (sources."hawk-3.1.3" // {
@@ -26293,14 +26832,15 @@ in
                       (sources."http-signature-1.1.1" // {
                         dependencies = [
                           sources."assert-plus-0.2.0"
-                          (sources."jsprim-1.3.1" // {
+                          (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.10.2" // {
+                          (sources."sshpk-1.11.0" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
@@ -26318,46 +26858,46 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.3.1"
+                      sources."performance-now-0.2.0"
+                      sources."qs-6.4.0"
                       sources."stringstream-0.0.5"
                       (sources."tough-cookie-2.3.2" // {
                         dependencies = [
                           sources."punycode-1.4.1"
                         ];
                       })
-                      sources."tunnel-agent-0.4.3"
+                      sources."tunnel-agent-0.6.0"
                       sources."uuid-3.0.1"
                     ];
                   })
-                  sources."rimraf-2.5.4"
                   sources."semver-5.3.0"
                   (sources."tar-2.2.1" // {
                     dependencies = [
                       sources."block-stream-0.0.9"
-                      sources."fstream-1.0.10"
+                      sources."fstream-1.0.11"
                     ];
                   })
-                  (sources."tar-pack-3.3.0" // {
+                  (sources."tar-pack-3.4.0" // {
                     dependencies = [
-                      (sources."debug-2.2.0" // {
+                      (sources."debug-2.6.3" // {
                         dependencies = [
-                          sources."ms-0.7.1"
+                          sources."ms-0.7.2"
                         ];
                       })
-                      sources."fstream-1.0.10"
+                      sources."fstream-1.0.11"
                       sources."fstream-ignore-1.0.5"
-                      (sources."once-1.3.3" // {
+                      (sources."once-1.4.0" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
                       })
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -26503,9 +27043,9 @@ in
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
@@ -26617,7 +27157,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.12" // {
+      (sources."useragent-2.1.13" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -26670,17 +27210,17 @@ in
                 dependencies = [
                   (sources."accepts-1.2.13" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."negotiator-0.5.3"
                     ];
                   })
-                  (sources."compressible-2.0.9" // {
+                  (sources."compressible-2.0.10" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                 ];
@@ -26692,12 +27232,11 @@ in
               })
               (sources."csurf-1.8.3" // {
                 dependencies = [
-                  (sources."csrf-3.0.4" // {
+                  (sources."csrf-3.0.6" // {
                     dependencies = [
-                      sources."base64-url-1.3.3"
                       sources."rndm-1.2.0"
                       sources."tsscmp-1.0.5"
-                      (sources."uid-safe-2.1.3" // {
+                      (sources."uid-safe-2.1.4" // {
                         dependencies = [
                           sources."random-bytes-1.0.0"
                         ];
@@ -26710,9 +27249,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -26747,14 +27286,14 @@ in
                   sources."statuses-1.3.1"
                 ];
               })
-              (sources."method-override-2.3.7" // {
+              (sources."method-override-2.3.8" // {
                 dependencies = [
-                  (sources."debug-2.3.3" // {
+                  (sources."debug-2.6.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
                   })
-                  sources."vary-1.1.0"
+                  sources."vary-1.1.1"
                 ];
               })
               (sources."morgan-1.6.1" // {
@@ -26801,9 +27340,9 @@ in
                   })
                   sources."batch-0.5.3"
                   sources."escape-html-1.0.3"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                 ];
@@ -26830,9 +27369,9 @@ in
               (sources."type-is-1.6.14" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                 ];
@@ -26954,7 +27493,7 @@ in
     dependencies = [
       (sources."through2-2.0.3" // {
         dependencies = [
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -27072,15 +27611,19 @@ in
                   sources."is-glob-2.0.1"
                   (sources."kind-of-3.1.0" // {
                     dependencies = [
-                      sources."is-buffer-1.1.4"
+                      sources."is-buffer-1.1.5"
+                    ];
+                  })
+                  (sources."normalize-path-2.1.1" // {
+                    dependencies = [
+                      sources."remove-trailing-separator-1.0.1"
                     ];
                   })
-                  sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-1.0.1"
+                          sources."for-in-1.0.2"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -27145,7 +27688,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."gulp-sourcemaps-1.6.0" // {
             dependencies = [
-              sources."convert-source-map-1.4.0"
+              sources."convert-source-map-1.5.0"
             ];
           })
           sources."is-valid-glob-0.3.0"
@@ -27158,7 +27701,7 @@ in
             ];
           })
           sources."object-assign-4.1.1"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -27354,10 +27897,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.1.1";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz";
-      sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz";
+      sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408";
     };
     dependencies = [
       sources."optparse-1.0.5"
@@ -27369,7 +27912,7 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -27387,9 +27930,9 @@ in
               sources."minimist-0.0.8"
             ];
           })
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -27407,9 +27950,9 @@ in
               })
             ];
           })
-          (sources."npm-package-arg-4.2.0" // {
+          (sources."npm-package-arg-4.2.1" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
             ];
           })
           (sources."once-1.4.0" // {
@@ -27417,11 +27960,11 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -27434,47 +27977,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."chalk-1.1.3" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -27488,14 +28003,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -27513,20 +28029,22 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              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.4.3"
+              sources."tunnel-agent-0.6.0"
               sources."uuid-3.0.1"
             ];
           })
@@ -27563,7 +28081,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -27644,7 +28162,7 @@ in
       (sources."tar-1.0.3" // {
         dependencies = [
           sources."block-stream-0.0.9"
-          (sources."fstream-1.0.10" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
@@ -27722,19 +28240,20 @@ in
     meta = {
       description = "Generate Nix expressions to build NPM packages";
       homepage = https://github.com/svanderburg/node2nix;
+      license = "MIT";
     };
     production = true;
   };
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.5.0";
+    version = "3.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz";
+      sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6";
     };
     dependencies = [
-      (sources."fstream-1.0.10" // {
+      (sources."fstream-1.0.11" // {
         dependencies = [
           sources."inherits-2.0.3"
         ];
@@ -27782,7 +28301,7 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -27829,11 +28348,11 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -27846,47 +28365,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -27900,14 +28391,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -27925,20 +28417,22 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
@@ -27950,9 +28444,9 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."which-1.2.12" // {
+      (sources."which-1.2.14" // {
         dependencies = [
-          sources."isexe-1.1.2"
+          sources."isexe-2.0.0"
         ];
       })
     ];
@@ -27967,10 +28461,10 @@ in
   node-inspector = nodeEnv.buildNodePackage {
     name = "node-inspector";
     packageName = "node-inspector";
-    version = "0.12.8";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz";
-      sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz";
+      sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -28043,9 +28537,9 @@ in
                         ];
                       })
                       sources."map-obj-1.0.1"
-                      (sources."normalize-package-data-2.3.5" // {
+                      (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.2.0"
+                          sources."hosted-git-info-2.4.1"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -28083,7 +28577,7 @@ in
                                   sources."graceful-fs-4.1.11"
                                   (sources."parse-json-2.2.0" // {
                                     dependencies = [
-                                      (sources."error-ex-1.3.0" // {
+                                      (sources."error-ex-1.3.1" // {
                                         dependencies = [
                                           sources."is-arrayish-0.2.1"
                                         ];
@@ -28154,18 +28648,18 @@ in
           })
         ];
       })
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
       })
-      (sources."express-4.14.1" // {
+      (sources."express-4.15.2" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -28176,22 +28670,26 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
-          sources."etag-1.7.0"
-          (sources."finalhandler-0.5.1" // {
+          sources."etag-1.8.0"
+          (sources."finalhandler-1.0.1" // {
             dependencies = [
-              sources."statuses-1.3.1"
+              (sources."debug-2.6.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
               sources."unpipe-1.0.0"
             ];
           })
-          sources."fresh-0.3.0"
+          sources."fresh-0.5.0"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
@@ -28201,41 +28699,41 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.4" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
-          sources."qs-6.2.0"
+          sources."qs-6.4.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.2" // {
+          (sources."send-0.15.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.1" // {
+              (sources."http-errors-1.6.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.2"
-              sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.2"
+          sources."serve-static-1.12.1"
+          sources."setprototypeof-1.0.3"
+          sources."statuses-1.3.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."glob-5.0.15" // {
@@ -28264,7 +28762,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -28273,11 +28771,11 @@ in
         ];
       })
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.0" // {
+      (sources."serve-favicon-2.4.2" // {
         dependencies = [
           sources."etag-1.8.0"
-          sources."fresh-0.4.0"
-          sources."ms-0.7.2"
+          sources."fresh-0.5.0"
+          sources."ms-1.0.0"
           sources."parseurl-1.3.1"
         ];
       })
@@ -28286,19 +28784,25 @@ in
           sources."truncate-1.0.5"
         ];
       })
-      (sources."v8-debug-0.7.7" // {
+      (sources."v8-debug-1.0.1" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.33" // {
+          (sources."node-pre-gyp-0.6.34" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."nopt-3.0.6" // {
+              (sources."nopt-4.0.1" // {
                 dependencies = [
                   sources."abbrev-1.1.0"
+                  (sources."osenv-0.1.4" // {
+                    dependencies = [
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."npmlog-4.0.2" // {
@@ -28306,7 +28810,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -28347,11 +28851,11 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.79.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
-                  sources."caseless-0.11.0"
+                  sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
                       sources."delayed-stream-1.0.0"
@@ -28364,47 +28868,19 @@ in
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-2.0.6" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."chalk-1.1.3" // {
+                      (sources."ajv-4.11.5" // {
                         dependencies = [
-                          sources."ansi-styles-2.2.1"
-                          sources."escape-string-regexp-1.0.5"
-                          (sources."has-ansi-2.0.0" // {
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."jsonify-0.0.0"
                             ];
                           })
-                          (sources."strip-ansi-3.0.1" // {
-                            dependencies = [
-                              sources."ansi-regex-2.1.1"
-                            ];
-                          })
-                          sources."supports-color-2.0.0"
-                        ];
-                      })
-                      (sources."commander-2.9.0" // {
-                        dependencies = [
-                          sources."graceful-readlink-1.0.1"
-                        ];
-                      })
-                      (sources."is-my-json-valid-2.16.0" // {
-                        dependencies = [
-                          sources."generate-function-2.0.0"
-                          (sources."generate-object-property-1.2.0" // {
-                            dependencies = [
-                              sources."is-property-1.0.2"
-                            ];
-                          })
-                          sources."jsonpointer-4.0.1"
-                          sources."xtend-4.0.1"
-                        ];
-                      })
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
                         ];
                       })
+                      sources."har-schema-1.0.5"
                     ];
                   })
                   (sources."hawk-3.1.3" // {
@@ -28418,14 +28894,15 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.3.1" // {
+                      (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.10.2" // {
+                      (sources."sshpk-1.11.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -28443,24 +28920,26 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.1"
+                  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.4.3"
+                  sources."tunnel-agent-0.6.0"
                   sources."uuid-3.0.1"
                 ];
               })
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -28494,7 +28973,7 @@ in
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                     ];
@@ -28502,14 +28981,9 @@ in
                   sources."inherits-2.0.3"
                 ];
               })
-              (sources."tar-pack-3.3.0" // {
+              (sources."tar-pack-3.4.0" // {
                 dependencies = [
-                  (sources."debug-2.2.0" // {
-                    dependencies = [
-                      sources."ms-0.7.1"
-                    ];
-                  })
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                       sources."inherits-2.0.3"
@@ -28530,17 +29004,17 @@ in
                       })
                     ];
                   })
-                  (sources."once-1.3.3" // {
+                  (sources."once-1.4.0" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
                       sources."string_decoder-0.10.31"
                       sources."util-deprecate-1.0.2"
@@ -28553,19 +29027,25 @@ in
           })
         ];
       })
-      (sources."v8-profiler-5.6.5" // {
+      (sources."v8-profiler-5.7.0" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.33" // {
+          (sources."node-pre-gyp-0.6.34" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."nopt-3.0.6" // {
+              (sources."nopt-4.0.1" // {
                 dependencies = [
                   sources."abbrev-1.1.0"
+                  (sources."osenv-0.1.4" // {
+                    dependencies = [
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."npmlog-4.0.2" // {
@@ -28573,7 +29053,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -28614,11 +29094,11 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.79.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
-                  sources."caseless-0.11.0"
+                  sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
                       sources."delayed-stream-1.0.0"
@@ -28631,47 +29111,19 @@ in
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-2.0.6" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."chalk-1.1.3" // {
+                      (sources."ajv-4.11.5" // {
                         dependencies = [
-                          sources."ansi-styles-2.2.1"
-                          sources."escape-string-regexp-1.0.5"
-                          (sources."has-ansi-2.0.0" // {
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."jsonify-0.0.0"
                             ];
                           })
-                          (sources."strip-ansi-3.0.1" // {
-                            dependencies = [
-                              sources."ansi-regex-2.1.1"
-                            ];
-                          })
-                          sources."supports-color-2.0.0"
-                        ];
-                      })
-                      (sources."commander-2.9.0" // {
-                        dependencies = [
-                          sources."graceful-readlink-1.0.1"
-                        ];
-                      })
-                      (sources."is-my-json-valid-2.16.0" // {
-                        dependencies = [
-                          sources."generate-function-2.0.0"
-                          (sources."generate-object-property-1.2.0" // {
-                            dependencies = [
-                              sources."is-property-1.0.2"
-                            ];
-                          })
-                          sources."jsonpointer-4.0.1"
-                          sources."xtend-4.0.1"
-                        ];
-                      })
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
                         ];
                       })
+                      sources."har-schema-1.0.5"
                     ];
                   })
                   (sources."hawk-3.1.3" // {
@@ -28685,14 +29137,15 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.3.1" // {
+                      (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.10.2" // {
+                      (sources."sshpk-1.11.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -28710,24 +29163,26 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.1"
+                  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.4.3"
+                  sources."tunnel-agent-0.6.0"
                   sources."uuid-3.0.1"
                 ];
               })
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -28761,7 +29216,7 @@ in
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                     ];
@@ -28769,14 +29224,9 @@ in
                   sources."inherits-2.0.3"
                 ];
               })
-              (sources."tar-pack-3.3.0" // {
+              (sources."tar-pack-3.4.0" // {
                 dependencies = [
-                  (sources."debug-2.2.0" // {
-                    dependencies = [
-                      sources."ms-0.7.1"
-                    ];
-                  })
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                       sources."inherits-2.0.3"
@@ -28797,17 +29247,17 @@ in
                       })
                     ];
                   })
-                  (sources."once-1.3.3" // {
+                  (sources."once-1.4.0" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
                       sources."string_decoder-0.10.31"
                       sources."util-deprecate-1.0.2"
@@ -28820,12 +29270,12 @@ in
           })
         ];
       })
-      (sources."which-1.2.12" // {
+      (sources."which-1.2.14" // {
         dependencies = [
-          sources."isexe-1.1.2"
+          sources."isexe-2.0.0"
         ];
       })
-      (sources."ws-1.1.2" // {
+      (sources."ws-1.1.4" // {
         dependencies = [
           sources."options-0.0.6"
           sources."ultron-1.0.2"
@@ -28884,10 +29334,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.33";
+    version = "0.6.34";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
-      sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
+      sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -28895,9 +29345,15 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."nopt-3.0.6" // {
+      (sources."nopt-4.0.1" // {
         dependencies = [
           sources."abbrev-1.1.0"
+          (sources."osenv-0.1.4" // {
+            dependencies = [
+              sources."os-homedir-1.0.2"
+              sources."os-tmpdir-1.0.2"
+            ];
+          })
         ];
       })
       (sources."npmlog-4.0.2" // {
@@ -28905,7 +29361,7 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -28946,7 +29402,7 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -28954,11 +29410,11 @@ in
           sources."strip-json-comments-2.0.1"
         ];
       })
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -28971,47 +29427,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -29025,14 +29453,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -29050,24 +29479,26 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
-      (sources."rimraf-2.5.4" // {
+      (sources."rimraf-2.6.1" // {
         dependencies = [
           (sources."glob-7.1.1" // {
             dependencies = [
@@ -29102,7 +29533,7 @@ in
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
-          (sources."fstream-1.0.10" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
             ];
@@ -29110,14 +29541,14 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."tar-pack-3.3.0" // {
+      (sources."tar-pack-3.4.0" // {
         dependencies = [
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
-          (sources."fstream-1.0.10" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
               sources."inherits-2.0.3"
@@ -29138,17 +29569,17 @@ in
               })
             ];
           })
-          (sources."once-1.3.3" // {
+          (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -29220,15 +29651,19 @@ in
                   sources."is-extglob-1.0.0"
                   (sources."kind-of-3.1.0" // {
                     dependencies = [
-                      sources."is-buffer-1.1.4"
+                      sources."is-buffer-1.1.5"
+                    ];
+                  })
+                  (sources."normalize-path-2.1.1" // {
+                    dependencies = [
+                      sources."remove-trailing-separator-1.0.1"
                     ];
                   })
-                  sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-1.0.1"
+                          sources."for-in-1.0.2"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -29267,7 +29702,7 @@ in
           (sources."readdirp-2.1.0" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -29283,16 +29718,22 @@ in
           (sources."fsevents-1.1.1" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.33" // {
+              (sources."node-pre-gyp-0.6.34" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."nopt-3.0.6" // {
+                  (sources."nopt-4.0.1" // {
                     dependencies = [
                       sources."abbrev-1.1.0"
+                      (sources."osenv-0.1.4" // {
+                        dependencies = [
+                          sources."os-homedir-1.0.2"
+                          sources."os-tmpdir-1.0.2"
+                        ];
+                      })
                     ];
                   })
                   (sources."npmlog-4.0.2" // {
@@ -29300,7 +29741,7 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -29340,7 +29781,7 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.1.7" // {
+                  (sources."rc-1.2.0" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
@@ -29348,11 +29789,11 @@ in
                       sources."strip-json-comments-2.0.1"
                     ];
                   })
-                  (sources."request-2.79.0" // {
+                  (sources."request-2.81.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
                       sources."aws4-1.6.0"
-                      sources."caseless-0.11.0"
+                      sources."caseless-0.12.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
                           sources."delayed-stream-1.0.0"
@@ -29365,47 +29806,19 @@ in
                           sources."asynckit-0.4.0"
                         ];
                       })
-                      (sources."har-validator-2.0.6" // {
+                      (sources."har-validator-4.2.1" // {
                         dependencies = [
-                          (sources."chalk-1.1.3" // {
+                          (sources."ajv-4.11.5" // {
                             dependencies = [
-                              sources."ansi-styles-2.2.1"
-                              sources."escape-string-regexp-1.0.5"
-                              (sources."has-ansi-2.0.0" // {
+                              sources."co-4.6.0"
+                              (sources."json-stable-stringify-1.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."jsonify-0.0.0"
                                 ];
                               })
-                              (sources."strip-ansi-3.0.1" // {
-                                dependencies = [
-                                  sources."ansi-regex-2.1.1"
-                                ];
-                              })
-                              sources."supports-color-2.0.0"
-                            ];
-                          })
-                          (sources."commander-2.9.0" // {
-                            dependencies = [
-                              sources."graceful-readlink-1.0.1"
-                            ];
-                          })
-                          (sources."is-my-json-valid-2.16.0" // {
-                            dependencies = [
-                              sources."generate-function-2.0.0"
-                              (sources."generate-object-property-1.2.0" // {
-                                dependencies = [
-                                  sources."is-property-1.0.2"
-                                ];
-                              })
-                              sources."jsonpointer-4.0.1"
-                              sources."xtend-4.0.1"
-                            ];
-                          })
-                          (sources."pinkie-promise-2.0.1" // {
-                            dependencies = [
-                              sources."pinkie-2.0.4"
                             ];
                           })
+                          sources."har-schema-1.0.5"
                         ];
                       })
                       (sources."hawk-3.1.3" // {
@@ -29419,14 +29832,15 @@ in
                       (sources."http-signature-1.1.1" // {
                         dependencies = [
                           sources."assert-plus-0.2.0"
-                          (sources."jsprim-1.3.1" // {
+                          (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.10.2" // {
+                          (sources."sshpk-1.11.0" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
@@ -29444,24 +29858,26 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.15" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.27.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.3.1"
+                      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.4.3"
+                      sources."tunnel-agent-0.6.0"
                       sources."uuid-3.0.1"
                     ];
                   })
-                  (sources."rimraf-2.5.4" // {
+                  (sources."rimraf-2.6.1" // {
                     dependencies = [
                       (sources."glob-7.1.1" // {
                         dependencies = [
@@ -29484,32 +29900,27 @@ in
                   (sources."tar-2.2.1" // {
                     dependencies = [
                       sources."block-stream-0.0.9"
-                      (sources."fstream-1.0.10" // {
+                      (sources."fstream-1.0.11" // {
                         dependencies = [
                           sources."graceful-fs-4.1.11"
                         ];
                       })
                     ];
                   })
-                  (sources."tar-pack-3.3.0" // {
+                  (sources."tar-pack-3.4.0" // {
                     dependencies = [
-                      (sources."debug-2.2.0" // {
-                        dependencies = [
-                          sources."ms-0.7.1"
-                        ];
-                      })
-                      (sources."fstream-1.0.10" // {
+                      (sources."fstream-1.0.11" // {
                         dependencies = [
                           sources."graceful-fs-4.1.11"
                         ];
                       })
                       sources."fstream-ignore-1.0.5"
-                      (sources."once-1.3.3" // {
+                      (sources."once-1.4.0" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
                       })
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -29528,7 +29939,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -29578,7 +29989,7 @@ in
             dependencies = [
               sources."through-2.3.8"
               sources."duplexer-0.1.1"
-              sources."from-0.1.3"
+              sources."from-0.1.7"
               sources."map-stream-0.1.0"
               sources."pause-stream-0.0.11"
               sources."split-0.3.3"
@@ -29664,7 +30075,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -29695,7 +30106,7 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -29713,7 +30124,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -29803,9 +30214,9 @@ in
           })
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -29838,7 +30249,7 @@ in
               sources."domhandler-2.3.0"
               sources."domutils-1.5.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -29873,14 +30284,14 @@ in
       })
       (sources."cors-2.8.1" // {
         dependencies = [
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."cron-1.2.1" // {
         dependencies = [
           (sources."moment-timezone-0.5.11" // {
             dependencies = [
-              sources."moment-2.17.1"
+              sources."moment-2.18.1"
             ];
           })
         ];
@@ -29889,9 +30300,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -29927,10 +30338,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.4" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
           sources."qs-6.2.0"
@@ -29969,20 +30380,20 @@ in
           })
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30040,9 +30451,9 @@ in
               sources."typedarray-0.0.6"
             ];
           })
-          (sources."end-of-stream-1.1.0" // {
+          (sources."end-of-stream-1.4.0" // {
             dependencies = [
-              (sources."once-1.3.3" // {
+              (sources."once-1.4.0" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -30131,15 +30542,19 @@ in
                       sources."is-glob-2.0.1"
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
+                        ];
+                      })
+                      (sources."normalize-path-2.1.1" // {
+                        dependencies = [
+                          sources."remove-trailing-separator-1.0.1"
                         ];
                       })
-                      sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
                           (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-1.0.1"
+                              sources."for-in-1.0.2"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -30209,13 +30624,13 @@ in
           })
           sources."inherits-2.0.3"
           sources."minimist-1.2.0"
-          (sources."mqtt-packet-5.2.1" // {
+          (sources."mqtt-packet-5.2.2" // {
             dependencies = [
               sources."bl-1.2.0"
               sources."process-nextick-args-1.0.7"
             ];
           })
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -30272,7 +30687,7 @@ in
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30321,7 +30736,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -30337,7 +30752,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -30417,7 +30832,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.5" // {
+                  (sources."async-2.2.0" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -30478,14 +30893,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -30502,14 +30918,14 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.2"
+              sources."qs-6.2.3"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -30541,7 +30957,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.6.1" // {
+                          (sources."debug-2.6.3" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -30555,7 +30971,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.6.1" // {
+                  (sources."debug-2.6.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -30622,15 +31038,15 @@ in
           })
         ];
       })
-      (sources."node-red-node-twitter-0.1.9" // {
+      (sources."node-red-node-twitter-0.1.10" // {
         dependencies = [
           sources."twitter-ng-0.6.2"
           sources."oauth-0.9.14"
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -30643,47 +31059,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."chalk-1.1.3" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -30697,14 +31085,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -30721,20 +31110,22 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              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.4.3"
+              sources."tunnel-agent-0.6.0"
               sources."uuid-3.0.1"
             ];
           })
@@ -30757,7 +31148,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -30806,11 +31197,11 @@ in
                   sources."strip-json-comments-2.0.1"
                 ];
               })
-              (sources."request-2.79.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
-                  sources."caseless-0.11.0"
+                  sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
                       sources."delayed-stream-1.0.0"
@@ -30823,47 +31214,19 @@ in
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-2.0.6" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."chalk-1.1.3" // {
+                      (sources."ajv-4.11.5" // {
                         dependencies = [
-                          sources."ansi-styles-2.2.1"
-                          sources."escape-string-regexp-1.0.5"
-                          (sources."has-ansi-2.0.0" // {
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."jsonify-0.0.0"
                             ];
                           })
-                          (sources."strip-ansi-3.0.1" // {
-                            dependencies = [
-                              sources."ansi-regex-2.1.1"
-                            ];
-                          })
-                          sources."supports-color-2.0.0"
-                        ];
-                      })
-                      (sources."commander-2.9.0" // {
-                        dependencies = [
-                          sources."graceful-readlink-1.0.1"
-                        ];
-                      })
-                      (sources."is-my-json-valid-2.16.0" // {
-                        dependencies = [
-                          sources."generate-function-2.0.0"
-                          (sources."generate-object-property-1.2.0" // {
-                            dependencies = [
-                              sources."is-property-1.0.2"
-                            ];
-                          })
-                          sources."jsonpointer-4.0.1"
-                          sources."xtend-4.0.1"
-                        ];
-                      })
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
                         ];
                       })
+                      sources."har-schema-1.0.5"
                     ];
                   })
                   (sources."hawk-3.1.3" // {
@@ -30877,14 +31240,15 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.3.1" // {
+                      (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.10.2" // {
+                      (sources."sshpk-1.11.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -30901,20 +31265,22 @@ in
                   })
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.1"
+                  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.4.3"
+                  sources."tunnel-agent-0.6.0"
                   sources."uuid-3.0.1"
                 ];
               })
@@ -30952,7 +31318,7 @@ in
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                     ];
@@ -30967,7 +31333,7 @@ in
                       sources."ms-0.7.1"
                     ];
                   })
-                  (sources."fstream-1.0.10" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
                       sources."graceful-fs-4.1.11"
                       sources."inherits-2.0.3"
@@ -31074,7 +31440,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -31214,10 +31580,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.3.0";
+    version = "4.4.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz";
-      sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28";
+      url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz";
+      sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -31226,13 +31592,15 @@ in
           sources."through-2.3.8"
         ];
       })
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.1"
       sources."archy-1.0.0"
       sources."asap-2.0.5"
+      sources."bluebird-3.5.0"
+      sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       (sources."columnify-1.5.4" // {
@@ -31255,9 +31623,9 @@ in
       })
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.9"
-      sources."fs-write-stream-atomic-1.0.8"
-      sources."fstream-1.0.10"
+      sources."fs-vacuum-1.2.10"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fstream-1.0.11"
       (sources."fstream-npm-1.2.0" // {
         dependencies = [
           (sources."fstream-ignore-1.0.5" // {
@@ -31299,23 +31667,8 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.4" // {
+      (sources."init-package-json-1.9.5" // {
         dependencies = [
-          (sources."glob-6.0.4" // {
-            dependencies = [
-              (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."path-is-absolute-1.0.1"
-            ];
-          })
           sources."promzard-0.3.0"
         ];
       })
@@ -31348,11 +31701,7 @@ in
               sources."stream-shift-1.0.0"
             ];
           })
-          (sources."end-of-stream-1.1.0" // {
-            dependencies = [
-              sources."once-1.3.3"
-            ];
-          })
+          sources."end-of-stream-1.4.0"
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
           (sources."parallel-transform-1.1.0" // {
@@ -31379,6 +31728,12 @@ in
           sources."minimist-0.0.8"
         ];
       })
+      (sources."move-concurrently-1.0.1" // {
+        dependencies = [
+          sources."copy-concurrently-1.0.3"
+          sources."run-queue-1.0.3"
+        ];
+      })
       (sources."node-gyp-3.5.0" // {
         dependencies = [
           (sources."minimatch-3.0.3" // {
@@ -31396,7 +31751,7 @@ in
       })
       sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
-      (sources."normalize-package-data-2.3.5" // {
+      (sources."normalize-package-data-2.3.6" // {
         dependencies = [
           (sources."is-builtin-module-1.0.0" // {
             dependencies = [
@@ -31407,8 +31762,8 @@ in
       })
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.4.5" // {
+      sources."npm-package-arg-4.2.1"
+      (sources."npm-registry-client-7.4.6" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -31466,23 +31821,8 @@ in
           sources."util-extend-1.0.3"
         ];
       })
-      (sources."read-package-json-2.0.4" // {
+      (sources."read-package-json-2.0.5" // {
         dependencies = [
-          (sources."glob-6.0.4" // {
-            dependencies = [
-              (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."path-is-absolute-1.0.1"
-            ];
-          })
           (sources."json-parse-helpfulerror-1.0.3" // {
             dependencies = [
               sources."jju-1.3.0"
@@ -31491,7 +31831,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.2.3" // {
+      (sources."readable-stream-2.2.6" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -31502,11 +31842,11 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -31519,38 +31859,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  sources."has-ansi-2.0.0"
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."is-property-1.0.2"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -31564,14 +31885,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -31589,24 +31911,26 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
         ];
       })
       sources."retry-0.10.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -31646,15 +31970,160 @@ in
         ];
       })
       sources."unpipe-1.0.0"
-      sources."uuid-3.0.1"
-      (sources."validate-npm-package-name-2.2.2" // {
+      (sources."update-notifier-2.1.0" // {
         dependencies = [
-          sources."builtins-0.0.7"
+          (sources."boxen-1.0.0" // {
+            dependencies = [
+              (sources."ansi-align-1.1.0" // {
+                dependencies = [
+                  (sources."string-width-1.0.2" // {
+                    dependencies = [
+                      sources."code-point-at-1.1.0"
+                      (sources."is-fullwidth-code-point-1.0.0" // {
+                        dependencies = [
+                          sources."number-is-nan-1.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              sources."camelcase-4.1.0"
+              sources."cli-boxes-1.0.0"
+              (sources."string-width-2.0.0" // {
+                dependencies = [
+                  sources."is-fullwidth-code-point-2.0.0"
+                ];
+              })
+              (sources."term-size-0.1.1" // {
+                dependencies = [
+                  (sources."execa-0.4.0" // {
+                    dependencies = [
+                      (sources."cross-spawn-async-2.2.5" // {
+                        dependencies = [
+                          (sources."lru-cache-4.0.2" // {
+                            dependencies = [
+                              sources."pseudomap-1.0.2"
+                              sources."yallist-2.1.2"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."is-stream-1.1.0"
+                      sources."npm-run-path-1.0.0"
+                      sources."object-assign-4.1.1"
+                      sources."path-key-1.0.0"
+                      sources."strip-eof-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."widest-line-1.0.0" // {
+                dependencies = [
+                  (sources."string-width-1.0.2" // {
+                    dependencies = [
+                      sources."code-point-at-1.1.0"
+                      (sources."is-fullwidth-code-point-1.0.0" // {
+                        dependencies = [
+                          sources."number-is-nan-1.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."chalk-1.1.3" // {
+            dependencies = [
+              sources."ansi-styles-2.2.1"
+              sources."escape-string-regexp-1.0.5"
+              sources."has-ansi-2.0.0"
+              sources."supports-color-2.0.0"
+            ];
+          })
+          (sources."configstore-3.0.0" // {
+            dependencies = [
+              (sources."dot-prop-4.1.1" // {
+                dependencies = [
+                  sources."is-obj-1.0.1"
+                ];
+              })
+              (sources."unique-string-1.0.0" // {
+                dependencies = [
+                  sources."crypto-random-string-1.0.0"
+                ];
+              })
+            ];
+          })
+          sources."is-npm-1.0.0"
+          (sources."latest-version-3.1.0" // {
+            dependencies = [
+              (sources."package-json-4.0.0" // {
+                dependencies = [
+                  (sources."got-6.7.1" // {
+                    dependencies = [
+                      (sources."create-error-class-3.0.2" // {
+                        dependencies = [
+                          sources."capture-stack-trace-1.0.0"
+                        ];
+                      })
+                      sources."duplexer3-0.1.4"
+                      sources."get-stream-3.0.0"
+                      sources."is-redirect-1.0.0"
+                      sources."is-retry-allowed-1.1.0"
+                      sources."is-stream-1.1.0"
+                      sources."lowercase-keys-1.0.0"
+                      sources."safe-buffer-5.0.1"
+                      sources."timed-out-4.0.1"
+                      sources."unzip-response-2.0.1"
+                      (sources."url-parse-lax-1.0.0" // {
+                        dependencies = [
+                          sources."prepend-http-1.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."registry-auth-token-3.1.0" // {
+                    dependencies = [
+                      (sources."rc-1.2.0" // {
+                        dependencies = [
+                          sources."deep-extend-0.4.1"
+                          sources."minimist-1.2.0"
+                          sources."strip-json-comments-2.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."registry-url-3.1.0" // {
+                    dependencies = [
+                      (sources."rc-1.2.0" // {
+                        dependencies = [
+                          sources."deep-extend-0.4.1"
+                          sources."minimist-1.2.0"
+                          sources."strip-json-comments-2.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."lazy-req-2.0.0"
+          sources."semver-diff-2.1.0"
+          sources."xdg-basedir-3.0.0"
         ];
       })
-      (sources."which-1.2.12" // {
+      sources."uuid-3.0.1"
+      (sources."validate-npm-package-name-3.0.0" // {
         dependencies = [
-          sources."isexe-1.1.2"
+          sources."builtins-1.0.3"
+        ];
+      })
+      (sources."which-1.2.14" // {
+        dependencies = [
+          sources."isexe-2.0.0"
         ];
       })
       sources."wrappy-1.0.2"
@@ -31706,11 +32175,11 @@ in
       })
       (sources."npm-registry-client-0.2.27" // {
         dependencies = [
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -31723,47 +32192,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."chalk-1.1.3" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -31777,14 +32218,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -31802,20 +32244,22 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              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.4.3"
+              sources."tunnel-agent-0.6.0"
               sources."uuid-3.0.1"
             ];
           })
@@ -31862,7 +32306,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -32021,13 +32465,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.3";
+    version = "2.10.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz";
-      sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz";
+      sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.5.0"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."ansi-styles-2.2.1"
@@ -32105,9 +32549,9 @@ in
           })
           sources."dezalgo-1.0.3"
           sources."editor-1.0.0"
-          sources."fs-vacuum-1.2.9"
-          sources."fs-write-stream-atomic-1.0.8"
-          sources."fstream-1.0.10"
+          sources."fs-vacuum-1.2.10"
+          sources."fs-write-stream-atomic-1.0.10"
+          sources."fstream-1.0.11"
           (sources."fstream-npm-1.2.0" // {
             dependencies = [
               (sources."fstream-ignore-1.0.5" // {
@@ -32149,24 +32593,14 @@ in
           sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
-          (sources."init-package-json-1.9.4" // {
+          (sources."init-package-json-1.9.5" // {
             dependencies = [
-              (sources."glob-6.0.4" // {
+              sources."promzard-0.3.0"
+              (sources."validate-npm-package-name-3.0.0" // {
                 dependencies = [
-                  (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."path-is-absolute-1.0.1"
+                  sources."builtins-1.0.3"
                 ];
               })
-              sources."promzard-0.3.0"
             ];
           })
           sources."lockfile-1.0.3"
@@ -32230,17 +32664,17 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.6.1" // {
+                      (sources."debug-2.6.3" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
                       })
-                      (sources."es6-symbol-3.1.0" // {
+                      (sources."es6-symbol-3.1.1" // {
                         dependencies = [
-                          sources."d-0.1.1"
-                          (sources."es5-ext-0.10.12" // {
+                          sources."d-1.0.0"
+                          (sources."es5-ext-0.10.15" // {
                             dependencies = [
-                              sources."es6-iterator-2.0.0"
+                              sources."es6-iterator-2.0.1"
                             ];
                           })
                         ];
@@ -32253,7 +32687,7 @@ in
           })
           sources."nopt-3.0.6"
           sources."normalize-git-url-3.0.2"
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
@@ -32264,13 +32698,13 @@ in
           })
           sources."npm-cache-filename-1.0.2"
           sources."npm-install-checks-3.0.0"
-          sources."npm-package-arg-4.2.0"
+          sources."npm-package-arg-4.2.1"
           (sources."npm-registry-client-7.2.1" // {
             dependencies = [
               (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -32362,25 +32796,7 @@ in
               sources."util-extend-1.0.3"
             ];
           })
-          (sources."read-package-json-2.0.4" // {
-            dependencies = [
-              (sources."glob-6.0.4" // {
-                dependencies = [
-                  (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."path-is-absolute-1.0.1"
-                ];
-              })
-            ];
-          })
+          sources."read-package-json-2.0.5"
           sources."read-package-tree-5.1.5"
           (sources."readable-stream-2.1.5" // {
             dependencies = [
@@ -32455,14 +32871,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -32480,14 +32897,14 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.2"
+              sources."qs-6.2.3"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -32522,9 +32939,9 @@ in
               sources."builtins-0.0.7"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
           sources."wrappy-1.0.2"
@@ -32559,6 +32976,722 @@ in
       sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
+      (sources."snyk-1.26.1" // {
+        dependencies = [
+          sources."abbrev-1.1.0"
+          sources."ansi-escapes-1.4.0"
+          (sources."configstore-1.4.0" // {
+            dependencies = [
+              sources."graceful-fs-4.1.11"
+              (sources."mkdirp-0.5.1" // {
+                dependencies = [
+                  sources."minimist-0.0.8"
+                ];
+              })
+              sources."object-assign-4.1.1"
+              sources."os-tmpdir-1.0.2"
+              (sources."osenv-0.1.4" // {
+                dependencies = [
+                  sources."os-homedir-1.0.2"
+                ];
+              })
+              sources."uuid-2.0.3"
+              (sources."write-file-atomic-1.3.1" // {
+                dependencies = [
+                  sources."imurmurhash-0.1.4"
+                  sources."slide-1.1.6"
+                ];
+              })
+              (sources."xdg-basedir-2.0.0" // {
+                dependencies = [
+                  sources."os-homedir-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."debug-2.6.3" // {
+            dependencies = [
+              sources."ms-0.7.2"
+            ];
+          })
+          sources."es6-promise-3.3.1"
+          (sources."hasbin-1.2.3" // {
+            dependencies = [
+              sources."async-1.5.2"
+            ];
+          })
+          (sources."inquirer-1.0.3" // {
+            dependencies = [
+              (sources."cli-cursor-1.0.2" // {
+                dependencies = [
+                  (sources."restore-cursor-1.0.1" // {
+                    dependencies = [
+                      sources."exit-hook-1.1.1"
+                      sources."onetime-1.1.0"
+                    ];
+                  })
+                ];
+              })
+              sources."cli-width-2.1.0"
+              (sources."figures-1.7.0" // {
+                dependencies = [
+                  sources."escape-string-regexp-1.0.5"
+                  sources."object-assign-4.1.1"
+                ];
+              })
+              sources."mute-stream-0.0.6"
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
+              (sources."run-async-2.3.0" // {
+                dependencies = [
+                  sources."is-promise-2.1.0"
+                ];
+              })
+              sources."rx-4.1.0"
+              (sources."string-width-1.0.2" // {
+                dependencies = [
+                  sources."code-point-at-1.1.0"
+                  (sources."is-fullwidth-code-point-1.0.0" // {
+                    dependencies = [
+                      sources."number-is-nan-1.0.1"
+                    ];
+                  })
+                ];
+              })
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.1.1"
+                ];
+              })
+              sources."through-2.3.8"
+            ];
+          })
+          sources."open-0.0.5"
+          (sources."os-name-1.0.3" // {
+            dependencies = [
+              (sources."osx-release-1.1.0" // {
+                dependencies = [
+                  sources."minimist-1.2.0"
+                ];
+              })
+              sources."win-release-1.1.1"
+            ];
+          })
+          (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."snyk-config-1.0.1" // {
+            dependencies = [
+              (sources."nconf-0.7.2" // {
+                dependencies = [
+                  sources."async-0.9.2"
+                  sources."ini-1.3.4"
+                  (sources."yargs-3.15.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.4"
+                    ];
+                  })
+                ];
+              })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+          (sources."snyk-module-1.7.0" // {
+            dependencies = [
+              sources."hosted-git-info-2.4.1"
+              (sources."validate-npm-package-name-2.2.2" // {
+                dependencies = [
+                  sources."builtins-0.0.7"
+                ];
+              })
+            ];
+          })
+          (sources."snyk-policy-1.7.0" // {
+            dependencies = [
+              (sources."js-yaml-3.8.2" // {
+                dependencies = [
+                  (sources."argparse-1.0.9" // {
+                    dependencies = [
+                      sources."sprintf-js-1.0.3"
+                    ];
+                  })
+                  sources."esprima-3.1.3"
+                ];
+              })
+              sources."lodash.clonedeep-4.5.0"
+            ];
+          })
+          (sources."snyk-recursive-readdir-2.0.0" // {
+            dependencies = [
+              (sources."minimatch-3.0.2" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.6" // {
+                    dependencies = [
+                      sources."balanced-match-0.4.2"
+                      sources."concat-map-0.0.1"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."snyk-resolve-1.0.0"
+          (sources."snyk-resolve-deps-1.7.0" // {
+            dependencies = [
+              sources."ansicolors-0.3.2"
+              (sources."clite-0.3.0" // {
+                dependencies = [
+                  sources."lodash.defaults-4.2.0"
+                  sources."lodash.defaultsdeep-4.6.0"
+                  sources."lodash.mergewith-4.6.0"
+                  (sources."update-notifier-0.6.3" // {
+                    dependencies = [
+                      (sources."boxen-0.3.1" // {
+                        dependencies = [
+                          sources."filled-array-1.1.0"
+                          sources."object-assign-4.1.1"
+                          (sources."repeating-2.0.1" // {
+                            dependencies = [
+                              (sources."is-finite-1.0.2" // {
+                                dependencies = [
+                                  sources."number-is-nan-1.0.1"
+                                ];
+                              })
+                            ];
+                          })
+                          (sources."string-width-1.0.2" // {
+                            dependencies = [
+                              sources."code-point-at-1.1.0"
+                              (sources."is-fullwidth-code-point-1.0.0" // {
+                                dependencies = [
+                                  sources."number-is-nan-1.0.1"
+                                ];
+                              })
+                              (sources."strip-ansi-3.0.1" // {
+                                dependencies = [
+                                  sources."ansi-regex-2.1.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."widest-line-1.0.0"
+                        ];
+                      })
+                      (sources."configstore-2.1.0" // {
+                        dependencies = [
+                          (sources."dot-prop-3.0.0" // {
+                            dependencies = [
+                              sources."is-obj-1.0.1"
+                            ];
+                          })
+                          sources."graceful-fs-4.1.11"
+                          (sources."mkdirp-0.5.1" // {
+                            dependencies = [
+                              sources."minimist-0.0.8"
+                            ];
+                          })
+                          sources."object-assign-4.1.1"
+                          sources."os-tmpdir-1.0.2"
+                          (sources."osenv-0.1.4" // {
+                            dependencies = [
+                              sources."os-homedir-1.0.2"
+                            ];
+                          })
+                          sources."uuid-2.0.3"
+                          (sources."write-file-atomic-1.3.1" // {
+                            dependencies = [
+                              sources."imurmurhash-0.1.4"
+                              sources."slide-1.1.6"
+                            ];
+                          })
+                          (sources."xdg-basedir-2.0.0" // {
+                            dependencies = [
+                              sources."os-homedir-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."is-npm-1.0.0"
+                      (sources."latest-version-2.0.0" // {
+                        dependencies = [
+                          (sources."package-json-2.4.0" // {
+                            dependencies = [
+                              (sources."got-5.7.1" // {
+                                dependencies = [
+                                  (sources."create-error-class-3.0.2" // {
+                                    dependencies = [
+                                      sources."capture-stack-trace-1.0.0"
+                                    ];
+                                  })
+                                  sources."duplexer2-0.1.4"
+                                  sources."is-redirect-1.0.0"
+                                  sources."is-retry-allowed-1.1.0"
+                                  sources."is-stream-1.1.0"
+                                  sources."lowercase-keys-1.0.0"
+                                  sources."node-status-codes-1.0.0"
+                                  sources."object-assign-4.1.1"
+                                  (sources."parse-json-2.2.0" // {
+                                    dependencies = [
+                                      (sources."error-ex-1.3.1" // {
+                                        dependencies = [
+                                          sources."is-arrayish-0.2.1"
+                                        ];
+                                      })
+                                    ];
+                                  })
+                                  (sources."pinkie-promise-2.0.1" // {
+                                    dependencies = [
+                                      sources."pinkie-2.0.4"
+                                    ];
+                                  })
+                                  sources."read-all-stream-3.1.0"
+                                  (sources."readable-stream-2.2.6" // {
+                                    dependencies = [
+                                      sources."buffer-shims-1.0.0"
+                                      sources."core-util-is-1.0.2"
+                                      sources."isarray-1.0.0"
+                                      sources."inherits-2.0.3"
+                                      sources."process-nextick-args-1.0.7"
+                                      sources."string_decoder-0.10.31"
+                                      sources."util-deprecate-1.0.2"
+                                    ];
+                                  })
+                                  sources."timed-out-3.1.3"
+                                  sources."unzip-response-1.0.2"
+                                  (sources."url-parse-lax-1.0.0" // {
+                                    dependencies = [
+                                      sources."prepend-http-1.0.4"
+                                    ];
+                                  })
+                                ];
+                              })
+                              (sources."registry-auth-token-3.1.0" // {
+                                dependencies = [
+                                  (sources."rc-1.2.0" // {
+                                    dependencies = [
+                                      sources."deep-extend-0.4.1"
+                                      sources."ini-1.3.4"
+                                      sources."strip-json-comments-2.0.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                              (sources."registry-url-3.1.0" // {
+                                dependencies = [
+                                  (sources."rc-1.2.0" // {
+                                    dependencies = [
+                                      sources."deep-extend-0.4.1"
+                                      sources."ini-1.3.4"
+                                      sources."strip-json-comments-2.0.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                      sources."semver-diff-2.1.0"
+                    ];
+                  })
+                  (sources."yargs-4.8.1" // {
+                    dependencies = [
+                      (sources."cliui-3.2.0" // {
+                        dependencies = [
+                          (sources."strip-ansi-3.0.1" // {
+                            dependencies = [
+                              sources."ansi-regex-2.1.1"
+                            ];
+                          })
+                          sources."wrap-ansi-2.1.0"
+                        ];
+                      })
+                      sources."decamelize-1.2.0"
+                      sources."get-caller-file-1.0.2"
+                      sources."lodash.assign-4.2.0"
+                      (sources."os-locale-1.4.0" // {
+                        dependencies = [
+                          (sources."lcid-1.0.0" // {
+                            dependencies = [
+                              sources."invert-kv-1.0.0"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."read-pkg-up-1.0.1" // {
+                        dependencies = [
+                          (sources."read-pkg-1.1.0" // {
+                            dependencies = [
+                              (sources."load-json-file-1.1.0" // {
+                                dependencies = [
+                                  sources."graceful-fs-4.1.11"
+                                  (sources."parse-json-2.2.0" // {
+                                    dependencies = [
+                                      (sources."error-ex-1.3.1" // {
+                                        dependencies = [
+                                          sources."is-arrayish-0.2.1"
+                                        ];
+                                      })
+                                    ];
+                                  })
+                                  sources."pify-2.3.0"
+                                  (sources."pinkie-promise-2.0.1" // {
+                                    dependencies = [
+                                      sources."pinkie-2.0.4"
+                                    ];
+                                  })
+                                  (sources."strip-bom-2.0.0" // {
+                                    dependencies = [
+                                      sources."is-utf8-0.2.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                              (sources."normalize-package-data-2.3.6" // {
+                                dependencies = [
+                                  sources."hosted-git-info-2.4.1"
+                                  (sources."is-builtin-module-1.0.0" // {
+                                    dependencies = [
+                                      sources."builtin-modules-1.1.1"
+                                    ];
+                                  })
+                                  (sources."validate-npm-package-license-3.0.1" // {
+                                    dependencies = [
+                                      (sources."spdx-correct-1.0.2" // {
+                                        dependencies = [
+                                          sources."spdx-license-ids-1.2.2"
+                                        ];
+                                      })
+                                      sources."spdx-expression-parse-1.0.4"
+                                    ];
+                                  })
+                                ];
+                              })
+                              (sources."path-type-1.1.0" // {
+                                dependencies = [
+                                  sources."graceful-fs-4.1.11"
+                                  sources."pify-2.3.0"
+                                  (sources."pinkie-promise-2.0.1" // {
+                                    dependencies = [
+                                      sources."pinkie-2.0.4"
+                                    ];
+                                  })
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                      sources."require-directory-2.1.1"
+                      sources."require-main-filename-1.0.1"
+                      sources."set-blocking-2.0.0"
+                      (sources."string-width-1.0.2" // {
+                        dependencies = [
+                          sources."code-point-at-1.1.0"
+                          (sources."is-fullwidth-code-point-1.0.0" // {
+                            dependencies = [
+                              sources."number-is-nan-1.0.1"
+                            ];
+                          })
+                          (sources."strip-ansi-3.0.1" // {
+                            dependencies = [
+                              sources."ansi-regex-2.1.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."which-module-1.0.0"
+                      sources."window-size-0.2.0"
+                      sources."y18n-3.2.1"
+                      (sources."yargs-parser-2.4.1" // {
+                        dependencies = [
+                          sources."camelcase-3.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."lru-cache-4.0.2" // {
+                dependencies = [
+                  sources."pseudomap-1.0.2"
+                  sources."yallist-2.1.2"
+                ];
+              })
+              sources."minimist-1.2.0"
+            ];
+          })
+          (sources."snyk-tree-1.0.0" // {
+            dependencies = [
+              sources."archy-1.0.0"
+            ];
+          })
+          (sources."snyk-try-require-1.2.0" // {
+            dependencies = [
+              sources."lodash.clonedeep-4.5.0"
+              (sources."lru-cache-4.0.2" // {
+                dependencies = [
+                  sources."pseudomap-1.0.2"
+                  sources."yallist-2.1.2"
+                ];
+              })
+            ];
+          })
+          (sources."tempfile-1.1.1" // {
+            dependencies = [
+              sources."os-tmpdir-1.0.2"
+              sources."uuid-2.0.3"
+            ];
+          })
+          (sources."then-fs-2.0.0" // {
+            dependencies = [
+              (sources."promise-7.1.1" // {
+                dependencies = [
+                  sources."asap-2.0.5"
+                ];
+              })
+            ];
+          })
+          sources."undefsafe-0.0.3"
+          (sources."update-notifier-0.5.0" // {
+            dependencies = [
+              sources."is-npm-1.0.0"
+              (sources."latest-version-1.0.1" // {
+                dependencies = [
+                  (sources."package-json-1.2.0" // {
+                    dependencies = [
+                      (sources."got-3.3.1" // {
+                        dependencies = [
+                          (sources."duplexify-3.5.0" // {
+                            dependencies = [
+                              (sources."end-of-stream-1.0.0" // {
+                                dependencies = [
+                                  (sources."once-1.3.3" // {
+                                    dependencies = [
+                                      sources."wrappy-1.0.2"
+                                    ];
+                                  })
+                                ];
+                              })
+                              sources."inherits-2.0.3"
+                              (sources."readable-stream-2.2.6" // {
+                                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."string_decoder-0.10.31"
+                                  sources."util-deprecate-1.0.2"
+                                ];
+                              })
+                              sources."stream-shift-1.0.0"
+                            ];
+                          })
+                          sources."infinity-agent-2.0.3"
+                          sources."is-redirect-1.0.0"
+                          sources."is-stream-1.1.0"
+                          sources."lowercase-keys-1.0.0"
+                          (sources."nested-error-stacks-1.0.2" // {
+                            dependencies = [
+                              sources."inherits-2.0.3"
+                            ];
+                          })
+                          sources."object-assign-3.0.0"
+                          sources."prepend-http-1.0.4"
+                          (sources."read-all-stream-3.1.0" // {
+                            dependencies = [
+                              (sources."pinkie-promise-2.0.1" // {
+                                dependencies = [
+                                  sources."pinkie-2.0.4"
+                                ];
+                              })
+                              (sources."readable-stream-2.2.6" // {
+                                dependencies = [
+                                  sources."buffer-shims-1.0.0"
+                                  sources."core-util-is-1.0.2"
+                                  sources."isarray-1.0.0"
+                                  sources."inherits-2.0.3"
+                                  sources."process-nextick-args-1.0.7"
+                                  sources."string_decoder-0.10.31"
+                                  sources."util-deprecate-1.0.2"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."timed-out-2.0.0"
+                        ];
+                      })
+                      (sources."registry-url-3.1.0" // {
+                        dependencies = [
+                          (sources."rc-1.2.0" // {
+                            dependencies = [
+                              sources."deep-extend-0.4.1"
+                              sources."ini-1.3.4"
+                              sources."minimist-1.2.0"
+                              sources."strip-json-comments-2.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."repeating-1.1.3" // {
+                dependencies = [
+                  (sources."is-finite-1.0.2" // {
+                    dependencies = [
+                      sources."number-is-nan-1.0.1"
+                    ];
+                  })
+                ];
+              })
+              sources."semver-diff-2.1.0"
+              (sources."string-length-1.0.1" // {
+                dependencies = [
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.1.1"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."url-0.11.0" // {
+            dependencies = [
+              sources."punycode-1.3.2"
+              sources."querystring-0.2.0"
+            ];
+          })
+          sources."uuid-3.0.1"
+        ];
+      })
       sources."spawn-please-0.2.0"
       (sources."update-notifier-1.0.3" // {
         dependencies = [
@@ -32646,7 +33779,7 @@ in
                       sources."object-assign-4.1.1"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
-                          (sources."error-ex-1.3.0" // {
+                          (sources."error-ex-1.3.1" // {
                             dependencies = [
                               sources."is-arrayish-0.2.1"
                             ];
@@ -32659,7 +33792,7 @@ in
                         ];
                       })
                       sources."read-all-stream-3.1.0"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -32681,7 +33814,7 @@ in
                   })
                   (sources."registry-auth-token-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -32693,7 +33826,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -32741,7 +33874,7 @@ in
           sources."is-arguments-1.0.2"
         ];
       })
-      (sources."body-parser-1.16.1" // {
+      (sources."body-parser-1.17.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
@@ -32751,10 +33884,10 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.1" // {
+          (sources."http-errors-1.6.1" // {
             dependencies = [
               sources."inherits-2.0.3"
-              sources."setprototypeof-1.0.2"
+              sources."setprototypeof-1.0.3"
               sources."statuses-1.3.1"
             ];
           })
@@ -32764,7 +33897,7 @@ in
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.1"
+          sources."qs-6.4.0"
           (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
@@ -32773,9 +33906,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -32786,17 +33919,17 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."bytes-2.3.0"
-          (sources."compressible-2.0.9" // {
+          (sources."compressible-2.0.10" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -32805,7 +33938,7 @@ in
             ];
           })
           sources."on-headers-1.0.1"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."connect-busboy-0.0.2" // {
@@ -32834,13 +33967,13 @@ in
       sources."diff-1.4.0"
       sources."domino-1.0.28"
       sources."entities-1.1.1"
-      (sources."express-4.14.1" // {
+      (sources."express-4.15.2" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -32850,16 +33983,26 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
-          sources."etag-1.7.0"
-          sources."fresh-0.3.0"
+          sources."etag-1.8.0"
+          (sources."finalhandler-1.0.1" // {
+            dependencies = [
+              (sources."debug-2.6.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
+              sources."unpipe-1.0.0"
+            ];
+          })
+          sources."fresh-0.5.0"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
@@ -32869,41 +34012,41 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.4" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
-          sources."qs-6.2.0"
+          sources."qs-6.4.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.2" // {
+          (sources."send-0.15.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.1" // {
+              (sources."http-errors-1.6.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.2"
-              sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.2"
+          sources."serve-static-1.12.1"
+          sources."setprototypeof-1.0.3"
+          sources."statuses-1.3.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."express-handlebars-3.0.0" // {
@@ -32949,11 +34092,9 @@ in
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.7.5" // {
+              (sources."uglify-js-2.8.20" // {
                 dependencies = [
-                  sources."async-0.2.10"
                   sources."source-map-0.5.6"
-                  sources."uglify-to-browserify-1.0.2"
                   (sources."yargs-3.10.0" // {
                     dependencies = [
                       sources."camelcase-1.2.1"
@@ -32965,7 +34106,7 @@ in
                                 dependencies = [
                                   (sources."kind-of-3.1.0" // {
                                     dependencies = [
-                                      sources."is-buffer-1.1.4"
+                                      sources."is-buffer-1.1.5"
                                     ];
                                   })
                                   sources."longest-1.0.1"
@@ -32981,7 +34122,7 @@ in
                                 dependencies = [
                                   (sources."kind-of-3.1.0" // {
                                     dependencies = [
-                                      sources."is-buffer-1.1.4"
+                                      sources."is-buffer-1.1.5"
                                     ];
                                   })
                                   sources."longest-1.0.1"
@@ -32997,6 +34138,7 @@ in
                       sources."window-size-0.1.0"
                     ];
                   })
+                  sources."uglify-to-browserify-1.0.2"
                 ];
               })
             ];
@@ -33041,7 +34183,7 @@ in
           sources."gelfling-0.2.0"
         ];
       })
-      (sources."js-yaml-3.8.1" // {
+      (sources."js-yaml-3.8.2" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -33053,14 +34195,14 @@ in
       })
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
       sources."prfun-2.1.4"
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -33073,47 +34215,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -33127,14 +34241,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -33152,38 +34267,40 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.4.0" // {
+      (sources."serve-favicon-2.4.2" // {
         dependencies = [
           sources."etag-1.8.0"
-          sources."fresh-0.4.0"
-          sources."ms-0.7.2"
+          sources."fresh-0.5.0"
+          sources."ms-1.0.0"
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.2.4" // {
+      (sources."service-runner-2.2.5" // {
         dependencies = [
-          sources."bluebird-3.4.7"
-          (sources."bunyan-1.8.5" // {
+          sources."bluebird-3.5.0"
+          (sources."bunyan-1.8.9" // {
             dependencies = [
-              (sources."dtrace-provider-0.8.0" // {
+              (sources."dtrace-provider-0.8.1" // {
                 dependencies = [
                   sources."nan-2.5.1"
                 ];
@@ -33228,8 +34345,8 @@ in
                   })
                 ];
               })
-              sources."safe-json-stringify-1.0.3"
-              sources."moment-2.17.1"
+              sources."safe-json-stringify-1.0.4"
+              sources."moment-2.18.1"
             ];
           })
           sources."bunyan-syslog-udp-0.1.0"
@@ -33239,7 +34356,7 @@ in
               sources."gelfling-0.3.1"
             ];
           })
-          sources."hot-shots-4.3.1"
+          sources."hot-shots-4.4.0"
           (sources."limitation-0.2.0" // {
             dependencies = [
               (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
@@ -33256,7 +34373,7 @@ in
                   sources."kad-memstore-0.0.1"
                   sources."lodash-3.10.1"
                   sources."merge-1.2.0"
-                  sources."ms-0.7.2"
+                  sources."ms-0.7.3"
                   (sources."msgpack5-3.4.1" // {
                     dependencies = [
                       sources."bl-1.2.0"
@@ -33265,7 +34382,7 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -33321,7 +34438,7 @@ in
                           sources."graceful-fs-4.1.11"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
-                              (sources."error-ex-1.3.0" // {
+                              (sources."error-ex-1.3.1" // {
                                 dependencies = [
                                   sources."is-arrayish-0.2.1"
                                 ];
@@ -33341,9 +34458,9 @@ in
                           })
                         ];
                       })
-                      (sources."normalize-package-data-2.3.5" // {
+                      (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.2.0"
+                          sources."hosted-git-info-2.4.1"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -33455,7 +34572,7 @@ in
                       sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
-                          (sources."error-ex-1.3.0" // {
+                          (sources."error-ex-1.3.1" // {
                             dependencies = [
                               sources."is-arrayish-0.2.1"
                             ];
@@ -33475,9 +34592,9 @@ in
                       })
                     ];
                   })
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -33550,10 +34667,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.1";
+    version = "0.36.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
-      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.2.tgz";
+      sha1 = "93dd39e10a0a94b4f66ec19a42d8f5598a3eec01";
     };
     dependencies = [
       (sources."airplayer-2.0.0" // {
@@ -33574,7 +34691,7 @@ in
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -33673,11 +34790,11 @@ in
                   sources."buffer-indexof-1.1.0"
                 ];
               })
-              (sources."multicast-dns-6.1.0" // {
+              (sources."multicast-dns-6.1.1" // {
                 dependencies = [
                   (sources."dns-packet-1.1.1" // {
                     dependencies = [
-                      sources."ip-1.1.4"
+                      sources."ip-1.1.5"
                       sources."safe-buffer-5.0.1"
                     ];
                   })
@@ -33708,9 +34825,9 @@ in
                     ];
                   })
                   sources."map-obj-1.0.1"
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -33749,7 +34866,7 @@ in
                               sources."graceful-fs-4.1.11"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
-                                  (sources."error-ex-1.3.0" // {
+                                  (sources."error-ex-1.3.1" // {
                                     dependencies = [
                                       sources."is-arrayish-0.2.1"
                                     ];
@@ -33851,7 +34968,7 @@ in
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33921,7 +35038,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.1" // {
+      (sources."parse-torrent-5.8.2" // {
         dependencies = [
           sources."blob-to-buffer-1.2.6"
           sources."get-stdin-5.0.1"
@@ -33957,15 +35074,7 @@ in
       })
       (sources."pump-1.0.2" // {
         dependencies = [
-          (sources."end-of-stream-1.1.0" // {
-            dependencies = [
-              (sources."once-1.3.3" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-            ];
-          })
+          sources."end-of-stream-1.4.0"
           (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -33974,7 +35083,7 @@ in
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -34004,7 +35113,7 @@ in
               })
               (sources."random-access-file-1.5.0" // {
                 dependencies = [
-                  (sources."debug-2.6.1" // {
+                  (sources."debug-2.6.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -34021,7 +35130,7 @@ in
           sources."immediate-chunk-store-1.0.8"
           (sources."ip-set-1.0.1" // {
             dependencies = [
-              sources."ip-1.1.4"
+              sources."ip-1.1.5"
             ];
           })
           sources."mkdirp-0.3.5"
@@ -34140,10 +35249,10 @@ in
                   sources."bn.js-4.11.6"
                   (sources."compact2string-1.4.0" // {
                     dependencies = [
-                      sources."ipaddr.js-1.2.0"
+                      sources."ipaddr.js-1.3.0"
                     ];
                   })
-                  sources."ip-1.1.4"
+                  sources."ip-1.1.5"
                   sources."minimist-1.2.0"
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -34158,11 +35267,11 @@ in
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.4.3" // {
+                  (sources."simple-peer-6.4.4" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -34177,7 +35286,7 @@ in
                   (sources."simple-websocket-4.3.1" // {
                     dependencies = [
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.2.3" // {
+                      (sources."readable-stream-2.2.6" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -34187,7 +35296,7 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      (sources."ws-2.1.0" // {
+                      (sources."ws-2.2.2" // {
                         dependencies = [
                           sources."ultron-1.1.0"
                         ];
@@ -34197,11 +35306,11 @@ in
                   (sources."string2compact-1.2.2" // {
                     dependencies = [
                       sources."addr-to-ip-port-1.4.2"
-                      sources."ipaddr.js-1.2.0"
+                      sources."ipaddr.js-1.3.0"
                     ];
                   })
                   sources."uniq-1.0.1"
-                  (sources."ws-1.1.2" // {
+                  (sources."ws-1.1.4" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
@@ -34209,7 +35318,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.6.1" // {
+              (sources."debug-2.6.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34378,15 +35487,7 @@ in
       })
       (sources."pump-1.0.2" // {
         dependencies = [
-          (sources."end-of-stream-1.1.0" // {
-            dependencies = [
-              (sources."once-1.3.3" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-            ];
-          })
+          sources."end-of-stream-1.4.0"
           (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -34443,7 +35544,7 @@ in
                   sources."sntp-0.1.4"
                 ];
               })
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."cookie-jar-0.2.0"
               sources."aws-sign-0.2.0"
               sources."oauth-sign-0.2.0"
@@ -34467,9 +35568,9 @@ in
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
@@ -34583,7 +35684,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.1" // {
+              (sources."debug-2.6.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34610,7 +35711,7 @@ in
               })
               (sources."string2compact-1.2.2" // {
                 dependencies = [
-                  sources."ipaddr.js-1.2.0"
+                  sources."ipaddr.js-1.3.0"
                 ];
               })
             ];
@@ -34620,7 +35721,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.1" // {
+              (sources."debug-2.6.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34647,7 +35748,7 @@ in
               (sources."string2compact-1.2.2" // {
                 dependencies = [
                   sources."addr-to-ip-port-1.4.2"
-                  sources."ipaddr.js-1.2.0"
+                  sources."ipaddr.js-1.3.0"
                 ];
               })
             ];
@@ -34655,7 +35756,7 @@ in
           sources."bncode-0.5.3"
           (sources."compact2string-1.4.0" // {
             dependencies = [
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
           (sources."end-of-stream-0.1.5" // {
@@ -34671,7 +35772,7 @@ in
           sources."ip-0.3.3"
           (sources."ip-set-1.0.1" // {
             dependencies = [
-              sources."ip-1.1.4"
+              sources."ip-1.1.5"
             ];
           })
           (sources."magnet-uri-2.0.1" // {
@@ -34762,14 +35863,14 @@ in
       })
       (sources."fluent-ffmpeg-2.1.0" // {
         dependencies = [
-          (sources."async-2.1.5" // {
+          (sources."async-2.2.0" // {
             dependencies = [
               sources."lodash-4.17.4"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
         ];
@@ -34897,7 +35998,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.5" // {
+              (sources."async-2.2.0" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -34905,26 +36006,27 @@ in
             ];
           })
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
-          sources."node-uuid-1.4.7"
+          sources."node-uuid-1.4.8"
           sources."qs-5.2.1"
           sources."tunnel-agent-0.4.3"
           sources."tough-cookie-2.2.2"
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -35007,9 +36109,9 @@ in
           sources."throttleit-1.0.0"
         ];
       })
-      (sources."which-1.2.12" // {
+      (sources."which-1.2.14" // {
         dependencies = [
-          sources."isexe-1.1.2"
+          sources."isexe-2.0.0"
         ];
       })
     ];
@@ -35037,9 +36139,9 @@ in
               sources."graceful-readlink-1.0.1"
             ];
           })
-          (sources."detective-4.3.2" // {
+          (sources."detective-4.5.0" // {
             dependencies = [
-              sources."acorn-3.3.0"
+              sources."acorn-4.0.11"
               sources."defined-1.0.0"
             ];
           })
@@ -35077,10 +36179,10 @@ in
             ];
           })
           sources."private-0.1.7"
-          sources."q-1.4.1"
-          (sources."recast-0.11.22" // {
+          sources."q-1.5.0"
+          (sources."recast-0.11.23" // {
             dependencies = [
-              sources."ast-types-0.9.5"
+              sources."ast-types-0.9.6"
               sources."esprima-3.1.3"
               sources."source-map-0.5.6"
             ];
@@ -35176,7 +36278,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -35205,11 +36307,11 @@ in
           })
           (sources."openid-2.0.6" // {
             dependencies = [
-              (sources."request-2.79.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
-                  sources."caseless-0.11.0"
+                  sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
                       sources."delayed-stream-1.0.0"
@@ -35222,47 +36324,19 @@ in
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-2.0.6" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."chalk-1.1.3" // {
+                      (sources."ajv-4.11.5" // {
                         dependencies = [
-                          sources."ansi-styles-2.2.1"
-                          sources."escape-string-regexp-1.0.5"
-                          (sources."has-ansi-2.0.0" // {
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."jsonify-0.0.0"
                             ];
                           })
-                          (sources."strip-ansi-3.0.1" // {
-                            dependencies = [
-                              sources."ansi-regex-2.1.1"
-                            ];
-                          })
-                          sources."supports-color-2.0.0"
-                        ];
-                      })
-                      (sources."commander-2.9.0" // {
-                        dependencies = [
-                          sources."graceful-readlink-1.0.1"
-                        ];
-                      })
-                      (sources."is-my-json-valid-2.16.0" // {
-                        dependencies = [
-                          sources."generate-function-2.0.0"
-                          (sources."generate-object-property-1.2.0" // {
-                            dependencies = [
-                              sources."is-property-1.0.2"
-                            ];
-                          })
-                          sources."jsonpointer-4.0.1"
-                          sources."xtend-4.0.1"
-                        ];
-                      })
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
                         ];
                       })
+                      sources."har-schema-1.0.5"
                     ];
                   })
                   (sources."hawk-3.1.3" // {
@@ -35276,14 +36350,15 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.3.1" // {
+                      (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.10.2" // {
+                      (sources."sshpk-1.11.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -35301,20 +36376,22 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.1"
+                  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.4.3"
+                  sources."tunnel-agent-0.6.0"
                   sources."uuid-3.0.1"
                 ];
               })
@@ -35373,13 +36450,13 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      (sources."express-5.0.0-alpha.3" // {
+      (sources."express-5.0.0-alpha.5" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -35390,22 +36467,26 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
-          sources."etag-1.7.0"
-          (sources."finalhandler-0.5.1" // {
+          sources."etag-1.8.0"
+          (sources."finalhandler-1.0.1" // {
             dependencies = [
-              sources."statuses-1.3.1"
+              (sources."debug-2.6.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
               sources."unpipe-1.0.0"
             ];
           })
-          sources."fresh-0.3.0"
+          sources."fresh-0.5.0"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
@@ -35416,46 +36497,37 @@ in
           sources."parseurl-1.3.1"
           sources."path-is-absolute-1.0.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.4" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
-          sources."qs-6.2.0"
+          sources."qs-6.4.0"
           sources."range-parser-1.2.0"
-          (sources."router-1.1.5" // {
-            dependencies = [
-              sources."setprototypeof-1.0.2"
-            ];
-          })
-          (sources."send-0.14.2" // {
+          sources."router-1.3.0"
+          (sources."send-0.15.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.1" // {
-                dependencies = [
-                  sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
-                ];
-              })
               sources."mime-1.3.4"
               sources."ms-0.7.2"
-              sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.2"
+          sources."serve-static-1.12.1"
+          sources."setprototypeof-1.0.3"
+          sources."statuses-1.3.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."express-json5-0.1.0" // {
@@ -35468,7 +36540,7 @@ in
           })
         ];
       })
-      (sources."body-parser-1.16.1" // {
+      (sources."body-parser-1.17.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
@@ -35478,20 +36550,13 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.1" // {
-            dependencies = [
-              sources."inherits-2.0.3"
-              sources."setprototypeof-1.0.2"
-              sources."statuses-1.3.1"
-            ];
-          })
           sources."iconv-lite-0.4.15"
           (sources."on-finished-2.3.0" // {
             dependencies = [
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.1"
+          sources."qs-6.4.0"
           (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
@@ -35500,9 +36565,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -35513,18 +36578,18 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.6.1"
             ];
           })
           sources."bytes-2.3.0"
-          (sources."compressible-2.0.9" // {
+          (sources."compressible-2.0.10" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -35533,7 +36598,7 @@ in
             ];
           })
           sources."on-headers-1.0.1"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."commander-2.9.0" // {
@@ -35541,7 +36606,7 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      (sources."js-yaml-3.8.1" // {
+      (sources."js-yaml-3.8.2" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -35557,11 +36622,11 @@ in
           sources."keygrip-1.0.1"
         ];
       })
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -35574,42 +36639,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."is-my-json-valid-2.16.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -35623,14 +36665,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -35648,20 +36691,22 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
@@ -35674,9 +36719,9 @@ in
           sources."sigmund-1.0.1"
         ];
       })
-      (sources."bunyan-1.8.5" // {
+      (sources."bunyan-1.8.9" // {
         dependencies = [
-          (sources."dtrace-provider-0.8.0" // {
+          (sources."dtrace-provider-0.8.1" // {
             dependencies = [
               sources."nan-2.5.1"
             ];
@@ -35716,8 +36761,8 @@ in
               })
             ];
           })
-          sources."safe-json-stringify-1.0.3"
-          sources."moment-2.17.1"
+          sources."safe-json-stringify-1.0.4"
+          sources."moment-2.18.1"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -35773,7 +36818,7 @@ in
                   })
                   sources."entities-1.1.1"
                   sources."inherits-2.0.3"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -35820,7 +36865,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."fs-ext-0.5.0" // {
+      (sources."fs-ext-0.6.0" // {
         dependencies = [
           sources."nan-2.5.1"
         ];
@@ -35879,7 +36924,7 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -35945,7 +36990,7 @@ in
           sources."lru-cache-2.7.3"
           sources."mime-1.3.4"
           sources."negotiator-0.5.3"
-          sources."node-uuid-1.4.7"
+          sources."node-uuid-1.4.8"
           (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -36025,7 +37070,7 @@ in
               })
             ];
           })
-          sources."safe-json-stringify-1.0.3"
+          sources."safe-json-stringify-1.0.4"
         ];
       })
       sources."clone-0.1.6"
@@ -36037,8 +37082,9 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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"
@@ -36050,7 +37096,7 @@ in
           (sources."sshpk-agent-1.2.1" // {
             dependencies = [
               sources."assert-plus-0.1.5"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -36135,7 +37181,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -36194,7 +37240,7 @@ in
       sources."sax-1.2.2"
       (sources."coa-1.0.1" // {
         dependencies = [
-          sources."q-1.4.1"
+          sources."q-1.5.0"
         ];
       })
       (sources."js-yaml-3.7.0" // {
@@ -36214,9 +37260,9 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."csso-2.3.1" // {
+      (sources."csso-2.3.2" // {
         dependencies = [
-          (sources."clap-1.1.2" // {
+          (sources."clap-1.1.3" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -36269,7 +37315,7 @@ in
                   sources."prr-0.0.0"
                 ];
               })
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -36326,10 +37372,10 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.11";
+    version = "5.0.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
-      sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.12.tgz";
+      sha1 = "2bcfab6110ef0a91c9d54825052fd0db3e9dd942";
     };
     dependencies = [
       (sources."async-2.1.2" // {
@@ -36359,11 +37405,15 @@ in
         ];
       })
       sources."moment-2.16.0"
-      (sources."node-appc-0.2.39" // {
+      (sources."node-appc-0.2.41" // {
         dependencies = [
           sources."adm-zip-0.4.7"
-          sources."async-1.5.2"
-          sources."diff-2.2.1"
+          (sources."async-2.1.4" // {
+            dependencies = [
+              sources."lodash-4.17.4"
+            ];
+          })
+          sources."diff-3.2.0"
           sources."node-uuid-1.4.7"
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -36371,135 +37421,8 @@ in
               sources."minimist-0.0.10"
             ];
           })
-          (sources."request-2.69.0" // {
-            dependencies = [
-              sources."aws-sign2-0.6.0"
-              sources."aws4-1.6.0"
-              (sources."bl-1.0.3" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."caseless-0.11.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-1.0.1" // {
-                dependencies = [
-                  (sources."async-2.1.5" // {
-                    dependencies = [
-                      sources."lodash-4.17.4"
-                    ];
-                  })
-                ];
-              })
-              (sources."har-validator-2.0.6" // {
-                dependencies = [
-                  (sources."chalk-1.1.3" // {
-                    dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              (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.3.1" // {
-                    dependencies = [
-                      sources."extsprintf-1.0.2"
-                      sources."json-schema-0.2.3"
-                      sources."verror-1.3.6"
-                    ];
-                  })
-                  (sources."sshpk-1.10.2" // {
-                    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.14" // {
-                dependencies = [
-                  sources."mime-db-1.26.0"
-                ];
-              })
-              sources."oauth-sign-0.8.2"
-              sources."qs-6.0.3"
-              sources."stringstream-0.0.5"
-              sources."tough-cookie-2.2.2"
-              sources."tunnel-agent-0.4.3"
-            ];
-          })
-          sources."semver-5.1.0"
-          sources."wrench-1.5.8"
-          (sources."uglify-js-2.6.1" // {
+          sources."wrench-1.5.9"
+          (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -36515,7 +37438,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -36531,7 +37454,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -36549,10 +37472,10 @@ in
               })
             ];
           })
-          sources."xmldom-0.1.22"
+          sources."xmldom-0.1.27"
         ];
       })
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
@@ -36623,14 +37546,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -36648,14 +37572,13 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          sources."qs-6.3.2"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -36663,6 +37586,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.1"
         ];
       })
       sources."semver-5.3.0"
@@ -36684,7 +37608,12 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      sources."wrench-1.5.9"
+      (sources."fs-extra-2.1.2" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+          sources."jsonfile-2.4.0"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -36697,10 +37626,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.2.1";
+    version = "2.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz";
-      sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz";
+      sha1 = "606022508479b55ffa368b58fee963a03dfd7b0c";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36713,15 +37642,13 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.5";
+    version = "2.8.20";
     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.20.tgz";
+      sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
     };
     dependencies = [
-      sources."async-0.2.10"
       sources."source-map-0.5.6"
-      sources."uglify-to-browserify-1.0.2"
       (sources."yargs-3.10.0" // {
         dependencies = [
           sources."camelcase-1.2.1"
@@ -36733,7 +37660,7 @@ in
                     dependencies = [
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
                         ];
                       })
                       sources."longest-1.0.1"
@@ -36749,7 +37676,7 @@ in
                     dependencies = [
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
                         ];
                       })
                       sources."longest-1.0.1"
@@ -36765,6 +37692,7 @@ in
           sources."window-size-0.1.0"
         ];
       })
+      sources."uglify-to-browserify-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -36777,10 +37705,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.8";
+    version = "1.1.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz";
-      sha1 = "1519b78475ef5162ef3342c2046889b396add651";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz";
+      sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f";
     };
     dependencies = [
       sources."async-2.1.5"
@@ -36818,9 +37746,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -36831,12 +37759,12 @@ in
         dependencies = [
           (sources."color-convert-1.9.0" // {
             dependencies = [
-              sources."color-name-1.1.1"
+              sources."color-name-1.1.2"
             ];
           })
-          (sources."color-string-1.5.0" // {
+          (sources."color-string-1.5.2" // {
             dependencies = [
-              sources."color-name-1.1.1"
+              sources."color-name-1.1.2"
               (sources."simple-swizzle-0.2.2" // {
                 dependencies = [
                   sources."is-arrayish-0.3.1"
@@ -36853,7 +37781,7 @@ in
         ];
       })
       sources."crossroads-0.12.2"
-      (sources."diff2html-2.0.12" // {
+      (sources."diff2html-2.3.0" // {
         dependencies = [
           sources."diff-3.2.0"
           (sources."hogan.js-3.0.2" // {
@@ -36866,16 +37794,16 @@ in
               sources."mkdirp-0.3.0"
             ];
           })
-          sources."whatwg-fetch-2.0.2"
+          sources."whatwg-fetch-2.0.3"
         ];
       })
       (sources."express-4.14.1" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -36911,10 +37839,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.4" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.3.0"
             ];
           })
           sources."qs-6.2.0"
@@ -36936,15 +37864,15 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."express-session-1.14.2" // {
@@ -36960,9 +37888,8 @@ in
           sources."depd-1.1.0"
           sources."on-headers-1.0.1"
           sources."parseurl-1.3.1"
-          (sources."uid-safe-2.1.3" // {
+          (sources."uid-safe-2.1.4" // {
             dependencies = [
-              sources."base64-url-1.3.3"
               sources."random-bytes-1.0.0"
             ];
           })
@@ -37028,7 +37955,7 @@ in
                           sources."sntp-0.1.4"
                         ];
                       })
-                      sources."node-uuid-1.4.7"
+                      sources."node-uuid-1.4.8"
                       sources."cookie-jar-0.2.0"
                       sources."aws-sign-0.2.0"
                       sources."oauth-sign-0.2.0"
@@ -37094,13 +38021,13 @@ in
         ];
       })
       sources."hasher-1.2.0"
-      sources."ignore-3.2.4"
+      sources."ignore-3.2.6"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
         ];
       })
-      sources."knockout-3.4.1"
+      sources."knockout-3.4.2"
       sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -37110,7 +38037,7 @@ in
       sources."moment-2.17.1"
       (sources."node-cache-4.1.1" // {
         dependencies = [
-          sources."clone-2.1.0"
+          sources."clone-2.1.1"
         ];
       })
       (sources."npm-4.1.2" // {
@@ -37149,9 +38076,9 @@ in
           })
           sources."dezalgo-1.0.3"
           sources."editor-1.0.0"
-          sources."fs-vacuum-1.2.9"
-          sources."fs-write-stream-atomic-1.0.8"
-          sources."fstream-1.0.10"
+          sources."fs-vacuum-1.2.10"
+          sources."fs-write-stream-atomic-1.0.10"
+          sources."fstream-1.0.11"
           (sources."fstream-npm-1.2.0" // {
             dependencies = [
               (sources."fstream-ignore-1.0.5" // {
@@ -37193,24 +38120,14 @@ in
           sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
-          (sources."init-package-json-1.9.4" // {
+          (sources."init-package-json-1.9.5" // {
             dependencies = [
-              (sources."glob-6.0.4" // {
+              sources."promzard-0.3.0"
+              (sources."validate-npm-package-name-3.0.0" // {
                 dependencies = [
-                  (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."path-is-absolute-1.0.1"
+                  sources."builtins-1.0.3"
                 ];
               })
-              sources."promzard-0.3.0"
             ];
           })
           sources."lockfile-1.0.3"
@@ -37241,11 +38158,7 @@ in
                   sources."stream-shift-1.0.0"
                 ];
               })
-              (sources."end-of-stream-1.1.0" // {
-                dependencies = [
-                  sources."once-1.3.3"
-                ];
-              })
+              sources."end-of-stream-1.4.0"
               sources."flush-write-stream-1.0.2"
               sources."from2-2.3.0"
               sources."pump-1.0.2"
@@ -37279,7 +38192,7 @@ in
           })
           sources."nopt-4.0.1"
           sources."normalize-git-url-3.0.2"
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
@@ -37290,7 +38203,7 @@ in
           })
           sources."npm-cache-filename-1.0.2"
           sources."npm-install-checks-3.0.0"
-          sources."npm-package-arg-4.2.0"
+          sources."npm-package-arg-4.2.1"
           sources."npm-user-validate-0.1.5"
           (sources."npmlog-4.0.2" // {
             dependencies = [
@@ -37339,23 +38252,8 @@ in
               sources."util-extend-1.0.3"
             ];
           })
-          (sources."read-package-json-2.0.4" // {
+          (sources."read-package-json-2.0.5" // {
             dependencies = [
-              (sources."glob-6.0.4" // {
-                dependencies = [
-                  (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."path-is-absolute-1.0.1"
-                ];
-              })
               (sources."json-parse-helpfulerror-1.0.3" // {
                 dependencies = [
                   sources."jju-1.3.0"
@@ -37364,7 +38262,7 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -37437,14 +38335,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -37462,13 +38361,13 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              sources."qs-6.3.2"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -37523,9 +38422,9 @@ in
               sources."builtins-0.0.7"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
           sources."wrappy-1.0.2"
@@ -37552,13 +38451,13 @@ in
           })
         ];
       })
-      (sources."npm-registry-client-7.4.5" // {
+      (sources."npm-registry-client-7.4.6" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -37571,9 +38470,9 @@ in
             ];
           })
           sources."graceful-fs-4.1.11"
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -37591,9 +38490,9 @@ in
               })
             ];
           })
-          (sources."npm-package-arg-4.2.0" // {
+          (sources."npm-package-arg-4.2.1" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
             ];
           })
           (sources."once-1.4.0" // {
@@ -37601,11 +38500,11 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -37618,47 +38517,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."chalk-1.1.3" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -37672,14 +38543,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -37697,20 +38569,22 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              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.4.3"
+              sources."tunnel-agent-0.6.0"
               sources."uuid-3.0.1"
             ];
           })
@@ -37721,7 +38595,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -37778,7 +38652,7 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-1.1.2" // {
+      (sources."raven-1.1.5" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."json-stringify-safe-5.0.1"
@@ -37879,9 +38753,9 @@ in
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
@@ -37995,7 +38869,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -38081,7 +38955,7 @@ in
                       sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
-                          (sources."error-ex-1.3.0" // {
+                          (sources."error-ex-1.3.1" // {
                             dependencies = [
                               sources."is-arrayish-0.2.1"
                             ];
@@ -38101,9 +38975,9 @@ in
                       })
                     ];
                   })
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -38311,7 +39185,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.5" // {
+                  (sources."async-2.2.0" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -38319,26 +39193,27 @@ in
                 ];
               })
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               sources."qs-5.2.1"
               sources."tunnel-agent-0.4.3"
               sources."tough-cookie-2.2.2"
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -38421,9 +39296,9 @@ in
               sources."throttleit-1.0.0"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
         ];
@@ -38450,15 +39325,15 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.2.1";
+    version = "2.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz";
-      sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz";
+      sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458";
     };
     dependencies = [
       sources."acorn-4.0.11"
-      sources."acorn-dynamic-import-2.0.1"
-      (sources."ajv-4.11.3" // {
+      sources."acorn-dynamic-import-2.0.2"
+      (sources."ajv-4.11.5" // {
         dependencies = [
           sources."co-4.6.0"
           (sources."json-stable-stringify-1.0.1" // {
@@ -38469,7 +39344,7 @@ in
         ];
       })
       sources."ajv-keywords-1.5.1"
-      (sources."async-2.1.5" // {
+      (sources."async-2.2.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -38480,7 +39355,7 @@ in
           sources."object-assign-4.1.1"
         ];
       })
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
       (sources."loader-utils-0.2.17" // {
@@ -38498,7 +39373,7 @@ in
               sources."prr-0.0.0"
             ];
           })
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -38560,7 +39435,7 @@ in
                   sources."evp_bytestokey-1.0.0"
                 ];
               })
-              (sources."browserify-sign-4.0.0" // {
+              (sources."browserify-sign-4.0.4" // {
                 dependencies = [
                   sources."bn.js-4.11.6"
                   sources."browserify-rsa-4.0.1"
@@ -38573,7 +39448,7 @@ in
                       sources."minimalistic-crypto-utils-1.0.1"
                     ];
                   })
-                  (sources."parse-asn1-5.0.0" // {
+                  (sources."parse-asn1-5.1.0" // {
                     dependencies = [
                       (sources."asn1.js-4.9.1" // {
                         dependencies = [
@@ -38629,7 +39504,7 @@ in
                 dependencies = [
                   sources."bn.js-4.11.6"
                   sources."browserify-rsa-4.0.1"
-                  (sources."parse-asn1-5.0.0" // {
+                  (sources."parse-asn1-5.1.0" // {
                     dependencies = [
                       (sources."asn1.js-4.9.1" // {
                         dependencies = [
@@ -38658,7 +39533,7 @@ in
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -38713,10 +39588,8 @@ in
         ];
       })
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.8.20" // {
         dependencies = [
-          sources."async-0.2.10"
-          sources."uglify-to-browserify-1.0.2"
           (sources."yargs-3.10.0" // {
             dependencies = [
               sources."camelcase-1.2.1"
@@ -38728,7 +39601,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -38744,7 +39617,7 @@ in
                         dependencies = [
                           (sources."kind-of-3.1.0" // {
                             dependencies = [
-                              sources."is-buffer-1.1.4"
+                              sources."is-buffer-1.1.5"
                             ];
                           })
                           sources."longest-1.0.1"
@@ -38760,6 +39633,7 @@ in
               sources."window-size-0.1.0"
             ];
           })
+          sources."uglify-to-browserify-1.0.2"
         ];
       })
       (sources."watchpack-1.3.1" // {
@@ -38809,15 +39683,19 @@ in
                       sources."is-extglob-1.0.0"
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
+                        ];
+                      })
+                      (sources."normalize-path-2.1.1" // {
+                        dependencies = [
+                          sources."remove-trailing-separator-1.0.1"
                         ];
                       })
-                      sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
                           (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-1.0.1"
+                              sources."for-in-1.0.2"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -38865,7 +39743,7 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -38881,11 +39759,17 @@ in
               (sources."fsevents-1.1.1" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.33" // {
+                  (sources."node-pre-gyp-0.6.34" // {
                     dependencies = [
-                      (sources."nopt-3.0.6" // {
+                      (sources."nopt-4.0.1" // {
                         dependencies = [
                           sources."abbrev-1.1.0"
+                          (sources."osenv-0.1.4" // {
+                            dependencies = [
+                              sources."os-homedir-1.0.2"
+                              sources."os-tmpdir-1.0.2"
+                            ];
+                          })
                         ];
                       })
                       (sources."npmlog-4.0.2" // {
@@ -38893,7 +39777,7 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.3" // {
+                              (sources."readable-stream-2.2.6" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -38933,7 +39817,7 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.1.7" // {
+                      (sources."rc-1.2.0" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -38941,11 +39825,11 @@ in
                           sources."strip-json-comments-2.0.1"
                         ];
                       })
-                      (sources."request-2.79.0" // {
+                      (sources."request-2.81.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
                           sources."aws4-1.6.0"
-                          sources."caseless-0.11.0"
+                          sources."caseless-0.12.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
                               sources."delayed-stream-1.0.0"
@@ -38958,47 +39842,9 @@ in
                               sources."asynckit-0.4.0"
                             ];
                           })
-                          (sources."har-validator-2.0.6" // {
+                          (sources."har-validator-4.2.1" // {
                             dependencies = [
-                              (sources."chalk-1.1.3" // {
-                                dependencies = [
-                                  sources."ansi-styles-2.2.1"
-                                  sources."escape-string-regexp-1.0.5"
-                                  (sources."has-ansi-2.0.0" // {
-                                    dependencies = [
-                                      sources."ansi-regex-2.1.1"
-                                    ];
-                                  })
-                                  (sources."strip-ansi-3.0.1" // {
-                                    dependencies = [
-                                      sources."ansi-regex-2.1.1"
-                                    ];
-                                  })
-                                  sources."supports-color-2.0.0"
-                                ];
-                              })
-                              (sources."commander-2.9.0" // {
-                                dependencies = [
-                                  sources."graceful-readlink-1.0.1"
-                                ];
-                              })
-                              (sources."is-my-json-valid-2.16.0" // {
-                                dependencies = [
-                                  sources."generate-function-2.0.0"
-                                  (sources."generate-object-property-1.2.0" // {
-                                    dependencies = [
-                                      sources."is-property-1.0.2"
-                                    ];
-                                  })
-                                  sources."jsonpointer-4.0.1"
-                                  sources."xtend-4.0.1"
-                                ];
-                              })
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
+                              sources."har-schema-1.0.5"
                             ];
                           })
                           (sources."hawk-3.1.3" // {
@@ -39012,14 +39858,15 @@ in
                           (sources."http-signature-1.1.1" // {
                             dependencies = [
                               sources."assert-plus-0.2.0"
-                              (sources."jsprim-1.3.1" // {
+                              (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.10.2" // {
+                              (sources."sshpk-1.11.0" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
@@ -39037,24 +39884,26 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.14" // {
+                          (sources."mime-types-2.1.15" // {
                             dependencies = [
-                              sources."mime-db-1.26.0"
+                              sources."mime-db-1.27.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.3.1"
+                          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.4.3"
+                          sources."tunnel-agent-0.6.0"
                           sources."uuid-3.0.1"
                         ];
                       })
-                      (sources."rimraf-2.5.4" // {
+                      (sources."rimraf-2.6.1" // {
                         dependencies = [
                           (sources."glob-7.1.1" // {
                             dependencies = [
@@ -39087,17 +39936,17 @@ in
                       (sources."tar-2.2.1" // {
                         dependencies = [
                           sources."block-stream-0.0.9"
-                          sources."fstream-1.0.10"
+                          sources."fstream-1.0.11"
                         ];
                       })
-                      (sources."tar-pack-3.3.0" // {
+                      (sources."tar-pack-3.4.0" // {
                         dependencies = [
-                          (sources."debug-2.2.0" // {
+                          (sources."debug-2.6.3" // {
                             dependencies = [
-                              sources."ms-0.7.1"
+                              sources."ms-0.7.2"
                             ];
                           })
-                          sources."fstream-1.0.10"
+                          sources."fstream-1.0.11"
                           (sources."fstream-ignore-1.0.5" // {
                             dependencies = [
                               (sources."minimatch-3.0.3" // {
@@ -39112,12 +39961,12 @@ in
                               })
                             ];
                           })
-                          (sources."once-1.3.3" // {
+                          (sources."once-1.4.0" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
                             ];
                           })
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -39139,9 +39988,9 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."webpack-sources-0.1.4" // {
+      (sources."webpack-sources-0.2.3" // {
         dependencies = [
-          sources."source-list-map-0.1.8"
+          sources."source-list-map-1.1.1"
         ];
       })
       (sources."yargs-6.6.0" // {
@@ -39187,7 +40036,7 @@ in
                       sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
-                          (sources."error-ex-1.3.0" // {
+                          (sources."error-ex-1.3.1" // {
                             dependencies = [
                               sources."is-arrayish-0.2.1"
                             ];
@@ -39207,9 +40056,9 @@ in
                       })
                     ];
                   })
-                  (sources."normalize-package-data-2.3.5" // {
+                  (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.2.0"
+                      sources."hosted-git-info-2.4.1"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -39294,10 +40143,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.20.4";
+    version = "0.21.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz";
-      sha1 = "575190fee60a27a54d4125a0f7579fc702f01229";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz";
+      sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0";
     };
     dependencies = [
       (sources."babel-runtime-6.23.0" // {
@@ -39306,7 +40155,7 @@ in
           sources."regenerator-runtime-0.10.3"
         ];
       })
-      sources."bytes-2.4.0"
+      sources."bytes-2.5.0"
       sources."camelcase-3.0.0"
       (sources."chalk-1.1.3" // {
         dependencies = [
@@ -39336,7 +40185,7 @@ in
         ];
       })
       sources."death-1.1.0"
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -39347,16 +40196,15 @@ in
         ];
       })
       sources."detect-indent-5.0.0"
-      sources."diff-2.2.3"
       sources."ini-1.3.4"
-      (sources."inquirer-3.0.5" // {
+      (sources."inquirer-3.0.6" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
           (sources."cli-cursor-2.1.0" // {
             dependencies = [
               (sources."restore-cursor-2.0.0" // {
                 dependencies = [
-                  (sources."onetime-2.0.0" // {
+                  (sources."onetime-2.0.1" // {
                     dependencies = [
                       sources."mimic-fn-1.1.0"
                     ];
@@ -39452,9 +40300,9 @@ in
           sources."string.prototype.codepointat-0.2.0"
         ];
       })
-      (sources."node-gyp-3.5.0" // {
+      (sources."node-gyp-3.6.0" // {
         dependencies = [
-          (sources."fstream-1.0.10" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
               sources."inherits-2.0.3"
             ];
@@ -39487,7 +40335,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -39534,9 +40382,9 @@ in
               sources."os-tmpdir-1.0.2"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
         ];
@@ -39553,11 +40401,11 @@ in
           sources."mute-stream-0.0.7"
         ];
       })
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
-          sources."caseless-0.11.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -39570,25 +40418,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."is-my-json-valid-2.16.0" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."is-property-1.0.2"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -39602,14 +40444,15 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (sources."sshpk-1.11.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -39627,24 +40470,26 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
-      sources."request-capture-har-1.1.4"
+      sources."request-capture-har-1.2.2"
       (sources."rimraf-2.6.1" // {
         dependencies = [
           (sources."glob-7.1.1" // {
@@ -39672,7 +40517,7 @@ in
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
-          (sources."fstream-1.0.10" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
             ];
@@ -39683,16 +40528,16 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          (sources."end-of-stream-1.1.0" // {
+          (sources."end-of-stream-1.4.0" // {
             dependencies = [
-              (sources."once-1.3.3" // {
+              (sources."once-1.4.0" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
               })
             ];
           })
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -39706,11 +40551,6 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."user-home-2.0.0" // {
-        dependencies = [
-          sources."os-homedir-1.0.2"
-        ];
-      })
       (sources."validate-npm-package-license-3.0.1" // {
         dependencies = [
           (sources."spdx-correct-1.0.2" // {
@@ -39724,7 +40564,7 @@ in
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      description = "📦🐈 Fast, reliable, and secure dependency management.";
       homepage = "https://github.com/yarnpkg/yarn#readme";
       license = "BSD-2-Clause";
     };
@@ -39792,12 +40632,12 @@ in
           (sources."lru-cache-4.0.2" // {
             dependencies = [
               sources."pseudomap-1.0.2"
-              sources."yallist-2.0.0"
+              sources."yallist-2.1.2"
             ];
           })
-          (sources."which-1.2.12" // {
+          (sources."which-1.2.14" // {
             dependencies = [
-              sources."isexe-1.1.2"
+              sources."isexe-2.0.0"
             ];
           })
         ];
@@ -39868,7 +40708,7 @@ in
           sources."object-assign-4.1.1"
           (sources."parse-json-2.2.0" // {
             dependencies = [
-              (sources."error-ex-1.3.0" // {
+              (sources."error-ex-1.3.1" // {
                 dependencies = [
                   sources."is-arrayish-0.2.1"
                 ];
@@ -39881,7 +40721,7 @@ in
             ];
           })
           sources."read-all-stream-3.1.0"
-          (sources."readable-stream-2.2.3" // {
+          (sources."readable-stream-2.2.6" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -40018,11 +40858,11 @@ in
               })
             ];
           })
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -40035,30 +40875,19 @@ in
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."commander-2.9.0" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."is-property-1.0.2"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -40072,14 +40901,15 @@ in
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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.10.2" // {
+                  (sources."sshpk-1.11.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -40097,15 +40927,17 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.1"
+              sources."performance-now-0.2.0"
+              sources."qs-6.4.0"
+              sources."safe-buffer-5.0.1"
               sources."stringstream-0.0.5"
-              sources."tunnel-agent-0.4.3"
+              sources."tunnel-agent-0.6.0"
               sources."uuid-3.0.1"
             ];
           })
@@ -40137,9 +40969,9 @@ in
           })
           sources."map-obj-1.0.1"
           sources."minimist-1.2.0"
-          (sources."normalize-package-data-2.3.5" // {
+          (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.2.0"
+              sources."hosted-git-info-2.4.1"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -40182,7 +41014,7 @@ in
           })
           (sources."registry-url-3.1.0" // {
             dependencies = [
-              (sources."rc-1.1.7" // {
+              (sources."rc-1.2.0" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -40203,7 +41035,7 @@ in
         dependencies = [
           (sources."registry-auth-token-3.1.0" // {
             dependencies = [
-              (sources."rc-1.1.7" // {
+              (sources."rc-1.2.0" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -40215,7 +41047,7 @@ in
           })
           (sources."registry-url-3.1.0" // {
             dependencies = [
-              (sources."rc-1.1.7" // {
+              (sources."rc-1.2.0" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -40261,7 +41093,7 @@ in
                   sources."graceful-fs-4.1.11"
                   (sources."parse-json-2.2.0" // {
                     dependencies = [
-                      (sources."error-ex-1.3.0" // {
+                      (sources."error-ex-1.3.1" // {
                         dependencies = [
                           sources."is-arrayish-0.2.1"
                         ];
@@ -40281,9 +41113,9 @@ in
                   })
                 ];
               })
-              (sources."normalize-package-data-2.3.5" // {
+              (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
-                  sources."hosted-git-info-2.2.0"
+                  sources."hosted-git-info-2.4.1"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -40363,7 +41195,7 @@ in
       })
       (sources."tabtab-1.3.2" // {
         dependencies = [
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -40391,7 +41223,7 @@ in
                         dependencies = [
                           sources."inherits-2.0.3"
                           sources."typedarray-0.0.6"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -40456,7 +41288,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -40620,7 +41452,7 @@ in
       })
       (sources."yeoman-environment-1.6.6" // {
         dependencies = [
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -40694,7 +41526,7 @@ in
                         dependencies = [
                           sources."inherits-2.0.3"
                           sources."typedarray-0.0.6"
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -40752,7 +41584,7 @@ in
             dependencies = [
               (sources."through2-2.0.3" // {
                 dependencies = [
-                  (sources."readable-stream-2.2.3" // {
+                  (sources."readable-stream-2.2.6" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -40791,7 +41623,7 @@ in
                     dependencies = [
                       (sources."first-chunk-stream-2.0.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.3" // {
+                          (sources."readable-stream-2.2.6" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index dba0e9d82c2..08070fe0e5f 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -337,13 +337,13 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "is-buffer-1.1.4" = {
+    "is-buffer-1.1.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
       };
     };
     "path-parse-1.0.5" = {
@@ -418,13 +418,13 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "which-1.2.12" = {
+    "which-1.2.14" = {
       name = "which";
       packageName = "which";
-      version = "1.2.12";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
-        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -436,13 +436,13 @@ let
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
-    "isexe-1.1.2" = {
+    "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
-      version = "1.1.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz";
-        sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
     "amdefine-1.0.1" = {
@@ -517,13 +517,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.2" = {
+    "azure-arm-cdn-1.0.3" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
-        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz";
+        sha1 = "39db281679dcdd33cb6ce032383b192430476412";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -886,6 +886,15 @@ let
         sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
       };
     };
+    "date-utils-1.2.21" = {
+      name = "date-utils";
+      packageName = "date-utils";
+      version = "1.2.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
+        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
+      };
+    };
     "easy-table-0.0.1" = {
       name = "easy-table";
       packageName = "easy-table";
@@ -967,6 +976,15 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
+    "jwt-decode-2.2.0" = {
+      name = "jwt-decode";
+      packageName = "jwt-decode";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
+        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
+      };
+    };
     "kuduscript-1.0.13" = {
       name = "kuduscript";
       packageName = "kuduscript";
@@ -976,22 +994,31 @@ let
         sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
       };
     };
-    "ms-rest-1.15.5" = {
-      name = "ms-rest";
-      packageName = "ms-rest";
-      version = "1.15.5";
+    "moment-2.18.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz";
-        sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d";
+        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
+        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
-    "ms-rest-azure-1.15.5" = {
+    "ms-rest-1.15.7" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "1.15.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
+        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
+      };
+    };
+    "ms-rest-azure-1.15.7" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.5";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz";
-        sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
+        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
     "node-forge-0.6.23" = {
@@ -1183,15 +1210,6 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
-    "date-utils-1.2.21" = {
-      name = "date-utils";
-      packageName = "date-utils";
-      version = "1.2.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
-        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
-      };
-    };
     "jws-3.1.4" = {
       name = "jws";
       packageName = "jws";
@@ -1480,13 +1498,13 @@ let
         sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
       };
     };
-    "from-0.1.3" = {
+    "from-0.1.7" = {
       name = "from";
       packageName = "from";
-      version = "0.1.3";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz";
-        sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
       };
     };
     "map-stream-0.1.0" = {
@@ -1912,13 +1930,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.15" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
+        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1930,13 +1948,13 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.2.2" = {
+    "qs-6.2.3" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.2";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz";
-        sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586";
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
+        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
       };
     };
     "stringstream-0.0.5" = {
@@ -1975,13 +1993,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.5" = {
+    "async-2.2.0" = {
       name = "async";
       packageName = "async";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
-        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
+        url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz";
+        sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32";
       };
     };
     "lodash-4.17.4" = {
@@ -2191,22 +2209,31 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.3.1" = {
+    "jsprim-1.4.0" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
-        sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.10.2" = {
+    "sshpk-1.11.0" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.2";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
-        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+        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" = {
@@ -2245,15 +2272,6 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "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";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -2317,13 +2335,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.27.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
+        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
       };
     };
     "punycode-1.4.1" = {
@@ -2416,13 +2434,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.3" = {
+    "readable-stream-2.2.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.3";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz";
-        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
+        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2839,13 +2857,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "normalize-package-data-2.3.5" = {
+    "normalize-package-data-2.3.6" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
-      version = "2.3.5";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz";
-        sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz";
+        sha1 = "498fa420c96401f787402ba21e600def9f981fff";
       };
     };
     "object-assign-4.1.1" = {
@@ -2920,13 +2938,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.2.0" = {
+    "hosted-git-info-2.4.1" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.2.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
+        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3064,13 +3082,13 @@ let
         sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
       };
     };
-    "error-ex-1.3.0" = {
+    "error-ex-1.3.1" = {
       name = "error-ex";
       packageName = "error-ex";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz";
-        sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9";
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz";
+        sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -3190,22 +3208,22 @@ let
         sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
-    "q-1.4.1" = {
+    "q-1.5.0" = {
       name = "q";
       packageName = "q";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz";
-        sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
+        url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz";
+        sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1";
       };
     };
-    "debug-2.6.1" = {
+    "debug-2.6.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.1";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz";
+        sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d";
       };
     };
     "ms-0.7.2" = {
@@ -3532,13 +3550,13 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "syntax-error-1.1.6" = {
+    "syntax-error-1.3.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
-      version = "1.1.6";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz";
-        sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
+        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz";
+        sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1";
       };
     };
     "through2-2.0.3" = {
@@ -3712,13 +3730,13 @@ let
         sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
       };
     };
-    "browserify-sign-4.0.0" = {
+    "browserify-sign-4.0.4" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.0.0";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz";
-        sha1 = "10773910c3c206d5420a46aad8694f820b85968f";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
     "create-ecdh-4.0.0" = {
@@ -3874,13 +3892,13 @@ let
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "parse-asn1-5.0.0" = {
+    "parse-asn1-5.1.0" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz";
-        sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
+        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
       };
     };
     "brorand-1.1.0" = {
@@ -3973,22 +3991,22 @@ let
         sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
       };
     };
-    "astw-2.0.0" = {
+    "astw-2.2.0" = {
       name = "astw";
       packageName = "astw";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz";
-        sha1 = "08121ac8288d35611c0ceec663f6cd545604897d";
+        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
+        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
       };
     };
-    "acorn-1.2.2" = {
+    "acorn-4.0.11" = {
       name = "acorn";
       packageName = "acorn";
-      version = "1.2.2";
+      version = "4.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
-        sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
       };
     };
     "stream-splicer-2.0.0" = {
@@ -4000,13 +4018,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.3.2" = {
+    "detective-4.5.0" = {
       name = "detective";
       packageName = "detective";
-      version = "4.3.2";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz";
-        sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c";
+        url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz";
+        sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -4018,15 +4036,6 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -4099,15 +4108,6 @@ let
         sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
       };
     };
-    "acorn-2.7.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
-        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
-      };
-    };
     "punycode-1.3.2" = {
       name = "punycode";
       packageName = "punycode";
@@ -4612,13 +4612,13 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "parse-torrent-5.8.1" = {
+    "parse-torrent-5.8.2" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.1";
+      version = "5.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.1.tgz";
-        sha1 = "29452b9eae4a1b497f12e580c1cf6fa9682e5c68";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz";
+        sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9";
       };
     };
     "pump-0.3.5" = {
@@ -5071,13 +5071,13 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
-    "ip-1.1.4" = {
+    "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz";
-        sha1 = "de8247ffef940451832550fba284945e6e039bfb";
+        url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz";
+        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
     "magnet-uri-4.2.3" = {
@@ -5314,13 +5314,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.4.3" = {
+    "simple-peer-6.4.4" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.4.3";
+      version = "6.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz";
-        sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz";
+        sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
     "simple-websocket-4.3.1" = {
@@ -5341,22 +5341,22 @@ let
         sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
       };
     };
-    "ws-1.1.2" = {
+    "ws-1.1.4" = {
       name = "ws";
       packageName = "ws";
-      version = "1.1.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
-        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz";
+        sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61";
       };
     };
-    "ipaddr.js-1.2.0" = {
+    "ipaddr.js-1.3.0" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz";
-        sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
+        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
       };
     };
     "get-browser-rtc-1.0.2" = {
@@ -5368,13 +5368,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.1.0" = {
+    "ws-2.2.2" = {
       name = "ws";
       packageName = "ws";
-      version = "2.1.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz";
-        sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92";
+        url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz";
+        sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01";
       };
     };
     "ultron-1.1.0" = {
@@ -5530,6 +5530,15 @@ let
         sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
       };
     };
+    "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";
+      };
+    };
     "cookie-jar-0.2.0" = {
       name = "cookie-jar";
       packageName = "cookie-jar";
@@ -5953,13 +5962,13 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "init-package-json-1.9.4" = {
+    "init-package-json-1.9.5" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.9.4";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz";
-        sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz";
+        sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09";
       };
     };
     "nopt-3.0.6" = {
@@ -5971,13 +5980,13 @@ let
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
-    "npm-2.15.11" = {
+    "npm-2.15.12" = {
       name = "npm";
       packageName = "npm";
-      version = "2.15.11";
+      version = "2.15.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz";
-        sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c";
+        url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz";
+        sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
       };
     };
     "opener-1.4.1" = {
@@ -6079,6 +6088,15 @@ let
         sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4";
       };
     };
+    "acorn-1.2.2" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+        sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+      };
+    };
     "foreach-2.0.5" = {
       name = "foreach";
       packageName = "foreach";
@@ -6124,22 +6142,31 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.6" = {
+    "shelljs-0.7.7" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.6";
+      version = "0.7.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
-        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
+        sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
       };
     };
-    "interpret-1.0.1" = {
+    "q-1.4.1" = {
+      name = "q";
+      packageName = "q";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz";
+        sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
+      };
+    };
+    "interpret-1.0.2" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz";
-        sha1 = "d579fb7f693b858004947af39fa0db49f795602c";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz";
+        sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d";
       };
     };
     "rechoir-0.6.2" = {
@@ -6178,13 +6205,13 @@ let
         sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
       };
     };
-    "express-4.14.1" = {
+    "express-4.15.2" = {
       name = "express";
       packageName = "express";
-      version = "4.14.1";
+      version = "4.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
-        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
+        url = "https://registry.npmjs.org/express/-/express-4.15.2.tgz";
+        sha1 = "af107fc148504457f2dca9a6f2571d7129b97b35";
       };
     };
     "accepts-1.3.3" = {
@@ -6205,13 +6232,13 @@ let
         sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
       };
     };
-    "compressible-2.0.9" = {
+    "compressible-2.0.10" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.9";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
-        sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz";
+        sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
       };
     };
     "debug-2.2.0" = {
@@ -6232,13 +6259,13 @@ let
         sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
       };
     };
-    "vary-1.1.0" = {
+    "vary-1.1.1" = {
       name = "vary";
       packageName = "vary";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
-        sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz";
+        sha1 = "67535ebb694c1d52257457984665323f587e8d37";
       };
     };
     "negotiator-0.6.1" = {
@@ -6304,6 +6331,15 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
+    "debug-2.6.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+      };
+    };
     "depd-1.1.0" = {
       name = "depd";
       packageName = "depd";
@@ -6331,31 +6367,31 @@ let
         sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
       };
     };
-    "etag-1.7.0" = {
+    "etag-1.8.0" = {
       name = "etag";
       packageName = "etag";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
-        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz";
+        sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-0.5.1" = {
+    "finalhandler-1.0.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.1";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.1.tgz";
+        sha1 = "bcd15d1689c0e5ed729b6f7f541a6df984117db8";
       };
     };
-    "fresh-0.3.0" = {
+    "fresh-0.5.0" = {
       name = "fresh";
       packageName = "fresh";
-      version = "0.3.0";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
-        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz";
+        sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -6403,40 +6439,49 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.3" = {
+    "proxy-addr-1.1.4" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
-        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz";
+        sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3";
       };
     };
-    "qs-6.2.0" = {
+    "qs-6.4.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.0";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
-        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
-    "send-0.14.2" = {
+    "send-0.15.1" = {
       name = "send";
       packageName = "send";
-      version = "0.14.2";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
-        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
+        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
+        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
       };
     };
-    "serve-static-1.11.2" = {
+    "serve-static-1.12.1" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.11.2";
+      version = "1.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
-        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
+        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
+      };
+    };
+    "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";
       };
     };
     "type-is-1.6.14" = {
@@ -6493,22 +6538,13 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.5.1" = {
+    "http-errors-1.6.1" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.5.1";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
-        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
-      };
-    };
-    "setprototypeof-1.0.2" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
-        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
+        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
       };
     };
     "media-typer-0.3.0" = {
@@ -6538,13 +6574,13 @@ let
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
-    "npm-package-arg-4.2.0" = {
+    "npm-package-arg-4.2.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz";
-        sha1 = "809bc61cabf54bd5ff94f6165c89ba8ee88c115c";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
+        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
       };
     };
     "promzard-0.3.0" = {
@@ -6556,22 +6592,22 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "read-package-json-2.0.4" = {
+    "read-package-json-2.0.5" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz";
-        sha1 = "61ed1b2256ea438d8008895090be84b8e799c853";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz";
+        sha1 = "f93a64e641529df68a08c64de46389e8a3f88845";
       };
     };
-    "validate-npm-package-name-2.2.2" = {
+    "validate-npm-package-name-3.0.0" = {
       name = "validate-npm-package-name";
       packageName = "validate-npm-package-name";
-      version = "2.2.2";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
-        sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
+        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
     "json-parse-helpfulerror-1.0.3" = {
@@ -6592,13 +6628,13 @@ let
         sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
       };
     };
-    "builtins-0.0.7" = {
+    "builtins-1.0.3" = {
       name = "builtins";
       packageName = "builtins";
-      version = "0.0.7";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
+        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
       };
     };
     "abbrev-1.1.0" = {
@@ -6736,31 +6772,31 @@ let
         sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742";
       };
     };
-    "fs-vacuum-1.2.9" = {
+    "fs-vacuum-1.2.10" = {
       name = "fs-vacuum";
       packageName = "fs-vacuum";
-      version = "1.2.9";
+      version = "1.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz";
-        sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d";
+        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz";
+        sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36";
       };
     };
-    "fs-write-stream-atomic-1.0.8" = {
+    "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz";
-        sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b";
-      };
-    };
-    "fstream-1.0.10" = {
-      name = "fstream";
-      packageName = "fstream";
       version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz";
-        sha1 = "604e8a92fe26ffd9f6fae30399d4984e1ab22822";
+        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+      };
+    };
+    "fstream-1.0.11" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz";
+        sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
       };
     };
     "fstream-npm-1.1.1" = {
@@ -6826,13 +6862,13 @@ let
         sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
-    "node-gyp-3.4.0" = {
+    "node-gyp-3.6.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.4.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz";
+        sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6";
       };
     };
     "normalize-git-url-3.0.2" = {
@@ -7015,6 +7051,15 @@ let
         sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
       };
     };
+    "validate-npm-package-name-2.2.2" = {
+      name = "validate-npm-package-name";
+      packageName = "validate-npm-package-name";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
+        sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
+      };
+    };
     "write-file-atomic-1.1.4" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -7096,76 +7141,31 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "yallist-2.0.0" = {
+    "yallist-2.1.2" = {
       name = "yallist";
       packageName = "yallist";
-      version = "2.0.0";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz";
-        sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4";
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "path-array-1.0.1" = {
-      name = "path-array";
-      packageName = "path-array";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
-        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
-      };
-    };
-    "array-index-1.0.0" = {
-      name = "array-index";
-      packageName = "array-index";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
-        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
-      };
-    };
-    "es6-symbol-3.1.0" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz";
-        sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa";
-      };
-    };
-    "d-0.1.1" = {
-      name = "d";
-      packageName = "d";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz";
-        sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
-      };
-    };
-    "es5-ext-0.10.12" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz";
-        sha1 = "aa84641d4db76b62abba5e45fd805ecbab140047";
-      };
-    };
-    "es6-iterator-2.0.0" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz";
-        sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
-      };
-    };
-    "request-2.79.0" = {
+    "request-2.81.0" = {
       name = "request";
       packageName = "request";
-      version = "2.79.0";
+      version = "2.81.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "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";
       };
     };
     "form-data-2.1.2" = {
@@ -7177,13 +7177,31 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
-    "qs-6.3.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.3.1";
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz";
-        sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
       };
     };
     "asynckit-0.4.0" = {
@@ -7195,6 +7213,42 @@ let
         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";
+      };
+    };
     "are-we-there-yet-1.1.2" = {
       name = "are-we-there-yet";
       packageName = "are-we-there-yet";
@@ -7285,6 +7339,15 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
+    "builtins-0.0.7" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      };
+    };
     "bl-0.9.5" = {
       name = "bl";
       packageName = "bl";
@@ -7771,13 +7834,13 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.1.7" = {
+    "rc-1.2.0" = {
       name = "rc";
       packageName = "rc";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
-        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz";
+        sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -7789,13 +7852,13 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "clone-2.1.0" = {
+    "clone-2.1.1" = {
       name = "clone";
       packageName = "clone";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
-        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz";
+        sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb";
       };
     };
     "parserlib-1.1.1" = {
@@ -8459,13 +8522,13 @@ let
         sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
-    "cors-2.8.1" = {
+    "cors-2.8.3" = {
       name = "cors";
       packageName = "cors";
-      version = "2.8.1";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
-        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz";
+        sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802";
       };
     };
     "docker-parse-image-3.0.1" = {
@@ -8477,13 +8540,13 @@ let
         sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4";
       };
     };
-    "end-of-stream-1.1.0" = {
+    "end-of-stream-1.4.0" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
-      version = "1.1.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
-        sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz";
+        sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206";
       };
     };
     "from2-1.3.0" = {
@@ -9152,13 +9215,13 @@ let
         sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
-    "doctrine-1.5.0" = {
+    "doctrine-2.0.0" = {
       name = "doctrine";
       packageName = "doctrine";
-      version = "1.5.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
-        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz";
+        sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63";
       };
     };
     "escope-3.6.0" = {
@@ -9179,6 +9242,15 @@ let
         sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
       };
     };
+    "esquery-1.0.0" = {
+      name = "esquery";
+      packageName = "esquery";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz";
+        sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa";
+      };
+    };
     "estraverse-4.2.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -9206,22 +9278,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.16.0" = {
+    "globals-9.17.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.16.0";
+      version = "9.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz";
-        sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80";
+        url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz";
+        sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
       };
     };
-    "ignore-3.2.4" = {
+    "ignore-3.2.6" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.4";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz";
-        sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz";
+        sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c";
       };
     };
     "inquirer-0.12.0" = {
@@ -9242,22 +9314,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.1" = {
+    "js-yaml-3.8.2" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.1";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
-        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
+        sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
       };
     };
     "levn-0.3.0" = {
@@ -9332,22 +9395,22 @@ let
         sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
       };
     };
-    "es6-map-0.1.4" = {
+    "es6-map-0.1.5" = {
       name = "es6-map";
       packageName = "es6-map";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz";
-        sha1 = "a34b147be224773a4d7da8072794cefa3632b897";
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
       };
     };
-    "es6-weak-map-2.0.1" = {
+    "es6-weak-map-2.0.2" = {
       name = "es6-weak-map";
       packageName = "es6-weak-map";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz";
-        sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81";
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
+        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
       };
     };
     "esrecurse-4.1.0" = {
@@ -9359,22 +9422,58 @@ let
         sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
       };
     };
-    "es6-set-0.1.4" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.4";
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz";
-        sha1 = "9516b6761c2964b92ff479456233a247dc707ce8";
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "event-emitter-0.3.4" = {
+    "es5-ext-0.10.15" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.15.tgz";
+        sha1 = "c330a5934c1ee21284a7c081a86e5fd937c91ea6";
+      };
+    };
+    "es6-iterator-2.0.1" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
+        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "event-emitter-0.3.5" = {
       name = "event-emitter";
       packageName = "event-emitter";
-      version = "0.3.4";
+      version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz";
-        sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5";
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
       };
     };
     "estraverse-4.1.1" = {
@@ -9404,6 +9503,15 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
     "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -9620,15 +9728,6 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.3" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
-        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
-      };
-    };
     "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
@@ -9656,15 +9755,6 @@ let
         sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
       };
     };
-    "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";
-      };
-    };
     "is-fullwidth-code-point-2.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -9962,13 +10052,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "normalize-path-2.0.1" = {
+    "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
-      version = "2.0.1";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz";
-        sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a";
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
     "object.omit-2.0.1" = {
@@ -10079,6 +10169,15 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
+    "remove-trailing-separator-1.0.1" = {
+      name = "remove-trailing-separator";
+      packageName = "remove-trailing-separator";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz";
+        sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4";
+      };
+    };
     "for-own-0.1.5" = {
       name = "for-own";
       packageName = "for-own";
@@ -10097,13 +10196,13 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
-    "for-in-1.0.1" = {
+    "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz";
-        sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa";
+        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz";
+        sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
       };
     };
     "glob-base-0.3.0" = {
@@ -10160,13 +10259,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.33" = {
+    "node-pre-gyp-0.6.34" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.33";
+      version = "0.6.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
-        sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
+        sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+      };
+    };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
     "npmlog-4.0.2" = {
@@ -10178,13 +10286,13 @@ let
         sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
-    "tar-pack-3.3.0" = {
+    "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
-        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz";
+        sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -10313,6 +10421,15 @@ let
         sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
       };
     };
+    "lodash.groupby-4.6.0" = {
+      name = "lodash.groupby";
+      packageName = "lodash.groupby";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz";
+        sha1 = "0b08a1dcf68397c397855c3239783832df7403d1";
+      };
+    };
     "minilog-2.0.8" = {
       name = "minilog";
       packageName = "minilog";
@@ -10322,6 +10439,15 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
+    "simple-git-1.69.0" = {
+      name = "simple-git";
+      packageName = "simple-git";
+      version = "1.69.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz";
+        sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177";
+      };
+    };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
       name = "tabtab";
       packageName = "tabtab";
@@ -10449,13 +10575,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-2.8.20" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "2.8.20";
       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.20.tgz";
+        sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
       };
     };
     "void-elements-2.0.1" = {
@@ -10494,6 +10620,15 @@ let
         sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
       };
     };
+    "acorn-2.7.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "2.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
+      };
+    };
     "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
@@ -10665,13 +10800,13 @@ let
         sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a";
       };
     };
-    "v8flags-2.0.11" = {
+    "v8flags-2.0.12" = {
       name = "v8flags";
       packageName = "v8flags";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz";
-        sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881";
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.12.tgz";
+        sha1 = "73235d9f7176f8e8833fb286795445f7938d84e5";
       };
     };
     "vinyl-fs-0.3.14" = {
@@ -11358,13 +11493,13 @@ let
         sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
       };
     };
-    "eventemitter3-2.0.2" = {
+    "eventemitter3-2.0.3" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz";
-        sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz";
+        sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba";
       };
     };
     "csslint-0.10.0" = {
@@ -11592,22 +11727,22 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.7" = {
+    "bluebird-3.5.0" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.7";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
-        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
+        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
-    "body-parser-1.16.1" = {
+    "body-parser-1.17.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.1";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
-        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz";
+        sha1 = "75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11718,13 +11853,13 @@ let
         sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
-    "useragent-2.1.12" = {
+    "useragent-2.1.13" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.12";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
-        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz";
+        sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10";
       };
     };
     "bytes-2.4.0" = {
@@ -11745,15 +11880,6 @@ let
         sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
-    "qs-6.2.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz";
-        sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625";
-      };
-    };
     "raw-body-2.2.0" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -11934,6 +12060,15 @@ let
         sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
+    "ws-1.1.2" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
+        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
+      };
+    };
     "after-0.8.2" = {
       name = "after";
       packageName = "after";
@@ -12204,6 +12339,24 @@ let
         sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
       };
     };
+    "etag-1.7.0" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+      };
+    };
+    "fresh-0.3.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+      };
+    };
     "merge-descriptors-1.0.0" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -12321,13 +12474,13 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.7" = {
+    "method-override-2.3.8" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.7";
+      version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
-        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz";
+        sha1 = "178234bf4bab869f89df9444b06fc6147b44828c";
       };
     };
     "morgan-1.6.1" = {
@@ -12438,22 +12591,13 @@ let
         sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
       };
     };
-    "csrf-3.0.4" = {
+    "csrf-3.0.6" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.4";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
-        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
+        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
       };
     };
     "rndm-1.2.0" = {
@@ -12474,13 +12618,13 @@ let
         sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "uid-safe-2.1.3" = {
+    "uid-safe-2.1.4" = {
       name = "uid-safe";
       packageName = "uid-safe";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
-        sha1 = "077e264a00b3187936b270bb7376a26473631071";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
+        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
       };
     };
     "random-bytes-1.0.0" = {
@@ -12798,13 +12942,13 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "convert-source-map-1.4.0" = {
+    "convert-source-map-1.5.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz";
-        sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
+        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
       };
     };
     "express-2.5.11" = {
@@ -13158,13 +13302,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "serve-favicon-2.4.0" = {
+    "serve-favicon-2.4.2" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.4.0";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz";
-        sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.2.tgz";
+        sha1 = "aed1d8de67d5b83192cf31fdf53d2ea29464363e";
       };
     };
     "strong-data-uri-1.0.4" = {
@@ -13176,22 +13320,22 @@ let
         sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0";
       };
     };
-    "v8-debug-0.7.7" = {
+    "v8-debug-1.0.1" = {
       name = "v8-debug";
       packageName = "v8-debug";
-      version = "0.7.7";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz";
-        sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935";
+        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz";
+        sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe";
       };
     };
-    "v8-profiler-5.6.5" = {
+    "v8-profiler-5.7.0" = {
       name = "v8-profiler";
       packageName = "v8-profiler";
-      version = "5.6.5";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz";
-        sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be";
+        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz";
+        sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d";
       };
     };
     "yargs-3.32.0" = {
@@ -13275,22 +13419,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "etag-1.8.0" = {
-      name = "etag";
-      packageName = "etag";
-      version = "1.8.0";
+    "ms-1.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz";
-        sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
-      };
-    };
-    "fresh-0.4.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz";
-        sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553";
+        url = "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz";
+        sha1 = "59adcd22edc543f7b5381862d31387b1f4bc9473";
       };
     };
     "truncate-1.0.5" = {
@@ -13500,6 +13635,15 @@ let
         sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
       };
     };
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
     "cookie-parser-1.4.3" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13509,6 +13653,15 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
+    "cors-2.8.1" = {
+      name = "cors";
+      packageName = "cors";
+      version = "2.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
+        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
+      };
+    };
     "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
@@ -13635,6 +13788,15 @@ let
         sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
+    "uglify-js-2.7.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+      };
+    };
     "when-3.7.7" = {
       name = "when";
       packageName = "when";
@@ -13671,13 +13833,13 @@ let
         sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
       };
     };
-    "node-red-node-twitter-0.1.9" = {
+    "node-red-node-twitter-0.1.10" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
-        sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz";
+        sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
       };
     };
     "node-red-node-rbe-0.1.6" = {
@@ -13698,6 +13860,33 @@ let
         sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
+    "http-errors-1.5.1" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
+      };
+    };
+    "qs-6.2.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+      };
+    };
+    "setprototypeof-1.0.2" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
+      };
+    };
     "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -13878,6 +14067,24 @@ let
         sha1 = "a954984325392f51532a7760760e459598c89f7a";
       };
     };
+    "serve-static-1.11.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
+        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
+      };
+    };
+    "send-0.14.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
+        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
+      };
+    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -13941,13 +14148,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-packet-5.2.1" = {
+    "mqtt-packet-5.2.2" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.1";
+      version = "5.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
-        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz";
+        sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a";
       };
     };
     "reinterval-1.1.0" = {
@@ -14247,6 +14454,24 @@ let
         sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
+    "rc-1.1.7" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
+        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
+      };
+    };
+    "tar-pack-3.3.0" = {
+      name = "tar-pack";
+      packageName = "tar-pack";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
+        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14832,6 +15057,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "call-limit-1.1.0" = {
+      name = "call-limit";
+      packageName = "call-limit";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
+        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14841,6 +15075,15 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
+    "hosted-git-info-2.2.0" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+      };
+    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -14904,6 +15147,15 @@ let
         sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
+    "move-concurrently-1.0.1" = {
+      name = "move-concurrently";
+      packageName = "move-concurrently";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+      };
+    };
     "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
@@ -14913,15 +15165,6 @@ let
         sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
-    "nopt-4.0.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14931,13 +15174,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.5" = {
+    "npm-registry-client-7.4.6" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.5";
+      version = "7.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
-        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz";
+        sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717";
       };
     };
     "opener-1.4.3" = {
@@ -14985,6 +15228,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "update-notifier-2.1.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
+        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15066,6 +15318,24 @@ let
         sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
       };
     };
+    "copy-concurrently-1.0.3" = {
+      name = "copy-concurrently";
+      packageName = "copy-concurrently";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
+        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
+      };
+    };
+    "run-queue-1.0.3" = {
+      name = "run-queue";
+      packageName = "run-queue";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15084,6 +15354,186 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
+    "boxen-1.0.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz";
+        sha1 = "b2694baf1f605f708ff0177c12193b22f29aaaab";
+      };
+    };
+    "configstore-3.0.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz";
+        sha1 = "e1b8669c1803ccc50b545e92f8e6e79aa80e0196";
+      };
+    };
+    "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-req-2.0.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
+        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+      };
+    };
+    "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";
+      };
+    };
+    "ansi-align-1.1.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
+        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "term-size-0.1.1" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
+        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+      };
+    };
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+      };
+    };
+    "execa-0.4.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
+        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+      };
+    };
+    "cross-spawn-async-2.2.5" = {
+      name = "cross-spawn-async";
+      packageName = "cross-spawn-async";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
+        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+      };
+    };
+    "npm-run-path-1.0.0" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
+        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
+      };
+    };
+    "path-key-1.0.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
+        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
+      };
+    };
+    "dot-prop-4.1.1" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
+        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "package-json-4.0.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.0.tgz";
+        sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998";
+      };
+    };
+    "registry-auth-token-3.1.0" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
+        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+      };
+    };
     "argparse-0.1.15" = {
       name = "argparse";
       packageName = "argparse";
@@ -15336,6 +15786,15 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
+    "snyk-1.26.1" = {
+      name = "snyk";
+      packageName = "snyk";
+      version = "1.26.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz";
+        sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5";
+      };
+    };
     "spawn-please-0.2.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
@@ -15363,6 +15822,15 @@ let
         sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
       };
     };
+    "node-gyp-3.4.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
+        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      };
+    };
     "request-2.75.0" = {
       name = "request";
       packageName = "request";
@@ -15381,6 +15849,24 @@ let
         sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
+    "path-array-1.0.1" = {
+      name = "path-array";
+      packageName = "path-array";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
+        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
+      };
+    };
+    "array-index-1.0.0" = {
+      name = "array-index";
+      packageName = "array-index";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
+        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
+      };
+    };
     "form-data-2.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -15390,13 +15876,220 @@ let
         sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
       };
     };
-    "boxen-0.6.0" = {
+    "hasbin-1.2.3" = {
+      name = "hasbin";
+      packageName = "hasbin";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz";
+        sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
+      };
+    };
+    "inquirer-1.0.3" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
+        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
+      };
+    };
+    "snyk-config-1.0.1" = {
+      name = "snyk-config";
+      packageName = "snyk-config";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
+        sha1 = "f27aec2498b24027ac719214026521591111508f";
+      };
+    };
+    "snyk-module-1.7.0" = {
+      name = "snyk-module";
+      packageName = "snyk-module";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz";
+        sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a";
+      };
+    };
+    "snyk-policy-1.7.0" = {
+      name = "snyk-policy";
+      packageName = "snyk-policy";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz";
+        sha1 = "2151c751ab1edc040fc6b94a872aa989db492324";
+      };
+    };
+    "snyk-recursive-readdir-2.0.0" = {
+      name = "snyk-recursive-readdir";
+      packageName = "snyk-recursive-readdir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz";
+        sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3";
+      };
+    };
+    "snyk-resolve-1.0.0" = {
+      name = "snyk-resolve";
+      packageName = "snyk-resolve";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
+        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+      };
+    };
+    "snyk-resolve-deps-1.7.0" = {
+      name = "snyk-resolve-deps";
+      packageName = "snyk-resolve-deps";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
+        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+      };
+    };
+    "snyk-tree-1.0.0" = {
+      name = "snyk-tree";
+      packageName = "snyk-tree";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz";
+        sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
+      };
+    };
+    "snyk-try-require-1.2.0" = {
+      name = "snyk-try-require";
+      packageName = "snyk-try-require";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
+        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+      };
+    };
+    "tempfile-1.1.1" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
+        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
+      };
+    };
+    "then-fs-2.0.0" = {
+      name = "then-fs";
+      packageName = "then-fs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz";
+        sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2";
+      };
+    };
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    };
+    "rx-4.1.0" = {
+      name = "rx";
+      packageName = "rx";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+      };
+    };
+    "nconf-0.7.2" = {
+      name = "nconf";
+      packageName = "nconf";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz";
+        sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00";
+      };
+    };
+    "yargs-3.15.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz";
+        sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
+      };
+    };
+    "minimatch-3.0.2" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz";
+        sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a";
+      };
+    };
+    "clite-0.3.0" = {
+      name = "clite";
+      packageName = "clite";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz";
+        sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441";
+      };
+    };
+    "lodash.defaultsdeep-4.6.0" = {
+      name = "lodash.defaultsdeep";
+      packageName = "lodash.defaultsdeep";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz";
+        sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81";
+      };
+    };
+    "lodash.mergewith-4.6.0" = {
+      name = "lodash.mergewith";
+      packageName = "lodash.mergewith";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz";
+        sha1 = "150cf0a16791f5903b8891eab154609274bdea55";
+      };
+    };
+    "update-notifier-0.6.3" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
+        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+      };
+    };
+    "yargs-4.8.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "4.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+      };
+    };
+    "boxen-0.3.1" = {
       name = "boxen";
       packageName = "boxen";
-      version = "0.6.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
+        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
       };
     };
     "configstore-2.1.0" = {
@@ -15417,33 +16110,6 @@ let
         sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
       };
     };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
-      };
-    };
-    "ansi-align-1.1.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
-      };
-    };
-    "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";
-      };
-    };
     "filled-array-1.1.0" = {
       name = "filled-array";
       packageName = "filled-array";
@@ -15453,15 +16119,6 @@ let
         sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
-      };
-    };
     "dot-prop-3.0.0" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -15471,15 +16128,6 @@ let
         sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
       };
     };
-    "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";
-      };
-    };
     "package-json-2.4.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -15498,15 +16146,6 @@ let
         sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "registry-auth-token-3.1.0" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
-        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
-      };
-    };
     "node-status-codes-1.0.0" = {
       name = "node-status-codes";
       packageName = "node-status-codes";
@@ -15534,6 +16173,96 @@ let
         sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
       };
     };
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
+    "window-size-0.2.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+      };
+    };
+    "yargs-parser-2.4.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "boxen-0.6.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
+        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+      };
+    };
+    "lazy-req-1.1.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
+        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
+      };
+    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -15580,6 +16309,15 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
+    "finalhandler-0.5.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+      };
+    };
     "gelf-stream-0.2.4" = {
       name = "gelf-stream";
       packageName = "gelf-stream";
@@ -15627,13 +16365,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.2.4" = {
+    "service-runner-2.2.5" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.2.4";
+      version = "2.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz";
-        sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.5.tgz";
+        sha1 = "95a55084f939110b3f201549c1afedf900ec4850";
       };
     };
     "simplediff-0.1.1" = {
@@ -15645,15 +16383,6 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
-      };
-    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -15717,13 +16446,13 @@ let
         sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
       };
     };
-    "bunyan-1.8.5" = {
+    "bunyan-1.8.9" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.5";
+      version = "1.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
-        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz";
+        sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a";
       };
     };
     "bunyan-syslog-udp-0.1.0" = {
@@ -15744,13 +16473,13 @@ let
         sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
       };
     };
-    "hot-shots-4.3.1" = {
+    "hot-shots-4.4.0" = {
       name = "hot-shots";
       packageName = "hot-shots";
-      version = "4.3.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
-        sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.4.0.tgz";
+        sha1 = "ab3f3b3df2f4b2ff0d716837569241ede81d9175";
       };
     };
     "limitation-0.2.0" = {
@@ -15780,13 +16509,13 @@ let
         sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
       };
     };
-    "dtrace-provider-0.8.0" = {
+    "dtrace-provider-0.8.1" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.0";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
-        sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz";
+        sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f";
       };
     };
     "mv-2.1.1" = {
@@ -15798,13 +16527,13 @@ let
         sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
       };
     };
-    "safe-json-stringify-1.0.3" = {
+    "safe-json-stringify-1.0.4" = {
       name = "safe-json-stringify";
       packageName = "safe-json-stringify";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
-        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz";
+        sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911";
       };
     };
     "ncp-2.0.0" = {
@@ -15907,51 +16636,6 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "get-caller-file-1.0.2" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
-        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
-      };
-    };
-    "require-directory-2.1.1" = {
-      name = "require-directory";
-      packageName = "require-directory";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
-      };
-    };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -15979,33 +16663,6 @@ let
         sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "airplayer-2.0.0" = {
       name = "airplayer";
       packageName = "airplayer";
@@ -16186,13 +16843,13 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
-    "multicast-dns-6.1.0" = {
+    "multicast-dns-6.1.1" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz";
-        sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf";
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz";
+        sha1 = "6e7de86a570872ab17058adea7160bbeca814dde";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -16222,33 +16879,6 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "mute-stream-0.0.6" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
-      };
-    };
-    "run-async-2.3.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
-      };
-    };
-    "rx-4.1.0" = {
-      name = "rx";
-      packageName = "rx";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
-        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
-      };
-    };
     "spawn-sync-1.0.15" = {
       name = "spawn-sync";
       packageName = "spawn-sync";
@@ -16942,22 +17572,22 @@ let
         sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.22" = {
+    "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.22";
+      version = "0.11.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz";
-        sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz";
+        sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
       };
     };
-    "ast-types-0.9.5" = {
+    "ast-types-0.9.6" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.5";
+      version = "0.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
-        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz";
+        sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9";
       };
     };
     "base62-0.1.1" = {
@@ -17240,13 +17870,13 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "express-5.0.0-alpha.3" = {
+    "express-5.0.0-alpha.5" = {
       name = "express";
       packageName = "express";
-      version = "5.0.0-alpha.3";
+      version = "5.0.0-alpha.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz";
-        sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz";
+        sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6";
       };
     };
     "express-json5-0.1.0" = {
@@ -17312,22 +17942,13 @@ let
         sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
       };
     };
-    "http-errors-1.6.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
-        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
-      };
-    };
-    "fs-ext-0.5.0" = {
+    "fs-ext-0.6.0" = {
       name = "fs-ext";
       packageName = "fs-ext";
-      version = "0.5.0";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz";
-        sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e";
+        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz";
+        sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66";
       };
     };
     "crypt3-0.2.0" = {
@@ -17339,13 +17960,13 @@ let
         sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "router-1.1.5" = {
+    "router-1.3.0" = {
       name = "router";
       packageName = "router";
-      version = "1.1.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz";
-        sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387";
+        url = "https://registry.npmjs.org/router/-/router-1.3.0.tgz";
+        sha1 = "15b24075c1de4a3d3f39808c5d7344a1564417c8";
       };
     };
     "raw-body-1.3.4" = {
@@ -17438,13 +18059,13 @@ let
         sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
-    "setprototypeof-1.0.3" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.3";
+    "async-2.1.5" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
-        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
     "lru-cache-2.2.0" = {
@@ -17816,31 +18437,22 @@ let
         sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
       };
     };
-    "csso-2.3.1" = {
+    "csso-2.3.2" = {
       name = "csso";
       packageName = "csso";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz";
-        sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9";
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
+        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
       };
     };
-    "clap-1.1.2" = {
+    "clap-1.1.3" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
-        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz";
+        sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -17924,22 +18536,22 @@ let
         sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
       };
     };
-    "node-appc-0.2.39" = {
+    "node-appc-0.2.41" = {
       name = "node-appc";
       packageName = "node-appc";
-      version = "0.2.39";
+      version = "0.2.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
-        sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz";
+        sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52";
       };
     };
-    "request-2.78.0" = {
+    "request-2.79.0" = {
       name = "request";
       packageName = "request";
-      version = "2.78.0";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
     "sprintf-0.1.5" = {
@@ -17960,13 +18572,13 @@ let
         sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
-    "wrench-1.5.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.5.9";
+    "fs-extra-2.1.2" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
-        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz";
+        sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35";
       };
     };
     "source-map-support-0.3.2" = {
@@ -17996,58 +18608,49 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "diff-2.2.1" = {
+    "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";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
-        sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "request-2.69.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.69.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
-        sha1 = "cf91d2e000752b1217155c005241911991a2346a";
-      };
-    };
-    "semver-5.1.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
-        sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
-      };
-    };
-    "wrench-1.5.8" = {
+    "wrench-1.5.9" = {
       name = "wrench";
       packageName = "wrench";
-      version = "1.5.8";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
-        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
       };
     };
-    "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";
-      };
-    };
-    "qs-6.0.3" = {
+    "qs-6.3.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.0.3";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz";
-        sha1 = "95f870b23e70268fba18704e80667515905af06c";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
+        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
+      };
+    };
+    "bluebird-3.4.7" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
     "blueimp-md5-2.6.0" = {
@@ -18077,13 +18680,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-2.0.12" = {
+    "diff2html-2.3.0" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.0.12";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz";
-        sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz";
+        sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
+      };
+    };
+    "express-4.14.1" = {
+      name = "express";
+      packageName = "express";
+      version = "4.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
+        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
       };
     };
     "express-session-1.14.2" = {
@@ -18131,13 +18743,13 @@ let
         sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
       };
     };
-    "knockout-3.4.1" = {
+    "knockout-3.4.2" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.4.1";
+      version = "3.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
-        sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz";
+        sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937";
       };
     };
     "node-cache-4.1.1" = {
@@ -18176,13 +18788,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.2" = {
+    "raven-1.1.5" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.2";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
-        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz";
+        sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf";
       };
     };
     "signals-1.0.0" = {
@@ -18221,22 +18833,22 @@ let
         sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-1.5.0" = {
+    "color-string-1.5.2" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.5.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz";
-        sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz";
+        sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "color-name-1.1.1" = {
+    "color-name-1.1.2" = {
       name = "color-name";
       packageName = "color-name";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
-        sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
       };
     };
     "simple-swizzle-0.2.2" = {
@@ -18257,15 +18869,6 @@ let
         sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
       };
     };
-    "diff-3.2.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
-      };
-    };
     "hogan.js-3.0.2" = {
       name = "hogan.js";
       packageName = "hogan.js";
@@ -18275,13 +18878,13 @@ let
         sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "whatwg-fetch-2.0.2" = {
+    "whatwg-fetch-2.0.3" = {
       name = "whatwg-fetch";
       packageName = "whatwg-fetch";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz";
-        sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
+        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
       };
     };
     "crc-3.4.1" = {
@@ -18491,13 +19094,13 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "acorn-dynamic-import-2.0.1" = {
+    "acorn-dynamic-import-2.0.2" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz";
-        sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz";
+        sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
       };
     };
     "enhanced-resolve-3.1.0" = {
@@ -18563,13 +19166,13 @@ let
         sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
-    "webpack-sources-0.1.4" = {
+    "webpack-sources-0.2.3" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "0.1.4";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz";
-        sha1 = "ccc2c817e08e5fa393239412690bb481821393cd";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz";
+        sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb";
       };
     };
     "big.js-3.1.3" = {
@@ -18626,13 +19229,13 @@ let
         sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
-    "source-list-map-0.1.8" = {
+    "source-list-map-1.1.1" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.8";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
-        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.1.tgz";
+        sha1 = "1a33ac210ca144d1e561f906ebccab5669ff4cb4";
       };
     };
     "babel-runtime-6.23.0" = {
@@ -18644,6 +19247,15 @@ let
         sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
+    "bytes-2.5.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
+        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
+      };
+    };
     "death-1.1.0" = {
       name = "death";
       packageName = "death";
@@ -18662,22 +19274,13 @@ let
         sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
       };
     };
-    "diff-2.2.3" = {
-      name = "diff";
-      packageName = "diff";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
-      };
-    };
-    "inquirer-3.0.5" = {
+    "inquirer-3.0.6" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz";
-        sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz";
+        sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347";
       };
     };
     "invariant-2.2.2" = {
@@ -18734,13 +19337,13 @@ let
         sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55";
       };
     };
-    "request-capture-har-1.1.4" = {
+    "request-capture-har-1.2.2" = {
       name = "request-capture-har";
       packageName = "request-capture-har";
-      version = "1.1.4";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
-        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz";
+        sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d";
       };
     };
     "roadrunner-1.1.0" = {
@@ -18797,13 +19400,13 @@ let
         sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
       };
     };
-    "onetime-2.0.0" = {
+    "onetime-2.0.1" = {
       name = "onetime";
       packageName = "onetime";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz";
-        sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6";
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
     "loose-envify-1.3.1" = {
@@ -18950,15 +19553,6 @@ let
         sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
       };
     };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
-      };
-    };
     "yeoman-character-1.1.0" = {
       name = "yeoman-character";
       packageName = "yeoman-character";
@@ -19094,15 +19688,6 @@ let
         sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c";
       };
     };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
-      };
-    };
     "bin-version-check-2.1.0" = {
       name = "bin-version-check";
       packageName = "bin-version-check";
@@ -19184,6 +19769,15 @@ let
         sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
       };
     };
+    "diff-2.2.3" = {
+      name = "diff";
+      packageName = "diff";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+      };
+    };
     "globby-4.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -19308,7 +19902,7 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."path-parse-1.0.5"
       sources."array-unique-0.2.1"
       (sources."global-modules-0.2.3" // {
@@ -19324,9 +19918,9 @@ in
       })
       sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."parse-passwd-1.0.0"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."amdefine-1.0.1"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
@@ -19343,10 +19937,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.10";
+    version = "0.10.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz";
-      sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz";
+      sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -19358,7 +19952,7 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.2"
+      sources."azure-arm-cdn-1.0.3"
       sources."azure-arm-commerce-0.2.0"
       sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
@@ -19413,6 +20007,7 @@ in
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
       sources."commander-1.0.4"
+      sources."date-utils-1.2.21"
       sources."easy-table-0.0.1"
       sources."event-stream-3.1.5"
       sources."eyes-0.1.8"
@@ -19422,15 +20017,16 @@ in
       sources."jsonlint-1.6.2"
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
+      sources."jwt-decode-2.2.0"
       (sources."kuduscript-1.0.13" // {
         dependencies = [
           sources."commander-1.1.1"
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.1"
-      sources."ms-rest-1.15.5"
-      (sources."ms-rest-azure-1.15.5" // {
+      sources."moment-2.18.1"
+      sources."ms-rest-1.15.7"
+      (sources."ms-rest-azure-1.15.7" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -19485,7 +20081,6 @@ in
       sources."xml2js-0.1.14"
       sources."xmlbuilder-0.4.3"
       sources."read-1.0.7"
-      sources."date-utils-1.2.21"
       sources."jws-3.1.4"
       sources."node-uuid-1.4.7"
       sources."xmldom-0.1.27"
@@ -19513,7 +20108,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."stack-trace-0.0.9"
       sources."keypress-0.1.0"
-      sources."from-0.1.3"
+      sources."from-0.1.7"
       sources."map-stream-0.1.0"
       sources."pause-stream-0.0.11"
       sources."split-0.2.10"
@@ -19567,7 +20162,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.5"
+          sources."async-2.2.0"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -19582,9 +20177,9 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.2"
+      sources."qs-6.2.3"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -19608,8 +20203,12 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19633,7 +20232,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
@@ -19642,7 +20241,7 @@ in
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
         ];
       })
       sources."http-response-object-1.1.0"
@@ -19733,7 +20332,7 @@ in
       sources."timed-out-2.0.0"
       sources."end-of-stream-1.0.0"
       sources."inherits-2.0.3"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
@@ -19748,7 +20347,7 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."minimist-1.2.0"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
@@ -19756,7 +20355,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -19781,7 +20380,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
       sources."indent-string-2.1.0"
@@ -19815,8 +20414,8 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."q-1.4.1"
-      sources."debug-2.6.1"
+      sources."q-1.5.0"
+      sources."debug-2.6.3"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19885,7 +20484,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."resolve-1.3.2"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
@@ -19893,11 +20492,7 @@ in
       sources."stream-http-2.6.3"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
-      (sources."syntax-error-1.1.6" // {
-        dependencies = [
-          sources."acorn-2.7.0"
-        ];
-      })
+      sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
@@ -19931,7 +20526,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."date-now-0.1.4"
       sources."browserify-cipher-1.0.0"
-      sources."browserify-sign-4.0.0"
+      sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
       sources."create-hash-1.1.2"
       sources."create-hmac-1.1.4"
@@ -19949,7 +20544,7 @@ in
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
-      sources."parse-asn1-5.0.0"
+      sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
       sources."hmac-drbg-1.0.0"
@@ -19968,16 +20563,12 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."function-bind-1.1.0"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
-      sources."astw-2.0.0"
-      sources."acorn-1.2.2"
+      sources."astw-2.2.0"
+      sources."acorn-4.0.11"
       sources."stream-splicer-2.0.0"
-      (sources."detective-4.3.2" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
+      sources."detective-4.5.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."buffer-shims-1.0.0"
@@ -20016,7 +20607,7 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -20097,7 +20688,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
@@ -20105,7 +20696,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -20124,7 +20715,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
       sources."indent-string-2.1.0"
@@ -20143,7 +20734,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.1" // {
+      (sources."parse-torrent-5.8.2" // {
         dependencies = [
           sources."get-stdin-5.0.1"
         ];
@@ -20241,7 +20832,7 @@ in
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
       sources."inherits-2.0.3"
-      sources."ip-1.1.4"
+      sources."ip-1.1.5"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -20289,26 +20880,26 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.4.3" // {
+      (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
-          sources."ws-2.1.0"
+          sources."readable-stream-2.2.6"
+          sources."ws-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.2" // {
+      (sources."ws-1.1.4" // {
         dependencies = [
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."get-browser-rtc-1.0.2"
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -20329,7 +20920,7 @@ in
         ];
       })
       sources."hawk-0.10.2"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
       sources."aws-sign-0.2.0"
       sources."oauth-sign-0.2.0"
@@ -20349,7 +20940,7 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -20395,7 +20986,7 @@ in
     dependencies = [
       (sources."cordova-common-2.0.0" // {
         dependencies = [
-          sources."q-1.4.1"
+          sources."q-1.5.0"
           sources."underscore-1.8.3"
         ];
       })
@@ -20412,8 +21003,7 @@ in
       (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."request-2.79.0"
-          sources."qs-6.3.1"
+          sources."request-2.81.0"
         ];
       })
       sources."nopt-3.0.1"
@@ -20456,15 +21046,15 @@ in
       })
       (sources."cordova-fetch-1.0.2" // {
         dependencies = [
-          sources."q-1.4.1"
-          sources."shelljs-0.7.6"
+          sources."q-1.5.0"
+          sources."shelljs-0.7.7"
           sources."glob-7.1.1"
         ];
       })
       sources."cordova-js-4.2.1"
       (sources."cordova-serve-1.0.1" // {
         dependencies = [
-          sources."q-1.4.1"
+          sources."q-1.5.0"
         ];
       })
       (sources."dep-graph-1.1.0" // {
@@ -20472,12 +21062,12 @@ in
           sources."underscore-1.2.1"
         ];
       })
-      (sources."init-package-json-1.9.4" // {
+      (sources."init-package-json-1.9.5" // {
         dependencies = [
-          sources."glob-6.0.4"
+          sources."glob-7.1.1"
         ];
       })
-      (sources."npm-2.15.11" // {
+      (sources."npm-2.15.12" // {
         dependencies = [
           sources."abbrev-1.0.9"
           sources."glob-7.0.6"
@@ -20488,8 +21078,14 @@ in
           sources."request-2.74.0"
           sources."semver-5.1.1"
           sources."tar-2.2.1"
+          sources."validate-npm-package-name-2.2.2"
           sources."isarray-1.0.0"
+          sources."caseless-0.11.0"
           sources."form-data-1.0.1"
+          sources."har-validator-2.0.6"
+          sources."qs-6.2.3"
+          sources."tunnel-agent-0.4.3"
+          sources."builtins-0.0.7"
         ];
       })
       sources."opener-1.4.1"
@@ -20502,6 +21098,7 @@ in
           sources."form-data-0.1.4"
           sources."mime-types-1.0.2"
           sources."qs-2.3.3"
+          sources."tunnel-agent-0.4.3"
           sources."http-signature-0.10.1"
           sources."oauth-sign-0.4.0"
           sources."hawk-1.1.1"
@@ -20521,7 +21118,11 @@ in
       })
       sources."tar-1.0.2"
       sources."valid-identifier-0.0.1"
-      sources."xcode-0.9.1"
+      (sources."xcode-0.9.1" // {
+        dependencies = [
+          sources."node-uuid-1.4.7"
+        ];
+      })
       sources."browserify-transform-tools-1.5.3"
       sources."falafel-1.2.0"
       sources."through-2.3.8"
@@ -20536,7 +21137,7 @@ in
         ];
       })
       sources."is-url-1.2.2"
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
       sources."resolve-1.3.2"
@@ -20589,7 +21190,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.3" // {
+      (sources."readable-stream-2.2.6" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
@@ -20600,9 +21201,9 @@ in
       sources."stream-http-2.6.3"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
-      (sources."syntax-error-1.1.6" // {
+      (sources."syntax-error-1.3.0" // {
         dependencies = [
-          sources."acorn-2.7.0"
+          sources."acorn-4.0.11"
         ];
       })
       sources."through2-2.0.3"
@@ -20634,7 +21235,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."date-now-0.1.4"
       sources."browserify-cipher-1.0.0"
-      sources."browserify-sign-4.0.0"
+      sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
       sources."create-hash-1.1.2"
       sources."create-hmac-1.1.4"
@@ -20652,7 +21253,7 @@ in
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
-      sources."parse-asn1-5.0.0"
+      sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
       sources."hmac-drbg-1.0.0"
@@ -20662,13 +21263,17 @@ in
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
-      sources."astw-2.0.0"
-      sources."stream-splicer-2.0.0"
-      (sources."detective-4.3.2" // {
+      (sources."astw-2.2.0" // {
         dependencies = [
-          sources."acorn-3.3.0"
+          sources."acorn-4.0.11"
+        ];
+      })
+      sources."stream-splicer-2.0.0"
+      (sources."detective-4.5.0" // {
+        dependencies = [
+          sources."acorn-4.0.11"
         ];
       })
       sources."stream-combiner2-1.1.1"
@@ -20686,7 +21291,12 @@ in
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
       sources."compression-1.6.2"
-      sources."express-4.14.1"
+      (sources."express-4.15.2" // {
+        dependencies = [
+          sources."debug-2.6.1"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -20695,13 +21305,13 @@ in
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
       sources."bytes-2.3.0"
-      sources."compressible-2.0.9"
+      sources."compressible-2.0.10"
       sources."debug-2.2.0"
       sources."on-headers-1.0.1"
-      sources."vary-1.1.0"
-      sources."mime-types-2.1.14"
+      sources."vary-1.1.1"
+      sources."mime-types-2.1.15"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -20711,49 +21321,55 @@ in
       sources."depd-1.1.0"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      sources."finalhandler-0.5.1"
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      (sources."finalhandler-1.0.1" // {
+        dependencies = [
+          sources."debug-2.6.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
-      sources."qs-6.2.0"
+      sources."proxy-addr-1.1.4"
+      sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.2" // {
+      (sources."send-0.15.1" // {
         dependencies = [
+          sources."debug-2.6.1"
           sources."ms-0.7.2"
         ];
       })
-      sources."serve-static-1.11.2"
+      sources."serve-static-1.12.1"
+      sources."setprototypeof-1.0.3"
+      sources."statuses-1.3.1"
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
-      sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
-      sources."http-errors-1.5.1"
+      sources."http-errors-1.6.1"
       sources."mime-1.3.4"
-      sources."setprototypeof-1.0.2"
       sources."media-typer-0.3.0"
-      sources."npm-package-arg-4.2.0"
+      sources."npm-package-arg-4.2.1"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
-      (sources."read-package-json-2.0.4" // {
+      (sources."read-package-json-2.0.5" // {
         dependencies = [
-          sources."glob-6.0.4"
+          sources."glob-7.1.1"
         ];
       })
       sources."validate-npm-package-license-3.0.1"
-      sources."validate-npm-package-name-2.2.2"
-      sources."hosted-git-info-2.2.0"
+      sources."validate-npm-package-name-3.0.0"
+      sources."hosted-git-info-2.4.1"
       sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."graceful-fs-4.1.11"
       sources."jju-1.3.0"
       sources."is-builtin-module-1.0.0"
@@ -20761,7 +21377,7 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."builtins-0.0.7"
+      sources."builtins-1.0.3"
       sources."abbrev-1.1.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
@@ -20776,9 +21392,9 @@ in
       sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.9"
-      sources."fs-write-stream-atomic-1.0.8"
-      sources."fstream-1.0.10"
+      sources."fs-vacuum-1.2.10"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-npm-1.1.1"
       sources."github-url-from-git-1.4.0"
       sources."github-url-from-username-repo-1.0.2"
@@ -20790,7 +21406,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-gyp-3.4.0" // {
+      (sources."node-gyp-3.6.0" // {
         dependencies = [
           sources."glob-7.1.1"
           sources."tar-2.2.1"
@@ -20801,8 +21417,7 @@ in
       sources."npm-install-checks-1.0.7"
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
-          sources."request-2.79.0"
-          sources."qs-6.3.1"
+          sources."request-2.81.0"
         ];
       })
       sources."npm-user-validate-0.1.5"
@@ -20822,7 +21437,7 @@ in
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."write-file-atomic-1.1.4"
       sources."imurmurhash-0.1.4"
       sources."wcwidth-1.0.1"
@@ -20833,49 +21448,47 @@ in
       sources."iferr-0.1.5"
       sources."fstream-ignore-1.0.5"
       sources."pseudomap-1.0.2"
-      sources."yallist-2.0.0"
-      sources."path-array-1.0.1"
-      sources."array-index-1.0.0"
-      sources."es6-symbol-3.1.0"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
+      sources."yallist-2.1.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      (sources."ajv-4.11.5" // {
+        dependencies = [
+          sources."json-stable-stringify-1.0.1"
+        ];
+      })
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20915,13 +21528,22 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."node-uuid-1.4.7"
-      (sources."async-2.1.5" // {
+      sources."node-uuid-1.4.8"
+      (sources."async-2.2.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
       })
-      sources."isexe-1.1.2"
+      sources."commander-2.9.0"
+      sources."is-my-json-valid-2.16.0"
+      sources."pinkie-promise-2.0.1"
+      sources."graceful-readlink-1.0.1"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.1"
+      sources."is-property-1.0.2"
+      sources."pinkie-2.0.4"
+      sources."isexe-2.0.0"
       sources."ctype-0.5.3"
       sources."pegjs-0.9.0"
       (sources."simple-plist-0.1.4" // {
@@ -20988,7 +21610,7 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."rc-1.1.7"
+      sources."rc-1.2.0"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-2.0.1"
       sources."is-finite-1.0.2"
@@ -21009,7 +21631,7 @@ in
       sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-2.1.0"
+      sources."clone-2.1.1"
       sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -21065,7 +21687,7 @@ in
       })
       sources."through-2.3.8"
       sources."duplexer-0.1.1"
-      sources."from-0.1.3"
+      sources."from-0.1.7"
       sources."map-stream-0.1.0"
       sources."pause-stream-0.0.11"
       sources."split-0.3.3"
@@ -21099,9 +21721,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -21172,9 +21794,9 @@ in
       sources."JSONStream-0.8.4"
       sources."basic-auth-1.1.0"
       sources."cookie-signature-1.0.6"
-      sources."cors-2.8.1"
+      sources."cors-2.8.3"
       sources."docker-parse-image-3.0.1"
-      sources."end-of-stream-1.1.0"
+      sources."end-of-stream-1.4.0"
       sources."from2-1.3.0"
       sources."fs-blob-store-5.2.1"
       sources."level-0.18.0"
@@ -21213,7 +21835,7 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -21227,7 +21849,7 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -21240,8 +21862,9 @@ in
       sources."xtend-4.0.1"
       sources."jsonparse-0.0.5"
       sources."through-2.3.8"
-      sources."vary-1.1.0"
-      sources."once-1.3.3"
+      sources."object-assign-4.1.1"
+      sources."vary-1.1.1"
+      sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."inherits-2.0.3"
       sources."readable-stream-1.1.14"
@@ -21251,7 +21874,8 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
+          sources."once-1.3.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -21319,62 +21943,56 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."async-2.1.5"
+      sources."async-2.2.0"
       sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."jsonparse-1.3.0"
       sources."through-2.3.8"
       sources."lodash-4.17.4"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21398,7 +22016,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -21444,10 +22062,10 @@ in
       sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
       sources."lru-cache-4.0.2"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."pseudomap-1.0.2"
-      sources."yallist-2.0.0"
-      sources."isexe-1.1.2"
+      sources."yallist-2.1.2"
+      sources."isexe-2.0.0"
       sources."object-assign-4.1.1"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
@@ -21474,14 +22092,14 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."minimist-1.2.0"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -21498,7 +22116,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
       sources."indent-string-2.1.0"
@@ -21519,30 +22137,31 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.16.1";
+    version = "3.18.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz";
-      sha1 = "9bc31fc7341692cf772e80607508f67d711c5609";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz";
+      sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
-      sources."debug-2.6.1"
-      sources."doctrine-1.5.0"
+      sources."debug-2.6.3"
+      sources."doctrine-2.0.0"
       sources."escope-3.6.0"
       sources."espree-3.4.0"
+      sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.1"
-      sources."globals-9.16.0"
-      sources."ignore-3.2.4"
+      sources."globals-9.17.0"
+      sources."ignore-3.2.6"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.16.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.1"
+      sources."js-yaml-3.8.2"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -21553,7 +22172,7 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.6"
+      sources."shelljs-0.7.7"
       sources."strip-bom-3.0.0"
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
@@ -21573,7 +22192,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -21581,19 +22200,19 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."ms-0.7.2"
-      sources."es6-map-0.1.4"
-      sources."es6-weak-map-2.0.1"
+      sources."es6-map-0.1.5"
+      sources."es6-weak-map-2.0.2"
       (sources."esrecurse-4.1.0" // {
         dependencies = [
           sources."estraverse-4.1.1"
         ];
       })
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
-      sources."es6-set-0.1.4"
-      sources."es6-symbol-3.1.0"
-      sources."event-emitter-0.3.4"
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.15"
+      sources."es6-iterator-2.0.1"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."event-emitter-0.3.5"
       sources."object-assign-4.1.1"
       sources."acorn-4.0.4"
       (sources."acorn-jsx-3.0.1" // {
@@ -21661,11 +22280,11 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       sources."rechoir-0.6.2"
       sources."resolve-1.3.2"
       sources."path-parse-1.0.5"
-      sources."ajv-4.11.3"
+      sources."ajv-4.11.5"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -21805,7 +22424,7 @@ in
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -21820,17 +22439,18 @@ in
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -21838,30 +22458,28 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.33"
+      sources."node-pre-gyp-0.6.34"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.79.0"
-      sources."rimraf-2.5.4"
+      sources."request-2.81.0"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-        ];
-      })
+      sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       (sources."gauge-2.7.3" // {
@@ -21886,48 +22504,44 @@ in
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21951,7 +22565,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -21959,11 +22573,11 @@ in
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
-      sources."debug-2.2.0"
+      sources."fstream-1.0.11"
+      sources."debug-2.6.3"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -21975,7 +22589,6 @@ in
       sources."lazy-1.0.11"
       sources."caller-0.0.1"
       sources."tape-2.3.3"
-      sources."jsonify-0.0.0"
       sources."deep-equal-0.1.2"
       sources."defined-0.0.0"
       sources."through-2.3.8"
@@ -21994,14 +22607,18 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.3";
+    version = "0.5.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
-      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz";
+      sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
+      sources."async-2.2.0"
+      sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
+      sources."simple-git-1.69.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
+      sources."lodash-4.17.4"
       sources."microee-0.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -22082,7 +22699,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.8.20" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -22106,9 +22723,8 @@ in
       sources."css-stringify-1.0.5"
       sources."optimist-0.3.7"
       sources."wordwrap-0.0.3"
-      sources."async-0.2.10"
-      sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
+      sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
       (sources."cliui-2.1.0" // {
         dependencies = [
@@ -22124,7 +22740,7 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
@@ -22153,14 +22769,14 @@ in
       sources."chalk-1.1.3"
       sources."deprecated-0.0.1"
       sources."gulp-util-3.0.8"
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
       sources."orchestrator-0.3.8"
       sources."pretty-hrtime-1.0.3"
       sources."semver-4.3.6"
       sources."tildify-1.2.0"
-      sources."v8flags-2.0.11"
+      sources."v8flags-2.0.12"
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
           sources."through2-0.6.5"
@@ -22191,7 +22807,7 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -22245,7 +22861,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -22263,10 +22879,11 @@ in
       sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."glob-parent-2.0.0"
@@ -22279,9 +22896,9 @@ in
       sources."is-windows-0.2.0"
       sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."parse-passwd-1.0.0"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."lodash.assignwith-4.2.0"
       sources."lodash.isempty-4.4.0"
       sources."lodash.pick-4.4.0"
@@ -22362,7 +22979,7 @@ in
       sources."redis-0.10.3"
       sources."lru-cache-2.5.2"
       sources."minimist-0.0.8"
-      sources."eventemitter3-2.0.2"
+      sources."eventemitter3-2.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22481,7 +23098,7 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      (sources."js-yaml-3.8.1" // {
+      (sources."js-yaml-3.8.2" // {
         dependencies = [
           sources."esprima-3.1.3"
         ];
@@ -22495,7 +23112,7 @@ in
       sources."once-1.4.0"
       sources."resolve-1.1.7"
       sources."supports-color-3.2.3"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."wordwrap-1.0.0"
       sources."estraverse-1.9.3"
       sources."esutils-2.0.2"
@@ -22520,15 +23137,14 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.8.20" // {
         dependencies = [
-          sources."async-0.2.10"
           sources."source-map-0.5.6"
         ];
       })
       sources."minimist-0.0.10"
-      sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
+      sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
       (sources."cliui-2.1.0" // {
         dependencies = [
@@ -22544,11 +23160,11 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."argparse-1.0.9"
       sources."sprintf-js-1.0.3"
       sources."has-flag-1.0.0"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22631,15 +23247,15 @@ in
   json = nodeEnv.buildNodePackage {
     name = "json";
     packageName = "json";
-    version = "9.0.4";
+    version = "9.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz";
-      sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce";
+      url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz";
+      sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "a 'json' command for massaging and processing JSON on the command line";
-      homepage = https://github.com/trentm/json;
+      homepage = "https://github.com/trentm/json#readme";
     };
     production = true;
   };
@@ -22661,10 +23277,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.1";
+    version = "3.8.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
-      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
+      sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -22688,8 +23304,8 @@ in
       sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
-      sources."body-parser-1.16.1"
+      sources."bluebird-3.5.0"
+      sources."body-parser-1.17.1"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
@@ -22736,26 +23352,26 @@ in
       })
       sources."source-map-0.5.6"
       sources."tmp-0.0.31"
-      sources."useragent-2.1.12"
+      sources."useragent-2.1.13"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.1"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.1"
+      sources."http-errors-1.6.1"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.2.1"
+      sources."qs-6.4.0"
       sources."raw-body-2.2.0"
       sources."type-is-1.6.14"
       sources."ms-0.7.2"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.2"
+      sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -22774,7 +23390,7 @@ in
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -22789,16 +23405,17 @@ in
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -22806,36 +23423,24 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      (sources."node-pre-gyp-0.6.33" // {
-        dependencies = [
-          sources."rimraf-2.5.4"
-        ];
-      })
+      sources."node-pre-gyp-0.6.34"
       sources."mkdirp-0.5.1"
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      (sources."request-2.79.0" // {
-        dependencies = [
-          sources."qs-6.3.1"
-        ];
-      })
+      sources."request-2.81.0"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."readable-stream-2.1.5"
-          sources."rimraf-2.5.4"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -22857,46 +23462,41 @@ in
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22922,9 +23522,9 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
-      sources."once-1.3.3"
+      sources."once-1.4.0"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
       sources."finalhandler-1.0.0"
@@ -23006,7 +23606,6 @@ in
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
       sources."json3-3.3.2"
-      sources."os-tmpdir-1.0.2"
       sources."lru-cache-2.2.4"
     ];
     buildInputs = globalBuildInputs;
@@ -23079,15 +23678,14 @@ in
       (sources."express-session-1.11.3" // {
         dependencies = [
           sources."uid-safe-2.0.0"
-          sources."base64-url-1.2.1"
         ];
       })
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.7" // {
+      (sources."method-override-2.3.8" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."vary-1.1.0"
+          sources."debug-2.6.3"
+          sources."vary-1.1.1"
           sources."ms-0.7.2"
         ];
       })
@@ -23132,18 +23730,18 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.9"
-      sources."mime-types-2.1.14"
+      sources."compressible-2.0.10"
+      sources."mime-types-2.1.15"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."ms-0.7.1"
-      sources."csrf-3.0.4"
-      sources."base64-url-1.3.3"
+      sources."csrf-3.0.6"
       sources."rndm-1.2.0"
       sources."tsscmp-1.0.5"
-      sources."uid-safe-2.1.3"
+      sources."uid-safe-2.1.4"
       sources."random-bytes-1.0.0"
       sources."crc-3.3.0"
+      sources."base64-url-1.2.1"
       sources."inherits-2.0.3"
       sources."statuses-1.3.1"
       sources."readable-stream-1.1.14"
@@ -23188,7 +23786,7 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."xtend-4.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -23256,7 +23854,7 @@ in
       })
       sources."filename-regex-2.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
         dependencies = [
@@ -23275,10 +23873,11 @@ in
       sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       (sources."glob-base-0.3.0" // {
         dependencies = [
           sources."glob-parent-2.0.0"
@@ -23293,7 +23892,7 @@ in
       sources."extend-shallow-2.0.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."convert-source-map-1.4.0"
+      sources."convert-source-map-1.5.0"
       sources."minimist-0.0.8"
       sources."is-utf8-0.2.1"
       sources."first-chunk-stream-1.0.0"
@@ -23415,10 +24014,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.1.1";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz";
-      sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz";
+      sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408";
     };
     dependencies = [
       sources."optparse-1.0.5"
@@ -23448,17 +24047,17 @@ in
       sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
-      sources."normalize-package-data-2.3.5"
-      sources."npm-package-arg-4.2.0"
+      sources."normalize-package-data-2.3.6"
+      sources."npm-package-arg-4.2.1"
       sources."once-1.4.0"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."retry-0.8.0"
       sources."rimraf-2.6.1"
       sources."slide-1.1.6"
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23466,7 +24065,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -23476,50 +24075,44 @@ in
       sources."wrappy-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23543,7 +24136,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23564,10 +24157,12 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
+      sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
+      sources."ansi-regex-2.1.1"
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
       sources."nopt-3.0.6"
@@ -23578,7 +24173,7 @@ in
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       (sources."fs-extra-0.6.4" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -23595,19 +24190,20 @@ in
     meta = {
       description = "Generate Nix expressions to build NPM packages";
       homepage = https://github.com/svanderburg/node2nix;
+      license = "MIT";
     };
     production = true;
   };
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.5.0";
+    version = "3.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz";
+      sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6";
     };
     dependencies = [
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
@@ -23615,11 +24211,11 @@ in
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
       sources."osenv-0.1.4"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."inherits-2.0.3"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -23636,7 +24232,7 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23658,48 +24254,44 @@ in
       sources."os-tmpdir-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23723,10 +24315,10 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -23739,36 +24331,34 @@ in
   node-inspector = nodeEnv.buildNodePackage {
     name = "node-inspector";
     packageName = "node-inspector";
-    version = "0.12.8";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz";
-      sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz";
+      sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37";
     };
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.1"
-      (sources."express-4.14.1" // {
+      sources."debug-2.6.3"
+      (sources."express-4.15.2" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."debug-2.6.1"
         ];
       })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
-      sources."rc-1.1.7"
+      sources."rc-1.2.0"
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.0" // {
+      (sources."serve-favicon-2.4.2" // {
         dependencies = [
-          sources."etag-1.8.0"
-          sources."fresh-0.4.0"
+          sources."ms-1.0.0"
         ];
       })
       sources."strong-data-uri-1.0.4"
-      sources."v8-debug-0.7.7"
-      sources."v8-profiler-5.6.5"
-      sources."which-1.2.12"
-      sources."ws-1.1.2"
+      sources."v8-debug-1.0.1"
+      sources."v8-profiler-5.7.0"
+      sources."which-1.2.14"
+      sources."ws-1.1.4"
       sources."yargs-3.32.0"
       sources."browser-launcher2-0.4.6"
       sources."minimist-1.2.0"
@@ -23810,7 +24400,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
@@ -23819,7 +24409,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -23837,7 +24427,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
       sources."indent-string-2.1.0"
@@ -23856,48 +24446,39 @@ in
       sources."depd-1.1.0"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      (sources."finalhandler-0.5.1" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      sources."finalhandler-1.0.1"
+      sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
-      sources."qs-6.2.0"
+      sources."proxy-addr-1.1.4"
+      sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.2" // {
+      (sources."send-0.15.1" // {
         dependencies = [
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
+          sources."debug-2.6.1"
         ];
       })
-      sources."serve-static-1.11.2"
+      sources."serve-static-1.12.1"
+      sources."setprototypeof-1.0.3"
+      sources."statuses-1.3.1"
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.0"
-      sources."mime-types-2.1.14"
+      sources."vary-1.1.1"
+      sources."mime-types-2.1.15"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.26.0"
-      sources."statuses-1.3.1"
+      sources."mime-db-1.27.0"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
-      sources."http-errors-1.5.1"
+      sources."http-errors-1.6.1"
       sources."mime-1.3.4"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.2"
       sources."media-typer-0.3.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
@@ -23911,28 +24492,20 @@ in
       sources."strip-json-comments-2.0.1"
       sources."truncate-1.0.5"
       sources."nan-2.5.1"
-      (sources."node-pre-gyp-0.6.33" // {
+      (sources."node-pre-gyp-0.6.34" // {
         dependencies = [
-          sources."rimraf-2.5.4"
+          sources."rimraf-2.6.1"
           sources."semver-5.3.0"
           sources."glob-7.1.1"
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."request-2.79.0" // {
-        dependencies = [
-          sources."qs-6.3.1"
-        ];
-      })
+      sources."request-2.81.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
+      (sources."tar-pack-3.4.0" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-          sources."rimraf-2.5.4"
-          sources."ms-0.7.1"
+          sources."rimraf-2.6.1"
           sources."glob-7.1.1"
         ];
       })
@@ -23942,7 +24515,7 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23958,43 +24531,42 @@ in
       sources."ansi-regex-2.1.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."is-property-1.0.2"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24021,10 +24593,10 @@ in
       sources."punycode-1.4.1"
       sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
       sources."cliui-3.2.0"
@@ -24045,38 +24617,36 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.33";
+    version = "0.6.34";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
-      sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
+      sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.79.0"
-      sources."rimraf-2.5.4"
+      sources."request-2.81.0"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-        ];
-      })
+      sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -24100,48 +24670,44 @@ in
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24165,7 +24731,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24178,12 +24744,12 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."graceful-fs-4.1.11"
-      sources."debug-2.2.0"
+      sources."debug-2.6.3"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24203,11 +24769,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.6.1" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."debug-2.6.3"
       sources."es6-promise-3.3.1"
       sources."ignore-by-default-1.0.1"
       sources."lodash.defaults-3.1.2"
@@ -24239,7 +24801,7 @@ in
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -24254,17 +24816,18 @@ in
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -24272,28 +24835,25 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.33"
+      sources."node-pre-gyp-0.6.34"
       sources."mkdirp-0.5.1"
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.79.0"
-      sources."rimraf-2.5.4"
+      sources."request-2.81.0"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-        ];
-      })
+      sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -24315,48 +24875,44 @@ in
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24380,7 +24936,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24388,10 +24944,10 @@ in
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."lodash.assign-3.2.0"
       sources."lodash.restparam-3.6.1"
       sources."lodash._baseassign-3.2.0"
@@ -24409,11 +24965,12 @@ in
       sources."event-stream-3.3.4"
       sources."through-2.3.8"
       sources."duplexer-0.1.1"
-      sources."from-0.1.3"
+      sources."from-0.1.7"
       sources."map-stream-0.1.0"
       sources."pause-stream-0.0.11"
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
+      sources."chalk-1.1.3"
       (sources."configstore-1.4.0" // {
         dependencies = [
           sources."uuid-2.0.3"
@@ -24424,11 +24981,12 @@ in
       sources."repeating-1.1.3"
       sources."semver-diff-2.1.0"
       sources."string-length-1.0.1"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.4"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."write-file-atomic-1.3.1"
       sources."xdg-basedir-2.0.0"
-      sources."os-homedir-1.0.2"
       sources."imurmurhash-0.1.4"
       sources."slide-1.1.6"
       sources."package-json-1.2.0"
@@ -24453,6 +25011,8 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."is-finite-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -24487,7 +25047,7 @@ in
       sources."express-4.14.0"
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          sources."debug-2.6.1"
+          sources."debug-2.6.3"
           sources."ms-0.7.2"
         ];
       })
@@ -24524,11 +25084,14 @@ in
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
       sources."node-red-node-email-0.1.21"
-      (sources."node-red-node-twitter-0.1.9" // {
+      (sources."node-red-node-twitter-0.1.10" // {
         dependencies = [
-          sources."request-2.79.0"
+          sources."request-2.81.0"
+          sources."caseless-0.12.0"
           sources."form-data-2.1.2"
-          sources."qs-6.3.1"
+          sources."har-validator-4.2.1"
+          sources."qs-6.4.0"
+          sources."tunnel-agent-0.6.0"
         ];
       })
       sources."node-red-node-rbe-0.1.6"
@@ -24548,8 +25111,8 @@ in
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -24576,7 +25139,7 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -24585,9 +25148,9 @@ in
       sources."util-deprecate-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."vary-1.1.0"
+      sources."vary-1.1.1"
       sources."moment-timezone-0.5.11"
-      sources."moment-2.17.1"
+      sources."moment-2.18.1"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -24600,7 +25163,7 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       (sources."serve-static-1.11.2" // {
@@ -24612,7 +25175,7 @@ in
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."graceful-fs-4.1.11"
@@ -24629,10 +25192,10 @@ in
       sources."sprintf-js-1.0.3"
       sources."commist-1.0.0"
       sources."concat-stream-1.6.0"
-      sources."end-of-stream-1.1.0"
+      sources."end-of-stream-1.4.0"
       sources."help-me-1.0.1"
       sources."minimist-1.2.0"
-      sources."mqtt-packet-5.2.1"
+      sources."mqtt-packet-5.2.2"
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.1.1"
@@ -24640,7 +25203,7 @@ in
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
-      sources."once-1.3.3"
+      sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."callback-stream-1.1.0"
       (sources."glob-stream-5.3.5" // {
@@ -24683,7 +25246,7 @@ in
       })
       sources."filename-regex-2.0.0"
       sources."kind-of-3.1.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
         dependencies = [
@@ -24702,10 +25265,11 @@ in
       sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       (sources."glob-base-0.3.0" // {
         dependencies = [
           sources."glob-parent-2.0.0"
@@ -24725,6 +25289,7 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
+          sources."once-1.3.3"
         ];
       })
       sources."stream-shift-1.0.0"
@@ -24772,7 +25337,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.5"
+          sources."async-2.2.0"
         ];
       })
       sources."har-validator-2.0.6"
@@ -24780,7 +25345,7 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
@@ -24807,8 +25372,12 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24876,15 +25445,23 @@ in
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."uuid-3.0.1"
       sources."asynckit-0.4.0"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
       sources."bindings-1.2.1"
       sources."nan-2.5.0"
       (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
-          sources."request-2.79.0"
+          sources."request-2.81.0"
+          sources."caseless-0.12.0"
           sources."form-data-2.1.2"
-          sources."qs-6.3.1"
+          sources."har-validator-4.2.1"
+          sources."qs-6.4.0"
+          sources."tunnel-agent-0.6.0"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -24902,6 +25479,7 @@ in
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."once-1.3.3"
           sources."readable-stream-2.1.5"
         ];
       })
@@ -24924,7 +25502,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
     ];
@@ -24990,7 +25568,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.1" // {
+      (sources."debug-2.6.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -25065,29 +25643,31 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.3.0";
+    version = "4.4.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz";
-      sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28";
+      url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz";
+      sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.1"
       sources."archy-1.0.0"
       sources."asap-2.0.5"
+      sources."bluebird-3.5.0"
+      sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.9"
-      sources."fs-write-stream-atomic-1.0.8"
-      sources."fstream-1.0.10"
+      sources."fs-vacuum-1.2.10"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
@@ -25097,11 +25677,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.4" // {
-        dependencies = [
-          sources."glob-6.0.4"
-        ];
-      })
+      sources."init-package-json-1.9.5"
       sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
@@ -25111,6 +25687,7 @@ in
       sources."lodash.without-4.4.0"
       sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
+      sources."move-concurrently-1.0.1"
       (sources."node-gyp-3.5.0" // {
         dependencies = [
           sources."nopt-3.0.6"
@@ -25118,11 +25695,11 @@ in
       })
       sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.0"
-      sources."npm-registry-client-7.4.5"
+      sources."npm-package-arg-4.2.1"
+      sources."npm-registry-client-7.4.6"
       sources."npm-user-validate-0.1.5"
       sources."npmlog-4.0.2"
       sources."once-1.4.0"
@@ -25132,17 +25709,13 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      (sources."read-package-json-2.0.4" // {
-        dependencies = [
-          sources."glob-6.0.4"
-        ];
-      })
+      sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."retry-0.10.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -25161,9 +25734,10 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
+      sources."update-notifier-2.1.0"
       sources."uuid-3.0.1"
-      sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.12"
+      sources."validate-npm-package-name-3.0.0"
+      sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
       sources."debuglog-1.0.1"
@@ -25199,11 +25773,7 @@ in
           sources."once-1.3.3"
         ];
       })
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
       sources."parallel-transform-1.1.0"
@@ -25216,6 +25786,8 @@ in
       sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
+      sources."copy-concurrently-1.0.3"
+      sources."run-queue-1.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
@@ -25244,46 +25816,43 @@ in
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25307,13 +25876,70 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      sources."builtins-0.0.7"
-      sources."isexe-1.1.2"
+      (sources."boxen-1.0.0" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."chalk-1.1.3"
+      sources."configstore-3.0.0"
+      sources."is-npm-1.0.0"
+      sources."latest-version-3.1.0"
+      sources."lazy-req-2.0.0"
+      sources."semver-diff-2.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."ansi-align-1.1.0"
+      sources."camelcase-4.1.0"
+      sources."cli-boxes-1.0.0"
+      sources."term-size-0.1.1"
+      sources."widest-line-1.0.0"
+      sources."execa-0.4.0"
+      sources."cross-spawn-async-2.2.5"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-1.0.0"
+      sources."path-key-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.0.2"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
+      sources."dot-prop-4.1.1"
+      sources."unique-string-1.0.0"
+      sources."is-obj-1.0.1"
+      sources."crypto-random-string-1.0.0"
+      sources."package-json-4.0.0"
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.1.0"
+      sources."registry-url-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."get-stream-3.0.0"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+      (sources."rc-1.2.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."deep-extend-0.4.1"
+      sources."strip-json-comments-2.0.1"
+      sources."builtins-1.0.3"
+      sources."isexe-2.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
@@ -25366,7 +25992,7 @@ in
       sources."coffee-script-1.12.4"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."graceful-fs-2.0.3"
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
@@ -25377,50 +26003,44 @@ in
       sources."npmlog-4.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25444,7 +26064,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -25462,7 +26082,7 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -25474,10 +26094,12 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
+      sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
+      sources."ansi-regex-2.1.1"
       (sources."config-chain-1.1.11" // {
         dependencies = [
           sources."ini-1.3.4"
@@ -25517,13 +26139,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.3";
+    version = "2.10.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz";
-      sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz";
+      sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.5.0"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
@@ -25543,8 +26165,26 @@ in
       sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
+      (sources."snyk-1.26.1" // {
+        dependencies = [
+          sources."update-notifier-0.5.0"
+          sources."latest-version-1.0.1"
+          sources."repeating-1.1.3"
+          sources."package-json-1.2.0"
+          sources."got-3.3.1"
+          sources."object-assign-3.0.0"
+          sources."timed-out-2.0.0"
+        ];
+      })
       sources."spawn-please-0.2.0"
-      sources."update-notifier-1.0.3"
+      (sources."update-notifier-1.0.3" // {
+        dependencies = [
+          sources."boxen-0.6.0"
+          sources."configstore-2.1.0"
+          sources."camelcase-2.1.1"
+          sources."uuid-2.0.3"
+        ];
+      })
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -25569,9 +26209,9 @@ in
       sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.9"
-      sources."fs-write-stream-atomic-1.0.8"
-      sources."fstream-1.0.10"
+      sources."fs-vacuum-1.2.10"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
@@ -25581,9 +26221,9 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.4" // {
+      (sources."init-package-json-1.9.5" // {
         dependencies = [
-          sources."glob-6.0.4"
+          sources."validate-npm-package-name-3.0.0"
         ];
       })
       sources."lockfile-1.0.3"
@@ -25600,10 +26240,10 @@ in
       })
       sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.0"
+      sources."npm-package-arg-4.2.1"
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
           sources."npmlog-3.1.2"
@@ -25622,11 +26262,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      (sources."read-package-json-2.0.4" // {
-        dependencies = [
-          sources."glob-6.0.4"
-        ];
-      })
+      sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
@@ -25642,8 +26278,12 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
-      sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.12"
+      (sources."validate-npm-package-name-2.2.2" // {
+        dependencies = [
+          sources."builtins-0.0.7"
+        ];
+      })
+      sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
       sources."debuglog-1.0.1"
@@ -25668,6 +26308,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
       sources."promzard-0.3.0"
+      sources."builtins-1.0.3"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       sources."minimist-0.0.8"
@@ -25686,17 +26327,17 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.1"
-      sources."es6-symbol-3.1.0"
+      sources."debug-2.6.3"
+      sources."es6-symbol-3.1.1"
       sources."ms-0.7.2"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.15"
+      sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
         ];
       })
       sources."typedarray-0.0.6"
@@ -25728,10 +26369,10 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.15"
+      sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.2"
+      sources."qs-6.2.3"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -25748,8 +26389,12 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25773,31 +26418,122 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      sources."builtins-0.0.7"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."boxen-0.6.0"
-      sources."configstore-2.1.0"
+      sources."ansi-escapes-1.4.0"
+      (sources."configstore-1.4.0" // {
+        dependencies = [
+          sources."uuid-2.0.3"
+        ];
+      })
+      sources."es6-promise-3.3.1"
+      sources."hasbin-1.2.3"
+      (sources."inquirer-1.0.3" // {
+        dependencies = [
+          sources."mute-stream-0.0.6"
+        ];
+      })
+      sources."open-0.0.5"
+      sources."os-name-1.0.3"
+      sources."snyk-config-1.0.1"
+      sources."snyk-module-1.7.0"
+      sources."snyk-policy-1.7.0"
+      (sources."snyk-recursive-readdir-2.0.0" // {
+        dependencies = [
+          sources."minimatch-3.0.2"
+        ];
+      })
+      sources."snyk-resolve-1.0.0"
+      (sources."snyk-resolve-deps-1.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."snyk-tree-1.0.0"
+      sources."snyk-try-require-1.2.0"
+      (sources."tempfile-1.1.1" // {
+        dependencies = [
+          sources."uuid-2.0.3"
+        ];
+      })
+      sources."then-fs-2.0.0"
+      sources."undefsafe-0.0.3"
+      (sources."url-0.11.0" // {
+        dependencies = [
+          sources."punycode-1.3.2"
+        ];
+      })
+      sources."uuid-3.0.1"
+      sources."xdg-basedir-2.0.0"
+      sources."async-1.5.2"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.1.0"
+      sources."figures-1.7.0"
+      sources."run-async-2.3.0"
+      sources."rx-4.1.0"
+      sources."through-2.3.8"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."is-promise-2.1.0"
+      (sources."osx-release-1.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."win-release-1.1.1"
+      (sources."nconf-0.7.2" // {
+        dependencies = [
+          sources."async-0.9.2"
+        ];
+      })
+      sources."yargs-3.15.0"
+      sources."camelcase-1.2.1"
+      sources."cliui-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.4"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."wordwrap-0.0.2"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.1.0"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."js-yaml-3.8.2"
+      sources."argparse-1.0.9"
+      sources."esprima-3.1.3"
+      sources."sprintf-js-1.0.3"
+      (sources."clite-0.3.0" // {
+        dependencies = [
+          sources."update-notifier-0.6.3"
+          sources."yargs-4.8.1"
+          sources."configstore-2.1.0"
+          sources."uuid-2.0.3"
+          sources."cliui-3.2.0"
+          sources."window-size-0.2.0"
+        ];
+      })
+      sources."lru-cache-4.0.2"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.defaultsdeep-4.6.0"
+      sources."lodash.mergewith-4.6.0"
+      sources."boxen-0.3.1"
       sources."is-npm-1.0.0"
       sources."latest-version-2.0.0"
-      sources."lazy-req-1.1.0"
       sources."semver-diff-2.1.0"
-      sources."xdg-basedir-2.0.0"
-      sources."ansi-align-1.1.0"
-      sources."camelcase-2.1.1"
-      sources."cli-boxes-1.0.0"
       sources."filled-array-1.1.0"
       sources."repeating-2.0.1"
       sources."widest-line-1.0.0"
       sources."is-finite-1.0.2"
       sources."dot-prop-3.0.0"
-      sources."uuid-2.0.3"
       sources."is-obj-1.0.1"
       sources."package-json-2.4.0"
       sources."got-5.7.1"
@@ -25816,16 +26552,55 @@ in
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-2.0.1"
+      sources."get-caller-file-1.0.2"
+      sources."lodash.assign-4.2.0"
+      sources."os-locale-1.4.0"
+      sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."which-module-1.0.0"
+      sources."y18n-3.2.1"
+      (sources."yargs-parser-2.4.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
+      sources."wrap-ansi-2.1.0"
+      sources."lcid-1.0.0"
+      sources."invert-kv-1.0.0"
+      sources."read-pkg-1.1.0"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-2.0.0"
+      sources."is-utf8-0.2.1"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."promise-7.1.1"
+      sources."string-length-1.0.1"
+      sources."duplexify-3.5.0"
+      sources."infinity-agent-2.0.3"
+      sources."nested-error-stacks-1.0.2"
+      (sources."end-of-stream-1.0.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."stream-shift-1.0.0"
+      sources."querystring-0.2.0"
+      sources."lazy-req-1.1.0"
+      sources."ansi-align-1.1.0"
+      sources."cli-boxes-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25846,7 +26621,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.16.1" // {
+      (sources."body-parser-1.17.1" // {
         dependencies = [
           sources."content-type-1.0.2"
         ];
@@ -25864,12 +26639,14 @@ in
       sources."diff-1.4.0"
       sources."domino-1.0.28"
       sources."entities-1.1.1"
-      (sources."express-4.14.1" // {
+      (sources."express-4.15.2" // {
         dependencies = [
           sources."content-type-1.0.2"
-          sources."debug-2.2.0"
-          sources."qs-6.2.0"
-          sources."ms-0.7.1"
+          (sources."finalhandler-1.0.1" // {
+            dependencies = [
+              sources."debug-2.6.3"
+            ];
+          })
         ];
       })
       sources."express-handlebars-3.0.0"
@@ -25880,25 +26657,20 @@ in
         ];
       })
       sources."gelf-stream-0.2.4"
-      sources."js-yaml-3.8.1"
+      sources."js-yaml-3.8.2"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
       sources."prfun-2.1.4"
-      (sources."request-2.79.0" // {
-        dependencies = [
-          sources."qs-6.3.1"
-        ];
-      })
+      sources."request-2.81.0"
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.4.0" // {
+      (sources."serve-favicon-2.4.2" // {
         dependencies = [
-          sources."etag-1.8.0"
-          sources."fresh-0.4.0"
+          sources."ms-1.0.0"
         ];
       })
-      (sources."service-runner-2.2.4" // {
+      (sources."service-runner-2.2.5" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
           sources."yargs-6.6.0"
@@ -25921,25 +26693,25 @@ in
       sources."bytes-2.4.0"
       sources."debug-2.6.1"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.1"
+      sources."http-errors-1.6.1"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.2.1"
+      sources."qs-6.4.0"
       sources."raw-body-2.2.0"
       sources."type-is-1.6.14"
       sources."ms-0.7.2"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.2"
+      sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
       sources."accepts-1.3.3"
-      sources."compressible-2.0.9"
+      sources."compressible-2.0.10"
       sources."on-headers-1.0.1"
-      sources."vary-1.1.0"
+      sources."vary-1.1.1"
       sources."busboy-0.2.14"
       sources."dicer-0.2.5"
       sources."readable-stream-1.1.14"
@@ -25953,27 +26725,19 @@ in
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.2" // {
-        dependencies = [
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
-        ];
-      })
-      sources."serve-static-1.11.2"
+      sources."send-0.15.1"
+      sources."serve-static-1.12.1"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
@@ -25995,9 +26759,8 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.8.20" // {
         dependencies = [
-          sources."async-0.2.10"
           sources."source-map-0.5.6"
           sources."yargs-3.10.0"
         ];
@@ -26021,7 +26784,7 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."function-bind-1.1.0"
       sources."object-keys-1.0.11"
       sources."define-properties-1.1.2"
@@ -26032,48 +26795,42 @@ in
       sources."sprintf-js-1.0.3"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26098,21 +26855,21 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."bluebird-3.4.7"
-      sources."bunyan-1.8.5"
+      sources."bluebird-3.5.0"
+      sources."bunyan-1.8.9"
       sources."bunyan-syslog-udp-0.1.0"
-      sources."hot-shots-4.3.1"
+      sources."hot-shots-4.4.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
       sources."dnscache-1.0.1"
-      sources."dtrace-provider-0.8.0"
+      sources."dtrace-provider-0.8.1"
       sources."mv-2.1.1"
-      sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.1"
+      sources."safe-json-stringify-1.0.4"
+      sources."moment-2.18.1"
       sources."nan-2.5.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -26127,14 +26884,14 @@ in
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -26142,7 +26899,7 @@ in
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -26152,7 +26909,7 @@ in
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -26170,22 +26927,26 @@ in
           sources."camelcase-3.0.0"
         ];
       })
+      sources."strip-ansi-3.0.1"
       sources."wrap-ansi-2.1.0"
+      sources."ansi-regex-2.1.1"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -26210,10 +26971,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.1";
+    version = "0.36.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
-      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.2.tgz";
+      sha1 = "93dd39e10a0a94b4f66ec19a42d8f5598a3eec01";
     };
     dependencies = [
       sources."airplayer-2.0.0"
@@ -26233,14 +26994,14 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.1" // {
+      (sources."parse-torrent-5.8.2" // {
         dependencies = [
           sources."get-stdin-5.0.1"
         ];
       })
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
-      sources."rc-1.1.7"
+      sources."rc-1.2.0"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -26269,7 +27030,7 @@ in
       sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -26303,18 +27064,18 @@ in
       sources."deep-equal-1.0.1"
       sources."dns-equal-1.0.0"
       sources."dns-txt-2.0.2"
-      sources."multicast-dns-6.1.0"
+      sources."multicast-dns-6.1.1"
       sources."multicast-dns-service-types-1.1.0"
       sources."dns-packet-1.1.1"
       sources."thunky-0.1.0"
-      sources."ip-1.1.4"
+      sources."ip-1.1.5"
       sources."safe-buffer-5.0.1"
       sources."meow-3.7.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
@@ -26323,7 +27084,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -26342,7 +27103,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
       sources."indent-string-2.1.0"
@@ -26380,11 +27141,7 @@ in
       sources."rusha-0.8.5"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
@@ -26414,7 +27171,7 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
@@ -26461,19 +27218,19 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.4.3"
+      sources."simple-peer-6.4.4"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."ws-2.1.0"
+          sources."ws-2.2.2"
         ];
       })
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.2" // {
+      (sources."ws-1.1.4" // {
         dependencies = [
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."get-browser-rtc-1.0.2"
       sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
@@ -26604,11 +27361,7 @@ in
       sources."keypress-0.1.0"
       sources."mime-1.2.11"
       sources."minimist-0.0.8"
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."magnet-uri-2.0.1"
@@ -26631,7 +27384,7 @@ in
       sources."rusha-0.8.5"
       sources."form-data-0.0.10"
       sources."hawk-0.10.2"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
       sources."aws-sign-0.2.0"
       sources."oauth-sign-0.2.0"
@@ -26673,9 +27426,9 @@ in
       sources."ms-0.7.2"
       (sources."accepts-1.3.3" // {
         dependencies = [
-          sources."mime-types-2.1.14"
+          sources."mime-types-2.1.15"
           sources."negotiator-0.6.1"
-          sources."mime-db-1.26.0"
+          sources."mime-db-1.27.0"
         ];
       })
       sources."base64id-1.0.0"
@@ -26712,13 +27465,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.6.1"
+          sources."debug-2.6.3"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.6.1"
+          sources."debug-2.6.3"
         ];
       })
       sources."bncode-0.5.3"
@@ -26727,7 +27480,7 @@ in
       sources."ip-0.3.3"
       (sources."ip-set-1.0.1" // {
         dependencies = [
-          sources."ip-1.1.4"
+          sources."ip-1.1.5"
         ];
       })
       sources."peer-wire-swarm-0.9.2"
@@ -26744,7 +27497,7 @@ in
       sources."string2compact-1.2.2"
       sources."ip-regex-1.0.3"
       sources."unzip-response-1.0.2"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."bn.js-1.3.0"
       sources."extend.js-0.0.2"
       (sources."portfinder-0.3.0" // {
@@ -26768,8 +27521,8 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."which-1.2.12"
-      sources."isexe-1.1.2"
+      sources."which-1.2.14"
+      sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26795,7 +27548,7 @@ in
       sources."progress-1.1.8"
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."concat-stream-1.5.0"
       sources."debug-0.7.4"
       sources."mkdirp-0.5.0"
@@ -26834,8 +27587,8 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.15"
+      sources."node-uuid-1.4.8"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
       sources."tough-cookie-2.2.2"
@@ -26848,12 +27601,16 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.5"
+      sources."async-2.2.0"
       sources."lodash-4.17.4"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26898,7 +27655,7 @@ in
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26924,16 +27681,16 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."detective-4.3.2"
+      sources."detective-4.5.0"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
       sources."iconv-lite-0.4.15"
       sources."mkdirp-0.5.1"
       sources."private-0.1.7"
-      sources."q-1.4.1"
-      sources."recast-0.11.22"
+      sources."q-1.5.0"
+      sources."recast-0.11.23"
       sources."graceful-readlink-1.0.1"
-      sources."acorn-3.3.0"
+      sources."acorn-4.0.11"
       sources."defined-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -26945,7 +27702,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."ast-types-0.9.5"
+      sources."ast-types-0.9.6"
       sources."esprima-3.1.3"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
@@ -27010,7 +27767,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -27031,8 +27788,8 @@ in
       sources."request-2.9.203"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."request-2.79.0"
-          sources."qs-6.3.1"
+          sources."request-2.81.0"
+          sources."qs-6.4.0"
         ];
       })
       sources."node-swt-0.1.1"
@@ -27041,52 +27798,43 @@ in
       sources."crc-0.2.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      (sources."har-validator-2.0.6" // {
-        dependencies = [
-          sources."commander-2.9.0"
-        ];
-      })
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27110,7 +27858,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -27144,37 +27892,31 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      sources."express-5.0.0-alpha.3"
+      sources."express-5.0.0-alpha.5"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.16.1" // {
+      (sources."body-parser-1.17.1" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."debug-2.6.1"
-          sources."http-errors-1.5.1"
           sources."iconv-lite-0.4.15"
-          sources."qs-6.2.1"
           sources."raw-body-2.2.0"
-          sources."ms-0.7.2"
         ];
       })
       (sources."compression-1.6.2" // {
         dependencies = [
           sources."bytes-2.3.0"
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.8.1"
+      sources."js-yaml-3.8.2"
       sources."cookies-0.7.0"
-      (sources."request-2.79.0" // {
-        dependencies = [
-          sources."qs-6.3.1"
-        ];
-      })
+      sources."request-2.81.0"
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.5"
+      sources."bunyan-1.8.9"
       sources."handlebars-2.0.0"
       sources."highlight.js-8.9.1"
       sources."lunr-0.7.2"
@@ -27183,17 +27925,13 @@ in
       sources."JSONStream-1.3.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
-      (sources."http-errors-1.6.1" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."http-errors-1.6.1"
       (sources."readable-stream-1.1.14" // {
         dependencies = [
           sources."isarray-0.0.1"
         ];
       })
-      sources."fs-ext-0.5.0"
+      sources."fs-ext-0.6.0"
       sources."crypt3-0.2.0"
       sources."accepts-1.3.3"
       sources."array-flatten-2.1.1"
@@ -27201,51 +27939,49 @@ in
       sources."content-type-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."debug-2.2.0"
+      sources."debug-2.6.1"
       sources."depd-1.1.0"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      sources."finalhandler-0.5.1"
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      (sources."finalhandler-1.0.1" // {
+        dependencies = [
+          sources."debug-2.6.3"
+        ];
+      })
+      sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
-      sources."qs-6.2.0"
+      sources."proxy-addr-1.1.4"
+      sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      sources."router-1.1.5"
-      (sources."send-0.14.2" // {
-        dependencies = [
-          sources."http-errors-1.5.1"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."serve-static-1.11.2"
+      sources."router-1.3.0"
+      sources."send-0.15.1"
+      sources."serve-static-1.12.1"
+      sources."setprototypeof-1.0.3"
+      sources."statuses-1.3.1"
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.0"
-      sources."mime-types-2.1.14"
+      sources."vary-1.1.1"
+      sources."mime-types-2.1.15"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.26.0"
-      sources."ms-0.7.1"
-      sources."statuses-1.3.1"
+      sources."mime-db-1.27.0"
+      sources."ms-0.7.2"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
-      sources."setprototypeof-1.0.2"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."inherits-2.0.3"
       sources."media-typer-0.3.0"
       sources."raw-body-1.3.4"
       sources."bytes-1.0.0"
       sources."iconv-lite-0.4.8"
-      sources."compressible-2.0.9"
+      sources."compressible-2.0.10"
       sources."on-headers-1.0.1"
       sources."graceful-readlink-1.0.1"
       sources."argparse-1.0.9"
@@ -27254,46 +27990,42 @@ in
       sources."keygrip-1.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27320,10 +28052,10 @@ in
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.8.0"
+      sources."dtrace-provider-0.8.1"
       sources."mv-2.1.1"
-      sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.1"
+      sources."safe-json-stringify-1.0.4"
+      sources."moment-2.18.1"
       sources."nan-2.5.1"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -27333,6 +28065,7 @@ in
         ];
       })
       sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.6"
@@ -27355,10 +28088,11 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.3"
+          sources."readable-stream-2.2.6"
         ];
       })
       sources."regexp-quote-0.0.0"
+      sources."xtend-4.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
@@ -27406,7 +28140,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -27493,7 +28227,7 @@ in
       sources."keep-alive-agent-0.0.1"
       sources."mime-1.3.4"
       sources."negotiator-0.5.3"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."once-1.4.0"
       sources."qs-3.1.0"
       sources."semver-4.3.6"
@@ -27517,7 +28251,7 @@ in
       sources."core-util-is-1.0.2"
       sources."nan-2.5.1"
       sources."mv-2.1.1"
-      sources."safe-json-stringify-1.0.3"
+      sources."safe-json-stringify-1.0.4"
       sources."mkdirp-0.5.1"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -27542,14 +28276,15 @@ in
           })
         ];
       })
-      (sources."jsprim-1.3.1" // {
+      (sources."jsprim-1.4.0" // {
         dependencies = [
+          sources."assert-plus-1.0.0"
           sources."extsprintf-1.0.2"
           sources."verror-1.3.6"
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -27578,7 +28313,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -27619,13 +28354,13 @@ in
       sources."colors-1.1.2"
       sources."whet.extend-0.9.9"
       sources."mkdirp-0.5.1"
-      sources."csso-2.3.1"
-      sources."q-1.4.1"
+      sources."csso-2.3.2"
+      sources."q-1.5.0"
       sources."argparse-1.0.9"
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.1.2"
+      sources."clap-1.1.3"
       sources."source-map-0.5.6"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
@@ -27662,7 +28397,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -27691,10 +28426,10 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.11";
+    version = "5.0.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
-      sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.12.tgz";
+      sha1 = "2bcfab6110ef0a91c9d54825052fd0db3e9dd942";
     };
     dependencies = [
       sources."async-2.1.2"
@@ -27707,21 +28442,12 @@ in
       sources."humanize-0.0.9"
       sources."longjohn-0.2.11"
       sources."moment-2.16.0"
-      (sources."node-appc-0.2.39" // {
+      (sources."node-appc-0.2.41" // {
         dependencies = [
-          sources."async-1.5.2"
-          sources."request-2.69.0"
-          sources."semver-5.1.0"
-          sources."wrench-1.5.8"
-        ];
-      })
-      (sources."request-2.78.0" // {
-        dependencies = [
-          sources."form-data-2.1.2"
-          sources."qs-6.3.1"
-          sources."tough-cookie-2.3.2"
+          sources."async-2.1.4"
         ];
       })
+      sources."request-2.79.0"
       sources."semver-5.3.0"
       sources."sprintf-0.1.5"
       sources."temp-0.8.3"
@@ -27731,53 +28457,66 @@ in
           sources."colors-1.0.3"
         ];
       })
-      sources."wrench-1.5.9"
+      sources."fs-extra-2.1.2"
       sources."lodash-4.17.4"
       sources."keypress-0.2.1"
       sources."source-map-support-0.3.2"
       sources."source-map-0.1.32"
       sources."amdefine-1.0.1"
       sources."adm-zip-0.4.7"
-      sources."diff-2.2.1"
+      sources."diff-3.2.0"
       sources."node-uuid-1.4.7"
       sources."optimist-0.6.1"
-      (sources."uglify-js-2.6.1" // {
+      sources."wrench-1.5.9"
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
         ];
       })
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
+      sources."uglify-to-browserify-1.0.2"
+      sources."yargs-3.10.0"
+      sources."camelcase-1.2.1"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.1.0"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."bl-1.0.3"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-1.0.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.0.3"
+      sources."qs-6.3.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.2.2"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."readable-stream-2.0.6"
-      sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.16.0"
@@ -27800,8 +28539,12 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27825,26 +28568,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
-      sources."uglify-to-browserify-1.0.2"
-      sources."yargs-3.10.0"
-      sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
-      sources."decamelize-1.2.0"
-      sources."window-size-0.1.0"
-      sources."center-align-0.1.3"
-      sources."right-align-0.1.3"
-      sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
-      sources."longest-1.0.1"
-      sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
-      sources."asynckit-0.4.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."os-tmpdir-1.0.2"
       sources."rimraf-2.2.8"
@@ -27852,6 +28576,8 @@ in
       sources."eyes-0.1.8"
       sources."pkginfo-0.3.1"
       sources."stack-trace-0.0.9"
+      sources."graceful-fs-4.1.11"
+      sources."jsonfile-2.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27864,10 +28590,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.2.1";
+    version = "2.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz";
-      sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz";
+      sha1 = "606022508479b55ffa368b58fee963a03dfd7b0c";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27880,16 +28606,15 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.5";
+    version = "2.8.20";
     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.20.tgz";
+      sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
     };
     dependencies = [
-      sources."async-0.2.10"
       sources."source-map-0.5.6"
-      sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
+      sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
       sources."cliui-2.1.0"
       sources."decamelize-1.2.0"
@@ -27902,7 +28627,7 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27915,10 +28640,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.8";
+    version = "1.1.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz";
-      sha1 = "1519b78475ef5162ef3342c2046889b396add651";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz";
+      sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f";
     };
     dependencies = [
       sources."async-2.1.5"
@@ -27928,15 +28653,15 @@ in
       sources."color-1.0.3"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-2.0.12"
+      sources."diff2html-2.3.0"
       sources."express-4.14.1"
       sources."express-session-1.14.2"
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.4"
+      sources."ignore-3.2.6"
       sources."keen.io-0.1.3"
-      sources."knockout-3.4.1"
+      sources."knockout-3.4.2"
       sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -27956,7 +28681,7 @@ in
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
+          sources."qs-6.3.2"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -27965,17 +28690,19 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-7.4.5" // {
+      (sources."npm-registry-client-7.4.6" // {
         dependencies = [
-          sources."request-2.79.0"
+          sources."request-2.81.0"
+          sources."caseless-0.12.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.2"
+          sources."har-validator-4.2.1"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.1"
-          sources."tunnel-agent-0.4.3"
+          sources."qs-6.4.0"
+          sources."tunnel-agent-0.6.0"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
           sources."boom-2.10.1"
@@ -27988,7 +28715,7 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.1.2" // {
+      (sources."raven-1.1.5" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."uuid-3.0.0"
@@ -28053,11 +28780,11 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
       sources."color-convert-1.9.0"
-      sources."color-string-1.5.0"
-      sources."color-name-1.1.1"
+      sources."color-string-1.5.2"
+      sources."color-name-1.1.2"
       sources."simple-swizzle-0.2.2"
       sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
@@ -28068,7 +28795,7 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
-      sources."whatwg-fetch-2.0.2"
+      sources."whatwg-fetch-2.0.3"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.0"
       sources."accepts-1.3.3"
@@ -28083,7 +28810,7 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
       (sources."send-0.14.2" // {
         dependencies = [
@@ -28091,16 +28818,15 @@ in
         ];
       })
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.0"
+      sources."vary-1.1.1"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."crc-3.4.1"
       sources."on-headers-1.0.1"
-      sources."uid-safe-2.1.3"
-      sources."base64-url-1.3.3"
+      sources."uid-safe-2.1.4"
       sources."random-bytes-1.0.0"
       (sources."broadway-0.2.10" // {
         dependencies = [
@@ -28153,7 +28879,7 @@ in
         ];
       })
       sources."hawk-0.10.2"
-      sources."node-uuid-1.4.7"
+      sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
       sources."aws-sign-0.2.0"
       sources."oauth-sign-0.2.0"
@@ -28180,7 +28906,7 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.1"
       sources."underscore-1.5.2"
-      sources."clone-2.1.0"
+      sources."clone-2.1.1"
       sources."JSONStream-1.3.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
@@ -28193,9 +28919,9 @@ in
       sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.9"
-      sources."fs-write-stream-atomic-1.0.8"
-      sources."fstream-1.0.10"
+      sources."fs-vacuum-1.2.10"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fstream-1.0.11"
       sources."fstream-npm-1.2.0"
       (sources."glob-7.1.1" // {
         dependencies = [
@@ -28207,10 +28933,9 @@ in
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
-      (sources."init-package-json-1.9.4" // {
+      (sources."init-package-json-1.9.5" // {
         dependencies = [
-          sources."glob-6.0.4"
-          sources."minimatch-3.0.3"
+          sources."validate-npm-package-name-3.0.0"
         ];
       })
       sources."lockfile-1.0.3"
@@ -28227,10 +28952,10 @@ in
         ];
       })
       sources."normalize-git-url-3.0.2"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.0"
+      sources."npm-package-arg-4.2.1"
       sources."npm-user-validate-0.1.5"
       sources."npmlog-4.0.2"
       sources."once-1.4.0"
@@ -28240,14 +28965,9 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      (sources."read-package-json-2.0.4" // {
-        dependencies = [
-          sources."glob-6.0.4"
-          sources."minimatch-3.0.3"
-        ];
-      })
+      sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
       sources."sha-2.0.1"
@@ -28267,8 +28987,12 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."uuid-3.0.1"
-      sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.12"
+      (sources."validate-npm-package-name-2.2.2" // {
+        dependencies = [
+          sources."builtins-0.0.7"
+        ];
+      })
+      sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
       sources."ansi-regex-2.1.1"
@@ -28302,6 +29026,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
       sources."promzard-0.3.0"
+      sources."builtins-1.0.3"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       sources."concat-stream-1.6.0"
@@ -28311,11 +29036,7 @@ in
           sources."once-1.3.3"
         ];
       })
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
       sources."pump-1.0.2"
@@ -28376,8 +29097,12 @@ in
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28405,11 +29130,17 @@ in
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      sources."builtins-0.0.7"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
@@ -28502,7 +29233,7 @@ in
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      (sources."error-ex-1.3.0" // {
+      (sources."error-ex-1.3.1" // {
         dependencies = [
           sources."is-arrayish-0.2.1"
         ];
@@ -28561,7 +29292,7 @@ in
       sources."progress-1.1.8"
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."concat-stream-1.5.0"
       sources."debug-0.7.4"
       sources."yauzl-2.4.1"
@@ -28596,8 +29327,8 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.15"
+      sources."node-uuid-1.4.8"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
       sources."tough-cookie-2.2.2"
@@ -28610,12 +29341,16 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.5"
+      sources."async-2.2.0"
       sources."lodash-4.17.4"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28660,7 +29395,7 @@ in
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."os-tmpdir-1.0.2"
       sources."underscore-1.8.3"
     ];
@@ -28675,19 +29410,19 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.2.1";
+    version = "2.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz";
-      sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz";
+      sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458";
     };
     dependencies = [
       sources."acorn-4.0.11"
-      sources."acorn-dynamic-import-2.0.1"
-      sources."ajv-4.11.3"
+      sources."acorn-dynamic-import-2.0.2"
+      sources."ajv-4.11.5"
       sources."ajv-keywords-1.5.1"
-      sources."async-2.1.5"
+      sources."async-2.2.0"
       sources."enhanced-resolve-3.1.0"
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
       sources."loader-utils-0.2.17"
@@ -28697,14 +29432,13 @@ in
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.8.20" // {
         dependencies = [
-          sources."async-0.2.10"
           sources."yargs-3.10.0"
         ];
       })
       sources."watchpack-1.3.1"
-      sources."webpack-sources-0.1.4"
+      sources."webpack-sources-0.2.3"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
@@ -28721,7 +29455,7 @@ in
       sources."emojis-list-2.1.0"
       sources."json5-0.5.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -28765,7 +29499,7 @@ in
       sources."ieee754-1.1.8"
       sources."date-now-0.1.4"
       sources."browserify-cipher-1.0.0"
-      sources."browserify-sign-4.0.0"
+      sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
       sources."create-hash-1.1.2"
       sources."create-hmac-1.1.4"
@@ -28783,7 +29517,7 @@ in
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
-      sources."parse-asn1-5.0.0"
+      sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
       sources."hmac-drbg-1.0.0"
@@ -28812,7 +29546,7 @@ in
       sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.4"
+      sources."is-buffer-1.1.5"
       sources."chokidar-1.6.1"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
@@ -28831,7 +29565,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."normalize-path-2.0.1"
+      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -28844,9 +29578,10 @@ in
       sources."isobject-2.1.0"
       sources."randomatic-1.1.6"
       sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-1.0.1"
+      sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
@@ -28858,25 +29593,23 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.33"
-      sources."nopt-3.0.6"
+      sources."node-pre-gyp-0.6.34"
+      sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.79.0"
-      sources."rimraf-2.5.4"
+      sources."request-2.81.0"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-        ];
-      })
+      sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -28897,50 +29630,40 @@ in
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."har-schema-1.0.5"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28964,19 +29687,19 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
-      sources."fstream-1.0.10"
-      sources."debug-2.2.0"
+      sources."fstream-1.0.11"
+      sources."debug-2.6.3"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.1"
-      sources."source-list-map-0.1.8"
+      sources."ms-0.7.2"
+      sources."source-list-map-1.1.1"
       sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
       sources."read-pkg-up-1.0.1"
@@ -28995,16 +29718,18 @@ in
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -29039,25 +29764,24 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.20.4";
+    version = "0.21.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz";
-      sha1 = "575190fee60a27a54d4125a0f7579fc702f01229";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz";
+      sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0";
     };
     dependencies = [
       sources."babel-runtime-6.23.0"
-      sources."bytes-2.4.0"
+      sources."bytes-2.5.0"
       sources."camelcase-3.0.0"
       sources."chalk-1.1.3"
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
       sources."death-1.1.0"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."defaults-1.0.3"
       sources."detect-indent-5.0.0"
-      sources."diff-2.2.3"
       sources."ini-1.3.4"
-      sources."inquirer-3.0.5"
+      sources."inquirer-3.0.6"
       sources."invariant-2.2.2"
       sources."is-builtin-module-1.0.0"
       sources."is-ci-1.0.10"
@@ -29066,19 +29790,18 @@ in
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."node-emoji-1.5.1"
-      sources."node-gyp-3.5.0"
+      sources."node-gyp-3.6.0"
       sources."object-path-0.11.4"
       sources."proper-lockfile-2.0.0"
       sources."read-1.0.7"
-      sources."request-2.79.0"
-      sources."request-capture-har-1.1.4"
+      sources."request-2.81.0"
+      sources."request-capture-har-1.2.2"
       sources."rimraf-2.6.1"
       sources."roadrunner-1.1.0"
       sources."semver-5.3.0"
       sources."strip-bom-3.0.0"
       sources."tar-2.2.1"
       sources."tar-stream-1.5.2"
-      sources."user-home-2.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.4.1"
       sources."regenerator-runtime-0.10.3"
@@ -29104,7 +29827,7 @@ in
       sources."string-width-2.0.0"
       sources."through-2.3.8"
       sources."restore-cursor-2.0.0"
-      sources."onetime-2.0.0"
+      sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."tmp-0.0.31"
@@ -29122,12 +29845,12 @@ in
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."string.prototype.codepointat-0.2.0"
-      sources."fstream-1.0.10"
+      sources."fstream-1.0.11"
       sources."glob-7.1.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
       sources."osenv-0.1.4"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."inherits-2.0.3"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -29145,7 +29868,7 @@ in
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -29164,45 +29887,48 @@ in
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
       sources."os-homedir-1.0.2"
-      sources."isexe-1.1.2"
+      sources."isexe-2.0.0"
       sources."retry-0.10.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      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"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29226,22 +29952,19 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."bl-1.2.0"
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
+      sources."xtend-4.0.1"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      description = "📦🐈 Fast, reliable, and secure dependency management.";
       homepage = "https://github.com/yarnpkg/yarn#readme";
       license = "BSD-2-Clause";
     };
@@ -29347,10 +30070,10 @@ in
       sources."imurmurhash-0.1.4"
       sources."slide-1.1.6"
       sources."lru-cache-4.0.2"
-      sources."which-1.2.12"
+      sources."which-1.2.14"
       sources."pseudomap-1.0.2"
-      sources."yallist-2.0.0"
-      sources."isexe-1.1.2"
+      sources."yallist-2.1.2"
+      sources."isexe-2.0.0"
       sources."npmconf-2.1.2"
       sources."pify-2.3.0"
       sources."pinkie-promise-2.0.1"
@@ -29374,12 +30097,12 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.3"
+      sources."readable-stream-2.2.6"
       sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
-      sources."error-ex-1.3.0"
+      sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -29406,7 +30129,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."lodash.debounce-3.1.1"
       sources."os-name-1.0.3"
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."uuid-3.0.1"
         ];
@@ -29425,39 +30148,42 @@ in
       })
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
+      sources."ajv-4.11.5"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."jsprim-1.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.11.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29481,19 +30207,19 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."camelcase-keys-2.1.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
+      sources."normalize-package-data-2.3.6"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.1"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -29504,7 +30230,7 @@ in
       sources."strip-indent-1.0.1"
       sources."get-stdin-4.0.1"
       sources."registry-url-3.1.0"
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -29532,7 +30258,7 @@ in
       sources."arrify-1.0.1"
       sources."dot-prop-2.4.0"
       sources."is-obj-1.0.1"
-      sources."debug-2.6.1"
+      sources."debug-2.6.3"
       sources."npmlog-2.0.4"
       sources."ms-0.7.2"
       sources."external-editor-1.1.1"
@@ -29604,6 +30330,7 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-file-2.0.0"
+      sources."xtend-4.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 7e8a3160b31..2e17d72ea9e 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "JSONStream-1.3.0" = {
+    "JSONStream-1.3.1" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
-        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz";
+        sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a";
       };
     };
     "assert-1.4.1" = {
@@ -49,22 +49,22 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-5.0.5" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
+        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
       };
     };
-    "cached-path-relative-1.0.0" = {
+    "cached-path-relative-1.0.1" = {
       name = "cached-path-relative";
       packageName = "cached-path-relative";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz";
-        sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
+        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz";
+        sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7";
       };
     };
     "concat-stream-1.5.2" = {
@@ -211,13 +211,13 @@ let
         sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
       };
     };
-    "module-deps-4.0.8" = {
+    "module-deps-4.1.1" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "4.0.8";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz";
-        sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz";
+        sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd";
       };
     };
     "os-browserify-0.1.2" = {
@@ -283,22 +283,22 @@ let
         sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
       };
     };
-    "readable-stream-2.2.2" = {
+    "readable-stream-2.2.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.2";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
+        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
       };
     };
-    "resolve-1.2.0" = {
+    "resolve-1.3.2" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.2.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
-        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz";
+        sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235";
       };
     };
     "shasum-1.0.2" = {
@@ -355,13 +355,13 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "syntax-error-1.1.6" = {
+    "syntax-error-1.3.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
-      version = "1.1.6";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz";
-        sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
+        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz";
+        sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1";
       };
     };
     "through2-2.0.3" = {
@@ -535,15 +535,6 @@ let
         sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
       };
     };
-    "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";
-      };
-    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -571,6 +562,15 @@ let
         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";
@@ -607,13 +607,13 @@ let
         sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
       };
     };
-    "browserify-sign-4.0.0" = {
+    "browserify-sign-4.0.4" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.0.0";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz";
-        sha1 = "10773910c3c206d5420a46aad8694f820b85968f";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
     "create-ecdh-4.0.0" = {
@@ -760,31 +760,31 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.2" = {
+    "elliptic-6.4.0" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.2";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
-        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz";
+        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "parse-asn1-5.0.0" = {
+    "parse-asn1-5.1.0" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz";
-        sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
+        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
       };
     };
-    "brorand-1.0.6" = {
+    "brorand-1.1.0" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.6";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
-        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
     "hash.js-1.0.3" = {
@@ -796,6 +796,24 @@ let
         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";
@@ -922,13 +940,13 @@ let
         sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
       };
     };
-    "is-buffer-1.1.4" = {
+    "is-buffer-1.1.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
       };
     };
     "lexical-scope-1.2.0" = {
@@ -940,22 +958,22 @@ let
         sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
       };
     };
-    "astw-2.0.0" = {
+    "astw-2.2.0" = {
       name = "astw";
       packageName = "astw";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz";
-        sha1 = "08121ac8288d35611c0ceec663f6cd545604897d";
+        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
+        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
       };
     };
-    "acorn-1.2.2" = {
+    "acorn-4.0.11" = {
       name = "acorn";
       packageName = "acorn";
-      version = "1.2.2";
+      version = "4.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
-        sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
       };
     };
     "isarray-0.0.1" = {
@@ -976,13 +994,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.3.2" = {
+    "detective-4.5.0" = {
       name = "detective";
       packageName = "detective";
-      version = "4.3.2";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz";
-        sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c";
+        url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz";
+        sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -994,15 +1012,6 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -1021,6 +1030,15 @@ let
         sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
+    "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";
+      };
+    };
     "json-stable-stringify-0.0.1" = {
       name = "json-stable-stringify";
       packageName = "json-stable-stringify";
@@ -1093,15 +1111,6 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "acorn-2.7.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
-        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
-      };
-    };
     "punycode-1.3.2" = {
       name = "punycode";
       packageName = "punycode";
@@ -1138,13 +1147,13 @@ let
         sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
       };
     };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -1156,15 +1165,6 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "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";
-      };
-    };
     "camelcase-1.2.1" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -1327,13 +1327,13 @@ let
         sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
       };
     };
-    "request-2.79.0" = {
+    "request-2.81.0" = {
       name = "request";
       packageName = "request";
-      version = "2.79.0";
+      version = "2.81.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
     "prr-0.0.0" = {
@@ -1372,22 +1372,22 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.5.0" = {
+    "aws4-1.6.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
-        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
-    "caseless-0.11.0" = {
+    "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
-        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
     "combined-stream-1.0.5" = {
@@ -1426,13 +1426,13 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
-    "har-validator-2.0.6" = {
+    "har-validator-4.2.1" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "2.0.6";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
-        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
       };
     };
     "hawk-3.1.3" = {
@@ -1480,13 +1480,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.15" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
+        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1498,13 +1498,31 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.3.0" = {
+    "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.3.0";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
-        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
+        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" = {
@@ -1525,13 +1543,13 @@ let
         sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
       };
     };
-    "tunnel-agent-0.4.3" = {
+    "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
-      version = "0.4.3";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
     "uuid-3.0.1" = {
@@ -1561,148 +1579,40 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
+    "ajv-4.11.5" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
+        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
       };
     };
-    "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";
-      };
-    };
-    "is-my-json-valid-2.15.0" = {
-      name = "is-my-json-valid";
-      packageName = "is-my-json-valid";
-      version = "2.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
-        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
-      };
-    };
-    "pinkie-promise-2.0.1" = {
-      name = "pinkie-promise";
-      packageName = "pinkie-promise";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
-      };
-    };
-    "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";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
       version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
       };
     };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
       };
     };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-      };
-    };
-    "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";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
+    "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/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-      };
-    };
-    "generate-function-2.0.0" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
-        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
-      };
-    };
-    "generate-object-property-1.2.0" = {
-      name = "generate-object-property";
-      packageName = "generate-object-property";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
-      };
-    };
-    "jsonpointer-4.0.1" = {
-      name = "jsonpointer";
-      packageName = "jsonpointer";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
-      };
-    };
-    "is-property-1.0.2" = {
-      name = "is-property";
-      packageName = "is-property";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
-      };
-    };
-    "pinkie-2.0.4" = {
-      name = "pinkie";
-      packageName = "pinkie";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
       };
     };
     "hoek-2.16.3" = {
@@ -1750,22 +1660,31 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.3.1" = {
+    "jsprim-1.4.0" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
-        sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.10.2" = {
+    "sshpk-1.11.0" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.2";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
-        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+        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" = {
@@ -1804,15 +1723,6 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "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";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -1831,13 +1741,13 @@ let
         sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
       };
     };
-    "jsbn-0.1.0" = {
+    "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -1867,22 +1777,22 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
-    "bcrypt-pbkdf-1.0.0" = {
+    "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
-        sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.27.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
+        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
       };
     };
     "browser-stdout-1.3.0" = {
@@ -1894,6 +1804,15 @@ let
         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";
@@ -1912,6 +1831,15 @@ let
         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";
@@ -1957,6 +1885,15 @@ let
         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";
@@ -2236,13 +2173,13 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "abbrev-1.0.9" = {
+    "abbrev-1.1.0" = {
       name = "abbrev";
       packageName = "abbrev";
-      version = "1.0.9";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz";
-        sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
+        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
       };
     };
     "qs-0.6.6" = {
@@ -2272,13 +2209,13 @@ let
         sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
       };
     };
-    "node-uuid-1.4.7" = {
+    "node-uuid-1.4.8" = {
       name = "node-uuid";
       packageName = "node-uuid";
-      version = "1.4.7";
+      version = "1.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
     "form-data-0.1.4" = {
@@ -2290,6 +2227,15 @@ let
         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";
@@ -2434,13 +2380,13 @@ let
         sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7";
       };
     };
-    "should-format-3.0.2" = {
+    "should-format-3.0.3" = {
       name = "should-format";
       packageName = "should-format";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.2.tgz";
-        sha1 = "1a543ad3abfea5dc2bea4a0ba875ede60fe22b19";
+        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz";
+        sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1";
       };
     };
     "should-type-1.4.0" = {
@@ -2470,31 +2416,76 @@ let
         sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063";
       };
     };
-    "formatio-1.1.1" = {
+    "diff-3.2.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+      };
+    };
+    "formatio-1.2.0" = {
       name = "formatio";
       packageName = "formatio";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
-        sha1 = "5ed3ccd636551097383465d996199100e86161e9";
+        url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz";
+        sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb";
       };
     };
-    "lolex-1.3.2" = {
+    "lolex-1.6.0" = {
       name = "lolex";
       packageName = "lolex";
-      version = "1.3.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz";
-        sha1 = "7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31";
+        url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz";
+        sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6";
       };
     };
-    "samsam-1.1.2" = {
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "samsam-1.2.1" = {
       name = "samsam";
       packageName = "samsam";
-      version = "1.1.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
-        sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
+        url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz";
+        sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67";
+      };
+    };
+    "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";
+      };
+    };
+    "type-detect-4.0.0" = {
+      name = "type-detect";
+      packageName = "type-detect";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz";
+        sha1 = "62053883542a321f2f7b25746dc696478b18ff6b";
       };
     };
     "cli-1.0.1" = {
@@ -2623,13 +2614,13 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "interpret-1.0.1" = {
+    "interpret-1.0.2" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz";
-        sha1 = "d579fb7f693b858004947af39fa0db49f795602c";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz";
+        sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d";
       };
     };
     "rechoir-0.6.2" = {
@@ -2663,13 +2654,13 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.3.0";
+    version = "14.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz";
+      sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311";
     };
     dependencies = [
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.3.1" // {
         dependencies = [
           sources."jsonparse-1.3.0"
           sources."through-2.3.8"
@@ -2699,14 +2690,13 @@ in
           sources."pako-0.2.9"
         ];
       })
-      (sources."buffer-4.9.1" // {
+      (sources."buffer-5.0.5" // {
         dependencies = [
           sources."base64-js-1.2.0"
           sources."ieee754-1.1.8"
-          sources."isarray-1.0.0"
         ];
       })
-      sources."cached-path-relative-1.0.0"
+      sources."cached-path-relative-1.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."typedarray-0.0.6"
@@ -2749,17 +2739,20 @@ in
               sources."evp_bytestokey-1.0.0"
             ];
           })
-          (sources."browserify-sign-4.0.0" // {
+          (sources."browserify-sign-4.0.4" // {
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.4.0" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  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.0.0" // {
+              (sources."parse-asn1-5.1.0" // {
                 dependencies = [
                   (sources."asn1.js-4.9.1" // {
                     dependencies = [
@@ -2780,10 +2773,13 @@ in
           (sources."create-ecdh-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.4.0" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  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"
                 ];
               })
             ];
@@ -2801,7 +2797,7 @@ in
               sources."bn.js-4.11.6"
               (sources."miller-rabin-4.0.0" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.1.0"
                 ];
               })
             ];
@@ -2811,7 +2807,7 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."parse-asn1-5.0.0" // {
+              (sources."parse-asn1-5.1.0" // {
                 dependencies = [
                   (sources."asn1.js-4.9.1" // {
                     dependencies = [
@@ -2881,12 +2877,12 @@ in
               sources."source-map-0.5.6"
             ];
           })
-          sources."is-buffer-1.1.4"
+          sources."is-buffer-1.1.5"
           (sources."lexical-scope-1.2.0" // {
             dependencies = [
-              (sources."astw-2.0.0" // {
+              (sources."astw-2.2.0" // {
                 dependencies = [
-                  sources."acorn-1.2.2"
+                  sources."acorn-4.0.11"
                 ];
               })
             ];
@@ -2899,11 +2895,11 @@ in
           sources."stream-splicer-2.0.0"
         ];
       })
-      (sources."module-deps-4.0.8" // {
+      (sources."module-deps-4.1.1" // {
         dependencies = [
-          (sources."detective-4.3.2" // {
+          (sources."detective-4.5.0" // {
             dependencies = [
-              sources."acorn-3.3.0"
+              sources."acorn-4.0.11"
             ];
           })
           sources."stream-combiner2-1.1.1"
@@ -2920,7 +2916,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.2" // {
+      (sources."readable-stream-2.2.6" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -2929,7 +2925,11 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."resolve-1.2.0"
+      (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" // {
@@ -2961,9 +2961,9 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      (sources."syntax-error-1.1.6" // {
+      (sources."syntax-error-1.3.0" // {
         dependencies = [
-          sources."acorn-2.7.0"
+          sources."acorn-4.0.11"
         ];
       })
       sources."through2-2.0.3"
@@ -2998,15 +2998,13 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.5";
+    version = "2.8.20";
     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.20.tgz";
+      sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
     };
     dependencies = [
-      sources."async-0.2.10"
       sources."source-map-0.5.6"
-      sources."uglify-to-browserify-1.0.2"
       (sources."yargs-3.10.0" // {
         dependencies = [
           sources."camelcase-1.2.1"
@@ -3018,7 +3016,7 @@ in
                     dependencies = [
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
                         ];
                       })
                       sources."longest-1.0.1"
@@ -3034,7 +3032,7 @@ in
                     dependencies = [
                       (sources."kind-of-3.1.0" // {
                         dependencies = [
-                          sources."is-buffer-1.1.4"
+                          sources."is-buffer-1.1.5"
                         ];
                       })
                       sources."longest-1.0.1"
@@ -3050,6 +3048,7 @@ in
           sources."window-size-0.1.0"
         ];
       })
+      sources."uglify-to-browserify-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3087,11 +3086,11 @@ in
         ];
       })
       sources."source-map-0.5.6"
-      (sources."request-2.79.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
-          sources."caseless-0.11.0"
+          sources."aws4-1.6.0"
+          sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
               sources."delayed-stream-1.0.0"
@@ -3104,47 +3103,19 @@ in
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-2.0.6" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."chalk-1.1.3" // {
+              (sources."ajv-4.11.5" // {
                 dependencies = [
-                  sources."ansi-styles-2.2.1"
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."has-ansi-2.0.0" // {
+                  sources."co-4.6.0"
+                  (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."jsonify-0.0.0"
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."supports-color-2.0.0"
-                ];
-              })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
-              (sources."is-my-json-valid-2.15.0" // {
-                dependencies = [
-                  sources."generate-function-2.0.0"
-                  (sources."generate-object-property-1.2.0" // {
-                    dependencies = [
-                      sources."is-property-1.0.2"
-                    ];
-                  })
-                  sources."jsonpointer-4.0.1"
-                  sources."xtend-4.0.1"
-                ];
-              })
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
                 ];
               })
+              sources."har-schema-1.0.5"
             ];
           })
           (sources."hawk-3.1.3" // {
@@ -3158,24 +3129,25 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.3.1" // {
+              (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.10.2" // {
+              (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.0"
+                  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.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -3183,20 +3155,22 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.15" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.27.0"
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          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.4.3"
+          sources."tunnel-agent-0.6.0"
           sources."uuid-3.0.1"
         ];
       })
@@ -3324,7 +3298,7 @@ in
               sources."osenv-0.0.3"
               (sources."nopt-2.2.1" // {
                 dependencies = [
-                  sources."abbrev-1.0.9"
+                  sources."abbrev-1.1.0"
                 ];
               })
               sources."semver-1.1.4"
@@ -3339,7 +3313,7 @@ in
               sources."json-stringify-safe-5.0.1"
               sources."mime-1.2.11"
               sources."forever-agent-0.5.2"
-              sources."node-uuid-1.4.7"
+              sources."node-uuid-1.4.8"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
                   sources."punycode-1.4.1"
@@ -3401,14 +3375,14 @@ in
   should = nodeEnv.buildNodePackage {
     name = "should";
     packageName = "should";
-    version = "11.1.2";
+    version = "11.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/should/-/should-11.1.2.tgz";
-      sha1 = "3cad9c6fc600ffe2e1547d948be3284e984da946";
+      url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz";
+      sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2";
     };
     dependencies = [
       sources."should-equal-1.0.1"
-      sources."should-format-3.0.2"
+      sources."should-format-3.0.3"
       sources."should-type-1.4.0"
       sources."should-type-adaptors-1.0.1"
       sources."should-util-1.0.0"
@@ -3424,20 +3398,24 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "1.17.7";
+    version = "2.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz";
-      sha1 = "4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf";
+      url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz";
+      sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb";
     };
     dependencies = [
-      sources."formatio-1.1.1"
-      (sources."util-0.10.3" // {
+      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."inherits-2.0.1"
+          sources."isarray-0.0.1"
         ];
       })
-      sources."lolex-1.3.2"
-      sources."samsam-1.1.2"
+      sources."samsam-1.2.1"
+      sources."text-encoding-0.6.4"
+      sources."type-detect-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3533,10 +3511,10 @@ in
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.7.6";
+    version = "0.7.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
-      sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
+      sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
     };
     dependencies = [
       (sources."glob-7.1.1" // {
@@ -3566,10 +3544,14 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."interpret-1.0.1"
+      sources."interpret-1.0.2"
       (sources."rechoir-0.6.2" // {
         dependencies = [
-          sources."resolve-1.2.0"
+          (sources."resolve-1.3.2" // {
+            dependencies = [
+              sources."path-parse-1.0.5"
+            ];
+          })
         ];
       })
     ];
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 54f8fe0c728..751638e02da 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix
index d413475389f..ee4dab5ad64 100644
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ b/pkgs/servers/web-apps/pump.io/composition.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix
index a275ef4ca40..ca27c79fab9 100644
--- a/pkgs/servers/web-apps/pump.io/node-packages.nix
+++ b/pkgs/servers/web-apps/pump.io/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -13,13 +13,13 @@ let
         sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
-    "bunyan-1.8.8" = {
+    "bunyan-1.8.9" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.8";
+      version = "1.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.8.tgz";
-        sha1 = "6549ed6db088e4d82b7be3bcc6d0697159f6e209";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz";
+        sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a";
       };
     };
     "colors-1.1.2" = {
@@ -131,13 +131,13 @@ let
         sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
       };
     };
-    "express-session-1.15.1" = {
+    "express-session-1.15.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.15.1";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.1.tgz";
-        sha1 = "9abba15971beea7ad98da5a4d25ed92ba4a2984e";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
+        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
       };
     };
     "gm-1.23.0" = {
@@ -149,13 +149,13 @@ let
         sha1 = "80a2fe9cbf131515024846444658461269f52661";
       };
     };
-    "helmet-3.4.1" = {
+    "helmet-3.5.0" = {
       name = "helmet";
       packageName = "helmet";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-3.4.1.tgz";
-        sha1 = "27d37629227f25a110f2a128bfe1b1028648a397";
+        url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz";
+        sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539";
       };
     };
     "jade-1.11.0" = {
@@ -185,13 +185,13 @@ let
         sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e";
       };
     };
-    "method-override-2.3.7" = {
+    "method-override-2.3.8" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.7";
+      version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
-        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz";
+        sha1 = "178234bf4bab869f89df9444b06fc6147b44828c";
       };
     };
     "mkdirp-0.5.1" = {
@@ -374,13 +374,13 @@ let
         sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9";
       };
     };
-    "databank-lrucache-0.1.2" = {
+    "databank-lrucache-0.1.3" = {
       name = "databank-lrucache";
       packageName = "databank-lrucache";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz";
-        sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640";
+        url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz";
+        sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef";
       };
     };
     "bindings-1.2.1" = {
@@ -428,13 +428,13 @@ let
         sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911";
       };
     };
-    "moment-2.17.1" = {
+    "moment-2.18.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.1";
+      version = "2.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
+        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
+        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
     "nan-2.5.1" = {
@@ -896,13 +896,13 @@ let
         sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
       };
     };
-    "compressible-2.0.9" = {
+    "compressible-2.0.10" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.9";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
-        sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz";
+        sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
       };
     };
     "vary-1.0.1" = {
@@ -914,13 +914,13 @@ let
         sha1 = "99e4981566a286118dfb2b817357df7993376d10";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.15" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
+        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
       };
     };
     "negotiator-0.5.3" = {
@@ -932,13 +932,13 @@ let
         sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.27.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
+        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
       };
     };
     "ms-0.7.1" = {
@@ -950,22 +950,13 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
-    "csrf-3.0.5" = {
+    "csrf-3.0.6" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.5.tgz";
-        sha1 = "3c3aa86f395dd39f86d68fcf1734a2380f466112";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
+        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
       };
     };
     "rndm-1.2.0" = {
@@ -1202,13 +1193,13 @@ let
         sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
-    "node-uuid-1.4.7" = {
+    "node-uuid-1.4.8" = {
       name = "node-uuid";
       packageName = "node-uuid";
-      version = "1.4.7";
+      version = "1.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
     "set-immediate-0.1.1" = {
@@ -1391,13 +1382,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.2.0" = {
+    "hosted-git-info-2.4.1" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.2.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
+        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -1850,13 +1841,13 @@ let
         sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
       };
     };
-    "debug-2.6.1" = {
+    "debug-2.6.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.1";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz";
+        sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d";
       };
     };
     "array-parallel-0.1.3" = {
@@ -1895,13 +1886,13 @@ let
         sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
-    "which-1.2.12" = {
+    "which-1.2.14" = {
       name = "which";
       packageName = "which";
-      version = "1.2.12";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
-        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
       };
     };
     "pseudomap-1.0.2" = {
@@ -1913,22 +1904,22 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "yallist-2.0.0" = {
+    "yallist-2.1.2" = {
       name = "yallist";
       packageName = "yallist";
-      version = "2.0.0";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz";
-        sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4";
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "isexe-1.1.2" = {
+    "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
-      version = "1.1.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz";
-        sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
     "connect-3.6.0" = {
@@ -1967,13 +1958,13 @@ let
         sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9";
       };
     };
-    "helmet-csp-2.3.0" = {
+    "helmet-csp-2.4.0" = {
       name = "helmet-csp";
       packageName = "helmet-csp";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.3.0.tgz";
-        sha1 = "bc341939dfef5266cc817abcf53f079f61fe7e3f";
+        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz";
+        sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e";
       };
     };
     "hide-powered-by-1.0.0" = {
@@ -2039,6 +2030,15 @@ let
         sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9";
       };
     };
+    "debug-2.6.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+      };
+    };
     "finalhandler-1.0.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -2156,13 +2156,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.9" = {
+    "uglify-js-2.8.20" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.9";
+      version = "2.8.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.9.tgz";
-        sha1 = "01194b91cc0795214093c05594ef5ac1e0b2e900";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz";
+        sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
       };
     };
     "void-elements-2.0.1" = {
@@ -2345,15 +2345,6 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
-    "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";
-      };
-    };
     "yargs-3.10.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -2363,6 +2354,15 @@ let
         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";
@@ -2462,13 +2462,13 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "is-buffer-1.1.4" = {
+    "is-buffer-1.1.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
       };
     };
     "acorn-1.2.2" = {
@@ -2543,13 +2543,13 @@ let
         sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
       };
     };
-    "request-2.80.0" = {
+    "request-2.81.0" = {
       name = "request";
       packageName = "request";
-      version = "2.80.0";
+      version = "2.81.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.80.0.tgz";
-        sha1 = "8cc162d76d79381cdefdd3505d76b80b60589bd0";
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
     "sax-1.2.2" = {
@@ -2840,13 +2840,22 @@ let
         sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
       };
     };
-    "qs-6.3.2" = {
+    "qs-6.4.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.3.2";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
-        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
+        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" = {
@@ -2858,13 +2867,13 @@ let
         sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "tunnel-agent-0.4.3" = {
+    "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
-      version = "0.4.3";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -2885,13 +2894,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-4.11.4" = {
+    "ajv-4.11.5" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.4";
+      version = "4.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz";
-        sha1 = "ebf3a55d4b132ea60ff5847ae85d2ef069960b45";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
+        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
       };
     };
     "har-schema-1.0.5" = {
@@ -2975,13 +2984,13 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.3.1" = {
+    "jsprim-1.4.0" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
-        sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
     "sshpk-1.11.0" = {
@@ -2993,6 +3002,15 @@ let
         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";
@@ -3029,15 +3047,6 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "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";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -3119,22 +3128,13 @@ let
         sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a";
       };
     };
-    "debug-2.3.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
-      };
-    };
-    "vary-1.1.0" = {
+    "vary-1.1.1" = {
       name = "vary";
       packageName = "vary";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
-        sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz";
+        sha1 = "67535ebb694c1d52257457984665323f587e8d37";
       };
     };
     "minimist-0.0.8" = {
@@ -3236,13 +3236,13 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "readable-stream-2.2.3" = {
+    "readable-stream-2.2.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.3";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz";
-        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
+        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
       };
     };
     "dom-serializer-0.1.0" = {
@@ -3587,13 +3587,13 @@ let
         sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b";
       };
     };
-    "mongodb-2.2.24" = {
+    "mongodb-2.2.25" = {
       name = "mongodb";
       packageName = "mongodb";
-      version = "2.2.24";
+      version = "2.2.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz";
-        sha1 = "80f40d6ec5bdec0ddecf0f9ce0144e794c46449a";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz";
+        sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6";
       };
     };
     "setimmediate-1.0.5" = {
@@ -3614,13 +3614,13 @@ let
         sha1 = "ec56233868032909207170c39448e24449dd1fc4";
       };
     };
-    "mongodb-core-2.1.8" = {
+    "mongodb-core-2.1.9" = {
       name = "mongodb-core";
       packageName = "mongodb-core";
-      version = "2.1.8";
+      version = "2.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz";
-        sha1 = "b33e0370d0a59d97b6cb1ec610527be9e95ca2c0";
+        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz";
+        sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5";
       };
     };
     "readable-stream-2.1.5" = {
@@ -3677,15 +3677,6 @@ let
         sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
       };
     };
-    "lru-cache-2.3.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
-        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
-      };
-    };
   };
   args = {
     name = "pump.io";
@@ -3699,7 +3690,7 @@ let
           sources."nan-2.3.5"
         ];
       })
-      (sources."bunyan-1.8.8" // {
+      (sources."bunyan-1.8.9" // {
         dependencies = [
           (sources."dtrace-provider-0.8.1" // {
             dependencies = [
@@ -3742,7 +3733,7 @@ let
             ];
           })
           sources."safe-json-stringify-1.0.4"
-          sources."moment-2.17.1"
+          sources."moment-2.18.1"
         ];
       })
       sources."colors-1.1.2"
@@ -3774,17 +3765,17 @@ let
             dependencies = [
               (sources."accepts-1.2.13" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."negotiator-0.5.3"
                 ];
               })
-              (sources."compressible-2.0.9" // {
+              (sources."compressible-2.0.10" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."vary-1.0.1"
@@ -3798,9 +3789,8 @@ let
           sources."content-type-1.0.2"
           (sources."csurf-1.8.3" // {
             dependencies = [
-              (sources."csrf-3.0.5" // {
+              (sources."csrf-3.0.6" // {
                 dependencies = [
-                  sources."base64-url-1.3.3"
                   sources."rndm-1.2.0"
                   sources."tsscmp-1.0.5"
                   (sources."uid-safe-2.1.4" // {
@@ -3822,9 +3812,9 @@ let
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.15" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.27.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
@@ -3908,9 +3898,9 @@ let
               })
               sources."batch-0.5.3"
               sources."escape-html-1.0.3"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -3923,9 +3913,9 @@ let
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -3943,7 +3933,7 @@ let
       (sources."connect-databank-1.0.3" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."node-uuid-1.4.7"
+          sources."node-uuid-1.4.8"
           sources."set-immediate-0.1.1"
         ];
       })
@@ -3967,9 +3957,9 @@ let
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
             ];
@@ -4007,7 +3997,7 @@ let
               sources."minimist-1.2.0"
               (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
-                  sources."hosted-git-info-2.2.0"
+                  sources."hosted-git-info-2.4.1"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -4178,12 +4168,12 @@ let
           sources."vary-1.0.1"
         ];
       })
-      (sources."express-session-1.15.1" // {
+      (sources."express-session-1.15.2" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
           sources."crc-3.4.4"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -4208,12 +4198,12 @@ let
               (sources."lru-cache-4.0.2" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
-                  sources."yallist-2.0.0"
+                  sources."yallist-2.1.2"
                 ];
               })
-              (sources."which-1.2.12" // {
+              (sources."which-1.2.14" // {
                 dependencies = [
-                  sources."isexe-1.1.2"
+                  sources."isexe-2.0.0"
                 ];
               })
             ];
@@ -4225,7 +4215,7 @@ let
           })
         ];
       })
-      (sources."helmet-3.4.1" // {
+      (sources."helmet-3.5.0" // {
         dependencies = [
           (sources."connect-3.6.0" // {
             dependencies = [
@@ -4254,7 +4244,7 @@ let
           sources."dns-prefetch-control-0.1.0"
           sources."dont-sniff-mimetype-1.0.0"
           sources."frameguard-3.0.0"
-          (sources."helmet-csp-2.3.0" // {
+          (sources."helmet-csp-2.4.0" // {
             dependencies = [
               sources."camelize-1.0.0"
               (sources."content-security-policy-builder-1.1.0" // {
@@ -4342,10 +4332,9 @@ let
               })
             ];
           })
-          (sources."uglify-js-2.8.9" // {
+          (sources."uglify-js-2.8.20" // {
             dependencies = [
               sources."source-map-0.5.6"
-              sources."uglify-to-browserify-1.0.2"
               (sources."yargs-3.10.0" // {
                 dependencies = [
                   sources."camelcase-1.2.1"
@@ -4357,7 +4346,7 @@ let
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -4373,7 +4362,7 @@ let
                             dependencies = [
                               (sources."kind-of-3.1.0" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.4"
+                                  sources."is-buffer-1.1.5"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -4389,6 +4378,7 @@ let
                   sources."window-size-0.1.0"
                 ];
               })
+              sources."uglify-to-browserify-1.0.2"
             ];
           })
           sources."void-elements-2.0.1"
@@ -4436,7 +4426,7 @@ let
           })
           sources."nwmatcher-1.3.9"
           sources."parse5-1.5.1"
-          (sources."request-2.80.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
@@ -4455,7 +4445,7 @@ let
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.4" // {
+                  (sources."ajv-4.11.5" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -4479,8 +4469,9 @@ let
               (sources."http-signature-1.1.1" // {
                 dependencies = [
                   sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
+                  (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"
@@ -4504,16 +4495,17 @@ let
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.15" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.27.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
               sources."performance-now-0.2.0"
-              sources."qs-6.3.2"
+              sources."qs-6.4.0"
+              sources."safe-buffer-5.0.1"
               sources."stringstream-0.0.5"
-              sources."tunnel-agent-0.4.3"
+              sources."tunnel-agent-0.6.0"
             ];
           })
           sources."sax-1.2.2"
@@ -4532,16 +4524,16 @@ let
           sources."xml-name-validator-2.0.1"
         ];
       })
-      (sources."method-override-2.3.7" // {
+      (sources."method-override-2.3.8" // {
         dependencies = [
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
           sources."methods-1.1.2"
           sources."parseurl-1.3.1"
-          sources."vary-1.1.0"
+          sources."vary-1.1.1"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -4605,7 +4597,7 @@ let
               })
               sources."entities-1.1.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.3" // {
+              (sources."readable-stream-2.2.6" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -4713,7 +4705,7 @@ let
                       })
                       (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.2.0"
+                          sources."hosted-git-info-2.4.1"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -4828,15 +4820,15 @@ let
               sources."setimmediate-1.0.5"
             ];
           })
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."mongodb-2.2.24" // {
+          (sources."mongodb-2.2.25" // {
             dependencies = [
               sources."es6-promise-3.2.1"
-              (sources."mongodb-core-2.1.8" // {
+              (sources."mongodb-core-2.1.9" // {
                 dependencies = [
                   sources."bson-1.0.4"
                   (sources."require_optional-1.0.0" // {
@@ -4869,11 +4861,16 @@ let
           sources."underscore-1.6.0"
         ];
       })
-      (sources."databank-lrucache-0.1.2" // {
+      (sources."databank-lrucache-0.1.3" // {
         dependencies = [
-          sources."underscore-1.5.2"
-          sources."lru-cache-2.3.1"
-          sources."set-immediate-0.1.1"
+          sources."databank-1.0.1"
+          (sources."lru-cache-4.0.2" // {
+            dependencies = [
+              sources."pseudomap-1.0.2"
+              sources."yallist-2.1.2"
+            ];
+          })
+          sources."setimmediate-1.0.5"
         ];
       })
     ];
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index d413475389f..ee4dab5ad64 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 74707ae015f..cdb2df80804 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.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 

From 552045db8025a9269ae1d33294ebc3ebe5c56ea6 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Fri, 31 Mar 2017 20:51:32 +0200
Subject: [PATCH 0492/1744] skopeo: 0.1.16 -> 0.1.18

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

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index e724d00e4d3..6a5faa68ced 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs }:
+
+with stdenv.lib;
 
 buildGoPackage rec {
   name = "skopeo-${version}";
-  version = "0.1.16";
+  version = "0.1.18";
   rev = "v${version}";
 
   goPackagePath = "github.com/projectatomic/skopeo";
   excludedPackages = "integration";
 
-  buildInputs = [ gpgme ];
+  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ];
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b";
+    sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z";
   };
 
+  preBuild = ''
+    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
+    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
+  '';
+
   meta = {
     description = "A command line utility for various operations on container images and image repositories";
     homepage = "https://github.com/projectatomic/skopeo";

From d8c47a20b81fcab54a86b52be8cce484426002d8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 31 Mar 2017 18:33:08 +0300
Subject: [PATCH 0493/1744] mumble_git: wrap with Qt dependencies

Fixes #14084.
---
 pkgs/applications/networking/mumble/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 0de567e7a74..ce9d1ac34ab 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -69,7 +69,7 @@ let
   client = source: generic {
     type = "mumble";
 
-    nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
+    nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ];
     buildInputs = [ libopus libsndfile speex ]
       ++ optional (source.qtVersion == 5) qt5.qtsvg
       ++ optional stdenv.isLinux alsaLib
@@ -90,6 +90,10 @@ let
       mkdir -p $out/share/icons{,/hicolor/scalable/apps}
       cp icons/mumble.svg $out/share/icons
       ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
+
+      ${optionalString (source.qtVersion == 5) ''
+        wrapQtProgram $out/bin/mumble
+      ''}
     '';
   } source;
 

From 1eccb75f266be2377731be9fc0682f5396241fb7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 31 Mar 2017 23:11:16 +0300
Subject: [PATCH 0494/1744] mumble: patch python scripts

---
 pkgs/applications/networking/mumble/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index ce9d1ac34ab..adcfa656eb9 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, pkgconfig
 , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
-, alsaLib
+, alsaLib, python
 , jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
 , pulseSupport ? false, libpulseaudio ? null
@@ -19,7 +19,7 @@ let
 
     patches = optional jackSupport ./mumble-jack-support.patch;
 
-    nativeBuildInputs = [ pkgconfig ]
+    nativeBuildInputs = [ pkgconfig python ]
       ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
       ++ (overrides.nativeBuildInputs or [ ]);
     buildInputs = [ boost protobuf avahi ]
@@ -42,6 +42,7 @@ let
 
     preConfigure = ''
        qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib"
+       patchShebangs scripts
     '';
 
     makeFlags = [ "release" ];

From 5793e12143ba18b91826c2443e2888d2a6ccafb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 31 Mar 2017 22:33:44 +0200
Subject: [PATCH 0495/1744] baresip: enable vp8/vp9

---
 .../instant-messengers/baresip/default.nix    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 5dc4294ba3b..90b2695f003 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
 , cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad
 , gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
-, gsm, speex, portaudio, spandsp, libuuid, ccache
+, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
   version = "0.5.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
-    ccache
+    ccache libvpx
     ];
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
@@ -24,21 +24,22 @@ stdenv.mkDerivation rec {
     "USE_VIDEO=1"
     "CCACHE_DISABLE=1"
 
-    "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" 
-    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1" 
-    "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" 
-    "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" 
-    "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" 
+    "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
+    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1"
+    "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
+    "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
+    "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
     "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1"
 
     "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1="
-    "USE_ILBC=" "USE_OPUS=" "USE_SILK=" 
+    "USE_ILBC=" "USE_OPUS=" "USE_SILK="
   ]
   ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
   ;
+
   NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm
-    -DHAVE_INTTYPES_H -D__GLIBC__ 
+    -DHAVE_INTTYPES_H -D__GLIBC__
     -D__need_timeval -D__need_timespec -D__need_time_t '';
   meta = {
     homepage = "http://www.creytiv.com/baresip.html";

From 1e7bad5d51756ac7f0f8065ee726add4c7670eaf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 22:46:32 +0200
Subject: [PATCH 0496/1744] clwrapper, buildLispPackage: compile fasls and
 store them for all systems

---
 .../lisp-modules/clwrapper/default.nix            | 11 ++++++++++-
 .../lisp-modules/clwrapper/setup-hook.sh          |  6 +++++-
 pkgs/development/lisp-modules/define-package.nix  | 15 +++++++++++----
 pkgs/development/lisp-modules/lisp-packages.nix   |  4 ++--
 .../quicklisp-to-nix-output/alexandria.nix        |  4 ----
 .../quicklisp-to-nix-output/anaphora.nix          |  4 ----
 .../quicklisp-to-nix-output/array-utils.nix       |  4 ----
 .../quicklisp-to-nix-output/babel-streams.nix     |  4 ----
 .../quicklisp-to-nix-output/babel.nix             |  4 ----
 .../quicklisp-to-nix-output/blackbird.nix         |  4 ----
 .../quicklisp-to-nix-output/bordeaux-threads.nix  |  4 ----
 .../quicklisp-to-nix-output/caveman.nix           |  4 ----
 .../quicklisp-to-nix-output/cffi-grovel.nix       |  4 ----
 .../quicklisp-to-nix-output/cffi-toolchain.nix    |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/cffi.nix |  4 ----
 .../quicklisp-to-nix-output/chipz.nix             |  4 ----
 .../quicklisp-to-nix-output/chunga.nix            |  4 ----
 .../quicklisp-to-nix-output/circular-streams.nix  |  4 ----
 .../quicklisp-to-nix-output/cl+ssl.nix            |  4 ----
 .../quicklisp-to-nix-output/cl-aa.nix             |  4 ----
 .../quicklisp-to-nix-output/cl-annot.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-ansi-text.nix      |  4 ----
 .../quicklisp-to-nix-output/cl-async-base.nix     |  4 ----
 .../quicklisp-to-nix-output/cl-async-util.nix     |  4 ----
 .../quicklisp-to-nix-output/cl-async.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-base64.nix         |  4 ----
 .../quicklisp-to-nix-output/cl-colors.nix         |  4 ----
 .../quicklisp-to-nix-output/cl-cookie.nix         |  4 ----
 .../quicklisp-to-nix-output/cl-emb.nix            |  4 ----
 .../quicklisp-to-nix-output/cl-fad.nix            |  4 ----
 .../quicklisp-to-nix-output/cl-fuse-meta-fs.nix   |  4 ----
 .../quicklisp-to-nix-output/cl-fuse.nix           |  4 ----
 .../quicklisp-to-nix-output/cl-json.nix           |  4 ----
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix      |  4 ----
 .../quicklisp-to-nix-output/cl-l10n.nix           |  4 ----
 .../quicklisp-to-nix-output/cl-libuv.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-paths-ttf.nix      |  4 ----
 .../quicklisp-to-nix-output/cl-paths.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-ppcre.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-project.nix        |  4 ----
 .../quicklisp-to-nix-output/cl-reexport.nix       |  4 ----
 .../quicklisp-to-nix-output/cl-smtp.nix           |  4 ----
 .../quicklisp-to-nix-output/cl-store.nix          |  4 ----
 .../quicklisp-to-nix-output/cl-syntax-annot.nix   |  4 ----
 .../quicklisp-to-nix-output/cl-syntax.nix         |  4 ----
 .../quicklisp-to-nix-output/cl-unicode.nix        |  4 ----
 .../quicklisp-to-nix-output/cl-unification.nix    |  4 ----
 .../quicklisp-to-nix-output/cl-utilities.nix      |  4 ----
 .../quicklisp-to-nix-output/cl-vectors.nix        |  4 ----
 .../quicklisp-to-nix-output/cl-who.nix            |  4 ----
 .../quicklisp-to-nix-output/clack-v1-compat.nix   |  4 ----
 .../quicklisp-to-nix-output/clack.nix             |  4 ----
 .../quicklisp-to-nix-output/closer-mop.nix        |  4 ----
 .../quicklisp-to-nix-output/closure-common.nix    |  4 ----
 .../quicklisp-to-nix-output/clsql.nix             |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/clss.nix |  4 ----
 .../quicklisp-to-nix-output/clx-truetype.nix      |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/clx.nix  |  4 ----
 .../command-line-arguments.nix                    |  4 ----
 .../quicklisp-to-nix-output/css-lite.nix          |  4 ----
 .../quicklisp-to-nix-output/cxml-dom.nix          |  4 ----
 .../quicklisp-to-nix-output/cxml-klacks.nix       |  4 ----
 .../quicklisp-to-nix-output/cxml-test.nix         |  4 ----
 .../quicklisp-to-nix-output/cxml-xml.nix          |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/cxml.nix |  4 ----
 .../quicklisp-to-nix-output/dexador.nix           |  4 ----
 .../quicklisp-to-nix-output/do-urlencode.nix      |  4 ----
 .../documentation-utils.nix                       |  4 ----
 .../quicklisp-to-nix-output/drakma.nix            |  4 ----
 .../quicklisp-to-nix-output/esrap.nix             |  4 ----
 .../quicklisp-to-nix-output/external-program.nix  |  4 ----
 .../quicklisp-to-nix-output/fast-http.nix         |  4 ----
 .../quicklisp-to-nix-output/fast-io.nix           |  4 ----
 .../quicklisp-to-nix-output/flexi-streams.nix     |  4 ----
 .../quicklisp-to-nix-output/form-fiddle.nix       |  4 ----
 .../quicklisp-to-nix-output/http-body.nix         |  4 ----
 .../quicklisp-to-nix-output/hunchentoot.nix       |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/idna.nix |  4 ----
 .../quicklisp-to-nix-output/iolib.nix             |  4 ----
 .../quicklisp-to-nix-output/ironclad.nix          |  4 ----
 .../quicklisp-to-nix-output/iterate.nix           |  4 ----
 .../quicklisp-to-nix-output/jonathan.nix          |  4 ----
 .../quicklisp-to-nix-output/lack-component.nix    |  4 ----
 .../quicklisp-to-nix-output/lack-util.nix         |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/lack.nix |  4 ----
 .../quicklisp-to-nix-output/let-plus.nix          |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/lev.nix  |  4 ----
 .../quicklisp-to-nix-output/local-time.nix        |  4 ----
 .../quicklisp-to-nix-output/lquery.nix            |  4 ----
 .../quicklisp-to-nix-output/map-set.nix           |  4 ----
 .../quicklisp-to-nix-output/marshal.nix           |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/md5.nix  |  4 ----
 .../quicklisp-to-nix-output/metabang-bind.nix     |  4 ----
 .../quicklisp-to-nix-output/myway.nix             |  4 ----
 .../quicklisp-to-nix-output/named-readtables.nix  |  4 ----
 .../quicklisp-to-nix-output/nibbles.nix           |  4 ----
 .../quicklisp-to-nix-output/optima.nix            |  4 ----
 .../quicklisp-to-nix-output/parenscript.nix       |  4 ----
 .../quicklisp-to-nix-output/pcall-queue.nix       |  4 ----
 .../quicklisp-to-nix-output/pcall.nix             |  4 ----
 .../quicklisp-to-nix-output/plump-dom.nix         |  4 ----
 .../quicklisp-to-nix-output/plump-lexer.nix       |  4 ----
 .../quicklisp-to-nix-output/plump-parser.nix      |  4 ----
 .../quicklisp-to-nix-output/plump.nix             |  4 ----
 .../quicklisp-to-nix-output/proc-parse.nix        |  4 ----
 .../quicklisp-to-nix-output/prove.nix             |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/puri.nix |  4 ----
 .../quicklisp-to-nix-output/query-fs.nix          |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/quri.nix |  4 ----
 .../quicklisp-to-nix-output/rfc2388.nix           |  4 ----
 .../quicklisp-to-nix-output/salza2.nix            |  4 ----
 .../quicklisp-to-nix-output/smart-buffer.nix      |  4 ----
 .../quicklisp-to-nix-output/split-sequence.nix    |  4 ----
 .../quicklisp-to-nix-output/static-vectors.nix    |  4 ----
 .../quicklisp-to-nix-output/stumpwm.nix           |  4 ----
 .../quicklisp-to-nix-output/swap-bytes.nix        |  4 ----
 .../quicklisp-to-nix-output/trivial-backtrace.nix |  4 ----
 .../quicklisp-to-nix-output/trivial-features.nix  |  4 ----
 .../quicklisp-to-nix-output/trivial-garbage.nix   |  4 ----
 .../trivial-gray-streams.nix                      |  4 ----
 .../quicklisp-to-nix-output/trivial-indent.nix    |  4 ----
 .../quicklisp-to-nix-output/trivial-mimes.nix     |  4 ----
 .../quicklisp-to-nix-output/trivial-types.nix     |  4 ----
 .../quicklisp-to-nix-output/trivial-utf-8.nix     |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/uffi.nix |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/uiop.nix |  6 +-----
 .../quicklisp-to-nix-output/usocket.nix           |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/vom.nix  |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/woo.nix  |  4 ----
 .../quicklisp-to-nix-output/wookie.nix            |  4 ----
 .../lisp-modules/quicklisp-to-nix-output/xmls.nix |  4 ----
 .../quicklisp-to-nix-output/xsubseq.nix           |  4 ----
 .../quicklisp-to-nix-output/yason.nix             |  4 ----
 .../quicklisp-to-nix-output/zpb-ttf.nix           |  4 ----
 .../lisp-modules/quicklisp-to-nix/nix-package.emb |  4 ----
 135 files changed, 29 insertions(+), 533 deletions(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 978e16fd998..2a4fd7f0e39 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -10,6 +10,15 @@ stdenv.mkDerivation {
     substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh"
     substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh"
     chmod a+x "$out"/bin/*
+    
+    substituteAll "${./setup-hook.sh}" "setup-hook-parsed"
+    source setup-hook-parsed
+    setLisp "${lisp}"
+    echo "$NIX_LISP"
+
+    ASDF_OUTPUT_TRANSLATIONS="${asdf}/lib/common-lisp/:$out/lib/common-lisp-compiled/" \
+    NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")"' \
+      "$out/bin/common-lisp.sh" "$NIX_LISP"
   '';
 
   inherit asdf lisp;
@@ -22,7 +31,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   passthru = {
-    inherit lisp;
+    inherit lisp asdf;
   };
 
   meta = {
diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
index bc5a6b34866..b2d5308c580 100644
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@@ -1,11 +1,15 @@
 NIX_LISP_ASDF="@asdf@"
 
 CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/"
+ASDF_OUTPUT_TRANSLATIONS="@asdf@/lib/common-lisp/:@out@/lib/common-lisp-compiled/"
 
 addASDFPaths () {
     for j in "$1"/lib/common-lisp/*; do
 	if [ -d "$j" ]; then
             CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/"
+            if [ -d "$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")" ]; then
+              ASDF_OUTPUT_TRANSLATIONS="$j:$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")${ASDF_OUTPUT_TRANSLATIONS:+:}$ASDF_OUTPUT_TRANSLATIONS"
+            fi
 	fi
     done
 }
@@ -31,7 +35,7 @@ collectNixLispLDLP () {
      fi
 }
 
-export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF
+export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF ASDF_OUTPUT_TRANSLATIONS
 
 envHooks+=(addASDFPaths setLisp collectNixLispLDLP)
 
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index a3368e336e6..58f4ab6d21d 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,15 +1,17 @@
-args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, 
-  buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}:
+args @ {stdenv, clwrapper, baseName, testSystem ? baseName, version ? "latest"
+  , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
+  , propagatedBuildInputs ? []}:
 let 
   deployConfigScript = ''
     config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh
     mkdir -p "$(dirname "$config_script")"
     touch "$config_script"
     chmod a+x "$config_script"
-    echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ $NIX_CFLAGS_COMPILE}\"" >> "$config_script"
+    echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script"
     echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
     echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
     echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script"
+    echo "export ASDF_OUTPUT_TRANSLATIONS="\$ASDF_OUTPUT_TRANSLATIONS\''${ASDF_OUTPUT_TRANSLATIONS:+:}"'$out/lib/common-lisp/${args.baseName}/:$out/lib/common-lisp-compiled/${args.baseName}:$ASDF_OUTPUT_TRANSLATIONS'" >> "$config_script"
     test -n "$LD_LIBRARY_PATH" &&
         echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$config_script"
     test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
@@ -41,9 +43,14 @@ basePackage = {
     ${deployConfigScript}
     ${deployLaunchScript}
 
+    ${if testSystem != null then ''
+       NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :${testSystem})"' \
+          "$out/bin/${args.baseName}-lisp-launcher.sh" ""
+    '' else ""}
+
     eval "$postInstall"
   '';
-  propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] 
+  propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf] 
     ++ (args.propagatedBuildInputs or []);
   buildInputs = buildInputs;
   dontStrip=true;
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 67decd721fb..334d801302c 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -10,7 +10,7 @@ let lispPackages = rec {
     baseName = "esrap-peg";
     version = "git-20170320";
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
-    deps = with pkgs.quicklispPackages; [alexandria cl-unification esrap iterate];
+    deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-unification esrap iterate];
     src = pkgs.fetchgit {
       url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby";
@@ -22,7 +22,7 @@ let lispPackages = rec {
     baseName = "clx-xkeyboard";
     version = "git-20150523";
     description = "CLX support for X Keyboard extensions";
-    deps = with pkgs.quicklispPackages; [clx];
+    deps = with (pkgs.quicklispPackagesFor clwrapper); [clx];
     # Source type: git
     src = pkgs.fetchgit {
       url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 8404bd0717d..9a59765aac8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :alexandria)"' "$out/bin/alexandria-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 2319134b32e..2d28e1d1824 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :anaphora)"' "$out/bin/anaphora-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index d26282accaf..eac6cbd3fd2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :array-utils)"' "$out/bin/array-utils-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 70e4b600c97..c089b4251c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :babel-streams)"' "$out/bin/babel-streams-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index e6a4fad3b26..ef2ab2b041b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :babel)"' "$out/bin/babel-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 91200e4e2ce..16f5143df4b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :blackbird)"' "$out/bin/blackbird-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index 819e3c0bc46..2035c90725e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :bordeaux-threads)"' "$out/bin/bordeaux-threads-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index a10ec469376..202f3b594c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :caveman)"' "$out/bin/caveman-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index aaf511fa27a..43c3ced1d8c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi-grovel)"' "$out/bin/cffi-grovel-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index fefbef57f7e..e762e32a4e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi-toolchain)"' "$out/bin/cffi-toolchain-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index c303727ba6d..6b564322021 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cffi)"' "$out/bin/cffi-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index fb7922a689a..c86ccad4d12 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :chipz)"' "$out/bin/chipz-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index e29d6818f01..30200cdb0b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :chunga)"' "$out/bin/chunga-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 95438b96c73..482d5f18d1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :circular-streams)"' "$out/bin/circular-streams-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 004afe7bd04..5e68159115f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl+ssl)"' "$out/bin/cl+ssl-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 0606f887821..dd1bccaf9aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-aa)"' "$out/bin/cl-aa-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 9bdb4f65c42..b8948dff0a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-annot)"' "$out/bin/cl-annot-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index bf706f957d9..a0058e1c0d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-ansi-text)"' "$out/bin/cl-ansi-text-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index 1e0a6e7a50a..2638663c955 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-base-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index 58a459031c6..b1f8d9448dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-util-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 9c53b3d43f5..2733d9352ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-async)"' "$out/bin/cl-async-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 81e5920a0c6..8926f34db59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-base64)"' "$out/bin/cl-base64-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index d7d0bf211ea..60db32f7245 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-colors)"' "$out/bin/cl-colors-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index eca4c14edda..b9109b828b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-cookie)"' "$out/bin/cl-cookie-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index f42d4d6bff4..b1db2691ecd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-emb)"' "$out/bin/cl-emb-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 3c4c1e72e19..152b7eb5d33 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fad)"' "$out/bin/cl-fad-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index e0722a8a7bb..8bd039bb7af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fuse-meta-fs)"' "$out/bin/cl-fuse-meta-fs-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 6beba38befd..081a1a5dfb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fuse)"' "$out/bin/cl-fuse-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index babfcf6e3a5..aff77cb559b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-json)"' "$out/bin/cl-json-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 0bb3c38312a..e0960eb4071 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-l10n-cldr)"' "$out/bin/cl-l10n-cldr-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 72d3a294aa7..220467242a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-l10n)"' "$out/bin/cl-l10n-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index bb100cc393f..1db65ecc513 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-libuv)"' "$out/bin/cl-libuv-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index e26f205c4f4..2da3ff06180 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths-ttf)"' "$out/bin/cl-paths-ttf-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index 836b523f556..0eb72064674 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths)"' "$out/bin/cl-paths-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 257417af0fe..d9eef7b0846 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-ppcre)"' "$out/bin/cl-ppcre-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 3573bbb5251..66a0cf743ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-project)"' "$out/bin/cl-project-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 1d523f55087..f8e50f167bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-reexport)"' "$out/bin/cl-reexport-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index fff81d9411f..7471c8ba82c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-smtp)"' "$out/bin/cl-smtp-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 79a841314f7..ebc8a989edf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-store)"' "$out/bin/cl-store-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index e6673ecddbc..887e9366011 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-syntax-annot)"' "$out/bin/cl-syntax-annot-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 6c76f0ea380..1458a3566c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-syntax)"' "$out/bin/cl-syntax-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index e2144a41fb0..f34904fef67 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-unicode)"' "$out/bin/cl-unicode-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 88ca12f7bfb..868c3c8e182 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -15,9 +15,5 @@ The system contains the definitions for the 'unification' machinery.'';
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-unification)"' "$out/bin/cl-unification-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index edb7fc3efc9..c253fa87c75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-utilities)"' "$out/bin/cl-utilities-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index 5b399bfc9ee..2f203e1317c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-vectors)"' "$out/bin/cl-vectors-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 33a4ae2f38f..0dc90c2579e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-who)"' "$out/bin/cl-who-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 4d96ad8c86f..9e70252554e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clack-v1-compat)"' "$out/bin/clack-v1-compat-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index c812f485ceb..2b2f0f92f76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clack)"' "$out/bin/clack-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index a231a245483..b2c2db32f76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :closer-mop)"' "$out/bin/closer-mop-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index f176bb6e1df..be36d5c05c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :closure-common)"' "$out/bin/closure-common-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 4bb11260f2b..040f7987af0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clsql)"' "$out/bin/clsql-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 3c89603d9cb..ac965df6e47 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clss)"' "$out/bin/clss-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 1c672aaa4be..13ee7781c92 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clx-truetype)"' "$out/bin/clx-truetype-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index e4303bca2d3..7b42b7c729b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clx)"' "$out/bin/clx-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 5cbef72e3dc..1d18be3ea83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :command-line-arguments)"' "$out/bin/command-line-arguments-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 8b2357fc7e0..4c7e53dee73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :css-lite)"' "$out/bin/css-lite-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 56d6a42d93d..270cf0d9f4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-dom-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index b118d276dd2..6d89a60baca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-klacks-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index e8f2bb5d8b3..9352cd1650a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-test-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 85d60abf746..116a1fba7f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-xml-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 54d02e035bc..3d579753893 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cxml)"' "$out/bin/cxml-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index d4c3ff3a1c4..2026fdea0dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :dexador)"' "$out/bin/dexador-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 699e5a1458f..eb10795d055 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :do-urlencode)"' "$out/bin/do-urlencode-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 37a7e979058..4adc20dd002 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :documentation-utils)"' "$out/bin/documentation-utils-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index c9845af9764..b1dd76536c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :drakma)"' "$out/bin/drakma-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 93864948f11..f3f217d545a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :esrap)"' "$out/bin/esrap-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 4143957416a..5fb808f64c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :external-program)"' "$out/bin/external-program-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 17cc9bc020a..7bd25dda403 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :fast-http)"' "$out/bin/fast-http-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 69201b7044b..22616f75adc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :fast-io)"' "$out/bin/fast-io-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 90dcbbc83f8..26a7ce83f7f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :flexi-streams)"' "$out/bin/flexi-streams-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 7aa65c3b84b..aa2fbb70282 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :form-fiddle)"' "$out/bin/form-fiddle-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 958c899bbe9..2c361812da6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :http-body)"' "$out/bin/http-body-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index 6f0aa151c15..eafcffa9b1b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -16,9 +16,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :hunchentoot)"' "$out/bin/hunchentoot-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index c0b325123cf..2a36fa821f0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :idna)"' "$out/bin/idna-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 4d76399a911..a6b5574b119 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iolib)"' "$out/bin/iolib-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index cf1d4ac077c..4f8f9e02752 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :ironclad)"' "$out/bin/ironclad-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 5fffe95309e..1eb9b549287 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iterate)"' "$out/bin/iterate-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 6f77708ade5..055d9eebc23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :jonathan)"' "$out/bin/jonathan-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 6580fc6760b..1116efadc5a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack-component)"' "$out/bin/lack-component-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 113a920348e..20d920dfad5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack-util)"' "$out/bin/lack-util-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 7f41d0ac276..330c696a66a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lack)"' "$out/bin/lack-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index f99372a37ec..1dfc69ea6d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :let-plus)"' "$out/bin/let-plus-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 61e6703dea4..9aaae650190 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lev)"' "$out/bin/lev-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index f2cab2b59fb..8e3ea32d75b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :local-time)"' "$out/bin/local-time-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 0b8d97def2f..4432119493a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :lquery)"' "$out/bin/lquery-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index a9a4a2d5852..ac55a3bbbef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :map-set)"' "$out/bin/map-set-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 65b7465873f..b15949ad6ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :marshal)"' "$out/bin/marshal-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index bf39f4b3c3b..9450a0431ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :md5)"' "$out/bin/md5-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index daf966dadab..5e824e69186 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :metabang-bind)"' "$out/bin/metabang-bind-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 7f0a2fe1139..92d2c10c3be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :myway)"' "$out/bin/myway-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 636f4cea7c7..24edc30f20b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -14,9 +14,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :named-readtables)"' "$out/bin/named-readtables-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index cfd8dba13fb..83c2b5a7bc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :nibbles)"' "$out/bin/nibbles-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 6d6981c8586..f73e6ea083b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :optima)"' "$out/bin/optima-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index a81494bc88f..3307536bb75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :parenscript)"' "$out/bin/parenscript-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index 6e19879b29d..f834554de95 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall-queue)"' "$out/bin/pcall-queue-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 06068e36dfb..f8a61f5b87d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall)"' "$out/bin/pcall-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
index 99cc86ea6fa..aed7c42b681 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-dom)"' "$out/bin/plump-dom-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index fe3bdb8649e..fe975e9f52d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-lexer)"' "$out/bin/plump-lexer-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
index 47d253b16be..941924d461e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump-parser)"' "$out/bin/plump-parser-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 2c2865b8bde..5410889987b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :plump)"' "$out/bin/plump-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 6c780e5a541..1c42d0688e2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :proc-parse)"' "$out/bin/proc-parse-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index fb9f5d7d564..0cf49862065 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :prove)"' "$out/bin/prove-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 2ae7b5e8703..7f219ba6a9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :puri)"' "$out/bin/puri-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 8962c687d86..087be682f5d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :query-fs)"' "$out/bin/query-fs-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index a96d145b2af..aea88cf61ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :quri)"' "$out/bin/quri-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 8216bcca9f7..56c2d630c4d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :rfc2388)"' "$out/bin/rfc2388-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index c4be68aa80b..19c5d84a26b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -14,9 +14,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :salza2)"' "$out/bin/salza2-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 689f83a93a6..5f0f316dda4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :smart-buffer)"' "$out/bin/smart-buffer-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index afb5a59fc89..70ec5445735 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -14,9 +14,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :split-sequence)"' "$out/bin/split-sequence-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index ed2aa3ab487..7e0b5231ea3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :static-vectors)"' "$out/bin/static-vectors-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 2927e6f8b38..20a57e86967 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :stumpwm)"' "$out/bin/stumpwm-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 8dc37b52342..ab003701039 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :swap-bytes)"' "$out/bin/swap-bytes-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index ef3c2754a04..36de0955f55 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-backtrace)"' "$out/bin/trivial-backtrace-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index d9f4a0bba06..4c8c7db0b0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-features)"' "$out/bin/trivial-features-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 93ecccf6fd2..f8f77eaee39 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-garbage)"' "$out/bin/trivial-garbage-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 91390088eba..2a2a9be1b85 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-gray-streams)"' "$out/bin/trivial-gray-streams-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 47c0468617a..d0e61f55abf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-indent)"' "$out/bin/trivial-indent-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 75be29e69ce..717d9d3d3ca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-mimes)"' "$out/bin/trivial-mimes-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 6d59de6fbe5..93bfedd45bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-types)"' "$out/bin/trivial-types-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 80c320dffbc..d666f2382a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :trivial-utf-8)"' "$out/bin/trivial-utf-8-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index ee860285e7b..30831df086f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :uffi)"' "$out/bin/uffi-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index f14e70f3c0c..6dbbcbe20ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''uiop'';
   version = ''3.2.0'';
 
-  description = '''';
+  description = ''Portability library for Common Lisp programs'';
 
   deps = [ ];
 
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :uiop)"' "$out/bin/uiop-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 3e121514fc0..4fe40ae2495 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :usocket)"' "$out/bin/usocket-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index d18e1f116ed..d8a429b1392 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :vom)"' "$out/bin/vom-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 8674970d0c1..c9624b2a5f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :woo)"' "$out/bin/woo-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 91325de816d..3e91bd9eb6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :wookie)"' "$out/bin/wookie-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index a0700c19087..ce0ae7043a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :xmls)"' "$out/bin/xmls-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index 7eab70d4d8f..f433eb8cfd8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :xsubseq)"' "$out/bin/xsubseq-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index c2b1ed9b556..7917646810c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :yason)"' "$out/bin/yason-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 896b9bba8a6..ad347623618 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :zpb-ttf)"' "$out/bin/zpb-ttf-lisp-launcher.sh" ""
-    '';
   };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 3a007050924..774d64a0a3c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -13,9 +13,5 @@ rec {
   };
 
   overrides = x: {
-    postInstall = ''
-        echo "$CL_SOURCE_REGISTRY"
-        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :<% @ifnotempty testname %><% @var testname %><% @else %><% @var name %><% @endif %>)"' "$out/bin/<% @var filename %>-lisp-launcher.sh" ""
-    '';
   };
 }

From 3690ad1772a5192601300fad0c0d92e93fdb7d81 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Fri, 31 Mar 2017 18:36:18 -0300
Subject: [PATCH 0497/1744] multimc: 5 -> 0.5.1

---
 pkgs/games/multimc/default.nix   | 20 +++++++++-----------
 pkgs/games/multimc/multimc.patch | 24 ------------------------
 2 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/games/multimc/multimc.patch

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 67f0a87df65..e438008b19c 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -4,31 +4,29 @@ let
   libnbt = fetchFromGitHub {
     owner = "MultiMC";
     repo = "libnbtplusplus";
-    rev = "5d0ffb50a526173ce58ae57136bf5d79a7e1920d";
-    sha256 = "05hnwfb77rmm9ba7n96g4g1sgwqqcmplvbcafsl76yxr6ysgw5jg";
+    rev = "4b305bb";
+    sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs";
   };
 in
 stdenv.mkDerivation {
-  name = "multimc-5";
+  name = "multimc-0.5.1";
   src = fetchFromGitHub {
     owner = "MultiMC";
     repo = "MultiMC5";
-    rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
-    sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
+    rev = "0.5.1";
+    sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20";
   };
   buildInputs = [ cmake qtbase jdk zlib file makeWrapper ];
 
   libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
   postUnpack = ''
-    rmdir $sourceRoot/depends/libnbtplusplus
-    cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
-    chmod 755 -R $sourceRoot/depends/libnbtplusplus
+    rmdir $sourceRoot/libraries/libnbtplusplus
+    cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus
+    chmod 755 -R $sourceRoot/libraries/libnbtplusplus
     mkdir -pv $sourceRoot/build/
     cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
   '';
 
-  patches = [ ./multimc.patch ];
-
   enableParallelBuilding = true;
 
   # the install rule tries to bundle ALL deps into the output for portability
@@ -41,7 +39,7 @@ stdenv.mkDerivation {
     mkdir -pv $out/bin/jars $out/lib
     cp -v MultiMC $out/bin/
     cp -v jars/*.jar $out/bin/jars/ #*/
-    cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
+    cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib
     wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
   '';
 
diff --git a/pkgs/games/multimc/multimc.patch b/pkgs/games/multimc/multimc.patch
deleted file mode 100644
index 39d0076f16a..00000000000
--- a/pkgs/games/multimc/multimc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp
---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp	2015-10-25 03:29:25.270126028 -0300
-+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp	2015-10-25 04:22:48.568437861 -0300
-@@ -330,7 +330,7 @@
- 	}
- 
- 	m_mmc_translator.reset(new QTranslator());
--	if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations"))
-+	if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), "translations"))
- 	{
- 		qDebug() << "Loading MMC Language File for"
- 					 << locale.bcp47Name().toLocal8Bit().constData() << "...";
-diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp
---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp	2015-10-25 03:29:25.428124792 -0300
-+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp	2015-10-25 04:29:24.145412196 -0300
-@@ -147,7 +147,7 @@
- 	m_metacache->addBase("general", QDir("cache").absolutePath());
- 	m_metacache->addBase("skins", QDir("accounts/skins").absolutePath());
- 	m_metacache->addBase("root", QDir(rootPath).absolutePath());
--	m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath());
-+	m_metacache->addBase("translations", QDir("translations").absolutePath());
- 	m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
- 	m_metacache->Load();
- }

From a41668f4412b75b65d65a46d352552546488c3c7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 1 Apr 2017 00:06:52 +0200
Subject: [PATCH 0498/1744] grsecurity: 4.9.19-201703300917 ->
 4.9.20-201703310823

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 70cda750279..b32dfbc4b35 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.19";
+  version = "4.9.20";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "13wzalzrhgvs6jfzrh8y9c90scliw6rl1vpyyh95va5wph5b8fczr136pbzpwzjaql7x5xyn3s57rmakpc5k8b34ng8hr6jzj6kiyq0";
+    sha512 = "3israf7zhq92wi0py8y299f7cz6z6xr0y4i5b1xvb46ljyx39jwrrdjrf5nxngz6c1641l9qalwzg5r15pp4gqyr09ilmwn8i7kbqwi";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ee4c161d739..5bb9d2d39ac 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.19";
-      grrev  = "201703300917";
-      sha512 = "04fyrxyxa817qw2fbpdrw2z5xmfhjaf9kgzrfdqg1rnxnwwp1x9alm3qwkvlw0s9hcph3jln7z19jiw0fh6s82pb337cnhr1iiikax4";
+    { kver   = "4.9.20";
+      grrev  = "201703310823";
+      sha512 = "0pm3wmcip73imjjx13yar5l5bhpii45mjac5vb1snypmbwqmywmikiixqslq84i1yqw0c8pi822znkz7650dhxrmdmagy0yirwfdrhf";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 57a29cab6a3955e2f8795aed8142e51d73f7d26d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 1 Apr 2017 01:43:12 +0000
Subject: [PATCH 0499/1744] instead-launcher: init at 0.6.3

---
 pkgs/games/instead-launcher/default.nix | 32 ++++++++++++++++++++
 pkgs/games/instead-launcher/path.patch  | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/games/instead-launcher/default.nix
 create mode 100644 pkgs/games/instead-launcher/path.patch

diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
new file mode 100644
index 00000000000..6515db9dab3
--- /dev/null
+++ b/pkgs/games/instead-launcher/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "instead-launcher-${version}";
+
+  version = "0.6.3";
+
+  src = fetchFromGitHub {
+    owner = "instead-hub";
+    repo = "instead-launcher";
+    rev = version;
+    sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw";
+  };
+
+  patches = [ ./path.patch ];
+
+  postPatch = ''
+    substituteInPlace platform.cpp --subst-var-by instead ${instead}
+  '';
+
+  nativeBuildInputs = [ qmake4Hook ];
+
+  buildInputs = [ zlib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://instead.syscall.ru/wiki/en/instead-launcher;
+    description = "Install and play games from INSTEAD repository";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/games/instead-launcher/path.patch b/pkgs/games/instead-launcher/path.patch
new file mode 100644
index 00000000000..f63737bfb16
--- /dev/null
+++ b/pkgs/games/instead-launcher/path.patch
@@ -0,0 +1,39 @@
+From c7460a7fc255ef4e8e0e37798605c4d8bb50633d Mon Sep 17 00:00:00 2001
+From: Orivej Desh <orivej@gmx.fr>
+Date: Sat, 1 Apr 2017 01:30:37 +0000
+Subject: [PATCH] path
+
+---
+ mainwindow.cpp | 2 +-
+ platform.cpp   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 9687c4e..234b176 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -688,7 +688,7 @@ void MainWindow::loadConfig() {
+     if ( args.contains( "default-gamespath" ) )
+ 	defGamesPath = args["default-gamespath"].toString();
+ 
+-    QString insteadPath = conf.value("InsteadPath", defInsteadPath).toString();
++    QString insteadPath = defInsteadPath;
+     bool autoRefresh = conf.value("AutoRefresh", "false").toString() == "true";
+     bool autoRefreshSW = conf.value("AutoRefreshSW", "false").toString() == "true";
+     QString lang = conf.value( "Language", "*" ).toString();
+diff --git a/platform.cpp b/platform.cpp
+index bda86be..c356f1c 100644
+--- a/platform.cpp
++++ b/platform.cpp
+@@ -22,7 +22,7 @@ QString getConfigPath() {
+ }
+ 
+ QString getDefaultInterpreterPath() {
+-    return "/usr/local/bin/sdl-instead";
++    return "@instead@/bin/sdl-instead";
+ }
+ 
+ #elif defined(Q_OS_WIN)
+-- 
+2.12.2
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e403f303d12..6c04157b152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16586,6 +16586,8 @@ with pkgs;
     lua = lua5;
   };
 
+  instead-launcher = callPackage ../games/instead-launcher { };
+
   ja2-stracciatella = callPackage ../games/ja2-stracciatella { };
 
   klavaro = callPackage ../games/klavaro {};

From ecf5daa5d7db5eec7d26792cf07b3b532b589390 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 1 Apr 2017 01:37:40 +0000
Subject: [PATCH 0500/1744] subgit: 3.1.0 -> 3.2.4

---
 .../git-and-tools/subgit/default.nix                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index 0774bbc9a62..7b36a142d15 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
-stdenv.mkDerivation {
-  name = "subgit-3.1.0";
+stdenv.mkDerivation rec {
+  name = "subgit-3.2.4";
 
   meta = {
     description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.all;
   };
 
-  buildInputs = [ unzip makeWrapper ];
+  nativeBuildInputs = [ unzip makeWrapper ];
 
   installPhase = ''
     mkdir $out;
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = http://old.subgit.com/download/subgit-3.1.0.zip;
-    sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg";
+    url = "http://subgit.com/download/${name}.zip";
+    sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw";
   };
-}
\ No newline at end of file
+}

From a3098900448544a084cb0ab0d83d9caadd19bbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= <matin1111@wp.pl>
Date: Sat, 1 Apr 2017 05:51:41 +0200
Subject: [PATCH 0501/1744] ipfs: 0.4.6 -> 0.4.8

---
 pkgs/applications/networking/ipfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index a00aebef296..2be39df6147 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "0.4.6";
-  rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a";
+  version = "0.4.8";
+  rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk";
+      sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13";
+    sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh";
   };
 
   meta = with stdenv.lib; {

From 033c5debbc2db8f934aad4bd2b35b899d839fb46 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 07:39:13 +0200
Subject: [PATCH 0502/1744] utop: fix on OCaml 4.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t strip the binary
The wrapper directly calls ocamlrun
---
 pkgs/development/tools/ocaml/utop/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 9b41a06c935..31549729cfe 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -25,14 +25,24 @@ stdenv.mkDerivation rec {
     make doc
     '';
 
+  dontStrip = true;
+
   postFixup =
-  let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
-  in
+   let p = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; in
    ''
-   for prog in "$out"/bin/*
+   pushd $out/bin
+   for prog in *
    do
-    wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
+    mv $prog .$prog-wrapped
+    cat > $prog <<EOF
+#!/bin/sh
+export CAML_LD_LIBRARY_PATH=${p ocaml_lwt}/lwt:${p lambdaTerm}/lambda-term:'\$CAML_LD_LIBRARY_PATH'
+export OCAMLPATH=${p ocaml_lwt}:${p ocaml_react}:${p camomile}:${p zed}:${p lambdaTerm}:"$out"/lib/ocaml/${ocaml.version}/site-lib:'\$OCAMLPATH'
+${ocaml}/bin/ocamlrun $out/bin/.$prog-wrapped \$*
+EOF
+    chmod +x $prog
    done
+   popd
    '';
 
   meta = {

From 623a46965380ac6c04a418e03d891e47e19361b9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 1 Apr 2017 08:08:02 +0200
Subject: [PATCH 0503/1744] quicklispPackages, lispPackages: make all
 system-loads pass with precompilation

---
 pkgs/development/lisp-modules/asdf/2.26.nix   |   1 +
 pkgs/development/lisp-modules/asdf/3.1.nix    |   1 +
 .../development/lisp-modules/asdf/default.nix |   1 +
 .../lisp-modules/clwrapper/default.nix        |   8 +-
 .../lisp-modules/clwrapper/setup-hook.sh      |   2 +-
 .../lisp-modules/define-package.nix           |  12 +-
 .../lisp-modules/lisp-packages.nix            |   6 +-
 .../3bmd-ext-tables.nix                       |  29 +
 .../3bmd-ext-wiki-links.nix                   |  29 +
 .../quicklisp-to-nix-output/3bmd-youtube.nix  |  29 +
 .../quicklisp-to-nix-output/3bmd.nix          |  29 +
 .../quicklisp-to-nix-output/alexandria.nix    |  11 +
 .../quicklisp-to-nix-output/anaphora.nix      |  11 +
 .../quicklisp-to-nix-output/array-utils.nix   |  11 +
 .../quicklisp-to-nix-output/babel-streams.nix |  14 +-
 .../quicklisp-to-nix-output/babel.nix         |  13 +-
 .../quicklisp-to-nix-output/blackbird.nix     |  11 +
 .../bordeaux-threads.nix                      |  12 +
 .../quicklisp-to-nix-output/caveman.nix       |  17 +-
 .../quicklisp-to-nix-output/cffi-examples.nix |  28 +
 .../quicklisp-to-nix-output/cffi-grovel.nix   |  13 +-
 .../quicklisp-to-nix-output/cffi-libffi.nix   |  29 +
 .../cffi-toolchain.nix                        |  13 +-
 .../cffi-uffi-compat.nix                      |  28 +
 .../quicklisp-to-nix-output/cffi.nix          |  14 +-
 .../quicklisp-to-nix-output/chipz.nix         |  11 +
 .../quicklisp-to-nix-output/chunga.nix        |  11 +
 .../circular-streams.nix                      |  14 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |  14 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  11 +
 .../quicklisp-to-nix-output/cl-annot.nix      |  11 +
 .../quicklisp-to-nix-output/cl-anonfun.nix    |  28 +
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |  13 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |  16 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |  29 +
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |  28 +
 .../quicklisp-to-nix-output/cl-async-util.nix |  16 +-
 .../quicklisp-to-nix-output/cl-async.nix      |  17 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |  11 +
 .../quicklisp-to-nix-output/cl-colors.nix     |  11 +
 .../quicklisp-to-nix-output/cl-cookie.nix     |  14 +-
 .../quicklisp-to-nix-output/cl-dbi.nix        |  28 +
 .../quicklisp-to-nix-output/cl-emb.nix        |  11 +
 .../quicklisp-to-nix-output/cl-fad.nix        |  11 +
 .../cl-fuse-meta-fs.nix                       |  12 +
 .../quicklisp-to-nix-output/cl-fuse.nix       |  12 +
 .../quicklisp-to-nix-output/cl-json.nix       |  11 +
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |  11 +
 .../quicklisp-to-nix-output/cl-l10n.nix       |  14 +
 .../quicklisp-to-nix-output/cl-libuv.nix      |  11 +
 .../quicklisp-to-nix-output/cl-markup.nix     |  28 +
 .../quicklisp-to-nix-output/cl-mysql.nix      |  28 +
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  13 +-
 .../quicklisp-to-nix-output/cl-paths.nix      |  17 -
 .../quicklisp-to-nix-output/cl-postgres.nix   |  28 +
 .../cl-ppcre-template.nix                     |  37 +
 .../quicklisp-to-nix-output/cl-ppcre.nix      |  11 +
 .../quicklisp-to-nix-output/cl-project.nix    |  14 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |  11 +
 .../quicklisp-to-nix-output/cl-smtp.nix       |  12 +
 .../quicklisp-to-nix-output/cl-store.nix      |  11 +
 .../cl-syntax-annot.nix                       |  14 +-
 .../cl-syntax-anonfun.nix                     |  29 +
 .../cl-syntax-markup.nix                      |  29 +
 .../quicklisp-to-nix-output/cl-syntax.nix     |  14 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |  28 +
 .../quicklisp-to-nix-output/cl-unicode.nix    |  11 +
 .../cl-unification.nix                        |  14 +
 .../quicklisp-to-nix-output/cl-utilities.nix  |  11 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  13 +-
 .../quicklisp-to-nix-output/cl-who.nix        |  11 +
 .../clack-v1-compat.nix                       |  15 +
 .../quicklisp-to-nix-output/clack.nix         |  15 +
 .../quicklisp-to-nix-output/closer-mop.nix    |  12 +
 .../closure-common.nix                        |  12 +
 .../quicklisp-to-nix-output/clsql.nix         |  13 +
 .../quicklisp-to-nix-output/clss.nix          |  11 +
 .../quicklisp-to-nix-output/clx-truetype.nix  |  13 +
 .../quicklisp-to-nix-output/clx.nix           |  11 +
 .../command-line-arguments.nix                |  11 +
 .../quicklisp-to-nix-output/css-lite.nix      |  11 +
 .../quicklisp-to-nix-output/cxml-dom.nix      |  13 +
 .../quicklisp-to-nix-output/cxml-klacks.nix   |  13 +
 .../quicklisp-to-nix-output/cxml-test.nix     |  15 +-
 .../quicklisp-to-nix-output/cxml-xml.nix      |  16 +-
 .../quicklisp-to-nix-output/cxml.nix          |  11 +
 .../quicklisp-to-nix-output/dbd-mysql.nix     |  29 +
 .../quicklisp-to-nix-output/dbd-postgres.nix  |  29 +
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |  29 +
 .../quicklisp-to-nix-output/dexador.nix       |  11 +
 .../quicklisp-to-nix-output/do-urlencode.nix  |  11 +
 .../documentation-utils.nix                   |  12 +
 .../quicklisp-to-nix-output/drakma.nix        |  14 +-
 .../quicklisp-to-nix-output/esrap.nix         |  11 +
 .../external-program.nix                      |  11 +
 .../quicklisp-to-nix-output/fast-http.nix     |  11 +
 .../quicklisp-to-nix-output/fast-io.nix       |  14 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |  11 +
 .../quicklisp-to-nix-output/form-fiddle.nix   |  11 +
 .../quicklisp-to-nix-output/http-body.nix     |  15 +-
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  29 +
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |  31 +
 .../quicklisp-to-nix-output/hunchentoot.nix   |  17 +
 .../quicklisp-to-nix-output/idna.nix          |  11 +
 .../quicklisp-to-nix-output/iolib.nix         |  13 +
 .../quicklisp-to-nix-output/ironclad.nix      |  11 +
 .../quicklisp-to-nix-output/iterate.nix       |  11 +
 .../quicklisp-to-nix-output/jonathan.nix      |  15 +-
 .../lack-component.nix                        |  17 -
 .../quicklisp-to-nix-output/lack-util.nix     |  17 -
 .../quicklisp-to-nix-output/lack.nix          |  18 +-
 .../quicklisp-to-nix-output/let-plus.nix      |  11 +
 .../quicklisp-to-nix-output/lev.nix           |  11 +
 .../quicklisp-to-nix-output/local-time.nix    |  12 +
 .../quicklisp-to-nix-output/lquery.nix        |  14 +-
 .../quicklisp-to-nix-output/map-set.nix       |  11 +
 .../quicklisp-to-nix-output/marshal.nix       |  11 +
 .../quicklisp-to-nix-output/md5.nix           |  11 +
 .../quicklisp-to-nix-output/metabang-bind.nix |  13 +
 .../quicklisp-to-nix-output/myway.nix         |  14 +-
 .../named-readtables.nix                      |  13 +
 .../quicklisp-to-nix-output/nibbles.nix       |  11 +
 .../quicklisp-to-nix-output/optima.nix        |  13 +-
 .../quicklisp-to-nix-output/parenscript.nix   |  14 +-
 .../quicklisp-to-nix-output/pcall-queue.nix   |  17 -
 .../quicklisp-to-nix-output/pcall.nix         |  13 +-
 .../quicklisp-to-nix-output/plump-dom.nix     |  17 -
 .../quicklisp-to-nix-output/plump-lexer.nix   |  17 -
 .../quicklisp-to-nix-output/plump-parser.nix  |  17 -
 .../quicklisp-to-nix-output/plump.nix         |  13 +-
 .../quicklisp-to-nix-output/proc-parse.nix    |  13 +-
 .../quicklisp-to-nix-output/prove.nix         |  14 +-
 .../quicklisp-to-nix-output/puri.nix          |  11 +
 .../quicklisp-to-nix-output/query-fs.nix      |  13 +
 .../quicklisp-to-nix-output/quri.nix          |  14 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |  11 +
 .../quicklisp-to-nix-output/salza2.nix        |  12 +
 .../quicklisp-to-nix-output/smart-buffer.nix  |  14 +-
 .../split-sequence.nix                        |  12 +
 .../quicklisp-to-nix-output/sqlite.nix        |  28 +
 .../static-vectors.nix                        |  11 +
 .../quicklisp-to-nix-output/stumpwm.nix       |  11 +
 .../quicklisp-to-nix-output/swap-bytes.nix    |  11 +
 .../trivial-backtrace.nix                     |  11 +
 .../trivial-features.nix                      |  11 +
 .../trivial-garbage.nix                       |  11 +
 .../trivial-gray-streams.nix                  |  12 +
 .../trivial-indent.nix                        |  11 +
 .../quicklisp-to-nix-output/trivial-mimes.nix |  11 +
 .../quicklisp-to-nix-output/trivial-types.nix |  11 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |  11 +
 .../quicklisp-to-nix-output/uffi.nix          |  11 +
 .../quicklisp-to-nix-output/uiop.nix          |  11 +
 .../quicklisp-to-nix-output/usocket.nix       |  11 +
 .../quicklisp-to-nix-output/vom.nix           |  11 +
 .../quicklisp-to-nix-output/woo.nix           |  11 +
 .../quicklisp-to-nix-output/wookie.nix        |  11 +
 .../quicklisp-to-nix-output/xmls.nix          |  10 +
 .../quicklisp-to-nix-output/xsubseq.nix       |  11 +
 .../quicklisp-to-nix-output/yason.nix         |  11 +
 .../quicklisp-to-nix-output/zpb-ttf.nix       |  11 +
 .../quicklisp-to-nix-overrides.lisp           |   1 -
 .../quicklisp-to-nix-overrides.nix            |  47 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  34 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 862 ++++++++++--------
 .../quicklisp-to-nix/nix-package.emb          |  13 +-
 .../quicklisp-to-nix/ql-to-nix.lisp           |  29 +-
 167 files changed, 2812 insertions(+), 533 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix

diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
index 01cfca0d1fd..2afdf05546f 100644
--- a/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/doc/asdf/
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
+    ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}
   '';
   meta = {
     inherit (s) version;
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix
index f3da61e286e..0e5c6a40087 100644
--- a/pkgs/development/lisp-modules/asdf/3.1.nix
+++ b/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/doc/asdf/
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
+    ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}
   '';
   meta = {
     inherit (s) version;
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 7e05dfa585a..ef07a65f96b 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/doc/asdf/
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
+    ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}
   '';
   meta = {
     inherit (s) version;
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 2a4fd7f0e39..799fb0b5d69 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -17,8 +17,14 @@ stdenv.mkDerivation {
     echo "$NIX_LISP"
 
     ASDF_OUTPUT_TRANSLATIONS="${asdf}/lib/common-lisp/:$out/lib/common-lisp-compiled/" \
-    NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")"' \
+    NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn 
+        (uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")
+        (asdf:load-system :uiop :force :all)
+        (asdf:load-system :asdf :force :all)
+      )"' \
       "$out/bin/common-lisp.sh" "$NIX_LISP"
+
+    ln -s "$out/lib/common-lisp-compiled"/{asdf/uiop,uiop}
   '';
 
   inherit asdf lisp;
diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
index b2d5308c580..4e582e0d5b0 100644
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@@ -6,7 +6,7 @@ ASDF_OUTPUT_TRANSLATIONS="@asdf@/lib/common-lisp/:@out@/lib/common-lisp-compiled
 addASDFPaths () {
     for j in "$1"/lib/common-lisp/*; do
 	if [ -d "$j" ]; then
-            CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/"
+            CL_SOURCE_REGISTRY="$j/:$CL_SOURCE_REGISTRY"
             if [ -d "$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")" ]; then
               ASDF_OUTPUT_TRANSLATIONS="$j:$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")${ASDF_OUTPUT_TRANSLATIONS:+:}$ASDF_OUTPUT_TRANSLATIONS"
             fi
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 58f4ab6d21d..26851181531 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,4 +1,4 @@
-args @ {stdenv, clwrapper, baseName, testSystem ? baseName, version ? "latest"
+args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
   , propagatedBuildInputs ? []}:
 let 
@@ -10,7 +10,7 @@ let
     echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script"
     echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
     echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
-    echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script"
+    echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$out/lib/common-lisp/${args.baseName}/:$CL_SOURCE_REGISTRY'" >> "$config_script"
     echo "export ASDF_OUTPUT_TRANSLATIONS="\$ASDF_OUTPUT_TRANSLATIONS\''${ASDF_OUTPUT_TRANSLATIONS:+:}"'$out/lib/common-lisp/${args.baseName}/:$out/lib/common-lisp-compiled/${args.baseName}:$ASDF_OUTPUT_TRANSLATIONS'" >> "$config_script"
     test -n "$LD_LIBRARY_PATH" &&
         echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$config_script"
@@ -43,10 +43,12 @@ basePackage = {
     ${deployConfigScript}
     ${deployLaunchScript}
 
-    ${if testSystem != null then ''
-       NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :${testSystem})"' \
+    ${stdenv.lib.concatMapStrings (testSystem: ''
+       CL_SOURCE_REGISTRY= \
+       NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
+             (asdf:compile-system :${testSystem}) (asdf:load-system :${testSystem}))"' \
           "$out/bin/${args.baseName}-lisp-launcher.sh" ""
-    '' else ""}
+    '') testSystems}
 
     eval "$postInstall"
   '';
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 334d801302c..275a6d405c8 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -10,7 +10,7 @@ let lispPackages = rec {
     baseName = "esrap-peg";
     version = "git-20170320";
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
-    deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-unification esrap iterate];
+    deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-ppcre-template cl-unification esrap iterate];
     src = pkgs.fetchgit {
       url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby";
@@ -20,6 +20,7 @@ let lispPackages = rec {
 
   clx-xkeyboard = buildLispPackage rec {
     baseName = "clx-xkeyboard";
+    testSystems = ["xkeyboard"];
     version = "git-20150523";
     description = "CLX support for X Keyboard extensions";
     deps = with (pkgs.quicklispPackagesFor clwrapper); [clx];
@@ -34,6 +35,9 @@ let lispPackages = rec {
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
     version = "2016-01-21";
+
+    testSystems = [];
+
     description = "The Common Lisp package manager";
     deps = [];
     src = pkgs.fetchgit {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
new file mode 100644
index 00000000000..7135766cf95
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''3bmd-ext-tables'';
+  version = ''3bmd-20161204-git'';
+
+  description = ''Extension to 3bmd implementing PHP Markdown Extra style tables'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
+    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-ext-tables[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM 3bmd-ext-tables DESCRIPTION Extension to 3bmd implementing PHP Markdown Extra style tables SHA256
+    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
+    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-ext-tables TESTNAME NIL FILENAME 3bmd-ext-tables DEPS NIL DEPENDENCIES NIL VERSION 3bmd-20161204-git SIBLINGS
+    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
new file mode 100644
index 00000000000..251f7b33b65
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''3bmd-ext-wiki-links'';
+  version = ''3bmd-20161204-git'';
+
+  description = ''example extension to 3bmd implementing simple wiki-style [[links]]'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
+    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-ext-wiki-links[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM 3bmd-ext-wiki-links DESCRIPTION example extension to 3bmd implementing simple wiki-style [[links]] SHA256
+    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
+    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-ext-wiki-links TESTNAME NIL FILENAME 3bmd-ext-wiki-links DEPS NIL DEPENDENCIES NIL VERSION 3bmd-20161204-git
+    SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-youtube-tests 3bmd-youtube 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
new file mode 100644
index 00000000000..802212e3d2f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''3bmd-youtube'';
+  version = ''3bmd-20161204-git'';
+
+  description = ''An extension for 3bmd for embedding YouTube videos'';
+
+  deps = [ args."esrap" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
+    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-youtube[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM 3bmd-youtube DESCRIPTION An extension for 3bmd for embedding YouTube videos SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-youtube TESTNAME NIL FILENAME
+    3bmd-youtube DEPS ((NAME esrap)) DEPENDENCIES (esrap) VERSION 3bmd-20161204-git SIBLINGS
+    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
new file mode 100644
index 00000000000..67ec24a5668
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''3bmd'';
+  version = ''20161204-git'';
+
+  description = ''markdown processor in CL using esrap parser.'';
+
+  deps = [ args."split-sequence" args."esrap" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
+    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS
+    ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
+    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 9a59765aac8..e3a6c52bc00 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/alexandria[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh
+    URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL
+    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 2d28e1d1824..102fd0d4ce5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/anaphora[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL
+    http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora TESTNAME NIL FILENAME
+    anaphora DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index eac6cbd3fd2..9cd1f486af2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/array-utils[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL
+    http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL
+    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index c089b4251c3..ad0931dec0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ args."alexandria" args."babel" args."trivial-gray-streams" ];
+  deps = [ args."trivial-gray-streams" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel-streams[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
+    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME
+    babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS
+    (babel-tests babel)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index ef2ab2b041b..2ae08f2ca60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."alexandria" args."trivial-features" ];
+  deps = [ args."trivial-features" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
+    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS
+    ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 16f5143df4b..e10ee3cfc35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/blackbird[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
+    http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME
+    blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index 2035c90725e..165f2e955ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/bordeaux-threads[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
+    09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5
+    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION
+    v0.8.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 202f3b594c0..bbd50ab7026 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ];
+  deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
@@ -13,5 +13,20 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/caveman[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL
+    http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME
+    caveman DEPS
+    ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre)
+     (NAME cl-emb) (NAME anaphora))
+    DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS
+    (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
new file mode 100644
index 00000000000..7947f1f02cc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-examples'';
+  version = ''cffi_0.18.0'';
+
+  description = ''CFFI Examples'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-examples[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cffi-examples DESCRIPTION CFFI Examples SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-examples TESTNAME NIL FILENAME
+    cffi-examples DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 43c3ced1d8c..51c9046c764 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''The CFFI Groveller'';
 
-  deps = [ args."alexandria" args."cffi" args."cffi-toolchain" ];
+  deps = [ args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-grovel[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
+    DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
new file mode 100644
index 00000000000..be3a8d2087e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-libffi'';
+  version = ''cffi_0.18.0'';
+
+  description = ''Foreign structures by value'';
+
+  deps = [ args."trivial-features" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-libffi[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cffi-libffi DESCRIPTION Foreign structures by value SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-libffi TESTNAME NIL FILENAME cffi-libffi
+    DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION cffi_0.18.0 SIBLINGS
+    (cffi-examples cffi-grovel cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index e762e32a4e0..bca3b17578f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''The CFFI toolchain'';
 
-  deps = [ args."cffi" ];
+  deps = [ ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-toolchain[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-toolchain TESTNAME NIL FILENAME
+    cffi-toolchain DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
new file mode 100644
index 00000000000..3c68d026272
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-uffi-compat'';
+  version = ''cffi_0.18.0'';
+
+  description = ''UFFI Compatibility Layer for CFFI'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-uffi-compat[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-uffi-compat TESTNAME NIL FILENAME
+    cffi-uffi-compat DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 6b564322021..923f6804327 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''The Common Foreign Function Interface'';
 
-  deps = [ args."alexandria" args."babel" args."trivial-features" args."uiop" ];
+  deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
+    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS
+    ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
+    (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c86ccad4d12..1e2588394ed 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chipz[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL
+    http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz TESTNAME NIL FILENAME chipz DEPS
+    NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 30200cdb0b1..f5be78349d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chunga[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
+    http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS
+    ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 482d5f18d1c..73b10972a6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Circularly readable streams for Common Lisp'';
 
-  deps = [ args."fast-io" args."trivial-gray-streams" ];
+  deps = [ args."trivial-gray-streams" args."fast-io" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/circular-streams[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
+    http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams
+    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git
+    SIBLINGS (circular-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 5e68159115f..76f5c61314c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Common Lisp interface to OpenSSL.'';
 
-  deps = [ args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
+  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl+ssl[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs URL
+    http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz MD5 8050639e66800045cb0a43863059e630 NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
+    DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES
+    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20161208-git SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index dd1bccaf9aa..db5cecf3c19 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-aa[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
+    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME
+    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index b8948dff0a5..b00646e96e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-annot[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
+    http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME
+    cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
new file mode 100644
index 00000000000..cd4b5e3cace
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-anonfun'';
+  version = ''20111203-git'';
+
+  description = ''Anonymous function helpers for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
+    sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-anonfun[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-anonfun DESCRIPTION Anonymous function helpers for Common Lisp SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL
+    http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun TESTNAME NIL
+    FILENAME cl-anonfun DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index a0058e1c0d2..c5d76714dd4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''ANSI control string characters, focused on color'';
 
-  deps = [ args."alexandria" args."cl-colors" ];
+  deps = [ args."cl-colors" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ansi-text[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
+    http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL
+    FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index 2638663c955..eb13e385ee8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -3,9 +3,11 @@ rec {
   baseName = ''cl-async-base'';
   version = ''cl-async-20160825-git'';
 
+  testSystems = ["cl-async"];
+
   description = ''Base system for cl-async.'';
 
-  deps = [ args."bordeaux-threads" args."cffi" args."cl-libuv" ];
+  deps = [ args."cl-libuv" args."cffi" args."bordeaux-threads" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
@@ -13,5 +15,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-base[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async
+    FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION
+    cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
new file mode 100644
index 00000000000..2d211eb8d18
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-async-repl'';
+  version = ''cl-async-20160825-git'';
+
+  description = ''REPL integration for CL-ASYNC.'';
+
+  deps = [ args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
+    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-repl[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL
+    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
new file mode 100644
index 00000000000..140b0157d37
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-async-ssl'';
+  version = ''cl-async-20160825-git'';
+
+  description = ''SSL Wrapper around cl-async socket implementation.'';
+
+  deps = [ args."vom" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
+    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-ssl[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL
+    FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index b1f8d9448dd..979cb5ee9b7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -3,9 +3,11 @@ rec {
   baseName = ''cl-async-util'';
   version = ''cl-async-20160825-git'';
 
+  testSystems = ["cl-async"];
+
   description = ''Internal utilities for cl-async.'';
 
-  deps = [ args."cffi" args."cl-async-base" args."cl-libuv" args."cl-ppcre" args."fast-io" args."vom" ];
+  deps = [ args."vom" args."fast-io" args."cl-ppcre" args."cl-libuv" args."cl-async-base" args."cffi" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
@@ -13,5 +15,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-util[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME cl-async
+    FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES
+    (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 2733d9352ba..a2ea0c38bf5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Asynchronous operations for Common Lisp.'';
 
-  deps = [ args."babel" args."cffi" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" ];
+  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-features" args."static-vectors" args."cl-ppcre" args."cl-libuv" args."cl-async-util" args."cl-async-base" args."cffi" args."babel" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
@@ -13,5 +13,20 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME
+    cl-async DEPS
+    ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util)
+     (NAME cl-async-base) (NAME cffi) (NAME babel))
+    DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git
+    SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 8926f34db59..c2799e37e2e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-base64[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support. SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL
+    http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 TESTNAME NIL FILENAME
+    cl-base64 DEPS NIL DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 60db32f7245..710799e095c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-colors[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
+    http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME
+    cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index b9109b828b5..cbfb425eee1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''HTTP cookie manager'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."local-time" args."proc-parse" args."quri" ];
+  deps = [ args."quri" args."proc-parse" args."local-time" args."cl-ppcre" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cookie[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
+    http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME
+    cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES
+    (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
new file mode 100644
index 00000000000..d7798a6eb1f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-dbi'';
+  version = ''20170124-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
+    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-dbi[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME cl-dbi TESTNAME NIL FILENAME cl-dbi
+    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index b1db2691ecd..f2aab01ef5e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-emb[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL
+    http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb
+    DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 152b7eb5d33..f731a13e782 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fad[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
+    http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS
+    ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 8bd039bb7af..35fb1fbc073 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse-meta-fs[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
+    http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs
+    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES
+    (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 081a1a5dfb7..01c01c57bb8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
+    http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME
+    cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8))
+    DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index aff77cb559b..a89a341715c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-json[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-json DESCRIPTION JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format. SHA256
+    00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz MD5
+    9d873fa462b93c76d90642d8e3fb4881 NAME cl-json TESTNAME NIL FILENAME cl-json DEPS NIL DEPENDENCIES NIL VERSION 20141217-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index e0960eb4071..463232d1419 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n-cldr[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-l10n-cldr DESCRIPTION The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way. SHA256
+    03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz MD5
+    466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr TESTNAME NIL FILENAME cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 220467242a9..9c8c1cc05b2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -13,5 +13,19 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
+    http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME
+    cl-l10n DEPS
+    ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time)
+     (NAME metabang-bind))
+    DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 1db65ecc513..bc45a29b4b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-libuv[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
+    http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME
+    cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
new file mode 100644
index 00000000000..93de92d71f6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-markup'';
+  version = ''20131003-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
+    sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markup[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-markup DESCRIPTION NIL SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL
+    http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup TESTNAME NIL FILENAME
+    cl-markup DEPS NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
new file mode 100644
index 00000000000..7aed84cec64
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-mysql'';
+  version = ''20160628-git'';
+
+  description = ''Common Lisp MySQL library bindings'';
+
+  deps = [ args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
+    sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-mysql[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
+    http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME
+    cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 2da3ff06180..e2fd4222b51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ args."cl-paths" args."zpb-ttf" ];
+  deps = [ args."zpb-ttf" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-paths-ttf[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
+    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL
+    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
deleted file mode 100644
index 0eb72064674..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cl-paths'';
-  version = ''cl-vectors-20150407-git'';
-
-  description = ''cl-paths: vectorial paths manipulation'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
new file mode 100644
index 00000000000..76fe21bfb76
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-postgres'';
+  version = ''postmodern-20170124-git'';
+
+  description = ''Low-level client library for PostgreSQL'';
+
+  deps = [ args."md5" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-01-24/postmodern-20170124-git.tgz'';
+    sha256 = ''1hdgdpkba225xqvpsr7r1j78cx0ha23x6f69ab2666plpyw321k8'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-postgres[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1hdgdpkba225xqvpsr7r1j78cx0ha23x6f69ab2666plpyw321k8 URL
+    http://beta.quicklisp.org/archive/postmodern/2017-01-24/postmodern-20170124-git.tgz MD5 d19b368a8883093f20a47be83709b0c5 NAME cl-postgres TESTNAME NIL
+    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170124-git SIBLINGS (postmodern s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
new file mode 100644
index 00000000000..ef75212c0f9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-ppcre-template'';
+  version = ''cl-unification-20170124-git'';
+
+  description = ''A system used to conditionally load the CL-PPCRE Template.
+
+This system is not required and it is handled only if CL-PPCRE is
+available.  If it is, then the library provides the
+REGULAR-EXPRESSION-TEMPLATE.'';
+
+  deps = [ args."cl-ppcre" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
+    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-template[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-ppcre-template DESCRIPTION A system used to conditionally load the CL-PPCRE Template.
+
+This system is not required and it is handled only if CL-PPCRE is
+available.  If it is, then the library provides the
+REGULAR-EXPRESSION-TEMPLATE.
+    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
+    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
+    cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index d9eef7b0846..6bcd357bfc4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre TESTNAME NIL FILENAME cl-ppcre
+    DEPS NIL DEPENDENCIES NIL VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 66a0cf743ae..eeb4d4023e2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Generate a skeleton for modern project'';
 
-  deps = [ args."cl-emb" args."cl-ppcre" args."local-time" args."prove" args."uiop" ];
+  deps = [ args."uiop" args."prove" args."local-time" args."cl-ppcre" args."cl-emb" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-project[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
+    http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL
+    FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb)
+    VERSION 20160531-git SIBLINGS (cl-project-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index f8e50f167bb..303ed95f662 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-reexport[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
+    http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL
+    FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 7471c8ba82c..6ef4a185475 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-smtp[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
+    http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME
+    cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES
+    (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index ebc8a989edf..667f644b33c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-store[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL
+    http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store TESTNAME NIL FILENAME
+    cl-store DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index 887e9366011..533e48b189f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''CL-Syntax Reader Syntax for cl-annot'';
 
-  deps = [ args."cl-annot" args."cl-syntax" ];
+  deps = [ args."cl-annot" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-annot[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL
+    FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
new file mode 100644
index 00000000000..d6ee6e602e7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-syntax-anonfun'';
+  version = ''cl-syntax-20150407-git'';
+
+  description = ''CL-Syntax Reader Syntax for cl-anonfun'';
+
+  deps = [ args."cl-anonfun" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-anonfun[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL
+    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
new file mode 100644
index 00000000000..4af6c8a19f8
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-syntax-markup'';
+  version = ''cl-syntax-20150407-git'';
+
+  description = ''CL-Syntax Reader Syntax for CL-Markup'';
+
+  deps = [ args."cl-markup" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-markup[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL
+    FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 1458a3566c3..4ad90aeb5ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
 
-  deps = [ args."named-readtables" args."trivial-types" ];
+  deps = [ args."trivial-types" args."named-readtables" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME
+    cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
new file mode 100644
index 00000000000..65681df3e2d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-test-more'';
+  version = ''prove-20170124-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz'';
+    sha256 = ''1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-test-more[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03 URL
+    http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz MD5 c5601ee1aebedc7272e2c25e6a5ca8be NAME cl-test-more TESTNAME NIL FILENAME
+    cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170124-git SIBLINGS (prove-asdf prove-test prove)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index f34904fef67..e67a8e36994 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
+    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME
+    cl-unicode DEPS NIL DEPENDENCIES NIL VERSION 0.1.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 868c3c8e182..059d9f1abee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -15,5 +15,19 @@ The system contains the definitions for the 'unification' machinery.'';
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unification[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
+
+The system contains the definitions for the 'unification' machinery.
+    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
+    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    (cl-unification-lib cl-unification-test cl-ppcre-template)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index c253fa87c75..5e6ee119874 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-utilities[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
+    http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities TESTNAME NIL
+    FILENAME cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index 2f203e1317c..9ac50b75557 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''cl-paths: vectorial paths manipulation'';
 
-  deps = [ args."cl-aa" args."cl-paths" ];
+  deps = [ ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-vectors[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
+    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL
+    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 0dc90c2579e..2f8923206c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-who[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL
+    http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who TESTNAME NIL FILENAME cl-who DEPS NIL
+    DEPENDENCIES NIL VERSION 1.1.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 9e70252554e..af1f2c8b8fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -13,5 +13,20 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-v1-compat[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x URL
+    http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz MD5 2264b62c2de992d12829053e8e5f9101 NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170227-git SIBLINGS
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
+     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 2b2f0f92f76..5fd364a5879 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -13,5 +13,20 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x URL
+    http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz MD5 2264b62c2de992d12829053e8e5f9101 NAME clack TESTNAME NIL FILENAME clack DEPS
+    NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
+     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index b2c2db32f76..725d2544e6b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closer-mop[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM closer-mop DESCRIPTION
+    Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
+    SHA256 1hdnbryh6gd8kn20yr5ldgkcs8i71c6awwf6a32nmp9l42gwv9k3 URL http://beta.quicklisp.org/archive/closer-mop/2017-02-27/closer-mop-20170227-git.tgz MD5
+    fb511369eb416a4cc8335db79d0ec4b2 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index be36d5c05c7..9dccf964a26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closure-common[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
+    http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common
+    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git
+    SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 040f7987af0..a0f0ad2a035 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clsql[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
+    http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS
+    ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
+    (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests
+     clsql-uffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index ac965df6e47..701f98eec15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clss[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL
+    http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS
+    ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 13ee7781c92..c5930fe0b15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx-truetype[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256
+    0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5
+    7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS
+    ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES
+    (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 7b42b7c729b..5e24696e8c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL
+    http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1d18be3ea83..9c13409fe7d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/command-line-arguments[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL
+    http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME
+    command-line-arguments TESTNAME NIL FILENAME command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 4c7e53dee73..fc1b09601de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/css-lite[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM css-lite DESCRIPTION NIL SHA256 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
+    http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite TESTNAME NIL FILENAME
+    css-lite DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 270cf0d9f4a..9b7bced0d90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''cxml-dom'';
   version = ''cxml-20110619-git'';
 
+  testSystems = ["cxml"];
+
   description = '''';
 
   deps = [ args."cxml-xml" ];
@@ -13,5 +15,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-dom[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom
+    DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index 6d89a60baca..e54cffb0ec4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''cxml-klacks'';
   version = ''cxml-20110619-git'';
 
+  testSystems = ["cxml"];
+
   description = '''';
 
   deps = [ args."cxml-xml" ];
@@ -13,5 +15,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-klacks[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME
+    cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index 9352cd1650a..ddf0dfab841 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -3,9 +3,11 @@ rec {
   baseName = ''cxml-test'';
   version = ''cxml-20110619-git'';
 
+  testSystems = ["cxml"];
+
   description = '''';
 
-  deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-xml" ];
+  deps = [ args."cxml-xml" args."cxml-klacks" args."cxml-dom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
@@ -13,5 +15,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-test[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME
+    cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 116a1fba7f7..1ac10de31d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -3,9 +3,11 @@ rec {
   baseName = ''cxml-xml'';
   version = ''cxml-20110619-git'';
 
+  testSystems = ["cxml"];
+
   description = '''';
 
-  deps = [ args."closure-common" args."puri" args."trivial-gray-streams" ];
+  deps = [ args."trivial-gray-streams" args."puri" args."closure-common" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
@@ -13,5 +15,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-xml[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml
+    DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git
+    SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 3d579753893..89513dd9a38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS
+    ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
new file mode 100644
index 00000000000..3f05586200d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbd-mysql'';
+  version = ''cl-dbi-20170124-git'';
+
+  description = ''Database driver for MySQL.'';
+
+  deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
+    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-mysql[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME
+    dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git
+    SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
new file mode 100644
index 00000000000..cc30e7aafce
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbd-postgres'';
+  version = ''cl-dbi-20170124-git'';
+
+  description = ''Database driver for PostgreSQL.'';
+
+  deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
+    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-postgres[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME
+    dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES
+    (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
new file mode 100644
index 00000000000..deb018bbc8a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbd-sqlite3'';
+  version = ''cl-dbi-20170124-git'';
+
+  description = ''Database driver for SQLite3.'';
+
+  deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
+    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-sqlite3[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME
+    dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION
+    cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 2026fdea0dd..c5c823422fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dexador[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0fc3hlckxfwz1ymindb9p44c6idfz8z6w5zk8cbd4nvvd0f2a8kz URL
+    http://beta.quicklisp.org/archive/dexador/2017-02-27/dexador-20170227-git.tgz MD5 87895012728d97cf37366c3e4b96fcee NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index eb10795d055..5da87698061 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/do-urlencode[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
+    http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL
+    FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 4adc20dd002..0fca95c1e9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/documentation-utils[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
+    0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL
+    http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME
+    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index b1dd76536c1..0cc14057d51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Full-featured http/https client based on usocket'';
 
-  deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ];
+  deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/drakma[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL
+    http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS
+    ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES
+    (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index f3f217d545a..6ca810098d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/esrap[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL
+    http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS
+    ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 5fb808f64c3..c716e9a35ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/external-program[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
+    http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program
+    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 7bd25dda403..17255e56a26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-http[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx URL
+    http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz MD5 5c5e2073702e7504a30c739e25c47c69 NAME fast-http TESTNAME NIL FILENAME
+    fast-http DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (fast-http-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 22616f75adc..8dddfd65f01 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ];
+  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-io[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL
+    http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME
+    fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION
+    20170124-git SIBLINGS (fast-io-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 26a7ce83f7f..4f7f8927919 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/flexi-streams[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
+    http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL
+    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index aa2fbb70282..354055aa112 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/form-fiddle[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL
+    http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL
+    FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 2c361812da6..dd7a876a28d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''HTTP POST data parser for Common Lisp'';
 
-  deps = [ args."babel" args."cl-ppcre" args."cl-utilities" args."fast-http" args."flexi-streams" args."jonathan" args."quri" args."trivial-gray-streams" ];
+  deps = [ args."trivial-gray-streams" args."quri" args."jonathan" args."flexi-streams" args."fast-http" args."cl-utilities" args."cl-ppcre" args."babel" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/http-body[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
+    http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME
+    http-body DEPS
+    ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel))
+    DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
new file mode 100644
index 00000000000..2ea3132e6fe
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu.dwim.asdf'';
+  version = ''20151218-darcs'';
+
+  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+
+  deps = [ args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2015-12-18/hu.dwim.asdf-20151218-darcs.tgz'';
+    sha256 = ''18qdysv7zd2avdl8lc3gbnif8crjn0qs45fmnw8hia4dmd71k0k4'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
+    18qdysv7zd2avdl8lc3gbnif8crjn0qs45fmnw8hia4dmd71k0k4 URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2015-12-18/hu.dwim.asdf-20151218-darcs.tgz MD5
+    68ada32eb844abd8e2e6bc029126fa5f NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20151218-darcs
+    SIBLINGS (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
new file mode 100644
index 00000000000..d7d6bf5611e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu.dwim.def'';
+  version = ''20161204-darcs'';
+
+  description = ''General purpose, homogenous, extensible definer macro.'';
+
+  deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz'';
+    sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES
+    (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS
+    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
+     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index eafcffa9b1b..b38796148a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -16,5 +16,22 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hunchentoot[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM hunchentoot DESCRIPTION Hunchentoot is a HTTP server based on USOCKET and
+  BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
+  simple framework for user-defined handlers and can be extended
+  through subclassing.
+    SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5
+    d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
+    ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388)
+     (NAME trivial-backtrace) (NAME usocket))
+    DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 2a36fa821f0..7e2f33ddfa9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/idna[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c
+    URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS
+    ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index a6b5574b119..5a5f1c8c34c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL
+    http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS
+    ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features)
+     (NAME uiop))
+    DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 4f8f9e02752..af1cbc8f1b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ironclad[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL
+    http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad
+    DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 1eb9b549287..b3ec955fead 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iterate[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL
+    http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate TESTNAME NIL FILENAME
+    iterate DEPS NIL DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 055d9eebc23..e3cfd9047b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."proc-parse" args."trivial-types" ];
+  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz'';
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/jonathan[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
+    1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5
+    f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
+    ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES
+    (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
deleted file mode 100644
index 1116efadc5a..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-component'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
deleted file mode 100644
index 20d920dfad5..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-util'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."ironclad" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 330c696a66a..7f1f4899f04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''A minimal Clack'';
 
-  deps = [ args."lack-component" args."lack-util" ];
+  deps = [ ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
@@ -13,5 +13,21 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
+    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack TESTNAME NIL FILENAME lack DEPS NIL
+    DEPENDENCIES NIL VERSION 20161204-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack-util t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace
+     t-lack-middleware-csrf t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi
+     t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 1dfc69ea6d8..07b106dde99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/let-plus[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
+    http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME
+    let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9aaae650190..8ccb243d1af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lev[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
+    http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS
+    ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 8e3ea32d75b..65ffbf88233 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/local-time[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
+    0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5
+    b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS
+    (cl-postgres+local-time local-time.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 4432119493a..068d0b9b1e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ];
+  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lquery[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL
+    http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery
+    DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS
+    (lquery-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index ac55a3bbbef..d2545b9a269 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/map-set[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL
+    http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set TESTNAME NIL FILENAME
+    map-set DEPS NIL DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index b15949ad6ec..ed49719ecf6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/marshal[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL
+    http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal TESTNAME NIL FILENAME
+    marshal DEPS NIL DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 9450a0431ab..e568fd1cce8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/md5[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL
+    http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 5e824e69186..e585c2bd298 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metabang-bind[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM metabang-bind DESCRIPTION
+    Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. SHA256
+    1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz MD5
+    20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind TESTNAME NIL FILENAME metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    (metabang-bind-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 92d2c10c3be..477d54f1c81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Sinatra-compatible routing library.'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" ];
+  deps = [ args."quri" args."map-set" args."cl-utilities" args."cl-ppcre" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/myway[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
+    http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS
+    ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION
+    20150302-git SIBLINGS (myway-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 24edc30f20b..a5a8e79c2ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -14,5 +14,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/named-readtables[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable
+  akin to the namespace of packages.
+    SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL
+    http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables
+    TESTNAME NIL FILENAME named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 83c2b5a7bc2..607a8e54d67 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/nibbles[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders SHA256
+    06cdnivq2966crpj8pidqmwagaif848yvq4fjqq213f3wynwknh4 URL http://beta.quicklisp.org/archive/nibbles/2016-12-04/nibbles-20161204-git.tgz MD5
+    a342eb0426be2570c18151ef8742dad3 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index f73e6ea083b..5b04344c635 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Optimized Pattern Matching Library'';
 
-  deps = [ args."alexandria" args."closer-mop" ];
+  deps = [ args."closer-mop" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/optima[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
+    http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima
+    DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 3307536bb75..01d1b384b26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Lisp to JavaScript transpiler'';
 
-  deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
+  deps = [ args."named-readtables" args."cl-ppcre" args."anaphora" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parenscript[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
+    http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME
+    parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6
+    SIBLINGS (parenscript.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
deleted file mode 100644
index f834554de95..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''pcall-queue'';
-  version = ''pcall-0.3'';
-
-  description = '''';
-
-  deps = [ args."bordeaux-threads" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
-    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index f8a61f5b87d..4d42a9a49b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -5,7 +5,7 @@ rec {
 
   description = '''';
 
-  deps = [ args."bordeaux-threads" args."pcall-queue" ];
+  deps = [ args."bordeaux-threads" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pcall[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
+    http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS
+    ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
deleted file mode 100644
index aed7c42b681..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''plump-dom'';
-  version = ''plump-20170124-git'';
-
-  description = ''A DOM for use with the Plump parser.'';
-
-  deps = [ args."array-utils" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
deleted file mode 100644
index fe975e9f52d..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''plump-lexer'';
-  version = ''plump-20170124-git'';
-
-  description = ''A very simple toolkit to help with lexing used mainly in Plump.'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
deleted file mode 100644
index 941924d461e..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''plump-parser'';
-  version = ''plump-20170124-git'';
-
-  description = ''Plump's core parser component.'';
-
-  deps = [ args."plump-dom" args."plump-lexer" args."trivial-indent" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
-  };
-
-  overrides = x: {
-  };
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 5410889987b..5d6e7a34a35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
-  deps = [ args."plump-dom" args."plump-lexer" args."plump-parser" ];
+  deps = [ ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/plump[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x
+    URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump
+    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 1c42d0688e2..4d79313d983 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Procedural vector parser'';
 
-  deps = [ args."alexandria" args."babel" ];
+  deps = [ args."babel" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/proc-parse[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
+    http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL
+    FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 0cf49862065..32c10118f3c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -5,7 +5,7 @@ rec {
 
   description = '''';
 
-  deps = [ args."alexandria" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."uiop" ];
+  deps = [ args."uiop" args."cl-ppcre" args."cl-colors" args."cl-ansi-text" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/prove[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM prove DESCRIPTION NIL SHA256 1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03 URL
+    http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz MD5 c5601ee1aebedc7272e2c25e6a5ca8be NAME prove TESTNAME NIL FILENAME prove DEPS
+    ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION
+    20170124-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 7f219ba6a9a..b6ef82f9520 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/puri[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL
+    http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5 3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri TESTNAME NIL FILENAME puri DEPS NIL
+    DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 087be682f5d..51ff8bdb022 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -13,5 +13,18 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/query-fs[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256
+    0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5
+    dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS
+    ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace))
+    DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index aea88cf61ef..1eb40822b9c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Yet another URI library for Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" ];
+  deps = [ args."split-sequence" args."cl-utilities" args."babel" args."alexandria" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/quri[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
+    http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS
+    ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git
+    SIBLINGS (quri-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 56c2d630c4d..290850ced7d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/rfc2388[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
+    http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 TESTNAME NIL FILENAME
+    rfc2388 DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 19c5d84a26b..963133feb8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -14,5 +14,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/salza2[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM salza2 DESCRIPTION Create compressed data in the ZLIB, DEFLATE, or GZIP
+  data formats
+    SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5
+    e62383de435081c0f1f888ec363bb32c NAME salza2 TESTNAME NIL FILENAME salza2 DEPS NIL DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 5f0f316dda4..1a610eaacbe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Smart octets buffer'';
 
-  deps = [ args."flexi-streams" args."uiop" args."xsubseq" ];
+  deps = [ args."xsubseq" args."uiop" args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/smart-buffer[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
+    http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL
+    FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS
+    (smart-buffer-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 70ec5445735..b6f1d8ec966 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -14,5 +14,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/split-sequence[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences
+  delimited by objects satisfying a test.
+    SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz MD5
+    194e24d60f0fba70a059633960052e21 NAME split-sequence TESTNAME NIL FILENAME split-sequence DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
new file mode 100644
index 00000000000..c514fd81576
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''sqlite'';
+  version = ''cl-20130615-git'';
+
+  description = '''';
+
+  deps = [ args."cffi" args."iterate" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
+    sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/sqlite[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
+    http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME
+    sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 7e0b5231ea3..879d2c3e815 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/static-vectors[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
+    http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL
+    FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 20a57e86967..529f989c5b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/stumpwm[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz MD5 076f2ec967024fcabc13eb921e6ce7c2 NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index ab003701039..6f8cf8c2a2a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/swap-bytes[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
+    http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME
+    swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 36de0955f55..e9c8ba354e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-backtrace[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL
+    http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz MD5 a3b41b4ae24e3fde303a2623201aac4d NAME
+    trivial-backtrace TESTNAME NIL FILENAME trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS (trivial-backtrace-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 4c8c7db0b0b..d1ccd2ea2c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-features[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL
+    http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features
+    TESTNAME NIL FILENAME trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS (trivial-features-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index f8f77eaee39..3aeb11fdf9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-garbage[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL
+    http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage
+    TESTNAME NIL FILENAME trivial-garbage DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 2a2a9be1b85..80ca1d6ea9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -13,5 +13,17 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-gray-streams[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). SHA256
+    1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL
+    http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME
+    trivial-gray-streams TESTNAME NIL FILENAME trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git SIBLINGS (trivial-gray-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d0e61f55abf..18cfe65db37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-indent[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir
+    URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent
+    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 717d9d3d3ca..96474552828 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-mimes[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME
+    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 93bfedd45bf..4f9851247eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-types[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-types DESCRIPTION Trivial type definitions SHA256 0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL
+    http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types TESTNAME
+    NIL FILENAME trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index d666f2382a3..814f4c1a6dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-utf-8[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
+    http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8
+    TESTNAME NIL FILENAME trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 30831df086f..382df53eeb0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uffi[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy URL
+    http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz MD5 84babed7d1633cf01610e81f027024da NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL
+    DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (uffi-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 6dbbcbe20ef..a1ad7daf179 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uiop[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM uiop DESCRIPTION Portability library for Common Lisp programs SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
+    http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 4fe40ae2495..d88c0a84749 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/usocket[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
+    http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket
+    DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index d8a429b1392..5563786b07e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/vom[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM vom DESCRIPTION A tiny logging utility. SHA256 0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL
+    http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5 ad16bdc0221b08de371be6ce25ce3d47 NAME vom TESTNAME NIL FILENAME vom DEPS NIL
+    DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index c9624b2a5f2..dce3e50c192 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/woo[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1 URL
+    http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz MD5 cc37270ad408e093bd28c025466d8f64 NAME woo TESTNAME NIL FILENAME woo DEPS NIL
+    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (clack-handler-woo woo-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 3e91bd9eb6c..9efaa93d2bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/wookie[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL
+    http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie
+    DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index ce0ae7043a7..564477d84d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -13,5 +13,15 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xmls[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM xmls DESCRIPTION NIL SHA256 1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz
+    MD5 697c9f49a60651b759e24ea0c1eb1cfe NAME xmls TESTNAME NIL FILENAME xmls DEPS NIL DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index f433eb8cfd8..59a92bb04a2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xsubseq[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL
+    http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq TESTNAME NIL FILENAME
+    xsubseq DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 7917646810c..5d346aef40b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/yason[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
+    http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS
+    ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index ad347623618..1bbf51cbda5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -13,5 +13,16 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/zpb-ttf[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* (SYSTEM zpb-ttf DESCRIPTION Access TrueType font metrics and outlines from Common Lisp SHA256 1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL
+    http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5 1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf TESTNAME NIL FILENAME zpb-ttf DEPS
+    NIL DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
index f03c34f5331..7b11b6b0b9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
@@ -1,4 +1,3 @@
-(defparameter testnames (make-hash-table :test 'equal))
 (setf
   (gethash "cxml-xml" testnames) "cxml"
   (gethash "cxml-dom" testnames) "cxml"
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index f4ccf19d2d9..01f734538b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,4 +1,4 @@
-{pkgs, buildLispPackage, quicklisp-to-nix-packages}:
+{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
 let
   addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
@@ -31,6 +31,8 @@ in
     flexi-streams circular-streams ironclad cl-syntax-annot alexandria
     split-sequence
   ]);
+  clack-handler-fcgi = addDeps (with qlnp; []);
+  lack = addDeps (with qlnp; [ironclad]);
   cxml = skipBuildPhase;
   cxml-xml = skipBuildPhase;
   cxml-dom = skipBuildPhase;
@@ -38,7 +40,7 @@ in
   cxml-test = skipBuildPhase;
   wookie = multiOverride [(addDeps (with qlnp; [
       alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
-      cl-fad fast-io vom do-urlencode
+      cl-fad fast-io vom do-urlencode cl-async-ssl
     ])) 
     (addNativeLibs (with pkgs; [libuv openssl]))];
   woo = addDeps (with qlnp; [
@@ -57,10 +59,15 @@ in
   "cl+ssl" = addNativeLibs [pkgs.openssl];
   cl-colors = skipBuildPhase;
   cl-libuv = addNativeLibs [pkgs.libuv];
+  cl-async = addDeps (with qlnp; [cl-async-base]);
+  cl-async-ssl = multiOverride [(addDeps (with qlnp; [cl-async-base]))
+    (addNativeLibs [pkgs.openssl])];
+  cl-async-repl = addDeps (with qlnp; [cl-async]);
   cl-async-base = addDeps (with qlnp; [
     cffi fast-io vom cl-libuv cl-ppcre trivial-features static-vectors
     trivial-gray-streams babel
   ]);
+  cl-async-util = addDeps (with qlnp; [ cl-async-base ]);
   css-lite = addDeps (with qlnp; [parenscript]);
   clsql = x: {
     propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];
@@ -75,7 +82,7 @@ in
   query-fs = x: {
     overrides = y: (x.overrides y) // {
       linkedSystems = [];
-      postInstall = ''
+      postInstall = ((x.overrides y).postInstall or "") + ''
         export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
 	export HOME=$PWD
 	build-with-lisp.sh sbcl \
@@ -85,4 +92,38 @@ in
       '';
     };
   };
+  cffi-grovel = addDeps (with qlnp; [ cffi-toolchain ]);
+  cffi-toolchain = addDeps (with qlnp; [ cffi uiop ]);
+  cffi-examples = addDeps (with qlnp; [ cffi ]);
+  cffi-libffi = addDeps (with qlnp; [ cffi ]);
+  cffi-uffi-compat = addDeps (with qlnp; [ cffi ]);
+  cffi = multiOverride [(addNativeLibs [pkgs.libffi])
+    (addDeps (with qlnp; [uffi]))];
+  cl-vectors = addDeps (with qlnp; [zpb-ttf]);
+  "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
+  "3bmd-ext-tables" = addDeps (with qlnp; [qlnp."3bmd"]);
+  "3bmd-ext-wiki-links" = addDeps (with qlnp; [qlnp."3bmd"]);
+  "3bmd-youtube" = addDeps (with qlnp; [qlnp."3bmd"]);
+  cl-dbi = addDeps (with qlnp; [
+    cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
+  ]);
+  dbd-sqlite3 = addDeps (with qlnp; [cl-dbi]);
+  dbd-postgres = addDeps (with qlnp; [cl-dbi]);
+  dbd-mysql = addDeps (with qlnp; [cl-dbi]);
+  cl-mysql = addNativeLibs [pkgs.mysql];
+  cl-ppcre-template = x: {
+    overrides = y: (x.overrides y) // {
+      postPatch = ''
+        ln -s lib-dependent/*.asd .
+      '';
+    };
+  };
+  cl-unification = addDeps (with qlnp; [cl-ppcre]);
+  cl-syntax-annot = addDeps (with qlnp; [cl-syntax]);
+  cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]);
+  cl-syntax-markup = addDeps (with qlnp; [cl-syntax]);
+  cl-test-more = addDeps (with qlnp; [prove]);
+  babel-streams = addDeps (with qlnp; [babel]);
+  plump = addDeps (with qlnp; [array-utils trivial-indent]);
+  sqlite = addNativeLibs [pkgs.sqlite];
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 581ccf77d99..8522ed79c56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,35 +1,64 @@
+3bmd
+3bmd-ext-tables
+3bmd-ext-wiki-links
+3bmd-youtube
 alexandria
 babel
 blackbird
 bordeaux-threads
 caveman
 cffi
+cffi-examples
+cffi-grovel
+cffi-libffi
+cffi-toolchain
+cffi-uffi-compat
 chipz
 circular-streams
 clack
+clack-v1-compat
 cl-async
+cl-async-base
+cl-async-repl
+cl-async-ssl
 cl-base64
+cl-colors
 cl-cookie
+cl-dbi
+cl-emb
 cl-fuse
 cl-fuse-meta-fs
 cl-json
 cl-l10n
+cl-libuv
+cl-mysql
 closer-mop
 cl-ppcre
+cl-ppcre-template
 cl-reexport
 cl-smtp
+clsql
+cl+ssl
 cl-syntax-annot
+cl-syntax-anonfun
+cl-syntax-markup
+cl-test-more
 cl-unicode
 cl-unification
 cl-utilities
+cl-vectors
 cl-who
-clsql
 clx
 clx-truetype
 command-line-arguments
-parenscript
 css-lite
 cxml
+cxml-dom
+cxml-klacks
+cxml-xml
+dbd-mysql
+dbd-postgres
+dbd-sqlite3
 dexador
 drakma
 esrap
@@ -38,6 +67,7 @@ fast-http
 fast-io
 flexi-streams
 http-body
+hu.dwim.def
 hunchentoot
 iolib
 ironclad
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 672dda1b096..a4b6c90aa08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,26 +6,6 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "closure-common" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closure-common" or (x: {}))
-       (import ./quicklisp-to-nix-output/closure-common.nix {
-         inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "let-plus" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."let-plus" or (x: {}))
-       (import ./quicklisp-to-nix-output/let-plus.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-       }));
-
-
   "trivial-indent" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-indent" or (x: {}))
@@ -43,39 +23,13 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cxml-xml" = buildLispPackage
+  "babel-streams" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cxml-xml" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-xml.nix {
+       (qlOverrides."babel-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-           "puri" = quicklisp-to-nix-packages."puri";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "cl-paths" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-paths" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-paths.nix {
-         inherit fetchurl;
-       }));
-
-
-  "trivial-garbage" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-garbage" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cffi-toolchain" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-toolchain" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
-         inherit fetchurl;
-           "cffi" = quicklisp-to-nix-packages."cffi";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -87,80 +41,29 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "babel-streams" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."babel-streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/babel-streams.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "cl-colors" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-colors" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-colors.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "let-plus" = quicklisp-to-nix-packages."let-plus";
-       }));
-
-
   "cl-ansi-text" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-ansi-text" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ansi-text.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
-  "plump-parser" = buildLispPackage
+  "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."plump-parser" or (x: {}))
-       (import ./quicklisp-to-nix-output/plump-parser.nix {
-         inherit fetchurl;
-           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
-           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
-       }));
-
-
-  "plump-lexer" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."plump-lexer" or (x: {}))
-       (import ./quicklisp-to-nix-output/plump-lexer.nix {
+       (qlOverrides."named-readtables" or (x: {}))
+       (import ./quicklisp-to-nix-output/named-readtables.nix {
          inherit fetchurl;
        }));
 
 
-  "plump-dom" = buildLispPackage
+  "array-utils" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."plump-dom" or (x: {}))
-       (import ./quicklisp-to-nix-output/plump-dom.nix {
+       (qlOverrides."array-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/array-utils.nix {
          inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-       }));
-
-
-  "pcall-queue" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."pcall-queue" or (x: {}))
-       (import ./quicklisp-to-nix-output/pcall-queue.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-       }));
-
-
-  "form-fiddle" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."form-fiddle" or (x: {}))
-       (import ./quicklisp-to-nix-output/form-fiddle.nix {
-         inherit fetchurl;
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
        }));
 
 
@@ -174,28 +77,12 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "array-utils" = buildLispPackage
+  "form-fiddle" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."array-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/array-utils.nix {
-         inherit fetchurl;
-       }));
-
-
-  "lack-util" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-       }));
-
-
-  "lack-component" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-component" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-component.nix {
+       (qlOverrides."form-fiddle" or (x: {}))
+       (import ./quicklisp-to-nix-output/form-fiddle.nix {
          inherit fetchurl;
+           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
        }));
 
 
@@ -241,27 +128,28 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "hu.dwim.asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu.dwim.asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "jonathan" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."jonathan" or (x: {}))
        (import ./quicklisp-to-nix-output/jonathan.nix {
          inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-       }));
-
-
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
-         inherit fetchurl;
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "babel" = quicklisp-to-nix-packages."babel";
        }));
 
 
@@ -274,40 +162,51 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "sqlite" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."sqlite" or (x: {}))
+       (import ./quicklisp-to-nix-output/sqlite.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+       }));
+
+
+  "cl-postgres" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-postgres" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-postgres.nix {
+         inherit fetchurl;
+           "md5" = quicklisp-to-nix-packages."md5";
+       }));
+
+
+  "closure-common" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closure-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-common.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "cxml-test" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml-test" or (x: {}))
        (import ./quicklisp-to-nix-output/cxml-test.nix {
          inherit fetchurl;
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
-  "cxml-klacks" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-klacks" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
-  "cxml-dom" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-dom" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-dom.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
-  "named-readtables" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."named-readtables" or (x: {}))
-       (import ./quicklisp-to-nix-output/named-readtables.nix {
-         inherit fetchurl;
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
        }));
 
 
@@ -319,16 +218,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl-vectors" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-vectors" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-vectors.nix {
-         inherit fetchurl;
-           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
-           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
-       }));
-
-
   "cl-store" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-store" or (x: {}))
@@ -342,7 +231,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
-           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
            "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
@@ -355,10 +243,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "uffi" = buildLispPackage
+  "cl-markup" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."uffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/uffi.nix {
+       (qlOverrides."cl-markup" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-markup.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-anonfun" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-anonfun" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-anonfun.nix {
          inherit fetchurl;
        }));
 
@@ -372,17 +268,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl+ssl" = buildLispPackage
+  "trivial-garbage" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl+ssl" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl+ssl.nix {
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+       }));
+
+
+  "uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/uffi.nix {
          inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -412,25 +310,13 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cffi-grovel" = buildLispPackage
+  "let-plus" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cffi-grovel" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
+       (qlOverrides."let-plus" or (x: {}))
+       (import ./quicklisp-to-nix-output/let-plus.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
-       }));
-
-
-  "cl-libuv" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-libuv" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-libuv.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
        }));
 
 
@@ -439,23 +325,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-async-util" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-async-util.nix {
          inherit fetchurl;
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
-           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
            "vom" = quicklisp-to-nix-packages."vom";
-       }));
-
-
-  "cl-async-base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-async-base" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-async-base.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cffi" = quicklisp-to-nix-packages."cffi";
        }));
 
 
@@ -475,16 +350,34 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "myway" = buildLispPackage
+  "anaphora" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."myway" or (x: {}))
-       (import ./quicklisp-to-nix-output/myway.nix {
+       (qlOverrides."anaphora" or (x: {}))
+       (import ./quicklisp-to-nix-output/anaphora.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "cl-project" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-project" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-project.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "local-time" = quicklisp-to-nix-packages."local-time";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "map-set" = quicklisp-to-nix-packages."map-set";
-           "quri" = quicklisp-to-nix-packages."quri";
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+       }));
+
+
+  "cl-syntax" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-syntax" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax.nix {
+         inherit fetchurl;
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
        }));
 
 
@@ -498,50 +391,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clack-v1-compat" = buildLispPackage
+  "myway" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."clack-v1-compat" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+       (qlOverrides."myway" or (x: {}))
+       (import ./quicklisp-to-nix-output/myway.nix {
          inherit fetchurl;
-       }));
-
-
-  "cl-syntax" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-syntax" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-syntax.nix {
-         inherit fetchurl;
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-       }));
-
-
-  "cl-project" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-project" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-project.nix {
-         inherit fetchurl;
-           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "map-set" = quicklisp-to-nix-packages."map-set";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "prove" = quicklisp-to-nix-packages."prove";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "cl-emb" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-emb" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-emb.nix {
-         inherit fetchurl;
-       }));
-
-
-  "anaphora" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."anaphora" or (x: {}))
-       (import ./quicklisp-to-nix-output/anaphora.nix {
-         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -676,9 +535,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."smart-buffer" or (x: {}))
        (import ./quicklisp-to-nix-output/smart-buffer.nix {
          inherit fetchurl;
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
            "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -695,10 +554,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."quri" or (x: {}))
        (import ./quicklisp-to-nix-output/quri.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -722,11 +581,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."prove" or (x: {}))
        (import ./quicklisp-to-nix-output/prove.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "uiop" = quicklisp-to-nix-packages."uiop";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -735,8 +594,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."proc-parse" or (x: {}))
        (import ./quicklisp-to-nix-output/proc-parse.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -745,9 +604,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."plump" or (x: {}))
        (import ./quicklisp-to-nix-output/plump.nix {
          inherit fetchurl;
-           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
-           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
-           "plump-parser" = quicklisp-to-nix-packages."plump-parser";
        }));
 
 
@@ -757,7 +613,17 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/pcall.nix {
          inherit fetchurl;
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
+       }));
+
+
+  "parenscript" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parenscript" or (x: {}))
+       (import ./quicklisp-to-nix-output/parenscript.nix {
+         inherit fetchurl;
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
        }));
 
 
@@ -766,8 +632,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."optima" or (x: {}))
        (import ./quicklisp-to-nix-output/optima.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -784,10 +650,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "clss" = quicklisp-to-nix-packages."clss";
-           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
            "plump" = quicklisp-to-nix-packages."plump";
+           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
+           "clss" = quicklisp-to-nix-packages."clss";
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
        }));
 
 
@@ -814,8 +680,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lack" or (x: {}))
        (import ./quicklisp-to-nix-output/lack.nix {
          inherit fetchurl;
-           "lack-component" = quicklisp-to-nix-packages."lack-component";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
        }));
 
 
@@ -872,19 +736,32 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "hu.dwim.def" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu.dwim.def" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu.dwim.def.nix {
+         inherit fetchurl;
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "http-body" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."http-body" or (x: {}))
        (import ./quicklisp-to-nix-output/http-body.nix {
          inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "jonathan" = quicklisp-to-nix-packages."jonathan";
-           "quri" = quicklisp-to-nix-packages."quri";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "babel" = quicklisp-to-nix-packages."babel";
        }));
 
 
@@ -902,9 +779,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -939,14 +816,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."drakma" or (x: {}))
        (import ./quicklisp-to-nix-output/drakma.nix {
          inherit fetchurl;
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "puri" = quicklisp-to-nix-packages."puri";
            "usocket" = quicklisp-to-nix-packages."usocket";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "chipz" = quicklisp-to-nix-packages."chipz";
        }));
 
 
@@ -958,6 +835,70 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "dbd-sqlite3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbd-sqlite3" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbd-sqlite3.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "sqlite" = quicklisp-to-nix-packages."sqlite";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+       }));
+
+
+  "dbd-postgres" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbd-postgres" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbd-postgres.nix {
+         inherit fetchurl;
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+       }));
+
+
+  "dbd-mysql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbd-mysql" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbd-mysql.nix {
+         inherit fetchurl;
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-mysql" = quicklisp-to-nix-packages."cl-mysql";
+       }));
+
+
+  "cxml-xml" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-xml" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-xml.nix {
+         inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+       }));
+
+
+  "cxml-klacks" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-klacks" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
+  "cxml-dom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-dom" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-dom.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
   "cxml" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml" or (x: {}))
@@ -977,17 +918,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "parenscript" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."parenscript" or (x: {}))
-       (import ./quicklisp-to-nix-output/parenscript.nix {
-         inherit fetchurl;
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
-       }));
-
-
   "command-line-arguments" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."command-line-arguments" or (x: {}))
@@ -1020,15 +950,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clsql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql.nix {
-         inherit fetchurl;
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
   "cl-who" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-who" or (x: {}))
@@ -1037,6 +958,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-vectors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-vectors" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-vectors.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-utilities" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-utilities" or (x: {}))
@@ -1061,13 +990,61 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-test-more" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-test-more" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-test-more.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-syntax-markup" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-syntax-markup" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax-markup.nix {
+         inherit fetchurl;
+           "cl-markup" = quicklisp-to-nix-packages."cl-markup";
+       }));
+
+
+  "cl-syntax-anonfun" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-syntax-anonfun" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix {
+         inherit fetchurl;
+           "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun";
+       }));
+
+
   "cl-syntax-annot" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-syntax-annot" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-syntax-annot.nix {
          inherit fetchurl;
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+       }));
+
+
+  "cl+ssl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl+ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl+ssl.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "clsql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql.nix {
+         inherit fetchurl;
+           "uffi" = quicklisp-to-nix-packages."uffi";
        }));
 
 
@@ -1093,6 +1070,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-ppcre-template" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ppcre-template" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+       }));
+
+
   "cl-ppcre" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-ppcre" or (x: {}))
@@ -1109,6 +1095,26 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-mysql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-mysql" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-mysql.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "cl-libuv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-libuv" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-libuv.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+       }));
+
+
   "cl-l10n" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-l10n" or (x: {}))
@@ -1162,16 +1168,42 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-emb" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-emb" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-emb.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-dbi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-dbi" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-dbi.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-cookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-cookie" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-cookie.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "quri" = quicklisp-to-nix-packages."quri";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "cl-colors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-colors" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-colors.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
        }));
 
 
@@ -1183,21 +1215,59 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-async-ssl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async-ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async-ssl.nix {
+         inherit fetchurl;
+           "vom" = quicklisp-to-nix-packages."vom";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "cl-async-repl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async-repl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async-repl.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "cl-async-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-async-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-async-base.nix {
+         inherit fetchurl;
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
   "cl-async" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-async" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-async.nix {
          inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
-           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
-           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "babel" = quicklisp-to-nix-packages."babel";
+       }));
+
+
+  "clack-v1-compat" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-v1-compat" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+         inherit fetchurl;
        }));
 
 
@@ -1214,8 +1284,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."circular-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/circular-streams.nix {
          inherit fetchurl;
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
        }));
 
 
@@ -1227,15 +1297,57 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cffi-uffi-compat" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-uffi-compat" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-uffi-compat.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cffi-toolchain" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-toolchain" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cffi-libffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-libffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-libffi.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
+  "cffi-grovel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "cffi-examples" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-examples" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-examples.nix {
+         inherit fetchurl;
+       }));
+
+
   "cffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cffi" or (x: {}))
        (import ./quicklisp-to-nix-output/cffi.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1244,16 +1356,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."caveman" or (x: {}))
        (import ./quicklisp-to-nix-output/caveman.nix {
          inherit fetchurl;
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-project" = quicklisp-to-nix-packages."cl-project";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
-           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
-           "local-time" = quicklisp-to-nix-packages."local-time";
            "myway" = quicklisp-to-nix-packages."myway";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
+           "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-project" = quicklisp-to-nix-packages."cl-project";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
        }));
 
 
@@ -1280,8 +1392,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1293,4 +1405,40 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "3bmd-youtube" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."3bmd-youtube" or (x: {}))
+       (import ./quicklisp-to-nix-output/3bmd-youtube.nix {
+         inherit fetchurl;
+           "esrap" = quicklisp-to-nix-packages."esrap";
+       }));
+
+
+  "3bmd-ext-wiki-links" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."3bmd-ext-wiki-links" or (x: {}))
+       (import ./quicklisp-to-nix-output/3bmd-ext-wiki-links.nix {
+         inherit fetchurl;
+       }));
+
+
+  "3bmd-ext-tables" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."3bmd-ext-tables" or (x: {}))
+       (import ./quicklisp-to-nix-output/3bmd-ext-tables.nix {
+         inherit fetchurl;
+       }));
+
+
+  "3bmd" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."3bmd" or (x: {}))
+       (import ./quicklisp-to-nix-output/3bmd.nix {
+         inherit fetchurl;
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
 }; in quicklisp-to-nix-packages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 774d64a0a3c..a798a452365 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -1,7 +1,9 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''<% @var filename %>'';
-  version = ''<% @var version %>'';
+  version = ''<% @var version %>'';<% @if testname %>
+
+  testSystems = ["<% @var testname %>"];<% @endif %>
 
   description = ''<% @var description %>'';
 
@@ -13,5 +15,14 @@ rec {
   };
 
   overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]asd${"$"}' |
+        while read f; do
+          CL_SOURCE_REGISTRY= \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
   };
 }
+/* <%= cl-emb-intern::topenv %> */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 3711ab957e0..18cf6d097a2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -6,8 +6,10 @@
 (ql:quickload :cl-emb)
 (ql:quickload :external-program)
 (ql:quickload :cl-ppcre)
-(ql:quickload :md5)
 (ql:quickload :alexandria)
+(ql:quickload :md5)
+
+(defvar testnames (make-hash-table :test 'equal))
 
 (defun nix-prefetch-url (url)
   (let*
@@ -45,11 +47,11 @@
            (t x)))))
 
 (defun system-data (system)
-  (ql:quickload system)
   (let*
     ((asdf-system (asdf:find-system system))
      (ql-system (ql-dist:find-system system))
      (ql-release (ql-dist:release ql-system))
+     (ql-sibling-systems (ql-dist:provided-systems ql-release))
      (url (ql-dist:archive-url ql-release))
      (local-archive (ql-dist:local-archive-file ql-release))
      (local-url (format nil "file://~a" (pathname local-archive)))
@@ -60,9 +62,18 @@
      (ideal-md5 (ql-dist:archive-md5 ql-release))
      (file-md5 (getf archive-data :md5))
      (raw-dependencies (ql-dist:required-systems ql-system))
-     (dependencies (remove-if-not 'ql-dist:find-system raw-dependencies))
-     (deps (mapcar (lambda (x) (list :name x)) dependencies))
      (name (string-downcase (format nil "~a" system)))
+     (ql-sibling-names
+       (remove name (mapcar 'ql-dist:name ql-sibling-systems)
+               :test 'equal))
+     (dependencies
+       (set-difference
+         (remove-duplicates
+           (remove-if-not 'ql-dist:find-system raw-dependencies)
+           :test 'equal)
+         ql-sibling-names
+         :test 'equal))
+     (deps (mapcar (lambda (x) (list :name x)) dependencies))
      (description (asdf:system-description asdf-system))
      (release-name (ql-dist:short-description ql-release))
      (version (cl-ppcre:regex-replace-all
@@ -79,7 +90,8 @@
     :filename (escape-filename name)
     :deps deps
     :dependencies dependencies
-    :version version)))
+    :version version
+    :siblings ql-sibling-names)))
 
 (defmacro this-file ()
   (or *compile-file-truename*
@@ -102,8 +114,11 @@
       with res := nil
       while queue
       for next := (pop queue)
-      for deps := (getf (system-data next) :dependencies)
-      unless (gethash next seen) do
+      for old := (gethash next seen)
+      for data := (unless old (system-data next))
+      for deps := (getf data :dependencies)
+      for siblings := (getf data :siblings)
+      unless old do
       (progn
         (push next res)
         (setf queue (append queue deps)))

From da8201e7c3523088f1d22c2af252ed9f853a0cca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 09:06:14 +0200
Subject: [PATCH 0504/1744] ocamlPackages.sedlex: fix on OCaml 4.04

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

diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 5dbc74ef543..2d1746bde0f 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
+  dontStrip = true;
+
   meta = {
     homepage = https://github.com/alainfrisch/sedlex;
     description = "An OCaml lexer generator for Unicode";

From bab0ed75c0207fde57ca80bcf0983ba2e32e1271 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 10:21:19 +0300
Subject: [PATCH 0505/1744] idea: rename to jetbrains JetBrains IDEs were put
 under wrong scope which was confusing. Fixes #24453

---
 .../editors/{idea => jetbrains}/common.nix       |  0
 .../editors/{idea => jetbrains}/default.nix      | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/applications/editors/{idea => jetbrains}/common.nix (100%)
 rename pkgs/applications/editors/{idea => jetbrains}/default.nix (98%)

diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/jetbrains/common.nix
similarity index 100%
rename from pkgs/applications/editors/idea/common.nix
rename to pkgs/applications/editors/jetbrains/common.nix
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/jetbrains/default.nix
similarity index 98%
rename from pkgs/applications/editors/idea/default.nix
rename to pkgs/applications/editors/jetbrains/default.nix
index e298385f793..8955f2ddba6 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -6,10 +6,10 @@
 assert stdenv.isLinux;
 
 let
-  mkIdeaProduct = callPackage ./common.nix { };
+  mkJetBrainsProduct = callPackage ./common.nix { };
 
   buildClion = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct rec {
+    (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "CLion";
       meta = with stdenv.lib; {
@@ -25,7 +25,7 @@ let
     });
 
   buildIdea = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct rec {
+    (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "IDEA";
       meta = with stdenv.lib; {
@@ -42,7 +42,7 @@ let
     });
 
   buildRubyMine = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct rec {
+    (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "RubyMine";
       meta = with stdenv.lib; {
@@ -55,7 +55,7 @@ let
     });
 
   buildPhpStorm = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct {
+    (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "PhpStorm";
       meta = with stdenv.lib; {
@@ -72,7 +72,7 @@ let
     });
 
   buildWebStorm = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct {
+    (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
       meta = with stdenv.lib; {
@@ -89,7 +89,7 @@ let
     });
 
   buildPycharm = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct rec {
+    (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "PyCharm";
       meta = with stdenv.lib; {
@@ -116,7 +116,7 @@ let
     };
 
   buildDataGrip = { name, version, src, license, description, wmClass }:
-    (mkIdeaProduct {
+    (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "DataGrip";
       meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e403f303d12..f87daa799a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13839,7 +13839,7 @@ with pkgs;
     libart = pkgs.gnome2.libart_lgpl;
   };
 
-  idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; });
+  jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 

From 5cb39dd45f3fd4846637ab1874f9e7a3fab04c0c Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 10:25:38 +0300
Subject: [PATCH 0506/1744] clion: 2016.3.3 -> 2017.1

---
 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 8955f2ddba6..de96e8d6e39 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -136,12 +136,12 @@ in
 {
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2016.3.3";
+    version = "2017.1";
     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 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05";
+      sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5";
     };
     wmClass = "jetbrains-clion";
   };

From d41dee0a9f3f85eec872171565ebb81e1f4b6bb2 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 10:27:23 +0300
Subject: [PATCH 0507/1744] clion1: remove package It is no longer present on
 JetBrains download servers and is very outdated.

---
 pkgs/applications/editors/jetbrains/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index de96e8d6e39..6080a9ab843 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -146,18 +146,6 @@ in
     wmClass = "jetbrains-clion";
   };
 
-  clion1 = buildClion rec {
-    name = "clion-${version}";
-    version = "1.2.5";
-    description  = "C/C++ IDE. New. Intelligent. Cross-platform";
-    license = stdenv.lib.licenses.unfree;
-    src = fetchurl {
-      url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp";
-    };
-    wmClass = "jetbrains-clion";
-  };
-
   idea14-community = buildIdea rec {
     name = "idea-community-${version}";
     version = "14.1.7";

From 23f5958dd0cf8a80b505a2c0ce633de8bd65ac54 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 10:36:35 +0300
Subject: [PATCH 0508/1744] datagrip: 2016.3.2 -> 2017.1

---
 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 6080a9ab843..9e163da70fe 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -328,12 +328,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2016.3.2";
+    version = "2017.1";
     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 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3";
+      sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
     };
     wmClass = "jetbrains-datagrip";
   };

From 3aaf146f0746e10f94f3151cdaa0932f1fbf3495 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 10:45:25 +0300
Subject: [PATCH 0509/1744] jebrains: sort packages alphabetically

---
 .../editors/jetbrains/default.nix             | 205 +++++++++---------
 1 file changed, 105 insertions(+), 100 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9e163da70fe..c2bc9d8e170 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -8,6 +8,8 @@ assert stdenv.isLinux;
 let
   mkJetBrainsProduct = callPackage ./common.nix { };
 
+  # Sorted alphabetically
+
   buildClion = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
@@ -24,6 +26,23 @@ let
       };
     });
 
+  buildDataGrip = { name, version, src, license, description, wmClass }:
+    (mkJetBrainsProduct {
+      inherit name version src wmClass jdk;
+      product = "DataGrip";
+      meta = with stdenv.lib; {
+        homepage = "https://www.jetbrains.com/datagrip/";
+        inherit description license;
+        longDescription = ''
+          DataGrip is a new IDE from JetBrains built for database admins.
+          It allows you to quickly migrate and refactor relational databases,
+          construct efficient, statically checked SQL queries and much more.
+        '';
+        maintainers = with maintainers; [ loskutov ];
+        platforms = platforms.linux;
+      };
+    });
+
   buildIdea = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
@@ -41,19 +60,6 @@ let
       };
     });
 
-  buildRubyMine = { name, version, src, license, description, wmClass }:
-    (mkJetBrainsProduct rec {
-      inherit name version src wmClass jdk;
-      product = "RubyMine";
-      meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/ruby/";
-        inherit description license;
-        longDescription = description;
-        maintainers = with maintainers; [ edwtjo ];
-        platforms = platforms.linux;
-      };
-    });
-
   buildPhpStorm = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
@@ -71,23 +77,6 @@ let
       };
     });
 
-  buildWebStorm = { name, version, src, license, description, wmClass }:
-    (mkJetBrainsProduct {
-      inherit name version src wmClass jdk;
-      product = "WebStorm";
-      meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/webstorm/";
-        inherit description license;
-        longDescription = ''
-          WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
-          and CSS with on-the-fly code analysis, error prevention and
-          automated refactorings for JavaScript code.
-        '';
-        maintainers = with maintainers; [ abaldeau ];
-        platforms = platforms.linux;
-      };
-    });
-
   buildPycharm = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
@@ -115,25 +104,41 @@ let
       propagatedUserEnvPkgs = [ python ];
     };
 
-  buildDataGrip = { name, version, src, license, description, wmClass }:
-    (mkJetBrainsProduct {
+  buildRubyMine = { name, version, src, license, description, wmClass }:
+    (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
-      product = "DataGrip";
+      product = "RubyMine";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/datagrip/";
+        homepage = "https://www.jetbrains.com/ruby/";
         inherit description license;
-        longDescription = ''
-          DataGrip is a new IDE from JetBrains built for database admins.
-          It allows you to quickly migrate and refactor relational databases,
-          construct efficient, statically checked SQL queries and much more.
-        '';
-        maintainers = with maintainers; [ loskutov ];
+        longDescription = description;
+        maintainers = with maintainers; [ edwtjo ];
         platforms = platforms.linux;
       };
     });
+
+  buildWebStorm = { name, version, src, license, description, wmClass }:
+    (mkJetBrainsProduct {
+      inherit name version src wmClass jdk;
+      product = "WebStorm";
+      meta = with stdenv.lib; {
+        homepage = "https://www.jetbrains.com/webstorm/";
+        inherit description license;
+        longDescription = ''
+          WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
+          and CSS with on-the-fly code analysis, error prevention and
+          automated refactorings for JavaScript code.
+        '';
+        maintainers = with maintainers; [ abaldeau ];
+        platforms = platforms.linux;
+      };
+    });
+
 in
 
 {
+  # Sorted alphabetically
+
   clion = buildClion rec {
     name = "clion-${version}";
     version = "2017.1";
@@ -146,6 +151,18 @@ in
     wmClass = "jetbrains-clion";
   };
 
+  datagrip = buildDataGrip rec {
+    name = "datagrip-${version}";
+    version = "2017.1";
+    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 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
+    };
+    wmClass = "jetbrains-datagrip";
+  };
+
   idea14-community = buildIdea rec {
     name = "idea-community-${version}";
     version = "14.1.7";
@@ -206,6 +223,54 @@ in
     wmClass = "jetbrains-idea";
   };
 
+  phpstorm = buildPhpStorm rec {
+    name = "phpstorm-${version}";
+    version = "2017.1";
+    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 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
+    };
+    wmClass = "jetbrains-phpstorm";
+  };
+
+  phpstorm10 = buildPhpStorm rec {
+    name = "phpstorm-${version}";
+    version = "10.0.4";
+    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 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
+    };
+    wmClass = "jetbrains-phpstorm";
+  };
+
+  pycharm-community = buildPycharm rec {
+    name = "pycharm-community-${version}";
+    version = "2017.1";
+    description = "PyCharm Community Edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
+    };
+    wmClass = "jetbrains-pycharm-ce";
+  };
+
+  pycharm-professional = buildPycharm rec {
+    name = "pycharm-professional-${version}";
+    version = "2017.1";
+    description = "PyCharm Professional Edition";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
+    };
+    wmClass = "jetbrains-pycharm";
+  };
+
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
     version = "2016.3.2";
@@ -242,54 +307,6 @@ in
     wmClass = "jetbrains-rubymine";
   };
 
-  pycharm-community = buildPycharm rec {
-    name = "pycharm-community-${version}";
-    version = "2017.1";
-    description = "PyCharm Community Edition";
-    license = stdenv.lib.licenses.asl20;
-    src = fetchurl {
-      url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
-    };
-    wmClass = "jetbrains-pycharm-ce";
-  };
-
-  pycharm-professional = buildPycharm rec {
-    name = "pycharm-professional-${version}";
-    version = "2017.1";
-    description = "PyCharm Professional Edition";
-    license = stdenv.lib.licenses.unfree;
-    src = fetchurl {
-      url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
-    };
-    wmClass = "jetbrains-pycharm";
-  };
-
-  phpstorm = buildPhpStorm rec {
-    name = "phpstorm-${version}";
-    version = "2017.1";
-    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 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
-    };
-    wmClass = "jetbrains-phpstorm";
-  };
-
-  phpstorm10 = buildPhpStorm rec {
-    name = "phpstorm-${version}";
-    version = "10.0.4";
-    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 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
-    };
-    wmClass = "jetbrains-phpstorm";
-  };
-
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
     version = "2017.1";
@@ -325,16 +342,4 @@ in
     };
     wmClass = "jetbrains-webstorm";
   };
-
-  datagrip = buildDataGrip rec {
-    name = "datagrip-${version}";
-    version = "2017.1";
-    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 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
-    };
-    wmClass = "jetbrains-datagrip";
-  };
 }

From d9b36c36c5e56c6e2e70f620313008c6ed2407a1 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sat, 1 Apr 2017 09:50:06 +0700
Subject: [PATCH 0510/1744] pycairo: fix build with Python 3.6

Apply the same patch as for Python 3.5 so that this builds correctly.
Addresses #24501.
---
 .../python-modules/pycairo/default.nix        | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 5d002c09623..2919506e931 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,9 +1,18 @@
-{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:
+{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy36, isPy3k }:
 
-if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else buildPythonPackage rec {
+if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else let
+
+  patch_waf = fetchpatch {
+    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch;
+    sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
+  };
+  patch_waf-py3_5 = ./waf-py3_5.patch;
+
+in buildPythonPackage rec {
   version = "1.10.0";
   name = "pycairo-${version}";
   format = "other";
+
   src = if isPy3k
     then fetchurl {
       url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
@@ -14,26 +23,20 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
       sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k";
     };
 
-  patches = [(fetchpatch {
-    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch;
-    sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd";
-  })];
-
-  patch_waf = fetchpatch {
-    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch;
-    sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
-  };
-
-  patch_waf-py3_5 = ./waf-py3_5.patch;
+  patches = [
+    (fetchpatch {
+      url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch;
+      sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd";
+    })
+  ];
 
   buildInputs = [ python pkgconfig cairo xlibsWrapper ];
 
   configurePhase = ''
     (
       cd $(${python.executable} waf unpack)
-      pwd
       patch -p1 < ${patch_waf}
-      ${lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"}
+      ${lib.optionalString (isPy35 || isPy36) "patch -p1 < ${patch_waf-py3_5}"}
     )
 
     ${python.executable} waf configure --prefix=$out

From f8832fb2771791cb27703aa9ef33b5c4e471bf61 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 11:48:52 +0300
Subject: [PATCH 0511/1744] rider: init at 171.3655.1246

---
 .../applications/editors/jetbrains/common.nix |  4 ++
 .../editors/jetbrains/default.nix             | 40 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 839f537843d..a7ac367f048 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -63,6 +63,10 @@ with stdenv; lib.makeOverridable mkDerivation rec {
 
     makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
       --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+        # Some internals want libstdc++.so.6
+        stdenv.cc.cc.lib
+      ]}" \
       --set JDK_HOME "$jdk" \
       --set ${hiName}_JDK "$jdk" \
       --set ANDROID_JAVA_HOME "$jdk" \
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index c2bc9d8e170..f91aa6b2cdd 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
+{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
 , coreutils, gnugrep, which, git, python, unzip, p7zip
 , androidsdk, jdk
 }:
@@ -104,6 +104,32 @@ let
       propagatedUserEnvPkgs = [ python ];
     };
 
+  buildRider = { name, version, src, license, description, wmClass }:
+    lib.overrideDerivation (mkJetBrainsProduct rec {
+      inherit name version src wmClass jdk;
+      product = "Rider";
+      meta = with stdenv.lib; {
+        homepage = "https://www.jetbrains.com/rider/";
+        inherit description license;
+        longDescription = ''
+          JetBrains Rider is a new .NET IDE based on the IntelliJ
+          platform and ReSharper. Rider supports .NET Core,
+          .NET Framework and Mono based projects. This lets you
+          develop a wide array of applications including .NET desktop
+          apps, services and libraries, Unity games, ASP.NET and 
+          ASP.NET Core web applications.
+        '';
+        maintainers = [ maintainers.miltador ];
+        platforms = platforms.linux;
+      };
+    }) (attrs: {
+      patchPhase = attrs.patchPhase + ''
+        # Patch built-in mono for ReSharperHost to start successfully
+        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
+        patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
+      '';
+    });
+
   buildRubyMine = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
@@ -271,6 +297,18 @@ in
     wmClass = "jetbrains-pycharm";
   };
 
+  rider = buildRider rec {
+    name = "rider-${version}";
+    version = "171.3655.1246";
+    description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
+      sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b";
+    };
+    wmClass = "jetbrains-rider";
+  };
+
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
     version = "2016.3.2";

From 1d170e1f820a1818cd8e52bddd5207de5217588b Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 11:54:16 +0300
Subject: [PATCH 0512/1744] ruby-mine: 2016.3.2 -> 2017.1

---
 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 f91aa6b2cdd..db5320da8a1 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -311,12 +311,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2016.3.2";
+    version = "2017.1";
     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 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6";
+      sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a";
     };
     wmClass = "jetbrains-rubymine";
   };

From 7bd4b1cdbd6461de4bdfcfb33f6bf03b610e35b3 Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 12:04:06 +0300
Subject: [PATCH 0513/1744] gogland: init at 171.3780.106

---
 .../editors/jetbrains/default.nix             | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index db5320da8a1..7e9c5e48ad0 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -43,6 +43,24 @@ let
       };
     });
 
+  buildGogland = { name, version, src, license, description, wmClass }:
+    (mkJetBrainsProduct {
+      inherit name version src wmClass jdk;
+      product = "Gogland";
+      meta = with stdenv.lib; {
+        homepage = "https://www.jetbrains.com/go/";
+        inherit description license;
+        longDescription = ''
+          Gogland is the codename for a new commercial IDE by JetBrains
+          aimed at providing an ergonomic environment for Go development.
+          The new IDE extends the IntelliJ platform with the coding assistance
+          and tool integrations specific for the Go language
+        '';
+        maintainers = [ maintainers.miltador ];
+        platforms = platforms.linux;
+      };
+    });
+
   buildIdea = { name, version, src, license, description, wmClass }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
@@ -189,6 +207,18 @@ in
     wmClass = "jetbrains-datagrip";
   };
 
+  gogland = buildGogland rec {
+    name = "gogland-${version}";
+    version = "171.3780.106";
+    description = "Up and Coming Go IDE";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/go/${name}.tar.gz";
+      sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b";
+    };
+    wmClass = "jetbrains-gogland";
+  };
+
   idea14-community = buildIdea rec {
     name = "idea-community-${version}";
     version = "14.1.7";

From b83d2970f27116bfdd14eb8c21425457a251c725 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 04:06:20 -0500
Subject: [PATCH 0514/1744] pkgconfig: 0.29 -> 0.29.1 (#24394)

---
 .../tools/misc/pkgconfig/default.nix            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index d0e63469987..7b7bbc279aa 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,10 +1,9 @@
 {stdenv, fetchurl, automake, libiconv, vanilla ? false }:
 
-let
-  inherit (stdenv.lib) optional;
-in
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "pkg-config-0.29";
+name = "pkg-config-0.29.1";
 
   setupHook = ./setup-hook.sh;
 
@@ -13,26 +12,26 @@ stdenv.mkDerivation rec {
       "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
       "http://fossies.org/linux/misc/${name}.tar.gz"
     ];
-    sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
+    sha256 = "00dh1jn8rbppmgbhhgqhmbh3c58b0gccy39rsjdlcma50sg3rd5y";
   };
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
   patches = optional (!vanilla) ./requires-private.patch
     ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
 
-  preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
+  preConfigure = optionalString (stdenv.system == "mips64el-linux")
     ''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
-  buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
+  buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
 
   configureFlags = [ "--with-internal-glib" ]
-    ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
+    ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
 
   postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
 
   meta = {
     description = "A tool that allows packages to find out information about other packages";
     homepage = http://pkg-config.freedesktop.org/wiki/;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 
 }

From d455cdd34bb80afa7225c2da25b760bd4d5e7a02 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 04:29:55 -0500
Subject: [PATCH 0515/1744] sharutils: 4.11.1 -> 4.15.2 (#24305)

---
 pkgs/tools/archivers/sharutils/default.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 41043cda5b6..77ab8a1cb03 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchurl, gettext, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "sharutils-4.11.1";
+  name = "sharutils-4.15.2";
 
   src = fetchurl {
-    url = "mirror://gnu/sharutils/${name}.tar.bz2";
-    sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g";
+    url = "mirror://gnu/sharutils/${name}.tar.xz";
+    sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b";
   };
 
   hardeningDisable = [ "format" ];
 
-  preConfigure = ''
-     # Fix for building on Glibc 2.16.  Won't be needed once the
-     # gnulib in sharutils is updated.
-     sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
-  '';
-
   # GNU Gettext is needed on non-GNU platforms.
-  buildInputs = [ gettext coreutils ];
+  buildInputs = [ coreutils gettext ];
 
   doCheck = true;
 
@@ -25,7 +19,7 @@ stdenv.mkDerivation rec {
     patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools for remote synchronization and `shell archives'";
     longDescription =
       '' GNU shar makes so-called shell archives out of many files, preparing
@@ -44,8 +38,8 @@ stdenv.mkDerivation rec {
          concatenated shell archives.
       '';
     homepage = http://www.gnu.org/software/sharutils/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.ndowens ];
+    platforms = platforms.all;
   };
 }

From 4fc2a867952d583ada03e482c379fc24e9476bfa Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Sat, 1 Apr 2017 12:46:27 +0300
Subject: [PATCH 0516/1744] rl-notes 17.09: add note about idea -> jetbrains
 renaming

---
 nixos/doc/manual/release-notes/rl-1709.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index bd999b60013..5fba4c34ec8 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -35,6 +35,8 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
+      Top-level <literal>idea</literal> package collection was renamed.
+      All JetBrains IDEs are now at <literal>jetbrains</literal>.
     </para>
   </listitem>
 </itemizedlist>

From 23ec4a40eea7d65ecc594007c81def3b202d58f8 Mon Sep 17 00:00:00 2001
From: Maciej Kazulak <kazulakm@gmail.com>
Date: Sat, 1 Apr 2017 11:50:13 +0200
Subject: [PATCH 0517/1744] oracle-instantclient: add optional odbc support

---
 .../oracle-instantclient/default.nix          | 50 +++++++++++++------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index c29a5da9f21..d0085752623 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,29 +1,39 @@
-{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }:
+{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio
+, odbcSupport ? false, unixODBC
+}:
 
-let requireSource = version: part: hash: (requireFile rec {
-  name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm";
-  message = ''
-    This Nix expression requires that ${name} already
-    be part of the store. Download the file
-    manually at
+assert odbcSupport -> unixODBC != null;
 
-    http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
+let optional = stdenv.lib.optional;
+    optionalString  = stdenv.lib.optionalString;
+    requireSource = version: part: hash: (requireFile rec {
+      name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm";
+      message = ''
+        This Nix expression requires that ${name} already
+        be part of the store. Download the file
+        manually at
 
-    and add it to the Nix store with the following command:
+        http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
 
-    nix-prefetch-url file://${name} ${hash} --type sha256
-'';
-  url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
-  sha256 = hash;
-}); in stdenv.mkDerivation rec {
+        and add it to the Nix store using either:
+          nix-store --add-fixed sha256 ${name}
+        or
+          nix-prefetch-url --type sha256 file:///path/to/${name}
+      '';
+      url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
+      sha256 = hash;
+    });
+in stdenv.mkDerivation rec {
   version = "12.1.0.2.0-1";
   name = "oracle-instantclient-${version}";
 
   srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed");
   srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296");
   srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam");
+  srcOdbc = optionalString odbcSupport (requireSource version "odbc" "d3aa1a4957a2f15ced05921dab551ba823aa7925d8fcb58d5b3a7f624e4df063");
 
-  buildInputs = [ glibc patchelf rpmextract ];
+  buildInputs = [ glibc patchelf rpmextract ] ++
+    optional odbcSupport unixODBC;
 
   buildCommand = ''
     mkdir -p "${name}"
@@ -31,6 +41,9 @@ let requireSource = version: part: hash: (requireFile rec {
     ${rpmextract}/bin/rpmextract "${srcBase}"
     ${rpmextract}/bin/rpmextract "${srcDevel}"
     ${rpmextract}/bin/rpmextract "${srcSqlplus}"
+    ${optionalString odbcSupport ''
+        ${rpmextract}/bin/rpmextract "${srcOdbc}"
+    ''}
 
     mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
     mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/"
@@ -46,6 +59,13 @@ let requireSource = version: part: hash: (requireFile rec {
                $lib
     done
 
+    for lib in $out/lib/libsqora*; do
+      test -f $lib || continue
+      chmod +x $lib
+      patchelf --force-rpath --set-rpath "$out/lib:${unixODBC}/lib" \
+               $lib
+    done
+
     for exe in $out/bin/sqlplus; do
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
                --force-rpath --set-rpath "$out/lib:${libaio}/lib" \

From 76213d102c1eaa91e733b326d9d312b60103d88a Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes.bornhold@gmail.com>
Date: Sat, 1 Apr 2017 12:19:53 +0200
Subject: [PATCH 0518/1744] python: Move catch_conflicts.py into subdirectory
 (#23600)

Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.
---
 .../interpreters/python/catch_conflicts/README.md   | 13 +++++++++++++
 .../python/{ => catch_conflicts}/catch_conflicts.py |  0
 .../interpreters/python/mk-python-derivation.nix    |  9 ++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/catch_conflicts/README.md
 rename pkgs/development/interpreters/python/{ => catch_conflicts}/catch_conflicts.py (100%)

diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md
new file mode 100644
index 00000000000..d144b80e338
--- /dev/null
+++ b/pkgs/development/interpreters/python/catch_conflicts/README.md
@@ -0,0 +1,13 @@
+
+
+catch_conflicts.py
+==================
+
+The file catch_conflicts.py is in a subdirectory because, if it isn't, the
+/nix/store/ directory is added to sys.path causing a delay when building.
+
+Pointers:
+
+- https://docs.python.org/3/library/sys.html#sys.path
+
+- https://github.com/NixOS/nixpkgs/pull/23600
diff --git a/pkgs/development/interpreters/python/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
similarity index 100%
rename from pkgs/development/interpreters/python/catch_conflicts.py
rename to pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index f30bd175daa..5d710fcad88 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -79,9 +79,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
   postFixup = ''
     wrapPythonPrograms
   '' + lib.optionalString catchConflicts ''
-    # check if we have two packages with the same name in closure and fail
-    # this shouldn't happen, something went wrong with dependencies specs
-    ${python.interpreter} ${./catch_conflicts.py}
+    # Check if we have two packages with the same name in the closure and fail.
+    # If this happens, something went wrong with the dependencies specs.
+    # Intentionally kept in a subdirectory, see catch_conflicts/README.md.
+    ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
   '' + attrs.postFixup or '''';
 
   passthru = {
@@ -98,5 +99,3 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
     isBuildPythonPackage = python.meta.platforms;
   };
 })
-
-

From 46ea770b2b1e105cab806cdd3845b2ec02ea66e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 12:20:31 +0200
Subject: [PATCH 0519/1744] Revert "python: Move catch_conflicts.py into
 subdirectory (#23600)" (#24528)

This reverts commit 76213d102c1eaa91e733b326d9d312b60103d88a.
---
 .../python/{catch_conflicts => }/catch_conflicts.py |  0
 .../interpreters/python/catch_conflicts/README.md   | 13 -------------
 .../interpreters/python/mk-python-derivation.nix    |  9 +++++----
 3 files changed, 5 insertions(+), 17 deletions(-)
 rename pkgs/development/interpreters/python/{catch_conflicts => }/catch_conflicts.py (100%)
 delete mode 100644 pkgs/development/interpreters/python/catch_conflicts/README.md

diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py
similarity index 100%
rename from pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
rename to pkgs/development/interpreters/python/catch_conflicts.py
diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md
deleted file mode 100644
index d144b80e338..00000000000
--- a/pkgs/development/interpreters/python/catch_conflicts/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-catch_conflicts.py
-==================
-
-The file catch_conflicts.py is in a subdirectory because, if it isn't, the
-/nix/store/ directory is added to sys.path causing a delay when building.
-
-Pointers:
-
-- https://docs.python.org/3/library/sys.html#sys.path
-
-- https://github.com/NixOS/nixpkgs/pull/23600
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 5d710fcad88..f30bd175daa 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -79,10 +79,9 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
   postFixup = ''
     wrapPythonPrograms
   '' + lib.optionalString catchConflicts ''
-    # Check if we have two packages with the same name in the closure and fail.
-    # If this happens, something went wrong with the dependencies specs.
-    # Intentionally kept in a subdirectory, see catch_conflicts/README.md.
-    ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
+    # check if we have two packages with the same name in closure and fail
+    # this shouldn't happen, something went wrong with dependencies specs
+    ${python.interpreter} ${./catch_conflicts.py}
   '' + attrs.postFixup or '''';
 
   passthru = {
@@ -99,3 +98,5 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
     isBuildPythonPackage = python.meta.platforms;
   };
 })
+
+

From 249b34aadca7038207492f29142a3456d0cecec3 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes.bornhold@gmail.com>
Date: Sat, 1 Apr 2017 12:19:53 +0200
Subject: [PATCH 0520/1744] python: Move catch_conflicts.py into subdirectory
 (#23600)

Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.

(moved from master commit 76213d102c1eaa91e733b326d9d312b60103d88a)
---
 .../interpreters/python/catch_conflicts/README.md   | 13 +++++++++++++
 .../python/{ => catch_conflicts}/catch_conflicts.py |  0
 .../interpreters/python/mk-python-derivation.nix    |  9 ++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/catch_conflicts/README.md
 rename pkgs/development/interpreters/python/{ => catch_conflicts}/catch_conflicts.py (100%)

diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md
new file mode 100644
index 00000000000..d144b80e338
--- /dev/null
+++ b/pkgs/development/interpreters/python/catch_conflicts/README.md
@@ -0,0 +1,13 @@
+
+
+catch_conflicts.py
+==================
+
+The file catch_conflicts.py is in a subdirectory because, if it isn't, the
+/nix/store/ directory is added to sys.path causing a delay when building.
+
+Pointers:
+
+- https://docs.python.org/3/library/sys.html#sys.path
+
+- https://github.com/NixOS/nixpkgs/pull/23600
diff --git a/pkgs/development/interpreters/python/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
similarity index 100%
rename from pkgs/development/interpreters/python/catch_conflicts.py
rename to pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index f30bd175daa..5d710fcad88 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -79,9 +79,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
   postFixup = ''
     wrapPythonPrograms
   '' + lib.optionalString catchConflicts ''
-    # check if we have two packages with the same name in closure and fail
-    # this shouldn't happen, something went wrong with dependencies specs
-    ${python.interpreter} ${./catch_conflicts.py}
+    # Check if we have two packages with the same name in the closure and fail.
+    # If this happens, something went wrong with the dependencies specs.
+    # Intentionally kept in a subdirectory, see catch_conflicts/README.md.
+    ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
   '' + attrs.postFixup or '''';
 
   passthru = {
@@ -98,5 +99,3 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
     isBuildPythonPackage = python.meta.platforms;
   };
 })
-
-

From e109faa401e2892a6189ae1987ebcad18db3621f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 05:26:36 -0500
Subject: [PATCH 0521/1744] libgudev: 230 -> 231 (#23965)

---
 pkgs/development/libraries/libgudev/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index e751c6ee6c0..4407a5e611a 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,21 +1,20 @@
-{ lib, stdenv, fetchurl, pkgconfig, udev, glib }:
-
-let version = "230"; in
+{ stdenv, fetchurl, pkgconfig, udev, glib }:
 
 stdenv.mkDerivation rec {
   name = "libgudev-${version}";
+  version = "231";
 
   src = fetchurl {
     url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
-    sha256 = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18";
+    sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv";
   };
 
   buildInputs = [ pkgconfig udev glib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/libgudev;
-    maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.linux;
-    license = lib.licenses.lgpl2Plus;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
   };
 }

From 86f4ded7898eee8ba3dd808d65095f5afacc1d29 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 10:52:19 +0200
Subject: [PATCH 0522/1744] google-drive-ocamlfuse: add missing ocamlbuild
 dependency

---
 .../networking/google-drive-ocamlfuse/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 64519ce17d5..674cf60161d 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib
-, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
   name    = "google-drive-ocamlfuse-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas";
   };
 
-  buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];
+  buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];
 
   configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
   buildPhase = "ocaml setup.ml -build";

From e5d0593a4289abc33505f061239b32081a710e06 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 10:53:47 +0200
Subject: [PATCH 0523/1744] ocamlPackages.core_extended: fix build on Linux

---
 .../development/ocaml-modules/janestreet/core-extended.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index df7f6903cd2..dc84ea34337 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -13,6 +13,13 @@ buildOcamlJane rec {
       ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
       re2 textutils ];
 
+  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+    patch src/extended_unix_stubs.c <<EOF
+0a1
+> #define _LINUX_QUOTA_VERSION 2
+EOF
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/core_extended;
     description = "Jane Street Capital's standard library overlay";

From fcb9f443750ce8c41a229818a2968d5dc4ec2e4d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 10:54:30 +0200
Subject: [PATCH 0524/1744] ocamlPackages.{ocf,xtmpl}: fix for OCaml 4.04

---
 pkgs/development/ocaml-modules/ocf/default.nix   | 4 +++-
 pkgs/development/ocaml-modules/xtmpl/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 11be8a13a57..4da9fb45d33 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -18,11 +18,14 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
+  dontStrip = true;
+
   patches = [(fetchpatch {
     url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch";
     sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5";
   })
   ];
+
   meta = with stdenv.lib; {
     description = "OCaml library to read and write configuration options in JSON syntax";
     homepage = "https://zoggy.github.io/ocf/";
@@ -31,4 +34,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ regnat ];
   };
 }
-
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index c3d7637e870..86c9974c931 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
+  dontStrip = true;
+
   meta = with stdenv.lib; {
     description = "Xml template library for OCaml";
     homepage = "https://zoggy.github.io/xtmpl/";
@@ -27,5 +29,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ regnat ];
   };
 }
-
-

From af098ff18e0080303bd6867898e4c7f118fb313a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 13:24:10 +0200
Subject: [PATCH 0525/1744] libgudev: fix build after update #23965

I somehow missed this error.
---
 pkgs/development/libraries/libgudev/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 4407a5e611a..5b29c23fa6e 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig udev glib ];
 
+  # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
+  configureFlags = [ "--disable-umockdev" ];
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/libgudev;
     maintainers = [ maintainers.eelco ];

From 6c153c55c3aeaa5978950d79f60efb5a03030a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 12:39:58 +0200
Subject: [PATCH 0526/1744] gtk3: maintenance 3.22.8 -> 3.22.11

---
 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 10f01294301..aa8957b2c7d 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 = "8";
+  ver_min = "11";
   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 = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1";
+    sha256 = "db440670cb6f3c098b076df3735fbc4e69359bd605385e87c90ee48344a804ca";
   };
 
   outputs = [ "out" "dev" ];

From ae08fdd84e29f02c589a0b4831f4559eb6a5a933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 12:49:03 +0200
Subject: [PATCH 0527/1744] pango: maintenance 1.40.3 -> 1.40.4

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b90ff39dc1f..91f065fa0eb 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 
 let
   ver_maj = "1.40";
-  ver_min = "3";
+  ver_min = "4";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3";
+    sha256 = "f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];

From ae58febf70b56f409ed91d58a32bfeaf783ae922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 12:50:47 +0200
Subject: [PATCH 0528/1744] gdk-pixbuf: maintenance 2.36.5 -> 2.36.6

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index af4bfc0709e..f40ebf00590 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "5";
+  ver_min = "6";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc";
+    sha256 = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 0062dd2f14526107bce0d78f39eea18f705fc2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 12:56:27 +0200
Subject: [PATCH 0529/1744] pciutils: 3.5.2 -> 3.5.4

The patch was integrated upstream.
---
 pkgs/tools/system/pciutils/default.nix     |  6 ++----
 pkgs/tools/system/pciutils/module-dir.diff | 23 ----------------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/tools/system/pciutils/module-dir.diff

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index dd107049578..998a3bdf6d1 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.5.2"; # with database from 2016-10
+  name = "pciutils-3.5.4"; # with database from 2017-02
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s";
+    sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4";
   };
 
-  patches = [ ./module-dir.diff ];
-
   buildInputs = [ pkgconfig zlib kmod which ];
 
   makeFlags = "SHARED=yes PREFIX=\${out}";
diff --git a/pkgs/tools/system/pciutils/module-dir.diff b/pkgs/tools/system/pciutils/module-dir.diff
deleted file mode 100644
index ea38b115b24..00000000000
--- a/pkgs/tools/system/pciutils/module-dir.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't override libkmod's way of finding modules.
-
-(We override that behavior in nixpkgs to fit nixos.)
-
-diff --git a/ls-kernel.c b/ls-kernel.c
-index 78b70f1..ecacd0e 100644
---- a/ls-kernel.c
-+++ b/ls-kernel.c
-@@ -29,13 +29,7 @@ show_kernel_init(void)
-   if (show_kernel_inited >= 0)
-     return show_kernel_inited;
- 
--  struct utsname uts;
--  if (uname(&uts) < 0)
--    die("uname() failed: %m");
--  char *name = alloca(64 + strlen(uts.release));
--  sprintf(name, "/lib/modules/%s", uts.release);
--
--  kmod_ctx = kmod_new(name, NULL);
-+  kmod_ctx = kmod_new(NULL, NULL);
-   if (!kmod_ctx)
-     {
-       fprintf(stderr, "lspci: Unable to initialize libkmod context\n");

From d55727c7a5f2151f77495f56f9b78a3688d346e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 13:00:00 +0200
Subject: [PATCH 0530/1744] at-spi2-core: maintenance 2.22.0 -> 2.22.1

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

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 3562969f6c9..85ab3f35fe7 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   versionMajor = "2.22";
-  versionMinor = "0";
+  versionMinor = "1";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a";
+    sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42";
   };
 
   outputs = [ "out" "dev" ];

From 6230bfa123ee48e6eb62d3033f928edce9c13b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 13:27:39 +0200
Subject: [PATCH 0531/1744] libpng: 1.6.28 -> 1.6.29

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 545c58f976e..92e0fa339b2 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,10 +3,10 @@
 assert zlib != null;
 
 let
-  version = "1.6.28";
+  version = "1.6.29";
   patchVersion = "1.6.26";
   # patchVersion = version;
-  sha256 = "0ylgyx93hnk38haqrh8prd3ax5ngzwvjqw5cxw7p9nxmwsfyrlyq";
+  sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
     sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1";

From 8eab29e26fe3531bda8c291c84ce4747fa69ae10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 11:14:07 +0200
Subject: [PATCH 0532/1744] nss: 3.28.3 -> 3.30 (close #24508)

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index e378c5b8a8a..396d795c5a4 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.28.3";
+  version = "3.30";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz";
-    sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_30_RTM/src/${name}.tar.gz";
+    sha256 = "a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9";
   };
 
   buildInputs = [ perl zlib sqlite ];

From 1a46368a60f128b7bd11a83a78f5b37857e0210f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 13:40:40 +0200
Subject: [PATCH 0533/1744] ffmpeg(3): 3.1 -> 3.2

According to ABI report https://abi-laboratory.pro/tracker/timeline/ffmpeg/
I see only one removed function and one removed field - both should be
detected during compile-time.  The rest are changes that don't matter
when everything rebuilds.
---
 pkgs/top-level/all-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e403f303d12..f0047cc4426 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7372,7 +7372,7 @@ with pkgs;
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
-  ffmpeg_3 = ffmpeg_3_1;
+  ffmpeg_3 = ffmpeg_3_2;
   ffmpeg = ffmpeg_3;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
@@ -14424,10 +14424,7 @@ with pkgs;
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
-  handbrake = callPackage ../applications/video/handbrake {
-    # TODO: remove when 3.2 becomes default
-    ffmpeg = ffmpeg_3_2;
-  };
+  handbrake = callPackage ../applications/video/handbrake { };
 
   lilyterm = callPackage ../applications/misc/lilyterm {
     inherit (gnome2) vte;

From ae034020aa18455d86202be50bff0939aebfb18c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 1 Apr 2017 12:54:24 +0100
Subject: [PATCH 0534/1744] fixup! terraform: 0.9.1 -> 0.9.2

use fetchpatch to improve patch download hash stability
---
 .../networking/cluster/terraform/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 42a8465bf8a..93a9894ba6b 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchurl, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -54,13 +54,13 @@ in {
     sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
 
     patches = [
-      (fetchurl {
+      (fetchpatch {
         url = "https://github.com/hashicorp/terraform/pull/13237.patch";
-        sha256 = "1f7hr1l5hck9mmqk01p6wxbfv9r3b0yi9ypz7bcmikp3bikza98x";
+        sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
       })
-      (fetchurl {
+      (fetchpatch {
         url = "https://github.com/hashicorp/terraform/pull/13248.patch";
-        sha256 = "1qc57kjhlqg5339him9bg4izdphins2fjjhb4ffr7bv9lb5k0hkr";
+        sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
       })
     ];
 

From d19384ca7e217dcd42eff673bafa07f9c6f183b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 14:40:35 +0200
Subject: [PATCH 0535/1744] liferea: bugfix 1.12-rc2 -> 1.12-rc3

---
 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 b348010c61f..93e10fbe566 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-rc2";
+  version = "1.12-rc3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb";
+    sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr";
   };
 
   nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];

From 1a805c4c6380ce9e5920e1fe1da58a7d3644a95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Apr 2017 14:48:29 +0200
Subject: [PATCH 0536/1744] libdrm: 2.4.75 -> 2.4.76

---
 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 3dfbdd7040f..82681a6d05e 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.75";
+  name = "libdrm-2.4.76";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f";
+    sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a";
   };
 
   outputs = [ "out" "dev" ];

From ed41d50e9fe3d942cfde37e84de781c096309e5b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 20 Mar 2017 23:24:54 +0000
Subject: [PATCH 0537/1744] kernel: fix 9p issues

[tuomas: rename the patch from 9p-hacks to something slighly more
meaningful]
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
---
 pkgs/os-specific/linux/kernel/p9-fixes.patch | 85 ++++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix    |  5 ++
 pkgs/top-level/all-packages.nix              |  6 ++
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/p9-fixes.patch

diff --git a/pkgs/os-specific/linux/kernel/p9-fixes.patch b/pkgs/os-specific/linux/kernel/p9-fixes.patch
new file mode 100644
index 00000000000..f6061b60667
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/p9-fixes.patch
@@ -0,0 +1,85 @@
+diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
+--- a/fs/9p/vfs_inode.c
++++ b/fs/9p/vfs_inode.c
+@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data)
+ 
+ 	if (v9inode->qid.type != st->qid.type)
+ 		return 0;
++
++	if (v9inode->qid.path != st->qid.path)
++		return 0;
+ 	return 1;
+ }
+ 
+diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
+--- a/fs/9p/vfs_inode_dotl.c
++++ b/fs/9p/vfs_inode_dotl.c
+@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data)
+ 
+ 	if (v9inode->qid.type != st->qid.type)
+ 		return 0;
++
++	if (v9inode->qid.path != st->qid.path)
++		return 0;
+ 	return 1;
+ }
+ 
+diff --git a/net/9p/client.c b/net/9p/client.c
+index 3ce672af1596..f1c8ad373f90 100644
+--- a/net/9p/client.c
++++ b/net/9p/client.c
+@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
+ 	}
+ again:
+ 	/* Wait for the response */
+-	err = wait_event_interruptible(*req->wq,
+-				       req->status >= REQ_STATUS_RCVD);
++	err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
+ 
+ 	/*
+ 	 * Make sure our req is coherent with regard to updates in other
+diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
+index f24b25c25106..f3a4efcf1456 100644
+--- a/net/9p/trans_virtio.c
++++ b/net/9p/trans_virtio.c
+@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
+ 		if (err == -ENOSPC) {
+ 			chan->ring_bufs_avail = 0;
+ 			spin_unlock_irqrestore(&chan->lock, flags);
+-			err = wait_event_interruptible(*chan->vc_wq,
+-							chan->ring_bufs_avail);
++			err = wait_event_killable(*chan->vc_wq,
++						  chan->ring_bufs_avail);
+ 			if (err  == -ERESTARTSYS)
+ 				return err;
+ 
+@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
+ 		 * Other zc request to finish here
+ 		 */
+ 		if (atomic_read(&vp_pinned) >= chan->p9_max_pages) {
+-			err = wait_event_interruptible(vp_wq,
++			err = wait_event_killable(vp_wq,
+ 			      (atomic_read(&vp_pinned) < chan->p9_max_pages));
+ 			if (err == -ERESTARTSYS)
+ 				return err;
+@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
+ 		if (err == -ENOSPC) {
+ 			chan->ring_bufs_avail = 0;
+ 			spin_unlock_irqrestore(&chan->lock, flags);
+-			err = wait_event_interruptible(*chan->vc_wq,
+-						       chan->ring_bufs_avail);
++			err = wait_event_killable(*chan->vc_wq,
++						  chan->ring_bufs_avail);
+ 			if (err  == -ERESTARTSYS)
+ 				goto err_out;
+ 
+@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
+ 	virtqueue_kick(chan->vq);
+ 	spin_unlock_irqrestore(&chan->lock, flags);
+ 	p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");
+-	err = wait_event_interruptible(*req->wq,
+-				       req->status >= REQ_STATUS_RCVD);
++	err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
+ 	/*
+ 	 * Non kernel buffers are pinned, unpin them
+ 	 */
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5bb9d2d39ac..d8676413e82 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -52,6 +52,11 @@ rec {
       patch = ./bridge-stp-helper.patch;
     };
 
+  p9_fixes =
+    { name = "p9-fixes";
+      patch = ./p9-fixes.patch;
+    };
+
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e403f303d12..a3ba43b95c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11501,6 +11501,7 @@ with pkgs;
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
         kernelPatches.packet_fix_race_condition_CVE_2016_8655
         kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
@@ -11521,6 +11522,7 @@ with pkgs;
   linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
     kernelPatches = with kernelPatches;
       [ bridge_stp_helper
+        p9_fixes
         lguest_entry-linkage
         packet_fix_race_condition_CVE_2016_8655
         DCCP_double_free_vulnerability_CVE-2017-6074
@@ -11535,6 +11537,7 @@ with pkgs;
   linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.4"
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -11547,6 +11550,7 @@ with pkgs;
   linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
         # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
         # when adding a new linux version
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
@@ -11563,6 +11567,7 @@ with pkgs;
   linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
         # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
         # when adding a new linux version
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
@@ -11579,6 +11584,7 @@ with pkgs;
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
+      kernelPatches.p9_fixes
       kernelPatches.modinst_arg_list_too_long
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu

From b78f16b33772722d19c9cbe4145953f9c4b76fc8 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 20 Mar 2017 23:12:12 +0000
Subject: [PATCH 0538/1744] kernel: do not remove .o files on installPhase

---
 .../linux/kernel/manual-config.nix            | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index e07a89fc1e6..55162e54f4d 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -146,17 +146,12 @@ let
         unlink $out/lib/modules/${modDirVersion}/build
         unlink $out/lib/modules/${modDirVersion}/source
 
-        mkdir -p $dev/lib/modules/${modDirVersion}
-        cd ..
-        mv $sourceRoot $dev/lib/modules/${modDirVersion}/source
+        mkdir -p $dev/lib/modules/${modDirVersion}/build
+        cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source
         cd $dev/lib/modules/${modDirVersion}/source
 
-        mv $buildRoot/.config $buildRoot/Module.symvers $TMPDIR
-        rm -fR $buildRoot
-        mkdir $buildRoot
-        mv $TMPDIR/.config $TMPDIR/Module.symvers $buildRoot
-        make modules_prepare $makeFlags "''${makeFlagsArray[@]}"
-        mv $buildRoot $dev/lib/modules/${modDirVersion}/build
+        cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
+        make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build
 
         # !!! No documentation on how much of the source tree must be kept
         # If/when kernel builds fail due to missing files, you can add
@@ -164,7 +159,7 @@ let
         # from drivers/ in the future; it adds 50M to keep all of its
         # headers on 3.10 though.
 
-        chmod +w -R ../source
+        chmod u+w -R ../source
         arch=`cd $dev/lib/modules/${modDirVersion}/build/arch; ls`
 
         # Remove unusued arches
@@ -177,14 +172,14 @@ let
         rm -fR drivers
 
         # Keep all headers
-        find .  -type f -name '*.h' -print0 | xargs -0 chmod -w
+        find .  -type f -name '*.h' -print0 | xargs -0 chmod u-w
 
         # Keep root and arch-specific Makefiles
-        chmod -w Makefile
-        chmod -w arch/$arch/Makefile*
+        chmod u-w Makefile
+        chmod u-w arch/$arch/Makefile*
 
         # Keep whole scripts dir
-        chmod -w -R scripts
+        chmod u-w -R scripts
 
         # Delete everything not kept
         find . -type f -perm -u=w -print0 | xargs -0 rm

From ee0f3e7ad9aa61f02283eb1c18f670703eea20ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 1 Apr 2017 14:42:21 +0200
Subject: [PATCH 0539/1744] acme: Use `chown -R` for challenges directory.
 Fixes #24529.

Commit 75f131da02c00027b9a8240fb74d117cb0f9d9cf added
`chown 'nginx:nginx' '/var/lib/acme'` to the pre-start script,
but since it doesn't use `chown -R`, it is possible that there
are older existing subdirs (like `acme-challenge`)
that are owned to `root` from before that commit went it.
---
 nixos/modules/security/acme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 703d5ddbd0e..ada198e0e58 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -178,7 +178,7 @@ in
                   path = [ pkgs.simp_le ];
                   preStart = ''
                     mkdir -p '${cfg.directory}'
-                    chown '${data.user}:${data.group}' '${cfg.directory}'
+                    chown -R '${data.user}:${data.group}' '${cfg.directory}'
                     if [ ! -d '${cpath}' ]; then
                       mkdir '${cpath}'
                     fi

From daab7c193f92151e0daae4c7fe927aa98bcb2b81 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 30 Mar 2017 18:09:45 -0500
Subject: [PATCH 0540/1744] i3lock-color: 2.7-2016-09-17 -> 2.8; Closes #24450

i3lock-color: Corrected software src

Fixed version
---
 pkgs/applications/window-managers/i3/lock-color.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index dd781143d86..aa4001f62de 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -2,17 +2,19 @@
 , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e";
-  version = "2.7-2016-09-17";
+  version = "2.7-2017-04-01";
   name = "i3lock-color-${version}";
+
   src = fetchFromGitHub {
     owner = "chrjguill";
     repo = "i3lock-color";
-    inherit rev;
-    sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia";
+    rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206";
+    sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703";
   };
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
     libev cairo libxkbcommon libxkbfile ];
+
   makeFlags = "all";
   preInstall = ''
     mkdir -p $out/share/man/man1

From 8c38250a3e4bc9dc62b710a263ea85dabf14d235 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 1 Apr 2017 14:34:17 +0100
Subject: [PATCH 0541/1744] treesheets: init at 2017-03-27

---
 .../office/treesheets/default.nix             | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/office/treesheets/default.nix

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
new file mode 100644
index 00000000000..01c24838f61
--- /dev/null
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name    = "treesheets-${version}";
+  version = "2017-03-27";
+
+  src = fetchFromGitHub {
+    owner  = "aardappel";
+    repo   = "treesheets";
+    rev    = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32";
+    sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb";
+  };
+
+  buildInputs = [ wxGTK makeWrapper ];
+
+  preConfigure = "cd src";
+
+  postInstall = ''
+    mkdir "$out/share" -p
+    cp -av ../TS "$out/share/libexec"
+
+    mkdir "$out/bin" -p
+    makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets"
+
+    mkdir "$out/share/doc" -p
+
+    for f in readme.html docs examples
+    do
+      mv -v "$out/share/libexec/$f" "$out/share/doc"
+      ln -sv "$out/share/doc/$f" "$out/share/libexec/$f"
+    done
+
+    mkdir "$out/share/applications" -p
+    mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications"
+    substituteInPlace "$out/share/applications/treesheets.desktop" \
+      --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free Form Data Organizer";
+
+    longDescription = ''
+      The ultimate replacement for spreadsheets, mind mappers, outliners,
+      PIMs, text editors and small databases.
+
+      Suitable for any kind of data organization, such as Todo lists,
+      calendars, project management, brainstorming, organizing ideas,
+      planning, requirements gathering, presentation of information, etc.
+    '';
+
+    homepage    = http://passwordsafe.sourceforge.net/;
+    maintainers = with maintainers; [ obadz ];
+    platforms   = platforms.linux;
+    license     = licenses.zlib;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3ba43b95c3..853d37d3c9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15724,6 +15724,8 @@ with pkgs;
 
   tree = callPackage ../tools/system/tree {};
 
+  treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; };
+
   trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
 
   tribler = callPackage ../applications/networking/p2p/tribler { };

From 498a2f5e61cca7a63e462b0ad32c5c00d62b6a56 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 08:45:58 -0500
Subject: [PATCH 0542/1744] speedtest-cli: 1.0.2 -> 1.0.3 (#24535)

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

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index ac23635441d..3be1d194d82 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
   
   src = fetchFromGitHub {
     owner = "sivel";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg";
+    sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83";
   };
 
   meta = with stdenv.lib; {

From c4801f65f8b9958a4d2dda1c278e5e081986ab54 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 1 Apr 2017 15:21:54 +0100
Subject: [PATCH 0543/1744] treesheets: fix url

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

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 01c24838f61..d8e6cdd86ea 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       planning, requirements gathering, presentation of information, etc.
     '';
 
-    homepage    = http://passwordsafe.sourceforge.net/;
+    homepage    = http://strlen.com/treesheets/;
     maintainers = with maintainers; [ obadz ];
     platforms   = platforms.linux;
     license     = licenses.zlib;

From 03aff3d22f7c729ffaec228437d840ff0a75aa4c Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 10:16:51 -0500
Subject: [PATCH 0544/1744] Small cosmetic change

---
 pkgs/tools/misc/clipster/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index c65836c1ae0..547cc289c3c 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation  rec {
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
 
   buildInputs =  [ pythonEnv gtk3 libwnck3 ];
-
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
@@ -48,6 +47,6 @@ stdenv.mkDerivation  rec {
     license = licenses.agpl3;
     homepage = https://github.com/mrichar1/clipster;
     platforms = platforms.linux;
-    maintainers = [maintainers.magnetophon];
+    maintainers = [ maintainers.magnetophon ];
   };
 }

From 72070e6dfce2dfc4dcd1bd567eadc39878497db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sat, 1 Apr 2017 15:32:25 +0200
Subject: [PATCH 0545/1744] doc: improve "getting the sources" chapter

---
 nixos/doc/manual/development/sources.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 0b2528e9a77..a2896cd7a13 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -8,7 +8,7 @@
 
 <para>By default, NixOS’s <command>nixos-rebuild</command> command
 uses the NixOS and Nixpkgs sources provided by the
-<literal>nixos-unstable</literal> channel (kept in
+<literal>nixos</literal> channel (kept in
 <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
 To modify NixOS, however, you should check out the latest sources from
 Git.  This is as follows:
@@ -41,7 +41,7 @@ branch based on your current NixOS version:
 $ nixos-version
 17.09pre104379.6e0b727 (Hummingbird)
 
-$ git checkout -b local e3938c8
+$ git checkout -b local 6e0b727
 </screen>
 
 Or, to base your local branch on the latest version available in a
@@ -87,7 +87,11 @@ $ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
 
 You may want to delete the symlink
 <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s
-NixOS channel from clashing with your own tree.</para>
+NixOS channel from clashing with your own tree (this may break the
+command-not-found utility though). If you want to go back to the default
+state, you may just remove the <filename>~/.nix-defexpr</filename>
+directory completely, log out and log in again and it should have been
+recreated with a link to the root channels.</para>
 
 <!-- FIXME: not sure what this means.
 <para>You should not pass the base directory

From 197bbe0e1b58cd07e0a81ec0ca3a5e212db49636 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 1 Apr 2017 19:42:01 +0300
Subject: [PATCH 0546/1744] xfstests: 2016-08-26 -> 2017-03-26

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

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index d9f87a8d894..a4ec2324b8b 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -3,12 +3,12 @@
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
-  name = "xfstests-2016-08-26";
+  name = "xfstests-2017-03-26";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
-    rev = "21eb9d303cff056753a3104602ff674d468af52e";
-    sha256 = "175nfdjfakxij7cmajjv2ycsiv4hkmx7b94nsylqrg51drx3jkji";
+    rev = "7400c10e503fed20fe2d9f8b03b2157eba4ff3b8";
+    sha256 = "0m30mx8nv49ryijlkqffjmkw2g1xdxsrq868jh9crwh19055v7qp";
   };
 
   buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];

From ba360f90f979f41a4613e111ebb3c39fb731b6a9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 1 Apr 2017 19:42:41 +0300
Subject: [PATCH 0547/1744] xfstests: Enable parallel build

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

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index a4ec2324b8b..49362676584 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
 
   hardeningDisable = [ "format" ];
+  enableParallelBuilding = true;
 
   patchPhase = ''
     # Patch the destination directory

From 097373e691f5111ed4fb1dcb0d2b694ab59aacd8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 1 Apr 2017 19:43:05 +0300
Subject: [PATCH 0548/1744] xfstests: Fix homepage

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

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 49362676584..fb56bdf8679 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Torture test suite for filesystems";
-    homepage = "http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git";
+    homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/";
     license = licenses.gpl2;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;

From b65dc619f013a8f24df5b16ae5c442837b226e94 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 1 Apr 2017 19:50:09 +0300
Subject: [PATCH 0549/1744] xfstests: Fixes

---
 pkgs/tools/misc/xfstests/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index fb56bdf8679..f312f4770b5 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -23,6 +23,14 @@ stdenv.mkDerivation {
     # Don't canonicalize path to mkfs (in util-linux) - otherwise e.g. mkfs.ext4 isn't found
     sed -i common/config -e 's|^export MKFS_PROG=.*|export MKFS_PROG=mkfs|'
 
+    # Move the Linux-specific test output files to the correct place, or else it will
+    # try to move them at runtime. Also nuke all the irix crap.
+    for f in tests/*/*.out.linux; do
+      mv $f $(echo $f | sed -e 's/\.linux$//')
+    done
+    rm -f tests/*/*.out.irix
+
+    # Fix up lots of impure paths
     for f in common/* tools/* tests/*/*; do
       sed -i $f -e 's|/bin/bash|${bash}/bin/bash|'
       sed -i $f -e 's|/bin/true|true|'

From 2e1ccaa31954db2465d42e08ad3f0d0e723354a9 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 18:10:37 +0100
Subject: [PATCH 0550/1744] masscan: init at 2017-02-04

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

diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
new file mode 100644
index 00000000000..46c90481628
--- /dev/null
+++ b/pkgs/tools/security/masscan/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "masscan-${version}";
+  version = "2016-11-03";
+
+  src = fetchFromGitHub {
+    owner  = "robertdavidgraham";
+    repo   = "masscan";
+    rev    = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496";
+    sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg";
+  };
+
+  buildInputs = [ libpcap ];
+
+  makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ];
+
+  postInstall = ''
+    mkdir -p $out/share/man/man8
+    mkdir -p $out/share/{doc,licenses}/masscan
+    mkdir -p $out/etc/masscan
+
+    cp data/exclude.conf $out/etc/masscan
+    cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml
+    cp doc/masscan.8 $out/share/man/man8/masscan.8
+    cp LICENSE $out/share/licenses/masscan/LICENSE
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast scan of the Internet";
+    homepage    = https://github.com/robertdavidgraham/masscan;
+    license     = licenses.agpl3;
+    platforms   = with platforms; allBut darwin;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbf1abba565..8684c1ed918 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -914,6 +914,8 @@ in
 
   mathics = pythonPackages.mathics;
 
+  masscan = callPackage ../tools/security/masscan { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };

From 4ab90c3b70b58fbad82471f298f00295b12c0620 Mon Sep 17 00:00:00 2001
From: "Scott R. Parish" <srp@sunlightpayments.com>
Date: Sat, 1 Apr 2017 10:24:53 -0700
Subject: [PATCH 0551/1744] scala_2_11: 2.11.8 -> 2.11.9

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

diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index 394b2f9da09..9af3431b8c6 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.8";
+  name = "scala-2.11.9";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47";
+    sha256 = "02rpx0pzr98vla2mgkgf6s8blccnrji5bxw05z36m1iwqmpryx5r";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 201960922c52f01f2ede01020d2a1db5fcbeea1f Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 1 Apr 2017 12:28:59 -0700
Subject: [PATCH 0552/1744] vulkan-loader: 1.0.39.1 -> 1.0.42.2

---
 .../development/compilers/glslang/default.nix |  11 +-
 .../compilers/glslang/install-headers.patch   |  35 --
 .../libraries/vulkan-loader/default.nix       |   7 +-
 .../vulkan-loader/fallback-paths.patch        |  52 ---
 .../vulkan-loader/use-xdg-paths.patch         | 322 ------------------
 .../development/tools/spirv-tools/default.nix |  13 +-
 6 files changed, 15 insertions(+), 425 deletions(-)
 delete mode 100644 pkgs/development/compilers/glslang/install-headers.patch
 delete mode 100644 pkgs/development/libraries/vulkan-loader/fallback-paths.patch
 delete mode 100644 pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index d2384598456..20e156a72e4 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -2,19 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "glslang-git-${version}";
-  version = "2016-12-21";
+  version = "2017-03-29";
 
   # `vulkan-loader` requires a specific version of `glslang` as specified in
-  # `<vulkan-loader-repo>/glslang_revision`.
+  # `<vulkan-loader-repo>/external_revisions/glslang_revision`.
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608";
-    sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj";
+    rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c";
+    sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv";
   };
 
-  patches = [ ./install-headers.patch ];
-
   buildInputs = [ cmake bison ];
   enableParallelBuilding = true;
 
@@ -23,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "Khronos reference front-end for GLSL and ESSL";
     license = licenses.asl20;
     platforms = platforms.linux;
+    maintainers = [ maintainers.ralith ];
   };
 }
diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch
deleted file mode 100644
index 75f27130978..00000000000
--- a/pkgs/development/compilers/glslang/install-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index c538e84..6ece1ab 100755
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS)
- endif(ENABLE_AMD_EXTENSIONS)
- 
- if(ENABLE_NV_EXTENSIONS)
--    set(HEADERS
--        GLSL.ext.NV.h)
-+    list(APPEND
-+         HEADERS
-+         GLSL.ext.NV.h)
- endif(ENABLE_NV_EXTENSIONS)
- 
- add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
-@@ -51,3 +52,5 @@ endif(WIN32)
- 
- install(TARGETS SPIRV SPVRemapper
-         ARCHIVE DESTINATION lib)
-+
-+install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 95d4bdd..e7fda90 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -93,3 +93,8 @@ endif(WIN32)
- 
- install(TARGETS glslang 
-         ARCHIVE DESTINATION lib)
-+
-+foreach(file ${HEADERS})
-+    get_filename_component(dir ${file} DIRECTORY)
-+    install(FILES ${file} DESTINATION include/glslang/${dir})
-+endforeach()
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index a1b9ee03f23..4432c22bcd8 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -3,12 +3,12 @@
   libXext, wayland, mesa_noglu }:
 
 let
-  version = "1.0.39.1";
+  version = "1.0.42.2";
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-LoaderAndValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp";
+    sha256 = "0na1ax2cgv6w29213mby56mndfsj3iizj3n5pbpy4s4p7ij9kdgn";
   };
 in
 
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share"
   ];
 
-  patches = [ ./use-xdg-paths.patch ./fallback-paths.patch ];
-
   outputs = [ "out" "dev" "demos" ];
 
   preConfigure = ''
@@ -59,5 +57,6 @@ stdenv.mkDerivation rec {
     homepage    = "http://www.lunarg.com";
     platforms   = platforms.linux;
     license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
   };
 }
diff --git a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch
deleted file mode 100644
index d8d9fdd3f5f..00000000000
--- a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit a59b141559a8c1813da438b97e5f79eeb6cc7642
-Author: Benjamin Saunders <ben.e.saunders@gmail.com>
-Date:   Sun Feb 19 11:14:24 2017 -0800
-
-    loader: Configurable fallback search paths
-    
-    This makes it easier for non-FHS distributions to behave well when the loader
-    is used by a SUID process or in an otherwise unusual environment.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a43d264..d28b3f5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- find_package(PythonInterp 3 REQUIRED)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+    set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING
-+        "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
-+    set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING
-+        "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.")
-+
-     include(FindPkgConfig)
-     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
-     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
-@@ -285,7 +290,10 @@ run_vk_xml_generate(dispatch_table_generator.py vk_dispatch_table_helper.h)
- if(NOT WIN32)
-     include(GNUInstallDirs)
- 
-+    add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
-+    add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
-     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-+
-     # Make sure /etc is searched by the loader
-     if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
-         add_definitions(-DEXTRASYSCONFDIR="/etc")
-diff --git a/loader/loader.c b/loader/loader.c
-index 81c37c4..83378eb 100644
---- a/loader/loader.c
-+++ b/loader/loader.c
-@@ -2644,9 +2644,9 @@ static VkResult loader_get_manifest_files(const struct loader_instance *inst, co
-         const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
-         const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
-         if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0')
--            xdgconfdirs = "/etc/xdg";
-+            xdgconfdirs = FALLBACK_CONFIG_DIRS;
-         if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0')
--            xdgdatadirs = "/usr/local/share:/usr/share";
-+            xdgdatadirs = FALLBACK_DATA_DIRS;
-         const size_t rel_size = strlen(relative_location);
-         // Leave space for trailing separators
-         loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2;
diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
deleted file mode 100644
index eb7869cd73c..00000000000
--- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27ab6e5..e59256e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -256,17 +256,10 @@ if(NOT WIN32)
-     include(GNUInstallDirs)
- 
-     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
--    add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
--
-     # Make sure /etc is searched by the loader
--    if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
-+    if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
-         add_definitions(-DEXTRASYSCONFDIR="/etc")
-     endif()
--
--    # Make sure /usr/share is searched by the loader
--    if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share"))
--        add_definitions(-DEXTRADATADIR="/usr/share")
--    endif()
- endif()
- 
- if(UNIX)
-diff --git a/loader/loader.c b/loader/loader.c
-index 24758f4..af7cc85 100644
---- a/loader/loader.c
-+++ b/loader/loader.c
-@@ -2909,7 +2909,7 @@ static VkResult
- loader_get_manifest_files(const struct loader_instance *inst,
-                           const char *env_override, const char *source_override,
-                           bool is_layer, bool warn_if_not_present,
--                          const char *location, const char *home_location,
-+                          const char *location, const char *relative_location,
-                           struct loader_manifest_files *out_files) {
-     const char * override = NULL;
-     char *override_getenv = NULL;
-@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst,
-     }
- 
- #if !defined(_WIN32)
--    if (location == NULL && home_location == NULL) {
-+    if (location == NULL && relative_location == NULL) {
- #else
--    home_location = NULL;
-+    relative_location = NULL;
-     if (location == NULL) {
- #endif
-         loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst,
-     // Make a copy of the input we are using so it is not modified
-     // Also handle getting the location(s) from registry on Windows
-     if (override == NULL) {
--        loc = loader_stack_alloc(strlen(location) + 1);
-+        size_t loc_size = strlen(location) + 1;
-+#if !defined(_WIN32)
-+        const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
-+        const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
-+        if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0')
-+            xdgconfdirs = "/etc/xdg";
-+        if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0')
-+            xdgdatadirs = "/usr/local/share:/usr/share";
-+        const size_t rel_size = strlen(relative_location);
-+        // Leave space for trailing separators
-+        loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2;
-+        for (const char *x = xdgconfdirs; *x; ++x)
-+            if (*x == PATH_SEPARATOR) loc_size += rel_size;
-+        for (const char *x = xdgdatadirs; *x; ++x)
-+            if (*x == PATH_SEPARATOR) loc_size += rel_size;
-+        loc_size += strlen(SYSCONFDIR) + rel_size + 1;
-+#ifdef EXTRASYSCONFDIR
-+        loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1;
-+#endif
-+#endif
-+        loc = loader_stack_alloc(loc_size);
-         if (loc == NULL) {
-             loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-                        "loader_get_manifest_files: Failed to allocate "
-                        "%d bytes for manifest file location.",
--                       strlen(location));
-+                       loc_size);
-             res = VK_ERROR_OUT_OF_HOST_MEMORY;
-             goto out;
-         }
--        strcpy(loc, location);
-+        char *loc_write = loc;
-+#if !defined(_WIN32)
-+        const char *loc_read;
-+
-+        loc_read = &xdgconfdirs[0];
-+        for (const char *x = loc_read;; ++x) {
-+            if (*x == PATH_SEPARATOR || *x == '\0') {
-+                const size_t s = x - loc_read;
-+                memcpy(loc_write, loc_read, s);
-+                loc_write += s;
-+                memcpy(loc_write, relative_location, rel_size);
-+                loc_write += rel_size;
-+                *loc_write++ = PATH_SEPARATOR;
-+                if (*x == 0)
-+                    break;
-+                loc_read = ++x;
-+            }
-+        }
-+
-+        memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR));
-+        loc_write += strlen(SYSCONFDIR);
-+        memcpy(loc_write, relative_location, rel_size);
-+        loc_write += rel_size;
-+        *loc_write++ = PATH_SEPARATOR;
-+
-+#ifdef EXTRASYSCONFDIR
-+        memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR));
-+        loc_write += strlen(EXTRASYSCONFDIR);
-+        memcpy(loc_write, relative_location, rel_size);
-+        loc_write += rel_size;
-+        *loc_write++ = PATH_SEPARATOR;
-+#endif
-+
-+        loc_read = &xdgdatadirs[0];
-+        for (const char *x = loc_read;; ++x) {
-+            if (*x == PATH_SEPARATOR || *x == '\0') {
-+                const size_t s = x - loc_read;
-+                memcpy(loc_write, loc_read, s);
-+                loc_write += s;
-+                memcpy(loc_write, relative_location, rel_size);
-+                loc_write += rel_size;
-+                *loc_write++ = PATH_SEPARATOR;
-+                if (*x == 0)
-+                    break;
-+                loc_read = ++x;
-+            }
-+        }
-+        --loc_write;
-+        *loc_write = '\0';
-+#else
-+        memcpy(loc_write, location, loc_size);
-+        loc[loc_size-1] = '\0';
-+#endif
-+
- #if defined(_WIN32)
-         VkResult reg_result = loaderGetRegistryFiles(inst, loc, &reg);
-         if (VK_SUCCESS != reg_result || NULL == reg) {
-@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst,
-         }
-         file = next_file;
- #if !defined(_WIN32)
--        if (home_location != NULL &&
-+        if (relative_location != NULL &&
-             (next_file == NULL || *next_file == '\0') && override == NULL) {
-             char *xdgdatahome = secure_getenv("XDG_DATA_HOME");
-             size_t len;
-             if (xdgdatahome != NULL) {
- 
-                 char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 +
--                                                    strlen(home_location));
-+                                                    strlen(relative_location));
-                 if (home_loc == NULL) {
-                     loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-                                "loader_get_manifest_files: Failed to allocate "
-@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
-                 }
-                 strcpy(home_loc, xdgdatahome);
-                 // Add directory separator if needed
--                if (home_location[0] != DIRECTORY_SYMBOL) {
-+                if (relative_location[0] != DIRECTORY_SYMBOL) {
-                     len = strlen(home_loc);
-                     home_loc[len] = DIRECTORY_SYMBOL;
-                     home_loc[len + 1] = '\0';
-                 }
--                strcat(home_loc, home_location);
-+                strcat(home_loc, relative_location);
-                 file = home_loc;
-                 next_file = loader_get_next_path(file);
--                home_location = NULL;
-+                relative_location = NULL;
- 
-                 loader_log(
-                     inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
-@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst,
-                 char *home = secure_getenv("HOME");
-                 if (home != NULL) {
-                     char *home_loc = loader_stack_alloc(strlen(home) + 16 +
--                                                        strlen(home_location));
-+                                                        strlen(relative_location));
-                     if (home_loc == NULL) {
-                         loader_log(
-                             inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
-                     }
-                     strcat(home_loc, ".local/share");
- 
--                    if (home_location[0] != DIRECTORY_SYMBOL) {
-+                    if (relative_location[0] != DIRECTORY_SYMBOL) {
-                         len = strlen(home_loc);
-                         home_loc[len] = DIRECTORY_SYMBOL;
-                         home_loc[len + 1] = '\0';
-                     }
--                    strcat(home_loc, home_location);
-+                    strcat(home_loc, relative_location);
-                     file = home_loc;
-                     next_file = loader_get_next_path(file);
--                    home_location = NULL;
-+                    relative_location = NULL;
- 
-                     loader_log(
-                         inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
-@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst,
-     // Get a list of manifest files for ICDs
-     res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true,
-                                     DEFAULT_VK_DRIVERS_INFO,
--                                    HOME_VK_DRIVERS_INFO, &manifest_files);
-+                                    RELATIVE_VK_DRIVERS_INFO, &manifest_files);
-     if (VK_SUCCESS != res || manifest_files.count == 0) {
-         goto out;
-     }
-@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst,
-     if (VK_SUCCESS !=
-         loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH,
-                                   true, true, DEFAULT_VK_ELAYERS_INFO,
--                                  HOME_VK_ELAYERS_INFO, &manifest_files[0])) {
-+                                  RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) {
-         goto out;
-     }
- 
-@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst,
-     // overridden by LAYERS_PATH_ENV
-     if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false,
-                                                 DEFAULT_VK_ILAYERS_INFO,
--                                                HOME_VK_ILAYERS_INFO,
-+                                                RELATIVE_VK_ILAYERS_INFO,
-                                                 &manifest_files[1])) {
-         goto out;
-     }
-@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst,
-     // overridden by LAYERS_PATH_ENV
-     VkResult res = loader_get_manifest_files(
-         inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO,
--        HOME_VK_ILAYERS_INFO, &manifest_files);
-+        RELATIVE_VK_ILAYERS_INFO, &manifest_files);
-     if (VK_SUCCESS != res || manifest_files.count == 0) {
-         return;
-     }
-diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
-index dc4ac10..50a7966 100644
---- a/loader/vk_loader_platform.h
-+++ b/loader/vk_loader_platform.h
-@@ -57,47 +57,9 @@
- #define VULKAN_ILAYERCONF_DIR "implicit_layer.d"
- #define VULKAN_LAYER_DIR      "layer"
- 
--#if defined(EXTRASYSCONFDIR)
--#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":"                                      \
--    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR
--#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":"                                      \
--    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
--#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":"                                      \
--    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
--#else
--#define EXTRA_DRIVERS_SYSCONFDIR_INFO
--#define EXTRA_ELAYERS_SYSCONFDIR_INFO
--#define EXTRA_ILAYERS_SYSCONFDIR_INFO
--#endif
--
--#if defined(EXTRADATADIR)
--#define EXTRA_DRIVERS_DATADIR_INFO ":"                                         \
--    EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
--#define EXTRA_ELAYERS_DATADIR_INFO ":"                                         \
--    EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
--#define EXTRA_ILAYERS_DATADIR_INFO ":"                                         \
--    EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
--#else
--#define EXTRA_DRIVERS_DATADIR_INFO
--#define EXTRA_ELAYERS_DATADIR_INFO
--#define EXTRA_ILAYERS_DATADIR_INFO
--#endif
--
--#define DEFAULT_VK_DRIVERS_INFO                                                \
--    SYSCONFDIR   VULKAN_DIR VULKAN_ICDCONF_DIR ":"                             \
--    DATADIR      VULKAN_DIR VULKAN_ICDCONF_DIR                                 \
--    EXTRA_DRIVERS_SYSCONFDIR_INFO                                              \
--    EXTRA_DRIVERS_DATADIR_INFO
--#define DEFAULT_VK_ELAYERS_INFO                                                \
--    SYSCONFDIR   VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"                          \
--    DATADIR      VULKAN_DIR VULKAN_ELAYERCONF_DIR                              \
--    EXTRA_ELAYERS_SYSCONFDIR_INFO                                              \
--    EXTRA_ELAYERS_DATADIR_INFO
--#define DEFAULT_VK_ILAYERS_INFO                                                \
--    SYSCONFDIR   VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"                          \
--    DATADIR      VULKAN_DIR VULKAN_ILAYERCONF_DIR                              \
--    EXTRA_ILAYERS_SYSCONFDIR_INFO                                              \
--    EXTRA_ILAYERS_DATADIR_INFO
-+#define DEFAULT_VK_DRIVERS_INFO ""
-+#define DEFAULT_VK_ELAYERS_INFO ""
-+#define DEFAULT_VK_ILAYERS_INFO ""
- 
- #define DEFAULT_VK_DRIVERS_PATH ""
- #if !defined(DEFAULT_VK_LAYERS_PATH)
-@@ -109,9 +71,9 @@
- #endif
- #define LAYERS_PATH_ENV "VK_LAYER_PATH"
- 
--#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
--#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
--#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
-+#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
-+#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
-+#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
- 
- // C99:
- #define PRINTF_SIZE_T_SPECIFIER "%zu"
-@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) {
- #define LAYERS_SOURCE_PATH NULL
- #endif
- #define LAYERS_PATH_ENV "VK_LAYER_PATH"
--#define HOME_VK_DRIVERS_INFO ""
--#define HOME_VK_ELAYERS_INFO ""
--#define HOME_VK_ILAYERS_INFO ""
-+#define RELATIVE_VK_DRIVERS_INFO ""
-+#define RELATIVE_VK_ELAYERS_INFO ""
-+#define RELATIVE_VK_ILAYERS_INFO ""
- #define PRINTF_SIZE_T_SPECIFIER "%Iu"
- 
- // File IO
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 9bc9bf9c0e4..bfd4b7370e0 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -4,18 +4,18 @@ let
 
 spirv_sources = {
   # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in
-  # `<vulkan-loader-repo>/spirv-tools_revision`.
+  # `<vulkan-loader-repo>/external_revisions/spirv-tools_revision`.
   tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8";
-    sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk";
+    rev = "7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4";
+    sha256 = "0rh25y1k3m3f1nqs032lh3mng5qfw9kqn6xv9yzzm47i1i0b6hmr";
   };
   headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "c470b68225a04965bf87d35e143ae92f831e8110";
-    sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd";
+    rev = "6c08995e6e7b94129e6086c78198c77111f2f262";
+    sha256 = "07m12wm9prib7hldj7pbc8vwnj0x6llgx4shzgy8x4xbhbafawws";
   };
 };
 
@@ -23,7 +23,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
-  version = "2016-12-19";
+  version = "2017-03-23";
 
   src = spirv_sources.tools;
   patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
     license = licenses.asl20;
     platforms = platforms.linux;
+    maintainers = [ maintainers.ralith ];
   };
 }

From 57a813f3dfde7b0d06e0f39909213a731a2f908b Mon Sep 17 00:00:00 2001
From: Dmitry Tsygankov <dmitry.tsygankov@gmail.com>
Date: Sun, 26 Mar 2017 23:33:41 -0700
Subject: [PATCH 0553/1744] bitcoin-unlimited: init at 1.0.1.3

Add the Bitcoin Unlimited client to the altcoins directory, so that all sides of the Bitcoin scaling debate are represented.
---
 lib/maintainers.nix                           |  1 +
 .../altcoins/bitcoin-unlimited.nix            | 60 +++++++++++++++++++
 pkgs/applications/altcoins/default.nix        |  3 +
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/altcoins/bitcoin-unlimited.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 200d900e382..7cf38aa43fc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -135,6 +135,7 @@
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
+  DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>";
   dmjio = "David Johnson <djohnson.m@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   domenkozar = "Domen Kozar <domen@dev.si>";
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
new file mode 100644
index 00000000000..b6d0739c6bf
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+
+  name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
+  version = "1.0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "bitcoinunlimited";
+    repo = "bitcoinunlimited";
+    rev = "${version}";
+    sha256 = "177l2jf2yqxh3sgf80dhgyk3wgjdnqszy3hb83clk8q1wyjkfz7y";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc utillinux protobuf libevent ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+                     ++ optionals withGui [ "--with-gui=qt4" ];
+
+  meta = {
+    description = "Peer-to-peer electronic cash system (Unlimited client)";
+    longDescription= ''
+      Bitcoin is a free open source peer-to-peer electronic cash system that is
+      completely decentralized, without the need for a central server or trusted
+      parties. Users hold the crypto keys to their own money and transact directly
+      with each other, with the help of a P2P network to check for double-spending.
+      
+      The Bitcoin Unlimited (BU) project seeks to provide a voice to all
+      stakeholders in the Bitcoin ecosystem.
+
+      Every node operator or miner can currently choose their own blocksize limit
+      by modifying their client. Bitcoin Unlimited makes the process easier by
+      providing a configurable option for the accepted and generated blocksize via
+      a GUI menu. Bitcoin Unlimited further provides a user-configurable failsafe
+      setting allowing you to accept a block larger than your maximum accepted
+      blocksize if it reaches a certain number of blocks deep in the chain.
+
+      The Bitcoin Unlimited client is not a competitive block scaling proposal
+      like BIP-101, BIP-102, etc. Instead it tracks consensus. This means that it
+      tracks the blockchain that the hash power majority follows, irrespective of
+      blocksize, and signals its ability to accept larger blocks via protocol and
+      block versioning fields.
+
+      If you support an increase in the blocksize limit by any means - or just
+      support Bitcoin conflict resolution as originally envisioned by its founder -
+      consider running a Bitcoin Unlimited client.      
+    '';
+    homepage = https://www.bitcoinunlimited.info/;
+    maintainers = with maintainers; [ DmitryTsygankov ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index d304019953a..fbc3d1c36f9 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -5,6 +5,9 @@ rec {
   bitcoin  = callPackage ./bitcoin.nix { withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { withGui = false; };
 
+  bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
+  bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
+
   bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; };
   bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
 

From dda001b0ba731648f2d5db50b2e8977b132f34f7 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 1 Apr 2017 17:25:34 -0400
Subject: [PATCH 0554/1744] gitkraken: add desktop entry

The tarball does not contain an icon so switched over to using the
dpkg.
---
 .../version-management/gitkraken/default.nix  | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index d17af6f5188..023343f59cb 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -2,6 +2,7 @@
 , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
 , libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
 , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
+, dpkg, makeDesktopItem
 }:
 
 with stdenv.lib;
@@ -11,8 +12,8 @@ stdenv.mkDerivation rec {
   version = "2.2.1";
 
   src = fetchurl {
-    url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
-    sha256 = "12nyw2dh9ylrms264dbw0xzyif0znmba32zyfq7kdp0iay0wvgqd";
+    url = "https://release.gitkraken.com/linux/v${version}.deb";
+    sha256 = "0ld5wdnrz4qpjl9af8hwmzli3201rfsh73lyy2zp8c98749a2zqn";
   };
 
   libPath = makeLibraryPath [
@@ -53,9 +54,29 @@ stdenv.mkDerivation rec {
 
   dontBuild = true;
 
+  desktopItem = makeDesktopItem {
+    name = "gitkraken";
+    exec = "gitkraken";
+    icon = "app";
+    desktopName = "GitKraken";
+    genericName = "Git Client";
+    categories = "Application;Development;";
+    comment = "Graphical Git client from Axosoft";
+  };
+
+  buildInputs = [ dpkg ];
+
+  unpackPhase = "dpkg-deb -x $src .";
+
   installPhase = ''
     mkdir -p "$out/opt/gitkraken"
-    cp -r ./* "$out/opt/gitkraken"
+    cp -r usr/share/gitkraken/* "$out/opt/gitkraken"
+
+    mkdir -p "$out/share/applications"
+    cp $desktopItem/share/applications/* "$out/share/applications"
+
+    mkdir -p "$out/share/pixmaps"
+    cp usr/share/pixmaps/app.png "$out/share/pixmaps"
   '';
 
   postFixup = ''

From a16dc1539a6f0616c3ba46bde2f8e7faeaa935a4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 18:07:27 -0500
Subject: [PATCH 0555/1744] bitcoin: 0.13.1 -> 0.14.0

---
 pkgs/applications/altcoins/bitcoin.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index c6490cf67df..ddbe7104f1d 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -4,19 +4,18 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
-
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  core_version = "0.13.1";
-  version = core_version;
+  version = "0.14.0";
 
   src = fetchurl {
-    urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
-             "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
+    urls = [ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
+             "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7";
+    sha256 = "07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
                   miniupnpc protobuf libevent]
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];

From 4ceeac7526a1e1c08f4063a4929a790ea47a61a8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Apr 2017 18:33:32 -0400
Subject: [PATCH 0556/1744] skopeo: default policy

---
 pkgs/development/tools/skopeo/default.nix |  9 ++++++++
 pkgs/development/tools/skopeo/path.patch  | 25 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/skopeo/path.patch

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 6a5faa68ced..d1ea6a2e12b 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -19,11 +19,20 @@ buildGoPackage rec {
     sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z";
   };
 
+  patches = [
+    ./path.patch
+  ];
+
   preBuild = ''
     export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
     export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
   '';
 
+  postInstall = ''
+    mkdir $bin/etc
+    cp -v ./go/src/github.com/projectatomic/skopeo/default-policy.json $bin/etc/default-policy.json
+  '';
+
   meta = {
     description = "A command line utility for various operations on container images and image repositories";
     homepage = "https://github.com/projectatomic/skopeo";
diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch
new file mode 100644
index 00000000000..deb63b27945
--- /dev/null
+++ b/pkgs/development/tools/skopeo/path.patch
@@ -0,0 +1,25 @@
+diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go
+index 51f918d..6681d73 100644
+--- a/cmd/skopeo/main.go
++++ b/cmd/skopeo/main.go
+@@ -3,6 +3,7 @@ package main
+ import (
+ 	"fmt"
+ 	"os"
++  "path/filepath"
+
+ 	"github.com/Sirupsen/logrus"
+ 	"github.com/containers/image/signature"
+@@ -84,6 +85,12 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) {
+ 	policyPath := c.GlobalString("policy")
+ 	var policy *signature.Policy // This could be cached across calls, if we had an application context.
+ 	var err error
++  var dir string
++  if policyPath == "" {
++    dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
++    policyPath = dir + "/../etc/default-policy.json"
++  }
++
+ 	if policyPath == "" {
+ 		policy, err = signature.DefaultPolicy(nil)
+ 	} else {

From c7e885ff9955da78aa273dcbdaa3ae2660c4bb49 Mon Sep 17 00:00:00 2001
From: Dmitry Rets <dmitryrets@gmail.com>
Date: Fri, 31 Mar 2017 23:03:57 +0300
Subject: [PATCH 0557/1744] xkbset: init at 0.5

---
 pkgs/tools/X11/xkbset/default.nix | 33 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/X11/xkbset/default.nix

diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix
new file mode 100644
index 00000000000..e6f6622f85a
--- /dev/null
+++ b/pkgs/tools/X11/xkbset/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "xkbset-0.5";
+
+  src = fetchurl {
+    url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz";
+    sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172";
+  };
+
+  buildInputs = [ perl libX11 ];
+
+  postPatch = ''
+    sed "s:^X11PREFIX=.*:X11PREFIX=$out:" -i Makefile
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
+  '';
+
+  postInstall = ''
+    rm -f $out/bin/xkbset-gui
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://faculty.missouri.edu/~stephen/software/#xkbset";
+    description = "Program to help manage many of XKB features of X window";
+    maintainers = with maintainers; [ drets ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45431fc8fdc..f21f6a15330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16172,6 +16172,8 @@ with pkgs;
   xen-slim = xenPackages.xen_4_5-slim;
   xen-light = xenPackages.xen_4_5-light;
 
+  xkbset = callPackage ../tools/X11/xkbset { };
+
   win-spice = callPackage ../applications/virtualization/driver/win-spice { };
   win-virtio = callPackage ../applications/virtualization/driver/win-virtio { };
   win-qemu = callPackage ../applications/virtualization/driver/win-qemu { };

From 40d171855f7155df1a597184d7c61642eb48093e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 30 Mar 2017 23:12:00 +0200
Subject: [PATCH 0558/1744] gpgme: 1.8.0 -> 1.9.0

For the license change see:
- https://directory.fsf.org/wiki/GPGME#tab=Details
- AUTHORS [0]

See #24491 for the other changes.

[0]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=AUTHORS;h=bbf1576ad27dc51956c371282862b468c633ea49;hb=HEAD
---
 pkgs/development/libraries/gpgme/default.nix | 32 +++++++++-----------
 pkgs/top-level/all-packages.nix              |  4 +--
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2ab0977004c..5601a8854ef 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,19 +1,11 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
-, useGnupg1 ? false, gnupg1 ? null }:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
 
-assert useGnupg1 -> gnupg1 != null;
-assert !useGnupg1 -> gnupg != null;
-
-let
-  gpgStorePath = if useGnupg1 then gnupg1 else gnupg;
-  gpgProgram = if useGnupg1 then "gpg" else "gpg2";
-in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.8.0";
+  name = "gpgme-1.9.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r";
+    sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -24,20 +16,24 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig gnupg ];
 
   configureFlags = [
-    "--enable-fixed-path=${gpgStorePath}/bin"
+    "--enable-fixed-path=${gnupg}/bin"
   ];
 
+  # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
     with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
-  AM_CXXFLAGS =
-    with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L";
-
   meta = with stdenv.lib; {
-    homepage = "http://www.gnupg.org/related_software/gpgme";
+    homepage = "https://gnupg.org/software/gpgme/index.html";
     description = "Library for making GnuPG easier to use";
-    license = licenses.gpl2;
+    longDescription = ''
+      GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
+      easier for applications. It provides a High-Level Crypto API for
+      encryption, decryption, signing, signature verification and key
+      management.
+    '';
+    license = with licenses; [ lgpl21Plus gpl3Plus ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.fuuzetsu ];
+    maintainers = with maintainers; [ fuuzetsu primeos ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f21f6a15330..5cf7986ca01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7709,9 +7709,7 @@ with pkgs;
 
   gpac = callPackage ../applications/video/gpac { };
 
-  gpgme = callPackage ../development/libraries/gpgme {
-    gnupg1 = gnupg1orig;
-  };
+  gpgme = callPackage ../development/libraries/gpgme { };
 
   pgpdump = callPackage ../tools/security/pgpdump { };
 

From affce1e2464f226afb6902c5185fee80d847d857 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 2 Apr 2017 02:21:59 +0300
Subject: [PATCH 0559/1744] nixos hibernate test: Use waitForOpenPort

There was one confusing recent failure of this:

http://cache.nixos.org/log/myla8bc17j8spmifdxmrz9jswxwsf5w6-vm-test-run-hibernate.drv

I don't have any real ideas on what could cause the problem but there is
at least one theoretical one: the system starts hibernating before the
listener process manages to open the TCP port for listening, and it can't
open it after resuming because not enough pages from the netcat binary
have been paged in (and as the 9p filesystem holding it is now toast,
they can't be loaded anymore).
---
 nixos/tests/hibernate.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 7616a75b021..db58a2f5c85 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: {
 
       networking.firewall.allowedTCPPorts = [ 4444 ];
 
-      systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444";
+      systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k";
     };
 
     probe = { config, lib, pkgs, ...}: {
@@ -32,6 +32,7 @@ import ./make-test.nix (pkgs: {
       $machine->succeed("mkswap /dev/vdb");
       $machine->succeed("swapon -a");
       $machine->startJob("listener");
+      $machine->waitForOpenPort(4444);
       $machine->succeed("systemctl hibernate &");
       $machine->waitForShutdown;
       $machine->start;

From 8f9b219107ebef79e35d47b5a1e8654555afe22d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 7 Mar 2017 23:35:04 +0000
Subject: [PATCH 0560/1744] kwallet: support GPG-encrypted wallets

---
 pkgs/development/libraries/kde-frameworks/kwallet.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index f02c6138df7..48181040a75 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
 , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
 }:
 
 kdeFramework {
@@ -9,6 +9,6 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
-    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme
   ];
 }

From 160a84013eeec6a856ef74ae8c39294f9f5a44d1 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 2 Apr 2017 00:18:52 +0000
Subject: [PATCH 0561/1744] qemu: 2.8.0 -> 2.8.1

---
 .../virtualization/qemu/default.nix           | 56 +++++--------------
 .../virtualization/qemu/no-etc-install.patch  |  2 +-
 2 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index e5620b6ce45..3714e6b2dd5 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,7 +18,7 @@
 
 with stdenv.lib;
 let
-  version = "2.8.0";
+  version = "2.8.1";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
+    sha256 = "1kdv8aa800rbsz9qnm4saw79vr052p83by21ryah68ics9z4r3h1";
   };
 
   buildInputs =
@@ -64,80 +64,52 @@ stdenv.mkDerivation rec {
     ./no-etc-install.patch
 
     # bugfixes
-    (fetchurl {
-      name = "qemu-vnc-do-not-disconnect-on-EAGAIN.patch";
-      url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vnc-do-not-disconnect-on-EAGAIN.patch?h=debian/qemu_2.8%2bdfsg-3";
-      sha256 = "1nqhfgfw1pzhid094pk204qy36r6n7w1yilsiwabgcsyxs5bymnh";
-    })
-
+    # xhci: fix event queue IRQ handling
     (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5"
       "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0")
 
+    # xhci: only free completed transfers
     (upstreamPatch "qemu-xhci-free-completed-transfers" "f94d18d6c6df388fde196d3ab252f57e33843a8b"
       "0lk19qss6ky7cqnvis54742cr2z0vl8c64chhch0kp6n83hray9x")
 
-    # security fixes from debian
-    (fetchurl {
-      name = "CVE-2016-9602.patch";
-      url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/9pfs-symlink-attack-fixes-CVE-2016-9602.patch?h=debian/qemu_2.8%2bdfsg-3";
-      sha256 = "0f7m1k3hbw9v0dwqn53ds36s7s334vlidvbn0682s9r2sq0sjlkv";
-    })
-
-    (fetchurl {
-      name = "CVE-2017-2630.patch";
-      url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/nbd_client-fix-drop_sync-CVE-2017-2630.patch?h=debian/qemu_2.8%2bdfsg-3";
-      sha256 = "1gdxaari53iwgj3gyczz30rhg8lj6xqycxym4snw9z5vmkyj1bbq";
-    })
-
-    (fetchurl {
-      name = "CVE-2017-6058.patch";
-      url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vmxnet3-fix-memory-corruption-on-vlan-header-stripping-CVE-2017-6058.patch?h=debian/qemu_2.8%2bdfsg-3";
-      sha256 = "0w8az2cr116mnijxjd4aprl8dvfdj76gm7ddajmngdslxiax601f";
-    })
-
     # security fixes from upstream
+    # net: imx: limit buffer descriptor count
     (upstreamPatch "CVE-2016-7907" "81f17e0d435c3db3a3e67e0d32ebf9c98973211f"
       "0dzghbm3jmnyw34kd40a6akrr1cpizd9hdzqmhlc2ljab7pr1rcb")
 
+    # watchdog: 6300esb: add exit function
     (upstreamPatch "CVE-2016-10155" "eb7a20a3616085d46aa6b4b4224e15587ec67e6e"
       "1xk00fyls0hdza11dyfrnzcn6gibmmcrwy7sxgp6iizp6wgzi3vw")
 
-    (upstreamPatch "CVE-2017-2615" "62d4c6bd5263bb8413a06c80144fc678df6dfb64"
-      "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h")
-
-    (upstreamPatch "CVE-2017-2620" "92f2b88cea48c6aeba8de568a45f2ed958f3c298"
-      "1kz12qmvfccy7xilsrxahbs67jycv4zjfbijxivadvx9klxs1n58")
-
+    # audio: ac97: add exit function
     (upstreamPatch "CVE-2017-5525" "12351a91da97b414eec8cdb09f1d9f41e535a401"
       "190b4aqr35p4lb3rjarknfi1ip1c9zizliqp1dd6frx4364y5yp2")
 
+    # audio: es1370: add exit function
     (upstreamPatch "CVE-2017-5526" "069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da"
       "05xgzd3zldk3x2vqpjag9z5ilhdkpkyh633fb5kvnz8scns6v86f")
 
+    # serial: fix memory leak in serial exit
     (upstreamPatch "CVE-2017-5579" "8409dc884a201bf74b30a9d232b6bbdd00cb7e2b"
       "0lbcyhif1kdcy8my0bv8aqr2f421kmljcch3plrjzj9pgcm4sv83")
 
-    (upstreamPatch "CVE-2017-5667" "42922105beb14c2fc58185ea022b9f72fb5465e9"
-      "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4")
-
-    (upstreamPatch "CVE-2017-5667-fix" "913a87885f589d263e682c2eb6637c6e14538061"
-      "0nm1k2r9n6r86dvjr16hxak2vcsinj7ijlqw5i6f4y5h2sh37wr5")
-
+    # megasas: fix guest-triggered memory leak
     (upstreamPatch "CVE-2017-5856" "765a707000e838c30b18d712fe6cb3dd8e0435f3"
       "03pjkn8l8rp9ip5h5rm1dp0nrwd43nmgpwamz4z1vy3rli1z3yjw")
 
+    # virtio-gpu: fix resource leak in virgl_cmd_resource_unref
     (upstreamPatch "CVE-2017-5857" "5e8e3c4c75c199aa1017db816fca02be2a9f8798"
       "1kz14rmxf049zl5m27apzpbvy8dk0g47n9gnwy0nm70g65rl1dh8")
 
+    # usb: ccid: check ccid apdu length
     (upstreamPatch "CVE-2017-5898" "c7dfbf322595ded4e70b626bf83158a9f3807c6a"
       "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn")
 
-    (upstreamPatch "CVE-2017-5931" "a08aaff811fb194950f79711d2afe5a892ae03a4"
-      "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5")
-
+    # xhci: apply limits to loops
     (upstreamPatch "CVE-2017-5973" "f89b60f6e5fee3923bedf80e82b4e5efc1bb156b"
       "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6")
 
+    # sd: sdhci: check transfer mode register in multi block transfer
     (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
       "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
 
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 833f030bed3..fbc5d1c7f76 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -418,7 +418,7 @@
+@@ -461,7 +461,7 @@
  
  
  install: all $(if $(BUILD_DOCS),install-doc) \

From 3d53b36bc3fa088e59716c51d9cf0891efb0a017 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 20:58:13 -0500
Subject: [PATCH 0562/1744] leo-editor: 5.3 -> 5.5

---
 pkgs/applications/editors/leo-editor/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 65fb927d48e..81f9ddd96d2 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "leo-editor-${version}";
-  version = "5.3";
+  version = "5.5";
 
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
     rev = version;
-    sha256 = "0whbay8ilabzpxdjaxv447y6bqbsilx161fv7wa15v3qqm2kapsp";
+    sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
   };
 
   dontBuild = true;
 
-  buildInputs = [ makeWrapper python3Packages.python ];
+  nativeBuildInputs = [ makeWrapper python3Packages.python ];
   propagatedBuildInputs = with python3Packages; [ pyqt5 ];
 
   desktopItem = makeDesktopItem rec {
@@ -56,10 +56,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://leoeditor.com";
+    homepage = http://leoeditor.com;
     description = "A powerful folding editor";
     longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers.";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ leonardoce ramkromberg ];
   };
 }

From 45fa146829167e6b45f46e131f01ae9b25c1ba15 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 21:24:08 -0500
Subject: [PATCH 0563/1744] git-imerge: 0.7.0 -> 1.0.0

---
 .../git-and-tools/git-imerge/default.nix      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 91180b33cde..49856552aa3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "git-imerge-${version}";
-  version = "0.7.0";
+  version = "1.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
-    sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+  src = fetchFromGitHub {
+    owner = "mhagger";
+    repo = "git-imerge";
+    rev = "v${version}";
+    sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-    wrapPythonPrograms
-  '';
-
+  makeFlags = "PREFIX= DESTDIR=$(out)" ; 
+ 
   meta = with stdenv.lib; {
     homepage = https://github.com/mhagger/git-imerge;
     description = "Perform a merge between two branches incrementally";

From 02dddacc75b33bba283c2edc924c031db0a60de9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 21:30:23 -0500
Subject: [PATCH 0564/1744] git-radar: 0.3.2 -> 0.5

---
 .../version-management/git-and-tools/git-radar/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 f61f9fe6d2a..3b10c3305ef 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,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "git-radar-${version}";
-  version = "0.3.2";
+  version = "0.5";
 
   phases = [ "unpackPhase" "installPhase" ];
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "michaeldfallen";
     repo = "git-radar";
     rev = "v${version}";
-    sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p";
+    sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
   };
 
   installPhase = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/michaeldfallen/git-radar;
     license = licenses.mit;
-    description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo";
+    description = "A tool you can add to your prompt to provide at-a-glance information on your git repo";
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ kamilchm ];
   };

From f70e7773ec39d67fb93e97cc08f53381d0507b49 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 2 Apr 2017 12:46:30 +0800
Subject: [PATCH 0565/1744] calibre: 2.80.0 -> 2.82.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index fc0374985cd..39f3a12b90a 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.80.0";
+  version = "2.82.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1cgj30b0imv4gl12y1lcd07w3bx10sapclvjr78z78n7g32xp9ik";
+    sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k";
   };
 
   patches = [

From cc779bc421330d61dbeb22f1949f5d9d2b80853a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Sun, 2 Apr 2017 10:11:01 +0200
Subject: [PATCH 0566/1744] doc: fix overlays paths

It was not updated with 9d6a55aefd7.
---
 doc/overlays.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index 540c83e0a39..4b95f3e7288 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -34,7 +34,7 @@ first one present is considered, and all the rest are ignored:
 
   <listitem>
 
-    <para>In the directory <filename>~/.nixpkgs/overlays/</filename>.</para>
+    <para>In the directory <filename>~/.config/nixpkgs/overlays/</filename>.</para>
   </listitem>
 
 </orderedlist>
@@ -50,7 +50,7 @@ the same recipe. In the case where overlays are loaded from a directory, they ar
 alphabetical order.</para>
 
 <para>To install an overlay using the last option, you can clone the overlay's repository and add
-a symbolic link to it in <filename>~/.nixpkgs/overlays/</filename> directory.</para>
+a symbolic link to it in <filename>~/.config/nixpkgs/overlays/</filename> directory.</para>
 
 </section>
 

From 7d076ab4fa27ee50ba67d7635172da85cc5d86fb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 04:04:32 -0500
Subject: [PATCH 0567/1744] lightdm: 1.18.1 -> 1.22.0 (#24545)

Remove patch
---
 .../display-managers/lightdm/default.nix      | 21 ++++---
 .../display-managers/lightdm/fix-paths.patch  | 61 -------------------
 2 files changed, 11 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/applications/display-managers/lightdm/fix-paths.patch

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index b3dd9f91ec8..191ec84f87b 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -4,38 +4,39 @@
 , withQt5 ? false, qtbase
 }:
 
+with stdenv.lib;
+
 let
-  ver_branch = "1.19";
-  version = "1.19.5";
+  ver_branch = "1.22";
+  version = "1.22.0";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z";
+    sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
   };
 
-  patches = [ ./fix-paths.patch ];
-
+  nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-    pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
+    pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
     qt4 libaudit gcc6
-  ] ++ stdenv.lib.optional withQt5 qtbase;
+  ] ++ optional withQt5 qtbase;
 
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--disable-tests"
-  ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
-    ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5";
+  ] ++ optional (qt4 != null) "--enable-liblightdm-qt"
+    ++ optional withQt5 "--enable-liblightdm-qt5";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://launchpad.net/lightdm;
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch
deleted file mode 100644
index 56930418cac..00000000000
--- a/pkgs/applications/display-managers/lightdm/fix-paths.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/common/user-list.c b/common/user-list.c
-index 792c6d3..57fbfb7 100644
---- a/common/user-list.c
-+++ b/common/user-list.c
-@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal)
- 
-     value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL);
-     if (!value)
--        value = g_strdup ("/bin/false /usr/sbin/nologin");
-+        value = g_strdup ("/run/current-system/sw/bin/nologin");
-     hidden_shells = g_strsplit (value, " ", -1);
-     g_free (value);
- 
-diff --git a/src/seat.c b/src/seat.c
-index f9b149d..9029742 100644
---- a/src/seat.c
-+++ b/src/seat.c
-@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
- 
-     /* Set POSIX variables */
-     process_set_clear_environment (script, TRUE);
--    process_set_env (script, "SHELL", "/bin/sh");
-+    process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh");
- 
-     /* Variables required for regression tests */
-     if (g_getenv ("LIGHTDM_TEST_ROOT"))
-@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
-         process_set_env (script, "PATH", g_getenv ("PATH"));
-     }
-     else
--        process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin");
-+        process_set_env (script, "PATH", "/run/current-system/sw/bin");
- 
-     if (user)
-     {
-diff --git a/src/session-child.c b/src/session-child.c
-index e85f57d..93db0bd 100644
---- a/src/session-child.c
-+++ b/src/session-child.c
-@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv)
-         else
-         {
-             /* Set POSIX variables */
--            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
-+            pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin");
-             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
-             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
-             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
-diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
-index 47f1c10..cc82652 100644
---- a/src/shared-data-manager.c
-+++ b/src/shared-data-manager.c
-@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data)
- 
-     gchar *path = g_build_filename (USERS_DIR, user, NULL);
-     gchar *quoted_path = g_shell_quote (path);
--    gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path);
-+    gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path);
- 
-     g_spawn_command_line_async (cmd, &error);
-     if (error)

From 195efedd2c784c96188afd835470a32f33d3a1fa Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 2 Apr 2017 11:21:34 +0200
Subject: [PATCH 0568/1744] qt58: Fix path to qhelpgenerator in cmake file.

It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
---
 .../development/libraries/qt-5/5.8/qttools/cmake-paths.patch | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
index 3d557c4c023..dfcba9045a7 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
@@ -18,7 +18,7 @@ Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake
      _qt5_Help_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-@@ -17,11 +16,7 @@ endif()
+@@ -17,11 +16,10 @@ endif()
  if (NOT TARGET Qt5::qhelpgenerator)
      add_executable(Qt5::qhelpgenerator IMPORTED)
  
@@ -28,6 +28,9 @@ Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake
 -    set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
 -!!ENDIF
 +    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
++    endif()
      _qt5_Help_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::qhelpgenerator PROPERTIES

From b5121db20dd0a16a1038023355e0d8b074e25b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 15:19:44 +0200
Subject: [PATCH 0569/1744] xorg xf86-video-ati: 7.8.0 -> 7.9.0

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 49e71614bf9..32dfc11250b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1703,11 +1703,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (mkDerivation "xf86videoati" {
-    name = "xf86-video-ati-7.8.0";
+    name = "xf86-video-ati-7.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2;
-      sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0";
+      url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2;
+      sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 4aeace9f0c2..f99de7c7eac 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -130,7 +130,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2

From 3932d080be27b372eac02cb986f2f5931214c1d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 15:20:23 +0200
Subject: [PATCH 0570/1744] xorg xf86-video-nouveau: 1.0.13 -> 1.0.14

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 32dfc11250b..298c57eac15 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1869,11 +1869,11 @@ let
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videonouveau = (mkDerivation "xf86videonouveau" {
-    name = "xf86-video-nouveau-1.0.13";
+    name = "xf86-video-nouveau-1.0.14";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2;
-      sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd";
+      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2;
+      sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index f99de7c7eac..2bfa3d59621 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2

From 8eec2948baa50abf9f652e3d4b9c46cd69b6190f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 15:21:04 +0200
Subject: [PATCH 0571/1744] xorg-server: maintenance 1.19.2 -> 1.19.3

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 298c57eac15..5455798b549 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2364,11 +2364,11 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.19.2";
+    name = "xorg-server-1.19.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2;
-      sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2;
+      sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 2bfa3d59621..ce5a3c1b1d2 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 6bce07f87607fa84df7237b7b500c8a7398c7806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 15:26:46 +0200
Subject: [PATCH 0572/1744] xorg xf86-video-openchrome: 0.3.3 -> 0.6.0

Now it builds (again), but I haven't tested it in any other way.
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/overrides.nix     | 1 -
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5455798b549..bb805e6add0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1891,11 +1891,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
-    name = "xf86-video-openchrome-0.3.3";
+    name = "xf86-video-openchrome-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2;
-      sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
+      url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2;
+      sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c7a4ff20a73..99c9ffa14c2 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -340,7 +340,6 @@ in
   xf86videoglide      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoi128       = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videonewport    = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
-  xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videotga        = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videov4l        = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videovoodoo     = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ce5a3c1b1d2..04622d6e2d0 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -148,7 +148,7 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
-mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2

From 6ee0d284c13d6675cf26bff3129aa1542275232d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 21:11:56 -0500
Subject: [PATCH 0573/1744] git-cola: 2.8 -> 2.10

git-cola: Remove postFixup
---
 .../git-and-tools/git-cola/default.nix        | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index cf7f6b82ce2..2a9ea0715e0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,33 +1,21 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }:
+{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
 
 let
   inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
-  version = "2.8";
+  version = "2.10";
 
-  src = fetchurl {
-    url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
-    sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr";
+  src = fetchFromGitHub {
+    owner = "git-cola";
+    repo = "git-cola";
+    rev = "v${version}";
+    sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8";
   };
 
-  buildInputs = [ git makeWrapper gettext ];
+  buildInputs = [ git gettext ];
   propagatedBuildInputs = [ pyqt4 sip pyinotify ];
 
-  # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
-  # "import __future__" must be placed above that. This removes the argv[0] line.
-  postFixup = ''
-    wrapPythonPrograms
-
-    sed -i "$out/bin/.git-dag-wrapped" -e '{
-      /import sys; sys.argv/d
-    }'
-    
-    sed -i "$out/bin/.git-cola-wrapped" -e '{
-      /import sys; sys.argv/d
-    }'
-  '';
-
   doCheck = false;
 
   meta = with stdenv.lib; {

From cc4fa379cb12ac7d84b4a79c8f6b683815bb9664 Mon Sep 17 00:00:00 2001
From: David Sferruzza <david.sferruzza@gmail.com>
Date: Sun, 2 Apr 2017 16:37:11 +0200
Subject: [PATCH 0574/1744] maintainers: add dsferruzza

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 087c2463957..4e62799373a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -142,6 +142,7 @@
   dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
+  dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>";
   dtzWill = "Will Dietz <nix@wdtz.org>";
   e-user = "Alexander Kahl <nixos@sodosopa.io>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";

From 2ae74f9f4f288e8ee79b0c1da3e4876f74a9eab3 Mon Sep 17 00:00:00 2001
From: David Sferruzza <david.sferruzza@gmail.com>
Date: Sun, 2 Apr 2017 16:38:08 +0200
Subject: [PATCH 0575/1744] veracrypt: init at 1.19

---
 pkgs/applications/misc/veracrypt/default.nix | 44 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/misc/veracrypt/default.nix

diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
new file mode 100644
index 00000000000..8e817b5a815
--- /dev/null
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK30, devicemapper, makeself,
+  wxGUI ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "veracrypt-${version}";
+  version = "1.19";
+
+  src = fetchurl {
+    url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.gz";
+    sha256 = "111xs1zmic82lpn5spn0ca33q0g4za04a2k4cvjwdb7k3vcicq6v";
+  };
+
+  # The source archive can't be extracted with "tar xfz"; I don't know why
+  # Using "gunzip" before "tar xf" works though
+  unpackPhase =
+    ''
+      gunzip -c $src > src.tar
+      tar xf src.tar
+      cd Vera*/src
+    '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ fuse devicemapper wxGTK30 nasm makeself ];
+  makeFlags = if wxGUI then "" else "NOGUI=1";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp Main/veracrypt $out/bin
+      mkdir -p $out/share/$name
+      cp License.txt $out/share/$name/LICENSE
+      mkdir -p $out/share/applications
+      sed 's/\/usr\/bin\/veracrypt/veracrypt/' Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop
+    '';
+
+  meta = {
+    description = "Free Open-Source filesystem on-the-fly encryption";
+    homepage = https://veracrypt.codeplex.com/;
+    license = "VeraCrypt License";
+    maintainers = with stdenv.lib.maintainers; [dsferruzza];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9484dc06bc1..92ebdb0194b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4532,6 +4532,10 @@ with pkgs;
     python = python27;
   };
 
+  veracrypt = callPackage ../applications/misc/veracrypt {
+    wxGUI = true;
+  };
+
   vlan = callPackage ../tools/networking/vlan { };
 
   vmtouch = callPackage ../tools/misc/vmtouch { };

From 2c81510a1aacce580a66912ab1b6c2a64c5d0bff Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 2 Apr 2017 16:41:11 +0200
Subject: [PATCH 0576/1744] veracrypt: refactorings

- Conditionally add wxGTK30 to inputs to avoid
  eval'ing it regardless of wxGUI
- Patch full path to exe into desktop file
- Move some inputs to native
- Do not write intermediate tar file on unpack
---
 pkgs/applications/misc/veracrypt/default.nix | 21 ++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 8e817b5a815..a3fa8924df7 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -2,6 +2,8 @@
   wxGUI ? true
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "veracrypt-${version}";
   version = "1.19";
@@ -11,18 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "111xs1zmic82lpn5spn0ca33q0g4za04a2k4cvjwdb7k3vcicq6v";
   };
 
-  # The source archive can't be extracted with "tar xfz"; I don't know why
-  # Using "gunzip" before "tar xf" works though
+  # The source archive appears to be compressed twice ...
   unpackPhase =
     ''
-      gunzip -c $src > src.tar
-      tar xf src.tar
+      gzip -dc $src | tar xz
       cd Vera*/src
     '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse devicemapper wxGTK30 nasm makeself ];
-  makeFlags = if wxGUI then "" else "NOGUI=1";
+  nativeBuildInputs = [ makeself nasm pkgconfig ];
+  buildInputs = [ fuse devicemapper ]
+    ++ optional wxGUI wxGTK30;
+  makeFlags = optionalString (!wxGUI) "NOGUI=1";
 
   installPhase =
     ''
@@ -31,14 +32,14 @@ stdenv.mkDerivation rec {
       mkdir -p $out/share/$name
       cp License.txt $out/share/$name/LICENSE
       mkdir -p $out/share/applications
-      sed 's/\/usr\/bin\/veracrypt/veracrypt/' Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop
+      sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop
     '';
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
     homepage = https://veracrypt.codeplex.com/;
     license = "VeraCrypt License";
-    maintainers = with stdenv.lib.maintainers; [dsferruzza];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ dsferruzza ];
+    platforms = platforms.linux;
   };
 }

From b1c081499929f8ff5d879554a0283c421db0d063 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 10:28:00 -0500
Subject: [PATCH 0577/1744] jitsi: Fixed java not found

Cosmetic change

Closes #24565
---
 .../instant-messengers/jitsi/default.nix         | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 30fedec1a4b..c4cb25dfe98 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -6,7 +6,6 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-
   name = "jitsi-${version}";
   version = "2.10.5550";
 
@@ -15,7 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
   };
 
-
   patches = [ ./jitsi.patch ];
 
   jitsiItem = makeDesktopItem {
@@ -42,7 +40,8 @@ stdenv.mkDerivation rec {
     xorg.libXv
   ]);
 
-  buildInputs = [unzip ant jdk];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ ant jdk ];
 
   buildPhase = ''ant make'';
 
@@ -55,11 +54,11 @@ stdenv.mkDerivation rec {
     cp resources/install/generic/run.sh $out/bin/jitsi
     chmod +x $out/bin/jitsi
     substituteInPlace $out/bin/jitsi \
-        --subst-var-by JAVA ${jdk}/bin/java \
-        --subst-var-by EXTRALIBS ${gtk2.out}/lib
+      --subst-var-by JAVA ${jdk}/bin/java \
+      --subst-var-by EXTRALIBS ${gtk2.out}/lib
+    sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi
     patchShebangs $out
-
-    libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+    libPath="$libPath:${jdk.home}/lib/${jdk.architecture}"
     find $out/ -type f -name '*.so' | while read file; do
       patchelf --set-rpath "$libPath" "$file" && \
           patchelf --shrink-rpath "$file"
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
     description = "Open Source Video Calls and Chat";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.khumba ];
+    maintainers = with maintainers; [ khumba ndowens ];
   };
-
 }

From 9ceea2ff4579248592688eb6a0b057d1cc420fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 18:49:16 +0200
Subject: [PATCH 0578/1744] xorg xf86-video-amdgpu: 1.2.0 -> 1.3.0 (#24561)

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index bb805e6add0..2ba0055c735 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1670,11 +1670,11 @@ let
   }) // {inherit ;};
 
   xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" {
-    name = "xf86-video-amdgpu-1.2.0";
+    name = "xf86-video-amdgpu-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2;
-      sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7";
+      url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2;
+      sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1";
     };
     buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 04622d6e2d0..38574bf681f 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2

From 7286dfebbb405362c8ab8fdaa9868c27a9a3a81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Apr 2017 18:50:42 +0200
Subject: [PATCH 0579/1744] xorg xf86-input-libinput: 0.23.0 -> 0.25.0

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2ba0055c735..a4de1ecda43 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1604,11 +1604,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.23.0";
+    name = "xf86-input-libinput-0.25.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2;
-      sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2;
+      sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 38574bf681f..ee85de75b40 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

From 236e752e384bcc736bc2be658a16327bcb7b329a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 12:15:02 -0500
Subject: [PATCH 0580/1744] dmenu2: Cosmetic change

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

diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix
index 9dca8f983a4..3d567603359 100644
--- a/pkgs/applications/misc/dmenu2/default.nix
+++ b/pkgs/applications/misc/dmenu2/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
       description = "A patched fork of the original dmenu - an efficient dynamic menu for X";
       homepage = https://bitbucket.org/melek/dmenu2;
-      license = stdenv.lib.licenses.mit;
-      maintainers = with maintainers; [ cstrahan ];
+      license = licenses.mit;
+      maintainers = [ maintainers.cstrahan ];
       platforms = platforms.all;
   };
 }

From 35d23911e0ff4971da225da8c0c213d731b02430 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 12:19:48 -0500
Subject: [PATCH 0581/1744] doomseeker: Cosmetic cleanup

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

diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index a8d35680dbd..61b0357bb9d 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://doomseeker.drdteam.org/;
     description = "Multiplayer server browser for many Doom source ports";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.MP2E ];
   };
 }

From 3490c39f38ad467ad805f390ca881e7ba529a087 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 12:41:43 -0500
Subject: [PATCH 0582/1744] evopedia: Cosmetic

---
 pkgs/applications/misc/evopedia/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix
index 4a9c2b60006..170e2385d4a 100644
--- a/pkgs/applications/misc/evopedia/default.nix
+++ b/pkgs/applications/misc/evopedia/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchgit, bzip2, qt4, qmake4Hook, libX11 }:
+{ stdenv, fetchFromGitHub, bzip2, qt4, qmake4Hook, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "evopedia-${version}";
   version = "0.4.4";
 
-  src = fetchgit {
-    url = https://github.com/evopedia/evopedia_qt;
-    rev = "refs/tags/v${version}";
+  src = fetchFromGitHub {
+    owner = "evopedia";
+    repo = "evopedia_qt";
+    rev = "v${version}";
     sha256 = "0snp5qiywj306kfaywvkl7j34fivgxcb8dids1lzmbqq5xcpqqvc";
   };
 
   buildInputs = [ bzip2 qt4 libX11 ];
   nativeBuildInputs = [ qmake4Hook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Offline Wikipedia Viewer";
     homepage = http://www.evopedia.info;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ qknight ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.qknight ];
+    platforms = platforms.linux;
   };
 }

From a77571399d71167bf16b4183090a6f7e203d7e0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 2 Apr 2017 19:50:28 +0200
Subject: [PATCH 0583/1744] surf: 0.7 -> 2.0

This renders surf-webkit2 obsolete; it is now aliased to surf.
---
 .../networking/browsers/surf/default.nix      | 36 +++++++---------
 .../networking/browsers/surf/webkit2.nix      | 42 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  6 +--
 4 files changed, 17 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/surf/webkit2.nix

diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index ae6ce3dd2c3..04d475f36f0 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -1,42 +1,36 @@
-{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}:
+{ stdenv, fetchurl
+, pkgconfig, wrapGAppsHook
+, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk
+, patches ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "surf-${version}";
-  version="0.7";
+  version = "2.0";
 
   src = fetchurl {
     url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m";
+    sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
   };
 
-  buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ];
 
-  # Allow users set their own list of patches
   inherit patches;
 
-  buildPhase = " make ";
-
-  # `-lX11' to make sure libX11's store path is in the RPATH
-  NIX_LDFLAGS = "-lX11";
-  preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
   installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
 
-  preFixup = ''
-    wrapProgram "$out/bin/surf" \
-      --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = {
-    description = "Simple web browser";
+  meta = with stdenv.lib; {
+    description = "A simple web browser based on WebKit/GTK+";
     longDescription = ''
       Surf is a simple web browser based on WebKit/GTK+. It is able to display
       websites and follow links. It supports the XEmbed protocol which makes it
       possible to embed it in another application. Furthermore, one can point
       surf to another URI by setting its XProperties.
-      '';
+    '';
     homepage = http://surf.suckless.org;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    platforms = webkitgtk.meta.platforms;
+    maintainers = with maintainers; [ joachifm ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix
deleted file mode 100644
index 929bf7dbcb2..00000000000
--- a/pkgs/applications/networking/browsers/surf/webkit2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchzip
-, pkgconfig, wrapGAppsHook
-, glib, glib_networking, gsettings_desktop_schemas, gtk2, libsoup, webkitgtk
-, patches ? null
-}:
-
-let
-  # http://git.suckless.org/surf/log/?h=surf-webkit2
-  rev = "7e02344a615a61246ccce1c7f770e88fbd57756e";
-  sha256 = "11f93fbjhl7nfgwkcc45lcm3x1wk5h87ap8fbw9w855021i57pp6";
-  date = "2017-03-22";
-in
-
-stdenv.mkDerivation rec {
-  name = "surf-webkit2-${date}";
-
-  src = fetchzip {
-    url = "http://git.suckless.org/surf/snapshot/surf-${rev}.tar.gz";
-    inherit sha256;
-  };
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-  buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk2 libsoup webkitgtk ];
-
-  inherit patches;
-
-  installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
-
-  meta = with stdenv.lib; {
-    description = "A simple web browser based on WebKit/GTK+";
-    longDescription = ''
-      Surf is a simple web browser based on WebKit/GTK+. It is able to display
-      websites and follow links. It supports the XEmbed protocol which makes it
-      possible to embed it in another application. Furthermore, one can point
-      surf to another URI by setting its XProperties.
-    '';
-    homepage = http://surf.suckless.org;
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ joachifm ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 324e2d35cfd..9dca8e7e26c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -121,6 +121,7 @@ doNotDisplayTwice rec {
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   sshfsFuse = sshfs-fuse; # added 2016-09
+  surf-webkit2 = surf; # added 2017-04-02
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19
   tftp_hpa = tftp-hpa; # added 2015-04-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a96fade045..840cfb3c4fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15561,11 +15561,7 @@ with pkgs;
 
   subunit = callPackage ../development/libraries/subunit { };
 
-  surf = callPackage ../applications/networking/browsers/surf {
-    webkit = webkitgtk2;
-  };
-
-  surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { };
+  surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
 
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 

From 968e6d823b669f52b541219b53de59073ea3713a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 13:25:46 -0500
Subject: [PATCH 0584/1744] finalterm-git: Cosmetic change

---
 pkgs/applications/misc/finalterm/default.nix | 22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 1d8412a25f3..053cdd05991 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, lib, fetchgit, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper
 , pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
 , keybinder3, clutter_gtk, libnotify
 , libxkbcommon, xorg, udev
 , bashInteractive
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation {
   name = "finalterm-git-2014-11-15";
 
-  src = fetchgit {
-    url = "https://github.com/p-e-w/finalterm.git";
+  src = fetchFromGitHub {
+    owner = "p-e-w";
+    repo = "finalterm";
     rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b";
     sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i";
   };
 
+  nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
   buildInputs = [
-    pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee
-    gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
+    vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee
+    gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify
     xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
     libxkbcommon
-  ] ++ lib.optionals stdenv.isLinux [
-    udev
-  ];
+  ] ++ optionals stdenv.isLinux [ udev ];
 
   preConfigure = ''
     substituteInPlace data/org.gnome.finalterm.gschema.xml \
@@ -44,7 +46,7 @@ stdenv.mkDerivation {
       --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://finalterm.org";
     description = "A new breed of terminal emulator";
     longDescription = ''
@@ -57,7 +59,7 @@ stdenv.mkDerivation {
       - GUI terminal controls
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = [ maintainers.cstrahan ];
     platforms = platforms.linux;
   };
 }

From 35e0eea053d81f7aa933cd2747f43d3b4524c326 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 2 Apr 2017 20:29:30 +0200
Subject: [PATCH 0585/1744] ntpd: Allow additional syscalls in seccomp filter.

Fixes issue #21136.

The problem is that the seccomp system call filter configured by ntpd did not
include some system calls that were apparently needed. For example the
program hanged in getpid just after the filter was installed:

prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)  = 0
seccomp(SECCOMP_SET_MODE_STRICT, 1, NULL) = -1 EINVAL (Invalid argument)
seccomp(SECCOMP_SET_MODE_FILTER, 0, {len=41, filter=0x5620d7f0bd90}) = 0
getpid()                                = ?

I do not know exactly why this is a problem on NixOS only, perhaps we have getpid
caching disabled.

The fcntl and setsockopt system calls also had to be added.
---
 pkgs/tools/networking/ntp/default.nix   |  4 +++
 pkgs/tools/networking/ntp/seccomp.patch | 44 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/networking/ntp/seccomp.patch

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 64f4b9008b1..37078d39fe6 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p";
   };
 
+  # The hardcoded list of allowed system calls for seccomp is
+  # insufficient for NixOS, add more to make it work (issue #21136).
+  patches = [ ./seccomp.patch ];
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch
new file mode 100644
index 00000000000..28de2f01d07
--- /dev/null
+++ b/pkgs/tools/networking/ntp/seccomp.patch
@@ -0,0 +1,44 @@
+diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
+--- ntp-4.2.8p10.orig/ntpd/ntpd.c	2017-04-02 20:21:17.371319663 +0200
++++ ntp-4.2.8p10/ntpd/ntpd.c	2017-04-02 21:26:02.766178723 +0200
+@@ -1157,10 +1157,12 @@
+ 	SCMP_SYS(close),
+ 	SCMP_SYS(connect),
+ 	SCMP_SYS(exit_group),
++	SCMP_SYS(fcntl),
+ 	SCMP_SYS(fstat),
+ 	SCMP_SYS(fsync),
+ 	SCMP_SYS(futex),
+ 	SCMP_SYS(getitimer),
++	SCMP_SYS(getpid),
+ 	SCMP_SYS(getsockname),
+ 	SCMP_SYS(ioctl),
+ 	SCMP_SYS(lseek),
+@@ -1179,6 +1181,7 @@
+ 	SCMP_SYS(sendto),
+ 	SCMP_SYS(setitimer),
+ 	SCMP_SYS(setsid),
++        SCMP_SYS(setsockopt),
+ 	SCMP_SYS(socket),
+ 	SCMP_SYS(stat),
+ 	SCMP_SYS(time),
+@@ -1195,9 +1198,11 @@
+ 	SCMP_SYS(clock_settime),
+ 	SCMP_SYS(close),
+ 	SCMP_SYS(exit_group),
++	SCMP_SYS(fcntl),
+ 	SCMP_SYS(fsync),
+ 	SCMP_SYS(futex),
+ 	SCMP_SYS(getitimer),
++	SCMP_SYS(getpid),
+ 	SCMP_SYS(madvise),
+ 	SCMP_SYS(mmap),
+ 	SCMP_SYS(mmap2),
+@@ -1211,6 +1216,7 @@
+ 	SCMP_SYS(select),
+ 	SCMP_SYS(setitimer),
+ 	SCMP_SYS(setsid),
++        SCMP_SYS(setsockopt),
+ 	SCMP_SYS(sigprocmask),
+ 	SCMP_SYS(sigreturn),
+ 	SCMP_SYS(socketcall),

From 6d4e6102a7ccef2529ecfd990793d32eef204679 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 30 Mar 2017 22:51:15 +0200
Subject: [PATCH 0586/1744] libgsf: Use separate dev output

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

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 588d0b8dadc..f2f062785b6 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]
     ++ libintlOrEmpty;
 
+  outputs = [ "out" "dev" ];
+
   doCheck = true;
   preCheck = "patchShebangs ./tests/";
 

From 747ad4befd7ceae21f0620bf3b2ac7dfe57d89c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 30 Mar 2017 23:21:17 +0200
Subject: [PATCH 0587/1744] mlt: Remove some -dev paths from the closure

This reduces the closure size of mlt-qt5 from 683 to 278 MiB.
---
 pkgs/development/libraries/mlt/default.nix |  5 +++++
 pkgs/development/libraries/mlt/qt-5.nix    | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 2e51492f142..a28936fee49 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+
+    # Remove an unnecessary reference to movit.dev.
+    s=${movit.dev}/include
+    t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
+    sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 5b255bd2d2b..1d56d58c68d 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     ladspa-sdk
   ];
 
+  outputs = [ "out" "dev" ];
+
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
   configureFlags = [
@@ -31,6 +33,16 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+
+    # Remove an unnecessary reference to movit.dev.
+    s=${movit.dev}/include
+    t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
+    sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
+
+    # Remove an unnecessary reference to movit.dev.
+    s=${qtbase.dev}/include
+    t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
+    sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g"
   '';
 
   passthru = {

From 17aab8a63e703177ffd2b070036ce5527822d640 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 2 Apr 2017 21:52:11 +0200
Subject: [PATCH 0588/1744] yotube-dl: 2017.03.10 -> 2017.04.02

---
 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 aa92e66d98f..b9548a5bff5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.03.10";
+  version = "2017.04.02";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0ccrwhgycz17xmsdsd0rsv7khhp1z7dnwp7fkxx7dxbivjf0h0a4";
+    sha256 = "131z42aq2qnh394y4ykzm3mvsf62lia86y90as6acyg4v201lgk2";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ff4fa6387e5f3ed7e671cb57d522bbb67376d34e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 2 Apr 2017 15:22:32 -0500
Subject: [PATCH 0589/1744] diff-so-fancy: 0.11.1 -> 0.11.4 (#24562)

---
 .../git-and-tools/diff-so-fancy/default.nix    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index aa4b83c59b5..3b1837d16f1 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "diff-so-fancy-${version}";
-  version = "0.11.1";
-
-  # perl is needed here so patchShebangs can do its job
-  buildInputs = [perl makeWrapper];
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
     rev = "v${version}";
-    sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3";
+    sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig";
   };
 
+  # Perl is needed here for patchShebangs
+  nativeBuildInputs = [ perl makeWrapper ];
+
   buildPhase = null;
 
   installPhase = ''
@@ -34,16 +34,14 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${ncurses.out}/bin"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/so-fancy/diff-so-fancy;
     description = "Good-looking diffs filter for git";
-    license = stdenv.lib.licenses.mit;
-
+    license = licenses.mit;
+    platforms = platforms.all;
     longDescription = ''
       diff-so-fancy builds on the good-lookin' output of git contrib's
       diff-highlight to upgrade your diffs' appearances.
     '';
-
-    platforms = stdenv.lib.platforms.all;
   };
 }

From 59c097730030f12398fb9d8c70f93571f589e694 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Apr 2017 14:45:44 -0400
Subject: [PATCH 0590/1744] Add facility to append secrets to the initrd

---
 nixos/modules/system/activation/top-level.nix |  2 +
 nixos/modules/system/boot/stage-1-init.sh     |  8 ++
 nixos/modules/system/boot/stage-1.nix         | 93 ++++++++++++++++++-
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 84c23bed3e3..e9897cc01b6 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -53,6 +53,8 @@ let
 
         ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
 
+        ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
+
         ln -s ${config.hardware.firmware}/lib/firmware $out/firmware
       ''}
 
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f0699ad9832..c75e637124a 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -8,6 +8,14 @@ export LD_LIBRARY_PATH=@extraUtils@/lib
 export PATH=@extraUtils@/bin
 ln -s @extraUtils@/bin /bin
 
+# Copy the secrets to their needed location
+if [ -d "@extraUtils@/secrets" ]; then
+    for secret in $(cd "@extraUtils@/secrets"; find . -type f); do
+        mkdir -p $(dirname "/$secret")
+        ln -s "@extraUtils@/secrets/$secret" "$secret"
+    done
+fi
+
 # Stop LVM complaining about fd3
 export LVM_SUPPRESS_FD_WARNINGS=true
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 61def24efd8..e3a3b6f88cf 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -82,6 +82,17 @@ let
         copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
       ''}
 
+      # Copy secrets if needed.
+      ${optionalString (!config.boot.loader.supportsInitrdSecrets)
+          (concatStringsSep "\n" (mapAttrsToList (dest: source:
+             let source' = if source == null then dest else source; in
+               ''
+                  mkdir -p $(dirname "$out/secrets/${dest}")
+                  cp -a ${source'} "$out/secrets/${dest}"
+                ''
+          ) config.boot.initrd.secrets))
+       }
+
       ${config.boot.initrd.extraUtilsCommands}
 
       # Copy ld manually since it isn't detected correctly
@@ -242,6 +253,52 @@ let
       ];
   };
 
+  # Script to add secret files to the initrd at bootloader update time
+  initialRamdiskSecretAppender =
+    pkgs.writeScriptBin "append-initrd-secrets"
+      ''
+        #!${pkgs.bash}/bin/bash -e
+        function usage {
+          echo "USAGE: $0 INITRD_FILE" >&2
+          echo "Appends this configuration's secrets to INITRD_FILE" >&2
+        }
+
+        if [ $# -ne 1 ]; then
+          usage
+          exit 1
+        fi
+
+        if [ "$1"x = "--helpx" ]; then
+          usage
+          exit 0
+        fi
+
+        ${lib.optionalString (config.boot.initrd.secrets == {})
+            "exit 0"}
+
+        export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin
+
+        function cleanup {
+          if [ -n "$tmp" -a -d "$tmp" ]; then
+            rm -fR "$tmp"
+          fi
+        }
+        trap cleanup EXIT
+
+        tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX)
+
+        ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source:
+            let source' = if source == null then dest else toString source; in
+              ''
+                mkdir -p $(dirname "$tmp/${dest}")
+                cp -a ${source'} "$tmp/${dest}"
+              ''
+          ) config.boot.initrd.secrets)
+         }
+
+        (cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1"
+      '';
+
 in
 
 {
@@ -370,6 +427,25 @@ in
       example = "xz";
     };
 
+    boot.initrd.secrets = mkOption
+      { internal = true;
+        default = {};
+        type = types.attrsOf (types.nullOr types.path);
+        description =
+          ''
+            Secrets to append to the initrd. The attribute name is the
+            path the secret should have inside the initrd, the value
+            is the path it should be copied from (or null for the same
+            path inside and out).
+          '';
+        example = literalExample
+          ''
+            { "/etc/dropbear/dropbear_rsa_host_key" =
+                ./secret-dropbear-key;
+            }
+          '';
+      };
+
     boot.initrd.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
@@ -377,6 +453,18 @@ in
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
+    boot.loader.supportsInitrdSecrets = mkOption
+      { internal = true;
+        default = false;
+        type = types.bool;
+        description =
+          ''
+            Whether the bootloader setup runs append-initrd-secrets.
+            If not, any needed secrets must be copied into the initrd
+            and thus added to the store.
+          '';
+      };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -404,9 +492,8 @@ in
       }
     ];
 
-    system.build.bootStage1 = bootStage1;
-    system.build.initialRamdisk = initialRamdisk;
-    system.build.extraUtils = extraUtils;
+    system.build =
+      { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils; };
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "TMPFS")

From b09490a3229dd5ac4169248ee38ca22e357c0aa2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Apr 2017 14:51:09 -0400
Subject: [PATCH 0591/1744] systemd-boot: Support initrd secrets

---
 .../boot/loader/systemd-boot/systemd-boot-builder.py   | 10 +++++++++-
 .../system/boot/loader/systemd-boot/systemd-boot.nix   |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 04cf17c1b0b..d5e00129a82 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -32,8 +32,11 @@ def write_loader_conf(generation):
             f.write("editor 0");
     os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
 
+def profile_path(generation, name):
+    return os.readlink("%s/%s" % (system_dir(generation), name))
+
 def copy_from_profile(generation, name, dry_run=False):
-    store_file_path = os.readlink("%s/%s" % (system_dir(generation), name))
+    store_file_path = profile_path(generation, name)
     suffix = os.path.basename(store_file_path)
     store_dir = os.path.basename(os.path.dirname(store_file_path))
     efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)
@@ -44,6 +47,11 @@ def copy_from_profile(generation, name, dry_run=False):
 def write_entry(generation, machine_id):
     kernel = copy_from_profile(generation, "kernel")
     initrd = copy_from_profile(generation, "initrd")
+    try:
+        append_initrd_secrets = profile_path(generation, "append-initrd-secrets")
+        subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)])
+    except FileNotFoundError:
+        pass
     entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
     generation_dir = os.readlink(system_dir(generation))
     tmp_path = "%s.tmp" % (entry_file)
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index ec02f73cada..a5a88a99be8 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -65,6 +65,8 @@ in {
 
     boot.loader.grub.enable = mkDefault false;
 
+    boot.loader.supportsInitrdSecrets = true;
+
     system = {
       build.installBootLoader = gummibootBuilder;
 

From 3a26d09e1542494770ff2f3f571d3b0e94d21218 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Apr 2017 15:35:45 -0400
Subject: [PATCH 0592/1744] initrd-ssh: Use initrd secrets for host keys

---
 nixos/modules/system/boot/initrd-ssh.nix | 33 ++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 59ecaf8d5a6..d78775c2758 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -44,9 +44,10 @@ in
       description = ''
         RSA SSH private key file in the Dropbear format.
 
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
+        WARNING: Unless your bootloader supports initrd secrets, this key is
+        contained insecurely in the global Nix store. Do NOT use your regular
+        SSH host private keys for this purpose or you'll expose them to
+        regular users!
       '';
     };
 
@@ -56,9 +57,10 @@ in
       description = ''
         DSS SSH private key file in the Dropbear format.
 
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
+        WARNING: Unless your bootloader supports initrd secrets, this key is
+        contained insecurely in the global Nix store. Do NOT use your regular
+        SSH host private keys for this purpose or you'll expose them to
+        regular users!
       '';
     };
 
@@ -68,9 +70,10 @@ in
       description = ''
         ECDSA SSH private key file in the Dropbear format.
 
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
+        WARNING: Unless your bootloader supports initrd secrets, this key is
+        contained insecurely in the global Nix store. Do NOT use your regular
+        SSH host private keys for this purpose or you'll expose them to
+        regular users!
       '';
     };
 
@@ -97,10 +100,6 @@ in
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
       cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
-
-      ${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"}
-      ${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"}
-      ${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"}
     '';
 
     boot.initrd.extraUtilsCommandsTest = ''
@@ -116,9 +115,6 @@ in
       touch /var/log/lastlog
 
       mkdir -p /etc/dropbear
-      ${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"}
-      ${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"}
-      ${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"}
 
       mkdir -p /root/.ssh
       ${concatStrings (map (key: ''
@@ -128,6 +124,11 @@ in
       dropbear -s -j -k -E -m -p ${toString cfg.port}
     '';
 
+    boot.initrd.secrets =
+     (optionalAttrs (cfg.hostRSAKey != null) { "/etc/dropbear/dropbear_rsa_host_key" = cfg.hostRSAKey; }) //
+     (optionalAttrs (cfg.hostDSSKey != null) { "/etc/dropbear/dropbear_dss_host_key" = cfg.hostDSSKey; }) //
+     (optionalAttrs (cfg.hostECDSAKey != null) { "/etc/dropbear/dropbear_ecdsa_host_key" = cfg.hostECDSAKey; });
+
   };
 
 }

From 74e2f482fe6821fab0c335f02690d8a48fbbdcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Apr 2017 22:09:09 +0200
Subject: [PATCH 0593/1744] pdfshuffler: init at unstable-2017-02-26

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

diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix
new file mode 100644
index 00000000000..e01956e3611
--- /dev/null
+++ b/pkgs/applications/misc/pdfshuffler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchsvn
+, wrapGAppsHook, makeWrapper, gettext
+, python3Packages, gtk3, poppler_gi
+, gnome3, gsettings_desktop_schemas, shared_mime_info,
+}:
+
+python3Packages.buildPythonApplication rec {
+  name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years
+
+  src = fetchsvn {
+    url = "http://svn.gna.org/svn/pdfshuffler/trunk";
+    rev = "20";
+    sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ];
+
+  buildInputs = [
+    gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    pycairo
+    pypdf2
+  ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
+  '';
+
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    homepage = https://gna.org/projects/pdfshuffler/;
+    description = "Merge or split pdf documents and rotate, crop and rearrange their pages";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 840cfb3c4fb..af43369ea56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3439,6 +3439,8 @@ with pkgs;
     inherit (pythonPackages) pillow;
   };
 
+  pdfshuffler = callPackage ../applications/misc/pdfshuffler { };
+
   briss = callPackage ../tools/graphics/briss { };
 
   brickd = callPackage ../servers/brickd {

From fda2590abb81795e0e5b90d4f5fd5f40f2ce3242 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 2 Apr 2017 23:43:13 +0300
Subject: [PATCH 0594/1744] v4l_utils: 1.10.1 -> 1.12.3

Add CLI utils-only mode.
Use flags instead of null's.
Move to Qt 5.
---
 pkgs/os-specific/linux/v4l-utils/default.nix | 54 +++++++++-----------
 pkgs/top-level/all-packages.nix              |  9 +---
 2 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 11a9808392a..c0e065b3b55 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,54 +1,50 @@
-{ stdenv, fetchurl, pkgconfig
-, libjpeg
-, alsaLib ? null
-, libX11 ? null
-, qt4 ? null # The default is set to qt4 in all-packages.nix
-, qt5 ? null
+{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper
+, libjpeg, udev
+, withUtils ? true
+, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
 }:
 
 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
 
-assert qt4 != null -> qt5 == null;
-assert qt5 != null -> qt4 == null;
-
-let
-  inherit (stdenv.lib) optional;
-in
-
 stdenv.mkDerivation rec {
-  name = "v4l-utils-1.10.1";
+  name = "v4l-utils-${version}";
+  version = "1.12.3";
 
   src = fetchurl {
     url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
-    sha256 = "1h1nhg5cmmzlbipak526nk4bm6d0yb217mll75f3rpg7kz1cqiv1";
+    sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss";
   };
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = [
-    "--enable-libv4l"
-  ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [
-    "--with-udevdir=\${out}/lib/udev"
-    "--enable-v4l-utils"
-    "--enable-qv4l2"
-  ] else [
-    "--without-libudev"
-    "--without-udevdir"
-    "--disable-v4l-utils"
-    "--disable-qv4l2"
-  ]);
+  configureFlags =
+    if withUtils then [
+      "--with-udevdir=\${out}/lib/udev"
+    ] else [
+      "--disable-v4l-utils"
+    ];
 
   postFixup = ''
     # Create symlink for V4l1 compatibility
     ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper;
 
-  buildInputs = [ alsaLib libX11 qt4 qt5 ];
+  buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
 
   propagatedBuildInputs = [ libjpeg ];
 
+  NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11";
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  postInstall = lib.optionalString (withUtils && withGUI) ''
+    wrapQtProgram $out/bin/qv4l2
+  '';
+
   meta = with stdenv.lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
     homepage = http://linuxtv.org/projects.php;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af43369ea56..1fb20dab34d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8844,10 +8844,7 @@ with pkgs;
   };
 
   libv4l = lowPrio (v4l_utils.override {
-    alsaLib = null;
-    libX11 = null;
-    qt4 = null;
-    qt5 = null;
+    withUtils = false;
   });
 
   libva = callPackage ../development/libraries/libva { };
@@ -12198,9 +12195,7 @@ with pkgs;
     systemd = null;
   });
 
-  v4l_utils = callPackage ../os-specific/linux/v4l-utils {
-    qt5 = null;
-  };
+  v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
   vndr = callPackage ../development/tools/vndr { };
 

From 500818b997fd871534ef13bdd642a899007f3fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Apr 2017 22:59:23 +0200
Subject: [PATCH 0595/1744] ntp: 4.2.8p9 -> 4.2.8p10; fix 10 medium/4 low CVEs

http://nwtime.org/network-time-foundation-publishes-ntp-4-2-8-p10/
---
 pkgs/tools/networking/ntp/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 64f4b9008b1..b4053c7a956 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p9";
+  name = "ntp-4.2.8p10";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p";
+    sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx";
   };
 
   configureFlags = [
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/doc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ntp.org/;
     description = "An implementation of the Network Time Protocol";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.linux;
   };
 }

From 68db8222b633ff20b61199941274547d87edac9f Mon Sep 17 00:00:00 2001
From: Vasiliy Solovey <miltador@yandex.ua>
Date: Mon, 3 Apr 2017 04:21:30 +0300
Subject: [PATCH 0596/1744] jetbrains: add alias for idea

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 324e2d35cfd..48db8f47295 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -62,6 +62,7 @@ doNotDisplayTwice rec {
   gnustep-make = gnustep.make; # added 2016-7-6
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
+  idea = jetbrains; # added 2017-04-03
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28

From 53a516b198e1c7815176e0b016e749623ecfcb64 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Sun, 2 Apr 2017 22:33:23 -0400
Subject: [PATCH 0597/1744] src: 1.12 -> 1.13

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

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 2fd45ec7fc0..e75223c6c36 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.12";
+  version = "1.13";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "1m6rjbizx9win3jkciyx176sfy98r5arb1g3l6aqnqam9gpr44zm";
+    sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8";
   };
 
   buildInputs = [ python rcs git makeWrapper ];

From aac3f9a8cb3367dd2d204850951b0493f72ac070 Mon Sep 17 00:00:00 2001
From: Brandon Dimcheff <bdimchef-git@wieldim.com>
Date: Sun, 2 Apr 2017 23:37:24 -0400
Subject: [PATCH 0598/1744] astroid: 0.7 -> 0.8

Upgraded astroid to 0.8 and uses the upstream changes to properly
propagate environment without a patch.  Note that this still uses an
unsupported version of webkitgtk and thus will fail to build, but if
allow webkitgtk to install, astroid will run.
---
 .../networking/mailreaders/astroid/default.nix      | 10 ++++------
 .../mailreaders/astroid/propagate-environment.patch | 13 -------------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 96b1b7d285e..668044f5efb 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -3,25 +3,23 @@
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf";
+    sha256 = "1gjrdls1mz8y8bca7s8l965l0m7s2sb6g7a90gy848admjsyav7h";
   };
 
-  patches = [ ./propagate-environment.patch ];
-
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
 
   buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
                   notmuch boost gnome3.gsettings_desktop_schemas
                   gnome3.adwaita-icon-theme ];
 
-  buildPhase = "scons --prefix=$out build";
-  installPhase = "scons --prefix=$out install";
+  buildPhase = "scons --propagate-environment --prefix=$out build";
+  installPhase = "scons --propagate-environment --prefix=$out install";
 
   meta = {
     homepage = "https://astroidmail.github.io/";
diff --git a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
deleted file mode 100644
index db536ea721f..00000000000
--- a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index a80bca3..ed2cd6d 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -5,7 +5,7 @@ from subprocess import *
- def getGitDesc():
-   return Popen('git describe --abbrev=8 --tags --always', stdout=PIPE, shell=True).stdout.read ().strip ()
- 
--env = Environment ()
-+env = Environment(ENV = os.environ)
- 
- AddOption ("--release", action="store", dest="release", default="git", help="Make a release (default: git describe output)")
- AddOption ("--enable-debug", action="store", dest="debug", default=None, help="Enable the -g flag for debugging (default: true when release is git)")

From 9f34d1f19a34771b493d3bd5e3361a127bc10c98 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 3 Apr 2017 11:59:24 +0800
Subject: [PATCH 0599/1744] terraform: remove 0.8.5 specific file

It is now handled by the terraform build function instead.
---
 .../networking/cluster/terraform/0.8.5.nix    | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform/0.8.5.nix

diff --git a/pkgs/applications/networking/cluster/terraform/0.8.5.nix b/pkgs/applications/networking/cluster/terraform/0.8.5.nix
deleted file mode 100644
index 7f927b58670..00000000000
--- a/pkgs/applications/networking/cluster/terraform/0.8.5.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  name = "terraform-${version}";
-  version = "0.8.5";
-
-  goPackagePath = "github.com/hashicorp/terraform";
-
-  src = fetchFromGitHub {
-    owner  = "hashicorp";
-    repo   = "terraform";
-    rev    = "v${version}";
-    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
-  };
-
-  postInstall = ''
-    # remove all plugins, they are part of the main binary now
-    for i in $bin/bin/*; do
-      if [[ $(basename $i) != terraform ]]; then
-        rm "$i"
-      fi
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Tool for building, changing, and versioning infrastructure";
-    homepage = "https://www.terraform.io/";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
-      jgeerds
-      zimbatm
-    ];
-  };
-}

From db6a2918b9427f8f82c025e7f7aac4c5ed138f7a Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Mon, 3 Apr 2017 15:54:04 +1200
Subject: [PATCH 0600/1744] kt: init at 11.1.0

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e639eb5aefb..fb526ec05ba 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -521,6 +521,7 @@
   tvorog = "Marsel Zaripov <marszaripov@gmail.com>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   uralbash = "Svintsov Dmitry <root@uralbash.ru>";
+  utdemir = "Utku Demir <me@utdemir.com>";
   #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
new file mode 100644
index 00000000000..738eceb20a0
--- /dev/null
+++ b/pkgs/tools/misc/kt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "kt-${version}";
+  version = "11.1.0";
+
+  src = fetchFromGitHub {
+    owner = "fgeller";
+    repo = "kt";
+    rev = "v${version}";
+    sha256 = "1ymygd3l5pfbnjmdjcrspj520v29hnv3bdgxpim38dpv3qj518vq";
+  };
+
+  goPackagePath = "github.com/fgeller/kt";
+
+  meta = with stdenv.lib; {
+    description = "Kafka command line tool";
+    homepage = https://github.com/fgeller/kt;
+    maintainers = with maintainers; [ utdemir ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fb20dab34d..6ae96cf5f14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6219,6 +6219,8 @@ with pkgs;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
 
+  kt = callPackage ../tools/misc/kt {};
+
   asn2quickder = callPackage ../development/tools/asn2quickder {};
 
   astyle = callPackage ../development/tools/misc/astyle { };

From 398823da6e8a98d92086606988a78fda7bbeca5b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 20 Feb 2017 21:45:48 -0400
Subject: [PATCH 0601/1744] Revert "steam: use custom openssl"

No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754

This reverts commit a120bad30cbd63019971e9d03edd82423131852c.
---
 pkgs/games/steam/runtime-wrapped.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 74548fcfb8c..5cf55535db1 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -58,6 +58,7 @@ let
     SDL
     SDL2_image
     glew110
+    openssl
     libidn
 
     # Other things from runtime
@@ -87,7 +88,6 @@ let
     alsaLib
     openalSoft
     libva
-    openssl-steam
     vulkan-loader
   ] ++ lib.optional newStdcpp gcc.cc;
 

From 2c006ca80565a2a58fbf992f6442722baed497cc Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 4 Mar 2017 16:40:50 -0400
Subject: [PATCH 0602/1744] Revert "openssl: add custom build of 1.0.2 for
 steam"

No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754

This reverts commit a50784b34e771aa4a6c5f4eeb8c25295c15e4ed4.
---
 .../development/libraries/openssl/default.nix |  15 +--
 .../openssl/openssl-fix-cpuid_setup.patch     | 105 ------------------
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 3 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index a9f8c32dde9..2009daa1cc8 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -9,7 +9,7 @@ let
   opensslCrossSystem = stdenv.cross.openssl.system or
     (throw "openssl needs its platform name cross building");
 
-  common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec {
+  common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
     name = "openssl-${version}";
 
     src = fetchurl {
@@ -47,10 +47,7 @@ let
     ] ++ stdenv.lib.optionals withCryptodev [
       "-DHAVE_CRYPTODEV"
       "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
-    ++ args.configureFlags or [];
-
-    postConfigure = if makeDepend then "make depend" else null;
+    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2";
 
     makeFlags = [ "MANDIR=$(man)/share/man" ];
 
@@ -121,12 +118,4 @@ in {
     sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
   };
 
-  openssl_1_0_2-steam = common {
-    version = "1.0.2k";
-    sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";
-    configureFlags = [ "no-engine" ];
-    makeDepend = true;
-    patches = [ ./openssl-fix-cpuid_setup.patch ];
-  };
-
 }
diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch
deleted file mode 100644
index 4a2384ca3da..00000000000
--- a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
-index 1925428..d2e42d2 100644
---- a/crypto/cryptlib.c
-+++ b/crypto/cryptlib.c
-@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP;
- #  else
- typedef unsigned long long IA32CAP;
- #  endif
-+
-+/* Compat function for STEAM */
-+extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*);
-+IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); }
-+
- void OPENSSL_cpuid_setup(void)
- {
-     static int trigger = 0;
--    IA32CAP OPENSSL_ia32_cpuid(unsigned int *);
-+    IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *);
-     IA32CAP vec;
-     char *env;
- 
-@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void)
-             vec = strtoul(env + off, NULL, 0);
- #  endif
-         if (off)
--            vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec;
-+            vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec;
-         else if (env[0] == ':')
--            vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
-+            vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P);
- 
-         OPENSSL_ia32cap_P[2] = 0;
-         if ((env = strchr(env, ':'))) {
-@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void)
-                 OPENSSL_ia32cap_P[2] = vecx;
-         }
-     } else
--        vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
-+        vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P);
- 
-     /*
-      * |(1<<10) sets a reserved bit to signal that variable
-diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
-index fba180a..b927c79 100644
---- a/crypto/cryptlib.h
-+++ b/crypto/cryptlib.h
-@@ -99,6 +99,9 @@ extern "C" {
- # define HEX_SIZE(type)          (sizeof(type)*2)
- 
- void OPENSSL_cpuid_setup(void);
-+#pragma GCC visibility push(hidden)
-+unsigned long long OPENSSL_ia32_cpuid(void);
-+#pragma GCC visibility pop
- extern unsigned int OPENSSL_ia32cap_P[];
- void OPENSSL_showfatal(const char *fmta, ...);
- void *OPENSSL_stderr(void);
-diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
-index d208d02..d4c0b24 100644
---- a/crypto/x86_64cpuid.pl
-+++ b/crypto/x86_64cpuid.pl
-@@ -52,10 +52,10 @@ OPENSSL_rdtsc:
- 	ret
- .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
- 
--.globl	OPENSSL_ia32_cpuid
--.type	OPENSSL_ia32_cpuid,\@function,1
-+.globl	OPENSSL_ia32_cpuid_new
-+.type	OPENSSL_ia32_cpuid_new,\@function,1
- .align	16
--OPENSSL_ia32_cpuid:
-+OPENSSL_ia32_cpuid_new:
- 	mov	%rbx,%r8		# save %rbx
- 
- 	xor	%eax,%eax
-@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid:
- 	mov	%r8,%rbx		# restore %rbx
- 	or	%r9,%rax
- 	ret
--.size	OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
-+.size	OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new
- 
- .globl  OPENSSL_cleanse
- .type   OPENSSL_cleanse,\@abi-omnipotent
-diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
-index e95f627..0781010 100644
---- a/crypto/x86cpuid.pl
-+++ b/crypto/x86cpuid.pl
-@@ -8,7 +8,7 @@ require "x86asm.pl";
- 
- for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 
--&function_begin("OPENSSL_ia32_cpuid");
-+&function_begin("OPENSSL_ia32_cpuid_new");
- 	&xor	("edx","edx");
- 	&pushf	();
- 	&pop	("eax");
-@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 	&mov	("eax","esi");
- 	&mov	("edx","ebp");
- &set_label("nocpuid");
--&function_end("OPENSSL_ia32_cpuid");
-+&function_end("OPENSSL_ia32_cpuid_new");
- 
- &external_label("OPENSSL_ia32cap_P");
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fb20dab34d..fe3cc43f208 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9240,7 +9240,6 @@ with pkgs;
   wolfssl = callPackage ../development/libraries/wolfssl { };
 
   openssl = openssl_1_0_2;
-  openssl-steam = openssl_1_0_2-steam;
 
   inherit (callPackages ../development/libraries/openssl {
       fetchurl = fetchurlBoot;
@@ -9250,8 +9249,7 @@ with pkgs;
       };
     })
     openssl_1_0_2
-    openssl_1_1_0
-    openssl_1_0_2-steam;
+    openssl_1_1_0;
 
   openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
     cryptodevHeaders = linuxPackages.cryptodev.override {

From b6036c95d069e074eaa408e5f2ca2a84f49278ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Apr 2017 09:08:31 +0200
Subject: [PATCH 0603/1744] release-small: use unar instead of unrar

It's a free (SW) alternative.  See #16868.
---
 pkgs/top-level/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 8872d7c676e..b12eda6f150 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -157,7 +157,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   time = linux;
   tinycc = linux;
   udev = linux;
-  unrar = linux;
+  unar = linux;
   unzip = all;
   upstart = linux;
   usbutils = linux;

From 438ac662aa598a065d2f270e78076c55f5d09aa9 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Mon, 3 Apr 2017 03:28:34 -0500
Subject: [PATCH 0604/1744] nomacs: init at 3.4 (#24580)

* nomacs: init at 3.4

* nomacs: add gsettings for gtk open dialogs

* nomacs: use fetchurl instead of fetchFromGitHub
---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/graphics/nomacs/default.nix | 66 +++++++++++++++++++
 .../graphics/nomacs/fix-appdata-install.patch | 13 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 82 insertions(+)
 create mode 100644 pkgs/applications/graphics/nomacs/default.nix
 create mode 100644 pkgs/applications/graphics/nomacs/fix-appdata-install.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fb526ec05ba..776b87c80f7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -25,6 +25,7 @@
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
+  ahmedtd = "Taahir Ahmed <ahmed.taahir@gmail.com>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
   akc = "Anders Claesson <akc@akc.is>";
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
new file mode 100644
index 00000000000..0f0e0984a87
--- /dev/null
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, makeWrapper
+, pkgconfig
+, wrapGAppsHook
+, gsettings_desktop_schemas
+
+, qtbase
+, qttools
+, qtsvg
+
+, exiv2
+, opencv
+, libraw
+, libtiff
+, quazip
+}:
+
+stdenv.mkDerivation rec {
+  version = "3.4";
+  src = fetchFromGitHub {
+    owner = "nomacs";
+    repo = "nomacs";
+    rev = "3.4";
+    sha256 = "1l7q85dsiss0ix25niybj27zx1ssd439mwj449rxixa351cg1r2z";
+  };
+
+  name = "nomacs-${version}";
+
+  enableParallelBuilding = true;
+
+  sourceRoot = "${name}/ImageLounge";
+
+  patches = [./fix-appdata-install.patch];
+
+  nativeBuildInputs = [cmake
+                       pkgconfig
+                       wrapGAppsHook];
+
+  buildInputs = [qtbase
+                 qttools
+                 qtsvg
+                 exiv2
+                 opencv
+                 libraw
+                 libtiff
+                 quazip
+                 gsettings_desktop_schemas];
+
+
+  cmakeFlags = ["-DENABLE_OPENCV=ON"
+                "-DENABLE_RAW=ON"
+                "-DENABLE_TIFF=ON"
+                "-DENABLE_QUAZIP=ON"
+                "-DUSE_SYSTEM_QUAZIP=ON"];
+
+  meta = with stdenv.lib; {
+    homepage = https://nomacs.org;
+    description = "Qt-based image viewer";
+    maintainers = [maintainers.ahmedtd];
+    license = licenses.gpl3Plus;
+    repositories.git = https://github.com/nomacs/nomacs.git;
+    inherit (qtbase.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch
new file mode 100644
index 00000000000..cdeed56f496
--- /dev/null
+++ b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake
+index 3521056a..34f99ed9 100644
+--- a/cmake/UnixBuildTarget.cmake
++++ b/cmake/UnixBuildTarget.cmake
+@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations)
+ #  manpage
+ install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
+ #  appdata
+-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/)
++install(FILES nomacs.appdata.xml DESTINATION share/appdata/)
+ 
+ # "make dist" target
+ string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43368d83472..e6b4b7ee6f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14814,6 +14814,8 @@ with pkgs;
 
   nedit = callPackage ../applications/editors/nedit { };
 
+  nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
+
   notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch { };

From 1a0a60482bcf92d1ca87f709206904806dfa06d9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 3 Apr 2017 10:02:47 +0200
Subject: [PATCH 0605/1744] snapraid: 11.0 -> 11.1

build from source, not the release configure scripts already generated
---
 pkgs/tools/filesystems/snapraid/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index bbaad516ebe..ccb20e9f1bd 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "snapraid-${version}";
-  version = "11.0";
+  version = "11.1";
 
-  src = fetchurl {
-    url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz";
-    sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh";
+  src = fetchFromGitHub {
+    owner = "amadvance";
+    repo = "snapraid";
+    rev = "v${version}";
+    sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r";
   };
 
   doCheck = true;
 
+  buildInputs = [ autoreconfHook ];
+
   meta = {
     homepage = http://www.snapraid.it/;
     description = "A backup program for disk arrays";

From 969849acf876bb4e40d6fc7f488757886fe84ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Apr 2017 11:24:50 +0200
Subject: [PATCH 0606/1744] mesa: maintenance 17.0.2 -> 17.0.3

---
 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 ea8bd57766b..5fbd6552b4c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.0.2";
+  version = "17.0.3";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4";
+    sha256 = "ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed";
   };
 
   prePatch = "patchShebangs .";

From 969ed8832c9897d57d7d1678efeea04beb20d1c6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 3 Apr 2017 04:43:08 -0500
Subject: [PATCH 0607/1744] epdfview: Fixed SRC URL; Cosmetic Change (#24568)

epdfview: Updated Debian Mirror
---
 pkgs/applications/misc/epdfview/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index 09bef975c85..b6c10dbebca 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "epdfview-0.1.8";
+  name = "epdfview-${version}";
+  version = "0.1.8";
 
   src = fetchurl {
-    url = "http://trac.emma-soft.com/epdfview/chrome/site/releases/${name}.tar.bz2";
-    sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
+    url = "mirror://debian/pool/main/e/epdfview/epdfview_${version}.orig.tar.gz";
+    sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64";
   };
 
-  buildInputs = [ pkgconfig gtk2 poppler ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 poppler ];
 
   hardeningDisable = [ "format" ];
 
@@ -24,16 +26,16 @@ stdenv.mkDerivation rec {
               })
             ];
 
-  meta = {
-    homepage = http://trac.emma-soft.com/epdfview/;
+  meta = with stdenv.lib; {
+    homepage = https://packages.debian.org/wheezy/epdfview;
     description = "A lightweight PDF document viewer using Poppler and GTK+";
     longDescription = ''
         ePDFView is a free lightweight PDF document viewer using Poppler and
         GTK+ libraries. The aim of ePDFView is to make a simple PDF document
         viewer, in the lines of Evince but without using the Gnome libraries.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.astsmtl ];
+    platforms = platforms.linux;
   };
 }

From 1feca4cae3bf243c1efe11918067cec269a8bfb2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Apr 2017 07:55:49 -0400
Subject: [PATCH 0608/1744] haskellPackages: Export haskellSrc2nix and
 hackage2nix

Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).
---
 pkgs/development/haskell-modules/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8242990fe74..694556123ab 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -80,12 +80,12 @@ let
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
 
-        inherit mkDerivation callPackage;
+        inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
 
-        callHackage = name: version: self.callPackage (hackage2nix name version);
+        callHackage = name: version: self.callPackage (self.hackage2nix name version);
 
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; });
+        callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From 5f8d6a56a880871724790704c8c9ce8100b60526 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 1 Apr 2017 17:13:46 -0500
Subject: [PATCH 0609/1744] ua: init at 2017-02-24

---
 pkgs/tools/networking/ua/default.nix | 31 +++++++++++++++
 pkgs/tools/networking/ua/deps.nix    | 57 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 pkgs/tools/networking/ua/default.nix
 create mode 100644 pkgs/tools/networking/ua/deps.nix

diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
new file mode 100644
index 00000000000..3b5be589f33
--- /dev/null
+++ b/pkgs/tools/networking/ua/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn
+, pkgconfig
+, glib, libxml2
+}:
+
+buildGoPackage rec {
+  name = "ua-unstable-${version}";
+  version = "2017-02-24";
+  rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
+
+  goPackagePath = "github.com/sloonz/ua";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/sloonz/ua.git";
+    sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif";
+  };
+
+  goDeps = ./deps.nix;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libxml2 ];
+
+  meta = {
+    homepage = "https://github.com/sloonz/ua";
+    license = stdenv.lib.licenses.isc;
+    shortDescription = "Universal Aggregator";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/tools/networking/ua/deps.nix b/pkgs/tools/networking/ua/deps.nix
new file mode 100644
index 00000000000..e59b9f239a6
--- /dev/null
+++ b/pkgs/tools/networking/ua/deps.nix
@@ -0,0 +1,57 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+  {
+    goPackagePath = "github.com/sloonz/cfeedparser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sloonz/cfeedparser";
+      rev = "a220b181f09fa7fba347c7fa72168ed8a010907a";
+      sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0";
+    };
+  }
+  {
+    goPackagePath = "github.com/sloonz/go-maildir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sloonz/go-maildir";
+      rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6";
+      sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f";
+    };
+  }
+  {
+    goPackagePath = "github.com/sloonz/go-mime-message";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sloonz/go-mime-message";
+      rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc";
+      sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs";
+    };
+  }
+  {
+    goPackagePath = "github.com/sloonz/go-qprintable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sloonz/go-qprintable";
+      rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926";
+      sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/redis.v3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-redis/redis";
+      rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29";
+      sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/bsm/ratelimit.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bsm/ratelimit";
+      rev = "db14e161995a5177acef654cb0dd785e8ee8bc22";
+      sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6b4b7ee6f3..1f1287a3576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4249,6 +4249,8 @@ with pkgs;
 
   u9fs = callPackage ../servers/u9fs { };
 
+  ua = callPackage ../tools/networking/ua { };
+
   ucl = callPackage ../development/libraries/ucl { };
 
   ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };

From 5cf9cbdc1798d189e3b269f2f40d08ecc82650e8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 3 Apr 2017 07:23:09 -0500
Subject: [PATCH 0610/1744] isyncUnstable: 20161218 -> 20170329

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

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
index a20fa2fe737..4adcaf2b9da 100644
--- a/pkgs/tools/networking/isync/unstable.nix
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -2,13 +2,13 @@
 , autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "isync-git-20161218";
-  rev = "77acc268123b8233843ca9bc3dcf90669efde08f";
+  name = "isync-git-20170329";
+  rev = "1fdf793a3fb9f4704977ef49e0a490a83291ea4d";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/isync/isync";
     inherit rev;
-    sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj";
+    sha256 = "1m54jjww1b7a6rfw4wckzx6z1nd90psbb6cs38b9c015cs0vwaf5";
   };
 
   buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ];

From a29d0df28c3036e26c1806fe9172e79c0ab386ed Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Apr 2017 09:02:37 -0400
Subject: [PATCH 0611/1744] linux: 4.11-rc4 -> 4.11-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 4606fc922a6..f56b1df6184 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11-rc4";
-  modDirVersion = "4.11.0-rc4";
+  version = "4.11-rc5";
+  modDirVersion = "4.11.0-rc5";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0kvp5zkq54ahxp59d33fpzf3jpr5k0jjfbxc1kfqwxvlkgznmd7h";
+    sha256 = "0qmb8sssh4f4zhvasy20k30r8cwc03qm5ql3b25cj16cn3frp0q7";
   };
 
   features.iwlwifi = true;

From 88bfe51f92e9adb3048d80f2c3a2809c297f6880 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Mon, 3 Apr 2017 15:03:53 +0200
Subject: [PATCH 0612/1744] update rust packages

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 6ca18ed4668..fea4e7c9160 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-03-29";
-  rev = "d9dbb2fc117bf730d1f54b090b3af407e8e5ff20";
-  sha256 = "1vrzr4v8qp5jy3xmqrcyk9naik3rngk8hzxif42y687ncppzrsdl";
+  version = "2017-04-03";
+  rev = "24cb86b25f4d4758b775e78c03673378ed28120d";
+  sha256 = "07nzdrrghbpikh0mgvi1mv66mxisd47lcwk6v3szbsy5pgj6dxnq";
 
   src = fetchFromGitHub {
       inherit rev;

From 3699a545fdd5451313fab91deed3bd604deb566d Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Mon, 3 Apr 2017 15:04:04 +0200
Subject: [PATCH 0613/1744] pijul: 0.3.3 -> 0.4.1

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index aed907b2dcd..134e6998670 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -4,11 +4,11 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.3.3";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "933e68703916ee7b50cd09f928bb072bdfc3388b69ff657578c23080f7df22b8";
+    sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a";
   };
 
   sourceRoot = "${name}/pijul";
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   doCheck = false;
   
-  depsSha256 = "1aiyjl8jbmr8yys5bsd2mg1i7jryzb8kxqlmxp7kjn2qx7b4q2zd";
+  depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";

From fa4fe7110566d8370983fa81f2b04a833339236d Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 27 Mar 2017 16:11:44 +0300
Subject: [PATCH 0614/1744] docker: fix socket permissions

Docker socket is world writable. This means any user on the system is
able to invoke docker command. (Which is equal to having a root access
to the machine.)

This commit makes socket group-writable and owned by docker group.

Inspired by
https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.socket
---
 nixos/modules/virtualisation/docker.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 4b30a38f832..f1101d7ea66 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -126,7 +126,17 @@ in
 
         path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
       };
-      systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions;
+
+      systemd.sockets.docker = {
+        description = "Docker Socket for the API";
+        wantedBy = [ "sockets.target" ];
+        socketConfig = {
+          ListenStream = cfg.listenOptions;
+          SocketMode = "0660";
+          SocketUser = "root";
+          SocketGroup = "docker";
+        };
+      };
     }
   ]);
 

From c7453084ef71e286699b7414894178e5559f5563 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 3 Apr 2017 09:05:15 -0400
Subject: [PATCH 0615/1744] docker: test for socket permissions

---
 nixos/tests/docker.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 1b57a94a05d..9096a5868f6 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -11,6 +11,21 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
+
+          users.users = {
+            noprivs = {
+              isNormalUser = true;
+              description = "Can't access the docker daemon";
+              password = "foobar";
+            };
+
+            hasprivs = {
+              isNormalUser = true;
+              description = "Can access the docker daemon";
+              password = "foobar";
+              extraGroups = [ "docker" ];
+            };
+          };
         };
     };
 
@@ -21,6 +36,8 @@ import ./make-test.nix ({ pkgs, ...} : {
     $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
     $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
     $docker->succeed("docker ps | grep sleeping");
+    $docker->succeed("sudo -u hasprivs docker ps");
+    $docker->fail("sudo -u noprivs docker ps");
     $docker->succeed("docker stop sleeping");
   '';
 })

From 7a78892c478be77fd53a9fdec25a4dac043e9560 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 3 Apr 2017 08:22:03 -0500
Subject: [PATCH 0616/1744] nixos/fontconfig: disable autohint by default

---
 nixos/modules/config/fonts/fontconfig.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 4d3cc26365f..93c5f2df725 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -372,11 +372,11 @@ in
 
           autohint = mkOption {
             type = types.bool;
-            default = true;
+            default = false;
             description = ''
-              Enable the autohinter, which provides hinting for otherwise
-              un-hinted fonts. The results are usually lower quality than
-              correctly-hinted fonts.
+              Enable the autohinter in place of the default interpreter.
+              The results are usually lower quality than correctly-hinted
+              fonts, but better than unhinted fonts.
             '';
           };
         };

From 21c9190a5fd8387c90feff08198c47894c0a541d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 3 Apr 2017 08:23:32 -0500
Subject: [PATCH 0617/1744] nixos/fontconfig: remove forceAutohint option

---
 nixos/modules/config/fonts/fontconfig.nix | 16 ----------------
 nixos/modules/rename.nix                  |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 93c5f2df725..affb46c2ca0 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -104,13 +104,6 @@ let cfg = config.fonts.fontconfig;
         </match>
         ''}
 
-        <!-- Force autohint always -->
-        <match target="font">
-          <edit name="force_autohint" mode="assign">
-            ${fcBool cfg.forceAutohint}
-          </edit>
-        </match>
-
       </fontconfig>
     '';
 
@@ -453,15 +446,6 @@ in
           description = ''Use embedded bitmaps in fonts like Calibri.'';
         };
 
-        forceAutohint = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Force use of the TrueType Autohinter. Useful for debugging or
-            free-software purists.
-          '';
-        };
-
         renderMonoTTFAsBitmap = mkOption {
           type = types.bool;
           default = false;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 54433e20597..4cf48e1e2cb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -202,5 +202,6 @@ with lib;
     (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
+    (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
   ];
 }

From 03942659ca1189ba50f9f1b86bbe6d925eba237b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 3 Apr 2017 08:24:32 -0500
Subject: [PATCH 0618/1744] nixos/fontconfig: remove renderMonoTTFAsBitmap

---
 nixos/modules/config/fonts/fontconfig.nix | 13 -------------
 nixos/modules/rename.nix                  |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index affb46c2ca0..1cf5cb6e039 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -167,13 +167,6 @@ let cfg = config.fonts.fontconfig;
         </edit>
       </match>
 
-      <!-- Render some monospace TTF fonts as bitmaps -->
-      <match target="pattern">
-        <edit name="bitmap_monospace" mode="assign">
-          ${fcBool cfg.renderMonoTTFAsBitmap}
-        </edit>
-      </match>
-
       </fontconfig>
     '';
 
@@ -446,12 +439,6 @@ in
           description = ''Use embedded bitmaps in fonts like Calibri.'';
         };
 
-        renderMonoTTFAsBitmap = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''Render some monospace TTF fonts as bitmaps.'';
-        };
-
       };
 
     };
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4cf48e1e2cb..0174fe544e3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -203,5 +203,6 @@ with lib;
     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
+    (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
   ];
 }

From c77a54d79fde2e79cb832f310ccfdd40bb8a36f0 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Mon, 3 Apr 2017 13:58:02 +0000
Subject: [PATCH 0619/1744] pharo-vm: Disable "pic" hardening

Compiling the Pharo VM with "pic" hardening causes segmentation faults
on startup of pharo-launcher.

Resolves NixOS/nixpkgs#24541.
---
 pkgs/development/pharo/vm/build-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 1eeb5dc3151..1f9e82f866e 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     mimeType = "application/x-pharo-image";
   };
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "pic" ];
 
   # Building
   preConfigure = ''

From 89bfa112cfd8a8b3da642169d33f1dfe3ea1e839 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 3 Apr 2017 08:48:50 -0500
Subject: [PATCH 0620/1744] fontconfig-penultimate: 0.2.1 -> 0.3.2

---
 .../config/fonts/fontconfig-penultimate.nix   | 221 +++++++++++++++++-
 nixos/modules/config/fonts/fontconfig.nix     |  15 +-
 .../fonts/fontconfig-penultimate/default.nix  |   4 +-
 3 files changed, 228 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 8e41d342117..83d6532774e 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -3,23 +3,236 @@
 with lib;
 
 let
-  cfg = config.fonts.fontconfig.penultimate;
+  cfg = config.fonts.fontconfig;
 
+  fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";
+
+  # back-supported fontconfig version and package
+  # version is used for font cache generation
+  supportVersion = "210";
+  supportPkg     = pkgs."fontconfig_${supportVersion}";
+
+  # latest fontconfig version and package
+  # version is used for configuration folder name, /etc/fonts/VERSION/
+  # note: format differs from supportVersion and can not be used with makeCacheConf
   latestVersion  = pkgs.fontconfig.configVersion;
+  latestPkg      = pkgs.fontconfig;
+
+  # supported version fonts.conf
+  supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; };
+
+  # configuration file to read fontconfig cache
+  # version dependent
+  # priority 0
+  cacheConfSupport = makeCacheConf { version = supportVersion; };
+  cacheConfLatest  = makeCacheConf {};
+
+  # generate the font cache setting file for a fontconfig version
+  # use latest when no version is passed
+  makeCacheConf = { version ? null }:
+    let
+      fcPackage = if builtins.isNull version
+                  then "fontconfig"
+                  else "fontconfig_${version}";
+      makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
+      cache     = makeCache pkgs."${fcPackage}";
+      cache32   = makeCache pkgs.pkgsi686Linux."${fcPackage}";
+    in
+    pkgs.writeText "fc-00-nixos-cache.conf" ''
+      <?xml version='1.0'?>
+      <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+      <fontconfig>
+        <!-- Font directories -->
+        ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
+        <!-- Pre-generated font caches -->
+        <cachedir>${cache}</cachedir>
+        ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''
+          <cachedir>${cache32}</cachedir>
+        ''}
+      </fontconfig>
+    '';
 
   # The configuration to be included in /etc/font/
-  confPkg = pkgs.runCommand "font-penultimate-conf" {} ''
+  penultimateConf = pkgs.runCommand "font-penultimate-conf" {} ''
     support_folder=$out/etc/fonts/conf.d
     latest_folder=$out/etc/fonts/${latestVersion}/conf.d
 
     mkdir -p $support_folder
     mkdir -p $latest_folder
 
-    # fontconfig ultimate various configuration files
+    ln -s ${supportFontsConf} $support_folder/../fonts.conf
+    ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
+          $latest_folder/../fonts.conf
+
+    # fontconfig-penultimate various configuration files
     ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
           $support_folder
     ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
           $latest_folder
+
+    ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf
+    ln -s ${cacheConfLatest}  $latest_folder/00-nixos-cache.conf
+
+    rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf
+    ln -s ${antialiasConf} $support_folder/10-antialias.conf
+    ln -s ${antialiasConf} $latest_folder/10-antialias.conf
+
+    rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf
+    ln -s ${hintingConf} $support_folder/10-hinting.conf
+    ln -s ${hintingConf} $latest_folder/10-hinting.conf
+
+    ${optionalString cfg.useEmbeddedBitmaps ''
+    rm $support_folder/10-no-embedded-bitmaps.conf
+    rm $latest_folder/10-no-embedded-bitmaps.conf
+    ''}
+
+    rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf
+    ln -s ${subpixelConf} $support_folder/10-subpixel.conf
+    ln -s ${subpixelConf} $latest_folder/10-subpixel.conf
+
+    ${optionalString (cfg.dpi != 0) ''
+    ln -s ${dpiConf} $support_folder/11-dpi.conf
+    ln -s ${dpiConf} $latest_folder/11-dpi.conf
+    ''}
+
+    ${optionalString (!cfg.includeUserConf) ''
+    rm $support_folder/50-user.conf
+    rm $latest_folder/50-user.conf
+    ''}
+
+    # 51-local.conf
+    rm $latest_folder/51-local.conf
+    substitute \
+      ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \
+      $latest_folder/51-local.conf \
+      --replace local.conf /etc/fonts/${latestVersion}/local.conf
+
+    ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf
+    ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf
+
+    ${optionalString cfg.allowBitmaps ''
+    rm $support_folder/53-no-bitmaps.conf
+    rm $latest_folder/53-no-bitmaps.conf
+    ''}
+
+    ${optionalString (!cfg.allowType1) ''
+    ln -s ${rejectType1} $support_folder/53-no-type1.conf
+    ln -s ${rejectType1} $latest_folder/53-no-type1.conf
+    ''}
+  '';
+
+  hintingConf = pkgs.writeText "fc-10-hinting.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+
+      <!-- Default rendering settings -->
+      <match target="pattern">
+        <edit mode="append" name="hinting">
+          ${fcBool cfg.hinting.enable}
+        </edit>
+        <edit mode="append" name="autohint">
+          ${fcBool cfg.hinting.autohint}
+        </edit>
+        <edit mode="append" name="hintstyle">
+          <const>hintslight</const>
+        </edit>
+      </match>
+
+    </fontconfig>
+  '';
+
+  antialiasConf = pkgs.writeText "fc-10-antialias.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+
+      <!-- Default rendering settings -->
+      <match target="pattern">
+        <edit mode="append" name="antialias">
+          ${fcBool cfg.antialias}
+        </edit>
+      </match>
+
+    </fontconfig>
+  '';
+
+  subpixelConf = pkgs.writeText "fc-10-subpixel.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+
+      <!-- Default rendering settings -->
+      <match target="pattern">
+        <edit mode="append" name="rgba">
+          <const>${cfg.subpixel.rgba}</const>
+        </edit>
+        <edit mode="append" name="lcdfilter">
+          <const>lcd${cfg.subpixel.lcdfilter}</const>
+        </edit>
+      </match>
+
+    </fontconfig>
+  '';
+
+  dpiConf = pkgs.writeText "fc-11-dpi.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+
+      <match target="pattern">
+        <edit name="dpi" mode="assign">
+          <double>${toString cfg.dpi}</double>
+        </edit>
+      </match>
+
+    </fontconfig>
+  '';
+
+  defaultFontsConf =
+    let genDefault = fonts: name:
+      optionalString (fonts != []) ''
+        <alias>
+          <family>${name}</family>
+          <prefer>
+          ${concatStringsSep ""
+          (map (font: ''
+            <family>${font}</family>
+          '') fonts)}
+          </prefer>
+        </alias>
+      '';
+    in
+    pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+
+      <!-- Default fonts -->
+      ${genDefault cfg.defaultFonts.sansSerif "sans-serif"}
+
+      ${genDefault cfg.defaultFonts.serif     "serif"}
+
+      ${genDefault cfg.defaultFonts.monospace "monospace"}
+
+    </fontconfig>
+  '';
+
+  rejectType1 = pkgs.writeText "fc-53-no-type1.conf" ''
+    <?xml version="1.0"?>
+    <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+    <fontconfig>
+
+    <!-- Reject Type 1 fonts -->
+    <selectfont>
+      <rejectfont>
+        <pattern>
+          <patelt name="fontformat"><string>Type 1</string></patelt>
+        </pattern>
+      </rejectfont>
+    </selectfont>
+
+    </fontconfig>
   '';
 
 in
@@ -50,7 +263,7 @@ in
 
   config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
 
-    fonts.fontconfig.confPackages = [ confPkg ];
+    fonts.fontconfig.confPackages = [ penultimateConf ];
 
   };
 
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 1cf5cb6e039..d44b583447a 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -444,11 +444,14 @@ in
     };
 
   };
-  config = mkIf cfg.enable {
-    fonts.fontconfig.confPackages = [ confPkg ];
-
-    environment.systemPackages    = [ pkgs.fontconfig ];
-    environment.etc.fonts.source  = "${fontconfigEtc}/etc/fonts/";
-  };
+  config = mkMerge [
+    (mkIf cfg.enable {
+      environment.systemPackages    = [ pkgs.fontconfig ];
+      environment.etc.fonts.source  = "${fontconfigEtc}/etc/fonts/";
+    })
+    (mkIf (cfg.enable && !cfg.penultimate.enable) {
+      fonts.fontconfig.confPackages = [ confPkg ];
+    })
+  ];
 
 }
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index f9d60d6600d..a42e5d9109b 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "0.2.1"; in
+let version = "0.3.2"; in
 stdenv.mkDerivation {
   name = "fontconfig-penultimate-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "ttuegel";
     repo = "fontconfig-penultimate";
     rev = version;
-    sha256 = "14arpalmpn7ig2myxslk4jdg6lm0cnmwsxy7zl0j7yr417k1kprf";
+    sha256 = "01cgqdmgpqahkg71lnvr3yzsmka9q1kgkbiz6w5ds1fhrpcswj7p";
   };
 
   installPhase = ''

From 4736c19c657012b6f6ecd5567fa21c57e2977c92 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Mon, 3 Apr 2017 14:26:33 +0000
Subject: [PATCH 0621/1744] pharo-launcher: Add test case & myself as
 maintainer

---
 pkgs/development/pharo/launcher/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 02004061b83..911680b1eb8 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -43,6 +43,19 @@ stdenv.mkDerivation rec {
     chmod +x $prefix/bin/${executable-name}
   '';
 
+  doCheck = true;
+
+  checkPhase = ''
+    # Launcher should be able to run for a few seconds without crashing.
+    (set +e
+     export HOME=. # Pharo will try to create files here
+     secs=5
+     echo -n "Running headless Pharo for $secs seconds to check for a crash... "
+     timeout $secs \
+       ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true'
+     test "$?" == 124 && echo "ok")
+  '';
+
   meta = {
     description = "Launcher for Pharo distributions";
     longDescription = ''
@@ -65,7 +78,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.lukego ];
     platforms = pharo-vm.meta.platforms;
   };
 }

From ef4b73a0386a088ac77e1c3e0d0db2d6d770dd50 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Apr 2017 17:25:12 +0300
Subject: [PATCH 0622/1744] libappindicator: propagate dependencies

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

diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index ff256fb73c8..0c1c51d6f47 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -27,12 +27,17 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf ];
 
+  propagatedBuildInputs =
+    if gtkVersion == "2"
+    then [ gtk2 libdbusmenu-gtk2 ]
+    else [ gtk3 libdbusmenu-gtk3 ];
+
   buildInputs = [
     glib dbus_glib
     python pygobject2 pygtk gobjectIntrospection vala_0_23
   ] ++ (if gtkVersion == "2"
-    then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
-    else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]);
+    then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
+    else [ libindicator-gtk3 ]);
 
   postPatch = ''
     substituteInPlace configure.ac \

From 74f7db075a89c92cf65c68a6e2bc64fd01d7da7f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Apr 2017 17:28:16 +0300
Subject: [PATCH 0623/1744] tdesktop: 1.0.2 -> 1.0.27

Use system Qt.
---
 .../telegram/tdesktop/default.nix             | 162 ++++++------------
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 56 insertions(+), 108 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 67d86571b88..d64b5be816a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,144 +1,92 @@
 { stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats, qtwayland
-, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
-, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
-, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland
-, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau
-
-, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon
-, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11
-, inputproto, sqlite, dbus
+, qtbase, qtimageformats, makeQtWrapper
+, breakpad, gtk3, libappindicator-gtk3, dee
+, ffmpeg, openalSoft, minizip
 }:
 
-let
-  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-  packagedQt = "5.6.2";
-  # Hacky: split "1.2.3-4" into "1.2.3" and "4"
-  systemQt = (builtins.parseDrvName qtbase.version).name;
-  qtLibs = [ qtbase qtimageformats qtwayland ];
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "1.0.2";
-  qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
+  version = "1.0.27";
 
-  src = fetchFromGitHub {
-    owner = "telegramdesktop";
-    repo = "tdesktop";
-    rev = "v${version}";
-    sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2";
+  # Submodules
+  src = fetchgit {
+    url = "https://github.com/telegramdesktop/tdesktop";
+    rev = "refs/tags/v${version}";
+    sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc";
   };
 
   tgaur = fetchgit {
-    url = "https://aur.archlinux.org/telegram-desktop.git";
-    rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69";
-    sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8";
+    url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
+    rev = "b4d169076ed12ec01941a95499774d5caa6fc00e";
+    sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9";
   };
 
   buildInputs = [
-    breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
-    gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
-    dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy
-    libSM libICE
-    # Qt dependencies
-    libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
-    libpng libjpeg freetype harfbuzz pcre16 xproto libX11
-    inputproto sqlite dbus libwebp wayland libvdpau
+    gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
   ];
 
-  nativeBuildInputs = [ pkgconfig gyp cmake ];
+  nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ];
 
-  patches = [ "${tgaur}/aur-fixes.diff" ];
+  patches = [ "${tgaur}/aur-build-fixes.patch" ];
 
   enableParallelBuilding = true;
 
-  qtSrcs = builtins.map (x: x.src) qtLibs;
-  qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs);
-  qtPatches = qtbase.patches;
+  GYP_DEFINES = lib.concatStringsSep "," [
+    "TDESKTOP_DISABLE_CRASH_REPORTS"
+    "TDESKTOP_DISABLE_AUTOUPDATE"
+    "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+  ];
 
-  buildCommand = ''
-    unpackPhase
-    cd "$sourceRoot"
-
-    patchPhase
-
-    sed -i Telegram/gyp/Telegram.gyp \
-      -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g'
+  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${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}"
+  ]) [ "QtCore" "QtGui" ];
+  CPPFLAGS = NIX_CFLAGS_COMPILE;
 
+  preConfigure = ''
     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,${packagedQt},${systemQt},g'
+      -e "s,/usr/bin/moc,moc,g"
+    sed -i Telegram/gyp/qt_rcc.gypi \
+      -e "s,/usr/bin/rcc,rcc,g"
 
-    gypFlagsArray=(
-      "-Dlinux_path_qt=$PWD/../qt"
-      "-Dlinux_lib_ssl=-lssl"
-      "-Dlinux_lib_crypto=-lcrypto"
-      "-Dlinux_lib_icu=-licuuc -licutu -licui18n"
-    )
+    gyp \
+      -Gconfig=Release \
+      --depth=Telegram/gyp \
+      --generator-output=../.. \
+      -Goutput_dir=out \
+       --format=cmake \
+      Telegram/gyp/Telegram.gyp
 
-    export QMAKE=$PWD/../qt/bin/qmake
-    ( mkdir -p ../Libraries
-      cd ../Libraries
-      for i in $qtSrcs; do
-        tar -xaf $i
-      done
-      cd qtbase-*
-      # This patch is often outdated but the fixes doesn't feel very important
-      patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true
-      for i in $qtPatches; do
-        patch -p1 < $i
-      done
-      ${qtbase.postPatch}
-      cd ..
+    cd out/Release
 
-      export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \
-        -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
-        -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \
-        -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \
-        ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \
-        -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"
-      export dontAddPrefix=1
-      export MAKEFLAGS=-j$NIX_BUILD_CORES
+    NUM=$((`wc -l < CMakeLists.txt` - 2))
+    sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
 
-      ( cd qtbase-*
-        configurePhase
-        buildPhase
-        make install
-      )
-      for i in $qtNames; do
-        ( cd $i-*
-          $QMAKE
-          buildPhase
-          make install
-        )
-      done
-    )
+    export ASM=$(type -p gcc)
+  '';
 
-    ( cd Telegram/gyp
-      gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
-    )
-
-    ( cd out/Release
-      export ASM=$(type -p gcc)
-      cmake .
-      # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry.
-      buildPhase || true
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h"
-      buildPhase
-    )
-
-    install -Dm755 out/Release/Telegram $out/bin/telegram-desktop
+  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/telegramdesktop.desktop > $out/share/applications/telegramdesktop.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"
+      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
-
-    fixupPhase
+    wrapQtProgram $out/bin/telegram-desktop
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f1287a3576..50aa1b0e8af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15614,7 +15614,7 @@ with pkgs;
 
   taskserver = callPackage ../servers/misc/taskserver { };
 
-  tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
+  tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
     inherit (pythonPackages) gyp;
   };
 

From 94c2f3e772cccdc681be720ffe95fc0483d7f9cf Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 3 Apr 2017 09:48:52 -0500
Subject: [PATCH 0624/1744] jp2a: 1.0.6 -> 1.0.7 (#24579)

---
 pkgs/applications/misc/jp2a/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index e552ac9777f..138ee397d3f 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, libjpeg }:
+{ stdenv, fetchFromGitHub, libjpeg, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.6";
+  version = "1.0.7";
   name = "jp2a-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/jp2a/${name}.tar.gz";
-    sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09";
+  src = fetchFromGitHub {
+    owner = "cslarsen";
+    repo = "jp2a";
+    rev = "v${version}";
+    sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql";
   };
 
   makeFlags = "PREFIX=$(out)";
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libjpeg ];
 
   meta = with stdenv.lib; {

From e6faf2a4e6c9d079e9c04dc88988479a73a54b34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Apr 2017 16:55:05 +0200
Subject: [PATCH 0625/1744] create-amis.sh: Use pv-grub-hd0_1.05

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 1e397b0f176..ac43d7dc31a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -206,7 +206,7 @@ for type in $types; do
 
                     # Register the AMI.
                     if [ $type = pv ]; then
-                        kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.04-$arch.gz" | jq -r .Images[0].ImageId)
+                        kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.05-$arch.gz" | jq -r .Images[0].ImageId)
                         if [ "$kernel" = null ]; then break; fi
                         echo "using PV-GRUB kernel $kernel"
                         extraFlags+=" --virtualization-type paravirtual --kernel $kernel"

From fbe6d23624b0b62cb5754d37ab81007cd4c035ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Apr 2017 17:03:49 +0200
Subject: [PATCH 0626/1744] EC2: Disable PV support

Unfortunately, somewhere between 16.09 and 17.03, paravirtualized
instances stopped working. They hang at the pv-grub prompt
("grubdom>"). I tried reverting to a 4.4 kernel, reverting kernel
compression from xz to bzip2 (even though pv-grub is supposed to
support xz), and reverting the only change to initrd generation
(5a8147479e794d5932273d01790c3602b8abeedc). Nothing worked so I'm
giving up.
---
 nixos/maintainers/scripts/ec2/create-amis.sh    | 13 ++++++-------
 nixos/modules/virtualisation/amazon-options.nix |  8 +++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index ac43d7dc31a..24ced8da531 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -3,21 +3,20 @@
 
 # To start with do: nix-shell -p awscli --run "aws configure"
 
-
+set -e
 set -o pipefail
-#set -x
-
-stateDir=${TMPDIR:-/tmp}/ec2-image
-echo "keeping state in $stateDir"
-mkdir -p $stateDir
 
 version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
 major=${version:0:5}
 echo "NixOS version is $version ($major)"
 
+stateDir=/var/tmp/ec2-image-$version
+echo "keeping state in $stateDir"
+mkdir -p $stateDir
+
 rm -f ec2-amis.nix
 
-types="hvm pv"
+types="hvm"
 stores="ebs s3"
 regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
 
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 34a50dcab16..cba77d3edd1 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -12,5 +12,11 @@
     };
   };
 
-  config = {};
+  config = {
+    assertions = [
+      { assertion = config.ec2.hvm;
+        message = "Paravirtualized EC2 instances are no longer supported.";
+      }
+    ];
+  };
 }

From 8cc3db6b671854b4433adf741f9b06931b7be1ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Apr 2017 17:46:15 +0200
Subject: [PATCH 0627/1744] Add 17.03 AMIs

---
 nixos/modules/virtualisation/ec2-amis.nix | 32 ++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index d592a23c303..745518f8597 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -193,5 +193,35 @@ let self = {
   "16.09".us-west-2.pv-ebs = "ami-6d4af60d";
   "16.09".us-west-2.pv-s3 = "ami-de48f4be";
 
-  latest = self."16.09";
+  # 17.03.885.6024dd4067
+  "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc";
+  "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b";
+  "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab";
+  "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665";
+  "17.03".ap-south-1.hvm-ebs = "ami-4f413220";
+  "17.03".ap-south-1.hvm-s3 = "ami-864033e9";
+  "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383";
+  "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1";
+  "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f";
+  "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e";
+  "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff";
+  "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c";
+  "17.03".eu-central-1.hvm-ebs = "ami-5450803b";
+  "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01";
+  "17.03".eu-west-1.hvm-ebs = "ami-10754c76";
+  "17.03".eu-west-1.hvm-s3 = "ami-11734a77";
+  "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b";
+  "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a";
+  "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5";
+  "17.03".sa-east-1.hvm-s3 = "ami-fca2c190";
+  "17.03".us-east-1.hvm-ebs = "ami-0940c61f";
+  "17.03".us-east-1.hvm-s3 = "ami-674fc971";
+  "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca";
+  "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4";
+  "17.03".us-west-1.hvm-ebs = "ami-587b2138";
+  "17.03".us-west-1.hvm-s3 = "ami-70411b10";
+  "17.03".us-west-2.hvm-ebs = "ami-a93daac9";
+  "17.03".us-west-2.hvm-s3 = "ami-5139ae31";
+
+  latest = self."17.03";
 }; in self

From 1bf690c1bb7bfc167d6ad78102a625320691e1ac Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 3 Apr 2017 18:30:49 +0100
Subject: [PATCH 0628/1744] iosevka: 1.11.4 -> 1.12.1 (#24527)

iosevka: 1.11.4 -> 1.12.1
---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index c8ce86b818b..ac7dcea31b1 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.11.4";
+  version = "1.12.1";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
-    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/01-iosevka-${version}.zip";
-    sha256 = "0mn9pqkambsal5cvz8hzlwx7qvcdfch8g1iy7mqhgghzflfhsy8x";
+    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
+    sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj";
   };
 
   sourceRoot = ".";

From c91c3209f3dbaf9dacef69395e071a9dee59bbee Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 2 Apr 2017 19:23:12 +0100
Subject: [PATCH 0629/1744] unclutter: Fix default value of $DISPLAY

---
 nixos/modules/services/x11/unclutter.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 6c789b7578f..a22e5ac2c95 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -60,7 +60,10 @@ in {
       serviceConfig.ExecStart = ''
         ${cfg.package}/bin/unclutter \
           -idle ${toString cfg.timeout} \
-          -display :${toString config.services.xserver.display} \
+          -display :${toString (
+             let display = config.services.xserver.display;
+             in if display != null then display else 0
+          )} \
           -jitter ${toString (cfg.threeshold - 1)} \
           ${optionalString cfg.keystroke "-keystroke"} \
           ${concatMapStrings (x: " -"+x) cfg.extraOptions} \

From 75319eb2035e7c9ec0a8f45ab816dd34689fd77a Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Mon, 3 Apr 2017 11:04:04 +0200
Subject: [PATCH 0630/1744] nomacs: 3.4 -> 3.6.1

fixes #24589
---
 pkgs/applications/graphics/nomacs/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 0f0e0984a87..669e46c6a84 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,19 +18,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.4";
+  version = "3.6.1";
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
-    rev = "3.4";
-    sha256 = "1l7q85dsiss0ix25niybj27zx1ssd439mwj449rxixa351cg1r2z";
+    rev = version;
+    sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44";
   };
 
   name = "nomacs-${version}";
 
   enableParallelBuilding = true;
 
-  sourceRoot = "${name}/ImageLounge";
+  sourceRoot = "${name}-src/ImageLounge";
 
   patches = [./fix-appdata-install.patch];
 
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
                  quazip
                  gsettings_desktop_schemas];
 
-
   cmakeFlags = ["-DENABLE_OPENCV=ON"
                 "-DENABLE_RAW=ON"
                 "-DENABLE_TIFF=ON"

From bc45ee50c4f043bea57422e94a92e79fd07eb379 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Apr 2017 15:23:18 -0400
Subject: [PATCH 0631/1744] ruby: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 98be02da3b2..6818a727155 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -212,11 +212,11 @@ in {
     };
   };
 
-  ruby_2_4_0 = generic {
-    version = rubyVersion "2" "4" "0" "";
+  ruby_2_4_1 = generic {
+    version = rubyVersion "2" "4" "1" "";
     sha256 = {
-      src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
-      git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
+      src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53";
+      git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index f1b82210aec..f8326ed325c 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -39,9 +39,9 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.0" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  "2.4.1" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
 }
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 51db26b7823..c60d6e3728d 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -1,8 +1,8 @@
 { fetchFromGitHub }:
 
 fetchFromGitHub {
-  owner  = "manveru";
+  owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "46e04f230ce91a786f5e583389443efec0ecd594";
-  sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
+  rev    = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94";
+  sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50aa1b0e8af..19a0c5cef0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -741,7 +741,7 @@ with pkgs;
   catclock = callPackage ../applications/misc/catclock { };
 
   cde = callPackage ../tools/package-management/cde { };
-  
+
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
 
   cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
@@ -5331,7 +5331,7 @@ with pkgs;
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;
-  
+
   openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
@@ -6084,7 +6084,7 @@ with pkgs;
     ruby_2_1_10
     ruby_2_2_5
     ruby_2_3_3
-    ruby_2_4_0;
+    ruby_2_4_1;
 
   # Ruby aliases
   ruby = ruby_2_3;
@@ -6092,7 +6092,7 @@ with pkgs;
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;
   ruby_2_3 = ruby_2_3_3;
-  ruby_2_4 = ruby_2_4_0;
+  ruby_2_4 = ruby_2_4_1;
 
   scsh = callPackage ../development/interpreters/scsh { };
 

From 482566939edc8130b60fe32a66f47556ffc7bec8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Apr 2017 15:28:38 -0400
Subject: [PATCH 0632/1744] ruby: 2.3.3 -> 2.3.4

---
 pkgs/development/interpreters/ruby/default.nix   | 8 ++++----
 pkgs/development/interpreters/ruby/patchsets.nix | 7 +------
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 6818a727155..906328eb458 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -204,11 +204,11 @@ in {
     };
   };
 
-  ruby_2_3_3 = generic {
-    version = rubyVersion "2" "3" "3" "";
+  ruby_2_3_4 = generic {
+    version = rubyVersion "2" "3" "4" "";
     sha256 = {
-      src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514";
-      git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
+      src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq";
+      git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index f8326ed325c..b67c102628a 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -29,12 +29,7 @@ rec {
     "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.3.1" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-  ];
-  "2.3.3" = ops useRailsExpress [
+  "2.3.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19a0c5cef0f..00fa8b5dbc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6083,7 +6083,7 @@ with pkgs;
     ruby_2_0_0
     ruby_2_1_10
     ruby_2_2_5
-    ruby_2_3_3
+    ruby_2_3_4
     ruby_2_4_1;
 
   # Ruby aliases
@@ -6091,7 +6091,7 @@ with pkgs;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;
-  ruby_2_3 = ruby_2_3_3;
+  ruby_2_3 = ruby_2_3_4;
   ruby_2_4 = ruby_2_4_1;
 
   scsh = callPackage ../development/interpreters/scsh { };

From ec2c46923078ceda67f944ae09bcb4d435d45ce5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Apr 2017 15:33:26 -0400
Subject: [PATCH 0633/1744] ruby: 2.2.5 -> 2.2.7

---
 pkgs/development/interpreters/ruby/default.nix   | 8 ++++----
 pkgs/development/interpreters/ruby/patchsets.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 906328eb458..52cae9bb64e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -196,11 +196,11 @@ in {
     };
   };
 
-  ruby_2_2_5 = generic {
-    version = rubyVersion "2" "2" "5" "";
+  ruby_2_2_7 = generic {
+    version = rubyVersion "2" "2" "7" "";
     sha256 = {
-      src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h";
-      git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2";
+      src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p";
+      git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index b67c102628a..f6ecb7c8e28 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -24,10 +24,10 @@ rec {
     "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch"
     "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
   ];
-  "2.2.5" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch"
+  "2.2.7" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
   "2.3.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00fa8b5dbc0..272c31641f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6082,7 +6082,7 @@ with pkgs;
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_2_0_0
     ruby_2_1_10
-    ruby_2_2_5
+    ruby_2_2_7
     ruby_2_3_4
     ruby_2_4_1;
 
@@ -6090,7 +6090,7 @@ with pkgs;
   ruby = ruby_2_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_10;
-  ruby_2_2 = ruby_2_2_5;
+  ruby_2_2 = ruby_2_2_7;
   ruby_2_3 = ruby_2_3_4;
   ruby_2_4 = ruby_2_4_1;
 

From 3535a6bf3c25bf2893c070a8a0cb60445e02ea0e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Apr 2017 15:40:26 -0400
Subject: [PATCH 0634/1744] ruby: 2.0.0-p647 -> 2.0.0-p648

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 52cae9bb64e..a552b2719bb 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -181,10 +181,10 @@ let
 
 in {
   ruby_2_0_0 = generic {
-    version = rubyVersion "2" "0" "0" "p647";
+    version = rubyVersion "2" "0" "0" "p648";
     sha256 = {
-      src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8";
-      git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3";
+      src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446";
+      git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76";
     };
   };
 

From d5a623cb39ee33ddb9589abe6bc640315437258f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Mon, 3 Apr 2017 22:54:34 +0200
Subject: [PATCH 0635/1744] Update 17.03 release notes

---
 nixos/doc/manual/release-notes/rl-1703.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 639b23b229b..28c573e6d23 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -501,6 +501,14 @@ following incompatible changes:</para>
       necessary to pull in all of <literal>bind</literal> to use them.
     </para>
   </listitem>
+
+  <listitem>
+    <para>
+      Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
+      <filename>~/.config/nixpkgs</filename>. The former is still valid for
+      <filename>config.nix</filename> for backwards compatibility.
+    </para>
+  </listitem>
 </itemizedlist>
 </section>
 </section>

From b03013cb326f3b6a274ad1d60e2c5f26b077a335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 4 Apr 2017 00:13:15 +0200
Subject: [PATCH 0636/1744] Fix consul version being "unknown-unknown". Fixes
 #24606.

See https://github.com/hashicorp/consul/blob/v0.7.5/scripts/build.sh#L44
for how consul's build script does it.
---
 pkgs/servers/consul/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 41a0bea1cdd..cc566e712c2 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -17,6 +17,10 @@ buildGoPackage rec {
   # Keep consul.ui for backward compatability
   passthru.ui = consul-ui;
 
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")
+  '';
+
   meta = with stdenv.lib; {
     description = "Tool for service discovery, monitoring and configuration";
     homepage = "https://www.consul.io/";

From beba07f712ea090666bd806cbf8106f98e6216d5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 3 Apr 2017 23:44:48 +0100
Subject: [PATCH 0637/1744] terraform: remove broken tests

---
 pkgs/applications/networking/cluster/terraform/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 93a9894ba6b..aad5d1a8032 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -64,6 +64,11 @@ in {
       })
     ];
 
+    postPatch = ''
+      rm builtin/providers/dns/data_dns_cname_record_set_test.go
+      rm builtin/providers/vsphere/resource_vsphere_file_test.go
+    '';
+
     doCheck = true;
   };
 }

From 1b6189117f304c703794d94bd5ecc82fa1f85637 Mon Sep 17 00:00:00 2001
From: Tim Jaeger <jger.tm@gmail.com>
Date: Thu, 30 Mar 2017 16:11:35 +0200
Subject: [PATCH 0638/1744] xsv: init at 0.11.0

This commit adds the `xsv` utility. It is quite useful when dealing with CSV files
---
 pkgs/tools/text/xsv/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/text/xsv/default.nix

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
new file mode 100644
index 00000000000..388917e6805
--- /dev/null
+++ b/pkgs/tools/text/xsv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "xsv-${version}";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "BurntSushi";
+    repo = "xsv";
+    rev = "${version}";
+    sha256 = "169rp4izcjhhlrqrhvlvsbiz7wqfi6g3kjfgrddgvahp0ls29hls";
+  };
+
+  depsSha256 = "006sp66l2gybyk1n7lxp645k6drz5cgxcix376k8qr0v9jwadlqa";
+
+  meta = with stdenv.lib; {
+    description = "A fast CSV toolkit written in Rust";
+    homepage = https://github.com/BurntSushi/xsv;
+    license = with licenses; [ unlicense ];
+    maintainers = [ maintainers.jgertm ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61e884366aa..f297937455b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4666,6 +4666,8 @@ with pkgs;
 
   xsel = callPackage ../tools/misc/xsel { };
 
+  xsv = callPackages ../tools/text/xsv { };
+
   xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
 
   xurls = callPackage ../tools/text/xurls {};

From 9497da7e2352d5d3133b16a7a7322702833211d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 4 Apr 2017 09:34:20 +0200
Subject: [PATCH 0639/1744] palemoon: switch to gcc-4.9

Upstream recommends that due to stability problems.
I tested it builds and starts.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61e884366aa..4a2db8227f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14898,7 +14898,10 @@ with pkgs;
 
   osmo = callPackage ../applications/office/osmo { };
 
-  palemoon = callPackage ../applications/networking/browsers/palemoon { };
+  palemoon = callPackage ../applications/networking/browsers/palemoon {
+    # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
+    stdenv = overrideCC stdenv gcc49;
+  };
 
   pamix = callPackage ../applications/audio/pamix { };
 

From d3fff80d00952dd5a187350c4e49d6971168521e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 11:00:38 +0200
Subject: [PATCH 0640/1744] exa: unstable-2016-04-20 -> unstable-2017-04-02
 (unbrick)

cc @ehegnes
---
 pkgs/tools/misc/exa/default.nix | 48 +++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index d26eb8f45ae..c49f11a72a9 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -1,28 +1,55 @@
-{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }:
+{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }:
 
 with rustPlatform;
 
-buildRustPackage rec {
-  name = "exa-${version}";
-  version = "2016-04-20";
+let
+  # check for updates
+  zoneinfo_compiled = fetchFromGitHub {
+    owner = "rust-datetime";
+    repo = "zoneinfo-compiled";
+    rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f";
+    sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26";
+  };
+  cargoPatch = ''
+    # use non-git dependencies
+    patch -p1 <<EOF
+   --- exa-v0.4.1-src.org/Cargo.toml       1970-01-01 01:00:01.000000000 +0100
+   +++ exa-v0.4.1-src/Cargo.toml   2017-04-04 10:33:31.554377034 +0200
+   @@ -42,4 +42,4 @@
+    optional = true
 
-  # NOTE: There is an impurity caused by `exa` depending on
-  # https://github.com/rust-datetime/zoneinfo-compiled.git
-  depsSha256 = "0qsqkgc1wxigvskhaamgfp5pyc2kprsikhcfccysgs07w44nxkd0";
+    [dependencies.zoneinfo_compiled]
+   -git = "https://github.com/rust-datetime/zoneinfo-compiled.git"
+   +path = "${zoneinfo_compiled}"
+EOF
+  '';
+in buildRustPackage rec {
+  name = "exa-unstable-2017-04-02";
+
+  depsSha256 = "0szjba03q4iwzjzb2dp39hhz554ys4z11qdhcdq1mgxqk94scjf4";
 
   src = fetchFromGitHub {
     owner = "ogham";
     repo = "exa";
-    rev = "110a1c716bfc4a7f74f74b3c4f0a881c773fcd06";
-    sha256 = "136yxi85m50vwmqinr1wnd0h29n5yjykqqqk9ibbcmmhx8sqhjzf";
+    rev = "1a6066327d2643881996946942aba530e8a1c67c";
+    sha256 = "1xrsg3zw5d3sw2bwx8g0lrs6zpk8rdrvvnknf7c9drp7rplmd8zq";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkgconfig perl ];
   buildInputs = [ openssl zlib ];
 
   # Some tests fail, but Travis ensures a proper build
   doCheck = false;
 
+  cargoUpdateHook = ''
+    ${cargoPatch}
+  '';
+  cargoDepsHook = ''
+    pushd $sourceRoot
+    ${cargoPatch}
+    popd
+  '';
+
   meta = with stdenv.lib; {
     description = "Replacement for 'ls' written in Rust";
     longDescription = ''
@@ -36,6 +63,5 @@ buildRustPackage rec {
     homepage = http://bsago.me/exa;
     license = licenses.mit;
     maintainer = [ maintainers.ehegnes ];
-    broken = true;
   };
 }

From 71710fd099ce6c46b54f05c6cf769e73cf11d49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 12:03:21 +0200
Subject: [PATCH 0641/1744] Revert "EC2: Disable PV support"

This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab.

this breaks every non-ec2 (non-hvm) system

cc @edolstra
---
 nixos/maintainers/scripts/ec2/create-amis.sh    | 13 +++++++------
 nixos/modules/virtualisation/amazon-options.nix |  8 +-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 24ced8da531..ac43d7dc31a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -3,20 +3,21 @@
 
 # To start with do: nix-shell -p awscli --run "aws configure"
 
-set -e
+
 set -o pipefail
+#set -x
+
+stateDir=${TMPDIR:-/tmp}/ec2-image
+echo "keeping state in $stateDir"
+mkdir -p $stateDir
 
 version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
 major=${version:0:5}
 echo "NixOS version is $version ($major)"
 
-stateDir=/var/tmp/ec2-image-$version
-echo "keeping state in $stateDir"
-mkdir -p $stateDir
-
 rm -f ec2-amis.nix
 
-types="hvm"
+types="hvm pv"
 stores="ebs s3"
 regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
 
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index cba77d3edd1..34a50dcab16 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -12,11 +12,5 @@
     };
   };
 
-  config = {
-    assertions = [
-      { assertion = config.ec2.hvm;
-        message = "Paravirtualized EC2 instances are no longer supported.";
-      }
-    ];
-  };
+  config = {};
 }

From 7d211be459ae80fca55c7eb50d79b5c6a7f9a9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 11:38:05 +0200
Subject: [PATCH 0642/1744] rustPackages: build less verbose

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index fea4e7c9160..1bebf222ac5 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -44,7 +44,7 @@ runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src
   $git config --local user.email "example@example.com"
   $git config --local user.name "example"
   $git add .
-  $git commit -m 'Rust registry commit'
+  $git commit --quiet -m 'Rust registry commit'
 
   touch $out/touch . "$out/.cargo-index-lock"
 ''

From bb1e6557da293d6a7c9f868cb850afdbe2ba09d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Mar 2017 14:48:05 +0200
Subject: [PATCH 0643/1744] sysdig: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index b23da5451d1..185d54b420b 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.15.0";
+  version = "0.15.1";
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2";
+    sha256 = "0x1ssgrw8n563fk4vb9f2f27yjgv2c05xmpkc8p78l4hv8alwh2b";
   };
 
   buildInputs = [

From 279565c3d623e16aff3233c7489d22d655adf773 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 13:03:05 +0200
Subject: [PATCH 0644/1744] Revert "Revert "EC2: Disable PV support""

This reverts commit 71710fd099ce6c46b54f05c6cf769e73cf11d49f.
---
 nixos/maintainers/scripts/ec2/create-amis.sh    | 13 ++++++-------
 nixos/modules/virtualisation/amazon-options.nix |  8 +++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index ac43d7dc31a..24ced8da531 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -3,21 +3,20 @@
 
 # To start with do: nix-shell -p awscli --run "aws configure"
 
-
+set -e
 set -o pipefail
-#set -x
-
-stateDir=${TMPDIR:-/tmp}/ec2-image
-echo "keeping state in $stateDir"
-mkdir -p $stateDir
 
 version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
 major=${version:0:5}
 echo "NixOS version is $version ($major)"
 
+stateDir=/var/tmp/ec2-image-$version
+echo "keeping state in $stateDir"
+mkdir -p $stateDir
+
 rm -f ec2-amis.nix
 
-types="hvm pv"
+types="hvm"
 stores="ebs s3"
 regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
 
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 34a50dcab16..cba77d3edd1 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -12,5 +12,11 @@
     };
   };
 
-  config = {};
+  config = {
+    assertions = [
+      { assertion = config.ec2.hvm;
+        message = "Paravirtualized EC2 instances are no longer supported.";
+      }
+    ];
+  };
 }

From 35dbcbb2960cd5a310638183cf75a7874c57e373 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 13:07:15 +0200
Subject: [PATCH 0645/1744] Fix eval error due to config.ec2.hvm

---
 nixos/modules/virtualisation/amazon-image.nix   |  6 ++++++
 nixos/modules/virtualisation/amazon-options.nix | 10 +---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 80e481d79b9..3e47710361a 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -15,6 +15,12 @@ let cfg = config.ec2; in
 
   config = {
 
+    assertions = [
+      { assertion = cfg.hvm;
+        message = "Paravirtualized EC2 instances are no longer supported.";
+      }
+    ];
+
     virtualisation.growPartition = cfg.hvm;
 
     fileSystems."/" = {
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index cba77d3edd1..349fd3adfc9 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -3,7 +3,7 @@
   options = {
     ec2 = {
       hvm = lib.mkOption {
-        default = false;
+        default = lib.versionAtLeast config.system.stateVersion "17.03";
         internal = true;
         description = ''
           Whether the EC2 instance is a HVM instance.
@@ -11,12 +11,4 @@
       };
     };
   };
-
-  config = {
-    assertions = [
-      { assertion = config.ec2.hvm;
-        message = "Paravirtualized EC2 instances are no longer supported.";
-      }
-    ];
-  };
 }

From 3a9c217804688668404ebfe9a199e6e85297a3a7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 4 Apr 2017 08:07:52 -0400
Subject: [PATCH 0646/1744] rtags: fix for clang/libc++ 4

This also fixes a missing header in the SDK that rtags needs to work
properly. The underlying cause is that C++ headers got shuffled around a
lot in libc++ 3.8 (I believe) and became more standards-compliant, which
led to a lot of C-compatible passthrough header files being added to it
like math.h, which defines some C++-compatible versions of standard
functions like signbit, while #include_next'ing the system math.h. In
this case, including the SDK was stuffing another math.h in front of the
libc++ shim, which led to all sorts of mysterious failures.
---
 pkgs/development/tools/rtags/default.nix      | 12 ++++--------
 pkgs/os-specific/darwin/apple-sdk/default.nix |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 44f922906e8..4f396e26bf9 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -5,15 +5,11 @@ stdenv.mkDerivation rec {
   version = "2.8-p1";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
-    ++ lib.optionals stdenv.isDarwin [ apple_sdk.sdk apple_sdk.frameworks.CoreServices ];
+    ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
 
   preConfigure = ''
     export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
-           LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \
-
-  '' + lib.optionalString stdenv.isDarwin ''
-    export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \
-           MACOSX_DEPLOYMENT_TARGET="10.9"
+           LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
   src = fetchgit {
@@ -24,11 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78";
   };
 
+  enableParallelBuilding = true;
+
   meta = {
     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" ];
   };
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 536e62f777e..73126ce1f5c 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -157,6 +157,7 @@ in rec {
         mkdir -p $out/include
         pushd $out/include >/dev/null
         ln -s "${sdk}/include/xpc"
+        ln -s "${sdk}/include/launch.h"
         popd >/dev/null
       '';
     };

From 01dbf03628fbddff46b60354407d23497c25a566 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 14:18:49 +0200
Subject: [PATCH 0647/1744] network-link-*.service: Set stopIfChanged = false

This reduces the time window during which IP addresses are gone during
switch-to-configuration. A complication is that with stopIfChanged =
true, preStop would try to delete the *new* IP addresses rather than
the old one (since the preStop script now runs after the switch to the
new configuration). So we now record the actually configured addresses
in /run/nixos/network/addresses/<interface>. This is more robust in
any case.

Issue https://github.com/NixOS/nixops/issues/640.
---
 nixos/modules/security/polkit.nix             |  2 +-
 .../tasks/network-interfaces-scripted.nix     | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 8d9d5348063..7e59408a5b0 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -64,7 +64,7 @@ in
     systemd.packages = [ pkgs.polkit.out ];
 
     systemd.services.polkit.restartTriggers = [ config.system.path ];
-    systemd.services.polkit.unitConfig.X-StopIfChanged = false;
+    systemd.services.polkit.stopIfChanged = false;
 
     # The polkit daemon reads action/rule files
     environment.pathsToLink = [ "/share/polkit-1" ];
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f30906b84a2..720891d518a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -159,35 +159,42 @@ let
             after = [ "network-pre.target" ] ++ (deviceDependency i.name);
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
+            # Restart rather than stop+start this unit to prevent the
+            # network from dying during switch-to-configuration.
+            stopIfChanged = false;
             path = [ pkgs.iproute ];
             script =
               ''
+                # FIXME: shouldn't this be done in network-link?
                 echo "bringing up interface..."
                 ip link set "${i.name}" up
 
-                restart_network_interfaces=false
+                state="/run/nixos/network/addresses/${i.name}"
+
+                mkdir -p $(dirname "$state")
+
               '' + flip concatMapStrings (ips) (ip:
                 let
                   address = "${ip.address}/${toString ip.prefixLength}";
                 in
                 ''
-                  echo "checking ip ${address}..."
+                  echo "${address}" >> $state
                   if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
-                    echo "added ip ${address}..."
+                    echo "added ip ${address}"
                   elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
                     echo "failed to add ${address}"
                     exit 1
                   fi
                 '');
-            preStop = flip concatMapStrings (ips) (ip:
-                let
-                  address = "${ip.address}/${toString ip.prefixLength}";
-                in
-                ''
-                  echo -n "deleting ${address}..."
-                  ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
-                  echo ""
-                '');
+            preStop = ''
+              state="/run/nixos/network/addresses/${i.name}"
+              while read address; do
+                echo -n "deleting $address..."
+                ip addr del "$address" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
+                echo ""
+              done < "$state"
+              rm -f "$state"
+            '';
           };
 
         createTunDevice = i: nameValuePair "${i.name}-netdev"

From fccce068c397ff2e97a686babbb9604e4e88c20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 11:38:47 +0200
Subject: [PATCH 0648/1744] baobab: remove superflous gsettings_desktop_schemas

---
 .../gnome-3/3.22/core/baobab/default.nix        | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
index f7a0ff473cc..15db270e80c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, intltool, fetchurl, vala_0_32, libgtop
+{ stdenv, intltool, fetchurl, vala, libgtop
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
+, bash, wrapGAppsHook, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
@@ -10,17 +10,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Baobab;

From e0160f70daf9f8ec7a42166fb5e43e1e7d252c29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Apr 2017 12:59:00 +0200
Subject: [PATCH 0649/1744] LTS Haskell 8.8

---
 .../configuration-hackage2nix.yaml            | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 91460eb4019..fb9efff3224 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
 
 default-package-overrides:
   - store < 0.4.1               # https://github.com/fpco/store/issues/104
-  # LTS Haskell 8.6
+  # LTS Haskell 8.8
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -371,7 +371,7 @@ default-package-overrides:
   - cmark ==0.5.5.1
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
-  - cmdargs ==0.10.16
+  - cmdargs ==0.10.17
   - code-builder ==0.1.3
   - code-page ==0.1.3
   - codo-notation ==0.5.2
@@ -666,6 +666,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
+  - foundation ==0.0.4
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -695,7 +696,7 @@ default-package-overrides:
   - getopt-generics ==0.13
   - ghc-events ==0.4.4.0
   - ghc-exactprint ==0.5.3.0
-  - ghc-heap-view ==0.5.7
+  - ghc-heap-view ==0.5.9
   - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.3.0.2
@@ -708,7 +709,7 @@ default-package-overrides:
   - ghcjs-base-stub ==0.1.0.2
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-hplay ==0.3.4.2
-  - ghcjs-perch ==0.3.3.1
+  - ghcjs-perch ==0.3.3.2
   - gi-atk ==2.0.11
   - gi-cairo ==1.0.11
   - gi-gdk ==3.0.11
@@ -897,10 +898,10 @@ default-package-overrides:
   - hashable ==1.2.6.0
   - hashable-time ==0.2
   - hashmap ==1.3.2
-  - hashtables ==1.2.1.0
+  - hashtables ==1.2.1.1
   - haskeline ==0.7.3.1
-  - haskell-gi ==0.20
-  - haskell-gi-base ==0.20
+  - haskell-gi ==0.20.1
+  - haskell-gi-base ==0.20.1
   - haskell-import-graph ==1.0.1
   - haskell-lexer ==1.0.1
   - haskell-names ==0.8.0
@@ -957,6 +958,7 @@ default-package-overrides:
   - hfsevents ==0.1.6
   - hid ==0.2.2
   - hidapi ==0.1.4
+  - hidden-char ==0.1.0.0
   - hierarchical-clustering ==0.4.6
   - highjson ==0.4.0.0
   - highjson-swagger ==0.4.0.0
@@ -1097,7 +1099,8 @@ default-package-overrides:
   - hyphenation ==0.6
   - ical ==0.0.1
   - iconv ==0.4.1.3
-  - identicon ==0.2.0
+  - identicon ==0.2.1
+  - idris ==1.0
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - IfElse ==0.85
@@ -1224,6 +1227,7 @@ default-package-overrides:
   - leveldb-haskell ==0.6.4
   - lexer-applicative ==2.1.0.1
   - lhs2tex ==1.19
+  - libffi ==0.1
   - libgit ==0.3.1
   - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.6
@@ -1291,7 +1295,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
-  - memory ==0.14.2
+  - memory ==0.14.3
   - MemoTrie ==0.6.7
   - mersenne-random ==1.0.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1327,7 +1331,7 @@ default-package-overrides:
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
   - monad-journal ==0.7.2
-  - monad-logger ==0.3.21
+  - monad-logger ==0.3.22
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.3.0
@@ -1371,7 +1375,7 @@ default-package-overrides:
   - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.2.4
-  - mustache ==2.1.2
+  - mustache ==2.1.3
   - mutable-containers ==0.3.3
   - mwc-probability ==1.3.0
   - mwc-random ==0.13.5.0
@@ -1567,6 +1571,7 @@ default-package-overrides:
   - prelude-safeenum ==0.1.1.2
   - preprocessor-tools ==1.0.1
   - presburger ==1.3.1
+  - present ==4.1.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
   - pretty-show ==1.6.12
@@ -1587,7 +1592,7 @@ default-package-overrides:
   - prometheus-metrics-ghc ==0.1.0.1
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.1
-  - protobuf-simple ==0.1.0.2
+  - protobuf-simple ==0.1.0.3
   - protocol-buffers ==2.4.0
   - protocol-buffers-descriptor ==2.4.0
   - protolude ==0.1.10
@@ -1725,7 +1730,7 @@ default-package-overrides:
   - scalpel ==0.5.0
   - scalpel-core ==0.5.0
   - scanner ==0.2
-  - scientific ==0.3.4.10
+  - scientific ==0.3.4.11
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -1867,7 +1872,7 @@ default-package-overrides:
   - storable-record ==0.0.3.1
   - store-core ==0.4
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.4.1
+  - stratosphere ==0.4.2
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
@@ -1935,11 +1940,11 @@ default-package-overrides:
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.8.4
   - tasty-rerun ==1.1.6
-  - tasty-silver ==3.1.9
+  - tasty-silver ==3.1.10
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.2
   - tasty-tap ==0.0.4
-  - tasty-th ==0.1.4
+  - tasty-th ==0.1.5
   - Taxonomy ==1.0.2
   - TCache ==0.12.1
   - tce-conf ==1.3
@@ -2054,7 +2059,7 @@ default-package-overrides:
   - uglymemo ==0.1.0.1
   - unbound ==0.5.1
   - unbound-generics ==0.3.1
-  - unbounded-delays ==0.1.0.9
+  - unbounded-delays ==0.1.0.10
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
   - unicode-show ==0.1.0.2
@@ -2138,7 +2143,7 @@ default-package-overrides:
   - wai-middleware-consul ==0.1.0.2
   - wai-middleware-content-type ==0.5.0.1
   - wai-middleware-crowd ==0.1.4.2
-  - wai-middleware-metrics ==0.2.3
+  - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==0.1.0.1
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.1.0
@@ -2168,7 +2173,7 @@ default-package-overrides:
   - webdriver-angular ==0.1.11
   - webkitgtk3 ==0.14.2.1
   - webkitgtk3-javascriptcore ==0.14.2.1
-  - webpage ==0.0.4
+  - webpage ==0.0.5
   - webrtc-vad ==0.1.0.3
   - websockets ==0.10.0.0
   - websockets-snap ==0.10.2.0
@@ -2203,7 +2208,7 @@ default-package-overrides:
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1
   - writer-cps-morph ==0.1.0.2
-  - writer-cps-mtl ==0.1.1.2
+  - writer-cps-mtl ==0.1.1.3
   - writer-cps-transformers ==0.1.1.2
   - wuss ==1.1.3
   - X11 ==1.8
@@ -2281,7 +2286,7 @@ default-package-overrides:
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.9
+  - zip ==0.1.10
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2

From 4f62f342f6e7a505e659d86792d7e7ad2d8d6b89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Apr 2017 12:56:25 +0200
Subject: [PATCH 0650/1744] hackage2nix: disable Hydra builds for accelerate-*
 packages with unfree license

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index fb9efff3224..2e0b75ce56f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2414,12 +2414,14 @@ dont-distribute-packages:
   shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
 
   # these packages depend on software with an unfree license
+  accelerate-bignum:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cublas:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cuda:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cufft:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fft:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier-benchmark:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm-ptx:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-yices:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]

From b232d2f4e4cf1ebb1f3dc5d58cf11a7d6c71d9a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 31 Mar 2017 09:44:31 +0200
Subject: [PATCH 0651/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f68bd6983705d5dbc2ad701dd90f45539cd0cef4.
---
 .../haskell-modules/hackage-packages.nix      | 1685 +++++++++++++----
 1 file changed, 1360 insertions(+), 325 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e709108e9d8..509f6449e02 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1807,6 +1807,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Blogdown" = callPackage
+    ({ mkDerivation, base, containers, MissingH, parsec }:
+     mkDerivation {
+       pname = "Blogdown";
+       version = "0.1.0";
+       sha256 = "e4485ea5f4b61b5887b930e23f7a3d0a1ed0068070c18aceff511ab980bd5532";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers MissingH parsec ];
+       executableHaskellDepends = [ base containers MissingH parsec ];
+       testHaskellDepends = [ base containers MissingH parsec ];
+       description = "A markdown-like markup language designed for blog posts";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "BluePrintCSS" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -3859,9 +3874,10 @@ self: {
     ({ mkDerivation, base, constraints, mtl, random }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.3.28";
-       sha256 = "e9dd1618c3e002cbf4fc6da18ad06202488b673b5d9e3ee5569830c5fc512f2d";
+       version = "0.2017.4.1";
+       sha256 = "01342b63961fc2916edebb8b4bc9bd63a1719608ac4c42f5cd700a7ef471dd77";
        libraryHaskellDepends = [ base constraints mtl random ];
+       testHaskellDepends = [ base constraints mtl random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -9883,6 +9899,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.0";
+       sha256 = "2ece595b6a29a58074e6459ab03f32aae2a90b475ce3d629ccdf71844f599da4";
+       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;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -18056,14 +18092,14 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_5_3_0" = callPackage
+  "Win32_2_5_4_1" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
      , msimg32, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.5.3.0";
-       sha256 = "fd66d7feafc7863cbd0726c8dbf605a007804e009fe4e5b5ebdf4f4727257c31";
+       version = "2.5.4.1";
+       sha256 = "cc183e9e545ad04fe8e509eb9447e9d11b160b2027482230cee8cdc141fd3d64";
        libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
          advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
@@ -19138,6 +19174,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate_1_0_0_0" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, deepseq, directory
+     , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables
+     , mtl, pretty, template-haskell, time, transformers, unique, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "accelerate";
+       version = "1.0.0.0";
+       sha256 = "26bd346b77852ebaeef32e18907272e7b0cc54b033a2fcc7f24ee1afa0e8f112";
+       libraryHaskellDepends = [
+         base base-orphans containers deepseq directory exceptions fclabels
+         filepath ghc-prim hashable hashtables mtl pretty template-haskell
+         time transformers unique unix unordered-containers
+       ];
+       homepage = "https://github.com/AccelerateHS/accelerate/";
+       description = "An embedded language for accelerated array processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-arithmetic" = callPackage
     ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
      , utility-ht
@@ -19158,6 +19215,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "accelerate-bignum" = callPackage
+    ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
+     , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
+     , ghc-prim, llvm-hs-pure, mwc-random, tasty, tasty-quickcheck
+     , template-haskell, vector, vector-th-unbox, wide-word
+     }:
+     mkDerivation {
+       pname = "accelerate-bignum";
+       version = "0.1.0.0";
+       sha256 = "7c18c467d646ed30131ad197144c4f7fa6ce3e821d41c6db3dba4361f04e30a5";
+       libraryHaskellDepends = [
+         accelerate accelerate-llvm accelerate-llvm-native
+         accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-llvm-native accelerate-llvm-ptx base tasty
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx
+         base criterion mwc-random vector vector-th-unbox wide-word
+       ];
+       homepage = "https://github.com/tmcdonell/accelerate-bignum";
+       description = "Fixed-length large integer arithmetic for Accelerate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-cublas" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
      , accelerate-io, accelerate-utility, base, cublas, cuda, random
@@ -19185,18 +19270,20 @@ self: {
 
   "accelerate-cuda" = callPackage
     ({ mkDerivation, accelerate, array, base, binary, bytestring
-     , cryptohash, cuda, directory, fclabels, filepath, hashable
-     , hashtables, language-c-quote, mainland-pretty, mtl, old-time
-     , pretty, process, SafeSemaphore, srcloc, template-haskell, text
-     , transformers, unix, unordered-containers
+     , containers, cryptohash, cuda, directory, fclabels, filepath
+     , hashable, hashtables, language-c-quote, mainland-pretty, mtl
+     , old-time, pretty, process, SafeSemaphore, srcloc
+     , template-haskell, text, transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "accelerate-cuda";
-       version = "0.16.0.0";
-       sha256 = "a5856713e24d2441823f3e53b7edaff3808b9757c687ca0c9fcf014a8001f7e5";
+       version = "0.17.0.0";
+       sha256 = "8bf1a11683db753961ce138aae1726f51aa93ff1bd29e9d30c0e53b60ad5b682";
+       revision = "3";
+       editedCabalFile = "7593f53c4d1e4851e226fef9f51b60b9addfc1cf7ed5f0f67eb2d3728e7f8013";
        libraryHaskellDepends = [
-         accelerate array base binary bytestring cryptohash cuda directory
-         fclabels filepath hashable hashtables language-c-quote
+         accelerate array base binary bytestring containers cryptohash cuda
+         directory fclabels filepath hashable hashtables language-c-quote
          mainland-pretty mtl old-time pretty process SafeSemaphore srcloc
          template-haskell text transformers unix unordered-containers
        ];
@@ -19227,37 +19314,37 @@ self: {
      }) {};
 
   "accelerate-examples" = callPackage
-    ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fft
-     , accelerate-io, ansi-wl-pprint, array, attoparsec, base, binary
-     , bmp, bytestring, bytestring-lexing, cereal, containers, criterion
-     , directory, ekg, fclabels, filepath, gloss, gloss-accelerate
-     , gloss-raster-accelerate, gloss-rendering, HUnit, mwc-random
-     , normaldistribution, primitive, QuickCheck, random, repa, repa-io
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector, vector-algorithms
+    ({ mkDerivation, accelerate, accelerate-fft, accelerate-io
+     , ansi-wl-pprint, array, base, binary, bmp, bytestring
+     , bytestring-lexing, cereal, colour-accelerate, containers
+     , criterion, directory, fclabels, filepath, gloss, gloss-accelerate
+     , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate
+     , linear, linear-accelerate, matrix-market-attoparsec, mwc-random
+     , normaldistribution, pipes, QuickCheck, random, repa, repa-io
+     , scientific, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "accelerate-examples";
-       version = "0.15.1.0";
-       sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2";
-       revision = "2";
-       editedCabalFile = "bcebd104b948308a60f7f5ff63cdacb7e4b07d84be73fe3a83c5ef641a2b41f4";
+       version = "1.0.0.0";
+       sha256 = "a659dc486da23d220aeefac958008ae9c0a214570008bfa6eaccb6fc02ac05e9";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         accelerate accelerate-cuda ansi-wl-pprint base containers criterion
-         directory ekg fclabels HUnit mwc-random QuickCheck test-framework
+         accelerate ansi-wl-pprint base containers criterion directory
+         fclabels HUnit linear mwc-random QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        executableHaskellDepends = [
-         accelerate accelerate-cuda accelerate-fft accelerate-io array
-         attoparsec base binary bmp bytestring bytestring-lexing cereal
-         containers criterion directory fclabels filepath gloss
-         gloss-accelerate gloss-raster-accelerate gloss-rendering HUnit
-         mwc-random normaldistribution primitive QuickCheck random repa
-         repa-io test-framework test-framework-hunit
-         test-framework-quickcheck2 vector vector-algorithms
+         accelerate accelerate-fft accelerate-io array base binary bmp
+         bytestring bytestring-lexing cereal colour-accelerate containers
+         criterion directory fclabels filepath gloss gloss-accelerate
+         gloss-raster-accelerate gloss-rendering HUnit lens-accelerate
+         linear-accelerate matrix-market-attoparsec mwc-random
+         normaldistribution pipes QuickCheck random repa repa-io scientific
+         test-framework test-framework-hunit test-framework-quickcheck2
+         vector vector-algorithms
        ];
        homepage = "https://github.com/AccelerateHS/accelerate-examples";
        description = "Examples using the Accelerate library";
@@ -19266,16 +19353,12 @@ self: {
      }) {};
 
   "accelerate-fft" = callPackage
-    ({ mkDerivation, accelerate, accelerate-cuda, base, cuda, cufft }:
+    ({ mkDerivation, accelerate, base, bytestring }:
      mkDerivation {
        pname = "accelerate-fft";
-       version = "0.15.1.0";
-       sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702";
-       revision = "1";
-       editedCabalFile = "c283fc3767bf4281da75b958ae0c8a404ba0e26f7c7b746158355e6824e2d22d";
-       libraryHaskellDepends = [
-         accelerate accelerate-cuda base cuda cufft
-       ];
+       version = "1.0.0.0";
+       sha256 = "784a486d36ac3af714952744f5f592242f11f477bdf8b336356857d593a584e3";
+       libraryHaskellDepends = [ accelerate base bytestring ];
        homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -19352,8 +19435,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-io";
-       version = "0.15.1.0";
-       sha256 = "d531fc6c950a6fcf0bdd72c65438c27fbffe2f3043444128979490d53fc7677c";
+       version = "1.0.0.0";
+       sha256 = "d12b3b85b488a860bee0c4d54c98d22a327e3264f5e8d328109035162cc8b640";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
@@ -19363,6 +19446,67 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "accelerate-llvm" = callPackage
+    ({ mkDerivation, abstract-deque, accelerate, base, chaselev-deque
+     , containers, data-default-class, dlist, exceptions, fclabels
+     , llvm-hs, llvm-hs-pure, mtl, mwc-random, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "accelerate-llvm";
+       version = "1.0.0.0";
+       sha256 = "b0ead40df7ff37ffd97374c5320c099cc85399af74e12b375dec46c172988ccf";
+       revision = "6";
+       editedCabalFile = "f9176273927c5a66cbd32d5039bd4d01ef33783fb5a8e7b24ec6f64da09e1ae6";
+       libraryHaskellDepends = [
+         abstract-deque accelerate base chaselev-deque containers
+         data-default-class dlist exceptions fclabels llvm-hs llvm-hs-pure
+         mtl mwc-random unordered-containers vector
+       ];
+       description = "Accelerate backend generating LLVM";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "accelerate-llvm-native" = callPackage
+    ({ mkDerivation, accelerate, accelerate-llvm, base, containers
+     , directory, dlist, fclabels, libffi, llvm-hs, llvm-hs-pure, mtl
+     , time
+     }:
+     mkDerivation {
+       pname = "accelerate-llvm-native";
+       version = "1.0.0.0";
+       sha256 = "2dca18b74e9eddb031d85bbf23a20dcdd0ee96a8b47b44ea2028e75fbabb0855";
+       revision = "1";
+       editedCabalFile = "6cc24adf5c991e7776a8ad0393bc7899caee5e431c8d90bccaf1f8610ae0811d";
+       libraryHaskellDepends = [
+         accelerate accelerate-llvm base containers directory dlist fclabels
+         libffi llvm-hs llvm-hs-pure mtl time
+       ];
+       description = "Accelerate backend generating LLVM";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "accelerate-llvm-ptx" = callPackage
+    ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
+     , containers, cuda, directory, dlist, fclabels, filepath, hashable
+     , llvm-hs, llvm-hs-pure, mtl, pretty, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "accelerate-llvm-ptx";
+       version = "1.0.0.0";
+       sha256 = "4fae1fb91339ce1e989f9fc8063869e68eb3cf152d972ec1913d6f5f37d12d0e";
+       revision = "1";
+       editedCabalFile = "c9e468c5a8c75f231122ba116ae645734f13051ef0163fef2a47bd2ea0278592";
+       libraryHaskellDepends = [
+         accelerate accelerate-llvm base bytestring containers cuda
+         directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl
+         pretty time unordered-containers
+       ];
+       description = "Accelerate backend generating LLVM";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-random" = callPackage
     ({ mkDerivation, accelerate, base, mwc-random }:
      mkDerivation {
@@ -20473,6 +20617,8 @@ self: {
        pname = "aeson";
        version = "1.0.2.1";
        sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066";
+       revision = "1";
+       editedCabalFile = "cf848d5d07a3e6962d7a274d452c772bc1c413a0f9f2d5f112fdde4556a7d7f1";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -20505,6 +20651,8 @@ self: {
        pname = "aeson";
        version = "1.1.1.0";
        sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6";
+       revision = "1";
+       editedCabalFile = "fac1956736821af59480cc0adaa84f6c35f6a7678d4256a818f0a5d84a23aef1";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -27955,8 +28103,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "7";
-       editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f";
+       revision = "8";
+       editedCabalFile = "02e4d9421b93aa3fe30c3b676ae1e7c5dca3a7b7d4c710b4f1a0925a071dca6c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -27973,7 +28121,7 @@ self: {
          aeson base criterion mtl network-uri resource-pool
          rethinkdb-client-driver text
        ];
-       description = "empty";
+       description = "Server-side implementation of the Avers storage model";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -27986,6 +28134,8 @@ self: {
        pname = "avers-api";
        version = "0.0.18.0";
        sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5";
+       revision = "1";
+       editedCabalFile = "1b4647c9b83c58c85eda00a185f366602084de4e1a75f47ad02fcb1789ecda7e";
        libraryHaskellDepends = [
          aeson avers base bytestring cookie http-api-data servant text time
          vector
@@ -28004,6 +28154,8 @@ self: {
        pname = "avers-api-docs";
        version = "0.0.18.0";
        sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1";
+       revision = "1";
+       editedCabalFile = "23afde7dedb160851c8cb51c7d778d52bac33b38b01189d91d71a5d0db0b4512";
        libraryHaskellDepends = [
          aeson avers avers-api base cookie lens servant servant-swagger
          swagger2 text unordered-containers
@@ -28025,6 +28177,8 @@ self: {
        pname = "avers-server";
        version = "0.0.18.0";
        sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7";
+       revision = "1";
+       editedCabalFile = "e685f7dcb5c8a80b047f6974e51cc2edab7e0a98b260587a7c82627fb858f559";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
          bytestring-conversion containers cookie cryptonite either
@@ -28713,8 +28867,8 @@ self: {
      }:
      mkDerivation {
        pname = "azubi";
-       version = "0.2.0.1";
-       sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651";
+       version = "0.2.0.2";
+       sha256 = "5b5901feb57f59e518e53cc8d29863650c5bf34d83224aafc10895e5f8915602";
        libraryHaskellDepends = [
          base Diff directory filepath options process unix
        ];
@@ -30653,7 +30807,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_4_1" = callPackage
+  "binary_0_8_5_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
      , containers, criterion, deepseq, directory, filepath, HUnit, mtl
      , QuickCheck, random, tar, test-framework
@@ -30661,35 +30815,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.4.1";
-       sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba";
-       revision = "1";
-       editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50";
-       libraryHaskellDepends = [ array base bytestring containers ];
-       testHaskellDepends = [
-         array base bytestring Cabal containers directory filepath HUnit
-         QuickCheck random test-framework test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         array attoparsec base bytestring Cabal cereal containers criterion
-         deepseq directory filepath mtl tar unordered-containers zlib
-       ];
-       homepage = "https://github.com/kolmodin/binary";
-       description = "Binary serialisation for Haskell values using lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "binary_0_9_0_0" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
-     , containers, criterion, deepseq, directory, filepath, HUnit, mtl
-     , QuickCheck, random, tar, test-framework
-     , test-framework-quickcheck2, unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "binary";
-       version = "0.9.0.0";
-       sha256 = "881dc60e21685846e1f2e8e02e60b30db96da3763492c7f1009aaf7ab9768dea";
+       version = "0.8.5.1";
+       sha256 = "deb91a69662288f38bb62e04f2cedf8ef60d84437a194c778dacf6c31dfe0596";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -33876,8 +34003,8 @@ self: {
      }:
      mkDerivation {
        pname = "board-games";
-       version = "0.1.0.5";
-       sha256 = "b03ba53621f7ebd508d1f910f71492252a7181cc3485ecf7ae874eb634bd5d5e";
+       version = "0.1.0.6";
+       sha256 = "173e6eba0eddd3807d610c305f37f049fe5d2346e0772e186b3c2aced4043e63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33943,8 +34070,8 @@ self: {
      }:
      mkDerivation {
        pname = "bolt";
-       version = "0.3.0.1";
-       sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9";
+       version = "0.3.1.0";
+       sha256 = "b08cbc39c38084e540c30052ac03fc764871650444024008f67d407002f57764";
        libraryHaskellDepends = [
          base bifunctors bytestring cereal containers hashable network
          network-uri scientific text transformers unordered-containers
@@ -35912,6 +36039,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "c-mosquitto" = callPackage
+    ({ mkDerivation, base, bytestring, containers, inline-c, mosquitto
+     , options, primitive
+     }:
+     mkDerivation {
+       pname = "c-mosquitto";
+       version = "0.1.0.0";
+       sha256 = "f5ebcc828368ab3e76f45e64fc0266d8483f28f42cbcda911a22d6021204cd3f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers inline-c primitive
+       ];
+       librarySystemDepends = [ mosquitto ];
+       executableHaskellDepends = [ base options ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/tolysz/c-mosquitto#readme";
+       description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) mosquitto;};
+
   "c-storable-deriving" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -36629,8 +36777,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.1.0.0";
-       sha256 = "14181990a168231a74b5f277e33f55c3dce8b58e0cb9f7bd828cb06d82326eae";
+       version = "0.1.1.0";
+       sha256 = "aa33d57eb818ca5da4c1ebf96f12e6751c216b279ee6bffdaee09bfd9cf6ea69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38225,10 +38373,8 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "casing";
-       version = "0.1.2.0";
-       sha256 = "82fa20ff56d52349a9d0ee0c095f1aad384c8d5046a3563b956c4add841465a7";
-       revision = "1";
-       editedCabalFile = "fe967eec15b788744d08ffa34b33baa7e765764dcf2feb642c5985ca543dd804";
+       version = "0.1.2.1";
+       sha256 = "a8bff2e6ed42915a472fa6f62873d78f21c2d31390845a8d3b5ea2638101a638";
        libraryHaskellDepends = [ base split ];
        description = "Convert between various source code casing conventions";
        license = stdenv.lib.licenses.mit;
@@ -39498,8 +39644,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "charsetdetect";
-       version = "1.0";
-       sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0";
+       version = "1.1.0.2";
+       sha256 = "5e8339ec02f13265016489141b69af373564edc7581ef46f8ae405b8a919d5e6";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
@@ -39590,8 +39736,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.9.0.0";
-       sha256 = "edf8212aeb172c7ba63be8d72eded4f7ca3eb0c29fbf78b134d7a9e64f989f5a";
+       version = "0.9.1.0";
+       sha256 = "c0bf8a15a71e935a83ae3b723a63ab81b13d59a1de1f9cd44c0a77e6a15852e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41738,6 +41884,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cloudi" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , network, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "cloudi";
+       version = "1.7.0";
+       sha256 = "66d372c0fe9a19f465f6b40d43864e9a43195c5de99ab560f0b5bbb6f3978648";
+       libraryHaskellDepends = [
+         array base binary bytestring containers network time unix zlib
+       ];
+       homepage = "https://github.com/CloudI/cloudi_api_haskell";
+       description = "Haskell CloudI API";
+       license = stdenv.lib.licenses.bsdOriginal;
+     }) {};
+
   "cloudyfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup
@@ -42028,6 +42190,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmdargs_0_10_17" = callPackage
+    ({ mkDerivation, base, filepath, process, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "cmdargs";
+       version = "0.10.17";
+       sha256 = "3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
+       homepage = "https://github.com/ndmitchell/cmdargs#readme";
+       description = "Command line argument processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cmdargs-browser" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, filepath
      , http-types, process, text, transformers, wai, wai-handler-launch
@@ -42760,6 +42941,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "colour-accelerate" = callPackage
+    ({ mkDerivation, accelerate, base }:
+     mkDerivation {
+       pname = "colour-accelerate";
+       version = "0.1.0.0";
+       sha256 = "3292dae683026ae6890908a70363d80500f56c0f539c8571672e667623b08cb2";
+       libraryHaskellDepends = [ accelerate base ];
+       homepage = "https://github.com/tmcdonell/colour-accelerate";
+       description = "Working with colours in Accelerate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "colour-space" = callPackage
     ({ mkDerivation, base, colour, constrained-categories, JuicyPixels
      , linear, linearmap-category, manifolds, semigroups, vector-space
@@ -43429,10 +43622,10 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "complex-generic";
-       version = "0.1.1";
-       sha256 = "9422670fd08f3daaae823466398a9d4b9b2d8b4b9d568380833c5c391e679896";
+       version = "0.1.1.1";
+       sha256 = "1f535c9ab52930cfae7665b659713214af81ab6ffdfddb42c540bad8522a8b0f";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://gitorious.org/complex-generic";
+       homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45055,17 +45248,24 @@ self: {
      }) {};
 
   "constrained-monads" = callPackage
-    ({ mkDerivation, base, containers, doctest, QuickCheck
-     , transformers
+    ({ mkDerivation, base, containers, criterion, deepseq, doctest
+     , free, nat-sized-numbers, QuickCheck, smallcheck, transformers
+     , vector
      }:
      mkDerivation {
        pname = "constrained-monads";
-       version = "0.4.0.0";
-       sha256 = "335432d74b02ada378b2815a57ba9b840fe24474e2d5c25fa2aac32c3a431cc1";
-       libraryHaskellDepends = [ base containers transformers ];
+       version = "0.5.0.0";
+       sha256 = "8e618d145ec4d38c41446b56fdc4264d789bf3f9bc03e1db64827086ecdb07c0";
+       libraryHaskellDepends = [
+         base containers deepseq free transformers
+       ];
        testHaskellDepends = [
          base containers doctest QuickCheck transformers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq nat-sized-numbers QuickCheck
+         smallcheck transformers vector
+       ];
        homepage = "https://github.com/oisdk/constrained-monads#readme";
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
@@ -45256,15 +45456,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_10_1" = callPackage
+  "containers_0_5_10_2" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
      , ghc-prim, HUnit, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.10.1";
-       sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347";
+       version = "0.5.10.2";
+       sha256 = "a04efef290be272cdeca1c36f9cff17271ccd8d2b484ebf152bb496fb5328c23";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -48575,6 +48775,8 @@ self: {
        pname = "cublas";
        version = "0.2.1.0";
        sha256 = "3c6031d2f7332a6a2357a1ec9adc4ba1404c5c05cb5a42193847ceac7652a80b";
+       revision = "1";
+       editedCabalFile = "2784c7237bd25f49735d8779ea8d3a57514b2418bfdeb2697bdd06e688acd9d7";
        libraryHaskellDepends = [
          base cuda filepath language-c storable-complex template-haskell
        ];
@@ -56769,6 +56971,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "doublify-toolkit" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "doublify-toolkit";
+       version = "0.0.1";
+       sha256 = "dba394c7bf1d64898679a3b8108245abcf053fee439b8e4066ce2135f8592b52";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/doublifyapis/toolkit-haskell";
+       description = "Doublify API toolkit for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dove" = callPackage
     ({ mkDerivation, acl2, base }:
      mkDerivation {
@@ -61152,6 +61366,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ether_0_4_1_0" = callPackage
+    ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
+     , QuickCheck, tasty, tasty-quickcheck, template-haskell
+     , transformers, transformers-base, transformers-lift
+     }:
+     mkDerivation {
+       pname = "ether";
+       version = "0.4.1.0";
+       sha256 = "4790c6a8d2f81fcda1dd037bd89e4183d215417f0f3228b6f3dee5a2be139d30";
+       libraryHaskellDepends = [
+         base exceptions mmorph monad-control mtl template-haskell
+         transformers transformers-base transformers-lift
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-quickcheck transformers
+       ];
+       homepage = "https://int-index.github.io/ether/";
+       description = "Monad transformers and classes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ethereum-client-haskell" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring
      , binary, bytestring, cmdargs, containers, cryptohash, data-default
@@ -61935,8 +62171,8 @@ self: {
      }:
      mkDerivation {
        pname = "exinst";
-       version = "0.3.0.1";
-       sha256 = "7a7351355ac5bf1f0bf1fb1028993399f7f644b661579a62bbc88853a55c796b";
+       version = "0.4";
+       sha256 = "49f2465086a7e0411d9bdfe5957e54e7bd85d873dc7e75d3447c7b2edf98ee58";
        libraryHaskellDepends = [
          aeson base binary bytes cereal constraints deepseq hashable
          profunctors QuickCheck singletons
@@ -61947,7 +62183,7 @@ self: {
          tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/exinst";
-       description = "Recover instances for your existential types";
+       description = "Recover type indexes and instances for your existentialized types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -62944,8 +63180,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tagsoup";
-       version = "1.0.12";
-       sha256 = "6447078da5a85c62528edab1a266ae8709811ba1d113f6dee1ec249e75e3904a";
+       version = "1.0.13";
+       sha256 = "250658a41dae37448ce938ef05f9eaa1d9083b4b6030de03df074d3e546a0986";
        libraryHaskellDepends = [
          base bytestring containers tagsoup text text-icu
        ];
@@ -66638,10 +66874,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.4";
-       sha256 = "a86d2383d2be673593c4862ce082bb2662ce1e2f32d5187f351d47105b95921b";
-       revision = "3";
-       editedCabalFile = "bd8219e3179c900cc49b70d006c8844fcda618f33867d2e8b5679fed9afd360b";
+       version = "0.0.5";
+       sha256 = "d2822ebd4159ef2786909dee674397d675dcb710ee2b48a693d69a1ece30cf55";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70325,6 +70559,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-heap-view_0_5_9" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-heap-view";
+       version = "0.5.9";
+       sha256 = "c631a30ed4dc3d6b53ffe1dbed7d2dc5799a362e6e490a7760ff2fd2b0df32af";
+       libraryHaskellDepends = [
+         base binary bytestring containers ghc template-haskell transformers
+       ];
+       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
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
@@ -70593,14 +70844,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-prof_1_4_0" = callPackage
+  "ghc-prof_1_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.4.0";
-       sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253";
+       version = "1.4.0.1";
+       sha256 = "af2e4919097e4bed023aefd9b10fb70ded3ea369e7457324e7ad7d2b96d809e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71159,6 +71410,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-perch_0_3_3_2" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "ghcjs-perch";
+       version = "0.3.3.2";
+       sha256 = "a7cee1699b51af9e0aa62dec2ab4a04f68250106da02c77bed19dd69fae5e6d9";
+       libraryHaskellDepends = [ base transformers ];
+       description = "GHCJS version of Perch library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-promise" = callPackage
     ({ mkDerivation, base, ghcjs-base, protolude }:
      mkDerivation {
@@ -71697,6 +71960,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libnotify;};
 
+  "gi-ostree" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-ostree";
+       version = "1.0.1";
+       sha256 = "de10141aad3fe918b337743231d86f2dd70e876e6e49de8f4d36ef700d241299";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ ostree ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "OSTree bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) ostree;};
+
   "gi-pango" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text
@@ -72515,8 +72799,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.3.6";
-       sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49";
+       version = "1.3.7";
+       sha256 = "dc38431b13d2dc4625987131c1389ed4ab67154990035c0c66f30d90d1a344af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process text unix ];
@@ -73693,10 +73977,8 @@ self: {
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
        pname = "gloss-accelerate";
-       version = "1.9.0.0";
-       sha256 = "3bf746a687ed23fbb19d6ac358cad52dfeb06301315ac4e69d221c6a5139798f";
-       revision = "1";
-       editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
+       version = "0.2.0.0";
+       sha256 = "5039b74bac0851ceaa7b971a5a50f1533c5e7d99594bc8030ee01c473f5875ae";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -73814,15 +74096,15 @@ self: {
      }) {};
 
   "gloss-raster-accelerate" = callPackage
-    ({ mkDerivation, accelerate, accelerate-cuda, base, gloss
+    ({ mkDerivation, accelerate, base, colour-accelerate, gloss
      , gloss-accelerate
      }:
      mkDerivation {
        pname = "gloss-raster-accelerate";
-       version = "1.9.0.0";
-       sha256 = "288e1937da8a28e947bafd55624bffb469c84ef031b23b895589deac205ef24d";
+       version = "0.2.0.0";
+       sha256 = "d88c6dd639b86a451e77b5eae86fec785b476dd337bb189b82981bf33fe580fa";
        libraryHaskellDepends = [
-         accelerate accelerate-cuda base gloss gloss-accelerate
+         accelerate base colour-accelerate gloss gloss-accelerate
        ];
        description = "Parallel rendering of raster images using Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -77092,8 +77374,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.2.0.0";
-       sha256 = "73a2560c6fb927d689e826cbd4ec1aba6a9f35bb3ba0b66b0d693614bfc492b3";
+       version = "0.3.0.0";
+       sha256 = "11b543397fd2a414371b0ba795ae4f49ab29db318d1f154df1d4f6c9cebe39b2";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
@@ -77171,17 +77453,20 @@ self: {
      }) {};
 
   "google-static-maps" = callPackage
-    ({ mkDerivation, aeson, base, bytedump, double-conversion
-     , http-client, JuicyPixels, network-uri, servant, servant-client
-     , servant-JuicyPixels, text
+    ({ mkDerivation, aeson, base, base64-bytestring, bytedump
+     , bytestring, cryptonite, double-conversion, http-client
+     , JuicyPixels, memory, MissingH, network-uri, servant
+     , servant-client, servant-JuicyPixels, text, utf8-string
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.3.0.0";
-       sha256 = "4344c0b1470dd2025bae93a0a9e29c43826c00a16b618513515d696eab96c196";
+       version = "0.4.0.0";
+       sha256 = "015e9f538cac89c82eda25732905eefc7c31bda40d068da5e13b8d3402b03464";
        libraryHaskellDepends = [
-         aeson base bytedump double-conversion http-client JuicyPixels
+         aeson base base64-bytestring bytedump bytestring cryptonite
+         double-conversion http-client JuicyPixels memory MissingH
          network-uri servant servant-client servant-JuicyPixels text
+         utf8-string
        ];
        homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
@@ -82006,23 +82291,16 @@ self: {
      }) {};
 
   "halma" = callPackage
-    ({ mkDerivation, async, base, containers, data-default
-     , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl
-     , mvc, pipes, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, timeit
+    ({ mkDerivation, aeson, base, containers, data-default
+     , diagrams-lib, grid, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "halma";
-       version = "0.2.0.1";
-       sha256 = "4c1b2990d2cbe3b46f5895cf9db75aaabbdf3a9e31df09d3c9fc5528a36c6011";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0.0";
+       sha256 = "ce4af6881502d16e55be04ff055c79898885aed2e657c981633b3a14584cd542";
        libraryHaskellDepends = [
-         base containers data-default diagrams-lib grid
-       ];
-       executableHaskellDepends = [
-         async base data-default diagrams-cairo diagrams-gtk diagrams-lib
-         gtk mtl mvc pipes timeit
+         aeson base containers data-default diagrams-lib grid
        ];
        testHaskellDepends = [
          base containers grid HUnit QuickCheck test-framework
@@ -82034,6 +82312,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "halma-gui" = callPackage
+    ({ mkDerivation, async, base, data-default, diagrams-cairo
+     , diagrams-gtk, diagrams-lib, gtk, halma, mtl, mvc, pipes, timeit
+     }:
+     mkDerivation {
+       pname = "halma-gui";
+       version = "0.1.1.0";
+       sha256 = "28c092d95859946c408bfec96a4794923802c8644b987d3fb7477504cb898861";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base data-default diagrams-cairo diagrams-gtk diagrams-lib
+         gtk halma mtl mvc pipes timeit
+       ];
+       homepage = "https://github.com/timjb/halma";
+       description = "GTK application for playing Halma";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "halma-telegram-bot" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , data-default, diagrams-cairo, diagrams-lib, directory, exceptions
+     , filepath, halma, http-client, http-client-tls, megaparsec, mtl
+     , optparse-applicative, semigroups, servant-client, telegram-api
+     , temporary, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "halma-telegram-bot";
+       version = "0.1.0.0";
+       sha256 = "0b7e311a1d86c7ccb8df208f985914e07c2f5df7f80ebcdbedd658cfb7afdcfa";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring containers data-default
+         diagrams-cairo diagrams-lib directory exceptions filepath halma
+         http-client http-client-tls megaparsec mtl optparse-applicative
+         semigroups servant-client telegram-api temporary text transformers
+         vector
+       ];
+       homepage = "https://github.com/timjb/halma";
+       description = "Telegram bot for playing Halma";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haltavista" = callPackage
     ({ mkDerivation, base, hint, process }:
      mkDerivation {
@@ -84613,14 +84935,14 @@ self: {
 
   "haskell-igraph" = callPackage
     ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs
-     , colour, data-default-class, hashable, hxt, igraph, primitive
-     , random, split, tasty, tasty-golden, tasty-hunit
-     , unordered-containers
+     , colour, data-default-class, data-ordlist, hashable, hxt, igraph
+     , matrices, primitive, random, split, tasty, tasty-golden
+     , tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.2.2";
-       sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d";
+       version = "0.3.0";
+       sha256 = "fb02f544b8ff98893bae89c72323dbb5ff49357e7c7b65f45eb11d26168517b4";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing colour data-default-class
          hashable hxt primitive split unordered-containers
@@ -84628,7 +84950,7 @@ self: {
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base random tasty tasty-golden tasty-hunit
+         base data-ordlist matrices random tasty tasty-golden tasty-hunit
        ];
        description = "Imcomplete igraph bindings";
        license = stdenv.lib.licenses.mit;
@@ -85171,8 +85493,8 @@ self: {
     ({ mkDerivation, base, doctest, lens, semigroups, text, time }:
      mkDerivation {
        pname = "haskell-time-range";
-       version = "0.2.0.0";
-       sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7";
+       version = "0.2.0.1";
+       sha256 = "249315cc1167c23e9e50bdc61b5b2ddb062603616df0b2e575a6235516320ef6";
        libraryHaskellDepends = [ base lens semigroups text time ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/mankyKitty/haskell-time-range#readme";
@@ -85222,6 +85544,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-ast_0_6_0_0" = callPackage
+    ({ mkDerivation, base, ghc, mtl, references, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-ast";
+       version = "0.6.0.0";
+       sha256 = "bb3669b5fb70875551a29efd781e58408c26107eb26f1a4b41d8123a9f7dd6a6";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-ast-fromghc" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
@@ -85295,6 +85634,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-backend-ghc_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghc
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-backend-ghc";
+       version = "0.6.0.0";
+       sha256 = "1bc88d278a314207ebe47cc8a85cebf6b6cd6d835f858e45be2d0cc663a40d96";
+       libraryHaskellDepends = [
+         base bytestring containers ghc 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-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
@@ -85325,6 +85683,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-cli_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl
+     , process, references, split, strict, tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "haskell-tools-cli";
+       version = "0.6.0.0";
+       sha256 = "fe6da0d9a8cfd42ff74579bbfe7d727a64f4e3b8b99770920877a0ddcee6d786";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath ghc ghc-paths haskell-tools-ast
+         haskell-tools-prettyprint haskell-tools-refactor mtl references
+         split strict
+       ];
+       executableHaskellDepends = [ base directory process split ];
+       testHaskellDepends = [
+         base bytestring directory filepath knob tasty tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion directory filepath 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, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -85353,6 +85741,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-daemon_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, Diff
+     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
+     , network, process, references, split, strict, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-daemon";
+       version = "0.6.0.0";
+       sha256 = "25500cc2877eb692cb70905b8f52fc4934ead7030d1acad4165a663dc59e7545";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath ghc
+         ghc-paths haskell-tools-ast haskell-tools-prettyprint
+         haskell-tools-refactor mtl network process references split strict
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath ghc HUnit network process
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Background process for Haskell-tools refactor that editors can connect to";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-debug" = callPackage
     ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -85375,6 +85791,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-debug_0_6_0_0" = callPackage
+    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, references, template-haskell
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "0.6.0.0";
+       sha256 = "e7c1d57bf0399e5421cff93a7873eb762fc428d0165a18512ef6a755b40f3a80";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath ghc ghc-paths haskell-tools-ast
+         haskell-tools-backend-ghc haskell-tools-prettyprint
+         haskell-tools-refactor references 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-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -85406,6 +85845,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-demo_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, 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 = "0.6.0.0";
+       sha256 = "d914bcd4e1e5eb9bee7dcb309847a075ee218c995bc1614bdf0f1ef7a10a1547";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         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-prettyprint" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, uniplate
@@ -85423,6 +85893,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-prettyprint_0_6_0_0" = callPackage
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
+     , references, split, text, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-prettyprint";
+       version = "0.6.0.0";
+       sha256 = "3940d50675b96c29a45a8682effb22a65bf49711dc44deaafcf46272d1c821f8";
+       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, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -85454,6 +85942,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-refactor_0_6_0_0" = callPackage
+    ({ mkDerivation, 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 = "0.6.0.0";
+       sha256 = "1a339d0571d78a94099cd442bf0865cb30df3b7054e7c75d7a5a20effbf94087";
+       libraryHaskellDepends = [
+         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
@@ -85477,6 +85996,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-rewrite_0_6_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-rewrite";
+       version = "0.6.0.0";
+       sha256 = "3a328de2b8df98fdb7e10308daf31b3ca8be401ad8df3b26887f2035642705f7";
+       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
@@ -90210,15 +90752,15 @@ self: {
      }) {};
 
   "hgis" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo
-     , Chart, Chart-cairo, Chart-diagrams, colour, composition
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart
+     , Chart-cairo, Chart-diagrams, colour, composition
      , data-binary-ieee754, data-default, directory, filepath, hspec
      , lens, monad-loops, optparse-applicative, transformers
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.3.1";
-       sha256 = "1616cb332092457e7649ea02687cfc7a5a7d777ac426207870a4df2afc32d6ab";
+       version = "0.1.3.2";
+       sha256 = "6fa441ccf23a2a867d24a3a229add55ce15d9ef95811e04f96e6882713824f0a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90227,14 +90769,13 @@ self: {
          directory filepath lens monad-loops optparse-applicative
          transformers
        ];
-       libraryPkgconfigDepends = [ cairo ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/vmchale/hgis#readme";
        description = "Package and command-line for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) cairo;};
+     }) {};
 
   "hgithub" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
@@ -90488,6 +91029,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
+  "hidden-char" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hidden-char";
+       version = "0.1.0.0";
+       sha256 = "805d8e7f4919f2b32374cf0074c3987831464a359be3b72f6b38509b58d7c9b7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/rcook/hidden-char#readme";
+       description = "Provides getHiddenChar function";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hieraclus" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, multiset }:
      mkDerivation {
@@ -91804,49 +92358,47 @@ self: {
   "hledger" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
      , criterion, csv, data-default, directory, file-embed, filepath
-     , hashable, haskeline, hledger-lib, html, HUnit, megaparsec, mtl
-     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
-     , safe, shakespeare, split, tabular, temporary, terminfo
-     , test-framework, test-framework-hunit, text, time, timeit
-     , transformers, unordered-containers, utf8-string, wizards
+     , hashable, haskeline, here, hledger-lib, html, HUnit, megaparsec
+     , mtl, mtl-compat, old-time, parsec, pretty-show, process
+     , regex-tdfa, safe, shakespeare, split, tabular, temporary
+     , terminfo, test-framework, test-framework-hunit, text, time
+     , timeit, transformers, unordered-containers, utf8-string, wizards
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.1";
-       sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5";
-       revision = "1";
-       editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf";
+       version = "1.2";
+       sha256 = "06f4bae5a49916e0291b1b6d6c2017794c98f14bb22ffa20c49e9650278247a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base base-compat bytestring cmdargs containers csv data-default
-         directory file-embed filepath hashable haskeline hledger-lib HUnit
-         megaparsec mtl mtl-compat old-time pretty-show process regex-tdfa
-         safe shakespeare split tabular temporary terminfo text time
-         transformers unordered-containers utf8-string wizards
+         directory file-embed filepath hashable haskeline here hledger-lib
+         HUnit megaparsec mtl mtl-compat old-time pretty-show process
+         regex-tdfa safe shakespeare split tabular temporary terminfo text
+         time transformers unordered-containers utf8-string wizards
        ];
        executableHaskellDepends = [
          base base-compat bytestring cmdargs containers csv data-default
-         directory file-embed filepath haskeline hledger-lib HUnit mtl
+         directory file-embed filepath haskeline here hledger-lib HUnit mtl
          mtl-compat old-time parsec pretty-show process regex-tdfa safe
          shakespeare split tabular temporary terminfo text time
          unordered-containers utf8-string wizards
        ];
        testHaskellDepends = [
          base base-compat bytestring cmdargs containers csv data-default
-         directory file-embed filepath haskeline hledger-lib HUnit mtl
+         directory file-embed filepath haskeline here hledger-lib HUnit mtl
          mtl-compat old-time parsec pretty-show process regex-tdfa safe
          shakespeare split tabular temporary terminfo test-framework
          test-framework-hunit text time unordered-containers utf8-string
          wizards
        ];
        benchmarkHaskellDepends = [
-         base base-compat criterion directory file-embed filepath
+         base base-compat criterion directory file-embed filepath here
          hledger-lib html pretty-show process tabular temporary time timeit
        ];
        homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -91858,8 +92410,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.1";
-       sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c";
+       version = "1.2";
+       sha256 = "98d3590c8ba7ea11f1d374b6dc0e26642b0d20ce091b83918d42118fd381425d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91869,7 +92421,7 @@ self: {
        ];
        homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -91916,8 +92468,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2";
-       sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083";
+       version = "1.2.1";
+       sha256 = "bc2636fbdce63f62b29ef9cba4e876469b4a040b0b10d2d4575927ef186a591e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91979,35 +92531,31 @@ self: {
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, data-default, Decimal, deepseq
      , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec
-     , mtl, mtl-compat, old-time, parsec, parsers, pretty-show
-     , regex-tdfa, safe, semigroups, split, system-filepath
-     , test-framework, test-framework-hunit, text, time, transformers
-     , trifecta, uglymemo, utf8-string
+     , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
+     , semigroups, split, test-framework, test-framework-hunit, text
+     , time, transformers, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.1";
-       sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556";
-       revision = "1";
-       editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724";
+       version = "1.2";
+       sha256 = "2c7fd837b2a9596b4d6bd3e5f5b60918c697ebb411942f973b6bd4587042d797";
        libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv data-default Decimal deepseq directory filepath hashtables
-         HUnit megaparsec mtl mtl-compat old-time parsec parsers pretty-show
-         regex-tdfa safe semigroups split system-filepath text time
-         transformers trifecta uglymemo utf8-string
+         HUnit megaparsec mtl mtl-compat old-time parsec pretty-show
+         regex-tdfa safe semigroups split text time transformers uglymemo
+         utf8-string
        ];
        testHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv data-default Decimal deepseq directory doctest filepath Glob
-         hashtables HUnit megaparsec mtl mtl-compat old-time parsec parsers
-         pretty-show regex-tdfa safe split system-filepath test-framework
-         test-framework-hunit text time transformers trifecta uglymemo
-         utf8-string
+         hashtables HUnit megaparsec mtl mtl-compat old-time parsec
+         pretty-show regex-tdfa safe split test-framework
+         test-framework-hunit text time transformers uglymemo utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "hledger-ui" = callPackage
@@ -92019,10 +92567,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.1.2";
-       sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1";
-       revision = "2";
-       editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd";
+       version = "1.2";
+       sha256 = "61e2aa3496a7f2898de3e487d9ee90d045e1c8851e74b3995ce37f332784b00a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92033,7 +92579,7 @@ self: {
        ];
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -92067,10 +92613,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.1";
-       sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca";
-       revision = "1";
-       editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d";
+       version = "1.2";
+       sha256 = "a3a14ae8d0548aeb239768639afbfc0631aed4ff620720c28448d88d20eac5e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92099,7 +92643,7 @@ self: {
        ];
        homepage = "http://hledger.org";
        description = "Web interface for the hledger accounting tool";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -97405,8 +97949,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.3.0";
-       sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1";
+       version = "0.3.1";
+       sha256 = "80cdbdec7f99957514f76faa858a0fd7b3c7e7c8539afd141983d6af6a32e728";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -97581,8 +98125,8 @@ self: {
     ({ mkDerivation, base, hspec-expectations, transformers }:
      mkDerivation {
        pname = "hspec-expectations-lifted";
-       version = "0.8.2";
-       sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef";
+       version = "0.10.0";
+       sha256 = "22cdf1509b396fea2f53a0bb88dec3552f540d58cc60962a82970264c1e73828";
        libraryHaskellDepends = [ base hspec-expectations transformers ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
@@ -102995,8 +103539,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.99.2";
-       sha256 = "c3ff38dfeecab2edb7afee907ccbc9b3f348c658ceff686d0617aa3b661d8c3a";
+       version = "1.0";
+       sha256 = "b06852c83e307c9398fa33e031ca1fbe3c4f927496e7f5b00f13b4ed19f82beb";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -106073,6 +106617,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip6addr_0_5_3" = callPackage
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
+     mkDerivation {
+       pname = "ip6addr";
+       version = "0.5.3";
+       sha256 = "1ff90994e691785a6eb4bc080d71556761f0ef6f91f0a3a1452c58a8b06e03c6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
+       homepage = "https://github.com/MichelBoucey/ip6addr";
+       description = "Commandline tool to generate IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ipatch" = callPackage
     ({ mkDerivation, base, bytestring, darcs, directory, filepath
      , hashed-storage, process, unix
@@ -111985,15 +112544,17 @@ self: {
      }) {};
 
   "lambdatex" = callPackage
-    ({ mkDerivation, async, base, containers, directory, HaTeX, hspec
-     , mtl, QuickCheck, quickcheck-text, text, transformers
+    ({ mkDerivation, async, base, containers, directory, filepath
+     , HaTeX, hspec, mtl, QuickCheck, quickcheck-text, text
+     , transformers
      }:
      mkDerivation {
        pname = "lambdatex";
-       version = "0.1.1.0";
-       sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164";
+       version = "0.2.0.0";
+       sha256 = "64d89ff1a397e7cc1390f5c0c49fd83e358b9fa12ca78325ff63a2cc44ddcea9";
        libraryHaskellDepends = [
-         async base containers directory HaTeX mtl text transformers
+         async base containers directory filepath HaTeX mtl text
+         transformers
        ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-text text
@@ -112127,8 +112688,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.6.2";
-       sha256 = "63b3201611262cf8aad5b836b2bbe673a6b718bd1a05d16289e3adc790b08ce8";
+       version = "0.7.0";
+       sha256 = "9debcc259bba8c09490965d6886db1b5495193aae633e624542e8e7f9f2df970";
        libraryHaskellDepends = [ base parsec pretty transformers ];
        testHaskellDepends = [
          base parsec process QuickCheck tasty tasty-expected-failure
@@ -114004,6 +114565,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-accelerate" = callPackage
+    ({ mkDerivation, accelerate, base, lens }:
+     mkDerivation {
+       pname = "lens-accelerate";
+       version = "0.1.0.0";
+       sha256 = "e4a736962342c116960425a32a17f4eaccc03bf583c09d2a619779deee5c9548";
+       libraryHaskellDepends = [ accelerate base lens ];
+       homepage = "https://github.com/tmcdonell/lens-accelerate";
+       description = "Instances to mix lens with accelerate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-action" = callPackage
     ({ mkDerivation, base, comonad, contravariant, directory, doctest
      , filepath, lens, mtl, profunctors, semigroupoids, semigroups
@@ -114314,6 +114887,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lentil_1_0_9_0" = 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.9.0";
+       sha256 = "4403da26f4c6bef7848a20587422103e1e84cd446fc428dfe6370b875c78cf93";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lenz" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, transformers }:
      mkDerivation {
@@ -115755,6 +116356,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linear-accelerate_0_3" = callPackage
+    ({ mkDerivation, accelerate, base, Cabal, distributive, filepath
+     , lens, linear
+     }:
+     mkDerivation {
+       pname = "linear-accelerate";
+       version = "0.3";
+       sha256 = "3aef0c04059e3b650573929aabbf782cc712b2926d76a2a3ed7e37079bdb42a9";
+       setupHaskellDepends = [ base Cabal filepath ];
+       libraryHaskellDepends = [
+         accelerate base distributive lens linear
+       ];
+       homepage = "http://github.com/ekmett/linear-accelerate/";
+       description = "Lifting linear vector spaces into Accelerate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linear-algebra-cblas" = callPackage
     ({ mkDerivation, base, ieee754, QuickCheck, storable-complex
      , test-framework, test-framework-quickcheck2, vector
@@ -116059,8 +116678,8 @@ self: {
      }:
      mkDerivation {
        pname = "linode";
-       version = "0.2.0.0";
-       sha256 = "3a5c1d507121a40848217ad8e092c3347c1c26a1ada09ccfa1450b30d22d59fa";
+       version = "0.3.0.0";
+       sha256 = "7c5c35938d19cd8577bd40c8c574a27011b3c0b30da45920129187d4d204139e";
        libraryHaskellDepends = [
          aeson async base binary bytestring containers errors lens process
          retry safe text transformers wreq
@@ -117148,8 +117767,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "4.0.0.0";
-       sha256 = "9f67758f1a0f73d9f1182251f0ded41cf9bd82382aa7b767d0b7ed6ee46c93b5";
+       version = "4.0.1.0";
+       sha256 = "48f5a375514269fae1fa8723c80500de845e0798a55fc36074e22bc2e7daa82d";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array base bytestring containers llvm-hs-pure mtl parsec
@@ -119666,19 +120285,19 @@ self: {
      }) {};
 
   "madlang" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion, hspec
-     , hspec-megaparsec, lens, megaparsec, mtl, mwc-random
-     , optparse-applicative, text, tibetan-utils
+    ({ mkDerivation, ansi-wl-pprint, base, composition, containers
+     , criterion, directory, hspec, hspec-megaparsec, lens, megaparsec
+     , mtl, mwc-random, optparse-applicative, text, tibetan-utils
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.0.1.1";
-       sha256 = "f58b9a47a8f213c030ffbee9c8b2ed71443b32b832eaa761fd06ac3c37a0dccb";
+       version = "2.1.0.1";
+       sha256 = "5fe47345bdeb09d6c5947df21afb3c58cda051e136e0b30696a8c02da48b18a9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers lens megaparsec mtl mwc-random
-         optparse-applicative text tibetan-utils
+         ansi-wl-pprint base composition containers directory lens
+         megaparsec mtl mwc-random optparse-applicative text tibetan-utils
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -119732,10 +120351,10 @@ self: {
      }:
      mkDerivation {
        pname = "magicbane";
-       version = "0.1.0";
-       sha256 = "8449c50e3abe937f235ce806c0f8dd193b2172949e7a2111f5b7d78b4aa38d94";
-       revision = "1";
-       editedCabalFile = "0da48eedc8e65efecfd5b41191ec1f27c198c35334af15baea2febf759659656";
+       version = "0.1.1";
+       sha256 = "a4022e70c5d97717127fe947e1d03a8648616ed84cb99fd6ab4775d83a014dc6";
+       revision = "3";
+       editedCabalFile = "707d4c38ae27930b18c675893fef20afab379474dc22783bc4e70842cc7f4d62";
        libraryHaskellDepends = [
          aeson aeson-qq attoparsec base classy-prelude conduit
          conduit-combinators data-default data-has either ekg-core ekg-wai
@@ -122283,6 +122902,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memorable-bits" = callPackage
+    ({ mkDerivation, base, binary, bits, bytes, bytestring, criterion
+     , cryptonite, data-dword, doctest, hashable, HUnit, memory, mtl
+     , network-ip, optparse-applicative, random, split, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "memorable-bits";
+       version = "0.1.0.0";
+       sha256 = "7ac3591f17c1a32c9d74f10cb610979729a1201e6f617604300152d2410cbd4b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bits bytes bytestring cryptonite data-dword hashable
+         memory mtl network-ip random split
+       ];
+       executableHaskellDepends = [
+         base bytestring cryptonite optparse-applicative
+       ];
+       testHaskellDepends = [
+         base doctest HUnit tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion random ];
+       description = "Generate human memorable strings from binary data";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "memory" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
      , tasty-hunit, tasty-quickcheck
@@ -127487,6 +128134,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mushu" = callPackage
+    ({ mkDerivation, base, brick, bytestring, classy-prelude
+     , connection, containers, data-default, directory, filepath, fuzzy
+     , hscurses, htoml, libmpd, list-t, microlens, microlens-platform
+     , microlens-th, mtl, network, pretty, process, safe-exceptions
+     , template-haskell, text, text-zipper, time, transformers
+     , unordered-containers, vector, vty
+     }:
+     mkDerivation {
+       pname = "mushu";
+       version = "0.1.1";
+       sha256 = "9b0a749a3f81d3101df1295ff0a2509604f5142d51e1daa97fab692c4b8b35f2";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick bytestring classy-prelude connection containers
+         data-default directory filepath fuzzy hscurses htoml libmpd list-t
+         microlens microlens-platform microlens-th mtl network pretty
+         process safe-exceptions template-haskell text text-zipper time
+         transformers unordered-containers vector vty
+       ];
+       testHaskellDepends = [ base classy-prelude ];
+       homepage = "https://github.com/elaye/mushu#README.md";
+       description = "Minimalist MPD client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "music-articulation" = callPackage
     ({ mkDerivation, average, base, semigroups }:
      mkDerivation {
@@ -127808,6 +128482,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mustache_2_1_3" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
+     , cmdargs, containers, directory, either, filepath, hspec, lens
+     , mtl, parsec, process, scientific, tar, template-haskell
+     , temporary, text, th-lift, unordered-containers, vector, wreq
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "mustache";
+       version = "2.1.3";
+       sha256 = "6bf426f9633aeff26bc78a5219b4ff93a785614adfc35f59933368ece71781b4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory either filepath mtl
+         parsec scientific template-haskell text th-lift
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs filepath text yaml
+       ];
+       testHaskellDepends = [
+         aeson base base-unicode-symbols bytestring directory filepath hspec
+         lens process tar temporary text unordered-containers wreq yaml zlib
+       ];
+       homepage = "https://github.com/JustusAdam/mustache";
+       description = "A mustache template parser library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mustache-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
      , optparse-applicative, parsec, pretty-show, scientific, text
@@ -127984,6 +128689,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mwc-random-accelerate" = callPackage
+    ({ mkDerivation, accelerate, base, mwc-random }:
+     mkDerivation {
+       pname = "mwc-random-accelerate";
+       version = "0.1.0.0";
+       sha256 = "30fad33d12b130457a6dcb8bedc885700e6ac0eea9b0f25fe6e5fe34968932e3";
+       libraryHaskellDepends = [ accelerate base mwc-random ];
+       description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mwc-random-monad" = callPackage
     ({ mkDerivation, base, monad-primitive, mwc-random, primitive
      , transformers, vector
@@ -131507,8 +132223,8 @@ self: {
     ({ mkDerivation, base, checkers, QuickCheck }:
      mkDerivation {
        pname = "non-empty-zipper";
-       version = "0.1.0.5";
-       sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4";
+       version = "0.1.0.7";
+       sha256 = "6b840c98fbe045bf3a2d4b5606ef8deb6668f6dbdaf872473273f129fda081fe";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
@@ -132250,6 +132966,49 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "numhask" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit
+     , protolude, QuickCheck, singletons, tasty, tasty-hunit
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "numhask";
+       version = "0.0.2";
+       sha256 = "567762fe357d2114176425b115fa89b304ab9a41ca564b4b599bbc00384246b2";
+       libraryHaskellDepends = [
+         adjunctions base distributive protolude QuickCheck singletons
+         vector
+       ];
+       testHaskellDepends = [
+         base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/tonyday567/numhask";
+       description = "A numeric prelude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "numhask-range" = callPackage
+    ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens
+     , linear, numhask, protolude, QuickCheck, smallcheck, tasty
+     , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "numhask-range";
+       version = "0.0.1";
+       sha256 = "52a73be1f8d653bb4ef0e54da3ec6a923494944e88ccbd86f2f9b7ea39c44f05";
+       libraryHaskellDepends = [
+         base containers foldl formatting lens linear numhask protolude
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         base HUnit numhask protolude QuickCheck smallcheck tasty
+         tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/tonyday567/numhask-range";
+       description = "see readme.md";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nums" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -133015,15 +133774,16 @@ self: {
      }) {};
 
   "ombra" = callPackage
-    ({ mkDerivation, base, gl, hashable, hashtables, transformers
-     , unordered-containers, vect
+    ({ mkDerivation, base, Boolean, gl, hashable, hashtables
+     , transformers, unordered-containers, vector-space
      }:
      mkDerivation {
        pname = "ombra";
-       version = "0.2.2.0";
-       sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60";
+       version = "0.3.0.0";
+       sha256 = "99516f07fdc85967a562668f136a2899fda28ea6fe3be27e09bc06a2aca654ad";
        libraryHaskellDepends = [
-         base gl hashable hashtables transformers unordered-containers vect
+         base Boolean gl hashable hashtables transformers
+         unordered-containers vector-space
        ];
        homepage = "https://github.com/ziocroc/Ombra";
        description = "Render engine";
@@ -138525,6 +139285,31 @@ self: {
        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, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-mysql-haskell";
+       version = "0.2.1.0";
+       sha256 = "bb7281fda0ff259d7d8738d541619fad2aadbc74245db72853d8fc6d669278cb";
+       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 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;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -139169,8 +139954,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.12.0";
-       sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb";
+       version = "0.0.13.0";
+       sha256 = "72d782287fccefaab02a524a8fc64affbee3692b56889dd07ed64427a1c453f7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139525,6 +140310,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pictikz" = callPackage
+    ({ mkDerivation, base, matrix, transformers, xml }:
+     mkDerivation {
+       pname = "pictikz";
+       version = "1.0.0.1";
+       sha256 = "69e1e3e93db18c36ee716ebb57e3dbb35c3894724ad36793abf80e7d5cd8f3b8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base matrix transformers xml ];
+       description = "Converts a svg image to tikz code";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "pid1" = callPackage
     ({ mkDerivation, base, process, unix }:
      mkDerivation {
@@ -142023,12 +142821,16 @@ self: {
      }) {};
 
   "pong-server" = callPackage
-    ({ mkDerivation, base, data-default, hspec, network, QuickCheck }:
+    ({ mkDerivation, base, bytestring, classy-prelude, exceptions
+     , hspec, http-types, network, QuickCheck
+     }:
      mkDerivation {
        pname = "pong-server";
-       version = "0.0.2.1";
-       sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a";
-       libraryHaskellDepends = [ base data-default network ];
+       version = "0.0.3.0";
+       sha256 = "dd84310b20b09d2667dcc1af7b6ecab2a47f19986395049eeebb7ddc86b8c326";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude exceptions http-types network
+       ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        homepage = "http://github.com/RobertFischer/pong-server#readme";
        description = "A simple embedded pingable server that runs in the background";
@@ -145405,6 +146207,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protobuf-simple_0_1_0_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
+     , QuickCheck, quickcheck-instances, split, text
+     }:
+     mkDerivation {
+       pname = "protobuf-simple";
+       version = "0.1.0.3";
+       sha256 = "55e8221677f8808539b3fc3644d4b3118afe6fb7bd9ff0be4e58783e38773f6d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 mtl text
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath mtl parsec split text
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 filepath
+         hspec parsec QuickCheck quickcheck-instances split text
+       ];
+       homepage = "https://github.com/sru-systems/protobuf-simple";
+       description = "Simple Protocol Buffers library (proto2)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
@@ -146200,8 +147029,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.1";
-       sha256 = "359894f7b8d6ba28e3150fbba3988a14aedf68d55b1eb7d6b69111a4a119ec86";
+       version = "0.11.2";
+       sha256 = "bf4c3c0cb3103cf4cfc2029bfbb0509ad61fa9ef07896818b522527891878144";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146216,19 +147045,29 @@ self: {
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat blaze-html
-         boxes bytestring containers directory file-embed filepath gitrev
-         Glob haskeline http-types monad-logger mtl network
-         optparse-applicative parsec process protolude sourcemap split stm
-         text time transformers transformers-compat utf8-string wai
-         wai-websockets warp websockets
+         aeson aeson-better-errors ansi-terminal ansi-wl-pprint base
+         base-compat blaze-html bower-json boxes bytestring cheapskate clock
+         containers data-ordlist deepseq directory dlist edit-distance
+         file-embed filepath fsnotify gitrev Glob haskeline http-client
+         http-types language-javascript lens lifted-base monad-control
+         monad-logger mtl network optparse-applicative parallel parsec
+         pattern-arrows pipes pipes-http process protolude regex-tdfa safe
+         scientific semigroups sourcemap spdx split stm syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector wai wai-websockets warp
+         websockets
        ];
        testHaskellDepends = [
-         aeson aeson-better-errors base base-compat bower-json boxes
-         bytestring containers directory filepath Glob haskeline hspec
-         hspec-discover HUnit lens monad-logger mtl optparse-applicative
-         parsec process protolude silently stm text time transformers
-         transformers-compat utf8-string vector
+         aeson aeson-better-errors ansi-terminal base base-compat blaze-html
+         bower-json boxes bytestring cheapskate clock containers
+         data-ordlist deepseq directory dlist edit-distance filepath
+         fsnotify Glob haskeline hspec hspec-discover http-client http-types
+         HUnit language-javascript lens lifted-base monad-control
+         monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
+         process protolude regex-tdfa safe scientific semigroups silently
+         sourcemap spdx split stm syb text time transformers
+         transformers-base transformers-compat unordered-containers
+         utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -148113,8 +148952,8 @@ self: {
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.6";
-       sha256 = "cc03e011817649426e527cb35f31b2daf7c2f8ab90c281d308dadddfd80f8500";
+       version = "0.7";
+       sha256 = "f8bafb43deaf0d656a8c170cb56861948af90d1c72cd99a2c9540c1eb6f1bc23";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
@@ -151200,20 +152039,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "regex_0_10_0_3" = callPackage
+  "regex_0_13_0_0" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, regex-base, regex-tdfa, regex-tdfa-text
-     , template-haskell, text, time, time-locale-compat, transformers
-     , unordered-containers
+     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
+     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.10.0.3";
-       sha256 = "304230caeb624689d05e41350bfbfa02d3a49f4087088c3017eb35ce6832ba3a";
+       version = "0.13.0.0";
+       sha256 = "78b7d83fb33c5e3cf45a66743db0dfe4ed4dfea77736d09c0830bd5e287b76bd";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable regex-base
-         regex-tdfa regex-tdfa-text template-haskell text time
-         time-locale-compat transformers unordered-containers
+         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
+         time time-locale-compat transformers unordered-containers
        ];
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
@@ -151358,31 +152197,31 @@ self: {
 
   "regex-examples" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , directory, hashable, heredoc, http-conduit, regex, regex-base
-     , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, regex-with-pcre
-     , shelly, smallcheck, tasty, tasty-hunit, tasty-smallcheck
-     , template-haskell, text, time, time-locale-compat, transformers
-     , unordered-containers
+     , directory, filepath, hashable, heredoc, http-conduit, regex
+     , regex-base, regex-pcre-builtin, regex-tdfa, regex-tdfa-text
+     , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, template-haskell, text, time
+     , time-locale-compat, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.10.0.3";
-       sha256 = "88a3ead02eed5054aaa19c09671b24e5ba0e3892f2e64e8bec5ba948d428bb54";
+       version = "0.13.0.0";
+       sha256 = "b0dc80f421768ea9a272aeccc60722da9fbadc19feaf3bb2232446d82b7ec4f8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base base-compat bytestring containers directory hashable
-         heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa
-         regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit
-         tasty-smallcheck template-haskell text time time-locale-compat
-         transformers unordered-containers
+         array base base-compat bytestring containers directory filepath
+         hashable heredoc http-conduit regex regex-base regex-pcre-builtin
+         regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
+         tasty-hunit tasty-smallcheck template-haskell text time
+         time-locale-compat transformers unordered-containers
        ];
        testHaskellDepends = [
-         array base base-compat bytestring containers directory hashable
-         heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa
-         regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit
-         tasty-smallcheck template-haskell text time time-locale-compat
-         transformers unordered-containers
+         array base base-compat bytestring containers directory filepath
+         hashable heredoc http-conduit regex regex-base regex-pcre-builtin
+         regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
+         tasty-hunit tasty-smallcheck template-haskell text time
+         time-locale-compat transformers unordered-containers
        ];
        homepage = "http://regex.uk";
        description = "Tutorial, tests and example programs for regex";
@@ -151645,8 +152484,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "0.10.0.3";
-       sha256 = "0fed51f7ee7d142b090c1f71a38c99fa51aa7cf74ec05bfea55fdb4a6feb10da";
+       version = "0.13.0.0";
+       sha256 = "5a39c51ac8d8e20b1a2c5b363e6e8087ca1480e771ad7a6c2853a60738fc9983";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
          regex-pcre-builtin regex-tdfa template-haskell transformers
@@ -152117,6 +152956,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_8_3_6" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, quickcheck-simple, sql-words
+     , template-haskell, text, th-reify-compat, time, time-locale-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.8.3.6";
+       sha256 = "227d39084a0d27fdb135b4e4ee48a0fbcbd9c3e99d69ba8429c2187be6fdf94b";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         sql-words template-haskell text th-reify-compat time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
@@ -155431,8 +156294,8 @@ self: {
      }:
      mkDerivation {
        pname = "ruby-marshal";
-       version = "0.1.1";
-       sha256 = "d61ceb301b82e439b064eb4b1b84b1bb21c4ac9dc0239a0dc8d361cfe1b1800e";
+       version = "0.1.2";
+       sha256 = "37bc92262a7b0be2a608566f3523b37ac2e017611ff591d3f722d588f509408f";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
@@ -160205,6 +161068,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-options" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, servant-foreign
+     , servant-server, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-options";
+       version = "0.1.0.0";
+       sha256 = "5cfe2e60ec6267c80dfd2c5ccfb2ce8d9d13b2bcaf646ee80de6bc32c8f49fb3";
+       libraryHaskellDepends = [
+         base bytestring http-types servant-foreign servant-server text wai
+       ];
+       homepage = "https://github.com/sordina/servant-options";
+       description = "Provide responses to OPTIONS requests for Servant applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
      , servant-docs, text, unordered-containers
@@ -161579,6 +162458,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shake-path" = callPackage
+    ({ mkDerivation, base, path, path-io, shake }:
+     mkDerivation {
+       pname = "shake-path";
+       version = "0.0.0.0";
+       sha256 = "eb6290368e92a637a5a3651c084790bc84e8cd614707e6227dde6b98ea761a33";
+       libraryHaskellDepends = [ base path path-io shake ];
+       homepage = "http://cs-syd.eu";
+       description = "path alternatives to shake functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "shake-persist" = callPackage
     ({ mkDerivation, base, binary, directory, shake, template-haskell
      }:
@@ -162160,8 +163051,8 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.2.1";
-       sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8";
+       version = "0.3.2";
+       sha256 = "74c76ed29a086f3d8c2d4a017c358cf78505e0b862da6d931f2202b52b51301f";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath flow Glob text
          unordered-containers
@@ -164044,7 +164935,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3_1" = callPackage
+  "skylighting_0_3_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
      , bytestring, case-insensitive, containers, criterion, Diff
      , directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -164053,8 +164944,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3.1";
-       sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74";
+       version = "0.3.2";
+       sha256 = "fe48ff596d3971cbb285a1ce677d1527285845feaed16d46fcb49b8ad50767bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167393,8 +168284,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.3";
-       sha256 = "d7db98c9cf05b393469f843535e3255d6f16ab3cc82244ccdb77c25a36e9a127";
+       version = "0.2.4";
+       sha256 = "7cafbb4269289cadef7562059b3d6bbce09e933cc41369c68e7f991f8a7d1e14";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base cmdargs containers leancheck ];
        benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
@@ -168591,6 +169482,8 @@ self: {
        pname = "stable-memo";
        version = "0.3.1";
        sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7";
+       revision = "1";
+       editedCabalFile = "3246671703f40d04d1f1f0087cfce88a8ba97b5b9c3774188915b9bd2e339ff2";
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
@@ -170423,7 +171316,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store_0_4_1" = callPackage
+  "store_0_4_2" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
      , containers, contravariant, criterion, cryptohash, deepseq
@@ -170437,8 +171330,8 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.4.1";
-       sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2";
+       version = "0.4.2";
+       sha256 = "584fd61fd788772398a233fce40f8956b6eb7cd6b8e86f35a30b44c849a7076b";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
          containers contravariant cryptohash deepseq directory filepath free
@@ -175289,6 +176182,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-silver_3_1_10" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
+     , temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.10";
+       sha256 = "8e886d93bff49da4221b917162613e00f83902af4a2ea014ab4bdcd9029d6efb";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       homepage = "https://github.com/phile314/tasty-silver";
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-smallcheck" = callPackage
     ({ mkDerivation, async, base, smallcheck, tagged, tasty }:
      mkDerivation {
@@ -175347,6 +176265,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-th_0_1_5" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, tasty, template-haskell }:
+     mkDerivation {
+       pname = "tasty-th";
+       version = "0.1.5";
+       sha256 = "6452b3b65a2d59e469df598aa808084020095b4be54c64ff669802148845d372";
+       libraryHaskellDepends = [
+         base haskell-src-exts tasty template-haskell
+       ];
+       homepage = "http://github.com/bennofs/tasty-th";
+       description = "Automatic tasty test case discovery using TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tateti-tateti" = callPackage
     ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
      mkDerivation {
@@ -176184,6 +177117,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "termcolor" = callPackage
+    ({ mkDerivation, base, cli }:
+     mkDerivation {
+       pname = "termcolor";
+       version = "0.2.0.0";
+       sha256 = "b09d399a733d867cb05dc51de4ee31d5db73cd453099e342973da91c30f21a90";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base cli ];
+       homepage = "https://github.com/mdibaiee/termcolor#readme";
+       description = "Composable terminal colors";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "terminal-progress-bar" = callPackage
     ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework
      , test-framework-hunit
@@ -180086,8 +181034,8 @@ self: {
     ({ mkDerivation, base, containers, HUnit, network-uri, text }:
      mkDerivation {
        pname = "tld";
-       version = "0.3.0.0";
-       sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e";
+       version = "0.3.0.1";
+       sha256 = "aa433c4fe7bfd06937bb68602a2c95272e221bb65272bd11cbd0bb241567df65";
        libraryHaskellDepends = [ base containers network-uri text ];
        testHaskellDepends = [ base HUnit network-uri text ];
        description = "This project separates subdomains, domains, and top-level-domains from URLs";
@@ -180282,17 +181230,17 @@ self: {
      }) {};
 
   "toboggan" = callPackage
-    ({ mkDerivation, base, clit, directory, madlang, optparse-generic
-     , text
+    ({ mkDerivation, base, directory, madlang, optparse-generic, text
+     , tweet-hs
      }:
      mkDerivation {
        pname = "toboggan";
-       version = "0.1.0.0";
-       sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67";
+       version = "0.1.0.1";
+       sha256 = "3eca9e54376ea057907a57205231f654916e3f7f845f0aaeb83a43b81fc408a6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base clit directory madlang optparse-generic text
+         base directory madlang optparse-generic text tweet-hs
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/toboggan#readme";
@@ -181209,14 +182157,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_3" = callPackage
+  "transient_0_5_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.3";
-       sha256 = "e3b4ae35933e4452745f257f2043356b00611b0772d73085d9af75e1bdd28d3e";
+       version = "0.5.4";
+       sha256 = "653065cb45b443606e30b4295d73885bd73795c7b254f26b65d9a15bf610855e";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
@@ -181835,13 +182783,16 @@ self: {
      }) {};
 
   "tslogger" = callPackage
-    ({ mkDerivation, async, base, containers, random }:
+    ({ mkDerivation, async, base, bytestring, containers, random, text
+     }:
      mkDerivation {
        pname = "tslogger";
-       version = "0.1.0.0";
-       sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7";
-       libraryHaskellDepends = [ async base containers random ];
-       description = "Thread-safe logging";
+       version = "0.2.1.0";
+       sha256 = "f8f15b288db3071e017afbb6b0326109e074bee9e6adc468da70b2d8bbfc9eac";
+       libraryHaskellDepends = [
+         async base bytestring containers random text
+       ];
+       description = "Thread-safe logging, with additional interleaving fuzz-testing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183826,6 +184777,23 @@ self: {
        license = "GPL";
      }) {};
 
+  "tyro" = callPackage
+    ({ mkDerivation, aeson, base, HUnit, protolude, singletons
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "tyro";
+       version = "0.1.1.1";
+       sha256 = "b225ec138b2f98c9b478143a8f10bcd48ad944e3bd9813a2227068a23ec70cce";
+       libraryHaskellDepends = [ aeson base protolude singletons text ];
+       testHaskellDepends = [
+         aeson base HUnit protolude test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/rlupton20/tyro#readme";
+       description = "Type derived JSON parsing using Aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tz" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
@@ -189780,6 +190748,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-metrics_0_2_4" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types
+     , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-metrics";
+       version = "0.2.4";
+       sha256 = "e73685a748f0ba6d16956b500cdc23f3802f794f5259a3d6b8a5b885e928ec74";
+       libraryHaskellDepends = [ base ekg-core http-types text time wai ];
+       testHaskellDepends = [
+         base bytestring ekg-core http-types QuickCheck scotty tasty
+         tasty-hunit tasty-quickcheck text time transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ekg-core http-types scotty text time wai
+         wai-extra
+       ];
+       homepage = "https://github.com/Helkafen/wai-middleware-metrics";
+       description = "A WAI middleware to collect EKG request metrics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-preprocessor" = callPackage
     ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai
      , wai-middleware-static, warp
@@ -190813,8 +191805,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-output";
-       version = "0.3.0.0";
-       sha256 = "db201c91c1c96db59670142d1ca1e63d31cbc0bdf495538994eab1b585894ead";
+       version = "0.4.0.0";
+       sha256 = "700bf50355a9232cb76af526c03d44d964a6829b01c66d909006db5c7e7d3404";
        libraryHaskellDepends = [
          base directory filepath open-browser temporary text
        ];
@@ -191424,6 +192416,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "webpage_0_0_5" = callPackage
+    ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
+     mkDerivation {
+       pname = "webpage";
+       version = "0.0.5";
+       sha256 = "213e92ff931d7f58becb532a70cb958a691b216fa85c43f950b429ffad3d1aad";
+       libraryHaskellDepends = [
+         base blaze-html data-default lucid text
+       ];
+       description = "Organized and simple web page scaffold for blaze and lucid";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webrtc-vad" = callPackage
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
@@ -192489,20 +193495,20 @@ self: {
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , amazonka-swf, base, bytestring, conduit, conduit-combinators
      , conduit-extra, directory, exceptions, filemanip, filepath
-     , lifted-async, monad-control, optparse-applicative
+     , http-types, lifted-async, monad-control, optparse-applicative
      , optparse-generic, preamble, process, resourcet, shakers, text
      , time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.8";
-       sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b";
+       version = "0.3.10";
+       sha256 = "37a02e1b60d7f7779dd94a3facbb54eadbecb0729e639ec30f7c7cd98fe5baae";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
          bytestring conduit conduit-combinators conduit-extra directory
-         exceptions filemanip filepath lifted-async monad-control
+         exceptions filemanip filepath http-types lifted-async monad-control
          optparse-applicative preamble process resourcet text time uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
@@ -199014,6 +200020,8 @@ self: {
        pname = "zifter";
        version = "0.0.1.1";
        sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45";
+       revision = "1";
+       editedCabalFile = "38d76a58f2a44cbef3d535592d54e082011fb7ee539c1a659d4a58d5bbc961a1";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
@@ -199083,6 +200091,8 @@ self: {
        pname = "zifter-hlint";
        version = "0.0.0.0";
        sha256 = "d7588cfa7dc22acc664a1438881abca0b38789e787e1014d4a9a0a320b35772f";
+       revision = "1";
+       editedCabalFile = "9b56b30b5d88ccb8613851ec14d630dd4d5ec5dbcb6b6f104f5b8d475afc9523";
        libraryHaskellDepends = [
          base filepath hlint path path-io safe zifter
        ];
@@ -199173,6 +200183,31 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "zip_0_1_10" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, exceptions
+     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "0.1.10";
+       sha256 = "8ec11736f49ffc9b07fa51910d7e06791358e02ba4073e5ad6346b7d3172530d";
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest exceptions filepath mtl path
+         path-io plan-b resourcet text time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers exceptions filepath hspec path
+         path-io QuickCheck text time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/zip";
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty

From 046c5c57d0f2260b5961b28f62ab0722225a385f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Apr 2017 12:55:56 +0200
Subject: [PATCH 0652/1744] haskell-binary: update 0.8.x branch to latest
 version

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 03a905ea3d1..6be7ae16572 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_4_1;
+  binary = self.binary_0_8_5_1;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index ee6e59c65ef..18ebe5c8e1a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 4c2fb69ec80..111852ab34b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 27fed51e6fc..10e1410ff59 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From fa365c2b9d085d8b913f561f1db559cab7d1a028 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Apr 2017 14:44:40 +0200
Subject: [PATCH 0653/1744] haskell-language-nix: fix build with GHC 7.6.3

---
 .../haskell-modules/configuration-ghc-7.6.x.nix          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 10e1410ff59..4ef1aa56211 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -39,9 +39,6 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
-  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; };
-
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
   cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
 
@@ -101,6 +98,12 @@ self: super: {
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
+  void = addBuildDepends super.void (with self; [hashable semigroups]);
+
+  # Need a newer version of Cabal to interpret their build instructions.
+  cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0;
+  extra = addSetupDepend super.extra self.Cabal_1_24_2_0;
+  hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;

From f0ba178a3c13d851270db44a1ac741bcd7fab14e Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 4 Apr 2017 16:36:46 +0200
Subject: [PATCH 0654/1744] zerotierone: 1.1.14 -> 1.2.2 (#24614)

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 76385312385..0202541da40 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.14";
+  version = "1.2.2";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj";
+    sha256 = "058sy6yrprd23iyx7fxnwyvnp1xxsd55yapjv5m2n7dcb7l4005h";
   };
 
   preConfigure = ''

From e410c78cd5f2d770f6be8b68e410e566d61f75e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 15:48:55 +0200
Subject: [PATCH 0655/1744] gnupg: Give the 1compat package a higher priority

This resolves collision warnings with the regular gnupg packages.
---
 pkgs/tools/security/gnupg/1compat.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
index c4cc68dcca3..da700fe9f22 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/pkgs/tools/security/gnupg/1compat.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
   meta = gnupg.meta // {
     description = gnupg.meta.description +
       " with symbolic links for gpg and gpgv";
+    priority = -1;
   };
 }

From de51ad6cd1a1443d66263420c49c334cad0eeb71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 16:29:24 +0200
Subject: [PATCH 0656/1744] Don't restart systemd-fsck@ units

Restarting them is useless since the filesystem is already
checked. Worse, restarting them causes the filesystem to be unmounted.

Also remove an override for systemd-rkill@.service which no longer
exists.
---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index bff6739db61..32e18ff0052 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -829,7 +829,7 @@ in
 
     # Some overrides to upstream units.
     systemd.services."systemd-backlight@".restartIfChanged = false;
-    systemd.services."systemd-rfkill@".restartIfChanged = false;
+    systemd.services."systemd-fsck@".restartIfChanged = false;
     systemd.services."user@".restartIfChanged = false;
     systemd.services.systemd-journal-flush.restartIfChanged = false;
     systemd.services.systemd-random-seed.restartIfChanged = false;

From 9fc14f23b8cc5a4868bb3f78630f0aeb453883ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 16:49:18 +0200
Subject: [PATCH 0657/1744] gnome-keyring: use wrapGAppsHook

---
 .../gnome-3/3.22/core/gnome-keyring/default.nix     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
index 3ea108808f5..df47c1a477b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook
 , docbook_xsl_ns, docbook_xsl, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -7,25 +7,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3; [
     dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
+    pango gcr gdk_pixbuf atk p11_kit
   ];
 
   propagatedBuildInputs = [ glib libtasn1 libxslt ];
 
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ];
 
   configureFlags = [
     "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
 
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;

From 43c0530ca6017dea25e0676cbcf4059dbb7e5d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 13:37:55 +0200
Subject: [PATCH 0658/1744] libproxy: fix compilation

also use webkit backend (webkitgtk is also a more common gnome/gtk)
Changelog: https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.2
---
 pkgs/development/libraries/libproxy/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 97929d29b37..163357a0c0f 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
-, dbus, networkmanager, spidermonkey_1_8_5 }:
+, dbus, networkmanager, webkitgtk214x, pcre, python2 }:
 
 stdenv.mkDerivation rec {
   name = "libproxy-${version}";
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig cmake ];
 
-  buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ];
+  buildInputs = [ dbus networkmanager webkitgtk214x pcre ];
+
+  cmakeFlags = [
+    "-DWITH_WEBKIT3=ON"
+    "-DWITH_MOZJS=OFF"
+    "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}"
+  ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From 6bb303cd856e9cef499b8738931099476f698e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 14:16:59 +0200
Subject: [PATCH 0659/1744] network-manager: 1.4.4 -> 1.6.4

---
 .../networking/network-manager/PppdPath.patch |  8 ++---
 .../networking/network-manager/default.nix    | 36 +++++++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch
index 98c1308e4db..4850d93716d 100644
--- a/pkgs/tools/networking/network-manager/PppdPath.patch
+++ b/pkgs/tools/networking/network-manager/PppdPath.patch
@@ -1,8 +1,6 @@
-diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
-index 89a7add..ae99eb4 100644
---- a/src/ppp-manager/nm-ppp-manager.c
-+++ b/src/ppp-manager/nm-ppp-manager.c
-@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self,
+--- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c	2017-02-15 13:10:27.000000000 +0100
++++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c	2017-04-03 11:45:39.891653216 +0200
+@@ -724,7 +724,7 @@
  
  	g_return_val_if_fail (setting != NULL, NULL);
  
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index cac37bce280..fd470143a3c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -2,25 +2,34 @@
 , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
-, ethtool, gnused, coreutils, file, inetutils, kmod }:
+, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
+, python3Packages, docbook_xsl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
   pname   = "NetworkManager";
-  major   = "1.4";
-  version = "${major}.4";
+  major   = "1.6";
+  version = "${major}.2";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2";
+    sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj";
   };
 
   outputs = [ "out" "dev" ];
 
+  postPatch = ''
+    patchShebangs ./tools
+  '';
+
   preConfigure = ''
     substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
     substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
-    substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
+    substituteInPlace src/devices/nm-device.c \
+       --replace /usr/bin/ping ${inetutils}/bin/ping \
+       --replace /usr/bin/ping6 ${inetutils}/bin/ping
+    substituteInPlace src/devices/nm-arping-manager.c \
+       --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);'
     substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe
     substituteInPlace data/84-nm-drivers.rules \
       --replace /bin/sh ${stdenv.shell}
@@ -58,14 +67,21 @@ stdenv.mkDerivation rec {
     "--with-libsoup=yes"
   ];
 
-  patches = [ ./PppdPath.patch ];
+  patches = [
+    ./PppdPath.patch
+    (fetchpatch {
+      sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6";
+      name = "null-dereference.patch";
+      url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
+    })
+  ];
 
   buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
-                  bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
+                  bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];
 
-  propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
+  propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ];
 
   preInstall = ''
     installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
@@ -78,7 +94,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
 
     # rename to network-manager to be in style
-    mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service 
+    mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
 
     # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
     # aliases ourselves.

From 7903ccbdf803bcca53fb4c695d11c32bd435ca4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 14:18:00 +0200
Subject: [PATCH 0660/1744] network-manager-applet: 1.4.4 -> 1.4.6

---
 .../networking/network-manager-applet/default.nix   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index d2240984d9f..c596ea63f4d 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }:
+, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }:
 
 stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
+  name    = "${pname}-${major}.${minor}";
   pname   = "network-manager-applet";
-  version = networkmanager.version;
+  major   = "1.4";
+  minor   = "6";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz";
-    sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39";
+    url    = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
+    sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ];
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
     polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
-    modemmanager jansson librsvg glib_networking gnome3.dconf
+    modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk
   ];
 
   nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

From b552de752500c6e9e84f71bb5f65a8e44c68ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 14:46:17 +0200
Subject: [PATCH 0661/1744] network-manager_l2tp: set 1.2.4 explicity

---
 pkgs/tools/networking/network-manager/l2tp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index 591994ddccf..6a4f31e5e19 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname   = "NetworkManager-l2tp";
-  version = networkmanager.version;
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner  = "nm-l2tp";
     repo   = "network-manager-l2tp";
-    rev    = "c0cedda5e2a0ded695b497c361eaf577068520cb";
-    sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2";
+    rev    = "${version}";
+    sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36";
   };
 
   buildInputs = [ networkmanager ppp libsecret ]

From d712c04d25bd3018e87b743e4d0ea99c097e04b3 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Tue, 4 Apr 2017 17:23:20 +0200
Subject: [PATCH 0662/1744] suitesparse: refining CUDA support

---
 .../libraries/science/math/suitesparse/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 10fc7bf10ac..7712a2890f1 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -40,9 +40,9 @@ stdenv.mkDerivation {
         -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
         -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
         -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
-        -e 's|^[[:space:]]*\(NV_20         =\)|NV_20 = -arch=sm_20 -Xcompiler -fPIC|' \
-        -e 's|^[[:space:]]*\(NV_30         =\)|NV_30 = -arch=sm_30 -Xcompiler -fPIC|' \
-        -e 's|^[[:space:]]*\(NV_35         =\)|NV_35 = -arch=sm_35 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV20          =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV30          =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV35          =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
         -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
         -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
   '';
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
         for i in "$out"/lib/lib*.a; do
           ar -x $i
         done
-        ''${CC} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas
+        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
     )
     for i in umfpack cholmod amd camd colamd spqr; do
       ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT}

From 9904019841b66a11d1dce48a54c15539f0731614 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Apr 2017 11:29:40 -0400
Subject: [PATCH 0663/1744] nix-plugins: Bump, unbreak

---
 .../libraries/nix-plugins/default.nix          | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 8a5d5495260..647f30f9828 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchgit, nix }:
-
+{ stdenv, fetchFromGitHub, nix }:
+let version = "2.0.2"; in
 stdenv.mkDerivation {
-  name = "nix-plugins-1.0.0";
+  name = "nix-plugins-${version}";
 
-  src = fetchgit {
-    url = git://github.com/shlevy/nix-plugins.git;
-    rev = "refs/tags/1.0.0";
-    sha256 = "1w7l4mdwgf5w1g48mbng4lcg2nihixvp835mg2j7gghnya309fxl";
+  src = fetchFromGitHub {
+    owner = "shlevy";
+    repo = "nix-plugins";
+    rev = version;
+    sha256 = "02bi0p9qjpyxzbr0ki9q774lwdjwcpipkzx84xx9q1ywwafjhr7b";
   };
 
   buildInputs = [ nix ];
 
-  buildFlags = [ "NIX_INCLUDE=${nix}/include" ];
+  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -20,6 +21,5 @@ stdenv.mkDerivation {
     homepage = https://github.com/shlevy/nix-plugins;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182f9b196ff..e83ef1781b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9131,9 +9131,7 @@ with pkgs;
   };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {
-    nix = pkgs.nixUnstable;
-  };
+  nix-plugins = callPackage ../development/libraries/nix-plugins {};
 
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
 

From ef2c8f98ec1ce78ca7e128fc9089285eebb115b1 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 4 Apr 2017 18:36:23 +0300
Subject: [PATCH 0664/1744] Fix schema, maintainers are usually an array

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

diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 8be5ee3c775..93ff39bde64 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Mini Web server that let others upload files to your computer";
     homepage = http://stackp.online.fr/droopy;
     license = licenses.bsd3;
-    maintainers = maintainers.profpatsch;
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }

From 938cf02a206e10a6ee83223e88db07414c7122a5 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 4 Apr 2017 18:48:00 +0300
Subject: [PATCH 0665/1744] flam3: wrap maintainers attribute in a list
 (#24629)

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

diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
index f4e0faffb0e..e3c9cbf2e69 100644
--- a/pkgs/tools/graphics/flam3/default.nix
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Cosmic recursive fractal flames";
     homepage = http://flam3.com/;
-    maintainers = maintainers.nand0p;
+    maintainers = [ maintainers.nand0p ];
     platforms = platforms.linux;
     license = licenses.cc-by-nc-sa-20;
   };

From 1ce34c54588b7567eb680073ab9da1a3adc7aa87 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Tue, 4 Apr 2017 17:56:42 +0200
Subject: [PATCH 0666/1744] albert: 0.10.0 -> 0.10.2

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 2bbac699a3e..4a42c55c249 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.10.0";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "1r8m0b6lqljy314ilpi58sdpqyb9rr502nzx3pgmx2g2xz4izsfj";
+    sha256 = "0plb8c7js91bpf7qgq1snhry8x4zixyy34lq42nhsglab2kaq4ns";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];

From e84d5b23e13b76aa377e8408ad1bb2709d5421be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Apr 2017 18:15:40 +0200
Subject: [PATCH 0667/1744] Allow systemd-fsck@.service to find fsck.*

Fixes "fsck.ext4 doesn't exist, not checking file system on ...".
---
 nixos/modules/system/boot/systemd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 32e18ff0052..f798862513c 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -830,6 +830,7 @@ in
     # Some overrides to upstream units.
     systemd.services."systemd-backlight@".restartIfChanged = false;
     systemd.services."systemd-fsck@".restartIfChanged = false;
+    systemd.services."systemd-fsck@".path = [ config.system.path ];
     systemd.services."user@".restartIfChanged = false;
     systemd.services.systemd-journal-flush.restartIfChanged = false;
     systemd.services.systemd-random-seed.restartIfChanged = false;

From 527512e5549c237010be421b14535c95f4f907ba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 4 Apr 2017 19:21:27 +0300
Subject: [PATCH 0668/1744] qutebrowser: add withWebEngineDefault flag

Allows to set QtWebEngine backend by default.
---
 .../networking/browsers/qutebrowser/default.nix          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a07fc04b02e..eb26811cfb8 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
+{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
 , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
 , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
-, qtwebkit-plugins }:
+, qtwebkit-plugins
+, withWebEngineDefault ? false
+}:
 
 let
   pdfjs = stdenv.mkDerivation rec {
@@ -73,7 +75,8 @@ in buildPythonApplication rec {
 
   postFixup = ''
     mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
-    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
+    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \
+      ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
 
     sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
   '';

From 7171d16fd40ed53b29ef11125f23f0f68f672f51 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:08:03 -0500
Subject: [PATCH 0669/1744] bap: init at 1.2.0

---
 .../development/ocaml-modules/bap/default.nix | 62 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bap/default.nix

diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
new file mode 100644
index 00000000000..25564a0a300
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -0,0 +1,62 @@
+{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}:
+
+buildOcaml rec {
+  name = "bap";
+  version = "1.2.0";
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "bap";
+    rev = "v${version}";
+    sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw";
+  };
+
+  sigs = fetchurl {
+     url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
+     sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn";
+  };
+
+  createFindlibDestdir = true;
+
+  setupHook = writeText "setupHook.sh" ''
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
+  '';
+
+  nativeBuildInputs = [ which makeWrapper ];
+
+  buildInputs = [ ocaml_oasis
+                  llvm_38
+                  utop ];
+
+  propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi
+                            piqi-ocaml uuidm frontc ounit ];
+
+  installPhase = ''
+    export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
+    export PATH=$PATH:$out/bin
+    export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
+    mkdir -p $out/lib/bap
+    make install
+    rm $out/bin/baptop
+    makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
+    wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
+    ln -s $sigs $out/share/bap/sigs.zip
+  '';
+
+  disableIda = "--disable-ida --disable-fsi-benchmark";
+
+  doCheck = true;
+
+  checkTarget = "check test";
+
+  configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
+
+  BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
+
+  meta = with stdenv.lib; {
+    description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
+    homepage = https://github.com/BinaryAnalysisPlatform/bap/;
+    maintainers = [ maintainers.maurer ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 232f1331865..cf2b676a5d4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -51,6 +51,8 @@ let
 
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
+    bap = callPackage ../development/ocaml-modules/bap { };
+
     bitstring = callPackage ../development/ocaml-modules/bitstring { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From d022b4419cc2f4528203b8840ee2f9481344e55e Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:14:40 -0500
Subject: [PATCH 0670/1744] bap-python: init at 1.1.0

---
 .../python-modules/bap/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/bap/default.nix

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
new file mode 100644
index 00000000000..9362729af44
--- /dev/null
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
+
+buildPythonPackage rec {
+  name = "bap";
+  version = "1.1.0";
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "bap-python";
+    rev = "v${version}";
+    sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3";
+  };
+
+  propagatedBuildInputs = [bap requests];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
+    homepage = https://github.com/BinaryAnalysisPlatform/bap/;
+    maintainers = [ maintainers.maurer ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5bb2b28d001..22a3f56a6d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -175,6 +175,10 @@ in {
 
   # packages defined elsewhere
 
+  bap = callPackage ../development/python-modules/bap {
+    bap = pkgs.ocamlPackages_4_02.bap;
+  };
+
   blivet = callPackage ../development/python-modules/blivet { };
 
   breathe = callPackage ../development/python-modules/breathe { };

From e010c25ba41a09787168afd4c343ad49a8515f56 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:18:06 -0500
Subject: [PATCH 0671/1744] libbap: init at master-2017-02-08

---
 pkgs/development/libraries/libbap/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/libbap/default.nix

diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
new file mode 100644
index 00000000000..83bd81456c0
--- /dev/null
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
+  which }:
+
+stdenv.mkDerivation rec {
+  name = "libbap-${version}";
+  version = "master-2017-02-08";
+
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "bap-bindings";
+    rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108";
+    sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb";
+  };
+
+  nativeBuildInputs = [ autoreconfHook which ];
+  buildInputs = [ ocaml bap findlib ctypes ];
+
+  preInstall = ''
+    mkdir -p $out/lib
+    mkdir -p $out/include
+  '';
+
+  meta = {
+    homepage = http://github.com/binaryanalysisplatform/bap-bindings;
+    description = "A C library for interacting with BAP";
+    maintainers = [ stdenv.lib.maintainers.maurer ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fb20dab34d..665e78c004c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8079,6 +8079,10 @@ with pkgs;
 
   libb2 = callPackage ../development/libraries/libb2 { };
 
+  libbap = callPackage ../development/libraries/libbap {
+    inherit (ocamlPackages_4_02) bap ocaml findlib ctypes;
+  };
+
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
   libbdplus = callPackage ../development/libraries/libbdplus { };

From aefb9671bf2e95b056570d4388c7a61a0749a602 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Apr 2017 08:03:55 -0400
Subject: [PATCH 0672/1744] docker: 17.03.0 -> 17.03.1

---
 .../virtualization/docker/default.nix         | 236 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   8 +-
 2 files changed, 134 insertions(+), 110 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b8667997b16..0fafb7fe317 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -6,134 +6,154 @@
 }:
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md
+# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits
 
 with lib;
 
-stdenv.mkDerivation rec {
-  name = "docker-${version}";
-  version = "17.03.0-ce";
-  rev = "60ccb22"; # should match the version commit
+rec {
+  dockerGen = {
+      version, rev, sha256
+      , runcRev, runcSha256
+      , containerdRev, containerdSha256
+      , tiniRev, tiniSha256
+  } : stdenv.mkDerivation rec {
+    inherit version rev;
 
-  src = fetchFromGitHub {
-    owner = "docker";
-    repo = "docker";
-    rev = "v${version}";
-    sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9";
-  };
+    name = "docker-${version}";
 
-  docker-runc = runc.overrideAttrs (oldAttrs: rec {
-    name = "docker-runc";
     src = fetchFromGitHub {
       owner = "docker";
-      repo = "runc";
-      rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70";
-      sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1";
-    };
-    # docker/runc already include these patches / are not applicable
-    patches = [];
-  });
-  docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
-    name = "docker-containerd";
-    src = fetchFromGitHub {
-      owner = "docker";
-      repo = "containerd";
-      rev = "977c511eda0925a723debdc94d09459af49d082a";
-      sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc";
-    };
-  });
-  docker-tini = tini.overrideAttrs  (oldAttrs: rec {
-    name = "docker-init";
-    src = fetchFromGitHub {
-      owner = "krallin";
-      repo = "tini";
-      rev = "949e6facb77383876aeff8a6944dde66b3089574";
-      sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+      repo = "docker";
+      rev = "v${version}";
+      sha256 = sha256;
     };
 
-    # Do not remove static from make files as we want a static binary
-    patchPhase = ''
+    docker-runc = runc.overrideAttrs (oldAttrs: rec {
+      name = "docker-runc";
+      src = fetchFromGitHub {
+        owner = "docker";
+        repo = "runc";
+        rev = runcRev;
+        sha256 = runcSha256;
+      };
+      # docker/runc already include these patches / are not applicable
+      patches = [];
+    });
+    docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+      name = "docker-containerd";
+      src = fetchFromGitHub {
+        owner = "docker";
+        repo = "containerd";
+        rev = containerdRev;
+        sha256 = containerdSha256;
+      };
+    });
+    docker-tini = tini.overrideAttrs  (oldAttrs: rec {
+      name = "docker-init";
+      src = fetchFromGitHub {
+        owner = "krallin";
+        repo = "tini";
+        rev = tiniRev;
+        sha256 = tiniSha256;
+      };
+
+      # Do not remove static from make files as we want a static binary
+      patchPhase = ''
+      '';
+
+      NIX_CFLAGS_COMPILE = [
+        "-DMINIMAL=ON"
+      ];
+    });
+
+    buildInputs = [
+      makeWrapper removeReferencesTo pkgconfig go-md2man go
+      sqlite devicemapper btrfs-progs systemd
+    ];
+
+    dontStrip = true;
+
+    DOCKER_BUILDTAGS = []
+      ++ optional (systemd != null) [ "journald" ]
+      ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
+      ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
+
+    # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
+    postPatch = ''
+      substituteInPlace ./hack/make.sh                   --replace libsystemd-journal libsystemd
+      substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
     '';
 
-    NIX_CFLAGS_COMPILE = [
-      "-DMINIMAL=ON"
-    ];
-  });
+    buildPhase = ''
+      patchShebangs .
+      export AUTO_GOPATH=1
+      export DOCKER_GITCOMMIT="${rev}"
+      ./hack/make.sh dynbinary
+    '';
 
-  buildInputs = [
-    makeWrapper removeReferencesTo pkgconfig go-md2man go
-    sqlite devicemapper btrfs-progs systemd
-  ];
+    outputs = ["out" "man"];
 
-  dontStrip = true;
+    extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
 
-  DOCKER_BUILDTAGS = []
-    ++ optional (systemd != null) [ "journald" ]
-    ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
-    ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
+    installPhase = ''
+      install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
+      install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+      makeWrapper $out/libexec/docker/docker $out/bin/docker \
+        --prefix PATH : "$out/libexec/docker:$extraPath"
+      makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
+        --prefix PATH : "$out/libexec/docker:$extraPath"
 
-  # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
-  postPatch = ''
-    substituteInPlace ./hack/make.sh                   --replace libsystemd-journal libsystemd
-    substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
-  '';
+      # docker uses containerd now
+      ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
+      ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
+      ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
+      ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
+      ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
 
-  buildPhase = ''
-    patchShebangs .
-    export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="${rev}"
-    ./hack/make.sh dynbinary
-  '';
+      # systemd
+      install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
 
-  outputs = ["out" "man"];
+      # completion
+      install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
+      install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
+      install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
 
-  extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
-
-  installPhase = ''
-    install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
-    install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
-    makeWrapper $out/libexec/docker/docker $out/bin/docker \
-      --prefix PATH : "$out/libexec/docker:$extraPath"
-    makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
-      --prefix PATH : "$out/libexec/docker:$extraPath"
-
-    # docker uses containerd now
-    ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
-    ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
-    ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
-    ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
-    ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
-
-    # systemd
-    install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
-
-    # completion
-    install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
-    install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
-    install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
-
-    # Include contributed man pages
-    man/md2man-all.sh -q
-    manRoot="$man/share/man"
-    mkdir -p "$manRoot"
-    for manDir in man/man?; do
-      manBase="$(basename "$manDir")" # "man1"
-      for manFile in "$manDir"/*; do
-        manName="$(basename "$manFile")" # "docker-build.1"
-        mkdir -p "$manRoot/$manBase"
-        gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
+      # Include contributed man pages
+      man/md2man-all.sh -q
+      manRoot="$man/share/man"
+      mkdir -p "$manRoot"
+      for manDir in man/man?; do
+        manBase="$(basename "$manDir")" # "man1"
+        for manFile in "$manDir"/*; do
+          manName="$(basename "$manFile")" # "docker-build.1"
+          mkdir -p "$manRoot/$manBase"
+          gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
+        done
       done
-    done
-  '';
+    '';
 
-  preFixup = ''
-    find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
-  '';
+    preFixup = ''
+      find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
+    '';
 
-  meta = {
-    homepage = http://www.docker.com/;
-    description = "An open source project to pack, ship and run any application as a lightweight container";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline tailhook ];
-    platforms = platforms.linux;
+    meta = {
+      homepage = http://www.docker.com/;
+      description = "An open source project to pack, ship and run any application as a lightweight container";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ offline tailhook ];
+      platforms = platforms.linux;
+    };
+  };
+
+  docker_17_03 = dockerGen rec {
+    version = "17.03.1-ce";
+    rev = "c6d412e"; # git commit
+    sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
+    runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
+    runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
+    containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
+    containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6";
+    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
+    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8322222263..6760a85952b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5332,7 +5332,7 @@ with pkgs;
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;
-  
+
   openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
@@ -13198,7 +13198,11 @@ with pkgs;
   dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
   };
 
-  docker = callPackage ../applications/virtualization/docker { };
+  inherit (callPackage ../applications/virtualization/docker { })
+    docker_17_03;
+
+  docker = docker_17_03;
+
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };

From a1e6176cbf3b38cf2ecc8f1543d6c562f509a144 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 4 Apr 2017 17:14:32 +0200
Subject: [PATCH 0673/1744] modules/searx: fix configFile type

---
 nixos/modules/services/networking/searx.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 3520c6d3f7d..e0eef9ed96f 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -18,17 +18,12 @@ in
 
     services.searx = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "
-          Whether to enable the Searx server. See https://github.com/asciimoo/searx
-        ";
-      };
+      enable = mkEnableOption
+        "the searx server. See https://github.com/asciimoo/searx";
 
       configFile = mkOption {
-        type = types.path;
-        default = "";
+        type = types.nullOr types.path;
+        default = null;
         description = "
           The path of the Searx server configuration file. If no file
           is specified, a default file is used (default config file has
@@ -72,7 +67,7 @@ in
           User = "searx";
           ExecStart = "${cfg.package}/bin/searx-run";
         };
-      } // (optionalAttrs (configFile != "") {
+      } // (optionalAttrs (configFile != null) {
         environment.SEARX_SETTINGS_PATH = configFile;
       });
 

From f24c89a4d64dab1a52f7004bf17afb9a6dbd05c9 Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Tue, 4 Apr 2017 21:10:53 +0200
Subject: [PATCH 0674/1744] gitkraken: 2.2.1 -> 2.3.1

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 023343f59cb..076a78bd5b6 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.2.1";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0ld5wdnrz4qpjl9af8hwmzli3201rfsh73lyy2zp8c98749a2zqn";
+    sha256 = "ddb9eec34232e830646633c43bc9adc61afa0eee79500af29918b62780093b2a";
   };
 
   libPath = makeLibraryPath [

From 3f023c8989ffea5c378e251c176571ef6481af4b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Apr 2017 15:11:42 -0400
Subject: [PATCH 0675/1744] nix-plugins: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 647f30f9828..6b61dbf7518 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, nix }:
-let version = "2.0.2"; in
+let version = "2.0.3"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "02bi0p9qjpyxzbr0ki9q774lwdjwcpipkzx84xx9q1ywwafjhr7b";
+    sha256 = "033w4m9ah127sfls7zqzpp2b1wdzsvzzk3bnkv6jyi31bws7hadp";
   };
 
   buildInputs = [ nix ];

From 9896cf10289628a2098cd99bdd96cfb092916b27 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 27 Mar 2017 20:27:19 +0200
Subject: [PATCH 0676/1744] gcc: include dylibs for darwin build

---
 pkgs/development/compilers/gcc/5/default.nix | 10 ++++++++--
 pkgs/development/compilers/gcc/builder.sh    | 12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3e9104a82fb..7c5cd686272 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -237,10 +237,16 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = if stdenv.isDarwin then ''
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
-  '' else null;
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
 
   postPatch =
     if (stdenv.isGNU
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index de3e9ba3ef5..ee56425f00b 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -212,6 +212,7 @@ postInstall() {
     # Move runtime libraries to $lib.
     moveToOutput "lib/lib*.so*" "$lib"
     moveToOutput "lib/lib*.la"  "$lib"
+    moveToOutput "lib/lib*.dylib" "$lib"
     moveToOutput "share/gcc-*/python" "$lib"
 
     for i in "$lib"/lib/*.{la,py}; do
@@ -221,6 +222,7 @@ postInstall() {
     if [ -n "$enableMultilib" ]; then
         moveToOutput "lib64/lib*.so*" "$lib"
         moveToOutput "lib64/lib*.la"  "$lib"
+        moveToOutput "lib64/lib*.dylib" "$lib"
 
         for i in "$lib"/lib64/*.{la,py}; do
             substituteInPlace "$i" --replace "$out" "$lib"
@@ -251,6 +253,16 @@ postInstall() {
         done
     fi
 
+    if type "install_name_tool"; then
+        for i in "$lib"/lib/*.*.dylib; do
+            install_name_tool -id "$i" "$i" || true
+            for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
+              new_path=`echo "$old_path" | sed "s,$out,$lib,"`
+              install_name_tool -change "$old_path" "$new_path" "$i" || true
+            done
+        done
+    fi
+
     # Get rid of some "fixed" header files
     rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux}
 

From 9b1a70f1ac59a0dea562ebf39907042c53e488ae Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Sat, 1 Apr 2017 22:11:11 +0100
Subject: [PATCH 0677/1744] mtools: fix build on darwin

---
 pkgs/tools/filesystems/mtools/UNUSED-darwin.patch | 11 +++++++++++
 pkgs/tools/filesystems/mtools/default.nix         |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/mtools/UNUSED-darwin.patch

diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch
new file mode 100644
index 00000000000..46b790afd30
--- /dev/null
+++ b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch
@@ -0,0 +1,11 @@
+--- mtools/sysincludes.h.orig	2017-04-01 20:59:46.083196540 +0100
++++ mtools/sysincludes.h	2017-04-01 20:59:12.855030456 +0100
+@@ -103,7 +103,7 @@
+ # define PACKED __attribute__ ((packed))
+ # if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3
+ /* gcc 2.6.3 doesn't have "unused" */		/* mool */
+-#  define UNUSED(x) x __attribute__ ((unused));x
++#  define UNUSED(x) x
+ #  define UNUSEDP __attribute__ ((unused))
+ # else
+ #  define UNUSED(x) x
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 6b9631bfccf..ff311b9fae2 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -8,12 +8,19 @@ stdenv.mkDerivation rec {
     sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
   };
 
+  # Prevents errors such as "mainloop.c:89:15: error: expected ')'"
+  # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
+  patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
+
+  # fails to find X on darwin
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
+
   doCheck = true;
 
   meta = {
     homepage = http://www.gnu.org/software/mtools/;
     description = "Utilities to access MS-DOS disks";
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin;
     maintainers = [ ];
   };
 }

From 7acd1e7f68bb6c7d3032fa287c46c238806ac163 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Apr 2017 20:56:27 -0400
Subject: [PATCH 0678/1744] sway: 0.11 -> 0.12.2

---
 pkgs/applications/window-managers/sway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 79077b477b4..64899e555c7 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.11";
+  version = "0.12.2";
 in
   stdenv.mkDerivation rec {
     name = "sway-${version}";
@@ -13,7 +13,7 @@ in
       owner = "Sircmpwn";
       repo = "sway";
       rev = "${version}";
-      sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv";
+      sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs";
     };
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];

From 89188e2972315e8fd555417dadf8a5646e92d81d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Apr 2017 21:01:27 -0400
Subject: [PATCH 0679/1744] docker-distribution: 2.5.1 -> 2.6.0

---
 .../virtualization/docker-distribution/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix
index 4850d7d9f5f..c3c0de14966 100644
--- a/pkgs/applications/virtualization/docker-distribution/default.nix
+++ b/pkgs/applications/virtualization/docker-distribution/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "distribution-${version}";
-  version = "2.5.1";
+  version = "2.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "docker";
     repo = "distribution";
     inherit rev;
-    sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc";
+    sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
   };
 
   meta = with stdenv.lib; {

From b4b95c6686205c9589c160616a0adbf7fb81fb4f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Apr 2017 21:04:39 -0400
Subject: [PATCH 0680/1744] nano: 2.7.5 -> 2.8.0

---
 pkgs/applications/editors/nano/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index b1f581dc841..3d089c1cec1 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,18 +20,18 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.7.5";
-  
+  version = "2.8.0";
+
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1r37gqx7hppqbgsbclchiis8wzzpb9srm3q3dlvlii2gpkk28kd6";
+    sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
-  
+
   outputs = [ "out" "info" ];
-  
+
   configureFlags = ''
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}

From fe319f8ebdbb14aea31e24e1f946278fad990b5e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Apr 2017 22:35:35 -0400
Subject: [PATCH 0681/1744] nix-plugins: 2.0.3 -> 2.0.6.

Fixes incompatibility between build-time and link-time nix version
---
 pkgs/development/libraries/nix-plugins/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 6b61dbf7518..c808ca616b1 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, nix }:
-let version = "2.0.3"; in
+{ stdenv, fetchFromGitHub, nix, boehmgc }:
+let version = "2.0.6"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,12 +7,10 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "033w4m9ah127sfls7zqzpp2b1wdzsvzzk3bnkv6jyi31bws7hadp";
+    sha256 = "0gbajaxg7awk1fhicsnmvhrmd47wc7i38lz4baxks17sgx76amqr";
   };
 
-  buildInputs = [ nix ];
-
-  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" ];
+  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ];
 
   installFlags = [ "PREFIX=$(out)" ];
 

From f038db24a601c5ec497fb8a70b577bd3a8093ae9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Apr 2017 22:50:00 -0400
Subject: [PATCH 0682/1744] nix-plugins: 2.0.6 -> 2.0.7.

Fixes warning on nix 1.12
---
 pkgs/development/libraries/nix-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index c808ca616b1..2dcc7e9a53d 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, nix, boehmgc }:
-let version = "2.0.6"; in
+let version = "2.0.7"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "0gbajaxg7awk1fhicsnmvhrmd47wc7i38lz4baxks17sgx76amqr";
+    sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs";
   };
 
   buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ];

From 0d8b5be67d30478c0790c8facf0198c730c9a1b2 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Tue, 4 Apr 2017 22:50:59 -0400
Subject: [PATCH 0683/1744] xpra: 0.17.6 -> 2.0.1

Requires build against newer ffmpeg (3.2.x instead of 3.1.x)
because of new symbols:
FF_PROFILE_H264_MULTIVIEW_HIGH
FF_PROFILE_H264_STEREO_HIGH
---
 pkgs/tools/X11/xpra/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 943707c0c5e..15feb30743b 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, python2Packages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
-, ffmpeg, x264, libvpx, libwebp
+, ffmpeg_3_2, x264, libvpx, libwebp
 , libfakeXinerama
 , gst_all_1, pulseaudioLight, gobjectIntrospection
 , pam }:
@@ -11,11 +11,11 @@ with lib;
 let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
-  name = "xpra-0.17.6";
+  name = "xpra-2.0.1";
   namePrefix = "";
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj";
+    sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8";
   };
 
   buildInputs = [
@@ -28,7 +28,7 @@ in buildPythonApplication rec {
 
     pango cairo gdk_pixbuf atk gtk2 glib
 
-    ffmpeg libvpx x264 libwebp
+    ffmpeg_3_2 libvpx x264 libwebp
 
     gobjectIntrospection
     gst_all_1.gstreamer

From a5ad8b4f69d541f1b8e456eb5d405b1558df9885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 22:50:48 +0200
Subject: [PATCH 0684/1744] stage-2: simplify exporting path

---
 nixos/modules/system/boot/stage-2-init.sh | 17 +----------------
 nixos/modules/system/boot/stage-2.nix     | 10 +++++-----
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index f827e530f87..99930fb95a6 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -2,7 +2,7 @@
 
 systemConfig=@systemConfig@
 
-export HOME=/root
+export HOME=/root PATH="@path@"
 
 
 # Print a greeting.
@@ -11,21 +11,6 @@ echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
 echo
 
 
-# Set the PATH.
-setPath() {
-    local dirs="$1"
-    export PATH=/empty
-    for i in $dirs; do
-        PATH=$PATH:$i/bin
-        if test -e $i/sbin; then
-            PATH=$PATH:$i/sbin
-        fi
-    done
-}
-
-setPath "@path@"
-
-
 # Normally, stage 1 mounts the root filesystem read/writable.
 # However, in some environments, stage 2 is executed directly, and the
 # root is read-only.  So make it writable here.
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 7e4ec2a4a67..a6864bf80c3 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -23,11 +23,11 @@ let
     inherit (config.nix) readOnlyStore;
     inherit (config.networking) useHostResolvConf;
     inherit (config.system.build) earlyMountScript;
-    path =
-      [ pkgs.coreutils
-        pkgs.utillinux
-        pkgs.openresolv
-      ] ++ optional config.nix.readOnlyStore readonlyMountpoint;
+    path = lib.makeBinPath ([
+      pkgs.coreutils
+      pkgs.utillinux
+      pkgs.openresolv
+    ] ++ optional config.nix.readOnlyStore readonlyMountpoint);
     postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}

From b42af252238d8e5a4b737ad39fda503f9d93c36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Apr 2017 23:27:51 +0200
Subject: [PATCH 0685/1744] stage-2: replace readonly-mountpoint by findmnt

---
 .../modules/system/boot/readonly-mountpoint.c | 20 -------------------
 nixos/modules/system/boot/stage-2-init.sh     |  4 +++-
 nixos/modules/system/boot/stage-2.nix         | 13 ++----------
 3 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 nixos/modules/system/boot/readonly-mountpoint.c

diff --git a/nixos/modules/system/boot/readonly-mountpoint.c b/nixos/modules/system/boot/readonly-mountpoint.c
deleted file mode 100644
index 27b66687382..00000000000
--- a/nixos/modules/system/boot/readonly-mountpoint.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <sys/statvfs.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char ** argv) {
-	struct statvfs stat;
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s PATH", argv[0]);
-		exit(2);
-	}
-	if (statvfs(argv[1], &stat) != 0) {
-		perror("statvfs");
-		exit(3);
-	}
-	if (stat.f_flag & ST_RDONLY)
-		exit(0);
-	else
-		exit(1);
-}
-
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 99930fb95a6..b5b2acf86ab 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -46,7 +46,9 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown -f 0:30000 /nix/store
 chmod -f 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! readonly-mountpoint /nix/store; then
+    if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then
+        # FIXME when linux < 4.5 is EOL, switch to atomic bind mounts
+        #mount /nix/store /nix/store -o bind,remount,ro
         mount --bind /nix/store /nix/store
         mount -o remount,ro,bind /nix/store
     fi
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index a6864bf80c3..8db6d2d2f73 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -7,15 +7,6 @@ let
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
 
-  readonlyMountpoint = pkgs.stdenv.mkDerivation {
-    name = "readonly-mountpoint";
-    unpackPhase = "true";
-    installPhase = ''
-      mkdir -p $out/bin
-      cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
-    '';
-  };
-
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
@@ -23,11 +14,11 @@ let
     inherit (config.nix) readOnlyStore;
     inherit (config.networking) useHostResolvConf;
     inherit (config.system.build) earlyMountScript;
-    path = lib.makeBinPath ([
+    path = lib.makeBinPath [
       pkgs.coreutils
       pkgs.utillinux
       pkgs.openresolv
-    ] ++ optional config.nix.readOnlyStore readonlyMountpoint);
+    ];
     postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}

From a17344c2adf7082b90b315eed3d954df0a4fd575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Apr 2017 00:27:25 +0200
Subject: [PATCH 0686/1744] stage-2: process options as first action

this way `set -x` is set early
---
 nixos/modules/system/boot/stage-2-init.sh | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index b5b2acf86ab..19e0877d364 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -5,6 +5,21 @@ systemConfig=@systemConfig@
 export HOME=/root PATH="@path@"
 
 
+# Process the kernel command line.
+for o in $(cat /proc/cmdline); do
+    case $o in
+        boot.debugtrace)
+            # Show each command.
+            set -x
+            ;;
+        resume=*)
+            set -- $(IFS==; echo $o)
+            resumeDevice=$2
+            ;;
+    esac
+done
+
+
 # Print a greeting.
 echo
 echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
@@ -62,21 +77,6 @@ rm -f /etc/mtab* # not that we care about stale locks
 ln -s /proc/mounts /etc/mtab
 
 
-# Process the kernel command line.
-for o in $(cat /proc/cmdline); do
-    case $o in
-        boot.debugtrace)
-            # Show each command.
-            set -x
-            ;;
-        resume=*)
-            set -- $(IFS==; echo $o)
-            resumeDevice=$2
-            ;;
-    esac
-done
-
-
 # More special file systems, initialise required directories.
 [ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp

From 5ffece7de1b75d2e059412ec417eebf01bb3bb6c Mon Sep 17 00:00:00 2001
From: Luke Clifton <ltclifton@gmail.com>
Date: Wed, 5 Apr 2017 15:37:47 +0800
Subject: [PATCH 0687/1744] llvm-hs: Point llvm-hs to llvm_4

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 017f2ea7637..f03fc73387f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -239,6 +239,8 @@ self: super: builtins.intersectAttrs super {
       }
     );
 
+  llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; };
+
   # Needs help finding LLVM.
   spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
 

From f911770acfaa6fd5a18e5236335ec7e2d3f34793 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Apr 2017 08:17:49 -0400
Subject: [PATCH 0688/1744] sway: Add xwayland build input

---
 pkgs/applications/window-managers/sway/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 64899e555c7..f392945b36d 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, pango, libinput
 , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
 , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
+, xwayland
 }:
 
 let
@@ -18,7 +19,7 @@ in
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ];
+    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ];
 
     patchPhase = ''
       sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;

From 637770f699c47ef9f25f4b4c1f2785be5b71d805 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 5 Apr 2017 15:24:05 +0200
Subject: [PATCH 0689/1744] gnupg21: 2.1.19 -> 2.1.20

See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00002.html
for release information
---
 pkgs/tools/security/gnupg/21.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 72786247af4..230ace07823 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.19";
+  version = "2.1.20";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26";
+    sha256 = "03cnd6gz8f4lf69inskssw57idrswcdimhccdyglmrlv6rlrmkr4";
   };
 
   buildInputs = [

From 12839e45997486bab15aa24717618f3607168f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Apr 2017 15:48:23 +0200
Subject: [PATCH 0690/1744] knot-resolver: maintenance 1.2.4 -> 1.2.5

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

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bc9e35f88c4..b916207e01f 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036";
+    sha256 = "9a50e32b90219a3e0b863d13f7a54f6064410371feff5f226439a0f9bff5edd1";
   };
 
   outputs = [ "out" "dev" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ knot-dns luajit libuv gnutls ]
     ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
-    ## optional dependencies
+    ## optional dependencies; TODO: libedit, dnstap?
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation
     ++ [

From 84ffb2d1d59b211f7a85f2ae8a94496f54a98c98 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 5 Apr 2017 22:52:16 +0900
Subject: [PATCH 0691/1744] source-han-sans: fix license from ASL2.0 to SIL
 Open Font License.

---
 pkgs/data/fonts/source-han-sans/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 11132710a90..bcfa082fb57 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -25,7 +25,7 @@ let
     meta = {
       description = "${language} subset of an open source Pan-CJK typeface";
       homepage = https://github.com/adobe-fonts/source-han-sans;
-      license = stdenv.lib.licenses.asl20;
+      license = stdenv.lib.licenses.ofl;
       platforms = stdenv.lib.platforms.unix;
     };
   };

From 44168b4b22a8c3a60ac4782c90052b497c4dee40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Apr 2017 16:07:17 +0200
Subject: [PATCH 0692/1744] knot-resolver: update the source hash

Just nitpick changes in the tarball, minutes after the release.
---
 pkgs/servers/dns/knot-resolver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index b916207e01f..c58b66d42f2 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "9a50e32b90219a3e0b863d13f7a54f6064410371feff5f226439a0f9bff5edd1";
+    sha256 = "30e24f9681e40c79a0aadbbfd78aaa72534dd3bca3347de89dfeae055b2c99e4";
   };
 
   outputs = [ "out" "dev" ];

From 6b5e5de0ef2a040cab9af7388487b16030b877db Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 5 Apr 2017 03:00:21 +0200
Subject: [PATCH 0693/1744] rss2email: init at 3.9

---
 .../feedreaders/rss2email/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/feedreaders/rss2email/default.nix

diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
new file mode 100644
index 00000000000..6b92db9efa5
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -0,0 +1,29 @@
+{ pythonPackages, fetchurl, lib }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "rss2email";
+  version = "3.9";
+
+  propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rss2email/${name}.tar.gz";
+    sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
+  };
+
+  postInstall = ''
+    install -Dm 644 r2e.1 $out/share/man/man1/r2e.1
+    # an alias for better finding the manpage
+    ln -s -T r2e.1 $out/share/man/man1/rss2email.1
+  '';
+
+  meta = with lib; {
+    description = "A tool that converts RSS/Atom newsfeeds to email.";
+    homepage = "https://pypi.python.org/pypi/rss2email";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jb55 profpatsch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67ca563cdac..24745919f54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3797,6 +3797,10 @@ with pkgs;
 
   rrdtool = callPackage ../tools/misc/rrdtool { };
 
+  rss2email = callPackage ../applications/networking/feedreaders/rss2email {
+    pythonPackages = python3Packages;
+  };
+
   rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
 
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };

From 7a38b0858fbed43e80f84a91da821eaaf657c5d7 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Wed, 5 Apr 2017 11:12:46 -0400
Subject: [PATCH 0694/1744] fvwm module: init; now fvwm can be used as an
 xserver.windowManager

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/fvwm.nix     | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/fvwm.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index f005decfa33..6d30fd3f4d6 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -14,6 +14,7 @@ in
     ./dwm.nix
     ./exwm.nix
     ./fluxbox.nix
+    ./fvwm.nix
     ./herbstluftwm.nix
     ./i3.nix
     ./jwm.nix
diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixos/modules/services/x11/window-managers/fvwm.nix
new file mode 100644
index 00000000000..9a51b9cd660
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/fvwm.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.fvwm;
+  fvwm = pkgs.fvwm.override { gestures = cfg.gestures; };
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.xserver.windowManager.fvwm = {
+      enable = mkEnableOption "Fvwm window manager";
+
+      gestures = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether or not to enable libstroke for gesture support";
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton
+      { name = "fvwm";
+        start =
+          ''
+            ${fvwm}/bin/fvwm &
+            waitPID=$!
+          '';
+      };
+
+    environment.systemPackages = [ fvwm ];
+  };
+}

From 55d1237c6bae4e7a32805f2bcf8c723475a0b282 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Wed, 5 Apr 2017 11:18:12 -0500
Subject: [PATCH 0695/1744] transcrypt: 1.0.1 -> 1.0.2

---
 .../version-management/git-and-tools/transcrypt/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 36d81ae9c44..6238cf9c975 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "transcrypt-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
     rev = "v${version}";
-    sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq";
+    sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc";
   };
 
   buildInputs = [ git makeWrapper openssl ];

From a6420e13a2ed7a6dfe4463db5d92cd45b2bfa6a9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 4 Apr 2017 21:19:38 +0200
Subject: [PATCH 0696/1744] luksroot: Wait for the header (device) to appear

The LUKS header can be on another device (e.g. a USB stick). In my case
it can take up to two seconds until the partition on my USB stick is
available (i.e. the decryption fails without this patch). This will also
remove some redundancy by providing the shell function `wait_target` and
slightly improve the output (one "." per second and a success/failure
indication after 10 seconds instead of always printing "ok").
---
 nixos/modules/system/boot/luksroot.nix | 51 +++++++++++++++-----------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 8978b73749b..6e867b67439 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -6,29 +6,38 @@ let
   luks = config.boot.initrd.luks;
 
   openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; ''
-    # Wait for luksRoot to appear, e.g. if on a usb drive.
-    # XXX: copied and adapted from stage-1-init.sh - should be
-    # available as a function.
-    if ! test -e ${device}; then
-        echo -n "waiting 10 seconds for device ${device} to appear..."
-        for try in $(seq 10); do
-            sleep 1
-            if test -e ${device}; then break; fi
-            echo -n .
-        done
-        echo "ok"
-    fi
+
+    # Wait for a target (e.g. device, keyFile, header, ...) to appear.
+    wait_target() {
+        local name="$1"
+        local target="$2"
+
+        if [ ! -e $target ]; then
+            echo -n "Waiting 10 seconds for $name $target to appear"
+            local success=false;
+            for try in $(seq 10); do
+                echo -n "."
+                sleep 1
+                if [ -e $target ]; then success=true break; fi
+            done
+            if [ $success = true ]; then
+                echo " - success";
+            else
+                echo " - failure";
+            fi
+        fi
+    }
+
+    # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g.
+    # if on a USB drive.
+    wait_target "device" ${device}
 
     ${optionalString (keyFile != null) ''
-    if ! test -e ${keyFile}; then
-        echo -n "waiting 10 seconds for key file ${keyFile} to appear..."
-        for try in $(seq 10); do
-            sleep 1
-            if test -e ${keyFile}; then break; fi
-            echo -n .
-        done
-        echo "ok"
-    fi
+      wait_target "key file" ${keyFile}
+    ''}
+
+    ${optionalString (header != null) ''
+      wait_target "header" ${header}
     ''}
 
     open_normally() {

From 471626e6fba855dae35df7b79787a0da04d408b8 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 5 Apr 2017 20:40:14 +0200
Subject: [PATCH 0697/1744] scalafmt: 0.6.6 -> 0.6.7

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 2c763072c29..b0d02cb8233 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.6";
+  version = "0.6.7";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "143g288m6xr93pavbym2y6f8gvihsf53fnzjra6ln1s39n9h205n";
+    sha256 = "122x4a5x8024s7qqqs7vx8kz1x18q2l6alcvpzvsqkc304ybhfmh";
   };
 
   unpackPhase = "tar xvzf $src";

From f1480038a4675f467b8d977e99cf57c28e08d0a5 Mon Sep 17 00:00:00 2001
From: Matthias Herrmann <matthias.mh.herrmann@googlemail.com>
Date: Wed, 5 Apr 2017 20:20:01 +0200
Subject: [PATCH 0698/1744] urbanterror: 4.3.1 -> 4.3.2

---
 pkgs/games/urbanterror/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 50b127fa9dc..bc293a88107 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.3.1";
+  version = "4.3.2";
 
   srcs =
     [ (fetchurl {
-         url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip";
-         sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw";
+         url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip";
+         sha256 = "192jwdyfy18cg413ysaklqc8yzmdnshljqc6dnr0xkd6dxbf3pkl";
        })
       (fetchurl {
-         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip";
-         sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k";
+         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip";
+         sha256 = "0m376hdkk8vjnbdy8zakjazyag6jiw4n8zy4lxhv2ndn9mii8lcx";
        })
     ];
 
   buildInputs = [ unzip SDL mesa openal curl libXxf86vm ];
-  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1";
+  sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}";
 
   configurePhase = ''
     echo "USE_OPENAL = 1" > Makefile.local

From e3f031b200dfb92ecefa73e02878b724194a1d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Apr 2017 00:28:24 +0200
Subject: [PATCH 0699/1744] stage-2: reduce mkdir commands

---
 nixos/modules/system/boot/stage-2-init.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 19e0877d364..2b89c888ac8 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -80,13 +80,9 @@ ln -s /proc/mounts /etc/mtab
 # More special file systems, initialise required directories.
 [ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
-mkdir -m 0755 -p /var /var/log /var/lib /var/db
-mkdir -m 0755 -p /nix/var
-mkdir -m 0700 -p /root
-chmod 0700 /root
-mkdir -m 0755 -p /bin # for the /bin/sh symlink
-mkdir -m 0755 -p /home
-mkdir -m 0755 -p /etc/nixos
+mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \
+    /run/lock /home /bin # for the /bin/sh symlink
+install -m 0700 -d /root
 
 
 # Miscellaneous boot time cleanup.
@@ -98,9 +94,6 @@ rm -f /etc/{group,passwd,shadow}.lock
 rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 
 
-mkdir -m 0755 -p /run/lock
-
-
 # For backwards compatibility, symlink /var/run to /run, and /var/lock
 # to /run/lock.
 ln -s /run /var/run

From 62c79a1de8e5e65ead62816b7760e12a6804d44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Apr 2017 00:34:54 +0200
Subject: [PATCH 0700/1744] stage-2: shellsheck recommendations

---
 nixos/modules/system/boot/stage-2-init.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 2b89c888ac8..46aed44bf10 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -6,7 +6,7 @@ export HOME=/root PATH="@path@"
 
 
 # Process the kernel command line.
-for o in $(cat /proc/cmdline); do
+for o in $(</proc/cmdline); do
     case $o in
         boot.debugtrace)
             # Show each command.
@@ -107,8 +107,8 @@ fi
 
 
 # Use /etc/resolv.conf supplied by systemd-nspawn, if applicable.
-if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
-    cat /etc/resolv.conf | resolvconf -m 1000 -a host
+if [ -n "@useHostResolvConf@" ] && [ -e /etc/resolv.conf ]; then
+    resolvconf -m 1000 -a host </etc/resolv.conf
 fi
 
 # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.

From d42dccf0290a377f06833108c5c2533feacca003 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 6 Apr 2017 00:08:04 +0200
Subject: [PATCH 0701/1744] pkgconfig: 0.29.1 -> 0.29.2

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

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 7b7bbc279aa..10358df69c2 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-name = "pkg-config-0.29.1";
+  name = "pkg-config-0.29.2";
 
   setupHook = ./setup-hook.sh;
 
@@ -12,7 +12,7 @@ name = "pkg-config-0.29.1";
       "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
       "http://fossies.org/linux/misc/${name}.tar.gz"
     ];
-    sha256 = "00dh1jn8rbppmgbhhgqhmbh3c58b0gccy39rsjdlcma50sg3rd5y";
+    sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
   };
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.

From bb833702aacde5207eebb3d077a51cbb3304256b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 5 Apr 2017 01:39:03 +0000
Subject: [PATCH 0702/1744] xfwm4-themes: init at 4.10.0

---
 pkgs/desktops/xfce/art/xfwm4-themes.nix | 21 +++++++++++++++++++++
 pkgs/desktops/xfce/default.nix          |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/xfce/art/xfwm4-themes.nix

diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix
new file mode 100644
index 00000000000..80cf7dd28c5
--- /dev/null
+++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfwm4-themes";
+  ver_maj = "4.10";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.xfce.org/;
+    description = "Themes for Xfce";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 36ef85aeb12..c6ac8973404 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -73,6 +73,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   #### ART                  from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"
 
   xfce4icontheme  = callPackage ./art/xfce4-icon-theme.nix { };
+  xfwm4themes     = callPackage ./art/xfwm4-themes.nix { };
 
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
 

From 699ea78866245b1dd9fcd33cfe01a7811f5f536c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Apr 2017 23:22:26 +0200
Subject: [PATCH 0703/1744] Revert "sysdig: 1.15.0 -> 1.15.1"

This reverts commit bb1e6557da293d6a7c9f868cb850afdbe2ba09d6.

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 185d54b420b..b23da5451d1 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.15.1";
+  version = "0.15.0";
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "0x1ssgrw8n563fk4vb9f2f27yjgv2c05xmpkc8p78l4hv8alwh2b";
+    sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2";
   };
 
   buildInputs = [

From 1e589239b32c67881585d6d05d68aecc172c3485 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Apr 2017 14:51:33 -0400
Subject: [PATCH 0704/1744] docker-edge: init at 17.04

---
 pkgs/applications/virtualization/docker/default.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                     |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 0fafb7fe317..6f3feddfda0 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -156,4 +156,16 @@ rec {
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
+
+  docker_17_04 = dockerGen rec {
+    version = "17.04.0-ce";
+    rev = "4845c56"; # git commit
+    sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7";
+    runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
+    runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
+    containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73";
+    containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2";
+    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
+    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67ca563cdac..6ed920fd6c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13201,9 +13201,11 @@ with pkgs;
   };
 
   inherit (callPackage ../applications/virtualization/docker { })
-    docker_17_03;
+    docker_17_03
+    docker_17_04;
 
   docker = docker_17_03;
+  docker-edge = docker_17_04;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From 4b77264308179ac8cef61689c19a9d2e69561f5c Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 19 Nov 2016 15:24:50 -0500
Subject: [PATCH 0705/1744] gammu: 1.33.0 -> 1.38.2

---
 .../misc/gammu/bashcomp-dir.patch             | 17 +++++------
 pkgs/applications/misc/gammu/default.nix      | 14 +++++----
 pkgs/applications/misc/gammu/systemd.patch    | 30 +++++++++++++++++++
 3 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/misc/gammu/systemd.patch

diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch
index 94cc2929c1e..d41aa432cf3 100644
--- a/pkgs/applications/misc/gammu/bashcomp-dir.patch
+++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch
@@ -1,12 +1,11 @@
-diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt
---- gammu-1.33.0.orig/contrib/CMakeLists.txt	2013-12-26 20:56:22.887772110 +0100
-+++ gammu-1.33.0/contrib/CMakeLists.txt	2013-12-26 20:57:04.386276037 +0100
-@@ -85,7 +85,7 @@
+--- a/contrib/CMakeLists.txt
++++ b/contrib/CMakeLists.txt
+@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES)
  if (INSTALL_BASH_COMPLETION)
+     macro_optional_find_package (BashCompletion)
+     if (NOT BASH_COMPLETION_FOUND)
+-      set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
++      set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
+     endif (NOT BASH_COMPLETION_FOUND)
      install (
          FILES bash-completion/gammu
--        DESTINATION "/etc/bash_completion.d"
-+        DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d"
-         COMPONENT "bash"
-         )
- endif (INSTALL_BASH_COMPLETION)
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 10ee8272f38..f44927beb98 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl
+{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl
 , libiconv, gettext, sqlite
 , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
 , postgresSupport ? false, postgresql ? null
@@ -8,14 +8,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gammu-${version}";
-  version = "1.33.0";
+  version = "1.38.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz";
-    sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112";
+  src = fetchFromGitHub {
+    owner = "gammu";
+    repo = "gammu";
+    rev = version;
+    sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv";
   };
 
-  patches = [ ./bashcomp-dir.patch ];
+  patches = [ ./bashcomp-dir.patch ./systemd.patch ];
 
   buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]
   ++ optionals dbiSupport [ libdbi libdbiDrivers ]
diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/applications/misc/gammu/systemd.patch
new file mode 100644
index 00000000000..22b49a5a2ff
--- /dev/null
+++ b/pkgs/applications/misc/gammu/systemd.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in
+index 8302353..e3ca59a 100644
+--- a/cmake/templates/gammu.spec.in
++++ b/cmake/templates/gammu.spec.in
+@@ -387,9 +387,9 @@ fi
+ %doc %{_mandir}/man7/gammu-smsd-run.7*
+ %doc %{_mandir}/man7/gammu-smsd-sql.7*
+ %doc %{_mandir}/man7/gammu-smsd-tables.7*
+-%dir %{_libexecdir}/systemd
+-%dir %{_libexecdir}/systemd/system
+-%{_libexecdir}/systemd/system/gammu-smsd.service
++%dir %{_prefix}/systemd
++%dir %{_prefix}/systemd/system
++%{_prefix}/systemd/system/gammu-smsd.service
+ 
+ %files -n libGammu%{so_ver} -f libgammu.lang
+ %defattr(-,root,root,-)
+diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
+index 78cc7fc..d674c36 100644
+--- a/contrib/CMakeLists.txt
++++ b/contrib/CMakeLists.txt
+@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION)
+ if (WITH_SYSTEMD)
+     install (
+         FILES init/gammu-smsd.service
+-        DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}"
++        DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd"
+         COMPONENT "systemd"
+     )
+ endif (WITH_SYSTEMD)

From c4d80e43af476608ef51effb3da962fa11d9de64 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 4 Apr 2017 20:31:56 -0400
Subject: [PATCH 0706/1744] gammu: move pkgconfig and cmake to
 nativeBuildInputs

---
 pkgs/applications/misc/gammu/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index f44927beb98..950ce210c06 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bashcomp-dir.patch ./systemd.patch ];
 
-  buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ]
   ++ optionals dbiSupport [ libdbi libdbiDrivers ]
   ++ optionals postgresSupport [ postgresql ];
 

From 5e984362f671313faa7056164394cd3522756d57 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Apr 2017 21:10:04 -0400
Subject: [PATCH 0707/1744] haskell generic builder: Use ghcjs's hsc2hs.

This is required when using ghcjs to compile Setup.hs, which we do since #23614.

See comments on https://github.com/ghcjs/ghcjs/commit/c35350a212f20bd4cb7486bf49044f7a1329fc93
---
 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 1f5d97941ce..d39e1bacd71 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -125,7 +125,6 @@ let
   ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"
   ] ++ optionals isGhcjs [
-    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"
   ] ++ optionals isCross ([
     "--configure-option=--host=${ghc.cross.config}"
@@ -150,6 +149,8 @@ let
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
+                     # ghcjs's hsc2hs calls out to the native hsc2hs
+                     optional isGhcjs nativeGhc ++
                      optionals withBenchmarkDepends (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 

From 0a6a06346a3c928a3115dfd700993c5c06b0a1e9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 6 Apr 2017 04:44:47 -0400
Subject: [PATCH 0708/1744] sddm: Fix test.

For whatever reason, the OCR code is not detecting ALICE but is BOB.

OCR output from login screen (blank lines omitted):

> Session none + icewm
> 08:41 <
> Thursday, April 6, 2017
> BOB FOOBAR
> Select your user and enter password
---
 nixos/tests/sddm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 82be9bc1d72..f78a77efbf0 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -24,7 +24,7 @@ let
         user = nodes.machine.config.users.extraUsers.alice;
       in ''
         startAll;
-        $machine->waitForText(qr/ALICE/);
+        $machine->waitForText(qr/BOB/);
         $machine->screenshot("sddm");
         $machine->sendChars("${user.password}\n");
         $machine->waitForFile("/home/alice/.Xauthority");

From ca0493ff63c6b0e53aa1e99d487e779ac5bdc4d6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Apr 2017 10:05:38 +0800
Subject: [PATCH 0709/1744] pmccabe: darwin is supported too

---
 pkgs/development/tools/misc/pmccabe/default.nix   |  6 +++++-
 .../tools/misc/pmccabe/getopt_on_darwin.patch     | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch

diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index 77066cfc8e1..fbb21a8b7c6 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474";
   };
 
+  patches = [
+    ./getopt_on_darwin.patch
+  ];
+
   configurePhase = ''
     sed -i -r Makefile \
       -e 's,/usr/,/,g' \
@@ -38,7 +42,7 @@ stdenv.mkDerivation rec {
       trees or files; and vifn, to invoke vi given a function name rather
       than a file name.
     '';
-    platforms = platforms.linux;
     maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
new file mode 100644
index 00000000000..534d6c1d6ef
--- /dev/null
+++ b/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
@@ -0,0 +1,15 @@
+diff --git a/decomment.c b/decomment.c
+index 400707a..aea29fd 100644
+--- a/decomment.c
++++ b/decomment.c
+@@ -11,6 +11,10 @@
+ #include "getopt.h"
+ #endif
+ 
++#ifdef __APPLE__
++#include "getopt.h"
++#endif
++
+ #ifdef NEED_OPTIND
+ extern int optind;
+ #endif

From c5015b77afefd8ce9c25a08b8c9147d7a350c525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Justin=20Bed=C5=91?= <cu@cua0.org>
Date: Thu, 6 Apr 2017 19:10:54 +1000
Subject: [PATCH 0710/1744] platypus: fix platforms metadata (#24666)

---
 pkgs/applications/science/biology/platypus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index 868540fcbc3..2947515652e 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
     license = licenses.gpl3;
     homepage = https://github.com/andyrimmer/Platypus;
     maintainers = with maintainers; [ jbedo ];
-    platforms = platforms.unix;
+    platforms = platforms.x86_64;
   };
 }

From ca733de96448d15d6da6fcdf9130ebc5d7333bbf Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 6 Apr 2017 13:03:31 +0300
Subject: [PATCH 0711/1744] autorandr: 53d29f9 -> 855c18b and module

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/misc/autorandr.nix | 43 +++++++++++++++++++++++
 pkgs/tools/misc/autorandr/default.nix     | 42 +++++++++++++++-------
 3 files changed, 74 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/services/misc/autorandr.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0035368273c..cbcb73fc9f3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -247,6 +247,7 @@
   ./services/mail/rmilter.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
+  ./services/misc/autorandr.nix
   ./services/misc/bepasty.nix
   ./services/misc/canto-daemon.nix
   ./services/misc/calibre-server.nix
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
new file mode 100644
index 00000000000..6746f3fec69
--- /dev/null
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.autorandr;
+
+in {
+
+  options = {
+
+    services.autorandr = {
+      enable = mkEnableOption "handling of hotplug and sleep events by autorandr";
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    services.udev.packages = [ pkgs.autorandr ];
+
+    environment.systemPackages = [ pkgs.autorandr ];
+
+    # systemd.unitPackages = [ pkgs.autorandr ];
+    systemd.services.autorandr = {
+      unitConfig = {
+        Description = "autorandr execution hook";
+        After = [ "sleep.target" ];
+        StartLimitInterval = "5";
+        StartLimitBurst = "1";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default default";
+        Type = "oneshot";
+        RemainAfterExit = false;
+      };
+      wantedBy = [ "sleep.target" ];
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index da9a599714c..d63819ade21 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -1,12 +1,12 @@
-{ fetchgit
-, stdenv
+{ stdenv
 , python3Packages
-, fetchFromGitHub }:
+, fetchFromGitHub
+, systemd }:
 
 let
   python = python3Packages.python;
   wrapPython = python3Packages.wrapPython;
-  date = "2016-11-23";
+  date = "2017-01-22";
 in
   stdenv.mkDerivation {
     name = "autorandr-unstable-${date}";
@@ -16,20 +16,38 @@ in
     phases = [ "unpackPhase" "installPhase" ];
 
     installPhase = ''
-      # install bash completions
-      mkdir -p $out/bin $out/libexec $out/etc/bash_completion.d
-      cp -v contrib/bash_completion/autorandr $out/etc/bash_completion.d
-
-      # install autorandr bin
-      cp autorandr.py $out/bin/autorandr
+      make install TARGETS='autorandr' PREFIX=$out
       wrapPythonProgramsIn $out/bin/autorandr $out
+
+      make install TARGETS='bash_completion' DESTDIR=$out
+
+      make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out
+
+      ${if false then ''
+        # breaks systemd-udev-settle during boot so disabled
+        make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \
+          SYSTEMD_UNIT_DIR=/lib/systemd/system \
+          UDEV_RULES_DIR=/etc/udev/rules.d
+        substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \
+          --replace /bin "${systemd}/bin"
+      '' else if systemd != null then ''
+        make install TARGETS='systemd' PREFIX=$out DESTDIR=$out \
+          SYSTEMD_UNIT_DIR=/lib/systemd/system
+        make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
+          UDEV_RULES_DIR=/etc/udev/rules.d
+      '' else ''
+        make install TARGETS='pmutils' DESTDIR=$out \
+          PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d
+        make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
+          UDEV_RULES_DIR=/etc/udev/rules.d
+      ''}
     '';
 
     src = fetchFromGitHub {
       owner = "phillipberndt";
       repo = "autorandr";
-      rev = "53d29f99275aebf14240ea95f2d7022b305738d5";
-      sha256 = "0pza4wfkzv7mmg2m4pf3n8wk0p7cy6bfqknn8ywz51r8ja16cqfj";
+      rev = "855c18b7f2cfd364d6f085d4301b5b98ba6e572a";
+      sha256 = "1yp1gns3lwa8796cb7par9czkc9i7paap2fkzf7wj6zqlkgjdvv0";
     };
 
     meta = {

From 480d94553ed27221c918d6911446d19d796b09a2 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 6 Apr 2017 12:30:53 +0200
Subject: [PATCH 0712/1744] libsndfile: 1.0.27 -> 1.0.28

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

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 30b378d77a4..bd5d0fd733c 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libsndfile-1.0.27";
+  name = "libsndfile-1.0.28";
 
   src = fetchurl {
     url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
-    sha256 = "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3";
+    sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
   };
 
   buildInputs = [ pkgconfig flac libogg libvorbis ]

From 58fbf4a44e18f9563c853bf2ed1d5f454e35cdad Mon Sep 17 00:00:00 2001
From: 0xABAB <0xABAB@users.noreply.github.com>
Date: Thu, 6 Apr 2017 13:35:25 +0200
Subject: [PATCH 0713/1744] nixos/filesystems: skip filesystem check for bindfs
 (#24671)

Bindfs (FUSE) provides a pseudo-filesystem and as such does not benefit from a file system check.
---
 nixos/modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 9f30eb61146..3951d617f6f 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -221,7 +221,7 @@ in
 
     environment.etc.fstab.text =
       let
-        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
+        fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
         skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
       in ''
         # This is a generated file.  Do not edit!

From 5861ba39a3fc54605cb65006b725d9b45f8832b0 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 6 Apr 2017 13:46:20 +0200
Subject: [PATCH 0714/1744] guitarix: 0.35.2 -> 0.35.3 (#24673)

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 642cbbd23f6..6073008d541 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.35.2";
+  version = "0.35.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
+    sha256 = "0pvw4ijkq6lcn45vrif9b4mqmgzi0qg1dp5b33kb5zan6n1aci4j";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];

From af603753926dd2c2997be2d58165f4c3c4c3070f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 6 Apr 2017 14:41:28 +0200
Subject: [PATCH 0715/1744] pythonPackages.django_1_10: 1.10.6 -> 1.10.7

This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/
---
 pkgs/development/python-modules/django/1_10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
index 271f8a5467b..6cc3af8c270 100644
--- a/pkgs/development/python-modules/django/1_10.nix
+++ b/pkgs/development/python-modules/django/1_10.nix
@@ -4,12 +4,12 @@
 }:
 buildPythonPackage rec {
   name = "Django-${version}";
-  version = "1.10.6";
+  version = "1.10.7";
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-    sha256 = "0q9c7hx720vc0jzq4xlxwhnxmmm8kh0qsqj3l46m29mi98jvwvks";
+    sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar";
   };
 
   patches = [

From 3f401926f955963e110e16101d25d2f3d35448f5 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 6 Apr 2017 14:43:25 +0200
Subject: [PATCH 0716/1744] pythonPackages.django_1_9: 1.9.12 -> 1.9.13

This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22a3f56a6d4..f42acc6db3d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10335,12 +10335,12 @@ in {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9.12";
+    version = "1.9.13";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "0daaz2rp1rwwpzm5l29wcgg1gbw9yqzcv9x2dsjfz29n806q685x";
+      sha256 = "079zspfsvfnv9wf6qvg8xmz1m23d0723p2nqyk8gfqb012jxn1y0";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)

From c6bc54e319f0ac88a8d0db2ffbe6621aac2ba778 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 6 Apr 2017 14:46:03 +0200
Subject: [PATCH 0717/1744] pythonPackages.django_1_8: 1.8.17 -> 1.8.18

This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f42acc6db3d..74b00ad6ff2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10359,12 +10359,12 @@ in {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.17";
+    version = "1.8.18";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "01zb2l0gcdb2wgxmvvrhjj9ccdj1mfhn6zhqcdq04m7lzi4dc6q2";
+      sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
     };
 
     # too complicated to setup

From 2994f14edbf084f7dcba97a972275d31d40afc58 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 4 Apr 2017 23:38:15 +0900
Subject: [PATCH 0718/1744] add source-han-serif-japanese,
 source-han-serif-korean, source-han-serif-simplified-chinese,
 source-han-serif-traditional-chinese: An open source Pan-CJK serif typeface

---
 lib/maintainers.nix                          |  1 +
 pkgs/data/fonts/source-han-sans/default.nix  |  3 +-
 pkgs/data/fonts/source-han-serif/default.nix | 59 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  5 ++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/data/fonts/source-han-serif/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 776b87c80f7..edfdc6e5c3f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -500,6 +500,7 @@
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   takikawa = "Asumu Takikawa <asumu@igalia.com>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
+  taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   teh = "Tom Hunger <tehunger@gmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 11132710a90..b69358c2c75 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -23,10 +23,11 @@ let
     '';
 
     meta = {
-      description = "${language} subset of an open source Pan-CJK typeface";
+      description = "${language} subset of an open source Pan-CJK sans-serif typeface";
       homepage = https://github.com/adobe-fonts/source-han-sans;
       license = stdenv.lib.licenses.asl20;
       platforms = stdenv.lib.platforms.unix;
+      maintainers = with stdenv.lib.maintainers; [ taku0 ];
     };
   };
 in
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix
new file mode 100644
index 00000000000..148f5a4538f
--- /dev/null
+++ b/pkgs/data/fonts/source-han-serif/default.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl, unzip}:
+
+let
+  makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+    version = "1.000R";
+    name = "source-han-serif-${variant}-${version}";
+    revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76";
+
+    buildInputs = [ unzip ];
+
+    src = fetchurl {
+      url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip";
+      inherit sha256;
+    };
+
+    setSourceRoot = ''
+      sourceRoot=$( echo SourceHanSerif* )
+    '';
+
+    installPhase = ''
+      mkdir -p $out/share/fonts/opentype
+      cp $( find . -name '*.otf' ) $out/share/fonts/opentype
+    '';
+
+    meta = {
+      description = "${language} subset of an open source Pan-CJK serif typeface";
+      homepage = https://github.com/adobe-fonts/source-han-sans;
+      license = stdenv.lib.licenses.ofl;
+      platforms = stdenv.lib.platforms.unix;
+      maintainers = with stdenv.lib.maintainers; [ taku0 ];
+    };
+  };
+in
+{
+  japanese = makePackage {
+    variant = "japanese";
+    language = "Japanese";
+    region = "JP";
+    sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7";
+  };
+  korean = makePackage {
+    variant = "korean";
+    language = "Korean";
+    region = "KR";
+    sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r";
+  };
+  simplified-chinese = makePackage {
+    variant = "simplified-chinese";
+    language = "Simplified Chinese";
+    region = "CN";
+    sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43";
+  };
+  traditional-chinese = makePackage {
+    variant = "traditional-chinese";
+    language = "Traditional Chinese";
+    region = "TW";
+    sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8322222263..4cf2e215dc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12630,6 +12630,11 @@ with pkgs;
   source-han-sans-korean = sourceHanSansPackages.korean;
   source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese;
   source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese;
+  sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { };
+  source-han-serif-japanese = sourceHanSerifPackages.japanese;
+  source-han-serif-korean = sourceHanSerifPackages.korean;
+  source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
+  source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
 
   inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
 

From 841740bd3d5625ae3ba87574be16ba4c9e26316d Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Thu, 6 Apr 2017 09:05:32 -0400
Subject: [PATCH 0719/1744] fvwm: add edanaher as maintainer

---
 pkgs/applications/window-managers/fvwm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index b374c982931..f8c8a59f6f6 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     description = "A multiple large virtual desktop window manager";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ edanaher ];
   };
 }

From bd948391e6196fbd4e1e666ddd96393f57cdb214 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Apr 2017 14:49:52 +0200
Subject: [PATCH 0720/1744] strongswan: 5.5.1 -> 5.5.2

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 7da47e339d0..5a9cf8f1f4b 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "1drahhmwz1jg14rfh67cl231dlg2a9pra6jmipfxwyzpj4ck02vj";
+    sha256 = "0slzrr5amn1rs9lrjca0fv5n1ya5jwlspfiqg9xzq1bghg56z5ys";
   };
 
   dontPatchELF = true;

From 09b1414acd7af2775414cbddd183db7b25697841 Mon Sep 17 00:00:00 2001
From: Jean Potier <jpotier@users.noreply.github.com>
Date: Thu, 6 Apr 2017 16:00:02 +0200
Subject: [PATCH 0721/1744] cups-toshiba-estudio: init at 7.51 (#24676)

---
 lib/maintainers.nix                        |  1 +
 pkgs/misc/cups/drivers/estudio/default.nix | 54 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/estudio/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 776b87c80f7..d1d47062caa 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -243,6 +243,7 @@
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
+  jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
new file mode 100644
index 00000000000..6f9e4579a14
--- /dev/null
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
+  name = "cups-toshiba-estudio";
+  version = "7.51";
+
+  src = fetchurl {
+    url = http://business.toshiba.com/downloads/KB/f1Ulds/14079/TOSHIBA_ColorMFP_CUPS.tar;
+    sha256 = "3741bb79723495da5cb5a3971ae8c6042b6c71a6264af8f25aecf721f1f0752f";
+  };
+
+  buildInputs = [ perl ];
+
+  phases = [ "unpackPhase"
+             "patchPhase"
+             "installPhase" ];
+
+  patchPhase = ''
+    patchShebangs lib/
+    gunzip                share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz
+    sed -i "s+/usr+$out+" share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS
+    gzip                  share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model/Toshiba
+    cp {.,$out}/lib/cups/filter/est6550_Authentication
+    chmod 755 $out/lib/cups/filter/est6550_Authentication
+    cp {.,$out}/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz
+    chmod 755 $out/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Printer only driver for the Toshiba e-STUDIO class of printers";
+    longDescription = ''
+      This driver supports the following printers: TOSHIBA e-STUDIO2000AC,
+      TOSHIBA e-STUDIO2005AC, TOSHIBA e-STUDIO2040C, TOSHIBA e-STUDIO2050C,
+      TOSHIBA e-STUDIO2055C, TOSHIBA e-STUDIO2500AC, TOSHIBA e-STUDIO2505AC,
+      TOSHIBA e-STUDIO2540C, TOSHIBA e-STUDIO2550C, TOSHIBA e-STUDIO2555C,
+      TOSHIBA e-STUDIO287CS, TOSHIBA e-STUDIO3005AC, TOSHIBA e-STUDIO3040C,
+      TOSHIBA e-STUDIO3055C, TOSHIBA e-STUDIO347CS, TOSHIBA e-STUDIO3505AC,
+      TOSHIBA e-STUDIO3540C, TOSHIBA e-STUDIO3555C, TOSHIBA e-STUDIO407CS,
+      TOSHIBA e-STUDIO4505AC, TOSHIBA e-STUDIO4540C, TOSHIBA e-STUDIO4555C,
+      TOSHIBA e-STUDIO5005AC, TOSHIBA e-STUDIO5055C, TOSHIBA e-STUDIO5506AC,
+      TOSHIBA e-STUDIO5540C, TOSHIBA e-STUDIO5560C, TOSHIBA e-STUDIO6506AC,
+      TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C,
+      TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC.
+    '';
+    homepage = https://www.toshiba-business.com.au/support/drivers;
+    license = licenses.unfree;
+    maintainers = [ maintainers.jpotier ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9a492a5c59..e55a22a0579 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17768,6 +17768,8 @@ with pkgs;
 
   cups-dymo = callPackage ../misc/cups/drivers/dymo {};
 
+  cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {};
+
   crashplan = callPackage ../applications/backup/crashplan { };
 
   colort = callPackage ../applications/misc/colort { };

From 365e8a7b6a39a442bf07796a0541b76331e2ede4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Apr 2017 18:43:42 +0200
Subject: [PATCH 0722/1744] quicklispPackages: update to fresh QuickLisp

lispPackages: reduce environment-bombing
---
 .../lisp-modules/clwrapper/cl-wrapper.sh      |   2 +-
 .../lisp-modules/clwrapper/common-lisp.sh     |   2 +-
 .../lisp-modules/clwrapper/default.nix        |  21 +-
 .../lisp-modules/clwrapper/setup-hook.sh      |  16 +-
 .../lisp-modules/define-package.nix           |  33 ++-
 .../lisp-modules/quicklisp-to-nix-aliases.nix |  13 +
 .../3bmd-ext-tables.nix                       |  29 ---
 .../3bmd-ext-wiki-links.nix                   |  29 ---
 .../quicklisp-to-nix-output/3bmd-youtube.nix  |  29 ---
 .../quicklisp-to-nix-output/3bmd.nix          |   9 +-
 .../quicklisp-to-nix-output/alexandria.nix    |   9 +-
 .../quicklisp-to-nix-output/anaphora.nix      |   9 +-
 .../quicklisp-to-nix-output/array-utils.nix   |   9 +-
 .../quicklisp-to-nix-output/babel-streams.nix |   9 +-
 .../quicklisp-to-nix-output/babel.nix         |   9 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   9 +-
 .../bordeaux-threads.nix                      |   9 +-
 .../quicklisp-to-nix-output/caveman.nix       |   9 +-
 .../quicklisp-to-nix-output/cffi-examples.nix |  28 --
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   9 +-
 .../quicklisp-to-nix-output/cffi-libffi.nix   |  29 ---
 .../cffi-toolchain.nix                        |  28 --
 .../cffi-uffi-compat.nix                      |  28 --
 .../quicklisp-to-nix-output/cffi.nix          |   9 +-
 .../quicklisp-to-nix-output/chipz.nix         |   9 +-
 .../quicklisp-to-nix-output/chunga.nix        |   9 +-
 .../circular-streams.nix                      |   9 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |  21 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |   9 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   9 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   9 +-
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |   9 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |   9 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-async-util.nix |  13 +-
 .../quicklisp-to-nix-output/cl-async.nix      |   9 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |   9 +-
 .../quicklisp-to-nix-output/cl-colors.nix     |   9 +-
 .../quicklisp-to-nix-output/cl-cookie.nix     |   9 +-
 .../quicklisp-to-nix-output/cl-dbi.nix        |   9 +-
 .../quicklisp-to-nix-output/cl-emb.nix        |   9 +-
 .../quicklisp-to-nix-output/cl-fad.nix        |   9 +-
 .../cl-fuse-meta-fs.nix                       |   9 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   9 +-
 .../quicklisp-to-nix-output/cl-json.nix       |   9 +-
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-l10n.nix       |   9 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |   9 +-
 .../quicklisp-to-nix-output/cl-markup.nix     |   9 +-
 .../quicklisp-to-nix-output/cl-mysql.nix      |   9 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |  21 +-
 .../cl-ppcre-template.nix                     |   9 +-
 .../cl-ppcre-unicode.nix                      |  33 +++
 .../quicklisp-to-nix-output/cl-ppcre.nix      |   9 +-
 .../quicklisp-to-nix-output/cl-project.nix    |   9 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |   9 +-
 .../quicklisp-to-nix-output/cl-smtp.nix       |   9 +-
 .../quicklisp-to-nix-output/cl-store.nix      |   9 +-
 .../cl-syntax-annot.nix                       |   9 +-
 .../cl-syntax-anonfun.nix                     |   9 +-
 .../cl-syntax-markup.nix                      |   9 +-
 .../quicklisp-to-nix-output/cl-syntax.nix     |   9 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |  21 +-
 .../quicklisp-to-nix-output/cl-unicode.nix    |   9 +-
 .../cl-unification.nix                        |   9 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-vectors.nix    |   9 +-
 .../quicklisp-to-nix-output/cl-who.nix        |   9 +-
 .../clack-v1-compat.nix                       |  30 ++-
 .../quicklisp-to-nix-output/clack.nix         |  24 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  19 +-
 .../closure-common.nix                        |   9 +-
 .../quicklisp-to-nix-output/clsql.nix         |   9 +-
 .../quicklisp-to-nix-output/clss.nix          |   9 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   9 +-
 .../quicklisp-to-nix-output/clx.nix           |   9 +-
 .../command-line-arguments.nix                |   9 +-
 .../quicklisp-to-nix-output/css-lite.nix      |   9 +-
 .../quicklisp-to-nix-output/cxml-dom.nix      |   9 +-
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   9 +-
 .../quicklisp-to-nix-output/cxml-test.nix     |   9 +-
 .../quicklisp-to-nix-output/cxml-xml.nix      |   9 +-
 .../quicklisp-to-nix-output/cxml.nix          |   9 +-
 .../quicklisp-to-nix-output/dbd-mysql.nix     |   9 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |   9 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |   9 +-
 .../quicklisp-to-nix-output/dexador.nix       |  29 ++-
 .../quicklisp-to-nix-output/do-urlencode.nix  |   9 +-
 .../documentation-utils.nix                   |   9 +-
 .../quicklisp-to-nix-output/drakma.nix        |   9 +-
 .../quicklisp-to-nix-output/esrap.nix         |   9 +-
 .../external-program.nix                      |   9 +-
 .../quicklisp-to-nix-output/fast-http.nix     |   9 +-
 .../quicklisp-to-nix-output/fast-io.nix       |   9 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |   9 +-
 .../quicklisp-to-nix-output/form-fiddle.nix   |   9 +-
 .../quicklisp-to-nix-output/http-body.nix     |   9 +-
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  19 +-
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |   9 +-
 .../quicklisp-to-nix-output/hunchentoot.nix   |   9 +-
 .../quicklisp-to-nix-output/idna.nix          |   9 +-
 .../quicklisp-to-nix-output/iolib.nix         |   9 +-
 .../quicklisp-to-nix-output/ironclad.nix      |   9 +-
 .../quicklisp-to-nix-output/iterate.nix       |   9 +-
 .../quicklisp-to-nix-output/jonathan.nix      |   9 +-
 .../lack-middleware-backtrace.nix             |  37 +++
 .../quicklisp-to-nix-output/lack-util.nix     |  38 +++
 .../quicklisp-to-nix-output/lack.nix          |   9 +-
 .../quicklisp-to-nix-output/let-plus.nix      |   9 +-
 .../quicklisp-to-nix-output/lev.nix           |   9 +-
 .../quicklisp-to-nix-output/local-time.nix    |   9 +-
 .../quicklisp-to-nix-output/lquery.nix        |   9 +-
 .../quicklisp-to-nix-output/map-set.nix       |   9 +-
 .../quicklisp-to-nix-output/marshal.nix       |   9 +-
 .../quicklisp-to-nix-output/md5.nix           |   9 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   9 +-
 .../quicklisp-to-nix-output/myway.nix         |   9 +-
 .../named-readtables.nix                      |   9 +-
 .../quicklisp-to-nix-output/nibbles.nix       |  19 +-
 .../quicklisp-to-nix-output/optima.nix        |   9 +-
 .../quicklisp-to-nix-output/parenscript.nix   |   9 +-
 .../quicklisp-to-nix-output/pcall.nix         |   9 +-
 .../quicklisp-to-nix-output/plump.nix         |   9 +-
 .../quicklisp-to-nix-output/proc-parse.nix    |   9 +-
 .../quicklisp-to-nix-output/prove.nix         |  21 +-
 .../quicklisp-to-nix-output/puri.nix          |   9 +-
 .../quicklisp-to-nix-output/query-fs.nix      |   9 +-
 .../quicklisp-to-nix-output/quri.nix          |   9 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |   9 +-
 .../quicklisp-to-nix-output/salza2.nix        |   9 +-
 .../quicklisp-to-nix-output/smart-buffer.nix  |   9 +-
 .../split-sequence.nix                        |   9 +-
 .../quicklisp-to-nix-output/sqlite.nix        |   9 +-
 .../static-vectors.nix                        |   9 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  23 +-
 .../quicklisp-to-nix-output/swap-bytes.nix    |   9 +-
 .../trivial-backtrace.nix                     |   9 +-
 .../trivial-features.nix                      |   9 +-
 .../trivial-garbage.nix                       |   9 +-
 .../trivial-gray-streams.nix                  |   9 +-
 .../trivial-indent.nix                        |   9 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |   9 +-
 .../quicklisp-to-nix-output/trivial-types.nix |   9 +-
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   9 +-
 .../quicklisp-to-nix-output/uffi.nix          |   9 +-
 .../quicklisp-to-nix-output/uiop.nix          |  13 +-
 .../quicklisp-to-nix-output/usocket.nix       |   9 +-
 .../quicklisp-to-nix-output/vom.nix           |   9 +-
 .../quicklisp-to-nix-output/woo.nix           |   9 +-
 .../quicklisp-to-nix-output/wookie.nix        |   9 +-
 .../quicklisp-to-nix-output/xmls.nix          |   9 +-
 .../quicklisp-to-nix-output/xsubseq.nix       |   9 +-
 .../quicklisp-to-nix-output/yason.nix         |   9 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   9 +-
 .../quicklisp-to-nix-overrides.lisp           |   1 -
 .../quicklisp-to-nix-overrides.nix            |  38 +--
 .../lisp-modules/quicklisp-to-nix-systems.txt |  12 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 245 ++++++++++--------
 .../quicklisp-to-nix/nix-package.emb          |   9 +-
 .../quicklisp-to-nix/top-package.emb          |   5 +-
 162 files changed, 1396 insertions(+), 725 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 2e136530cd1..97add524d17 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -49,7 +49,7 @@ NIX_LISP_ASDF_REGISTRY_CODE="
     )
 "
 
-NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}"
+NIX_LISP_ASDF="${NIX_LISP_ASDF:-@out@}"
 
 nix_lisp_run_single_form(){
   NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1"
diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
index 43349cc7f8a..9f5a2b80689 100755
--- a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
+++ b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(ls "@lisp@/bin"/* | head -n 1)}" "$@"
+source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(@ls@ "@lisp@/bin"/* | @head@ -n 1)}" "$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 799fb0b5d69..4599c630d83 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, asdf, lisp ? null}:
+{stdenv, fetchurl, asdf, which, lisp ? null}:
 stdenv.mkDerivation {
   name = "cl-wrapper-script";
 
@@ -6,6 +6,8 @@ stdenv.mkDerivation {
 
   installPhase=''
     mkdir -p "$out"/bin
+    export head="$(which head)"
+    export ls="$(which ls)"
     substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh
     substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh"
     substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh"
@@ -16,17 +18,20 @@ stdenv.mkDerivation {
     setLisp "${lisp}"
     echo "$NIX_LISP"
 
-    ASDF_OUTPUT_TRANSLATIONS="${asdf}/lib/common-lisp/:$out/lib/common-lisp-compiled/" \
+    mkdir -p "$out/lib/common-lisp/"
+    cp -r "${asdf}/lib/common-lisp"/* "$out/lib/common-lisp/"
+    chmod u+rw -R "$out/lib/common-lisp/"
+
     NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn 
-        (uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")
+        (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\")
         (asdf:load-system :uiop :force :all)
         (asdf:load-system :asdf :force :all)
       )"' \
-      "$out/bin/common-lisp.sh" "$NIX_LISP"
-
-    ln -s "$out/lib/common-lisp-compiled"/{asdf/uiop,uiop}
+      "$out/bin/common-lisp.sh"
   '';
 
+  buildInputs = [which];
+
   inherit asdf lisp;
   stdenv_shell = stdenv.shell;
 
@@ -34,10 +39,10 @@ stdenv.mkDerivation {
 
   phases="installPhase fixupPhase";
 
-  preferLocalBuild = true;
+  ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}";
 
   passthru = {
-    inherit lisp asdf;
+    inherit lisp;
   };
 
   meta = {
diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
index 4e582e0d5b0..7ac8c70d59f 100644
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@@ -1,16 +1,10 @@
-NIX_LISP_ASDF="@asdf@"
+NIX_LISP_ASDF="@out@"
 
-CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/"
-ASDF_OUTPUT_TRANSLATIONS="@asdf@/lib/common-lisp/:@out@/lib/common-lisp-compiled/"
+CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@out@/lib/common-lisp/asdf/"
 
 addASDFPaths () {
-    for j in "$1"/lib/common-lisp/*; do
-	if [ -d "$j" ]; then
-            CL_SOURCE_REGISTRY="$j/:$CL_SOURCE_REGISTRY"
-            if [ -d "$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")" ]; then
-              ASDF_OUTPUT_TRANSLATIONS="$j:$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")${ASDF_OUTPUT_TRANSLATIONS:+:}$ASDF_OUTPUT_TRANSLATIONS"
-            fi
-	fi
+    for j in "$1"/lib/common-lisp-settings/*-path-config.sh; do
+      source "$j"
     done
 }
 
@@ -35,7 +29,7 @@ collectNixLispLDLP () {
      fi
 }
 
-export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF ASDF_OUTPUT_TRANSLATIONS
+export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF
 
 envHooks+=(addASDFPaths setLisp collectNixLispLDLP)
 
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 26851181531..520e224e6da 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -3,19 +3,33 @@ args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest
   , propagatedBuildInputs ? []}:
 let 
   deployConfigScript = ''
+    outhash="$out"
+    outhash="''${outhash##*/}"
+    outhash="''${outhash%%-*}"
     config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh
+    path_config_script="$out"/lib/common-lisp-settings/${args.baseName}-path-config.sh
+    store_translation="$(dirname "$out"):$(dirname "$out")"
     mkdir -p "$(dirname "$config_script")"
     touch "$config_script"
+    touch "$path_config_script"
     chmod a+x "$config_script"
+    chmod a+x "$path_config_script"
+    echo "if test -z \"\''${_''${outhash}_NIX_LISP_CONFIG}\"; then export _''${outhash}_NIX_LISP_CONFIG=1; " >> "$config_script"
     echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script"
+    echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script"
     echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
     echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
-    echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$out/lib/common-lisp/${args.baseName}/:$CL_SOURCE_REGISTRY'" >> "$config_script"
-    echo "export ASDF_OUTPUT_TRANSLATIONS="\$ASDF_OUTPUT_TRANSLATIONS\''${ASDF_OUTPUT_TRANSLATIONS:+:}"'$out/lib/common-lisp/${args.baseName}/:$out/lib/common-lisp-compiled/${args.baseName}:$ASDF_OUTPUT_TRANSLATIONS'" >> "$config_script"
+    echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script"
+    echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script"
+    echo "source '$path_config_script'" >> "$config_script"
+    echo "fi" >> "$config_script"
+    echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script"
+    echo "for i in \"''${CL_SOURCE_REGISTRY//:/\" \"}\" \"$out/lib/common-lisp/${args.baseName}/\" ; do echo \"\$CL_SOURCE_REGISTRY\" | grep -E \"(^|:)\$i(:|\\\$)\" >/dev/null || export CL_SOURCE_REGISTRY=\"\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}\$i\"; done;" >> "$path_config_script"
     test -n "$LD_LIBRARY_PATH" &&
-        echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$config_script"
+        echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script"
     test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
-        echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$config_script"
+        echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$path_config_script"
+    echo "fi" >> "$path_config_script"
   '';
   deployLaunchScript = ''
     launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh
@@ -44,9 +58,14 @@ basePackage = {
     ${deployLaunchScript}
 
     ${stdenv.lib.concatMapStrings (testSystem: ''
-       CL_SOURCE_REGISTRY= \
+       env -i \
+       NIX_LISP="$NIX_LISP" \
        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
-             (asdf:compile-system :${testSystem}) (asdf:load-system :${testSystem}))"' \
+             (asdf:compile-system :${testSystem})
+             (asdf:load-system :${testSystem})
+             (asdf:operate (quote asdf::compile-bundle-op) :${testSystem})
+             (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem}))
+             )"' \
           "$out/bin/${args.baseName}-lisp-launcher.sh" ""
     '') testSystems}
 
@@ -57,6 +76,8 @@ basePackage = {
   buildInputs = buildInputs;
   dontStrip=true;
 
+  ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}";
+
   meta = {
     inherit description version;
   } // meta;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
new file mode 100644
index 00000000000..cdcfde8eb33
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
@@ -0,0 +1,13 @@
+{quicklisp-to-nix-packages}:
+with quicklisp-to-nix-packages;
+rec {
+  cffi-grovel = cffi;
+
+  cxml-test = null;
+  cxml-dom = null;
+  cxml-klacks = null;
+  cxml-xml = null;
+
+  cl-async-util = cl-async-base;
+  cl-async = cl-async-base;
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
deleted file mode 100644
index 7135766cf95..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-tables.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''3bmd-ext-tables'';
-  version = ''3bmd-20161204-git'';
-
-  description = ''Extension to 3bmd implementing PHP Markdown Extra style tables'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
-    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-ext-tables[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM 3bmd-ext-tables DESCRIPTION Extension to 3bmd implementing PHP Markdown Extra style tables SHA256
-    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
-    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-ext-tables TESTNAME NIL FILENAME 3bmd-ext-tables DEPS NIL DEPENDENCIES NIL VERSION 3bmd-20161204-git SIBLINGS
-    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
deleted file mode 100644
index 251f7b33b65..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-ext-wiki-links.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''3bmd-ext-wiki-links'';
-  version = ''3bmd-20161204-git'';
-
-  description = ''example extension to 3bmd implementing simple wiki-style [[links]]'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
-    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-ext-wiki-links[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM 3bmd-ext-wiki-links DESCRIPTION example extension to 3bmd implementing simple wiki-style [[links]] SHA256
-    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
-    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-ext-wiki-links TESTNAME NIL FILENAME 3bmd-ext-wiki-links DEPS NIL DEPENDENCIES NIL VERSION 3bmd-20161204-git
-    SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-youtube-tests 3bmd-youtube 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
deleted file mode 100644
index 802212e3d2f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd-youtube.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''3bmd-youtube'';
-  version = ''3bmd-20161204-git'';
-
-  description = ''An extension for 3bmd for embedding YouTube videos'';
-
-  deps = [ args."esrap" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
-    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd-youtube[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM 3bmd-youtube DESCRIPTION An extension for 3bmd for embedding YouTube videos SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd-youtube TESTNAME NIL FILENAME
-    3bmd-youtube DEPS ((NAME esrap)) DEPENDENCIES (esrap) VERSION 3bmd-20161204-git SIBLINGS
-    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
index 67ec24a5668..e04b3032091 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index e3a6c52bc00..d72835e88c6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/alexandria[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 102fd0d4ce5..fde774a9b24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/anaphora[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 9cd1f486af2..0f51b69e200 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/array-utils[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index ad0931dec0b..4ad9f00b150 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel-streams[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 2ae08f2ca60..a88e60824d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index e10ee3cfc35..352538cd353 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/blackbird[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index 165f2e955ac..adcf9fa5a72 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/bordeaux-threads[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index bbd50ab7026..e5d895adb63 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/caveman[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
deleted file mode 100644
index 7947f1f02cc..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-examples.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cffi-examples'';
-  version = ''cffi_0.18.0'';
-
-  description = ''CFFI Examples'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-examples[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cffi-examples DESCRIPTION CFFI Examples SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-examples TESTNAME NIL FILENAME
-    cffi-examples DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 51c9046c764..fdb2ab5b869 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-grovel[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
deleted file mode 100644
index be3a8d2087e..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-libffi.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cffi-libffi'';
-  version = ''cffi_0.18.0'';
-
-  description = ''Foreign structures by value'';
-
-  deps = [ args."trivial-features" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-libffi[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cffi-libffi DESCRIPTION Foreign structures by value SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-libffi TESTNAME NIL FILENAME cffi-libffi
-    DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION cffi_0.18.0 SIBLINGS
-    (cffi-examples cffi-grovel cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
deleted file mode 100644
index bca3b17578f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cffi-toolchain'';
-  version = ''cffi_0.18.0'';
-
-  description = ''The CFFI toolchain'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-toolchain[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-toolchain TESTNAME NIL FILENAME
-    cffi-toolchain DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
deleted file mode 100644
index 3c68d026272..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cffi-uffi-compat'';
-  version = ''cffi_0.18.0'';
-
-  description = ''UFFI Compatibility Layer for CFFI'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-uffi-compat[.]asd${"$"}' |
-        while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-uffi-compat TESTNAME NIL FILENAME
-    cffi-uffi-compat DEPS NIL DEPENDENCIES NIL VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 923f6804327..81f3dfad8aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 1e2588394ed..0a1d054b05e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chipz[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index f5be78349d5..6f38719781e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chunga[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 73b10972a6a..ff69c56e8a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/circular-streams[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 76f5c61314c..9b19aa51678 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -1,29 +1,34 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl+ssl'';
-  version = ''cl+ssl-20161208-git'';
+  version = ''cl+ssl-20170403-git'';
 
   description = ''Common Lisp interface to OpenSSL.'';
 
   deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz'';
-    sha256 = ''0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz'';
+    sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl+ssl[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs URL
-    http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz MD5 8050639e66800045cb0a43863059e630 NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
+/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL
+    http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
     DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES
-    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20161208-git SIBLINGS (cl+ssl.test)) */
+    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index db5cecf3c19..2988906735a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-aa[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index b00646e96e0..bdf0dbdf48a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-annot[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index cd4b5e3cace..dae0666a727 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-anonfun[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index c5d76714dd4..2530203e3b7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ansi-text[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index eb13e385ee8..ea9c89dffb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-base[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 2d211eb8d18..ccc138a9b5e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-repl[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 140b0157d37..dbd056059f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-ssl[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index 979cb5ee9b7..b72be6f88bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -3,8 +3,6 @@ rec {
   baseName = ''cl-async-util'';
   version = ''cl-async-20160825-git'';
 
-  testSystems = ["cl-async"];
-
   description = ''Internal utilities for cl-async.'';
 
   deps = [ args."vom" args."fast-io" args."cl-ppcre" args."cl-libuv" args."cl-async-base" args."cffi" ];
@@ -18,14 +16,19 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-util[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
 /* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME cl-async
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL
     FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES
     (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index a2ea0c38bf5..e484e1d991a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index c2799e37e2e..0ca5f7149f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-base64[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 710799e095c..237fbfaea38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-colors[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index cbfb425eee1..4d2b56ac775 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cookie[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index d7798a6eb1f..781ae6c1d33 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-dbi[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index f2aab01ef5e..7b4c40632a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-emb[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index f731a13e782..2063f2f4be3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fad[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 35fb1fbc073..9d3d779ab48 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse-meta-fs[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 01c01c57bb8..576edbfdbf2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index a89a341715c..7babd1a459f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-json[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 463232d1419..f782c99a68a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n-cldr[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 9c8c1cc05b2..6c465f14858 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index bc45a29b4b4..cca51585e5d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-libuv[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 93de92d71f6..282b05fefd8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markup[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 7aed84cec64..f54fc00950a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-mysql[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index e2fd4222b51..38f57fc61b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-paths-ttf[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 76fe21bfb76..66b42fec175 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,28 +1,33 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20170124-git'';
+  version = ''postmodern-20170403-git'';
 
   description = ''Low-level client library for PostgreSQL'';
 
   deps = [ args."md5" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2017-01-24/postmodern-20170124-git.tgz'';
-    sha256 = ''1hdgdpkba225xqvpsr7r1j78cx0ha23x6f69ab2666plpyw321k8'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-postgres[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1hdgdpkba225xqvpsr7r1j78cx0ha23x6f69ab2666plpyw321k8 URL
-    http://beta.quicklisp.org/archive/postmodern/2017-01-24/postmodern-20170124-git.tgz MD5 d19b368a8883093f20a47be83709b0c5 NAME cl-postgres TESTNAME NIL
-    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170124-git SIBLINGS (postmodern s-sql simple-date)) */
+/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL
+    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index ef75212c0f9..8e687ce64a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -20,8 +20,13 @@ REGULAR-EXPRESSION-TEMPLATE.'';
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-template[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
new file mode 100644
index 00000000000..3872bfd5f93
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -0,0 +1,33 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-ppcre-unicode'';
+  version = ''cl-ppcre-2.0.11'';
+
+  description = ''Perl-compatible regular expression library (Unicode)'';
+
+  deps = [ args."cl-unicode" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
+    sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-unicode[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME
+    cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 6bcd357bfc4..ecf4a5de399 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index eeb4d4023e2..3a933d2b11d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-project[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 303ed95f662..cad670acab1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-reexport[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 6ef4a185475..0098abf59d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-smtp[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 667f644b33c..ba16a64a9f6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-store[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index 533e48b189f..abdfc65ec1f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-annot[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index d6ee6e602e7..32c1a0c0ccc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-anonfun[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index 4af6c8a19f8..34c5a2e6628 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-markup[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 4ad90aeb5ff..bccba7ca8ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 65681df3e2d..c0d004c4009 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -1,28 +1,33 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-test-more'';
-  version = ''prove-20170124-git'';
+  version = ''prove-20170403-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz'';
-    sha256 = ''1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03'';
+    url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
+    sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-test-more[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03 URL
-    http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz MD5 c5601ee1aebedc7272e2c25e6a5ca8be NAME cl-test-more TESTNAME NIL FILENAME
-    cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170124-git SIBLINGS (prove-asdf prove-test prove)) */
+/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
+    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more TESTNAME NIL FILENAME
+    cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index e67a8e36994..d514c1f26a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 059d9f1abee..4c0b0c5c762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -18,8 +18,13 @@ The system contains the definitions for the 'unification' machinery.'';
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unification[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 5e6ee119874..099c63daf28 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-utilities[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index 9ac50b75557..e2e2c956e7d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-vectors[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 2f8923206c7..ca1303e9d1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-who[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index af1f2c8b8fa..b9d894e3f47 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,31 +1,43 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170227-git'';
+  version = ''clack-20170403-git'';
 
   description = '''';
 
-  deps = [ ];
+  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz'';
-    sha256 = ''1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
+    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-v1-compat[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x URL
-    http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz MD5 2264b62c2de992d12829053e8e5f9101 NAME clack-v1-compat TESTNAME NIL FILENAME
-    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170227-git SIBLINGS
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
+    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS
+    ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time)
+     (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64)
+     (NAME circular-streams) (NAME alexandria))
+    DEPENDENCIES
+    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
+     cl-ppcre cl-base64 circular-streams alexandria)
+    VERSION clack-20170403-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 5fd364a5879..2d0d3b3d0bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,31 +1,37 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170227-git'';
+  version = ''20170403-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz'';
-    sha256 = ''1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
+    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1sm6iamghpzmrv0h375y2famdngx62ml5dw424896kixxfyr923x URL
-    http://beta.quicklisp.org/archive/clack/2017-02-27/clack-20170227-git.tgz MD5 2264b62c2de992d12829053e8e5f9101 NAME clack TESTNAME NIL FILENAME clack DEPS
-    NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
+    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS
+    ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES
+    (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 725d2544e6b..432da3069d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,23 +1,28 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20170227-git'';
+  version = ''20170403-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-02-27/closer-mop-20170227-git.tgz'';
-    sha256 = ''1hdnbryh6gd8kn20yr5ldgkcs8i71c6awwf6a32nmp9l42gwv9k3'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz'';
+    sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closer-mop[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
@@ -25,5 +30,5 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 1hdnbryh6gd8kn20yr5ldgkcs8i71c6awwf6a32nmp9l42gwv9k3 URL http://beta.quicklisp.org/archive/closer-mop/2017-02-27/closer-mop-20170227-git.tgz MD5
-    fb511369eb416a4cc8335db79d0ec4b2 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+    SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5
+    806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 9dccf964a26..4e7579dba88 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closure-common[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index a0f0ad2a035..f5dba03d08e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clsql[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 701f98eec15..e8af9d041e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clss[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index c5930fe0b15..bf1b1a5e00c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx-truetype[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 5e24696e8c7..e9e1acfcefc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 9c13409fe7d..62010efd047 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/command-line-arguments[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index fc1b09601de..3f8886915a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/css-lite[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 9b7bced0d90..041cc5b8481 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-dom[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index e54cffb0ec4..15dd75fbfa6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-klacks[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index ddf0dfab841..4a872802ecb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-test[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 1ac10de31d0..9674eca3d1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-xml[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 89513dd9a38..3c17f72b42a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 3f05586200d..4ba68b6c545 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-mysql[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index cc30e7aafce..0d0c3f153ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-postgres[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index deb018bbc8a..f4c38e485f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-sqlite3[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index c5c823422fd..95672b7296f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,28 +1,39 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20170227-git'';
+  version = ''20170403-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-02-27/dexador-20170227-git.tgz'';
-    sha256 = ''0fc3hlckxfwz1ymindb9p44c6idfz8z6w5zk8cbd4nvvd0f2a8kz'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz'';
+    sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dexador[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0fc3hlckxfwz1ymindb9p44c6idfz8z6w5zk8cbd4nvvd0f2a8kz URL
-    http://beta.quicklisp.org/archive/dexador/2017-02-27/dexador-20170227-git.tgz MD5 87895012728d97cf37366c3e4b96fcee NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (dexador-test)) */
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL
+    http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS
+    ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre)
+     (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria))
+    DEPENDENCIES
+    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
+     alexandria)
+    VERSION 20170403-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 5da87698061..608cd6b3896 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/do-urlencode[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 0fca95c1e9f..43f6343b7eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/documentation-utils[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 0cc14057d51..82695e74bfe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/drakma[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 6ca810098d8..60db24e57d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/esrap[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index c716e9a35ea..aa7963f3243 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/external-program[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 17255e56a26..1f83d562967 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-http[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 8dddfd65f01..52cbc8ddcdb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-io[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 4f7f8927919..2348167ba65 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/flexi-streams[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 354055aa112..e12f3efb59a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/form-fiddle[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index dd7a876a28d..ed38c44b0c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/http-body[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
index 2ea3132e6fe..c37de8f6f8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
@@ -1,29 +1,34 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.asdf'';
-  version = ''20151218-darcs'';
+  version = ''20170403-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2015-12-18/hu.dwim.asdf-20151218-darcs.tgz'';
-    sha256 = ''18qdysv7zd2avdl8lc3gbnif8crjn0qs45fmnw8hia4dmd71k0k4'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz'';
+    sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    18qdysv7zd2avdl8lc3gbnif8crjn0qs45fmnw8hia4dmd71k0k4 URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2015-12-18/hu.dwim.asdf-20151218-darcs.tgz MD5
-    68ada32eb844abd8e2e6bc029126fa5f NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20151218-darcs
+    0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5
+    53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs
     SIBLINGS (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
index d7d6bf5611e..0649edb6fd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index b38796148a7..e77e977ea3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -19,8 +19,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hunchentoot[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 7e2f33ddfa9..ea7dd30df0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/idna[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 5a5f1c8c34c..55dd6b2a373 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index af1cbc8f1b6..de5528bca5e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ironclad[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index b3ec955fead..446b54a455a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iterate[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index e3cfd9047b6..905a14b785c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/jonathan[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
new file mode 100644
index 00000000000..ba24d7dd78c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-middleware-backtrace'';
+  version = ''lack-20161204-git'';
+
+  description = '''';
+
+  deps = [ args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
+    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
+    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL
+    FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
+     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
+     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
new file mode 100644
index 00000000000..9b60f52c87f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-util'';
+  version = ''lack-20161204-git'';
+
+  description = '''';
+
+  deps = [ args."ironclad" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
+    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
+    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util
+    DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
+     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
+     t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 7f1f4899f04..ceed4365966 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 07b106dde99..c01500f0c3d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/let-plus[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 8ccb243d1af..9d4aa874d4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lev[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 65ffbf88233..e2e7e71aadd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/local-time[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 068d0b9b1e7..473581c3184 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lquery[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index d2545b9a269..ad159edc5c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/map-set[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index ed49719ecf6..cb5041b6029 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/marshal[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index e568fd1cce8..a24e9d99a2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/md5[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index e585c2bd298..708fa41ca51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metabang-bind[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 477d54f1c81..186550a15df 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/myway[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index a5a8e79c2ad..c952ab5a1f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -17,8 +17,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/named-readtables[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 607a8e54d67..c5300698e54 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,28 +1,33 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''nibbles'';
-  version = ''20161204-git'';
+  version = ''20170403-git'';
 
   description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/nibbles/2016-12-04/nibbles-20161204-git.tgz'';
-    sha256 = ''06cdnivq2966crpj8pidqmwagaif848yvq4fjqq213f3wynwknh4'';
+    url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz'';
+    sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/nibbles[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
 /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders SHA256
-    06cdnivq2966crpj8pidqmwagaif848yvq4fjqq213f3wynwknh4 URL http://beta.quicklisp.org/archive/nibbles/2016-12-04/nibbles-20161204-git.tgz MD5
-    a342eb0426be2570c18151ef8742dad3 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS NIL) */
+    0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz MD5
+    5683a0a5510860a036b2a272036cda87 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 5b04344c635..48bd3b7e542 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/optima[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 01d1b384b26..56ae3473e2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parenscript[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 4d42a9a49b6..dae0d011e75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pcall[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 5d6e7a34a35..17795e3a92a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/plump[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 4d79313d983..9e4e2effbd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/proc-parse[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 32c10118f3c..cf6fd03ba12 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -1,29 +1,34 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''prove'';
-  version = ''20170124-git'';
+  version = ''20170403-git'';
 
   description = '''';
 
   deps = [ args."uiop" args."cl-ppcre" args."cl-colors" args."cl-ansi-text" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz'';
-    sha256 = ''1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03'';
+    url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
+    sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/prove[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM prove DESCRIPTION NIL SHA256 1kyhh4yvf47psb5v0zqivcwn71n6my5fwggdifymlpigk2q3zn03 URL
-    http://beta.quicklisp.org/archive/prove/2017-01-24/prove-20170124-git.tgz MD5 c5601ee1aebedc7272e2c25e6a5ca8be NAME prove TESTNAME NIL FILENAME prove DEPS
+/* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
+    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS
     ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION
-    20170124-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
+    20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index b6ef82f9520..fe48a580ee9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/puri[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 51ff8bdb022..2a1219e48e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/query-fs[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1eb40822b9c..1c351669c9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/quri[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 290850ced7d..572cd29c75b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/rfc2388[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 963133feb8d..38e9e4ecabd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -17,8 +17,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/salza2[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 1a610eaacbe..597f8fcfe3a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/smart-buffer[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index b6f1d8ec966..2712a1b8e1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -17,8 +17,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/split-sequence[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index c514fd81576..1d2f8fd0122 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/sqlite[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 879d2c3e815..1a7056e3fa2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/static-vectors[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 529f989c5b0..aaef5095dbb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,28 +1,33 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20170227-git'';
+  version = ''20170403-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz'';
-    sha256 = ''0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz'';
+    sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf'';
   };
 
   overrides = x: {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/stumpwm[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz MD5 076f2ec967024fcabc13eb921e6ce7c2 NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 6f8cf8c2a2a..8ae38c45686 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/swap-bytes[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index e9c8ba354e7..e28637849af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-backtrace[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index d1ccd2ea2c7..7b44cb90337 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-features[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 3aeb11fdf9d..3c439aae2e4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-garbage[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 80ca1d6ea9b..120f384a7a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-gray-streams[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 18cfe65db37..d091ad3250f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-indent[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 96474552828..e9d090a84aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-mimes[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 4f9851247eb..064e67fef50 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-types[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 814f4c1a6dc..d7a8721f298 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-utf-8[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 382df53eeb0..f3528d60524 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uffi[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index a1ad7daf179..3b340be7c1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -3,7 +3,7 @@ rec {
   baseName = ''uiop'';
   version = ''3.2.0'';
 
-  description = ''Portability library for Common Lisp programs'';
+  description = '''';
 
   deps = [ ];
 
@@ -16,13 +16,18 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uiop[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
   };
 }
-/* (SYSTEM uiop DESCRIPTION Portability library for Common Lisp programs SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
+/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
     http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
     DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index d88c0a84749..5b6a7fafd01 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/usocket[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 5563786b07e..ca9680ebd00 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/vom[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index dce3e50c192..a225b323f36 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/woo[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 9efaa93d2bf..3744526b25a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/wookie[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 564477d84d6..11fa1931f0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xmls[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index 59a92bb04a2..da2611d1f39 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xsubseq[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 5d346aef40b..32c7198b99f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/yason[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 1bbf51cbda5..06fc8502d6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -16,8 +16,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/zpb-ttf[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
index 7b11b6b0b9d..a710d25ab5c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
@@ -4,5 +4,4 @@
   (gethash "cxml-test" testnames) "cxml"
   (gethash "cxml-klacks" testnames) "cxml"
   (gethash "cl-async-base" testnames) "cl-async"
-  (gethash "cl-async-util" testnames) "cl-async"
   )
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 01f734538b5..6228f9c5fec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -10,15 +10,25 @@ let
     ((builtins.head l) x) // (multiOverride (builtins.tail l) x);
 in
 {
-  stumpwm = addDeps (with qlnp; [alexandria cl-ppcre clx]);
+  stumpwm = x:{
+    overrides = y: (x.overrides y) // {
+      preConfigure = ''
+        export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
+      '';
+    };
+  };
   iterate = skipBuildPhase;
   cl-fuse = x: {
     propagatedBuildInputs = [pkgs.fuse];
     overrides = y : (x.overrides y) // {
       configurePhase = ''
+        export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY"
         export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
         export makeFlags="$makeFlags LISP=common-lisp.sh"
       '';
+      preInstall = ''
+        export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY"
+      '';
     };
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
@@ -31,13 +41,10 @@ in
     flexi-streams circular-streams ironclad cl-syntax-annot alexandria
     split-sequence
   ]);
-  clack-handler-fcgi = addDeps (with qlnp; []);
   lack = addDeps (with qlnp; [ironclad]);
-  cxml = skipBuildPhase;
-  cxml-xml = skipBuildPhase;
-  cxml-dom = skipBuildPhase;
-  cxml-klacks = skipBuildPhase;
-  cxml-test = skipBuildPhase;
+  cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [
+    closure-common puri trivial-gray-streams
+  ]))];
   wookie = multiOverride [(addDeps (with qlnp; [
       alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
       cl-fad fast-io vom do-urlencode cl-async-ssl
@@ -92,18 +99,10 @@ in
       '';
     };
   };
-  cffi-grovel = addDeps (with qlnp; [ cffi-toolchain ]);
-  cffi-toolchain = addDeps (with qlnp; [ cffi uiop ]);
-  cffi-examples = addDeps (with qlnp; [ cffi ]);
-  cffi-libffi = addDeps (with qlnp; [ cffi ]);
-  cffi-uffi-compat = addDeps (with qlnp; [ cffi ]);
   cffi = multiOverride [(addNativeLibs [pkgs.libffi])
-    (addDeps (with qlnp; [uffi]))];
+    (addDeps (with qlnp; [uffi uiop trivial-features]))];
   cl-vectors = addDeps (with qlnp; [zpb-ttf]);
   "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
-  "3bmd-ext-tables" = addDeps (with qlnp; [qlnp."3bmd"]);
-  "3bmd-ext-wiki-links" = addDeps (with qlnp; [qlnp."3bmd"]);
-  "3bmd-youtube" = addDeps (with qlnp; [qlnp."3bmd"]);
   cl-dbi = addDeps (with qlnp; [
     cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
   ]);
@@ -126,4 +125,11 @@ in
   babel-streams = addDeps (with qlnp; [babel]);
   plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
+  uiop = x: {
+    overrides = y: (x.overrides y) // {
+      postInstall = ((x.overrides y).postInstall or "") + ''
+        cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop"
+      '';
+    };
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 8522ed79c56..3d15319ad06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,18 +1,10 @@
 3bmd
-3bmd-ext-tables
-3bmd-ext-wiki-links
-3bmd-youtube
 alexandria
 babel
 blackbird
 bordeaux-threads
 caveman
 cffi
-cffi-examples
-cffi-grovel
-cffi-libffi
-cffi-toolchain
-cffi-uffi-compat
 chipz
 circular-streams
 clack
@@ -35,6 +27,7 @@ cl-mysql
 closer-mop
 cl-ppcre
 cl-ppcre-template
+cl-ppcre-unicode
 cl-reexport
 cl-smtp
 clsql
@@ -53,9 +46,6 @@ clx-truetype
 command-line-arguments
 css-lite
 cxml
-cxml-dom
-cxml-klacks
-cxml-xml
 dbd-mysql
 dbd-postgres
 dbd-sqlite3
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index a4b6c90aa08..118045015e2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -14,6 +14,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "closure-common" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closure-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-common.nix {
+         inherit fetchurl;
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
   "documentation-utils" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."documentation-utils" or (x: {}))
@@ -23,6 +33,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cxml-xml" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-xml" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-xml.nix {
+         inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+       }));
+
+
   "babel-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."babel-streams" or (x: {}))
@@ -153,6 +174,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "chunga" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."chunga" or (x: {}))
@@ -181,24 +210,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "closure-common" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closure-common" or (x: {}))
-       (import ./quicklisp-to-nix-output/closure-common.nix {
-         inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
-         inherit fetchurl;
-       }));
-
-
   "cxml-test" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml-test" or (x: {}))
@@ -210,6 +221,24 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cxml-klacks" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-klacks" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
+  "cxml-dom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-dom" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-dom.nix {
+         inherit fetchurl;
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+       }));
+
+
   "zpb-ttf" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."zpb-ttf" or (x: {}))
@@ -310,6 +339,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cffi-grovel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "let-plus" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."let-plus" or (x: {}))
@@ -334,6 +372,24 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "lack-middleware-backtrace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-middleware-backtrace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "lack-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-util.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+       }));
+
+
   "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-gray-streams" or (x: {}))
@@ -508,6 +564,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
@@ -832,6 +891,22 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -870,35 +945,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cxml-xml" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-xml" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-xml.nix {
-         inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-       }));
-
-
-  "cxml-klacks" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-klacks" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
-  "cxml-dom" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-dom" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-dom.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
   "cxml" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml" or (x: {}))
@@ -1070,6 +1116,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-ppcre-unicode" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ppcre-unicode" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ppcre-unicode.nix {
+         inherit fetchurl;
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+       }));
+
+
   "cl-ppcre-template" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-ppcre-template" or (x: {}))
@@ -1268,6 +1323,24 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "marshal" = quicklisp-to-nix-packages."marshal";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1276,6 +1349,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1297,48 +1376,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cffi-uffi-compat" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-uffi-compat" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-uffi-compat.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cffi-toolchain" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-toolchain" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cffi-libffi" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-libffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-libffi.nix {
-         inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
-  "cffi-grovel" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-grovel" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
-  "cffi-examples" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-examples" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-examples.nix {
-         inherit fetchurl;
-       }));
-
-
   "cffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cffi" or (x: {}))
@@ -1405,31 +1442,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "3bmd-youtube" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."3bmd-youtube" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd-youtube.nix {
-         inherit fetchurl;
-           "esrap" = quicklisp-to-nix-packages."esrap";
-       }));
-
-
-  "3bmd-ext-wiki-links" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."3bmd-ext-wiki-links" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd-ext-wiki-links.nix {
-         inherit fetchurl;
-       }));
-
-
-  "3bmd-ext-tables" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."3bmd-ext-tables" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd-ext-tables.nix {
-         inherit fetchurl;
-       }));
-
-
   "3bmd" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."3bmd" or (x: {}))
@@ -1441,4 +1453,7 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-}; in quicklisp-to-nix-packages
+} // qlAliases {inherit quicklisp-to-nix-packages;};
+qlAliases = import ./quicklisp-to-nix-aliases.nix;
+in
+   quicklisp-to-nix-packages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index a798a452365..3b71ade03f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -18,8 +18,13 @@ rec {
     postInstall = ''
       find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]asd${"$"}' |
         while read f; do
-          CL_SOURCE_REGISTRY= \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
             "$out"/bin/*-lisp-launcher.sh ||
           mv "$f"{,.sibling}; done || true
     '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
index 2cbe73c89ca..95b60df0d01 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
@@ -8,4 +8,7 @@ let quicklisp-to-nix-packages = rec {
 <% @loop invocations %>
 <% @var code %>
 <% @endloop %>
-}; in quicklisp-to-nix-packages
+} // qlAliases {inherit quicklisp-to-nix-packages;};
+qlAliases = import ./quicklisp-to-nix-aliases.nix;
+in
+   quicklisp-to-nix-packages

From d3ef8dc63353736679c10bbcc879b3a5252fe237 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 6 Apr 2017 21:03:15 +0200
Subject: [PATCH 0723/1744] gitlab: 8.17.4 -> 8.17.5

Fixes security issues:

  https://about.gitlab.com/2017/04/05/gitlab-9-dot-0-dot-4-security-release/
---
 pkgs/applications/version-management/gitlab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index f04d0c89da3..442edc04fa2 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
     };
   };
 
-  version = "8.17.4";
+  version = "8.17.5";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "1fd6y9lyavzsm2ac10sip01dnvcd73ymcn2rqdljr4sq4f222mry";
+    sha256 = "1ga5ki1bh66sdk5yizjy0dqcg85hrzkdp0ag3si942yv28sjy1xk";
   };
 
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1yrbbf55pz7863xngl2mxwj9w4imdlqvmqywd1zpnswdsjqxa5xj";
+    sha256 = "0wvszxm28c80qwx6np5mi36saxzzg4n7jcp4ckvhhr3jvczn9m8g";
   };
 
   patches = [

From b70b1b1f0653ef00205168fda29301c389d3d76b Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Thu, 6 Apr 2017 15:25:03 -0500
Subject: [PATCH 0724/1744] shotwell: 0.25.90 -> 0.26.0

Simple version bump.
---
 pkgs/applications/graphics/shotwell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 8cd1a04e977..0c77857e66b 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  major = "0.25";
-  minor = "90";
+  major = "0.26";
+  minor = "0";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "1xlywhwr27n2q7xid19zzgf6rmmiyf4jq62rxn2af2as8rpkf1pm";
+    sha256 = "090hvw9qcfs3irh05aji7pqh50j4v6xpwmsbl3r11svik7ag8p9h";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

From e94437d1ed7616f0e3dfa90498d81e191652cba8 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Wed, 1 Mar 2017 11:20:14 +0100
Subject: [PATCH 0725/1744] mopidy: Add gst-plugins-bad to buildInputs

Needed for processing .m4a files.
---
 pkgs/applications/audio/mopidy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 856da9f742e..7dae614a8f7 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   buildInputs = with gst_all_1; [
-    gst-plugins-base gst-plugins-good gst-plugins-ugly
+    gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
     glib_networking gobjectIntrospection
   ];
 

From bde6e3da6f19f75a2b1f44094fabc7139be63c6d Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Sat, 1 Apr 2017 13:10:32 +1300
Subject: [PATCH 0726/1744] Fix geoclue build on Darwin

---
 pkgs/development/libraries/geoclue/2.0.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 0c22cc9ff9f..8cc06f9269e 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -1,7 +1,9 @@
-{ fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip
+{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip
 , dbus, dbus_glib, modemmanager, avahi
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "geoclue-2.4.3";
 
@@ -10,23 +12,31 @@ stdenv.mkDerivation rec {
     sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd";
   };
 
-  buildInputs =
+  buildInputs = libintlOrEmpty ++
    [ intltool pkgconfig glib json_glib libsoup geoip
-     dbus dbus_glib modemmanager avahi
-   ];
+     dbus dbus_glib avahi
+   ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
 
   preConfigure = ''
      substituteInPlace configure --replace "-Werror" ""
   '';
 
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++
+                   optionals stdenv.isDarwin [
+                       "--disable-silent-rules"
+                       "--disable-3g-source"
+                       "--disable-cdma-source"
+                       "--disable-modem-gps-source"
+                       "--disable-nmea-source" ];
+
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
 
   propagatedBuildInputs = [ dbus dbus_glib glib ];
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
     maintainers = with maintainers; [ raskin garbas ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl2;
   };
 }

From aa31d4b803c50d727b24bfd5a24176f067490f9a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 20:13:23 -0400
Subject: [PATCH 0727/1744] cups: fix on Darwin

Kinda fix, anyway. Enough to proceed with other stuff :)
---
 pkgs/misc/cups/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index a8f7d00b6b6..1f8e559b415 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
     "--disable-launchd"
   ];
 
+  # XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693
+  preBuild = if stdenv.isDarwin then ''
+    export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
+  '' else null;
+
   installFlags =
     [ # Don't try to write in /var at build time.
       "CACHEDIR=$(TMPDIR)/dummy"
@@ -109,6 +114,6 @@ stdenv.mkDerivation rec {
     description = "A standards-based printing system for UNIX";
     license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
     maintainers = with maintainers; [ jgeerds ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 6b1957d17ae687f7db09db63667fa6f2cc40990b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 21:00:28 -0400
Subject: [PATCH 0728/1744] qt5: fix to work on LLVM 4

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
---
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 4 ++--
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index dae1139d961..b26fc7faf9d 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
       sed -i \
           -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
           -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
-          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
+          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
           -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
           -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
           -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
@@ -208,7 +208,7 @@ stdenv.mkDerivation {
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
-    DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+    DiskArbitration darwin.cf-private libiconv
   ]);
 
   buildInputs =
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index f881c76c3ad..9642b613677 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       sed -i \
           -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
           -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
-          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
+          -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
           -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
           -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
           -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
@@ -212,7 +212,7 @@ stdenv.mkDerivation {
     xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
-    DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+    DiskArbitration darwin.cf-private libiconv
   ]);
 
   buildInputs = [ ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8335e54a02e..26187bf7e55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9446,7 +9446,7 @@ with pkgs;
     inherit newScope;
     inherit stdenv fetchurl makeSetupHook makeWrapper;
     bison = bison2; # error: too few arguments to function 'int yylex(...
-    cups = if stdenv.isLinux then cups else null;
+    inherit cups;
     harfbuzz = harfbuzz-icu;
     mesa = mesa_noglu;
     inherit perl;
@@ -9459,7 +9459,7 @@ with pkgs;
     inherit newScope;
     inherit stdenv fetchurl makeSetupHook makeWrapper;
     bison = bison2; # error: too few arguments to function 'int yylex(...
-    cups = if stdenv.isLinux then cups else null;
+    inherit cups;
     harfbuzz = harfbuzz-icu;
     mesa = mesa_noglu;
     inherit perl;

From 6e58719b1b6aa92cd2be1acde768dbc27375ab65 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 21:09:32 -0400
Subject: [PATCH 0729/1744] nano: fix on Darwin

The latest update broke it
---
 pkgs/applications/editors/nano/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 3d089c1cec1..f3a5a27bd36 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -36,6 +36,11 @@ in stdenv.mkDerivation rec {
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}
     ${optionalString enableTiny "--enable-tiny"}
+  ''
+  # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available
+  # during configure but then can't find it at build time.
+    + optionalString stdenv.isDarwin ''
+    nano_cv_flag_reg_extended=REG_EXTENDED
   '';
 
   postPatch = optionalString stdenv.isDarwin ''

From f50258bba59c125e9a35102b1f6b7ace186786c9 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 6 Apr 2017 21:17:25 -0400
Subject: [PATCH 0730/1744] vscode: 1.10.2 -> 1.11.1

---
 pkgs/applications/editors/vscode/default.nix | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index c4664060214..bdd8bd44167 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,24 +2,28 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.10.2";
-  rev = "8076a19fdcab7e1fc1707952d652f0bb6c6db331";
+  version = "1.11.1";
+  rev = "d9484d12b38879b7f4cdd1150efeb2fd2c1fbf39";
   channel = "stable";
 
-  # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
-  # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
+  # The revision and build timestamps can be obtained with the following
+  # command (see https://github.com/NixOS/nixpkgs/issues/22465):
+  # for a in x64 ia32; do
+  #   curl -w "%{url_effective}\n" -I -L -s -S -o /dev/null \
+  #     "https://vscode-update.azurewebsites.net/latest/linux-${arch}/stable" \
+  # done
 
-  sha256 = if stdenv.system == "i686-linux"    then "1rhwrpv17c8j06qja7i58cggzka8jm9v9h27jy22z30yxjz0p241"
-      else if stdenv.system == "x86_64-linux"  then "1c1w7wc39a5vdap8j143ym976p9l9iwns1y28mcgjwrihdlb5wb8"
-      else if stdenv.system == "x86_64-darwin" then "1zznsn84k79lqirzv950q7caq7c88yh2gglwjc11y8k69awmlpva"
+  sha256 = if stdenv.system == "i686-linux"    then "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94"
+      else if stdenv.system == "x86_64-linux"  then "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc"
+      else if stdenv.system == "x86_64-darwin" then "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-${channel}-code_${version}-1488982317_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1491487843_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1488981323_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1491486998_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";

From 6f0a2af5bccc4f53ae1874ad9aa6103c8cb752f3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 21:17:32 -0400
Subject: [PATCH 0731/1744] brotli: fix on Darwin

---
 pkgs/tools/compression/brotli/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 92180216671..111d4125684 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ];
 
+  # This breaks on Darwin because our cmake hook tries to make a build folder
+  # and the wonderful bazel BUILD file is already there (yay case-insensitivty?)
+  prePatch = "rm BUILD";
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
 

From 4a79bf0e844fd465cc1b5ea6838d14963f25f7ef Mon Sep 17 00:00:00 2001
From: Andrew Abbott <mirrexagon@mirrexagon.com>
Date: Fri, 7 Apr 2017 11:47:39 +1000
Subject: [PATCH 0732/1744] textadept: 9.0 -> 9.3

---
 .../editors/textadept/default.nix             | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 1e24054b996..db171f49950 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -43,11 +43,11 @@ let
 
 
   # These lists are taken from the Makefile.
-  scintilla_tgz  = "scintilla367.tgz";
+  scintilla_tgz  = "scintilla373.tgz";
   tre_zip        = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip";
   scinterm_zip   = "scinterm_1.8.zip";
-  scintillua_zip = "scintillua_3.6.7-1.zip";
-  lua_tgz        = "lua-5.3.3.tar.gz";
+  scintillua_zip = "33298b6cbce3.zip";
+  lua_tgz        = "lua-5.3.4.tar.gz";
   lpeg_tgz       = "lpeg-1.0.0.tar.gz";
   lfs_zip        = "v_1_6_3.zip";
   lspawn_zip     = "lspawn_1.5.zip";
@@ -60,7 +60,8 @@ let
 
   scinterm_url   = "http://foicica.com/scinterm/download/" + scinterm_zip;
   tre_url        = "https://github.com/laurikari/tre/archive/" + tre_zip;
-  scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip;
+  #scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip;
+  scintillua_url = "http://foicica.com/hg/scintillua/archive/" + scintillua_zip;
   gtdialog_url   = "http://foicica.com/gtdialog/download/" + gtdialog_zip;
   lspawn_url     = "http://foicica.com/lspawn/download/" + lspawn_zip;
 
@@ -75,11 +76,11 @@ let
   termkey_url    = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz;
 
 
-  get_scintilla   = get_url scintilla_url   "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi";
+  get_scintilla   = get_url scintilla_url   "0rkczxzj6bqxks4jcbxbyrarjhfjh95nwxxiqprfid1kaamgkfm2";
   get_tre         = get_url tre_url         "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7";
   get_scinterm    = get_url scinterm_url    "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi";
-  get_scintillua  = get_url scintillua_url  "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq";
-  get_lua         = get_url lua_url         "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si";
+  get_scintillua  = get_url scintillua_url  "1kx113dpjby1p9jcsqlnlzwj01z94f9szw4b38077qav3bj4lk6g";
+  get_lua         = get_url lua_url         "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
   get_lpeg        = get_url lpeg_url        "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h";
   get_lfs         = get_url_zip lfs_url     "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri";
   get_lspawn      = get_url lspawn_url      "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi";
@@ -108,7 +109,7 @@ let
     + get_termkey;
 in
 stdenv.mkDerivation rec {
-  version = "9.0";
+  version = "9.3";
   name = "textadept-${version}";
 
   buildInputs = [
@@ -118,7 +119,7 @@ stdenv.mkDerivation rec {
   src = fetchhg {
     url = http://foicica.com/hg/textadept;
     rev = "textadept_${version}";
-    sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi";
+    sha256 = "18x79pazm86agn1khdxfnf87la6kli3xasi7dcjx7l6yyz19y14d";
   };
 
   preConfigure = ''

From 4a08528b4aad94332006ad4c190c3f2fa207d630 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 6 Apr 2017 22:18:18 -0400
Subject: [PATCH 0733/1744] vscode: Revamp URL generation scheme

This ought to be way easier to maintain! Now just the version number
and sha256 hashes need to be updated for an update, and there are no
more manual cmdline steps to get version hashes and timestamps.

Related to #22465
---
 pkgs/applications/editors/vscode/default.nix | 34 ++++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index bdd8bd44167..a2854208a49 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -3,37 +3,29 @@
 
 let
   version = "1.11.1";
-  rev = "d9484d12b38879b7f4cdd1150efeb2fd2c1fbf39";
   channel = "stable";
 
-  # The revision and build timestamps can be obtained with the following
-  # command (see https://github.com/NixOS/nixpkgs/issues/22465):
-  # for a in x64 ia32; do
-  #   curl -w "%{url_effective}\n" -I -L -s -S -o /dev/null \
-  #     "https://vscode-update.azurewebsites.net/latest/linux-${arch}/stable" \
-  # done
+  plat = {
+    "i686-linux" = "linux-ia32";
+    "x86_64-linux" = "linux-x64";
+    "x86_64-darwin" = "darwin";
+  }.${stdenv.system};
 
-  sha256 = if stdenv.system == "i686-linux"    then "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94"
-      else if stdenv.system == "x86_64-linux"  then "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc"
-      else if stdenv.system == "x86_64-darwin" then "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6"
-      else throw "Unsupported system: ${stdenv.system}";
+  sha256 = {
+    "i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94";
+    "x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc";
+    "x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6";
+  }.${stdenv.system};
 
-  urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
+  archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
 
-  urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-${channel}-code_${version}-1491487843_i386.tar.gz"
-      else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1491486998_amd64.tar.gz"
-      else if stdenv.system == "x86_64-darwin" then
-        urlBase + "VSCode-darwin-${channel}.zip"
-      else throw "Unsupported system: ${stdenv.system}";
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
-    inherit version;
 
     src = fetchurl {
-      url = urlStr;
+      name = "VSCode_${version}_${plat}.${archive_fmt}";
+      url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}";
       inherit sha256;
     };
 

From 5b6b1100f303190604f919d1a0dfde21e1e3856a Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 6 Apr 2017 20:12:20 -0700
Subject: [PATCH 0734/1744] ffmpeg-full: replace SDL support with SDL2 support

ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 47fcd76240b..9a5c228ac82 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -110,7 +110,7 @@
 #, libquvi ? null # Quvi input support
 , samba ? null # Samba protocol
 #, schroedinger ? null # Dirac de/encoder
-, SDL ? null
+, SDL2 ? null
 #, shine ? null # Fixed-point MP3 encoder
 , soxr ? null # Resampling via soxr
 , speex ? null # Speex de/encoder
@@ -199,7 +199,7 @@ assert ffplayProgram -> avcodecLibrary
                      && avformatLibrary
                      && swscaleLibrary
                      && swresampleLibrary
-                     && SDL != null;
+                     && SDL2 != null;
 assert ffprobeProgram -> avcodecLibrary && avformatLibrary;
 assert ffserverProgram -> avformatLibrary;
 /*
@@ -368,7 +368,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (schroedinger != null) "libschroedinger")
     #(enableFeature (shine != null) "libshine")
     (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient")
-    (enableFeature (SDL != null) "sdl") # Only configurable since 2.5, auto detected before then
+    (enableFeature (SDL2 != null) "sdl2")
     (enableFeature (soxr != null) "libsoxr")
     (enableFeature (speex != null) "libspeex")
     #(enableFeature (twolame != null) "libtwolame")
@@ -401,7 +401,7 @@ stdenv.mkDerivation rec {
     libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
     libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
-    samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
+    samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
   ] ++ optional openglExtlib mesa
     ++ optionals x11grabExtlib [ libXext libXfixes ]
     ++ optionals nonfreeLicensing [ fdk_aac openssl ]

From 0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 23:20:35 -0400
Subject: [PATCH 0735/1744] gcc6: fix for LLVM 4.0

---
 .../gcc/6/darwin-const-correct.patch          | 25 +++++++++++++++++++
 pkgs/development/compilers/gcc/6/default.nix  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/6/darwin-const-correct.patch

diff --git a/pkgs/development/compilers/gcc/6/darwin-const-correct.patch b/pkgs/development/compilers/gcc/6/darwin-const-correct.patch
new file mode 100644
index 00000000000..a9b9b85acab
--- /dev/null
+++ b/pkgs/development/compilers/gcc/6/darwin-const-correct.patch
@@ -0,0 +1,25 @@
+From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001
+From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 3 Jan 2017 05:36:40 +0000
+Subject: [PATCH] 	* config/darwin-driver.c (darwin_driver_init):
+ Const-correctness 	fixes for first_period and second_period variables.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
+index 0c4f0cd..e3ed79d 100644
+--- a/gcc/config/darwin-driver.c
++++ b/gcc/config/darwin-driver.c
+@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count,
+   if (vers_string != NULL)
+     {
+       char *asm_major = NULL;
+-      char *first_period = strchr(vers_string, '.');
++      const char *first_period = strchr(vers_string, '.');
+       if (first_period != NULL)
+ 	{
+-	  char *second_period = strchr(first_period+1, '.');
++	  const char *second_period = strchr(first_period+1, '.');
+ 	  if (second_period  != NULL)
+ 	    asm_major = xstrndup (vers_string, second_period-vers_string);
+ 	  else
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index c6fac16a76c..b4e588f6b14 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -73,7 +73,8 @@ let version = "6.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
+      ++ optional stdenv.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

From 1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 23:33:14 -0400
Subject: [PATCH 0736/1744] podofo: fix on LLVM 4

Not sure if the things I made optional on Darwin are really worth keeping
at all, but I don't have a Linux box handy so I'm minimizing potential
damage.
---
 pkgs/development/libraries/podofo/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 5f5dcfb71e6..1ba82354033 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
-  nativeBuildInputs = [ cmake gcc5 pkgconfig ];
-  buildInputs = [ lua5 stdenv.cc.libc ];
+
+  # Does Linux really need gcc5? Darwin doesn't seem to...
+  nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
+
+  # Does Linux really need libc here? Darwin doesn't seem to...
+  buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
 
   crossAttrs = {
     propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv

From 987cafe5e041489ef530b4f8c55d0d5080e1de3e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 6 Apr 2017 23:35:49 -0400
Subject: [PATCH 0737/1744] vscode: Add libxkbfile to rpath

Otherwise vscode complains about it.
---
 pkgs/applications/editors/vscode/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index a2854208a49..b6734d09d0e 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
-  makeWrapper, libXScrnSaver }:
+  makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
   version = "1.11.1";
@@ -19,6 +19,13 @@ let
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
 
+  rpath = lib.concatStringsSep ":" [
+    atomEnv.libPath
+    "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
+    "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"
+    "$out/lib/vscode"
+  ];
+
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
@@ -41,7 +48,7 @@ in
 
     buildInputs = if stdenv.system == "x86_64-darwin"
       then [ unzip makeWrapper libXScrnSaver ]
-      else [ makeWrapper libXScrnSaver ];
+      else [ makeWrapper libXScrnSaver libxkbfile ];
 
     installPhase =
       if stdenv.system == "x86_64-darwin" then ''
@@ -63,7 +70,7 @@ in
     postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1:$out/lib/vscode" \
+        --set-rpath "${rpath}" \
         $out/lib/vscode/code
     '';
 

From 40d46f9ca4066ed52b023b2e9a5054aa68fcf097 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Sun, 2 Apr 2017 14:12:24 +0200
Subject: [PATCH 0738/1744] Kodi: use kodi fork of libdvdnav/libdvdread. Fix
 #24153 (dvd playback)

---
 pkgs/applications/video/kodi/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 9c421e0c828..10656af4ef4 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -43,6 +43,15 @@ let
     url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
     sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
   };
+  # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
+  libdvdnav_src = fetchurl {
+    url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz";
+    sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d";
+  };
+  libdvdread_src = fetchurl {
+    url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz";
+    sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
+  };
 in stdenv.mkDerivation rec {
     name = "kodi-${version}";
     version = "17.1";
@@ -92,8 +101,8 @@ in stdenv.mkDerivation rec {
         --replace "/bin/bash" "${bash}/bin/bash -ex"
       cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
       ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
-      ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
-      ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
+      cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
+      cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
     '';
 
     preConfigure = ''

From c865b8e35e364e1193770243bc4b41e8178b1982 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 7 Apr 2017 01:28:44 +0200
Subject: [PATCH 0739/1744] haskell: add the linkWithGold function to link
 packages with ld.gold

Also support linking the double-conversion package with ld.gold.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 pkgs/development/haskell-modules/lib.nix                  | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d84db527951..643f71f9f87 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -171,7 +171,13 @@ self: super: {
     else dontCheck super.fsnotify;
 
   double-conversion = if !pkgs.stdenv.isDarwin
-    then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib
+    then addExtraLibrary
+           # https://github.com/bos/double-conversion/pull/17
+           (appendPatch super.double-conversion (pkgs.fetchpatch {
+              url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch";
+              sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9";
+           }))
+           pkgs.stdenv.cc.cc.lib
     else addExtraLibrary (overrideCabal super.double-conversion (drv:
       {
         postPatch = ''
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 912d26c806c..f88f2f2cf54 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -79,6 +79,9 @@ rec {
     fixupPhase = ":";
   });
 
+  linkWithGold = drv : appendConfigureFlag drv
+    "--ghc-option=-optl-fuse-ld=gold --ld-option=-fuse-ld=gold --with-ld=ld.gold";
+
   # link executables statically against haskell libs to reduce closure size
   justStaticExecutables = drv: overrideCabal drv (drv: {
     enableSharedExecutables = false;

From b52a3d90fee2f096a8be8cc93abe2cdfe33eab52 Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Fri, 7 Apr 2017 12:19:19 +0200
Subject: [PATCH 0740/1744] robomongo: 0.8.4 -> 0.9.0

---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/misc/robomongo/default.nix  | 51 +++++++++++-----
 .../misc/robomongo/robomongo.patch            | 61 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 38 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/applications/misc/robomongo/robomongo.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c3ab790e7c7..173aeebe5fe 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -160,6 +160,7 @@
   eleanor = "Dejan Lukan <dejan@proteansec.com>";
   elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
+  eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
   ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 41de15bca51..cb100fa6fc6 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -1,29 +1,50 @@
-{ stdenv, fetchurl, qtbase, openssl, boost, cmake, scons, python, pcre, bzip2 }:
+{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, freetype, xkeyboard_config, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "robomongo-0.8.4";
+  name = "robomongo-0.9.0";
 
   src = fetchurl {
-    url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz;
-    sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc";
+    url = "https://download.robomongo.org/0.9.0/linux/robomongo-0.9.0-linux-x86_64-0786489.tar.gz";
+    sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad";
   };
 
-  patches = [ ./robomongo.patch ];
+  ldLibraryPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc
+    zlib
+    glib
+    xorg.libXi
+    xorg.libxcb
+    xorg.libXrender
+    xorg.libX11
+    xorg.libSM
+    xorg.libICE
+    xorg.libXext
+    dbus
+    fontconfig
+    freetype
+  ];
 
-  postPatch = ''
-    rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file
+  buildInputs = [makeWrapper];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin
+
+    mkdir -p $out/lib
+    cp -r lib/* $out/lib
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/robomongo
+
+    wrapProgram $out/bin/robomongo \
+      --suffix LD_LIBRARY_PATH : $ldLibraryPath \
+      --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
   '';
 
-  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
-
-  buildInputs = [ cmake boost scons qtbase openssl python pcre bzip2 ];
-
   meta = {
-    homepage = "http://robomongo.org/";
+    homepage = "https://robomongo.org/";
     description = "Query GUI for mongodb";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.amorsillo ];
-    broken = true;
+    maintainers = [ stdenv.lib.maintainers.eperuffo ];
   };
 }
diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch
deleted file mode 100644
index 3de6e940d9f..00000000000
--- a/pkgs/applications/misc/robomongo/robomongo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
-Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
-Fix typo in cmakelists
-Add stdint.h include to mongo driver src
-diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
---- robomongo-0.8.3/CMakeLists.txt	2013-10-01 10:55:00.000000000 -0400
-+++ robomongo-0.8.3-patched/CMakeLists.txt	2013-12-06 12:22:06.070659856 -0500
-@@ -133,7 +133,7 @@ ELSE()
- ENDIF()
- 
- ##################################DEFAULT VALUES##########################################
--IF(NOT CMAKE_INSTALL_PREFIX})
-+IF(NOT CMAKE_INSTALL_PREFIX)
-     SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
- ENDIF()
- 
-diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
---- robomongo-0.8.3/src/robomongo/gui/AppStyle.h	2013-10-01 10:55:00.000000000 -0400
-+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h	2013-12-06 12:20:57.417297186 -0500
-@@ -8,13 +8,8 @@
-     #include <QProxyStyle>
-     typedef QProxyStyle OsStyle;
- #elif defined OS_LINUX
--    #if !defined(QT_NO_STYLE_GTK)
--        #include <QProxyStyle>
--        typedef QProxyStyle OsStyle;
--    #else
--        #include <QCleanlooksStyle>
--        typedef QCleanlooksStyle OsStyle;
--    #endif
-+    #include <QProxyStyle>
-+    typedef QProxyStyle OsStyle;
- #endif
- 
- namespace Robomongo
-
-diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
---- robomongo-0.8.3/src/third-party/mongodb/SConstruct	2013-10-01 10:55:00.000000000 -0400
-+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct	2013-12-06 12:21:45.705255731 -0500
-@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
- 
- justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
- 
--env = Environment( BUILD_DIR=variantDir,
-+env = Environment( ENV=os.environ,
-+                   BUILD_DIR=variantDir,
-                    CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
-                    CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
-                    CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
-
-diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h
---- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h	2013-12-13 12:56:35.000000000 -0500
-+++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h	2014-08-20 18:16:31.788396489 -0400
-@@ -39,6 +39,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
-+#include <stdint.h>
- 
- #include "time.h"
- #include "string.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26187bf7e55..4763f4a5f26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18021,7 +18021,7 @@ with pkgs;
 
   redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
 
-  robomongo = libsForQt5.callPackage ../applications/misc/robomongo { };
+  robomongo = callPackage ../applications/misc/robomongo { };
 
   rucksack = callPackage ../development/tools/rucksack { };
 

From 370452ef41eca6facdcb7d5a2728b33834694ff4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 7 Apr 2017 12:42:31 +0200
Subject: [PATCH 0741/1744] scalafmt: 0.6.7 -> 0.6.8 (#24699)

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index b0d02cb8233..dc7f96ea8a0 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.7";
+  version = "0.6.8";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "122x4a5x8024s7qqqs7vx8kz1x18q2l6alcvpzvsqkc304ybhfmh";
+    sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2";
   };
 
   unpackPhase = "tar xvzf $src";

From 668777f01d670a2bbc56a07511664dff58af277d Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Fri, 7 Apr 2017 13:40:27 +0200
Subject: [PATCH 0742/1744] robomongo: add desktop entry

---
 pkgs/applications/misc/robomongo/default.nix | 87 +++++++++++++-------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index cb100fa6fc6..1516e827c5e 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -1,13 +1,7 @@
-{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, freetype, xkeyboard_config, makeWrapper }:
-
-stdenv.mkDerivation {
-  name = "robomongo-0.9.0";
-
-  src = fetchurl {
-    url = "https://download.robomongo.org/0.9.0/linux/robomongo-0.9.0-linux-x86_64-0786489.tar.gz";
-    sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad";
-  };
+{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
+  freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
+let
   ldLibraryPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc
     zlib
@@ -24,27 +18,56 @@ stdenv.mkDerivation {
     freetype
   ];
 
-  buildInputs = [makeWrapper];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
-
-    mkdir -p $out/lib
-    cp -r lib/* $out/lib
-
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/robomongo
-
-    wrapProgram $out/bin/robomongo \
-      --suffix LD_LIBRARY_PATH : $ldLibraryPath \
-      --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
-  '';
-
-  meta = {
-    homepage = "https://robomongo.org/";
-    description = "Query GUI for mongodb";
-    platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.eperuffo ];
+  icon = fetchurl {
+    url = "https://github.com/Studio3T/robomongo/raw/v0.9.0/trash/install/linux/robomongo.png";
+    sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
   };
-}
+in
+  stdenv.mkDerivation {
+    name = "robomongo-0.9.0";
+
+    src = fetchurl {
+      url = "https://download.robomongo.org/0.9.0/linux/robomongo-0.9.0-linux-x86_64-0786489.tar.gz";
+      sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad";
+    };
+
+    desktopItem = makeDesktopItem {
+      name = "robomongo";
+      exec = "robomongo";
+      icon = icon;
+      comment = "Query GUI for mongodb";
+      desktopName = "Robomongo";
+      genericName = "MongoDB management tool";
+      categories = "Development;IDE;mongodb;";
+    };
+
+    buildInputs = [makeWrapper];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp bin/* $out/bin
+
+      mkdir -p $out/lib
+      cp -r lib/* $out/lib
+
+      mkdir -p $out/share/applications
+      cp $desktopItem/share/applications/* $out/share/applications
+
+      mkdir -p $out/share/icons
+      cp ${icon} $out/share/icons/robomongo.png
+
+      patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/robomongo
+
+      wrapProgram $out/bin/robomongo \
+        --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
+        --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
+    '';
+
+    meta = {
+      homepage = "https://robomongo.org/";
+      description = "Query GUI for mongodb";
+      platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = [ stdenv.lib.maintainers.eperuffo ];
+    };
+  }

From 892fd83ec8ecbb0be1b4e2074f975a705e40d0b1 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 11 Feb 2017 22:37:53 +1100
Subject: [PATCH 0743/1744] nix-update-source: init at 0.4.0

---
 .../nix-update-source/default.nix             | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-update-source/default.nix

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
new file mode 100644
index 00000000000..a156c4f8a72
--- /dev/null
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -0,0 +1,46 @@
+{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
+python3Packages.buildPythonApplication rec {
+  version = "0.4.0";
+  name = "nix-update-source-${version}";
+  src = fetchFromGitHub {
+    owner = "timbertson";
+    repo = "nix-update-source";
+    rev = "version-0.4.0";
+    sha256 = "0gz0f7nx1q697s16ya7q84q1cj020n547k2ffb99ds2r40nckr2g";
+  };
+  propagatedBuildInputs = [ nix-prefetch-scripts ];
+  passthru = {
+    # NOTE: `fetch` should not be used within nixpkgs because it
+    # uses a non-idiomatic structure. It is provided for use by
+    # out-of-tree nix derivations.
+    fetch = path:
+      let
+        fetchers = {
+          # whitelist of allowed fetchers
+          inherit (pkgs) fetchgit fetchurl fetchFromGitHub;
+        };
+        json = lib.importJSON path;
+        fetchFn = builtins.getAttr json.fetch.fn fetchers;
+        src = fetchFn json.fetch.args;
+      in
+      json // json.fetch // { inherit src; };
+    updateScript = ''
+      set -e
+      echo
+      cd ${toString ./.}
+      ${pkgs.nix-update-source}/bin/nix-update-source \
+        --prompt version \
+        --replace-attr version \
+        --set owner timbertson \
+        --set repo nix-update-source \
+        --set type fetchFromGitHub \
+        --set rev 'version-{version}' \
+        --modify-nix default.nix
+    '';
+  };
+  meta = {
+    description = "Utility to automate updating of nix derivation sources";
+    maintainers = with lib.maintainers; [ timbertson ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7b5cd5599..f77cde6c0ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17635,6 +17635,8 @@ with pkgs;
     nix-prefetch-zip
     nix-prefetch-scripts;
 
+  nix-update-source = callPackage ../tools/package-management/nix-update-source {};
+
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
 
   nix-repl = callPackage ../tools/package-management/nix-repl { };

From 4c718a9a5a73be55ff2c4fe043e7f7a9b748a2d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 7 Apr 2017 08:22:04 -0400
Subject: [PATCH 0744/1744] sbt: 0.13.13 -> 0.13.14

---
 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 e6006e94881..309a6e13606 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.13";
+  version = "0.13.14";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20";
+    sha256 = "1q4jnrva21s0rhcn561ayfp5yhd6rpxidgx6f4i5n3dla3p9zkr9";
   };
 
   patchPhase = ''

From 27cec397b1229d6341de52ab878bad80c175c555 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 7 Apr 2017 08:23:08 -0400
Subject: [PATCH 0745/1744] itk: 4.10 -> 4.11

Also includes a patch to work against clang 4, which was my original
motivation for the 4.10 -> 4.11 upgrade (since it fixed another issue)
---
 pkgs/development/libraries/itk/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 7e3220d8a37..3865aa226f9 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,13 +1,20 @@
-{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
+{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
 
 stdenv.mkDerivation rec {
-  name = "itk-4.10.0";
+  name = "itk-4.11.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz;
-    sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a";
+    url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
+    sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
   };
 
+  # 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 9ef5fd41892c83f905425187c409d0addc23faa7 Mon Sep 17 00:00:00 2001
From: xNWDD <xNWDD@users.noreply.github.com>
Date: Fri, 7 Apr 2017 14:52:46 +0200
Subject: [PATCH 0746/1744] gitkraken: 2.3.1 -> 2.3.3 (#24684)

* gitkraken: 2.3.1 -> 2.3.2

* gitkraken: 2.3.2 -> 2.3.3
---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 076a78bd5b6..b02da41f9d6 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.3.1";
+  version = "2.3.3";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "ddb9eec34232e830646633c43bc9adc61afa0eee79500af29918b62780093b2a";
+    sha256 = "a6e235ab1a4c1da755af8218ad819fcac6bc89b1a324aa2c0e430f3805cb1a16";
   };
 
   libPath = makeLibraryPath [

From 20d3ad5e9c5df6b4fa4813822627790f3cced1d9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 7 Apr 2017 17:59:54 +0200
Subject: [PATCH 0747/1744] mktorrent: 1.0 -> 1.1

[1.1] - 2017-01-11
Added
- Autodetect the number of CPUs available <esmil@mailme.dk>
- Option for source string added to torrent info (`-s`), included in infohash.
  Often used by private trackers to create a unique infohash to prevent
  peer-leak and the possibility to track the trackers that do use leaked
  torrents. Having this option in mktorrent make it possible to create a
  infohash accurate torrent to the tracker you want to upload it to
Changed
- Make`-a` (announce list) optional
- Optional announce URL even for private torrents. No need to require announce
  for private torrents, they are added by most private trackers anyway and they
  modify the infohash so you'd have to redownload their modified torrent with
  injected unique announce URL anyway. (@mathieui, fix from @jrwren)
Fixed
- DHT makes trackers optional, so remove the warning
---
 pkgs/tools/misc/mktorrent/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index c62bd45fef8..0e1d3b8f49f 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,11 +1,14 @@
-{stdenv, fetchurl, openssl}:
+{stdenv, fetchFromGitHub, openssl}:
 
-stdenv.mkDerivation {
-  name = "mktorrent-1.0";
+stdenv.mkDerivation rec {
+  name = "mktorrent-${version}";
+  version = "1.1";
 
-  src = fetchurl {
-    url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz;
-    sha256 = "17qi3nfky240pq6qcmf5qg324mxm83vk9r3nvsdhsvinyqm5d3kg";
+  src = fetchFromGitHub {
+    owner = "Rudde";
+    repo = "mktorrent";
+    rev = "v${version}";
+    sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
   };
 
   makeFlags = "USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1"
@@ -22,7 +25,6 @@ stdenv.mkDerivation {
     homepage = http://mktorrent.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Command line utility to create BitTorrent metainfo files";
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric profpatsch];
   };
 }

From 7a08e57b9e077dc5abcca090621fa688413832c3 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Thu, 6 Apr 2017 20:30:44 +0200
Subject: [PATCH 0748/1744] haskell: ghcjs packages: Break dependency cycle
 less invasive

Between cabal and hscolour.
---
 pkgs/development/compilers/ghcjs/head_stage2.nix       |  1 -
 pkgs/development/compilers/ghcjs/stage2.nix            |  1 -
 .../haskell-modules/configuration-ghcjs.nix            | 10 +++++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
index 5808891d430..d4247f51b3e 100644
--- a/pkgs/development/compilers/ghcjs/head_stage2.nix
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -382,7 +382,6 @@
         version = "1.24.0.0";
         src = "${ghcjsBoot}/boot/cabal/Cabal";
         doCheck = false;
-        hyperlinkSource = false;
         libraryHaskellDepends = [
           array base binary bytestring containers deepseq directory filepath
           pretty process time unix
diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix
index b88051113b5..8c68b6f15a6 100644
--- a/pkgs/development/compilers/ghcjs/stage2.nix
+++ b/pkgs/development/compilers/ghcjs/stage2.nix
@@ -327,7 +327,6 @@
         version = "1.22.8.0";
         src = "${ghcjsBoot}/boot/cabal/Cabal";
         doCheck = false;
-        hyperlinkSource = false;
         libraryHaskellDepends = [
           array base binary bytestring containers deepseq directory filepath
           pretty process time unix
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index d6d7277cc9d..fd7f15008d2 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -58,9 +58,13 @@ self: super:
   # Almost all packages require Cabal to build their Setup.hs,
   # but usually they don't declare it explicitly as they don't need to for normal GHC.
   # To account for that we add Cabal by default.
-  mkDerivation = args:
-    if args.pname == "Cabal" then super.mkDerivation args else super.mkDerivation (args //
-      { setupHaskellDepends = (args.setupHaskellDepends or []) ++ [ self.Cabal ]; });
+  mkDerivation = args: super.mkDerivation (args // {
+    setupHaskellDepends = (args.setupHaskellDepends or []) ++
+      (if args.pname == "Cabal" then [ ]
+      # Break the dependency cycle between Cabal and hscolour
+      else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ]
+      else [ self.Cabal ]);
+  });
 
 ## OTHER PACKAGES
 

From 0a15af2ed170b30636a264b6b535a9327effddc5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 7 Apr 2017 14:03:40 -0400
Subject: [PATCH 0749/1744] lib: Add composeExtensions for composing extension
 functions

---
 lib/trivial.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 40499b2b509..acbd687dd98 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -80,6 +80,15 @@ rec {
   # argument, but it's nice this way if several uses of `extends` are cascaded.
   extends = f: rattrs: self: let super = rattrs self; in super // f self super;
 
+  # Compose two extending functions of the type expected by 'extends'
+  # into one where changes made in the first are available in the
+  # 'super' of the second
+  composeExtensions =
+    f: g: self: super:
+      let fApplied = f self super;
+          super' = super // fApplied;
+      in fApplied // g self super';
+
   # Create an overridable, recursive attribute set. For example:
   #
   #     nix-repl> obj = makeExtensible (self: { })

From 60f18cf94a02a78e4304c9438680cd8d74ce47b5 Mon Sep 17 00:00:00 2001
From: Petr Mikusek <petr@mikusek.info>
Date: Fri, 7 Apr 2017 20:33:56 +0200
Subject: [PATCH 0750/1744] advancecomp: fix license

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

diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 2f4b56ffcaf..23acf7446b1 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = ''A set of tools to optimize deflate-compressed files'';
-    license = licenses.gpl2 ;
+    license = licenses.gpl3 ;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     homepage = https://github.com/amadvance/advancecomp;

From b9e558597de13a044f2f9c00cc8c29d3cce1e55d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 18 Mar 2017 16:48:27 -0400
Subject: [PATCH 0751/1744] stdenv-darwin: bump to use LLVM 4.0 & new bootstrap
 tools

---
 pkgs/development/compilers/llvm/4/default.nix |  4 ++--
 pkgs/stdenv/darwin/default.nix                | 24 ++++++++++---------
 pkgs/top-level/all-packages.nix               | 18 +++++++-------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 999ff858d02..4be621adb5c 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,6 +1,6 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
+{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
 let
-  callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
+  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
   release_version = "4.0.0";
   version = release_version; # differentiating these is important for rc's
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e647c81890e..e80c54e0218 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,15 +4,15 @@
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "0d91c19xjzmqisncvldv79d7ddzai9l7vcmajhwlwwv74g6da5yl"; };
-    cpio    = fetch { file = "cpio";  sha256 = "0lw057bmcqls96j0gv1n3mgl66q31mba7i413cbkkaf0rfzz3dxj"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "13ihbj002pis3fgy1d9c4fi7flca21z9brjsjkklm82h5b4nlwxl"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; };
+    cpio    = fetch { file = "cpio";  sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; };
   }
 }:
 
@@ -301,7 +301,7 @@ in rec {
 
     allowedRequisites = (with pkgs; [
       xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
-      bzip2.bin llvmPackages.llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
+      bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
@@ -309,10 +309,12 @@ in rec {
       dyld Libsystem CF cctools libiconv locale
     ]);
 
-    overrides = self: super: persistent4 prevStage self super // {
-      clang = cc;
-      inherit cc;
-    };
+    overrides = self: super:
+      let persistent = persistent4 prevStage self super; in persistent // {
+        clang = cc;
+        llvmPackages = persistent.llvmPackages // { clang = cc; };
+        inherit cc;
+      };
   };
 
   stagesDarwin = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb41a4bb474..86320f815ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5421,7 +5421,7 @@ with pkgs;
   llvm_34 = llvmPackages_34.llvm;
 
   llvmPackages = recurseIntoAttrs
-    (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39);
+    (if stdenv.isDarwin then llvmPackages_4 else llvmPackages_39);
 
   llvmPackagesSelf = llvmPackages_34.override {
     stdenv = libcxxStdenv;
@@ -5435,13 +5435,9 @@ with pkgs;
     isl = isl_0_14;
   };
 
-  llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
+  llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
     inherit (stdenvAdapters) overrideCC;
-  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-    cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
-    libxml2 = libxml2.override { pythonSupport = false; };
-    python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
-  });
+  };
 
   llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 {
     inherit (stdenvAdapters) overrideCC;
@@ -5451,9 +5447,13 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
   };
 
-  llvmPackages_4 = callPackage ../development/compilers/llvm/4 {
+  llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
     inherit (stdenvAdapters) overrideCC;
-  };
+  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
+    libxml2 = libxml2.override { pythonSupport = false; };
+    python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
+  });
 
   manticore = callPackage ../development/compilers/manticore { };
 

From d486006e06cb22ddac1fdbf96cddce813589ebd4 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Fri, 7 Apr 2017 20:43:19 +0200
Subject: [PATCH 0752/1744] rq: 0.9.2 -> 0.10.4 (still broken, our v8 is too
 old)

---
 pkgs/development/tools/rq/default.nix | 49 ++-------------------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index b383812d321..eef8b660c41 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -4,59 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "rq-${version}";
-  version = "0.9.2";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "dflemstr";
     repo = "rq";
     rev = "v${version}";
-    sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq";
+    sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
   };
 
-  serde_json = fetchFromGitHub {
-    owner = "serde-rs";
-    repo = "json";
-    rev = "0c05059e4533368020bd356bd708c38286810a7d";
-    sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43";
-  };
-
-  v8_rs = fetchFromGitHub {
-    owner = "dflemstr";
-    repo = "v8-rs";
-    rev = "0772be5b2e84842a2d434963702bc2995aeda90b";
-    sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad";
-  };
-
-  cargoDepsHook = ''
-    # use non-git dependencies
-    (cd $sourceRoot && patch -p1 <<EOF)
-    diff -u a/Cargo.toml b/Cargo.toml
-    --- a/Cargo.toml	2016-12-03 21:29:31.615019030 +0100
-    +++ b/Cargo.toml	2016-12-03 21:30:12.188170359 +0100
-    @@ -40,15 +40,16 @@
-     version = "*"
-     
-     [dependencies.serde_json]
-    -branch = "v0.9.0"
-    -git = "https://github.com/serde-rs/json.git"
-    +path = "${serde_json}/json"
-    +version = "*"
-     
-     [dependencies.toml]
-     features = ["serde"]
-     version = "*"
-     
-     [dependencies.v8]
-    -git = "https://github.com/dflemstr/v8-rs.git"
-    +path = "${v8_rs}"
-    +version = "*"
-     
-     [features]
-     shared = ["v8/shared"]
-    EOF
-  '';
-
-  depsSha256 = "1pci9iwf4y574q32b05gbc490iqw5i7shvqgb1gblchrihvlkddq";
+  depsSha256 = "138h0q2a2gghfjpwfi11zw4rkipvmglb7srqz56ibbw2xliid2wl";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
 

From 60e937173846f1b28e27aaa3abbf200452325e74 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Fri, 7 Apr 2017 20:02:32 +0200
Subject: [PATCH 0753/1744] haskell: ghcjs packages: Remove ghcjs-prim

It is wired into ghcjs now.
---
 pkgs/development/compilers/ghcjs/base.nix           |  3 +--
 pkgs/development/compilers/ghcjs/head.nix           |  2 --
 .../haskell-modules/configuration-ghc-7.10.x.nix    | 12 ------------
 .../haskell-modules/configuration-ghc-8.0.x.nix     | 13 -------------
 4 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index ac9419d662e..ab68a8fe3b5 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -19,7 +19,6 @@
 , executable-path
 , transformers-compat
 , haddock-api
-, ghcjs-prim
 , regex-posix
 , callPackage
 
@@ -122,7 +121,7 @@ in mkDerivation (rec {
     alex happy git gnumake autoconf automake libtool patch gmp
     base16-bytestring cryptohash executable-path haddock-api
     transformers-compat QuickCheck haddock hspec xhtml
-    ghcjs-prim regex-posix libiconv
+    regex-posix libiconv
   ];
   buildTools = [ nodejs git ];
   testDepends = [
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index e045dc67a50..591660f5c34 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -3,8 +3,6 @@
 bootPkgs.callPackage ./base.nix {
   version = "0.2.020170323";
 
-  # deprecated on HEAD, directly included in the distribution
-  ghcjs-prim = null;
   inherit bootPkgs;
 
   ghcjsSrc = fetchFromGitHub {
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 ee62cf64fec..7f561133b64 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -95,18 +95,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
-  ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
-    pname = "ghcjs-prim";
-    version = "0.1.0.0";
-    src = fetchgit {
-      url = git://github.com/ghcjs/ghcjs-prim.git;
-      rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
-      sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
-    };
-    buildDepends = [ primitive ];
-    license = pkgs.stdenv.lib.licenses.bsd3;
-  }) {};
-
   # diagrams/monoid-extras#19
   monoid-extras = overrideCabal super.monoid-extras (drv: {
     prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
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 78c3823a0f9..8eb87279c79 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -41,19 +41,6 @@ self: super: {
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
-  ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
-    pname = "ghcjs-prim";
-    version = "0.1.0.0";
-    src = fetchgit {
-      url = git://github.com/ghcjs/ghcjs-prim.git;
-      rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
-      sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
-    };
-    buildDepends = [ primitive ];
-    license = pkgs.stdenv.lib.licenses.bsd3;
-    broken = true;   # needs template-haskell >=2.9 && <2.11
-  }) {};
-
   # 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 82a63385fb82f87efaf8456011fc5b296f50c196 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 7 Apr 2017 15:44:10 -0400
Subject: [PATCH 0754/1744] bup: 0.29 -> 0.29.1

This pretty much only has a single fix for gc --threshold 0:
https://github.com/bup/bup/blob/master/note/0.29.1-from-0.29.md
---
 pkgs/tools/backup/bup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index baf9e4f4e39..8a81e737ccc 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.29"; in
+let version = "0.29.1"; in
 
 with stdenv.lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "1cc9kpq9bpln89m4ni6wqzh4c8zwxmgnhaibdxxfs5pk2mpl3ds5";
+    sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf";
   };
 
   buildInputs = [ git python2Packages.python ];

From 65be0b3a4b0555ebc634b28314175878c8c6ceeb Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Fri, 7 Apr 2017 21:47:03 +0200
Subject: [PATCH 0755/1744] bup: enable par2 by default

The par2 closure is <300 KB, so having it enabled by default seems
reasonable.
---
 pkgs/tools/backup/bup/default.nix | 2 +-
 pkgs/top-level/all-packages.nix   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index baf9e4f4e39..2f3d0bedb97 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, makeWrapper
 , perl, pandoc, python2Packages, git
-, par2cmdline ? null, par2Support ? false
+, par2cmdline ? null, par2Support ? true
 }:
 
 assert par2Support -> par2cmdline != null;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26187bf7e55..1ef3492a702 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1118,9 +1118,7 @@ with pkgs;
     inherit (pythonPackages) gyp;
   };
 
-  bup = callPackage ../tools/backup/bup {
-    par2Support = config.bup.par2Support or false;
-  };
+  bup = callPackage ../tools/backup/bup { };
 
   burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };
 

From 30b6561982bc086a74261a8efe0ccddd178ba13a Mon Sep 17 00:00:00 2001
From: Sean Haugh <sean.haugh@vertivco.com>
Date: Fri, 7 Apr 2017 15:24:08 -0500
Subject: [PATCH 0756/1744] i3: add separateDebugInfo

---
 pkgs/applications/window-managers/i3/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b6de07bff8a..fded295b0ef 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  separateDebugInfo = true;
+
   meta = with stdenv.lib; {
     description = "A tiling window manager";
     homepage    = "http://i3wm.org";

From 9ae3f39e8ec9d27e23e3dd8453181da833a4cc32 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 7 Apr 2017 16:51:23 -0400
Subject: [PATCH 0757/1744] p7zip: fix purity on Darwin

This should (I hope) get Hydra to build it. Fixes #24714
---
 pkgs/tools/archivers/p7zip/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 2b61b5b2679..8e9db09147e 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
+  postPatch = ''
+    sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
+
+    # I think this is a typo and should be CXX? Either way let's kill it
+    sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
+  '';
+
   preConfigure = ''
     makeFlagsArray=(DEST_HOME=$out)
     buildFlags=all3

From 4151bf5fd4b60d53f5c5c973bec13457a6e6605a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 7 Apr 2017 19:54:40 -0400
Subject: [PATCH 0758/1744] scala: 2.11.9 -> 2.11.10

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

diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index 9af3431b8c6..404c469b86d 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.9";
+  name = "scala-2.11.10";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "02rpx0pzr98vla2mgkgf6s8blccnrji5bxw05z36m1iwqmpryx5r";
+    sha256 = "10rs8ak3qyxggw24ga3gjcpl3x8r1b3ykrdfrym1n154b1rrs904";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 94acb5b7806ae95b3e3b78de1ea713ae3560a226 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 21:55:02 -0500
Subject: [PATCH 0759/1744] yasr: make linux-only

---
 pkgs/applications/audio/yasr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index b700cc0bd83..1008d3e8e98 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -2,26 +2,26 @@
 
 stdenv.mkDerivation rec {
   name = "yasr-${version}";
-  
+
   version = "0.6.9";
-  
+
   src = fetchurl {
     url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz";
     sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1";
   };
-  
+
   patches = [
     ./10_fix_openpty_forkpty_declarations
     ./20_maxpathlen
     ./30_conf
     ./40_dectalk_extended_chars
   ]; # taken from the debian yasr package
-  
+
   meta = {
     homepage = "http://yasr.sourceforge.net";
     description = "A general-purpose console screen reader";
     longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems.";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ jhhuh ];
   };

From 106214a7c98bd382b313551f315a2f12d329c056 Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <andrewmiller237@gmail.com>
Date: Fri, 7 Apr 2017 23:15:16 -0400
Subject: [PATCH 0760/1744] hy: 0.11.1 -> 0.12.1

Fixed build inputs up a little while bumping version
---
 pkgs/development/interpreters/hy/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index e1ce01b5906..3cafd956277 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -2,15 +2,14 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "hy-${version}";
-  version = "0.11.1";
+  version = "0.12.1";
 
   src = fetchurl {
     url = "mirror://pypi/h/hy/${name}.tar.gz";
-    sha256 = "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs";
+    sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx";
   };
 
-  buildInputs = [ pythonPackages.appdirs ];
-  propagatedBuildInputs = [ pythonPackages.clint pythonPackages.astor pythonPackages.rply ];
+  propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
 
   meta = {
     description = "A LISP dialect embedded in Python";

From b41dd2fae0128d15f0b23d12b91310c4df00bc1a Mon Sep 17 00:00:00 2001
From: Sorin Iclanzan <sorin@iclanzan.com>
Date: Sat, 8 Apr 2017 00:04:55 -0400
Subject: [PATCH 0761/1744] nixos/compton: fixup option descriptions (#24724)

* Fix `fadeExclude` description.
* Fix typo in `shadowExclude`.
---
 nixos/modules/services/x11/compton.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index d1f7f164e64..d75d24830f8 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -83,7 +83,7 @@ in {
         "focused = 1" 
       ];
       description = ''
-        List of condition of windows that should have no shadow.
+        List of conditions of windows that should not be faded.
         See <literal>compton(1)</literal> man page for more examples.
       '';
     };
@@ -123,7 +123,7 @@ in {
         "focused = 1" 
       ];
       description = ''
-        List of condition of windows that should have no shadow.
+        List of conditions of windows that should have no shadow.
         See <literal>compton(1)</literal> man page for more examples.
       '';
     };

From 47e943e8d1a5a5072ee9dd9071d889119ee7ff8b Mon Sep 17 00:00:00 2001
From: Vanessa McHale <tmchale@wisc.edu>
Date: Sat, 8 Apr 2017 00:09:31 -0500
Subject: [PATCH 0762/1744] init tweet-hs at 0.5.3.2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8335e54a02e..7fa8bd83cc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4428,6 +4428,8 @@ with pkgs;
 
   time = callPackage ../tools/misc/time { };
 
+  tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs;
+
   qfsm = callPackage ../applications/science/electronics/qfsm { };
 
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };

From 90b2290ca361319567660383efefea568b9e713b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Jan=20G=C3=B3ralczyk?= <tomg@fastmail.uk>
Date: Sat, 8 Apr 2017 07:56:28 +0100
Subject: [PATCH 0763/1744] purple-facebook: 0.9.0 -> 0.9.3

---
 .../pidgin-plugins/purple-facebook/default.nix              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 30e4992ff36..6e96719fd89 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -10,13 +10,13 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "purple-facebook-0.9.0";
+  name = "purple-facebook-0.9.3";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "v0.9.0-c9b74a765767";
-    sha256 = "1f7jhmaj15p3c9s4xmfygrpav9c8wq0vilbi5cj4jysb7xgndlqv";
+    rev = "v0.9.3-c9b74a765767";
+    sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb";
   };
 
   postPatch = ''

From c2a0f2584acbebb792f9d9ce7632b0630450ea80 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 8 Apr 2017 00:16:48 +0200
Subject: [PATCH 0764/1744] buku: 2.8 -> 2.9

---
 lib/maintainers.nix                     |  1 +
 pkgs/applications/misc/buku/default.nix | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c3ab790e7c7..c4857f69b15 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -217,6 +217,7 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
+  infinisil = "Silvan Mosberger <infinisil@icloud.com";
   ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 85d8180983e..1ee68b55aa7 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,21 +2,22 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.8";
+  version = "2.9";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm";
+    sha256 = "0ylq0j5w8jvzys4bj9m08bfr1sgf8h2b4fiax6hs6lcwn2882jbr";
   };
 
-  buildInputs = [
+  propagatedBuildInputs = [
     cryptography
     beautifulsoup4
+    requests2
+    urllib3
   ];
-  propagatedBuildInputs = [ beautifulsoup4 ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
@@ -31,7 +32,7 @@ with pythonPackages; buildPythonApplication rec {
     homepage = https://github.com/jarun/Buku;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [ matthiasbeyer infinisil ];
   };
 }
 

From 0a573f7a0c1c870a7d1eb69995978150987e3d87 Mon Sep 17 00:00:00 2001
From: dyrnade <gurescicem@gmail.com>
Date: Sat, 8 Apr 2017 10:15:45 +0300
Subject: [PATCH 0765/1744] changed chefdk version to 1.3.40 upgraded
 dependencies for chefdk-1.3.40

---
 pkgs/development/tools/chefdk/Gemfile.lock |  386 +++--
 pkgs/development/tools/chefdk/default.nix  |    2 +-
 pkgs/development/tools/chefdk/gemset.nix   | 1824 ++++++++++----------
 3 files changed, 1085 insertions(+), 1127 deletions(-)

diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock
index ddbb1f5f1dd..c397758aaac 100644
--- a/pkgs/development/tools/chefdk/Gemfile.lock
+++ b/pkgs/development/tools/chefdk/Gemfile.lock
@@ -1,244 +1,268 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     app_conf (0.4.2)
-    ast (2.2.0)
-    berkshelf (4.3.0)
+    artifactory (2.8.1)
+    ast (2.3.0)
+    backports (3.7.0)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (~> 2.0, >= 2.0.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (= 0.16.0)
-      celluloid-io (~> 0.16.1)
+      berkshelf-api-client (>= 2.0.2, < 4.0)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
-      ridley (~> 4.5)
-      solve (~> 2.0)
-      thor (~> 0.19)
-    berkshelf-api-client (2.0.2)
-      faraday (~> 0.9.1)
-      httpclient (~> 2.7.0)
-      ridley (~> 4.5)
-    buff-config (1.0.1)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.2.0)
-      buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
+      ridley (~> 5.0)
+      solve (> 2.0, < 4.0)
+      thor (~> 0.19, < 0.19.2)
+    berkshelf-api-client (3.0.0)
+      faraday (~> 0.9)
+      httpclient (~> 2.7)
+      ridley (>= 4.5, < 6.0)
+    blankslate (2.1.2.4)
+    buff-config (2.0.0)
+      buff-extensions (~> 2.0)
+      varia_model (~> 0.6)
+    buff-extensions (2.0.0)
+    buff-ignore (1.2.0)
+    buff-ruby_engine (1.0.0)
+    buff-shell_out (1.1.0)
+      buff-ruby_engine (~> 1.0)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.8.1)
+    chef (12.19.36)
+      addressable
       bundler (>= 1.10)
-      chef-config (= 12.8.1)
-      chef-zero (~> 4.5)
+      chef-config (= 12.19.36)
+      chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      mixlib-archive (~> 0.4)
       mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.4)
+      mixlib-cli (~> 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-multi (~> 1.1)
-      ohai (>= 8.6.0.alpha.1, < 9)
-      plist (~> 3.1.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (>= 8.6.0.alpha.1, < 13)
+      plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.8.1)
+    chef-config (12.19.36)
+      addressable
+      fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-dk (0.11.2)
+    chef-dk (1.3.40)
+      addressable (>= 2.3.5, < 2.6)
       chef (~> 12.5)
-      chef-provisioning (~> 1.2)
-      cookbook-omnifetch (~> 0.2, >= 0.2.2)
+      chef-provisioning (~> 2.0)
+      cookbook-omnifetch (~> 0.5)
       diff-lcs (~> 1.0)
       ffi-yajl (>= 1.0, < 3.0)
       minitar (~> 0.5.4)
-      mixlib-cli (~> 1.5)
+      mixlib-cli (~> 1.7)
       mixlib-shellout (~> 2.0)
       paint (~> 1.0)
-      solve (~> 2.0, >= 2.0.1)
-    chef-provisioning (1.6.0)
-      cheffish (>= 1.3.1, < 3.0)
-      inifile (~> 2.0)
-      mixlib-install (~> 0.7.0)
+      solve (> 2.0, < 4.0)
+    chef-provisioning (2.2.1)
+      cheffish (>= 4.0, < 6.0)
+      inifile (>= 2.0.2)
+      mixlib-install (>= 1.0, < 3.0)
       net-scp (~> 1.0)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
-      winrm (~> 1.3)
-    chef-vault (2.8.0)
-    chef-zero (4.5.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.0)
+    chef-vault (2.9.1)
+    chef-zero (5.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack
+      rack (~> 2.0)
       uuidtools (~> 2.1)
-    cheffish (2.0.2)
-      chef-zero (~> 4.3)
-      compat_resource
-    chefspec (4.6.0)
-      chef (>= 11.14)
-      fauxhai (~> 3.0, >= 3.0.1)
+    cheffish (5.0.1)
+      chef-zero (~> 5.0)
+      net-ssh
+    chefspec (6.2.0)
+      chef (>= 12.0)
+      fauxhai (>= 3.6, < 5)
       rspec (~> 3.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    compat_resource (12.8.0)
-    cookbook-omnifetch (0.2.2)
-      minitar (~> 0.5.4)
-    diff-lcs (1.2.5)
-    diffy (3.1.0)
-    docker-api (1.26.2)
+    cookbook-omnifetch (0.5.1)
+      mixlib-archive (~> 0.4)
+    cucumber-core (2.0.0)
+      backports (~> 3.6)
+      gherkin (~> 4.0)
+    diff-lcs (1.3)
+    diffy (3.2.0)
+    docker-api (1.33.3)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.48.0)
+    excon (0.55.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fauxhai (3.1.0)
+    fauxhai (4.1.0)
       net-ssh
-    ffi (1.9.10)
-    ffi-yajl (2.2.3)
+    ffi (1.9.18)
+    ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
-    foodcritic (6.0.1)
+    foodcritic (10.2.2)
+      cucumber-core (>= 1.3)
       erubis
-      gherkin (~> 2.11)
       nokogiri (>= 1.5, < 2.0)
       rake
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
       yajl-ruby (~> 1.1)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
+    fuzzyurl (0.9.0)
+    gherkin (4.1.1)
     git (1.3.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.4.3)
+    hashie (3.5.5)
     highline (1.7.8)
-    hitimes (1.2.3)
-    httpclient (2.7.1)
-    inifile (2.0.2)
-    inspec (0.14.8)
-      json (~> 1.8)
+    hitimes (1.2.4)
+    httpclient (2.8.3)
+    inifile (3.0.0)
+    iniparse (1.4.2)
+    inspec (1.19.2)
+      addressable (~> 2.4)
+      faraday (>= 0.9.0)
+      hashie (~> 3.4)
+      json (>= 1.8, < 3.0)
       method_source (~> 0.8)
+      mixlib-log
+      parallel (~> 1.9)
       pry (~> 0)
-      r-train (~> 0.10.1)
       rainbow (~> 2)
-      rspec (~> 3.3)
+      rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
+      sslshake (~> 1)
       thor (~> 0.19)
+      toml (~> 0.1)
+      train (>= 0.22.0, < 1.0)
     ipaddress (0.8.3)
-    json (1.8.3)
-    kitchen-inspec (0.12.3)
-      inspec (~> 0.14.1)
+    json (2.0.3)
+    kitchen-inspec (0.17.0)
+      hashie (~> 3.4)
+      inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.19.0)
+    kitchen-vagrant (1.1.0)
       test-kitchen (~> 1.4)
-    knife-spork (1.6.1)
+    knife-spork (1.6.3)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
     libyajl2 (1.2.0)
     little-plugger (1.1.4)
-    logging (2.0.0)
+    logging (2.2.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
-    mixlib-cli (1.5.0)
-    mixlib-config (2.2.1)
-    mixlib-install (0.7.1)
-    mixlib-log (1.6.0)
-    mixlib-shellout (2.2.6)
-    molinillo (0.2.3)
-    multi_json (1.11.2)
+    mixlib-authentication (1.4.1)
+      mixlib-log
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.4)
+    mixlib-install (2.1.12)
+      artifactory
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-log (1.7.1)
+    mixlib-shellout (2.2.7)
+    mixlib-versioning (1.1.0)
+    molinillo (0.5.7)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
-    net-ssh-gateway (1.2.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.1.0)
+    net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    nio4r (1.2.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
     nori (2.6.0)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.12.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ohai (8.23.0)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli
       mixlib-config (~> 2.0)
-      mixlib-log
+      mixlib-log (>= 1.7.1, < 2.0)
       mixlib-shellout (~> 2.0)
-      plist
-      rake (~> 10.1)
+      plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     paint (1.0.1)
-    parser (2.3.0.6)
+    parallel (1.11.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    plist (3.1.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    plist (3.2.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
     proxifier (1.0.3)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    r-train (0.10.3)
-      docker-api (~> 1.26.2)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.1)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
-    rack (1.6.4)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    retryable (2.0.3)
-    ridley (4.5.0)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    retryable (2.0.4)
+    ridley (5.1.0)
       addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
-      buff-shell_out (~> 0.1)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-ignore (~> 1.2)
+      buff-shell_out (~> 1.0)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
@@ -249,91 +273,107 @@ GEM
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       retryable (~> 2.0)
-      semverse (~> 1.1)
-      varia_model (~> 0.4.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      semverse (~> 2.0)
+      varia_model (~> 0.6)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    rubyntlm (0.6.0)
-    rubyzip (1.2.0)
-    rufus-lru (1.0.5)
+    ruby-progressbar (1.8.1)
+    rubyntlm (0.6.1)
+    rubyzip (1.2.1)
+    rufus-lru (1.1.0)
     safe_yaml (1.0.4)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    semverse (1.2.1)
-    serverspec (2.31.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    semverse (2.0.0)
+    serverspec (2.38.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.53)
-    sfl (2.2)
+    sfl (2.3)
     slop (3.6.0)
-    solve (2.0.2)
-      molinillo (~> 0.2.3)
-      semverse (~> 1.1)
-    specinfra (2.53.1)
+    solve (3.1.0)
+      molinillo (>= 0.5)
+      semverse (>= 1.1, < 3.0)
+    specinfra (2.67.7)
       net-scp
-      net-ssh (>= 2.7, < 3.1)
+      net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
+    sslshake (1.1.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.6.0)
-      mixlib-install (~> 0.7)
+    test-kitchen (1.16.0)
+      mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
+      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    treetop (1.6.5)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    train (0.23.0)
+      docker-api (~> 1.26)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 5.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    treetop (1.6.8)
       polyglot (~> 0.3)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.1.3)
     uuidtools (2.1.5)
-    varia_model (0.4.1)
-      buff-extensions (~> 1.0)
+    varia_model (0.6.0)
+      buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
-    winrm (1.7.2)
+    winrm (2.2.1)
       builder (>= 2.1.2)
+      erubis (~> 2.7)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
-    winrm-fs (0.3.2)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.0.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
-      winrm (~> 1.5)
+      winrm (~> 2.0)
     wmi-lite (1.0.0)
-    yajl-ruby (1.2.1)
+    yajl-ruby (1.3.0)
 
 PLATFORMS
   ruby
@@ -356,4 +396,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   1.10.5
+   1.14.4
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 880d0ddcc74..b453b0ca504 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
 
 bundlerEnv {
-  name = "chefdk-0.11.2";
+  name = "chefdk-1.3.40";
 
   inherit ruby;
   gemdir = ./.;
diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix
index 87faa3105ad..18e430a3dec 100644
--- a/pkgs/development/tools/chefdk/gemset.nix
+++ b/pkgs/development/tools/chefdk/gemset.nix
@@ -1,1170 +1,1088 @@
 {
-  "addressable" = {
-    version = "2.4.0";
+  addressable = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
       type = "gem";
-      sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
     };
+    version = "2.5.1";
   };
-  "app_conf" = {
-    version = "0.4.2";
+  app_conf = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57";
-    };
-  };
-  "ast" = {
-    version = "2.2.0";
-    source = {
       type = "gem";
-      sha256 = "14md08f8f1mmr2v7lczqnf1n1v8bal73gvg6ldhvkds1bmbnkrlb";
     };
+    version = "0.4.2";
   };
-  "berkshelf" = {
-    version = "4.3.0";
+  artifactory = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zaxa5fxrfal6vi90w725n8cd57fxw1jf99h38vn8d4vimvan2cc";
       type = "gem";
-      sha256 = "1dsbyq3749b9133rmnzjak7rsysyps1ryalc2r4rxyihflmxhix9";
     };
-    dependencies = [
-      "addressable"
-      "berkshelf-api-client"
-      "buff-config"
-      "buff-extensions"
-      "buff-shell_out"
-      "celluloid"
-      "celluloid-io"
-      "cleanroom"
-      "faraday"
-      "httpclient"
-      "minitar"
-      "octokit"
-      "retryable"
-      "ridley"
-      "solve"
-      "thor"
-    ];
+    version = "2.8.1";
   };
-  "berkshelf-api-client" = {
-    version = "2.0.2";
+  ast = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
       type = "gem";
-      sha256 = "0xbn8q2xi09x5a7ma6wqs13gkpzj4ly21vls7m7ffv3sw8x29cyc";
     };
-    dependencies = [
-      "faraday"
-      "httpclient"
-      "ridley"
-    ];
+    version = "2.3.0";
   };
-  "buff-config" = {
-    version = "1.0.1";
+  backports = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qlaq999znlbjw9wb0kwbjvidrbcimnd4v59y682kvm5c09mfn0l";
       type = "gem";
-      sha256 = "0r3h3mk1dj7pc4zymz450bdqp23faqprx363ji4zfdg8z6r31jfh";
     };
-    dependencies = [
-      "buff-extensions"
-      "varia_model"
-    ];
+    version = "3.7.0";
   };
-  "buff-extensions" = {
+  berkshelf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1aajjag7l55gi7k67n27dr6pscbdlzjaj751r2zhaggrczhh6yyq";
+      type = "gem";
+    };
+    version = "5.6.4";
+  };
+  berkshelf-api-client = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n9bmrqmyy8cqm9vakscf5s1k2chks43x7dr201zp4bv2i6g3ih2";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  blankslate = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
+      type = "gem";
+    };
+    version = "2.1.2.4";
+  };
+  buff-config = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06zx175sww4grk1rwyn1g3b1j2y324jf1506wl4xx96iss8spa4r";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  buff-extensions = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qjyx97b9gavrk1r77bif1wv7z2mwlqy0v42q0vb7jd609n7vgcg";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  buff-ignore = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vn0jh4l8np1xlyvsrrhlzhapcwvrjfni92jmg1an5qdw1qlgxmh";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  buff-ruby_engine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1njpndvhvq7idfrwfw3p0hs5ch6nygwscjmksh23dz49dsirk7a9";
+      type = "gem";
+    };
     version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1jqb5sn38qgx66lc4km6rljzz05myijjw12hznz1fk0k4qfw6yzk";
-    };
   };
-  "buff-ignore" = {
-    version = "1.1.1";
+  buff-shell_out = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zg1li17759whsi2yhb08wvbbqn5cy6i5v51384yjk2a29vs9lck";
       type = "gem";
-      sha256 = "1ghzhkgbq7f5fc7xilw0c9gspxpdhqhq3ygi1ybjm6r0dxlmvdb4";
     };
+    version = "1.1.0";
   };
-  "buff-ruby_engine" = {
-    version = "0.1.0";
+  builder = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
       type = "gem";
-      sha256 = "1llpwpmzkakbgz9fc3vr1298cx1n9zv1g25fwj80xnnr7428aj8p";
     };
+    version = "3.2.3";
   };
-  "buff-shell_out" = {
-    version = "0.2.0";
+  celluloid = {
     source = {
-      type = "gem";
-      sha256 = "0sphb69vxm346ys2laiz174k5jx628vfwz9ch8g2w9plc4xkxf3p";
-    };
-    dependencies = [
-      "buff-ruby_engine"
-    ];
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "celluloid" = {
-    version = "0.16.0";
-    source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-    };
-    dependencies = [
-      "timers"
-    ];
-  };
-  "celluloid-io" = {
-    version = "0.16.2";
-    source = {
       type = "gem";
+    };
+    version = "0.16.0";
+  };
+  celluloid-io = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx";
-    };
-    dependencies = [
-      "celluloid"
-      "nio4r"
-    ];
-  };
-  "chef" = {
-    version = "12.8.1";
-    source = {
       type = "gem";
-      sha256 = "16wb3ymnl7rbayy8qp35fp0947cnq2y9bac7xzhc1njp5j2p6lhg";
     };
-    dependencies = [
-      "chef-config"
-      "chef-zero"
-      "diff-lcs"
-      "erubis"
-      "ffi-yajl"
-      "highline"
-      "mixlib-authentication"
-      "mixlib-cli"
-      "mixlib-log"
-      "mixlib-shellout"
-      "net-ssh"
-      "net-ssh-multi"
-      "ohai"
-      "plist"
-      "proxifier"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec_junit_formatter"
-      "serverspec"
-      "specinfra"
-      "syslog-logger"
-      "uuidtools"
-    ];
+    version = "0.16.2";
   };
-  "chef-config" = {
-    version = "12.8.1";
+  chef = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "057m3c7h3fz3682r7wxmm7dm3n90rv56lc7svrk1hmf4c3g4b99v";
       type = "gem";
-      sha256 = "0chgbdv9c1xfkhzx3kmpr8lj0wjdbziixgln2y3ryn84x4fg84ic";
     };
-    dependencies = [
-      "mixlib-config"
-      "mixlib-shellout"
-    ];
+    version = "12.19.36";
   };
-  "chef-dk" = {
-    version = "0.11.2";
+  chef-config = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j4m13zzhd4w7j09a2cnj9sinxd9669i5qanbb1cvj90my0raxa2";
       type = "gem";
-      sha256 = "1qfx5qclvh3kwjgfs18iwdn0knpgka5py7mwi4r0mz2sw14wq5wk";
     };
-    dependencies = [
-      "chef"
-      "chef-provisioning"
-      "cookbook-omnifetch"
-      "diff-lcs"
-      "ffi-yajl"
-      "minitar"
-      "mixlib-cli"
-      "mixlib-shellout"
-      "paint"
-      "solve"
-    ];
+    version = "12.19.36";
   };
-  "chef-provisioning" = {
-    version = "1.6.0";
+  chef-dk = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wvdv3hmxnp7ydcwji1w4x0g48dy4qq1ik8zd6n43mqcfgkjq0cb";
       type = "gem";
-      sha256 = "1nxgia4zyhyqbrz65q7lgjwx8ba5iyzxdxa181y0s4aqqpv0j45g";
     };
-    dependencies = [
-      "cheffish"
-      "inifile"
-      "mixlib-install"
-      "net-scp"
-      "net-ssh"
-      "net-ssh-gateway"
-      "winrm"
-    ];
+    version = "1.3.40";
   };
-  "chef-vault" = {
-    version = "2.8.0";
+  chef-provisioning = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z5334zp76fswj7ygs5gzf8vsc13ixvyxywpyd5sif75dqsays48";
       type = "gem";
-      sha256 = "0dbvawlrfx9mqjyh8q71jjfh987xqqv3f6c0pmcjp6qxs95l1dqq";
     };
+    version = "2.2.1";
   };
-  "chef-zero" = {
-    version = "4.5.0";
+  chef-vault = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pqxmraiai9jrld53fyfsglaqcw14xwmy4f3rjfwbrsmparsxjc2";
       type = "gem";
-      sha256 = "1lqvmgjniviahrhim8k67qddnwh5p7wzw33r1wga4z136pfka1zx";
     };
-    dependencies = [
-      "ffi-yajl"
-      "hashie"
-      "mixlib-log"
-      "rack"
-      "uuidtools"
-    ];
+    version = "2.9.1";
   };
-  "cheffish" = {
-    version = "2.0.2";
+  chef-zero = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qmpn8wq2wns8m28pcn8ljgwz0v2ksninzc4wn5nq66gvksmpjig";
       type = "gem";
-      sha256 = "0mvp7kybgp3nm2sdcmlx8bv147hcdjx745a8k97bx1m47isv97ax";
     };
-    dependencies = [
-      "chef-zero"
-      "compat_resource"
-    ];
+    version = "5.3.2";
   };
-  "chefspec" = {
-    version = "4.6.0";
+  cheffish = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19hn46s3qm2ncnfzggm0lcdrsagspdxg699k97a4hbl18k1n6lb1";
       type = "gem";
-      sha256 = "1ikn8k6xdqixdjga50jmkqajz2z2z71dg4j3dsmd31hv1mdbp7wz";
     };
-    dependencies = [
-      "chef"
-      "fauxhai"
-      "rspec"
-    ];
+    version = "5.0.1";
   };
-  "cleanroom" = {
-    version = "1.0.0";
+  chefspec = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18xkzcxglrr3bfy5k0c1cjk5a3ka49xg3xirldb5yhv395svgg1r";
       type = "gem";
+    };
+    version = "6.2.0";
+  };
+  cleanroom = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml";
-    };
-  };
-  "coderay" = {
-    version = "1.1.1";
-    source = {
       type = "gem";
+    };
+    version = "1.0.0";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r";
-    };
-  };
-  "compat_resource" = {
-    version = "12.8.0";
-    source = {
       type = "gem";
-      sha256 = "0zp1dd1wkbgxbazvs7acqyk1xjls0wq1pd5ilhj6zi63lpychgy5";
     };
+    version = "1.1.1";
   };
-  "cookbook-omnifetch" = {
-    version = "0.2.2";
+  cookbook-omnifetch = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qkzlkszq9f74i71vz72skvmrw24zvdpzfl2029x6vyxrwn83hwf";
       type = "gem";
-      sha256 = "1ml25xc69nsgbvp9a6w9yi376rav7b659cvyr8qhfb4jaj4l1yd6";
     };
-    dependencies = [
-      "minitar"
-    ];
+    version = "0.5.1";
   };
-  "diff-lcs" = {
-    version = "1.2.5";
+  cucumber-core = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "136hnvqv444qyxzcgy1k60y4i6cn3sn9lbqr4wan9dzz1yzllqbm";
       type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
     };
+    version = "2.0.0";
   };
-  "diffy" = {
-    version = "3.1.0";
+  diff-lcs = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
       type = "gem";
-      sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj";
     };
+    version = "1.3";
   };
-  "docker-api" = {
-    version = "1.26.2";
+  diffy = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941";
       type = "gem";
-      sha256 = "0sg2xazcga21pmlb9yy1z5f3yyzqa2ly5b2h2cxfhyfda6k748wk";
     };
-    dependencies = [
-      "excon"
-      "json"
-    ];
+    version = "3.2.0";
   };
-  "erubis" = {
-    version = "2.7.0";
+  docker-api = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xg2iw6rffyd6zahm6rc80m10dghqmvjg8s83zjm6bqsqdg5h2dk";
       type = "gem";
+    };
+    version = "1.33.3";
+  };
+  erubis = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "excon" = {
-    version = "0.48.0";
-    source = {
       type = "gem";
-      sha256 = "0hjfd2p2mhklavhy8gy1ygm390iz3imx71065dcr9r28s3wk63gf";
     };
+    version = "2.7.0";
   };
-  "faraday" = {
-    version = "0.9.2";
+  excon = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "149grwcry52hi3f1xkbbx74jw5m3qcmiib13wxrk3rw5rz200kmx";
       type = "gem";
+    };
+    version = "0.55.0";
+  };
+  faraday = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "fauxhai" = {
-    version = "3.1.0";
-    source = {
       type = "gem";
-      sha256 = "0ff8wappc4n4v7v6969zm64c36qiadfw3igl8cyqrpp36fnqm04d";
     };
-    dependencies = [
-      "net-ssh"
-    ];
+    version = "0.9.2";
   };
-  "ffi" = {
-    version = "1.9.10";
+  fauxhai = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yk8cspxgs7y29hgzv248albld4d0y5z498xmgh7kqxav6vxpigj";
       type = "gem";
-      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
     };
+    version = "4.1.0";
   };
-  "ffi-yajl" = {
-    version = "2.2.3";
+  ffi = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
       type = "gem";
-      sha256 = "14wgy2isc5yir4zdkk0l3hzh1s1ycwblqb1hllbv4g9svb9naqbz";
     };
+    version = "1.9.18";
+  };
+  ffi-yajl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dlfzbs1amvqv9lrl87h614xz7319zcwn29qjl1mhnbclny98hqz";
+      type = "gem";
+    };
+    version = "2.3.0";
     dependencies = [
       "libyajl2"
     ];
   };
-  "foodcritic" = {
-    version = "6.0.1";
+  foodcritic = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0js522pp3q1xx929mpbzska2i87ydkax1dnyczpll4c46dkc2ivx";
       type = "gem";
-      sha256 = "06pi4984g6vwfzqvsf73zpw4h1p63bl7yn2sjb9mqd896bb3v6cn";
     };
-    dependencies = [
-      "erubis"
-      "gherkin"
-      "nokogiri"
-      "rake"
-      "rufus-lru"
-      "treetop"
-      "yajl-ruby"
-    ];
+    version = "10.2.2";
   };
-  "gherkin" = {
-    version = "2.12.2";
+  fuzzyurl = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl";
       type = "gem";
-      sha256 = "1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "0.9.0";
   };
-  "git" = {
-    version = "1.3.0";
+  gherkin = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s2ibsl5vi3961cci677zjb03wg4wh5hcci5g87i416333qq69xx";
       type = "gem";
+    };
+    version = "4.1.1";
+  };
+  git = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
-    };
-  };
-  "gssapi" = {
-    version = "1.2.0";
-    source = {
       type = "gem";
+    };
+    version = "1.3.0";
+  };
+  gssapi = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
-    };
-    dependencies = [
-      "ffi"
-    ];
-  };
-  "gyoku" = {
-    version = "1.3.1";
-    source = {
       type = "gem";
+    };
+    version = "1.2.0";
+  };
+  gyoku = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
-    };
-    dependencies = [
-      "builder"
-    ];
-  };
-  "hashie" = {
-    version = "3.4.3";
-    source = {
       type = "gem";
-      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
     };
+    version = "1.3.1";
   };
-  "highline" = {
-    version = "1.7.8";
+  hashie = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw";
       type = "gem";
+    };
+    version = "3.5.5";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
-    };
-  };
-  "hitimes" = {
-    version = "1.2.3";
-    source = {
       type = "gem";
-      sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4";
     };
+    version = "1.7.8";
   };
-  "httpclient" = {
-    version = "2.7.1";
+  hitimes = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a4yfhj7vp5gx20y99z45skynyn57wzxwwjp9mjm0b6dgiv6l0lz";
       type = "gem";
-      sha256 = "1y01wgmvwz8r4ycr87d12niglpk0nlh2hkpgy9bnmm8as7kgs428";
     };
+    version = "1.2.4";
   };
-  "inifile" = {
-    version = "2.0.2";
+  httpclient = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
       type = "gem";
-      sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25";
     };
+    version = "2.8.3";
   };
-  "inspec" = {
-    version = "0.14.8";
+  inifile = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c5zmk7ia63yw5l2k14qhfdydxwi1sah1ppjdiicr4zcalvfn0xi";
       type = "gem";
-      sha256 = "0whd57f82ml0awn7wgfi8gj3mwl7njww22hn2ciabxafqld9xrri";
     };
-    dependencies = [
-      "json"
-      "method_source"
-      "pry"
-      "r-train"
-      "rainbow"
-      "rspec"
-      "rspec-its"
-      "rubyzip"
-      "thor"
-    ];
+    version = "3.0.0";
   };
-  "ipaddress" = {
-    version = "0.8.3";
+  iniparse = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pj4r636swr6j7zisgs6xjws1hkkj8wxdbbknpzydcmaridk880r";
       type = "gem";
+    };
+    version = "1.4.2";
+  };
+  inspec = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03c1xxp13yv601b5fdbjbqy0sq84ymn5bx4d7k34h553lgc0124f";
+      type = "gem";
+    };
+    version = "1.19.2";
+  };
+  ipaddress = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
-    };
-  };
-  "json" = {
-    version = "1.8.3";
-    source = {
       type = "gem";
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
     };
+    version = "0.8.3";
   };
-  "kitchen-inspec" = {
-    version = "0.12.3";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql";
       type = "gem";
-      sha256 = "1vjb9pxb4ga9ppr35k6vsqh053k35b4fxamzg99g17y1rijp6dbj";
     };
-    dependencies = [
-      "inspec"
-      "test-kitchen"
-    ];
-  };
-  "kitchen-vagrant" = {
-    version = "0.19.0";
-    source = {
-      type = "gem";
-      sha256 = "0sydjihhvnr40vqnj7bg65zxf00crwvwdli1av03ghhggrp5scla";
-    };
-    dependencies = [
-      "test-kitchen"
-    ];
-  };
-  "knife-spork" = {
-    version = "1.6.1";
-    source = {
-      type = "gem";
-      sha256 = "104f3xq4gfy7rszc8zbfakg9wlnwnf8k9zij9ahdq4id3sdf1ylb";
-    };
-    dependencies = [
-      "app_conf"
-      "chef"
-      "diffy"
-      "git"
-    ];
-  };
-  "libyajl2" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
-    };
-  };
-  "little-plugger" = {
-    version = "1.1.4";
-    source = {
-      type = "gem";
-      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
-    };
-  };
-  "logging" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0ka5q88qvc2w7yr9z338jwxcyj1kifmbr9is5hps2f37asismqvb";
-    };
-    dependencies = [
-      "little-plugger"
-      "multi_json"
-    ];
-  };
-  "method_source" = {
-    version = "0.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
-    };
-  };
-  "mini_portile2" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
-    };
-  };
-  "minitar" = {
-    version = "0.5.4";
-    source = {
-      type = "gem";
-      sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka";
-    };
-  };
-  "mixlib-authentication" = {
-    version = "1.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0qk6mln2bkp6jgkz3sh5r69lzipzjs4dqdixqq12wzvwapmgc0zj";
-    };
-    dependencies = [
-      "mixlib-log"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-    ];
-  };
-  "mixlib-cli" = {
-    version = "1.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0im6jngj76azrz0nv69hgpy1af4smcgpfvmmwh5iwsqwa46zx0k0";
-    };
-  };
-  "mixlib-config" = {
-    version = "2.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0smhnyhw1va94vrd7zapxplbavbs4dc78h9yd1yfv52fzxx16zk3";
-    };
-  };
-  "mixlib-install" = {
-    version = "0.7.1";
-    source = {
-      type = "gem";
-      sha256 = "1ws2syfimnqzlff2fp6yj5v7zgnzmi3pj9kbkg7xlmd9fhnkb0n7";
-    };
-  };
-  "mixlib-log" = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1xblfxby3psh4n5cgc6j6xnvmmssyr8qjy0l76f92nr4b9yvv9m2";
-    };
-  };
-  "mixlib-shellout" = {
-    version = "2.2.6";
-    source = {
-      type = "gem";
-      sha256 = "1xfs7yp533qx3nsd4x2q2r125awyxcizgdc4dwgdlxsa1n1pj0pd";
-    };
-  };
-  "molinillo" = {
-    version = "0.2.3";
-    source = {
-      type = "gem";
-      sha256 = "1ylvnpdn20nna488mkzpq3iy6gr866gmkiv090c7g5h88x1qws0b";
-    };
-  };
-  "multi_json" = {
-    version = "1.11.2";
-    source = {
-      type = "gem";
-      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
-    };
-  };
-  "multipart-post" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "3.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1k3hrgr899dlhkn53c4hnn5qzbhc7lwks0vaqgw95gg74hn1ivqw";
-    };
-  };
-  "net-ssh-gateway" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh-multi" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
-    };
-    dependencies = [
-      "net-ssh"
-      "net-ssh-gateway"
-    ];
-  };
-  "net-telnet" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
-    };
-  };
-  "nio4r" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1adnm77xfxck0mrvid5d7lwng783gh580rh3y18nq4bwdikr6nha";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.7.2";
-    source = {
-      type = "gem";
-      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
-    };
-    dependencies = [
-      "mini_portile2"
-    ];
-  };
-  "nori" = {
-    version = "2.6.0";
-    source = {
-      type = "gem";
-      sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
-    };
-  };
-  "octokit" = {
-    version = "4.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np";
-    };
-    dependencies = [
-      "sawyer"
-    ];
-  };
-  "ohai" = {
-    version = "8.12.0";
-    source = {
-      type = "gem";
-      sha256 = "0l7vdfnfm4plla6q4qkngwpmy0ah53pnymlwfzc7iy6jn2n9ibpm";
-    };
-    dependencies = [
-      "chef-config"
-      "ffi"
-      "ffi-yajl"
-      "ipaddress"
-      "mixlib-cli"
-      "mixlib-config"
-      "mixlib-log"
-      "mixlib-shellout"
-      "plist"
-      "rake"
-      "systemu"
-      "wmi-lite"
-    ];
-  };
-  "paint" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj";
-    };
-  };
-  "parser" = {
-    version = "2.3.0.6";
-    source = {
-      type = "gem";
-      sha256 = "1r14k5jlsc5ivxjm1kljhk9sqp50rnd71n0mzx18hz135nvw1hbz";
-    };
-    dependencies = [
-      "ast"
-    ];
-  };
-  "plist" = {
-    version = "3.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs";
-    };
-  };
-  "polyglot" = {
-    version = "0.3.5";
-    source = {
-      type = "gem";
-      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
-    };
-  };
-  "powerpack" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
-    };
-  };
-  "proxifier" = {
-    version = "1.0.3";
-    source = {
-      type = "gem";
-      sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0";
-    };
-  };
-  "pry" = {
-    version = "0.10.3";
-    source = {
-      type = "gem";
-      sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
-    };
-    dependencies = [
-      "coderay"
-      "method_source"
-      "slop"
-    ];
-  };
-  "r-train" = {
-    version = "0.10.3";
-    source = {
-      type = "gem";
-      sha256 = "1hn0aap2lq15p97mb91h32yfsw8rh4imhyjlbs4jx9x52h2q6nam";
-    };
-    dependencies = [
-      "docker-api"
-      "json"
-      "mixlib-shellout"
-      "net-scp"
-      "net-ssh"
-      "winrm"
-      "winrm-fs"
-    ];
-  };
-  "rack" = {
-    version = "1.6.4";
-    source = {
-      type = "gem";
-      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
-    };
-  };
-  "rainbow" = {
-    version = "2.1.0";
-    source = {
-      type = "gem";
-      sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00";
-    };
-  };
-  "rake" = {
-    version = "10.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
-    };
-  };
-  "retryable" = {
     version = "2.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0lr3wasxwdyzr0bag179003hs2ycn9w86m450pazc81v19j4x1dq";
-    };
   };
-  "ridley" = {
-    version = "4.5.0";
+  kitchen-inspec = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zpkb9hy6hbdk58xs2lf8rcdbm9l02m607bzdramwfm7czzh08rs";
       type = "gem";
-      sha256 = "0y0p45y3xp37gg8ab132x4i0iggl3p907wfklhr5gb7r5yj6sj4r";
     };
-    dependencies = [
-      "addressable"
-      "buff-config"
-      "buff-extensions"
-      "buff-ignore"
-      "buff-shell_out"
-      "celluloid"
-      "celluloid-io"
-      "chef-config"
-      "erubis"
-      "faraday"
-      "hashie"
-      "httpclient"
-      "json"
-      "mixlib-authentication"
-      "retryable"
-      "semverse"
-      "varia_model"
-    ];
+    version = "0.17.0";
   };
-  "rspec" = {
-    version = "3.4.0";
+  kitchen-vagrant = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qanaqs769lvp3bw0bp2jivjs7n0y1y71x99j0cnx3qag9nbjca5";
       type = "gem";
-      sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s";
     };
-    dependencies = [
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-    ];
+    version = "1.1.0";
   };
-  "rspec-core" = {
-    version = "3.4.4";
+  knife-spork = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k2lmcz9ym6n7a5xn3jvlmfls10lbk7h6phqpc7ah1dz6dk4qw8d";
       type = "gem";
-      sha256 = "1z2zmy3xaq00v20ykamqvnynzv2qrrnbixc6dn0jw1c5q9mqq9fp";
     };
-    dependencies = [
-      "rspec-support"
-    ];
+    version = "1.6.3";
   };
-  "rspec-expectations" = {
-    version = "3.4.0";
+  libyajl2 = {
     source = {
+  #    remotes = ["https://rubygems.org"];
+      sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
       type = "gem";
-      sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h";
     };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-its" = {
     version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
-    };
-    dependencies = [
-      "rspec-core"
-      "rspec-expectations"
-    ];
   };
-  "rspec-mocks" = {
-    version = "3.4.1";
+  little-plugger = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
       type = "gem";
-      sha256 = "0sk8ijq5d6bwhvjq94gfm02fssxkm99bgpasqazsmmll5m1cn7vr";
     };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
+    version = "1.1.4";
   };
-  "rspec-support" = {
-    version = "3.4.1";
+  logging = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ddy1dh8sshbfaz3magaww1frlk0p3dpishmakpq0c2skp988wl2";
       type = "gem";
-      sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr";
     };
+    version = "2.2.0";
   };
-  "rspec_junit_formatter" = {
-    version = "0.2.3";
+  method_source = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
       type = "gem";
-      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
     };
-    dependencies = [
-      "builder"
-      "rspec-core"
-    ];
+    version = "0.8.2";
   };
-  "rubocop" = {
-    version = "0.38.0";
+  mini_portile2 = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
       type = "gem";
-      sha256 = "0qgwq558n41z2id7nwc3bh7z8h9yh7c9zdasqn8p30p0p72f5520";
     };
-    dependencies = [
-      "parser"
-      "powerpack"
-      "rainbow"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
+    version = "2.1.0";
   };
-  "ruby-progressbar" = {
-    version = "1.7.5";
+  minitar = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka";
       type = "gem";
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
     };
+    version = "0.5.4";
   };
-  "rubyntlm" = {
-    version = "0.6.0";
+  mixlib-archive = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b56iprv8cdhxjpzb8ck0mc54cl0kmyzlkn6bzzdqws4gxvdf6gk";
       type = "gem";
-      sha256 = "00k1cll10mcyg6qpdzyrazm5pjbpj7wq54ki2y8vxz86842vbsgp";
     };
-  };
-  "rubyzip" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s";
-    };
-  };
-  "rufus-lru" = {
-    version = "1.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1vrsbvcsl7yspzb761p2gbl7dwz0d1j82msbjsksf8hi4cv970s5";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sawyer" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j";
-    };
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-  };
-  "semverse" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8";
-    };
-  };
-  "serverspec" = {
-    version = "2.31.0";
-    source = {
-      type = "gem";
-      sha256 = "169mh6s4drxy9qs7f01gqcaq1qfkvy9hdc1ny3lnk0aiwfcm2s1p";
-    };
-    dependencies = [
-      "multi_json"
-      "rspec"
-      "rspec-its"
-      "specinfra"
-    ];
-  };
-  "sfl" = {
-    version = "2.2";
-    source = {
-      type = "gem";
-      sha256 = "0aq7ykbyvx8mx4szkcgp09zs094fg60l2pzxscmxqrgqk9yvyg1j";
-    };
-  };
-  "slop" = {
-    version = "3.6.0";
-    source = {
-      type = "gem";
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-    };
-  };
-  "solve" = {
-    version = "2.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0mwdd6z3vbzna9vphnkgdghy40xawn0yiwhamvb6spfk6n2c80kb";
-    };
-    dependencies = [
-      "molinillo"
-      "semverse"
-    ];
-  };
-  "specinfra" = {
-    version = "2.53.1";
-    source = {
-      type = "gem";
-      sha256 = "17jbrn7nm6c72qy1nw064c0yi9cimd295s7j6x9bm878cbyq9i6i";
-    };
-    dependencies = [
-      "net-scp"
-      "net-ssh"
-      "net-telnet"
-      "sfl"
-    ];
-  };
-  "syslog-logger" = {
-    version = "1.6.8";
-    source = {
-      type = "gem";
-      sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm";
-    };
-  };
-  "systemu" = {
-    version = "2.6.5";
-    source = {
-      type = "gem";
-      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
-    };
-  };
-  "test-kitchen" = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1glmvjm24fmlbhm8q4lzi1ynds77ip3s4s5q6fdjlhdanh6jrgwz";
-    };
-    dependencies = [
-      "mixlib-install"
-      "mixlib-shellout"
-      "net-scp"
-      "net-ssh"
-      "safe_yaml"
-      "thor"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "timers" = {
-    version = "4.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz";
-    };
-    dependencies = [
-      "hitimes"
-    ];
-  };
-  "treetop" = {
-    version = "1.6.5";
-    source = {
-      type = "gem";
-      sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh";
-    };
-    dependencies = [
-      "polyglot"
-    ];
-  };
-  "unicode-display_width" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1cffs73zrn788dyd1vv91p0mcxgx2g1sis6552ggmfib3f148gbi";
-    };
-  };
-  "uuidtools" = {
-    version = "2.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
-    };
-  };
-  "varia_model" = {
     version = "0.4.1";
-    source = {
-      type = "gem";
-      sha256 = "1qm9fhizfry055yras9g1129lfd48fxg4lh0hck8h8cvjdjz1i62";
-    };
-    dependencies = [
-      "buff-extensions"
-      "hashie"
-    ];
   };
-  "winrm" = {
-    version = "1.7.2";
+  mixlib-authentication = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v2r5klw6c8b67yw906slp8a7wi4v2gmhhi9b1slmm4sg2v0pgah";
       type = "gem";
-      sha256 = "1as865gd6f0g0hppw8plki1i4afpn6lcx89sgi52v1mlgwxfifff";
     };
-    dependencies = [
-      "builder"
-      "gssapi"
-      "gyoku"
-      "httpclient"
-      "logging"
-      "nori"
-      "rubyntlm"
-    ];
+    version = "1.4.1";
   };
-  "winrm-fs" = {
-    version = "0.3.2";
+  mixlib-cli = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
       type = "gem";
-      sha256 = "08j2ip9wx1vcx45kd9ws6lb6znfq9gib1n2j7shzs10rxwgs1bj8";
     };
-    dependencies = [
-      "erubis"
-      "logging"
-      "rubyzip"
-      "winrm"
-    ];
+    version = "1.7.0";
   };
-  "wmi-lite" = {
-    version = "1.0.0";
+  mixlib-config = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s2ag6jz59r1gn8rbhf5c1g2mpbkc5jmz2fxh3n7hzv80dfzk42w";
       type = "gem";
-      sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3";
     };
+    version = "2.2.4";
   };
-  "yajl-ruby" = {
+  mixlib-install = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08fmrc9qaagj3i85n37l50d9qpjsv0lkdppmx3y69r3d0xcgfv3p";
+      type = "gem";
+    };
+    version = "2.1.12";
+  };
+  mixlib-log = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14sknyi9r7rg28m21c8ixzyndhbmi0d6vk02y4hf42dd60hmdbgp";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  mixlib-shellout = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c6zhas6jfr4zd7f6s7sq7qi34ljs7qmdr4zj3ighpcsawm16zg9";
+      type = "gem";
+    };
+    version = "2.2.7";
+  };
+  mixlib-versioning = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07an7gxrw6gda98bg9zbfk55b2d58hwpms8wx8sd2x2lv8qs670s";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  molinillo = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758";
+      type = "gem";
+    };
+    version = "0.5.7";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  net-scp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+      type = "gem";
+    };
     version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
-    };
   };
-}
\ No newline at end of file
+  net-sftp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  net-ssh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  net-ssh-gateway = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04ws9bvf3ppvcj9vrnwyabcwv4lz1m66ni443z2cf4wvvqssifsa";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  net-ssh-multi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  net-telnet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  nio4r = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ka4923544ckvc9bxd75van9y901cjxmsiq9h5is9j743bz71k1f";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  nokogiri = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fhmgciw6pfckqgc0aq9kqpbvnakxwh1xf351c9x4xqcj9xjgn0y";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  nori = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  octokit = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4";
+      type = "gem";
+    };
+    version = "4.7.0";
+  };
+  ohai = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18bxqa2rh6y6v3pvimy9ffjzrqh7q1my4vd0l7bnsczv07d5gxns";
+      type = "gem";
+    };
+    version = "8.23.0";
+  };
+  paint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iyiyd6s2dy42mhqfnvq2f64h78w0jjwgnyha1kz7dnxavncdb7i";
+      type = "gem";
+    };
+    version = "1.11.1";
+  };
+  parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+      type = "gem";
+    };
+    version = "2.4.0.0";
+  };
+  parslet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  plist = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1abhg9bcdk2v4liyf10mnww3ngvkmr7flbzzajwsg2z1pmax8g8b";
+      type = "gem";
+    };
+    version = "3.2.0";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  proxifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  pry = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar";
+      type = "gem";
+    };
+    version = "0.10.4";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri";
+      type = "gem";
+    };
+    version = "2.2.1";
+    dependencies = [
+      "rake"
+    ];
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      type = "gem";
+    };
+    version = "12.0.0";
+  };
+  retryable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  ridley = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y6dcbxmn74qg5psdjk9i751zryfwypf56rb458dkq6b7mwfxxwb";
+      type = "gem";
+    };
+    version = "5.1.0";
+  };
+  rspec = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  rspec-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
+      type = "gem";
+    };
+    version = "3.5.4";
+  };
+  rspec-expectations = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  rspec-its = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  rspec-mocks = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  rspec_junit_formatter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  rubocop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mzv23i11hqwpxh4srvhm8dpzvnk90y46xdfd1fc1g9s054nnbq0";
+      type = "gem";
+    };
+    version = "0.48.1";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  rubyntlm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nfl35b2lgc4p3bgl6vmhsisap8h7p0rrb4b20gahji7s4m93bbk";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  rubyzip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rufus-lru = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sp7ymz054md75fnn2hx5d2axmhrh0abbn8c2p759j4g4lxn11ip";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  safe_yaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  sawyer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  semverse = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  serverspec = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j8fvjzmkcri83p0hiyfdypgbc616w2r0nr6rsi1696cd4nppknp";
+      type = "gem";
+    };
+    version = "2.38.0";
+  };
+  sfl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qm4hvhq9pszi9zs1cl9qgwx1n4wxq0af0hq9sbf6qihqd8rwwwr";
+      type = "gem";
+    };
+    version = "2.3";
+  };
+  slop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  solve = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  specinfra = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gdbkqr82p7s0aq0sixsahapijccs8qswssfmsb76hi40xb2s3sg";
+      type = "gem";
+    };
+    version = "2.67.7";
+  };
+  sslshake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sm0vxh9ryywsl9iqj8kkwpykh8xrr2fmlv5ysm9jjgwmdpslfvl";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  syslog-logger = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm";
+      type = "gem";
+    };
+    version = "1.6.8";
+  };
+  systemu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
+      type = "gem";
+    };
+    version = "2.6.5";
+  };
+  test-kitchen = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mg13w1xi36r7vsbdwf7cb06s2j1p2hig144r0hzqwi599w5l9hr";
+      type = "gem";
+    };
+    version = "1.16.0";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      type = "gem";
+    };
+    version = "0.19.1";
+  };
+  timers = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz";
+      type = "gem";
+    };
+    version = "4.0.4";
+  };
+  toml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  train = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dglwr6kirqn9k7am4gszvgkpndvyqydlfgmwjwikvpsvf8rxgrl";
+      type = "gem";
+    };
+    version = "0.23.0";
+  };
+  treetop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kx3qqdbdk5sy44cyinfx2jxr4w9z3qb17f7wicqa2kshbrvnp1q";
+      type = "gem";
+    };
+    version = "1.6.8";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  uuidtools = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
+      type = "gem";
+    };
+    version = "2.1.5";
+  };
+  varia_model = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kgj37rc3yia4pr5pma0psgar6xjk064qdfii3nwr6dj1v73cyxz";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  winrm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xf36sf2cgangij9maphprzhznv4w50arnwrik5jdnmfxc8lqfmh";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  winrm-elevated = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  winrm-fs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p9kv5hj57krlrh20ykq8pz4i911r30mbl57n6mc6hfba2zfl7j8";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  wmi-lite = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  yajl-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+}

From b55a9f86e44290b75a6e61317764b55eaa0bcede Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 8 Apr 2017 09:41:37 +0200
Subject: [PATCH 0766/1744] ponyc: 0.12.2 -> 0.13.0

https://github.com/ponylang/ponyc/issues/1823
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 6cd407374db..5655cf61a0b 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1gp92fwfq9ic43c525p0idap99jq5fkjbijf0s8bxif3kng7rxbp";
+    sha256 = "1agb7aiii7pl8zsh3h0lfzghmm1ajj15gx1j48xjyvplxixdgn9j";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 775531c1e3d996db5705aee3f2e2f6a583912c9d Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Sun, 26 Mar 2017 00:16:51 +0100
Subject: [PATCH 0767/1744] qt58: extend darwin compatibility

---
 .../libraries/qt-5/5.8/default.nix            |  8 +++--
 .../libraries/qt-5/5.8/qtbase/default.nix     |  6 ++--
 .../qt-5/5.8/qtdeclarative/default.nix        | 16 ++++++++--
 .../libraries/qt-5/5.8/qtmacextras.nix        | 10 +++++++
 .../libraries/qt-5/5.8/qtmultimedia.nix       | 11 ++++---
 .../libraries/qt-5/5.8/qtsensors.nix          |  4 ++-
 .../qt-5/5.8/qtserialport/default.nix         |  6 ++--
 .../libraries/qt-5/5.8/qttools/default.nix    | 21 ++++++++++++--
 .../qt-5/5.8/qtwebengine/default.nix          | 29 ++++++++++++-------
 .../5.8/qtwebkit/0004-icucore-darwin.patch    | 11 +++++++
 .../libraries/qt-5/5.8/qtwebkit/default.nix   | 14 +++++++--
 11 files changed, 106 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtmacextras.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index eb26f88f725..2865a879f47 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -76,6 +76,7 @@ let
       qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
       qtimageformats = callPackage ./qtimageformats.nix {};
       qtlocation = callPackage ./qtlocation.nix {};
+      qtmacextras = callPackage ./qtmacextras.nix {};
       qtmultimedia = callPackage ./qtmultimedia.nix {
         inherit gstreamer gst-plugins-base;
       };
@@ -97,12 +98,13 @@ let
       qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
 
       env = callPackage ../qt-env.nix {};
-      full = env "qt-${qtbase.version}" [
+      full = env "qt-${qtbase.version}" ([
         qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
         qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
-        qtsensors qtserialport qtsvg qttools qttranslations qtwayland
+        qtsensors qtserialport qtsvg qttools qttranslations
         qtwebsockets qtx11extras qtxmlpatterns
-      ];
+      ] ++ optional (!stdenv.isDarwin) qtwayland
+        ++ optional (stdenv.isDarwin) qtmacextras);
 
       makeQtWrapper =
         makeSetupHook
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 9642b613677..0af6ed8b594 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -211,8 +211,10 @@ stdenv.mkDerivation {
     libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
     xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
-    DiskArbitration darwin.cf-private libiconv
+    AGL AppKit ApplicationServices Carbon Cocoa
+    CoreAudio CoreBluetooth CoreLocation CoreServices
+    DiskArbitration Foundation OpenGL
+    darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
   ]);
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 9b6a6c46176..acddbd9e365 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -1,8 +1,18 @@
-{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
+{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
+
+with stdenv.lib;
 
 qtSubmodule {
   name = "qtdeclarative";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python2 ];
+  nativeBuildInputs = [ python2 makeQtWrapper ];
+
+  postInstall = ''
+    wrapQtProgram $out/bin/qmleasing
+    wrapQtProgram $out/bin/qmlscene
+    wrapQtProgram $out/bin/qmltestrunner
+  '' + optionalString (stdenv.isDarwin) ''
+    wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix
new file mode 100644
index 00000000000..582294cc7f7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix
@@ -0,0 +1,10 @@
+{ qtSubmodule, qtbase, lib }:
+
+qtSubmodule {
+  name = "qtmacextras";
+  qtInputs = [ qtbase ];
+  meta = with lib; {
+    maintainers = with maintainers; [ periklis ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
index 7c1cc5da07e..1c2dcc90d41 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
@@ -1,12 +1,15 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
+{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
+, darwin
 }:
 
+with stdenv.lib;
+
 qtSubmodule {
   name = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = [
-    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
-  ];
+  buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio]
+    ++ optional (stdenv.isLinux) alsaLib;
   qmakeFlags = [ "GST_VERSION=1.0" ];
+  NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
index 61e64dc47e4..7bb18f56fe2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
@@ -1,4 +1,6 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
+{ stdenv, qtSubmodule, qtbase, qtdeclarative }:
+
+with stdenv.lib;
 
 qtSubmodule {
   name = "qtsensors";
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
index 2bffd0a2bd6..1fde2c2bd18 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
@@ -1,9 +1,11 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
+{ stdenv, qtSubmodule, qtbase, substituteAll, systemd }:
+
+with stdenv.lib;
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = [
+  patches = optionals (stdenv.isLinux) [
     (substituteAll {
       src = ./0001-dlopen-serialport-udev.patch;
       libudev = systemd.lib;
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index d72d7b6c64c..6b97c2d85cd 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -1,11 +1,28 @@
-{ qtSubmodule, lib, copyPathsToStore, qtbase }:
+{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }:
+
+with stdenv.lib;
 
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ makeQtWrapper ];
+
+  patches = copyPathsToStore (readPathsFromFile ./. ./series);
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
   '';
+
+  postInstall =   ''
+    wrapQtProgram $out/bin/qcollectiongenerator
+    wrapQtProgram $out/bin/qhelpconverter
+    wrapQtProgram $out/bin/qhelpgenerator
+    wrapQtProgram $out/bin/qtdiag
+  '' + optionalString (stdenv.isDarwin) ''
+    wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant
+    wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer
+    wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist
+    wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool
+    wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
index 1edb0846029..37f12eed758 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -17,6 +17,8 @@
 , lib, stdenv # lib.optional, needsPax
 }:
 
+with stdenv.lib;
+
 qtSubmodule {
   name = "qtwebengine";
   qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
@@ -41,7 +43,7 @@ qtSubmodule {
       -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
       -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
       src/core/web_engine_library_info.cpp
-
+ '' + optionalString (!stdenv.isDarwin) ''
     sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
       src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
 
@@ -49,11 +51,9 @@ qtSubmodule {
       src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
   '';
 
-  qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
+  qmakeFlags = optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
 
   propagatedBuildInputs = [
-    dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
-
     # Image formats
     libjpeg libpng libtiff libwebp
 
@@ -61,19 +61,28 @@ qtSubmodule {
     srtp libvpx
 
     # Audio formats
-    alsaLib libopus
+    libopus
 
     # Text rendering
-    fontconfig freetype harfbuzz icu
+    harfbuzz icu
+  ]
+  ++ optionals (!stdenv.isDarwin) [
+    dbus zlib minizip snappy nss protobuf jsoncpp libevent
+
+    # Audio formats
+    alsaLib
+
+    # Text rendering
+    fontconfig freetype
+
+    libcap
+    pciutils
 
     # X11 libs
     xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
     xlibs.libXcomposite
-
-    libcap
-    pciutils
   ];
-  patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+  patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
   postInstall = ''
     cat > $out/libexec/qt.conf <<EOF
     [Paths]
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
new file mode 100644
index 00000000000..a1cc1892288
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
@@ -0,0 +1,11 @@
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri
++++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+@@ -12,7 +12,7 @@
+     # Mac OS does ship libicu but not the associated header files.
+     # Therefore WebKit provides adequate header files.
+     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
+-    LIBS += -licucore
++    LIBS += /usr/lib/libicucore.dylib
+ } else:!use?(wchar_unicode): {
+     win32 {
+         CONFIG(static, static|shared) {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
index 915a6bcae8a..881acb442e8 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
@@ -2,6 +2,7 @@
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
+, darwin
 , substituteAll
 , flashplayerFix ? false
 }:
@@ -11,10 +12,16 @@ with stdenv.lib;
 qtSubmodule {
   name = "qtwebkit";
   qtInputs = [ qtdeclarative qtlocation qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
+    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);
   nativeBuildInputs = [
     bison2 flex gdb gperf perl pkgconfig python2 ruby
   ];
+
+  __impureHostDeps = optionals (stdenv.isDarwin) [
+    "/usr/lib/libicucore.dylib"
+  ];
+
   patches =
     let dlopen-webkit-nsplugin = substituteAll {
           src = ./0001-dlopen-webkit-nsplugin.patch;
@@ -30,6 +37,7 @@ qtSubmodule {
           libudev = systemd.lib;
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
-  meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
+    ++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
+    ++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];
+  meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
 }

From 94214467ff66cdb810e8e9c33f9aff0a0735ea1c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 8 Apr 2017 10:57:33 +0200
Subject: [PATCH 0768/1744] google-cloud-sdk: 148.0.1 -> 150.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 6e6fbed2dbf..7c410a1a4f4 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "148.0.1";
+  version = "150.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "17az8nah6s33c790kkqcpmcsc8cydhndmq7dblpwgizd86hg245g";
+        sha256 = "0zg6jnn93dq53glds4cghksyghb4d4z0i2h38na0r88mr8hzmx1l";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "1p5076cqk02y8zc3pkdlmrgh3mx2w1pddb2r5c9h3krfcaim2yj8";
+        sha256 = "1vbc360z2da3blwx51asw7jh0v0v6wsrv20z36yq0hccmljlh24w";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "0fr07vcksy0vrg7inmyddz9jlbqx0yg933s45zzkpp3a0m5hz6ll";
+        sha256 = "1q66aap3qidfsa8gm13jff3dprx8qarhjkx5ib65439fy4zj0bca";
       };
 
   buildInputs = [python27 makeWrapper];

From 016a319b501d4624ee47f97c18c3c8e4d0bbbef5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Apr 2017 07:59:27 -0400
Subject: [PATCH 0769/1744] linux: 4.9.20 -> 4.9.21

---
 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 e8facc96ebc..6e36ab81aa5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.20";
+  version = "4.9.21";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h8km3z5c3qyhwq24dvh00j2jzfcyqdjjcjrrz5qvyrjvl30hrj8";
+    sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p";
   };
 
   kernelPatches = args.kernelPatches;

From 1988c1fa4177c573e348c756ef4f35c60145dccc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Apr 2017 08:02:18 -0400
Subject: [PATCH 0770/1744] linux: 4.10.8 -> 4.10.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index a4fa8f65c39..252eb2498cc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.8";
+  version = "4.10.9";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12wf3nzhs0hbl87ckwc15b492z50lg4c7rxwqw50px3zhh5mvf8a";
+    sha256 = "1y8cpwhkcb8lsryiyqqr1w58snw26x3x6c4f9v1xnh9grz0s4j6h";
   };
 
   kernelPatches = args.kernelPatches;

From 79f9544eca8659bad4e48c31accf62f69521fb86 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Apr 2017 08:04:54 -0400
Subject: [PATCH 0771/1744] linux: 4.4.59 -> 4.4.60

---
 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 da633753e70..718c76b8dfa 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.59";
+  version = "4.4.60";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jlnm6msxdhm7l6all91rd1rkqsqpd0rblbdl68z7nkz9hy55sb4";
+    sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f";
   };
 
   kernelPatches = args.kernelPatches;

From 55e191d8445743112660a801f3cfeda75a76ec2a Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sat, 8 Apr 2017 12:57:37 +0200
Subject: [PATCH 0772/1744] haskell: Correct dependencies for
 haskell-tools-*_0_6_0_0

---
 .../haskell-modules/configuration-common.nix  | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 643f71f9f87..643940797bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -875,4 +875,34 @@ self: super: {
 
   # https://github.com/danidiaz/tailfile-hinotify/issues/2
   tailfile-hinotify = dontCheck super.tailfile-hinotify;
-}
+} // (let scope' = self: super: {
+            haskell-tools-ast = super.haskell-tools-ast_0_6_0_0;
+            haskell-tools-backend-ghc = super.haskell-tools-backend-ghc_0_6_0_0;
+            haskell-tools-cli = super.haskell-tools-cli_0_6_0_0;
+            haskell-tools-daemon = super.haskell-tools-daemon_0_6_0_0;
+            haskell-tools-debug = super.haskell-tools-debug_0_6_0_0;
+            haskell-tools-demo = super.haskell-tools-demo_0_6_0_0;
+            haskell-tools-prettyprint = super.haskell-tools-prettyprint_0_6_0_0;
+            haskell-tools-refactor = super.haskell-tools-refactor_0_6_0_0;
+            haskell-tools-rewrite = super.haskell-tools-rewrite_0_6_0_0;
+          };
+      in {
+        haskell-tools-ast_0_6_0_0 =
+          super.haskell-tools-ast_0_6_0_0.overrideScope scope';
+        haskell-tools-backend-ghc_0_6_0_0 =
+          super.haskell-tools-backend-ghc_0_6_0_0.overrideScope scope';
+        haskell-tools-cli_0_6_0_0 =
+          dontCheck (super.haskell-tools-cli_0_6_0_0.overrideScope scope');
+        haskell-tools-daemon_0_6_0_0 =
+          dontCheck (super.haskell-tools-daemon_0_6_0_0.overrideScope scope');
+        haskell-tools-debug_0_6_0_0 =
+          super.haskell-tools-debug_0_6_0_0.overrideScope scope';
+        haskell-tools-demo_0_6_0_0 =
+          super.haskell-tools-demo_0_6_0_0.overrideScope scope';
+        haskell-tools-prettyprint_0_6_0_0 =
+          super.haskell-tools-prettyprint_0_6_0_0.overrideScope scope';
+        haskell-tools-refactor_0_6_0_0 =
+          super.haskell-tools-refactor_0_6_0_0.overrideScope scope';
+        haskell-tools-rewrite_0_6_0_0 =
+          super.haskell-tools-rewrite_0_6_0_0.overrideScope scope';
+     })

From d0954b549410cc98cbc8fe65610487b19e08bfa4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 8 Apr 2017 07:48:09 -0500
Subject: [PATCH 0773/1744] nixos/fontconfig-ultimate: Restore presets

The `preset` option was accidentally removed.
---
 nixos/modules/config/fonts/fontconfig-ultimate.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index e412146a039..1bf9fdb1984 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -63,6 +63,15 @@ in
               <literal>none</literal> disables the substitutions.
             '';
           };
+
+          preset = mkOption {
+            type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];
+            default = "ultimate3";
+            description = ''
+              FreeType rendering settings preset. Any of the presets may be
+              customized by setting environment variables.
+            '';
+          };
         };
       };
     };
@@ -72,6 +81,7 @@ in
   config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
 
     fonts.fontconfig.confPackages = [ confPkg ];
+    environment.variables."INFINALITY_FT" = cfg.preset;
 
   };
 

From 2214b638a7ddc7845eacfdc74fedd786c7d6e344 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 8 Apr 2017 09:33:21 -0500
Subject: [PATCH 0774/1744] nixos/fonts: install gyre-fonts by default

gyre-fonts provides high-quality TrueType substitutes for standard PostScript
fonts. Unlike most other distributions, NixOS does not install Ghostscript and
its Type 1 fonts by default, so we must get the standard fonts elsewhere.
---
 nixos/modules/config/fonts/fonts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index af3d93fc1bc..0dd01df9da7 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -37,6 +37,7 @@ with lib;
         pkgs.xorg.fontbhlucidatypewriter75dpi
         pkgs.dejavu_fonts
         pkgs.freefont_ttf
+        pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
         pkgs.liberation_ttf
         pkgs.xorg.fontbh100dpi
         pkgs.xorg.fontmiscmisc

From a40600bc58aa3f6ba87b8cc7d1e101dc5b4eb164 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 8 Apr 2017 09:42:09 -0500
Subject: [PATCH 0775/1744] fontconfig-penultimate: 0.3.2 -> 0.3.3

---
 pkgs/data/fonts/fontconfig-penultimate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index a42e5d9109b..148cbb2f8c1 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "0.3.2"; in
+let version = "0.3.3"; in
 stdenv.mkDerivation {
   name = "fontconfig-penultimate-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "ttuegel";
     repo = "fontconfig-penultimate";
     rev = version;
-    sha256 = "01cgqdmgpqahkg71lnvr3yzsmka9q1kgkbiz6w5ds1fhrpcswj7p";
+    sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
   };
 
   installPhase = ''

From 21e3c2a72f5392af592bae76041ecbfbd65caf7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 8 Apr 2017 17:12:59 +0200
Subject: [PATCH 0776/1744] sstmp: document how to specify port/AuthPassFile

---
 nixos/modules/programs/ssmtp.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 1702edab6e4..44756171b74 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -39,7 +39,8 @@ in
         example = "mail.example.org";
         description = ''
           The host name of the default mail server to use to deliver
-          e-mail.
+          e-mail. Can also contain a port number (ex: mail.example.org:587),
+          defaults to port 25 if no port is given.
         '';
       };
 
@@ -106,7 +107,8 @@ in
         default = null;
         example = "/run/keys/ssmtp-authpass";
         description = ''
-          Path to a file that contains the password used for SMTP auth.
+          Path to a file that contains the password used for SMTP auth. The file
+          should not contain a trailing newline, if the password does not contain one.
           This file should be readable by the users that need to execute ssmtp.
 
           <option>authPassFile</option> takes precedence over <option>authPass</option>.

From 8889d405c7aa22ae7d1e571d3f3c30b14e2faafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 8 Apr 2017 17:43:40 +0200
Subject: [PATCH 0777/1744] rustRegistry: 2017-04-03 -> 2017-04-08

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1bebf222ac5..ce8605a27e8 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-04-03";
-  rev = "24cb86b25f4d4758b775e78c03673378ed28120d";
-  sha256 = "07nzdrrghbpikh0mgvi1mv66mxisd47lcwk6v3szbsy5pgj6dxnq";
+  version = "2017-04-08";
+  rev = "9876afbb35a2fe28748990f76d91eaae827e2aae";
+  sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh";
 
   src = fetchFromGitHub {
       inherit rev;

From 16e12a6c42186436f9f06f846a100f907d02d16d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Apr 2017 18:37:03 +0200
Subject: [PATCH 0778/1744] glusterfs: 3.10.0 -> 3.10.1

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 2f49d630c15..4689207e835 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,10 +6,10 @@ let
   s =
   rec {
     baseName="glusterfs";
-    version = "3.10.0";
+    version = "3.10.1";
     name="${baseName}-${version}";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.0/glusterfs-3.10.0.tar.gz";
-    sha256 = "1svysq55z4sd6bxcdpkxljwis4cnzkknag22ngyr7sgb4bs19c97";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.10/${version}/glusterfs-${version}.tar.gz";
+    sha256 = "05qmn85lg3d1gz0fhn1v2z7nwl2qwbflvjc8nvkfyr4r57rkvhnk";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline

From ecf03368f8b624b8573f97f70387d6d14f7e32fe Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 8 Apr 2017 19:32:19 +0200
Subject: [PATCH 0779/1744] bepasty: add secretKeyFile option

This gives users the option to store secrets outside the
world-readable Nix store.
---
 nixos/modules/services/misc/bepasty.nix | 36 ++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 52719222db6..4d78cddcb54 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -21,7 +21,7 @@ in
         configure a number of bepasty servers which will be started with
         gunicorn.
         '';
-      type = with types ; attrsOf (submodule ({
+      type = with types ; attrsOf (submodule ({ config, ... } : {
 
         options = {
 
@@ -34,7 +34,6 @@ in
             default = "127.0.0.1:8000";
           };
 
-
           dataDir = mkOption {
             type = types.str;
             description = ''
@@ -73,10 +72,28 @@ in
             type = types.str;
             description = ''
               server secret for safe session cookies, must be set.
+
+              Warning: this secret is stored in the WORLD-READABLE Nix store!
+
+              It's recommended to use <option>secretKeyFile</option>
+              which takes precedence over <option>secretKey</option>.
               '';
             default = "";
           };
 
+          secretKeyFile = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = ''
+              A file that contains the server secret for safe session cookies, must be set.
+
+              <option>secretKeyFile</option> takes precedence over <option>secretKey</option>.
+
+              Warning: when <option>secretKey</option> is non-empty <option>secretKeyFile</option>
+              defaults to a file in the WORLD-READABLE Nix store containing that secret.
+              '';
+          };
+
           workDir = mkOption {
             type = types.str;
             description = ''
@@ -87,11 +104,22 @@ in
           };
 
         };
+        config = {
+          secretKeyFile = mkDefault (
+            if config.secretKey != ""
+            then toString (pkgs.writeTextFile {
+              name = "bepasty-secret-key";
+              text = config.secretKey;
+            })
+            else null
+          );
+        };
       }));
     };
   };
 
   config = mkIf cfg.enable {
+
     environment.systemPackages = [ bepasty ];
 
     # creates gunicorn systemd service for each configured server
@@ -115,7 +143,7 @@ in
           serviceConfig = {
             Type = "simple";
             PrivateTmp = true;
-            ExecStartPre = assert server.secretKey != ""; pkgs.writeScript "bepasty-server.${name}-init" ''
+            ExecStartPre = assert !isNull server.secretKeyFile; pkgs.writeScript "bepasty-server.${name}-init" ''
               #!/bin/sh
               mkdir -p "${server.workDir}"
               mkdir -p "${server.dataDir}"
@@ -123,7 +151,7 @@ in
               cat > ${server.workDir}/bepasty-${name}.conf <<EOF
               SITENAME="${name}"
               STORAGE_FILESYSTEM_DIRECTORY="${server.dataDir}"
-              SECRET_KEY="${server.secretKey}"
+              SECRET_KEY="$(cat "${server.secretKeyFile}")"
               DEFAULT_PERMISSIONS="${server.defaultPermissions}"
               ${server.extraConfig}
               EOF

From cfaad2679e419eeb6f152e42cde748e840b07a85 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 8 Apr 2017 15:34:26 -0300
Subject: [PATCH 0780/1744] amdgpu-pro: 16.60 -> 17.10

---
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  6 +-
 .../patches/0001-disable-firmware-copy.patch  | 10 +--
 .../patches/0002-linux-4.9-fixes.patch        | 85 +++++--------------
 ...seq_printf-format-for-64-bit-context.patch | 10 +--
 .../0004-fix-warnings-for-Werror.patch        | 44 ++--------
 5 files changed, 40 insertions(+), 115 deletions(-)

diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 7cf2bc4f975..e7825a0ebd6 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "16.60";
+  version = "17.10";
   pname = "amdgpu-pro";
-  build = "${version}-379184";
+  build = "${version}-401251";
 
   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 = "1g90sryxw8y4abjgviibq34v3hr82ijgbaiqnxgafrf7g9s5m2yq";
+    sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
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
index 6803cf03289..4733e0580af 100644
--- 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
@@ -1,4 +1,4 @@
-From ad3f6de6d16ea8ee76635dd39875eeab39def6e9 Mon Sep 17 00:00:00 2001
+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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] disable firmware copy
  1 file changed, 5 deletions(-)
 
 diff --git a/pre-build.sh b/pre-build.sh
-index 25e718f..e3cd009 100755
+index 622ff13..e3cd009 100755
 --- a/pre-build.sh
 +++ b/pre-build.sh
 @@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
@@ -18,8 +18,8 @@ index 25e718f..e3cd009 100755
 -
 -FW_DIR="/lib/firmware/$KERNELVER"
 -mkdir -p $FW_DIR
--cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/radeon $FW_DIR
--cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/amdgpu $FW_DIR
+-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.11.0
+2.12.2
 
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
index 86dbea29e08..aa6cbcc118d 100644
--- 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
@@ -1,63 +1,31 @@
-From 52e47be93c7a492730477f590e5eb42e035018bd Mon Sep 17 00:00:00 2001
+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/amdgpu/amdgpu_connectors.c          | 8 ++++++++
- amd/amdgpu/amdgpu_ttm.c                 | 4 ++++
+ amd/amdkcl/kcl_io.c                     | 2 ++
  amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- include/kcl/kcl_mm.h                    | 4 +++-
- 4 files changed, 23 insertions(+), 1 deletion(-)
+ 2 files changed, 10 insertions(+)
 
-diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c
-index 1b51981..4b43379 100644
---- a/amd/amdgpu/amdgpu_connectors.c
-+++ b/amd/amdgpu/amdgpu_connectors.c
-@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)
- 		}
- 
- 		/* Any defined maximum tmds clock limit we must not exceed? */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+		if (connector->display_info.max_tmds_clock > 0) {
-+#else
- 		if (connector->max_tmds_clock > 0) {
-+#endif
- 			/* mode_clock is clock in kHz for mode to be modeset on this connector */
- 			mode_clock = amdgpu_connector->pixelclock_for_modeset;
- 
- 			/* Maximum allowable input clock in kHz */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+			max_tmds_clock = connector->display_info.max_tmds_clock * 1000;
-+#else
- 			max_tmds_clock = connector->max_tmds_clock * 1000;
-+#endif
- 
- 			DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n",
- 				  connector->name, mode_clock, max_tmds_clock);
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 447529d..252bab4 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -255,7 +255,11 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp)
- 
- 	if (amdgpu_ttm_tt_get_usermm(bo->ttm))
- 		return -EPERM;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp->private_data);
-+#else
- 	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp);
-+#endif
+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);
  }
- 
- static void amdgpu_move_null(struct ttm_buffer_object *bo,
+ #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 be7aafb..5e11f26 100644
+index 34313a9..44a4a71 100644
 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1692,6 +1692,10 @@ static int dm_plane_helper_prepare_fb(
+@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
+ static int dm_plane_helper_prepare_fb(
  	struct drm_plane *plane,
- 	struct drm_framebuffer *fb,
  	const struct drm_plane_state *new_state)
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 +static int dm_plane_helper_prepare_fb(
@@ -66,9 +34,9 @@ index be7aafb..5e11f26 100644
  #else
  static int dm_plane_helper_prepare_fb(
  	struct drm_plane *plane,
-@@ -1735,6 +1739,10 @@ static void dm_plane_helper_cleanup_fb(
+@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
+ static void dm_plane_helper_cleanup_fb(
  	struct drm_plane *plane,
- 	struct drm_framebuffer *fb,
  	const struct drm_plane_state *old_state)
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 +static void dm_plane_helper_cleanup_fb(
@@ -77,21 +45,6 @@ index be7aafb..5e11f26 100644
  #else
  static void dm_plane_helper_cleanup_fb(
  	struct drm_plane *plane,
-diff --git a/include/kcl/kcl_mm.h b/include/kcl/kcl_mm.h
-index a18936d..f068195 100644
---- a/include/kcl/kcl_mm.h
-+++ b/include/kcl/kcl_mm.h
-@@ -8,7 +8,9 @@ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct *
-                                      int write, int force, struct page **pages,
-                                      struct vm_area_struct **vmas)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+        return get_user_pages(start, nr_pages, write ? FOLL_WRITE : 0, pages, vmas);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-         return get_user_pages(start, nr_pages, write, force, pages, vmas);
- #else
-         return get_user_pages(tsk, mm, start, nr_pages,
 -- 
-2.11.0
+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
index 6856b9ae092..7a11c9bd4ef 100644
--- 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
@@ -1,4 +1,4 @@
-From cc490c71a98b6bbe390fcf777fbe0360d01bf4ca Mon Sep 17 00:00:00 2001
+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
@@ -8,18 +8,18 @@ Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index c43f582..8c4b9f7 100644
+index 74932bf..db4119a 100644
 --- a/amd/amdgpu/amdgpu_sa.c
 +++ b/amd/amdgpu/amdgpu_sa.c
-@@ -427,7 +427,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+@@ -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);
+ 					i->fence->seqno, i->fence->context);
  #else
 -- 
-2.11.0
+2.12.2
 
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
index d226504c4e4..cd360e18faa 100644
--- 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
@@ -1,30 +1,15 @@
-From 9970f3107aed7b2b1ff1c5f29129b62cec99980d Mon Sep 17 00:00:00 2001
+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_kms.c                 | 2 +-
  amd/amdgpu/amdgpu_ttm.c                 | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm.c       | 2 +-
  amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 4 files changed, 5 insertions(+), 3 deletions(-)
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/amd/amdgpu/amdgpu_kms.c b/amd/amdgpu/amdgpu_kms.c
-index b7b51ae..bc884f6 100644
---- a/amd/amdgpu/amdgpu_kms.c
-+++ b/amd/amdgpu/amdgpu_kms.c
-@@ -591,7 +591,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
- 
- 			bios = adev->bios + bios_offset;
- 			return copy_to_user(out, bios,
--				min((size_t)size, bios_size - bios_offset))
-+				min(size, bios_size - bios_offset))
- 					? -EFAULT : 0;
- 		}
- 		default:
 diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 252bab4..90f3655 100644
+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,
@@ -41,26 +26,13 @@ index 252bab4..90f3655 100644
  }
 +#endif
  
- static struct ttm_bo_driver amdgpu_bo_driver = {
- 	.ttm_tt_create = &amdgpu_ttm_tt_create,
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm.c b/amd/display/amdgpu_dm/amdgpu_dm.c
-index 3dcb619..5700861 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -121,7 +121,7 @@ static bool dm_check_soft_reset(void *handle)
- 
- static int dm_soft_reset(void *handle)
- {
--	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-+	/* struct amdgpu_device *adev = (struct amdgpu_device *)handle; */
- 
- 	/* XXX todo */
- 	return 0;
+ 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 5e11f26..7039542 100644
+index 44a4a71..ae7e707 100644
 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -913,7 +913,7 @@ static void decide_crtc_timing_for_drm_display_mode(
+@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
  }
  
  static struct dc_target *create_target_for_sink(
@@ -70,5 +42,5 @@ index 5e11f26..7039542 100644
  		const struct dm_connector_state *dm_state)
  {
 -- 
-2.11.0
+2.12.2
 

From 9d94e100f5d5f71a375df845d748bbd0b081943f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Apr 2017 15:03:33 -0400
Subject: [PATCH 0781/1744] coursier: 1.0.0-M15-5 -> 1.0.0-RC1

---
 pkgs/development/tools/coursier/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 7a2b3e8e1d9..483905f5f2e 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name    = "coursier-${version}";
-  version = "1.0.0-M15-5";
+  name = "coursier-${version}";
+  version = "1.0.0-RC1";
 
   src = fetchurl {
-    url    = "https://github.com/coursier/coursier/raw/v${version}/coursier";
-    sha256 = "610c5fc08d0137c5270cefd14623120ab10cd81b9f48e43093893ac8d00484c9";
+    url = "https://github.com/coursier/coursier/raw/v${version}/coursier";
+    sha256 = "0dxwhqp7m7nmal8wn4chlmyvhdh6v3ja0nfz9x952kacf2vpnqw3";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://get-coursier.io/;
+    homepage = http://get-coursier.io/;
     description = "A Scala library to fetch dependencies from Maven / Ivy repositories";
-    license     = licenses.asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ adelbertc nequissimus ];
   };
 }

From 333923c88bb22f039a6da52bb55b8a14d7b7e4d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 8 Apr 2017 14:48:07 -0500
Subject: [PATCH 0782/1744] dropbox: 22.4.24 -> 23.4.17

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 097ff84a704..44caf615205 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "22.4.24";
+  version = "23.4.17";
   sha256 =
     {
-      "x86_64-linux" = "1353mwk8hjqfc9a87zrp12klsc4anrxr7ccai4cffnq0yw2pnbfp";
-      "i686-linux"   = "07gpdxq61qkj3c4aywh61zwj34w7j24gcv5y2xf2qgcwn8bykks2";
+      "x86_64-linux" = "047i6afghb2nphwwc8sd6dxcbfi9cdyb1w4ssvwfkmbf3mznpfrh";
+      "i686-linux"   = "186z540iv4gq2gmis3mjly070y09lsfwvk9ygmjrh6y7pd9dqa5n";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 60160234aac5f594fc64c26bc406c7e85d058e66 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 8 Apr 2017 21:48:42 +0200
Subject: [PATCH 0783/1744] nsd: 4.1.14 -> 4.1.15

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 89845fff9c6..e69b25c5b94 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.14";
+  name = "nsd-4.1.15";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802";
+    sha256 = "494a862cfcd26a525a4bf06306eb7ab0387b34678ac6d37767507438e3a23a4b";
   };
 
   buildInputs = [ libevent openssl ];

From a6c39ed207e5d6dbdf28ab812286e123505ac71f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 8 Apr 2017 16:21:57 -0400
Subject: [PATCH 0784/1744] haskell-lib: Add overrideSrc helper

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index f88f2f2cf54..0aed2211448 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -104,4 +104,7 @@ rec {
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
+  overrideSrc = drv: { src, version ? drv.version }:
+    overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
+
 }

From 72d9016b8ba4934d6fdcb3a76ea7cae1ab5149b8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 8 Apr 2017 16:38:41 -0400
Subject: [PATCH 0785/1744] darwin.make-bootstrap-tools: fix to use LLVM 4

This should now roughly match the bootstrap tools we're using on Darwin
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 85e4dabbbde..4f651575d6a 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -3,7 +3,7 @@
 with import pkgspath { inherit system; };
 
 let
-  llvmPackages = llvmPackages_37;
+  llvmPackages = llvmPackages_4;
 in rec {
   coreutils_ = coreutils.override (args: {
     # We want coreutils without ACL support.

From fbdc4616ab2bf11d92411f2b59671699268e458a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 8 Apr 2017 16:54:16 -0400
Subject: [PATCH 0786/1744] nix: fix on LLVM 4.0

---
 pkgs/tools/package-management/nix/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index dbd6a352132..11edda06f13 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -7,8 +7,8 @@
 
 let
 
-  common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec {
-    inherit name src;
+  common = { name, suffix ? "", src, patchPhase, fromGit ? false }: stdenv.mkDerivation rec {
+    inherit name src patchPhase;
     version = lib.getVersion name;
 
     VERSION_SUFFIX = lib.optionalString fromGit suffix;
@@ -109,6 +109,14 @@ in rec {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
       sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
     };
+
+    # 1.11.8 doesn't yet have the patch to work on LLVM 4, so we patch it for now. Take this out once
+    # we move to a higher version. I'd pull the specific patch from upstream but it doesn't apply cleanly.
+    patchPhase = ''
+      substituteInPlace src/libexpr/json-to-value.cc \
+        --replace 'std::less<Symbol>, gc_allocator<Value *>' \
+                  'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >'
+    '';
   };
 
   nixUnstable = lib.lowPrio (common rec {

From 215e8e40206176348e8624b813a95cbf8993ed0a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Apr 2017 18:13:48 -0400
Subject: [PATCH 0787/1744] minikube: 0.17.1 -> 0.18.0

---
 .../networking/cluster/minikube/default.nix   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 19fe89ea449..9d17443ac88 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -10,22 +10,19 @@ let
   # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare.
   #
   # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge
-  # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like,
-  # so for example it doesn't know about v1.5.3 even though there's a perfectly good version of localkube hosted there. So
+  # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like. So
   # 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. Note that we can't use 1.5.3 with minikube 0.17.1
-  # expects to be able to pass it a command-line argument that it doesn't understand. v1.5.4 and higher should be fine. There
-  # doesn't seem to ae any official release of localkube for 1.5.4 yet so I'm temporarily grabbing a version built from the
-  # minikube CI server.
+  # currently https://storage.googleapis.com/minikube/k8s_releases.json
+
+  localkube-version = "1.6.0";
   localkube-binary = fetchurl {
-    url    = "https://storage.googleapis.com/minikube-builds/1216/localkube";
-    # url    = "https://storage.googleapis.com/minikube/k8sReleases/v${kubernetes.version}/localkube-linux-amd64";
-    sha256 = "1vqrsak7n045ci6af3rpgs2qwjnrqk8k7c3ax6wzli4m8vhsiv57";
+    url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
+    sha256 = "0zx0c9fwairvga1g1112l5g5pspm2m9wxb42qgfxfgyidywvirha";
   };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.17.1";
+  version = "0.18.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -33,7 +30,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1m61yipn0p3cfavjddhrg1rcmr0hv6k3zxvqqd9fisl79g0sdfsr";
+    sha256 = "0r8184xfsw7vvvmzhc18si582q41cnzka4ry151hwy56gmp2jyiw";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

From 98a287e733ead07ec4783656491f6b744297191c Mon Sep 17 00:00:00 2001
From: Cole Scott <colescottsf@gmail.com>
Date: Sat, 8 Apr 2017 02:08:56 +0200
Subject: [PATCH 0788/1744] lib/maintainers.nix add colescott

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9d59ebc9e3e..231574b7bb5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -106,6 +106,7 @@
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
   colemickens = "Cole Mickens <cole.mickens@gmail.com>";
+  colescott = "Cole Scott <colescottsf@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   corngood = "David McFarland <corngood@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";

From 9597247cc03997655fde22e635bba845d40189d2 Mon Sep 17 00:00:00 2001
From: Cole Scott <colescottsf@gmail.com>
Date: Sat, 8 Apr 2017 02:10:54 +0200
Subject: [PATCH 0789/1744] arm-frc-linux-gnueabi-linux-api-headers: init at
 3.19-r0.36

---
 .../default.nix                               | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100755 pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix

diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix
new file mode 100755
index 00000000000..29e349e0a82
--- /dev/null
+++ b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix
@@ -0,0 +1,43 @@
+{stdenv, fetchurl}:
+
+let
+  _target = "arm-frc-linux-gnueabi";
+  _basever = "3.19-r0.36";
+  src = fetchurl {
+    url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk";
+    sha256 = "10066ddb9a19bf764a9a67919a7976478041e98c44c19308f076c78ecb07408c";
+  };
+in
+stdenv.mkDerivation rec {
+  version = "3.19";
+  name = "${_target}-linux-api-headers-${version}";
+
+  sourceRoot = ".";
+  inherit src;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackCmd = ''
+    ar x $curSrc
+    tar xf data.tar.gz
+  '';
+
+  installPhase = ''
+    mkdir -p $out/${_target}
+    find . \( -name .install -o -name ..install.cmd \) -delete
+    cp -r usr/ $out/${_target}
+  '';
+
+  meta = {
+    description = "FRC linux api headers";
+    longDescription = ''
+      All linux api headers required to compile the arm-frc-linux-gnuaebi-gcc
+      cross compiler and all user programs.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.colescott ];
+    platforms = stdenv.lib.platforms.linux;
+
+    priority = 1;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99e2ab0cda1..18cecf8b993 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,6 +444,8 @@ with pkgs;
 
   argyllcms = callPackage ../tools/graphics/argyllcms {};
 
+  arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {};
+
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
   artyFX = callPackage ../applications/audio/artyFX {};

From 7c32b93c9a707e16d6d5153bf73f5bc6ff028356 Mon Sep 17 00:00:00 2001
From: Cole Scott <colescottsf@gmail.com>
Date: Sat, 8 Apr 2017 02:11:17 +0200
Subject: [PATCH 0790/1744] arm-frc-linux-gnueabi-eglibc: init at 2.21-r0.83

---
 .../arm-frc-linux-gnueabi-eglibc/default.nix  | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 67 insertions(+)
 create mode 100755 pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix

diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix
new file mode 100755
index 00000000000..8adbef8f576
--- /dev/null
+++ b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix
@@ -0,0 +1,65 @@
+{stdenv, fetchurl, arm-frc-linux-gnueabi-linux-api-headers}:
+
+let
+  _target = "arm-frc-linux-gnueabi";
+  _basever = "2.21-r0.83";
+  srcs = [
+    (fetchurl {
+      url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk";
+      sha256 = "117058215440e258027bb9ff18db63c078d55288787dbedfcd5730c06c7a1ae9";
+    })
+    (fetchurl {
+      url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk";
+      sha256 = "e28b05d498c1160949f51539270035e12c5bb9d75d68df1f5f111a8fc087f3a6";
+    })
+    (fetchurl {
+      url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk";
+      sha256 = "0f7372590abf69da54a9b7db8f944cf6c48d9ac8a091218ee60f84fdd9de2398";
+    })
+    (fetchurl {
+      url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk";
+      sha256 = "5a839498507a0b63165cb7a78234d7eb2ee2bb6a046bff586090f2e70e0e2bfb";
+    })
+    (fetchurl {
+      url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk";
+      sha256 = "d765d43c8ec95a4c64fa38eddf8cee848fd090d9cc5b9fcda6d2c9b03d2635c5";
+    })
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "2.21";
+  name = "${_target}-eglibc-${version}";
+
+  sourceRoot = ".";
+  inherit srcs;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackCmd = ''
+      ar x $curSrc
+      tar xf data.tar.gz
+  '';
+
+  installPhase = ''
+    mkdir -p $out/${_target}
+    rm -rf lib/eglibc
+    find . \( -name .install -o -name ..install.cmd \) -delete
+    cp -r lib $out/${_target}
+    cp -r usr $out/${_target}
+
+    cp -r ${arm-frc-linux-gnueabi-linux-api-headers}/* $out
+  '';
+
+  meta = {
+    description = "FRC standard C lib";
+    longDescription = ''
+      eglibc library for the NI RoboRio to be used in compiling frc user
+      programs.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.colescott ];
+    platforms = stdenv.lib.platforms.linux;
+
+    priority = 2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18cecf8b993..e947c7db899 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,6 +444,8 @@ with pkgs;
 
   argyllcms = callPackage ../tools/graphics/argyllcms {};
 
+  arm-frc-linux-gnueabi-eglibc = callPackage ../development/libraries/arm-frc-linux-gnueabi-eglibc {};
+
   arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {};
 
   arp-scan = callPackage ../tools/misc/arp-scan { };

From 1d7a478c92e3ca3b952008e16cceafe4e831036b Mon Sep 17 00:00:00 2001
From: Cole Scott <colescottsf@gmail.com>
Date: Sat, 8 Apr 2017 02:11:52 +0200
Subject: [PATCH 0791/1744] arm-frc-linux-gnueabi-binutils: init at 2.28

---
 .../default.nix                               | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100755 pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix

diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix
new file mode 100755
index 00000000000..4e3ad7ab8b0
--- /dev/null
+++ b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix
@@ -0,0 +1,50 @@
+{stdenv, fetchurl, glibc, bison, arm-frc-linux-gnueabi-eglibc}:
+
+stdenv.mkDerivation rec {
+  _target = "arm-frc-linux-gnueabi";
+
+  version = "2.28";
+  name = "${_target}-binutils-${version}";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.bz2";
+    sha256 = "369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88";
+  };
+
+  nativeBuildInputs = [ bison arm-frc-linux-gnueabi-eglibc ];
+  buildInputs = [ glibc ];
+
+  configureFlags = ''
+    --target=${_target}
+    --with-pkgversion='GNU-Binutils-for-FRC'
+    --with-sysroot=$out/${_target}
+    --with-build-sysroot=/$out/${_target}
+    --disable-multilib
+    --disable-nls
+    --enable-lto
+    --disable-libiberty-install
+    --enable-ld
+    --enable-gold=default
+    --enable-plugins
+  '';
+
+  postConfigure = ''
+    make configure-host
+  '';
+
+  postInstall = ''
+    rm -rf $out/share/info
+  '';
+
+  meta = {
+    description = "FRC binutils";
+    longDescription = ''
+      binutils used to build arm-frc-linux-gnueabi and user programs.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.colescott ];
+    platforms = stdenv.lib.platforms.linux;
+
+    priority = 3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e947c7db899..d86f95e23ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -448,6 +448,8 @@ with pkgs;
 
   arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {};
 
+  arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {};
+
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
   artyFX = callPackage ../applications/audio/artyFX {};

From ff1e372849c74ed60eac1969d57c487c0042296a Mon Sep 17 00:00:00 2001
From: Cole Scott <colescottsf@gmail.com>
Date: Sat, 8 Apr 2017 02:12:22 +0200
Subject: [PATCH 0792/1744] arm-frc-linux-gnueabi-gcc: init at 4.9.4

fixes #24578
---
 .../arm-frc-linux-gnueabi-gcc/default.nix     | 98 +++++++++++++++++++
 .../minorSOname.patch                         | 49 ++++++++++
 .../no-nested-deprecated-warnings.patch       | 22 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 171 insertions(+)
 create mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix
 create mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch
 create mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch

diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix
new file mode 100755
index 00000000000..6fa25df5e03
--- /dev/null
+++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix
@@ -0,0 +1,98 @@
+{stdenv, fetchurl
+, arm-frc-linux-gnueabi-binutils, arm-frc-linux-gnueabi-eglibc, arm-frc-linux-gnueabi-linux-api-headers
+, elfutils
+, libmpc, gmp, mpfr, zlib, isl_0_15, cloog}:
+
+stdenv.mkDerivation rec {
+  _target = "arm-frc-linux-gnueabi";
+
+  version = "4.9.4";
+  name = "${_target}-gcc-${version}";
+
+  src = fetchurl {
+    url = "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092";
+  };
+
+  patches = [
+    ./minorSOname.patch
+    ./no-nested-deprecated-warnings.patch
+  ];
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [
+    arm-frc-linux-gnueabi-binutils
+    arm-frc-linux-gnueabi-eglibc
+    arm-frc-linux-gnueabi-linux-api-headers
+    elfutils
+    libmpc
+    gmp
+    mpfr
+    zlib
+    isl_0_15
+    cloog
+  ];
+
+
+  configurePhase = ''
+    mkdir gcc-build
+    cd gcc-build
+    ../configure \
+      --prefix=$out \
+      --host=$CHOST \
+      --build=$CHOST \
+      --program-prefix=${_target}- \
+      --target=${_target} \
+      --enable-shared \
+      --disable-nls \
+      --enable-threads=posix \
+      --enable-languages=c,c++ \
+      --disable-multilib \
+      --disable-multiarch \
+      --with-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \
+      --with-build-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \
+      --with-as=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/as \
+      --with-ld=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/ld \
+      --with-cpu=cortex-a9 \
+      --with-float=softfp \
+      --with-fpu=vfp \
+      --with-specs='%{save-temps:-fverbose-asm} %{funwind-tables|fno-unwind-tables|mabi=*|ffreestanding|nostdlib:;:-funwind-tables}' \
+      --enable-lto \
+      --with-pkgversion='GCC-for-FRC' \
+      --with-cloog \
+      --enable-poison-system-directories \
+      --enable-plugin \
+      --with-system-zlib \
+      --disable-libmudflap \
+      --disable-libsanitizer
+  '';
+
+  makeFlags = [
+    "all-gcc"
+    "all-target-libgcc"
+    "all-target-libstdc++-v3"
+  ];
+
+  installPhase = ''
+    make install-gcc install-target-libgcc install-target-libstdc++-v3
+  '';
+
+  postInstall = ''
+    rm -rf $out/share/{man/man7,info}/ "$out/share/gcc-${version}/python"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "FRC cross compiler";
+    longDescription = ''
+      arm-frc-linux-gnueabi-gcc is a cross compiler for building
+      code for FIRST Robotics Competition. Used as a cross compiler
+      for the NI RoboRio.
+    '';
+    license = licenses.gpl2;
+    maintainers = [ maintainers.colescott ];
+    platforms = platforms.linux;
+
+    priority = 4;
+  };
+}
diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch
new file mode 100755
index 00000000000..d97d12bc629
--- /dev/null
+++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch
@@ -0,0 +1,49 @@
+Description: Make the default SONAME include minor numbers (c++)
+ This patch adds .0.20 to the end of the SONAME for libstdc++ to support
+ independent side-by-side usage of .17 and .20.
+ .
+ gcc-armel (4.9.1-0frc2) trusty; urgency=low
+ .
+   * Fixing dependency ambiguity yet again...
+Author: Patrick Plenefisch <phplenefisch@wpi.edu>
+
+---
+
+--- gcc-armel-4.9.1.orig/libstdc++-v3/configure
++++ gcc-armel-4.9.1/libstdc++-v3/configure
+@@ -10698,7 +10698,7 @@ gnu*)
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='${libname}${release}${shared_ext}$versuffix'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+@@ -10824,7 +10824,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='${libname}${release}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+@@ -14382,7 +14382,7 @@ gnu*)
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='${libname}${release}${shared_ext}$versuffix'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+@@ -14508,7 +14508,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='${libname}${release}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch
new file mode 100755
index 00000000000..050a63e92fd
--- /dev/null
+++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch
@@ -0,0 +1,22 @@
+Description: Get rid of recursive deprecated warnings.
+ As is, gcc gives warnings when a function with the
+ deprecated attribute calls another function with
+ the deprecated attribute.
+ See http://stackoverflow.com/questions/13459602/how-can-i-get-rid-of-deprecated-warnings-in-deprecated-functions-in-gcc
+
+Author: James Kuszmaul <jbkuszmaul@wpi.edu>
+
+--
+
+--- gcc-armel-4.9.1.orig/gcc/tree.c
++++ gcc-armel-4.9.1/gcc/tree.c
+@@ -12063,6 +12063,9 @@ warn_deprecated_use (tree node, tree attr)
+   if (node == 0 || !warn_deprecated_decl)
+     return;
+
++  if (current_function_decl && TREE_DEPRECATED(current_function_decl))
++    return;
++
+   if (!attr)
+     {
+       if (DECL_P (node))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d86f95e23ed..7b888a7d06d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -450,6 +450,8 @@ with pkgs;
 
   arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {};
 
+  arm-frc-linux-gnueabi-gcc = callPackage ../development/compilers/arm-frc-linux-gnueabi-gcc {};
+
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
   artyFX = callPackage ../applications/audio/artyFX {};

From ec674a63720969a016091171282f9ea014e5f45a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 8 Apr 2017 21:15:21 -0400
Subject: [PATCH 0793/1744] nix: fix evaluation

Sorry!
---
 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 11edda06f13..93463509b79 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -7,7 +7,7 @@
 
 let
 
-  common = { name, suffix ? "", src, patchPhase, fromGit ? false }: stdenv.mkDerivation rec {
+  common = { name, suffix ? "", src, patchPhase ? "", fromGit ? false }: stdenv.mkDerivation rec {
     inherit name src patchPhase;
     version = lib.getVersion name;
 

From ba78c500696e61a1ce5be3b11f5c3089e00be8f2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 8 Apr 2017 15:43:25 -0500
Subject: [PATCH 0794/1744] inkscape: fix missing library error

---
 pkgs/applications/graphics/inkscape/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 2ab918e99b6..bee1f71a061 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     rm "$out/share/icons/hicolor/icon-theme.cache"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
+    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
   '';
 
   meta = with stdenv.lib; {

From c344f46321a66965876101338bafdfbbec4faa38 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:32:58 -0500
Subject: [PATCH 0795/1744] djview: fix macOS build

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

diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 85c0f58174a..2b0dde210c5 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig
-, djvulibre, qt4, xorg, libtiff }:
+, djvulibre, qt4, xorg, libtiff
+, darwin }:
 
 stdenv.mkDerivation rec {
   name = "djview-${version}";
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ djvulibre qt4 xorg.libXt libtiff ];
+  buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ];
 
   passthru = {
     mozillaPlugin = "/lib/netscape/plugins";

From 6a6b371a775c8ded3060ffd6984675dd1be4934e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:33:27 -0500
Subject: [PATCH 0796/1744] liblastfm: fix macOS build

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

diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 0beb689090a..aa76505c3a0 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }:
+{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake
+, darwin }:
 
 let version = "1.0.9"; in
 
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
   nativeBuildInputs = [ pkgconfig which cmake ];
+  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
 
   meta = {
     homepage = http://github.com/lastfm/liblastfm;

From 719cb89342258705d4a2607f5bac7b21f5e46a73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:35:21 -0500
Subject: [PATCH 0797/1744] wxsqlite3: fix macOS build

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

diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 88cf92b34ef..a0600399784 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, wxGTK, sqlite }:
+{ stdenv, fetchFromGitHub, wxGTK, sqlite
+, darwin }:
 
 stdenv.mkDerivation rec {
   name = "wxsqlite3-${version}";
@@ -11,7 +12,12 @@ stdenv.mkDerivation rec {
     sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g";
   };
 
-  buildInputs = [ wxGTK sqlite ];
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    cp build28/Info.plist.in build28/wxmac.icns build/
+  '';
+
+  buildInputs = [ wxGTK sqlite ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
 
   meta = with stdenv.lib; {
     homepage = http://utelle.github.io/wxsqlite3/ ;

From efcd597ab626934370a7b8b7eaac065720bbcbe2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:53:29 -0500
Subject: [PATCH 0798/1744] cwebbin: Fix macOS build

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

diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index 75a06291b02..458f85c1082 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     "CP=cp"
     "RM=rm"
     "PDFTEX=echo"
+    "CC=c++"
   ];
 
   buildPhase = ''

From 9e7faf98838dc0c9808c472af95f3f8fb083da8d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:53:41 -0500
Subject: [PATCH 0799/1744] exult: Fix macOS build

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

diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 27ffcf2e742..649d69c6fe6 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  makeFlags = [ "DESTDIR=$(out)" ];
+
   postInstall =
     ''
       mkdir -p $out/share/exult/music

From 1953cb5f714e0f11e1dae2477ae0a835df40bd58 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:54:29 -0500
Subject: [PATCH 0800/1744] sysdig: fix macOS build

---
 pkgs/os-specific/linux/sysdig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index b23da5451d1..27a0d301acf 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     stdenv.cc.cc
   ];
 
-  postInstall = ''
+  postInstall = optionalString (!stdenv.isDarwin) ''
     patchelf --set-rpath "$libPath" "$out/bin/sysdig"
     patchelf --set-rpath "$libPath" "$out/bin/csysdig"
   '' + optionalString (kernel != null) ''

From 06716f310ab8e037ffbccc3c3a993c8cdfbab18a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:55:25 -0500
Subject: [PATCH 0801/1744] zstmdt: fix macOS build

---
 pkgs/tools/compression/zstdmt/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix
index 14dd4f21b2d..5cf88e68c64 100644
--- a/pkgs/tools/compression/zstdmt/default.nix
+++ b/pkgs/tools/compression/zstdmt/default.nix
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
     zstd lz4
   ];
 
-  buildPhase = ''
-    make zstdmt lz4mt
-  '';
+  makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ];
 
   installPhase = ''
     mkdir -p $out/bin/

From 65d9a8e4fb6fc889b52e94cdbface3a21f051e8a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:55:49 -0500
Subject: [PATCH 0802/1744] rrdtool: fix macOS build

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

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index de4c97731ef..3d2666add42 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff
-, tcl-8_5 }:
+, tcl-8_5, darwin }:
 
 stdenv.mkDerivation rec {
   name = "rrdtool-1.6.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ gettext perl libxml2 pango cairo groff ]
-    ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ];
 
   postInstall = ''
     # for munin and rrdtool support

From d98323515562d564f53dedc12d35707b0be3f43b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:56:09 -0500
Subject: [PATCH 0803/1744] nuttcp: fix macOS build

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

diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix
index 70f3d7e9c70..23cce602875 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   unpackPhase = ":";
 
   buildPhase = ''
-    gcc -O2 -o nuttcp $src
+    cc -O2 -o nuttcp $src
   '';
 
   installPhase = ''

From 8dbefea7149d3c47924ac31f97189e7485e1e218 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:57:13 -0500
Subject: [PATCH 0804/1744] lout: fix macOS build

---
 pkgs/tools/typesetting/lout/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh
index ec52adc225b..cd3b9c67e3c 100755
--- a/pkgs/tools/typesetting/lout/builder.sh
+++ b/pkgs/tools/typesetting/lout/builder.sh
@@ -39,6 +39,6 @@ cat makefile |									\
   > "$nixMakefile" &&								\
 mkdir -p "$out/bin" && mkdir -p "$out/lib"					\
 mkdir -p "$out/man" && mkdir -p "$out/doc/lout" &&				\
-make -f "$nixMakefile" install installman &&					\
+make -f "$nixMakefile" CC=cc install installman &&					\
 installDoc &&									\
 fixupPhase

From 04f8199e5b0441a8c6d341afa5f9164077601fcf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 21:59:41 -0500
Subject: [PATCH 0805/1744] libx86emu: make linux-only

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

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index a1471766516..ee32d9418dd 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i 's|/usr/|/|g' Makefile
   '';
 
-  makeFlags = "shared";
+  makeFlags = [ "shared" ];
 
   installPhase = ''
     make install DESTDIR=$out/ LIBDIR=lib
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     homepage = https://github.com/wfeldt/libx86emu;
     maintainers = with maintainers; [ bobvanderlinden ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From a1f22aafa252b87fede414ec446d43462a0c0e76 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 21:59:57 -0500
Subject: [PATCH 0806/1744] neardal: make linux-only

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

diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index 23bc7f883d4..9f46305c1b5 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     homepage = https://01.org/linux-nfc;
     maintainers = with maintainers; [ tstrobel ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 3f2560cc083ca584e6876150da4cc093f2cef137 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:00:20 -0500
Subject: [PATCH 0807/1744] xbase: make linux-only

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

diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 931d4064400..45d7d6f8301 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://linux.techass.com/projects/xdb/;
     description = "C++ class library formerly known as XDB";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }

From 2a2e9b8f2e2acedd5e8d362d5d505e468b321f02 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:00:45 -0500
Subject: [PATCH 0808/1744] xautolock: make linux-only

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

diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index c65c7ef121c..02cdcf7b4d1 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "A program that launches a given program when your X session has been idle for a given time.";
     homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;
     maintainers = with maintainers; [ garbas ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 }

From 038550b596c046a66e94916ab5aea8a7cbd2b567 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:01:20 -0500
Subject: [PATCH 0809/1744] gcsfuse: make linux-only

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

diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index 06190a8f03d..086f0e0f790 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -14,9 +14,9 @@ buildGoPackage rec {
     sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a";
   };
 
-  # TODO: add metadata https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes
   meta = {
     license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
     maintainers = [];
     homepage = https://cloud.google.com/storage/docs/gcs-fuse;
     description =

From 4db3b9031495a3b34d76405b35b0e8af7edcd812 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:01:01 -0500
Subject: [PATCH 0810/1744] rssh: make linux-only

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

diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index f1fb4d03121..b84f5f26685 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.pizzashack.org/rssh/";
     license = licenses.bsd2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ arobyn ];
   };
 

From c02ab895a106610047249b3eba3be32335b0f98e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 7 Apr 2017 22:01:39 -0500
Subject: [PATCH 0811/1744] hwinfo: make linux-only

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

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 8dd95a8b4de..09dfb6e47a5 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = https://github.com/openSUSE/hwinfo;
     maintainers = with maintainers; [ bobvanderlinden ndowens ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From f0ebcc64445bf009d781f494a2e583cbf67846c4 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Thu, 16 Mar 2017 16:40:01 +1100
Subject: [PATCH 0812/1744] epstool: add package

---
 pkgs/tools/graphics/epstool/default.nix | 25 +++++++++++++++++++++++++
 pkgs/tools/graphics/epstool/gcc43.patch | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/graphics/epstool/default.nix
 create mode 100644 pkgs/tools/graphics/epstool/gcc43.patch

diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
new file mode 100644
index 00000000000..9735adca53d
--- /dev/null
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.08";
+  name = "epstool-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz";
+    sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk";
+  };
+
+  installPhase = ''
+    make EPSTOOL_ROOT=$out install
+  '';
+
+  patches = [ ./gcc43.patch ];
+
+  meta = with stdenv.lib; {
+    description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps";
+    homepage = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.asppsa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/pkgs/tools/graphics/epstool/gcc43.patch
new file mode 100644
index 00000000000..398ce08c518
--- /dev/null
+++ b/pkgs/tools/graphics/epstool/gcc43.patch
@@ -0,0 +1,20 @@
+--- epstool-3.08.orig/src/epstool.c	2005-06-10 04:41:00.000000000 -0500
++++ epstool-3.08/src/epstool.c	2009-02-16 20:55:43.186140029 -0600
+@@ -2824,7 +2824,7 @@
+ 		code = -1;
+ 	}
+ 	if ((code==0) && stdout_name && (hChildStdoutWr == -1)) {
+-	    handle = open(stdout_name, O_WRONLY | O_CREAT);
++	    handle = open(stdout_name, O_WRONLY | O_CREAT, 0644);
+ 	    hChildStdoutWr = dup2(handle, 1);
+ 	    if (handle != -1)
+ 		close(handle);
+@@ -2832,7 +2832,7 @@
+ 		code = -1;
+ 	}
+ 	if ((code==0) && stderr_name && (hChildStderrWr == -1)) {
+-	    handle = open(stderr_name, O_WRONLY | O_CREAT);
++	    handle = open(stderr_name, O_WRONLY | O_CREAT, 0644);
+ 	    hChildStderrWr = dup2(handle, 2);
+ 	    if (handle != -1)
+ 		close(handle);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b888a7d06d..eefdd2e786a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1674,6 +1674,8 @@ with pkgs;
 
   eplot = callPackage ../tools/graphics/eplot { };
 
+  epstool = callPackage ../tools/graphics/epstool { };
+
   ethtool = callPackage ../tools/misc/ethtool { };
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };

From 3baff95efd0da6805cc82835a986ef142c3e4147 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 8 Apr 2017 23:49:55 -0500
Subject: [PATCH 0813/1744] botan: fix macOS build

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

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 4a4ec5d9fe9..b37fd6079b9 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -3,6 +3,7 @@
 , baseVersion, revision, sha256
 , extraConfigureFlags ? ""
 , postPatch ? null
+, darwin
 , ...
 }:
 
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
   };
   inherit postPatch;
 
-  buildInputs = [ python bzip2 zlib gmp openssl boost ];
+  buildInputs = [ python bzip2 zlib gmp openssl boost ]
+             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   configurePhase = ''
     python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }

From 23d8b4f10c3ea8a9a463b026070451046118bf1b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 00:23:24 -0500
Subject: [PATCH 0814/1744] glfw: fix darwin build

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

diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index feb769229c0..1500718c737 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
 , libXinerama, libXcursor
+, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper
     libXinerama libXcursor
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel ]);
 
   cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
 

From 525b5dce199ac13abbb6b9b79784ba189fc1a9db Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 01:29:29 -0500
Subject: [PATCH 0815/1744] tcp-wrappers: linux only

---
 pkgs/os-specific/linux/tcp-wrappers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 850fbe9f449..526b1a86db1 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -57,6 +57,6 @@ in stdenv.mkDerivation rec {
 
     homepage = ftp://ftp.porcupine.org/pub/security/index.html;
     license = "BSD-style";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 1df7966d9d164242aafcc0c65d2e6096526a7997 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 01:29:41 -0500
Subject: [PATCH 0816/1744] scanmem: linux only

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

diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index 03c1273a7d3..38b31311137 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/scanmem/scanmem";
     description = "Memory scanner for finding and poking addresses in executing processes";
     maintainers = [ maintainers.chattered  ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.linux;
     license = licenses.gpl3;
   };
 }

From d8b98c4f7786057518281803637a38e1dcd2919f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 01:29:52 -0500
Subject: [PATCH 0817/1744] safecopy: linux only

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

diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix
index 5e7ec51bf10..ce0779c0999 100644
--- a/pkgs/tools/system/safecopy/default.nix
+++ b/pkgs/tools/system/safecopy/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
   };
 }

From f75703bfbf0031a096da536daa00667ca22d4bc2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 01:30:25 -0500
Subject: [PATCH 0818/1744] spectrwm: fix OSX build

---
 pkgs/applications/window-managers/spectrwm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 39825e37f30..1a3c976f77d 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
     xcbutilwm
   ];
 
-  sourceRoot = "spectrwm-SPECTRWM_2_7_2/linux";
+  sourceRoot = let
+    subdir = if stdenv.isDarwin then "osx" else "linux";
+  in "spectrwm-SPECTRWM_2_7_2/${subdir}";
+
   makeFlags="PREFIX=$(out)";
   installPhase = "PREFIX=$out make install";
 

From 250ddfe1a213af6ad600edca0c35b35f0c5d75d7 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Sun, 9 Apr 2017 16:10:54 +1000
Subject: [PATCH 0819/1744] octave: add runtime texinfo dependency

makeinfo (provided by the texinfo package) is used by the "help"
command in Octave to display info about functions, etc.  By default,
Octave looks for "makeinfo" in the PATH, rather than specifying the
location of the executable.  This results in Nix not being aware that
makeinfo is required at runtime (so unless you happen have makeinfo
available from your path, "help" won't work).

This patch fixes that by setting the path to makeinfo in Octave,
thereby creating a runtime dependency on texinfo.
---
 pkgs/development/interpreters/octave/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 3233baea8f4..ab1dc4b5fe1 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -41,9 +41,15 @@ stdenv.mkDerivation rec {
     ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
     ;
 
+  # makeinfo is required by Octave at runtime to display help
+  prePatch = ''
+    substituteInPlace libinterp/corefcn/help.cc \
+      --replace 'Vmakeinfo_program = "makeinfo"' \
+                'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
+  ''
   # REMOVE ON VERSION BUMP
   # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
     sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
   '';
 

From 8df24b78d53da95ef55a1cb6e2caad0bab45f5fc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 02:11:16 -0500
Subject: [PATCH 0820/1744] wxGTK28: linux only

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

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index cbfdf876dba..e263708c18e 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  
+
   meta = {
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 443dc395c5e0670c4e628cd5e2f395ed42cd5015 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 9 Apr 2017 10:00:12 +0200
Subject: [PATCH 0821/1744] gnome3.gnome_settings_daemon: use wrapGAppsHook

This fixes the "Using the 'memory' GSettings backend." error if
gnome-settings-daemon is used separately from gnome.
---
 .../3.22/core/gnome-settings-daemon/default.nix      | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
index 00999353c2f..ff5670935bd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/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, makeWrapper, ibus, xkeyboard_config }:
+, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -14,15 +14,7 @@ stdenv.mkDerivation rec {
       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 makeWrapper gnome_themes_standard ];
-
-  # FIXME: glib binaries shouldn't be in .dev!
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib.dev}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
+      libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From 01a8de97eb2aab98e6e9a7330bf99f4fe4844d2a Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 9 Apr 2017 01:57:32 +0200
Subject: [PATCH 0822/1744] avahi-daemon: refactored using some abstraction

---
 .../services/networking/avahi-daemon.nix      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index e7ef68c90b2..3985f8561d3 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -7,32 +7,32 @@ let
 
   cfg = config.services.avahi;
 
+  yesNo = yes : if yes then "yes" else "no";
+
   avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" ''
     [server]
     ${# Users can set `networking.hostName' to the empty string, when getting
       # a host name from DHCP.  In that case, let Avahi take whatever the
       # current host name is; setting `host-name' to the empty string in
       # `avahi-daemon.conf' would be invalid.
-      if hostName != ""
-      then "host-name=${hostName}"
-      else ""}
+      optionalString (hostName != "") "host-name=${hostName}"}
     browse-domains=${concatStringsSep ", " browseDomains}
-    use-ipv4=${if ipv4 then "yes" else "no"}
-    use-ipv6=${if ipv6 then "yes" else "no"}
+    use-ipv4=${yesNo ipv4}
+    use-ipv6=${yesNo ipv6}
     ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
     ${optionalString (domainName!=null) "domain-name=${domainName}"}
-    allow-point-to-point=${if allowPointToPoint then "yes" else "no"}
+    allow-point-to-point=${yesNo allowPointToPoint}
 
     [wide-area]
-    enable-wide-area=${if wideArea then "yes" else "no"}
+    enable-wide-area=${yesNo wideArea}
 
     [publish]
-    disable-publishing=${if publish.enable then "no" else "yes"}
-    disable-user-service-publishing=${if publish.userServices then "no" else "yes"}
-    publish-addresses=${if publish.userServices || publish.addresses then "yes" else "no"}
-    publish-hinfo=${if publish.hinfo then "yes" else "no"}
-    publish-workstation=${if publish.workstation then "yes" else "no"}
-    publish-domain=${if publish.domain then "yes" else "no"}
+    disable-publishing=${yesNo (!publish.enable)}
+    disable-user-service-publishing=${yesNo (!publish.userServices)}
+    publish-addresses=${yesNo (publish.userServices || publish.addresses)}
+    publish-hinfo=${yesNo publish.hinfo}
+    publish-workstation=${yesNo publish.workstation}
+    publish-domain=${yesNo publish.domain}
   '';
 
 in

From 5eb75ce205ac00b1a2403425b6b195627da0f699 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 04:22:08 -0500
Subject: [PATCH 0823/1744] xcbuild: add app bundle specs

---
 pkgs/development/tools/xcbuild/platform.nix | 94 +++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index 34fc5b0f620..a1f4eed8e60 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -101,6 +101,54 @@ let
         Name = "$(EXECUTABLE_NAME)";
       };
     }
+    {
+      Identifier = "com.apple.package-type.wrapper";
+      Type = "PackageType";
+      Name = "Wrapper";
+      DefaultBuildSettings = {
+        WRAPPER_SUFFIX = ".bundle";
+        WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
+        CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents";
+        EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
+        EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS";
+        EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)";
+        INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist";
+        INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings";
+        PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo";
+        PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist";
+        VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist";
+        PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers";
+        PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
+        EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables";
+        FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks";
+        SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks";
+        SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport";
+        UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources";
+        LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj";
+        DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation";
+        PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns";
+        SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts";
+      };
+      ProductReference = {
+        FileType = "wrapper.cfbundle";
+        Name = "$(WRAPPER_NAME)";
+        IsLaunchable = "NO";
+      };
+    }
+    {
+      Identifier = "com.apple.package-type.wrapper.application";
+      Type = "PackageType";
+      BasedOn = "com.apple.package-type.wrapper";
+      Name = "Application Wrapper";
+      DefaultBuildSettings = {
+        GENERATE_PKGINFO_FILE = "YES";
+      };
+      ProductReference = {
+        FileType = "wrapper.application";
+        Name = "$(WRAPPER_NAME)";
+        IsLaunchable = "YES";
+      };
+    }
   ];
 
   # Based off of the MacOSX Product Types.xcpsec file. All
@@ -125,6 +173,52 @@ let
       Name = "Dynamic Library";
       PackageTypes = [ "com.apple.package-type.mach-o-dylib" ];
     }
+    {
+      Type = "ProductType";
+      Identifier = "com.apple.product-type.bundle";
+      Name = "Bundle";
+      DefaultTargetName = "Bundle";
+      DefaultBuildProperties = {
+        FULL_PRODUCT_NAME = "$(WRAPPER_NAME)";
+        MACH_O_TYPE = "mh_bundle";
+        WRAPPER_PREFIX = "";
+        WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
+        WRAPPER_EXTENSION = "bundle";
+        WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
+        FRAMEWORK_FLAG_PREFIX = "-framework";
+        LIBRARY_FLAG_PREFIX = "-l";
+        LIBRARY_FLAG_NOSPACE = "YES";
+        STRIP_STYLE = "non-global";
+        GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
+      };
+      PackageTypes = [ "com.apple.package-type.wrapper" ];
+      IsWrapper = "YES";
+      HasInfoPlist = "YES";
+      HasInfoPlistStrings = "YES";
+    }
+    {
+      Identifier = "com.apple.product-type.application";
+      Type = "ProductType";
+      BasedOn = "com.apple.product-type.bundle";
+      Name = "Application";
+      DefaultTargetName = "Application";
+      DefaultBuildProperties = {
+        MACH_O_TYPE = "mh_execute";
+        GCC_DYNAMIC_NO_PIC = "NO";
+        GCC_SYMBOLS_PRIVATE_EXTERN = "YES";
+        GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
+        WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
+        WRAPPER_EXTENSION = "app";
+        INSTALL_PATH = "$(LOCAL_APPS_DIR)";
+        STRIP_STYLE = "all";
+      };
+      PackageTypes = [ "com.apple.package-type.wrapper.application" ];
+      CanEmbedCompilerSanitizerLibraries = "YES";
+      RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks";
+      ValidateEmbeddedBinaries = "YES";
+      ProvisioningProfileSupported = "YES";
+      ProvisioningProfileRequired = "NO";
+    }
   ];
 
 in

From a78af29ae7e7d2d0c0737271cfdb0ff710493e1d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 04:22:44 -0500
Subject: [PATCH 0824/1744] install_name_tool: remove

cctools provides install_name_tool
---
 .../darwin/install_name_tool/default.nix      | 29 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix

diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
deleted file mode 100644
index 581eb31cc71..00000000000
--- a/pkgs/os-specific/darwin/install_name_tool/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "install_name_tool";
-  src = "/usr/bin/install_name_tool";
-
-  unpackPhase = "true";
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p "$out"/bin
-    ln -s "$src" "$out"/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Change dynamic shared library install names";
-    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html;
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      Install_name_tool changes the dynamic shared library install names and or
-      adds, changes or deletes the rpaths recorded in a Mach-O binary.
-    '';
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0ef39ce64f..ca033e4ffdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -547,8 +547,6 @@ with pkgs;
 
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
-  install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
-
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv = callPackage ../development/mobile/titaniumenv {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8fd95ea65d7..266f11a73ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28918,8 +28918,7 @@ EOF
     };
 
     propagatedBuildInputs = with self; [ cffi ];
-    buildInputs = [ pkgs.libspotify ]
-      ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
+    buildInputs = [ pkgs.libspotify ];
 
     # python zip complains about old timestamps
     preConfigure = ''

From 38fa9910642bc819484726aec596f4827b10ba2f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 04:24:16 -0500
Subject: [PATCH 0825/1744] pinentry_mac: use xcbuild

---
 pkgs/tools/security/pinentry-mac/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index 7116d1777d6..ba3e8b1818d 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, xcbuild }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271";
   };
 
-  postPatch = ''
-    substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild"
-  '';
+  buildInputs = [ xcbuild ];
+
+  dontUseXcbuild = true;
 
   installPhase = ''
     mkdir -p $out/Applications

From 34422f428d583f57b3cbdaf6bbcc1e0ca61662c4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 04:27:21 -0500
Subject: [PATCH 0826/1744] ibtool: add to toolchain

- init package
- add into xcbuild/toolchain.nix
---
 pkgs/development/tools/xcbuild/toolchain.nix |  5 ++++-
 pkgs/os-specific/darwin/ibtool/default.nix   | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/ibtool/default.nix

diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
index 4313f005147..cdf4a673cc5 100644
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ b/pkgs/development/tools/xcbuild/toolchain.nix
@@ -1,6 +1,7 @@
 {stdenv, writeText, toolchainName, xcbuild, fetchurl
 , llvm, cctools, gcc, bootstrap_cmds, binutils
-, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}:
+, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper
+, ibtool}:
 
 let
 
@@ -89,6 +90,8 @@ stdenv.mkDerivation {
     ln -s ${cctools}/bin/pagestuff
     ln -s ${cctools}/bin/ranlib
     ln -s ${cctools}/bin/redo_prebinding
+
+    ln -s ${ibtool}/bin/ibtool
   '' +
     # No point including the entire gcc closure if we don't already have it
     (if stdenv.cc.isClang then ''
diff --git a/pkgs/os-specific/darwin/ibtool/default.nix b/pkgs/os-specific/darwin/ibtool/default.nix
new file mode 100644
index 00000000000..556426ac62d
--- /dev/null
+++ b/pkgs/os-specific/darwin/ibtool/default.nix
@@ -0,0 +1,20 @@
+{ stdenv }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "ibtool";
+  src = "/usr/bin/ibtool";
+
+  unpackPhase = "true";
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    ln -s "$src" "$out"/bin
+  '';
+
+  meta = with stdenv.lib; {
+    platforms   = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca033e4ffdc..30f6598f975 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18407,4 +18407,6 @@ with pkgs;
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
+
+  ibtool = callPackage ../os-specific/darwin/ibtool {};
 }

From 87e6b2c50fb4520d9ef910418f3c686d830dc3df Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 04:27:56 -0500
Subject: [PATCH 0827/1744] xcbuild: try to fix sdk not found

This is an attempt to get rid of the issues with sdk not found in
xcbuild when building pinentry_mac.
---
 pkgs/development/tools/xcbuild/platform.nix | 2 +-
 pkgs/development/tools/xcbuild/wrapper.nix  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index a1f4eed8e60..01693ce8e5b 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -241,6 +241,6 @@ stdenv.mkDerivation {
 
     mkdir -p $out/Developer/SDKs/
     cd $out/Developer/SDKs/
-    ln -s ${sdk}
+    ln -s ${sdk} macosx10.10.sdk
   '';
 }
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index ab6605e91b1..3dfc7f36343 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,9 +60,13 @@ stdenv.mkDerivation {
       --add-flags "DERIVED_DATA_DIR=." \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcrun \
+      --add-flags "-sdk macosx10.10" \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcode-select \
       --set DEVELOPER_DIR "$out"
+
+    mkdir -p $out/usr/bin/
+    ln -s $out/bin/xcrun $out/usr/bin/xcrun
   '';
 
   inherit (xcbuild) meta;

From 2380e96327ded90b7c650f9b9b6c1a7e8e95538f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Mar 2017 20:49:20 +0200
Subject: [PATCH 0828/1744] lambda-mod-zsh-theme: init at
 eceee68cf46bba9f7f42887c2128b48e8861e31b

---
 pkgs/shells/lambda-mod-zsh-theme/default.nix | 30 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/shells/lambda-mod-zsh-theme/default.nix

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
new file mode 100644
index 00000000000..e5f43bf25a9
--- /dev/null
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit }:
+
+let
+  pkgName = "lambda-mod-zsh-theme";
+  rev = "eceee68cf46bba9f7f42887c2128b48e8861e31b";
+in stdenv.mkDerivation rec {
+  name = "${pkgName}-${rev}";
+
+  src = fetchgit {
+    inherit rev;
+
+    url = "https://github.com/halfo/lambda-mod-zsh-theme";
+    sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4";
+  };
+
+  buildPhases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp lambda-mod.zsh-theme $out/share
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
+    homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b888a7d06d..8818ac26326 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9635,6 +9635,8 @@ with pkgs;
     haskell-lib = haskell.lib;
   };
 
+  lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { };
+
   leksah = callPackage ../development/tools/haskell/leksah {
     inherit (haskellPackages) ghcWithPackages;
   };

From 74c14f8b28a690d3ba281e9008d584ad6e0ea72d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Mar 2017 21:04:01 +0200
Subject: [PATCH 0829/1744] lambda-mod-zsh-theme: remove unnecessary `rec`
 declaration

---
 pkgs/shells/lambda-mod-zsh-theme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index e5f43bf25a9..ffc321ae399 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -3,7 +3,7 @@
 let
   pkgName = "lambda-mod-zsh-theme";
   rev = "eceee68cf46bba9f7f42887c2128b48e8861e31b";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   name = "${pkgName}-${rev}";
 
   src = fetchgit {

From ea5ff16bb08a6b68dc83027ca96c29cee2b5d31c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Mar 2017 21:07:14 +0200
Subject: [PATCH 0830/1744] lambda-mod-zsh-theme: refactor to use
 `fetchFromGitHub` for source retrieval

---
 pkgs/shells/lambda-mod-zsh-theme/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index ffc321ae399..bfd6a304b92 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 let
-  pkgName = "lambda-mod-zsh-theme";
+  repo = "lambda-mod-zsh-theme";
   rev = "eceee68cf46bba9f7f42887c2128b48e8861e31b";
 in stdenv.mkDerivation {
-  name = "${pkgName}-${rev}";
+  name = "${repo}-${rev}";
 
-  src = fetchgit {
-    inherit rev;
+  src = fetchFromGitHub {
+    inherit rev repo;
 
-    url = "https://github.com/halfo/lambda-mod-zsh-theme";
+    owner = "halfo";
     sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4";
   };
 

From cd56c3334e67fa40e37b1610627987dcd63a1e91 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Mar 2017 21:10:05 +0200
Subject: [PATCH 0831/1744] lambda-mod-zsh-theme: fix broken `maintainers`
 expression

---
 pkgs/shells/lambda-mod-zsh-theme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index bfd6a304b92..4096d88b127 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -25,6 +25,6 @@ in stdenv.mkDerivation {
     homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = [ ma27 ];
+    maintainers = with maintainers; [ ma27 ];
   };
 }

From 3260d8cd7081686145e13810c5e59d8f68cf90a9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 9 Apr 2017 13:51:16 +0200
Subject: [PATCH 0832/1744] lambda-mod-zsh-theme: refactor install behavior to
 use `themes` dir

Now it's possible to set the path of this derivation as `ZSH_CUSTOM` in
the zsh configuration, so it's possible to use the theme directly from
the store path.

see https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-and-adding-themes
---
 pkgs/shells/lambda-mod-zsh-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index 4096d88b127..e53aa28666b 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
   buildPhases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    mkdir -p $out/share
-    cp lambda-mod.zsh-theme $out/share
+    mkdir -p $out/share/themes
+    cp lambda-mod.zsh-theme $out/share/themes
   '';
 
   meta = with stdenv.lib; {

From 813eb41cf6a3edcff719fad7d67193f7ca39faf7 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Wed, 29 Mar 2017 19:50:58 +1100
Subject: [PATCH 0833/1744] octaveHg: add package

---
 pkgs/development/interpreters/octave/hg.nix | 75 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 34 +++++++---
 2 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/interpreters/octave/hg.nix

diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
new file mode 100644
index 00000000000..a34834af48c
--- /dev/null
+++ b/pkgs/development/interpreters/octave/hg.nix
@@ -0,0 +1,75 @@
+args@{ stdenv, openblas, ghostscript ? null, texinfo
+
+     , # These are arguments that shouldn't be passed to the
+       # octave package.
+       texlive, tex ? texlive.combined.scheme-small
+     , epstool, pstoedit, transfig
+     , lib, fetchhg, callPackage
+     , autoconf, automake, libtool
+     , bison, librsvg, icoutils, gperf
+
+     , # These are options that can be passed in addition to the ones
+       # octave usually takes.
+       # - rev is the HG revision.  Use "tip" for the bleeding edge.
+       # - docs can be set to false to skip building documentation.
+       rev ? "23269", docs ? true
+
+     , # All remaining arguments will be passed to the octave package.
+       ...
+     }:
+
+with stdenv.lib;
+let
+  octaveArgs = removeAttrs args
+    [ "texlive" "tex"
+      "epstool" "pstoedit" "transfig"
+      "lib" "fetchhg" "callPackage"
+      "autoconf" "automake" "libtool"
+      "bison" "librsvg" "icoutils" "gperf"
+      "rev" "docs"
+    ];
+  octave = callPackage ./default.nix octaveArgs;
+
+  # List of hashes for known HG revisions.
+  sha256s = {
+    "23269" = "87f560e873ad1454fdbcdd8aca65f9f0b1e605bdc00aebbdc4f9d862ca72ff1d";
+  };
+
+in lib.overrideDerivation octave (attrs: rec {
+  version = "4.3.0pre${rev}";
+  name = "octave-${version}";
+
+  src = fetchhg {
+    url = http://www.octave.org/hg/octave;
+    inherit rev;
+
+    sha256 =
+      if builtins.hasAttr rev sha256s
+      then builtins.getAttr rev sha256s
+      else null;
+
+    fetchSubrepos = true;
+  };
+
+  # Octave's test for including this flag seems to be broken in 4.3.
+  F77_INTEGER_8_FLAG = optional openblas.blas64 "-fdefault-integer-8";
+
+  # This enables texinfo to find the files it needs.
+  TEXINPUTS = ".:build-aux:${texinfo}/texmf-dist/tex/generic/epsf:";
+
+  disableDocs = !docs || ghostscript == null;
+
+  nativeBuildInputs = attrs.nativeBuildInputs
+    ++ [ autoconf automake libtool bison librsvg icoutils gperf ]
+    ++ optionals (!disableDocs) [ tex epstool pstoedit transfig ];
+
+  # Run bootstrap before any other patches, as other patches may refer
+  # to files that are generated by the bootstrap.
+  prePatch = ''
+    patchShebangs bootstrap
+    ./bootstrap
+  '' + attrs.prePatch;
+
+  configureFlags = attrs.configureFlags ++
+    optional disableDocs "--disable-docs";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eefdd2e786a..cffdc0addc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5943,17 +5943,29 @@ with pkgs;
     git = gitMinimal;
   };
 
-  octave = callPackage ../development/interpreters/octave {
-    qt = null;
-    ghostscript = null;
-    graphicsmagick = null;
-    llvm = null;
-    hdf5 = null;
-    glpk = null;
-    suitesparse = null;
-    jdk = null;
-    openblas = if stdenv.isDarwin then openblasCompat else openblas;
-  };
+  inherit (
+    let
+      defaultOctaveOptions = {
+        qt = null;
+        ghostscript = null;
+        graphicsmagick = null;
+        llvm = null;
+        hdf5 = null;
+        glpk = null;
+        suitesparse = null;
+        jdk = null;
+        openblas = if stdenv.isDarwin then openblasCompat else openblas;
+      };
+
+      hgOctaveOptions =
+        (removeAttrs defaultOctaveOptions ["ghostscript"]) // {
+          overridePlatforms = stdenv.lib.platforms.none;
+        };
+    in {
+      octave = callPackage ../development/interpreters/octave defaultOctaveOptions;
+      octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
+  }) octave octaveHg;
+
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     qt = qt4;
     overridePlatforms = ["x86_64-linux" "x86_64-darwin"];

From 68c56c46fb319696b9c4e0909c91f1c2c3641155 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Wed, 29 Mar 2017 19:55:26 +1100
Subject: [PATCH 0834/1744] purePackages.octave: Use octaveHg

Pure's Octave package compiles but crashes with Octave 4.2 due to an
upstream bug which is fixed in mercurial.
---
 pkgs/development/pure-modules/octave/default.nix | 4 +++-
 pkgs/top-level/pure-packages.nix                 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 61bc7a4d5c1..f1a54eb50ae 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
     description = "An Octave module for the Pure programming language";
     homepage = http://puredocs.bitbucket.org/pure-octave.html;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    # This is set to none for now because it does not work with the
+    # current stable version of Octave.
+    platforms = stdenv.lib.platforms.none;
     maintainers = with stdenv.lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix
index 005e09cc003..a1600888032 100644
--- a/pkgs/top-level/pure-packages.nix
+++ b/pkgs/top-level/pure-packages.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, octaveHg }:
 
 rec {
   audio = callPackage ../development/pure-modules/audio { };
@@ -19,7 +19,7 @@ rec {
   lv2 = callPackage ../development/pure-modules/lv2 { };
   midi = callPackage ../development/pure-modules/midi { };
   mpfr = callPackage ../development/pure-modules/mpfr { };
-  octave = callPackage ../development/pure-modules/octave { };
+  octave = callPackage ../development/pure-modules/octave { octave = octaveHg; };
   odbc = callPackage ../development/pure-modules/odbc { };
   pandoc = callPackage ../development/pure-modules/pandoc { };
   rational = callPackage ../development/pure-modules/rational { };

From 42e13147278afea46d590fa761020b08ce8bdb1e Mon Sep 17 00:00:00 2001
From: Timofei Kushnir <timophey@ecotelecom.ru>
Date: Sun, 9 Apr 2017 16:07:33 +0400
Subject: [PATCH 0835/1744] nixos: remove duplicate wrapperDir PATH addition
 (#24703)

---
 nixos/modules/config/shells-environment.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 8a7b3ea0bfd..152493151fd 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -168,9 +168,6 @@ in
 
          ${cfg.extraInit}
 
-         # The setuid/setcap wrappers override other bin directories.
-         export PATH="${config.security.wrapperDir}:$PATH"
-
          # ~/bin if it exists overrides other bin directories.
          export PATH="$HOME/bin:$PATH"
        '';

From 773c456ef49e84de75931ce7d95a565888bff096 Mon Sep 17 00:00:00 2001
From: pngwjpgh <pngwjpgh@users.noreply.github.com>
Date: Sun, 9 Apr 2017 14:14:04 +0200
Subject: [PATCH 0836/1744] networkmanager: fix dispatcher scripts (#24507)

networkmanager used `source` to mean `text` and wrote dispatcher scripts with the default mode (0666), which means networkmanager wouldn't call them.
---
 nixos/modules/services/networking/networkmanager.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7255ffc5af4..7fb2be78698 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -162,9 +162,9 @@ in {
         type = types.listOf (types.submodule {
           options = {
             source = mkOption {
-              type = types.str;
+              type = types.path;
               description = ''
-                A script source.
+                A script.
               '';
             };
 
@@ -224,7 +224,7 @@ in {
              target = "NetworkManager/dispatcher.d/02overridedns";
            }
       ++ lib.imap (i: s: {
-        text = s.source;
+        inherit (s) source;
         target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
       }) cfg.dispatcherScripts;
 

From 4a9da1c5381ce646ce5bfbd6a024eb246901b1df Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sun, 9 Apr 2017 15:09:31 +0200
Subject: [PATCH 0837/1744] sonarr: 2.0.0.4645 -> 2.0.0.4689 (#24767)

---
 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 af0b17bfb3a..de147e31da7 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.4645";
+  version = "2.0.0.4689";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "13a1ly2rm0ha355h4q2x8v699d43arcq3iyn7nm921rkswajvvb8";
+    sha256 = "056ndn98byn6gkiq46vn8pl0s715ni7wklxnmid2hk5xwyjy7bwk";
   };
 
   buildInputs = [

From d93f2c38659b6ec5a61428ce504626e742c2a361 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 9 Apr 2017 09:39:30 -0400
Subject: [PATCH 0838/1744] darwin.libSystem: fix intermittent impurity bug

If you've seen issues with libsystem_symptoms.dylib,
this should fix that.
---
 .../Libsystem/default.nix                     |  6 ++-
 .../Libsystem/reexported_libraries            | 41 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 92c54d9b679..ea5aac60ab9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -76,7 +76,11 @@ appleDerivation rec {
        /usr/lib/libSystem.dylib \
        -reexported_symbols_list ${./system_symbols}
 
-    libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
+    # We used to determine these impurely based on the host system, but then when we got some 10.12 Hydra boxes,
+    # one of them accidentally built this derivation, referenced libsystem_symptoms.dylib, which doesn't exist on
+    # 10.11, and then broke all subsequent builds on 10.11. By picking a 10.11 compatible subset of the libraries,
+    # we avoid scary impurity issues like that.
+    libs=$(cat ${./reexported_libraries} | grep -v '^#')
 
     for i in $libs; do
       if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
new file mode 100644
index 00000000000..00aaba1d498
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
@@ -0,0 +1,41 @@
+# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine
+/usr/lib/system/libcache.dylib
+/usr/lib/system/libcommonCrypto.dylib
+/usr/lib/system/libcompiler_rt.dylib
+/usr/lib/system/libcopyfile.dylib
+/usr/lib/system/libcorecrypto.dylib
+/usr/lib/system/libdispatch.dylib
+/usr/lib/system/libdyld.dylib
+/usr/lib/system/libkeymgr.dylib
+/usr/lib/system/liblaunch.dylib
+/usr/lib/system/libmacho.dylib
+/usr/lib/system/libquarantine.dylib
+/usr/lib/system/libremovefile.dylib
+/usr/lib/system/libsystem_asl.dylib
+/usr/lib/system/libsystem_blocks.dylib
+
+# We handle this specially in the expression
+# /usr/lib/system/libsystem_c.dylib
+
+/usr/lib/system/libsystem_configuration.dylib
+/usr/lib/system/libsystem_coreservices.dylib
+/usr/lib/system/libsystem_coretls.dylib
+/usr/lib/system/libsystem_dnssd.dylib
+/usr/lib/system/libsystem_info.dylib
+
+# We handle this specially in the expression
+# /usr/lib/system/libsystem_kernel.dylib
+
+/usr/lib/system/libsystem_m.dylib
+/usr/lib/system/libsystem_malloc.dylib
+/usr/lib/system/libsystem_network.dylib
+/usr/lib/system/libsystem_networkextension.dylib
+/usr/lib/system/libsystem_notify.dylib
+/usr/lib/system/libsystem_platform.dylib
+/usr/lib/system/libsystem_pthread.dylib
+/usr/lib/system/libsystem_sandbox.dylib
+/usr/lib/system/libsystem_secinit.dylib
+/usr/lib/system/libsystem_trace.dylib
+/usr/lib/system/libunc.dylib
+/usr/lib/system/libunwind.dylib
+/usr/lib/system/libxpc.dylib

From b7223e0393abbbe065d7c2fbb704dc97cfa45a26 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 9 Apr 2017 16:58:48 +0200
Subject: [PATCH 0839/1744] maven: 3.3.9 -> 3.5.0

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

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index bdd50421c1f..5490790fe38 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.3.9"; in
+let version = "3.5.0"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82";
+    sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy";
   };
 
   buildInputs = [ makeWrapper ];

From c51625b058e03ca7a91d4b5f49d73b6c4ea6cbed Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 9 Apr 2017 09:17:32 -0700
Subject: [PATCH 0840/1744] keychain: 2.8.0 -> 2.8.3

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

diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 6ffd36312a3..d32ed0b0d83 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "keychain-${version}";
-  version = "2.8.0";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
-    rev = "1c8eaba53a7788d12d086b66ac3929810510f73a";
-    sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp";
+    rev = "${version}";
+    sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb";
   };
 
   buildInputs = [ makeWrapper perl ];

From b520bed83442a5c5a1853f62f1bc869051379efa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Apr 2017 23:19:20 +0800
Subject: [PATCH 0841/1744] syncthing: 0.14.25 -> 0.14.26

---
 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 0f696d78855..81c459ff15a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.25";
+  version = "0.14.26";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1if92y32h1wp5sz2lnlw5fqibzbik7bklq850j9wcxfvr6ahck0w";
+    sha256 = "1ny41fj8gg555awqcsyvsjs1zghjlwciwhyxjh5ly16hzaixn499";
   };
 
   buildInputs = [ go removeReferencesTo ];

From caccd11442e0cfa331f7909a2c09388a3c3bd900 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:10 +0300
Subject: [PATCH 0842/1744] dtc: 1.4.2 -> 1.4.4

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

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index ac7a275d66a..e8c36dc7a03 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "dtc-${version}";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j";
+    sha256 = "1pxp7700b3za7q4fnsnxx6i8v66rnr8p6lyi7jf684y1hq5ynlnf";
   };
 
   nativeBuildInputs = [ flex bison ];

From 6be639680495cdde029437080e4393f981607702 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:13 +0300
Subject: [PATCH 0843/1744] i2c-tools: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 7d2a5f795d9..1f67743af0d 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "i2c-tools-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/i/i2c-tools/i2c-tools_${version}.orig.tar.bz2";
-    sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l";
+    sha256 = "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv";
   };
 
   buildInputs = [ perl ];

From 997b77cd382dc51231ecaa962ec550538e9876ba Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:19 +0300
Subject: [PATCH 0844/1744] iperf: 3.1.3 -> 3.1.7

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

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index 7dc418cba57..0d1e3194bd8 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iperf-3.1.3";
+  name = "iperf-3.1.7";
 
   src = fetchurl {
     url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
-    sha256 = "1gwmhm29zlp5grrpglmqj7vgx19s6xy33hk6hpbn8jnpn5lxpn30";
+    sha256 = "0kvk8d0a3dcxc8fisyprbn01y8akxj4sx8ld5dh508p9dx077vx4";
   };
 
   postInstall = ''

From 15efefa832be637e3053ae666e19121b7e597360 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:24 +0300
Subject: [PATCH 0845/1744] lcov: 1.12 -> 1.13

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

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index daefafa9e6a..ad887baf23e 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "lcov-1.12";
+  name = "lcov-1.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/ltp/${name}.tar.gz";
-    sha256 = "19wfifdpxxivhq9adbphanjfga9bg9spms9v7c3589wndjff8x5l";
+    sha256 = "08wabnb0gcjqk0qc65a6cgbbmz6b8lvam3p7byh0dk42hj3jr5s4";
   };
 
   buildInputs = [ perl ];

From 64306e29d7dbc3e8a909bc641afa6f9112e198b4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:27 +0300
Subject: [PATCH 0846/1744] less: 481 -> 487

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

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 9693556862b..b3370a3cab1 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, lessSecure ? false }:
 
 stdenv.mkDerivation rec {
-  name = "less-481";
+  name = "less-487";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz";
+    sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.

From 1f625ce93ec857cdc4f46144c4991dea35d8beb5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:30 +0300
Subject: [PATCH 0847/1744] ntfs3g: 2016.2.22 -> 2017.3.23

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index a5c858ecbae..a96612c2804 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
-  version = "2016.2.22";
+  version = "2017.3.23";
   name = "${pname}-${version}";
 
   buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
-    sha256 = "180y5y09h30ryf2vim8j30a2npwz1iv9ly5yjmh3wjdkwh2jrdyp";
+    sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy";
   };
 
   patches = [

From aef593fcbf3982a00512d07622965e984584aefd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:34 +0300
Subject: [PATCH 0848/1744] picocom: 2.1 -> 2.2

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

diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index f287e39e7b2..bfafe0151a0 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "picocom-${version}";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "npat-efault";
     repo = "picocom";
     rev = version;
-    sha256 = "1ac3xdfiw5bd24lw4l9hxc75rcagw0y182x7svhkqp2gwsvzkbjv";
+    sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx";
   };
 
   buildInputs = [ makeWrapper ];

From a7b572805c8b455f1a33ea51224ee51ab35e9c07 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:44:44 +0300
Subject: [PATCH 0849/1744] strace: 4.15 -> 4.16

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index d0e05dd35f8..ab5934ed58c 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.15";
+  version = "4.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0";
+    sha256 = "1vzhmpcy989i4k12q4cc438yal2ghhm6x7ychscjbhcf2yspqj4q";
   };
 
   nativeBuildInputs = [ perl ];

From d284082b9f1b22b4f8c2bb844d57d6d4549379b9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 21:45:15 +0300
Subject: [PATCH 0850/1744] yle-dl: 2.11 -> 2.15

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

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index a7f2d445bca..600b2c49758 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "yle-dl-${version}";
-  version = "2.11";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
     rev = version;
-    sha256 = "1fa2a25j3wwk3m6q1alilklwhqf337ch8rj6bwricc5zqb58qivc";
+    sha256 = "1mvgw8ppv33j04mjsyb5rxg358v3i2zfgazwm7nc3ysc5yl091j5";
   };
 
   patchPhase = ''

From 1b94c30beb287c261077531ca7097f5ebae44f66 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 9 Apr 2017 22:33:05 +0300
Subject: [PATCH 0851/1744] fio: 2.17 -> 2.19

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 0398ffc180a..50c8862bc34 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.17";
-  sha256 = "17fygcy3flsp64mfmwpc66byy95cidby34s6grm3zgsjb7mcypr0";
+  version = "2.19";
+  sha256 = "1rfnisb8hqwx76rjmgaagvs3k0808z27ll9i3w5ifzysi1c1l6r9";
 in
 
 stdenv.mkDerivation rec {

From c0e77dba0e1c16e6ddae4edfd073804e3ab7b30c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Mar 2017 03:03:37 +0300
Subject: [PATCH 0852/1744] linux: add kernelPreferBuiltin platform option

This allows to use kernelAutoModules but still compile in any options that are set so in template config.
It's helpful for ARM and maybe other platforms where defaul configurations are useful because they compile in
modules that we and udev cannot autodetect now.
---
 pkgs/os-specific/linux/kernel/generate-config.pl | 3 ++-
 pkgs/os-specific/linux/kernel/generic.nix        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 5574cc937af..5bce3af9429 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -17,6 +17,7 @@ my $wd = getcwd;
 
 my $debug = $ENV{'DEBUG'};
 my $autoModules = $ENV{'AUTO_MODULES'};
+my $preferBuiltin = $ENV{'PREFER_BUILTIN'};
     
 $SIG{PIPE} = 'IGNORE';
 
@@ -73,7 +74,7 @@ sub runConfig {
                 my $question = $1; my $name = $2; my $alts = $3;
                 my $answer = "";
                 # Build everything as a module if possible.
-                $answer = "m" if $autoModules && $alts =~ /\/m/;
+                $answer = "m" if $autoModules && $alts =~ /\/m/ && !($preferBuiltin && $alts =~ /Y/);
                 $answer = $answers{$name} if defined $answers{$name};
                 print STDERR "QUESTION: $question, NAME: $name, ALTS: $alts, ANSWER: $answer\n" if $debug;
                 print OUT "$answer\n";
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index af14434b08f..16b35e9aa3e 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -55,6 +55,7 @@ let
     kernelBaseConfig = stdenv.platform.kernelBaseConfig;
     kernelTarget = stdenv.platform.kernelTarget;
     autoModules = stdenv.platform.kernelAutoModules;
+    preferBuiltin = stdenv.platform.kernelPreferBuiltin or false;
     arch = stdenv.platform.kernelArch;
 
     crossAttrs = let
@@ -92,7 +93,7 @@ let
       echo "generating kernel configuration..."
       echo "$kernelConfig" > kernel-config
       DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \
-           SRC=../$sourceRoot perl -w $generateConfig
+           PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig
     '';
 
     installPhase = "mv .config $out";

From 250ab7a26a8b9ee2a403c7c21f8ac25ed62a551f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Mar 2017 03:06:09 +0300
Subject: [PATCH 0853/1744] {armv7l,aarch64}-linux: build all kernel modules

---
 pkgs/top-level/platforms.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index e26bc9e66ae..19cb0da58d9 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -413,9 +413,18 @@ rec {
     kernelBaseConfig = "multi_v7_defconfig";
     kernelArch = "arm";
     kernelDTB = true;
-    kernelAutoModules = false;
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
     uboot = null;
     kernelTarget = "zImage";
+    kernelExtraConfig =
+      ''
+        # Fix broken sunxi-sid nvmem driver.
+        TI_CPTS y
+
+        # Hangs ODROID-XU4
+        ARM_BIG_LITTLE_CPUIDLE n
+      '';
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
@@ -447,32 +456,21 @@ rec {
     kernelBaseConfig = "defconfig";
     kernelArch = "arm64";
     kernelDTB = true;
-    kernelAutoModules = false;
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
     kernelExtraConfig = ''
       # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10.
       ARCH_BCM2835 y
       BCM2835_MBOX y
       BCM2835_WDT y
-      BRCMFMAC m
-      DMA_BCM2835 m
-      DRM_VC4 m
-      I2C_BCM2835 m
-      PWM_BCM2835 m
       RASPBERRYPI_FIRMWARE y
       RASPBERRYPI_POWER y
       SERIAL_8250_BCM2835AUX y
       SERIAL_8250_EXTENDED y
       SERIAL_8250_SHARE_IRQ y
-      SND_BCM2835_SOC_I2S m
-      SPI_BCM2835AUX m
-      SPI_BCM2835 m
 
       # Cavium ThunderX stuff.
       PCI_HOST_THUNDER_ECAM y
-      THUNDER_NIC_RGX y
-      THUNDER_NIC_BGX y
-      THUNDER_NIC_PF y
-      THUNDER_NIC_VF y
     '';
     uboot = null;
     kernelTarget = "Image";

From 7099e8da8346765b2add777b7c4e6b46355ee8e7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Mar 2017 03:06:25 +0300
Subject: [PATCH 0854/1744] linux: build with initrd support by default

We don't require initrd in some cases but still most boot sequences including ARM use it.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 09e4d9e1ecd..39c19ceeff7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -100,6 +100,10 @@ with stdenv.lib;
   # Disable some expensive (?) features.
   PM_TRACE_RTC n
 
+  # Enable initrd support.
+  BLK_DEV_RAM y
+  BLK_DEV_INITRD y
+
   # Enable various subsystems.
   ACCESSIBILITY y # Accessibility support
   AUXDISPLAY y # Auxiliary Display support

From da4fd5ef41c548c83461bee53c8d4b19ac4d6a78 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sun, 9 Apr 2017 21:55:27 +0200
Subject: [PATCH 0855/1744] mutt: actually make imap optional (#24776)

---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index e5cb54723d3..92d1a3446c0 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
     (enableFeature withSidebar  "sidebar")
     "--enable-smtp"
     "--enable-pop"
-    "--enable-imap"
     "--with-mailpath="
 
     # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail

From 40e2e78d91334154e55d24e4c2274fc8d1599239 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 9 Apr 2017 15:17:55 -0500
Subject: [PATCH 0856/1744] texstudio: 2.11.2 > 2.12.4

---
 pkgs/applications/editors/texstudio/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 89ae2e04eac..52223dafeb7 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -2,16 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.11.2";
+  version = "2.12.4";
   name = "${pname}-${version}";
   altname="Texstudio";
 
   src = fetchurl {
     url = "mirror://sourceforge/texstudio/${name}.tar.gz";
-    sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82";
+    sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw";
   };
 
-  buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ];
+  nativeBuildInputs = [ qmake4Hook pkgconfig ];
+  buildInputs = [ qt4 poppler_qt4 zlib ];
 
   qmakeFlags = [ "NO_APPDATA=True" ];
 
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
 	LaTeX editing with completion, structure viewer, preview,
 	spell checking and support of any compilation chain.
 	'';
-    homepage = "http://texstudio.sourceforge.net/";
+    homepage = http://texstudio.sourceforge.net;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cfouche ];

From 07884766246354a18e52404b7e232e34f1785364 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sun, 9 Apr 2017 22:18:51 +0200
Subject: [PATCH 0857/1744] polybar: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index aceaf43ac97..026a1289fb6 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
 stdenv.mkDerivation rec {
     name = "polybar-${version}";
-    version = "3.0.4";
+    version = "3.0.5";
     src = fetchgit {
       url = "https://github.com/jaagr/polybar";
-      rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af";
-      sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas";
+      rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d";
+      sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn";
     };
 
     meta = with stdenv.lib; {

From cba6e287660fedefc7c64c613bd86f5ebd27b2d6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Mar 2017 13:23:41 -0500
Subject: [PATCH 0858/1744] hidapi: fix macos

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

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 07534ed63d7..80085759a76 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb
+, darwin }:
 
 stdenv.mkDerivation rec {
   name = "hidapi-0.8.0-rc1";
@@ -10,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig udev libusb ];
+  buildInputs = [ autoreconfHook pkgconfig ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ];
+
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
 
   meta = with stdenv.lib; {
     homepage = https://github.com/signal11/hidapi;

From cb180f47d403157f2cc5046fdd45a88031258efd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 15:47:55 -0500
Subject: [PATCH 0859/1744] cwebbin: fix src

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

diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index 458f85c1082..f4d9de184e3 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ascherer";
     repo = "cwebbin";
-    rev = name;
+    rev = "2016-05-20-22p";
     sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr";
   };
 

From f2655dd0c7cf1b33700446f57cc5651bd29c1831 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 8 Apr 2017 19:57:02 -0300
Subject: [PATCH 0860/1744] mesa: patch vulkan manifests when any driver is
 enabled

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5fbd6552b4c..b7a5f1a5c90 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -187,7 +187,7 @@ stdenv.mkDerivation {
 
     # set the default search path for DRI drivers; used e.g. by X server
     substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
-  '' + optionalString (builtins.elem "intel" vulkanDrivers) ''
+  '' + optionalString (vulkanDrivers != []) ''
     # move share/vulkan/icd.d/
     mv $out/share/ $drivers/
     # Update search path used by Vulkan (it's pointing to $out but

From 2db5b5a0093d3e9ac55bfb948aa44feb7312504a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 7 Apr 2017 22:24:06 +0000
Subject: [PATCH 0861/1744] verbiste: init at 0.1.44

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

diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
new file mode 100644
index 00000000000..3d4c35559e3
--- /dev/null
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "verbiste-${version}";
+
+  version = "0.1.44";
+
+  src = fetchurl {
+    url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
+    sha256 = "0vmjr8w3qc64y312a0sj0ask309mmmlmyxp2fsii0ji35ls7m9sw";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libgnomeui libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = http://sarrazip.com/dev/verbiste.html;
+    description = "French and Italian verb conjugator";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cffdc0addc5..3de94189158 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15823,6 +15823,10 @@ with pkgs;
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
+  verbiste = callPackage ../applications/misc/verbiste {
+    inherit (gnome2) libgnomeui;
+  };
+
   vim = callPackage ../applications/editors/vim {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };

From c595d5ed3dd05e278c12e740d32bcb3650b6f069 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 9 Apr 2017 17:32:37 -0400
Subject: [PATCH 0862/1744] cctools-port: 886 -> 895

---
 .../darwin/cctools/ld-tbd-v2.patch            | 98 -------------------
 pkgs/os-specific/darwin/cctools/port.nix      | 10 +-
 .../darwin/cctools/undo-unknown-triple.patch  | 17 ----
 3 files changed, 3 insertions(+), 122 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
 delete mode 100644 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch

diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
deleted file mode 100644
index 9aae2be1d03..00000000000
--- a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
-index 09c0e12..ac6b085 100644
---- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
-+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
-@@ -187,6 +187,7 @@ struct DynamicLibrary {
- 	ld::File::ObjcConstraint _objcConstraint;
- 	Options::Platform _platform;
- 	std::vector<Token> _allowedClients;
-+	std::vector<Token> _allowableClients;
- 	std::vector<Token> _reexportedLibraries;
- 	std::vector<Token> _symbols;
- 	std::vector<Token> _classes;
-@@ -246,6 +247,14 @@ class TBDFile {
- 		});
- 	}
- 
-+	void parseAllowableClients(DynamicLibrary& lib) {
-+		if ( !hasOptionalToken("allowable-clients") )
-+			return;
-+		parseFlowSequence([&](Token name) {
-+			lib._allowableClients.emplace_back(name);
-+		});
-+	}
-+
- 	void parseReexportedDylibs(DynamicLibrary& lib) {
- 		if ( !hasOptionalToken("re-exports") )
- 			return;
-@@ -306,6 +315,21 @@ class TBDFile {
- 		return false;
- 	}
- 
-+	void skipUUIDs(DynamicLibrary& lib) {
-+		expectToken("uuids");
-+		while ( true ) {
-+			auto token = next();
-+			if ( token == "]" )
-+				break;
-+		}
-+	}
-+
-+	void skipParentUmbrella(DynamicLibrary& lib) {
-+		if (!hasOptionalToken("parent-umbrella"))
-+			return;
-+		next();
-+	}
-+
- 	void parsePlatform(DynamicLibrary& lib) {
- 		expectToken("platform");
- 
-@@ -410,6 +434,7 @@ class TBDFile {
- 			}
- 
- 			parseAllowedClients(lib);
-+			parseAllowableClients(lib);
- 			parseReexportedDylibs(lib);
- 			parseSymbols(lib);
- 			if ( !hasOptionalToken("-") )
-@@ -455,17 +480,21 @@ class TBDFile {
- 			return result.front();
- 	}
- 
--	void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
-+	void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
- 		auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
- 		if (selectedArchName.empty())
- 			throwf("invalid arch");
- 
-+		if(isTbdV2)
-+			skipUUIDs(lib);
- 		parsePlatform(lib);
- 		parseInstallName(lib);
- 		parseCurrentVersion(lib);
- 		parseCompatibilityVersion(lib);
- 		parseSwiftVersion(lib);
- 		parseObjCConstraint(lib);
-+		if(isTbdV2)
-+			skipParentUmbrella(lib);
- 		parseExportsBlock(lib, selectedArchName);
- 	}
- 
-@@ -476,7 +505,8 @@ public:
- 		_tokenizer.reset();
- 		DynamicLibrary lib;
- 		expectToken("---");
--		parseDocument(lib, requestedArchName);
-+		auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
-+		parseDocument(lib, requestedArchName, isTbdV2);
- 		expectToken("...");
- 		return lib;
- 	}
-@@ -486,6 +516,7 @@ public:
- 		auto token = next();
- 		if ( token != "---" )
- 			return false;
-+		hasOptionalToken("!tapi-tbd-v2");
- 		return !parseAndSelectArchitecture(requestedArchName).empty();
- 	}
- 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 202426e7872..0154d395216 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -6,13 +6,13 @@
 let
   baseParams = rec {
     name = "cctools-port-${version}";
-    version = "886";
+    version = "895";
 
     src = fetchFromGitHub {
       owner  = "tpoechtrager";
       repo   = "cctools-port";
-      rev    = "02f0b8ecd87a3951653d838a321ae744815e21a5";
-      sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
+      rev    = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
+      sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
     };
 
     buildInputs = [ autoconf automake libtool_2 libuuid ] ++
@@ -22,10 +22,6 @@ let
 
     patches = [
       ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
-      # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
-      ./undo-unknown-triple.patch
-      ./ld-tbd-v2.patch
     ];
 
     enableParallelBuilding = true;
diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
deleted file mode 100644
index 7df9bdd16da..00000000000
--- a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cctools/as/driver.c b/cctools/as/driver.c
-index b06d085..c03397a 100644
---- a/cctools/as/driver.c
-+++ b/cctools/as/driver.c
-@@ -363,12 +363,6 @@ char **envp)
- 	    /* Add -c or clang will run ld(1). */
- 	    new_argv[j] = "-c";
- 	    j++;
--	    /* cctools-port start */
--	    new_argv[j] = "-target";
--	    j++;
--	    new_argv[j] = "unknown-apple-darwin";
--	    j++;
--	    /* cctools-port end */
- 	    new_argv[j] = NULL;
- 	    if(execute(new_argv, verbose))
- 		exit(0);

From 917ecc2390ae0c6a5f9aa7029d02bb44f4d138ac Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Apr 2017 23:48:02 +0200
Subject: [PATCH 0863/1744] lispPackages.iolib: precompile iolib/os

---
 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 6228f9c5fec..ea7e790ccae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -32,7 +32,10 @@ in
     };
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
-  iolib = addNativeLibs [pkgs.libfixposix pkgs.gcc];
+  iolib = x: {
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ [pkgs.libfixposix pkgs.gcc];
+    testSystems = (x.testSystems or ["iolib"]) ++ ["iolib/os" "iolib/zstreams"];
+  };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
   clack-v1-compat =  addDeps (with qlnp;[

From c4bdec77a059d0085d68f2b29c5110a2747978f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 10 Apr 2017 00:14:34 +0200
Subject: [PATCH 0864/1744] firejail: 0.9.44.8 -> 0.9.44.10

---
 pkgs/os-specific/linux/firejail/default.nix      | 8 ++++----
 pkgs/os-specific/linux/firejail/default.upstream | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 27acc8f1c28..cf7fe8fc841 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.44.8";
+    version="0.9.44.10";
     name="${baseName}-${version}";
-    hash="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr";
-    url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.8.tar.xz";
-    sha256="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr";
+    hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
+    url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz";
+    sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
   };
   buildInputs = [
     which
diff --git a/pkgs/os-specific/linux/firejail/default.upstream b/pkgs/os-specific/linux/firejail/default.upstream
index 4a0037e8aa4..186dd4408b7 100644
--- a/pkgs/os-specific/linux/firejail/default.upstream
+++ b/pkgs/os-specific/linux/firejail/default.upstream
@@ -1,3 +1,3 @@
 url http://sourceforge.net/projects/firejail/files/firejail/
-version_link '[.]tar[.][a-z0-9]+/download$'
+version_link '[-][0-9.]+[.]tar[.][a-z0-9]+/download$'
 SF_redirect

From b64163a90d395c9b0edc2c38c12875802968c191 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 10 Apr 2017 01:15:36 +0300
Subject: [PATCH 0865/1744] bonnie: 1.97 -> 1.97.3

---
 pkgs/tools/filesystems/bonnie/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index fb25446d2e3..65a722c7408 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "bonnie++-1.97";
+stdenv.mkDerivation rec {
+  name = "bonnie++-1.97.3";
   src = fetchurl {
-    url = http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz;
-    sha256 = "10jrqgvacvblyqv38pg5jb9jspyisxaladcrp8k6b2k46xcs1xa4";
+    url = "http://www.coker.com.au/bonnie++/experimental/${name}.tgz";
+    sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;

From eae15ab7713310847923fe1028c555290af9b1e4 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Sun, 9 Apr 2017 15:58:06 -0700
Subject: [PATCH 0866/1744] darktable: 2.2.3 -> 2.2.4

---
 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 1a80c1466d4..68ab287f1a6 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.2.3";
+  version = "2.2.4";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0";
+    sha256 = "1n7rddkxwcifc3kcdlnar9w562xv4h78fqkkn27jihqzp3b4am5x";
   };
 
   buildInputs =

From 58d6b50232b350511207a4723de3b1a17dae26fa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 10 Apr 2017 01:10:39 +0200
Subject: [PATCH 0867/1744] lispPackages: load precompiled asdf; support more
 implementations

---
 .../lisp-modules/clwrapper/cl-wrapper.sh      | 31 +++++++++++++++++--
 .../lisp-modules/clwrapper/default.nix        |  6 ++--
 .../lisp-modules/define-package.nix           |  8 ++---
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 97add524d17..41d40064294 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -1,6 +1,6 @@
 #!@stdenv_shell@
 # Part of NixPkgs package collection
-# This script can be used at your option under the same license as NixPkgs or 
+# This script can be used at your option under the same license as NixPkgs or
 # under MIT/X11 license
 
 eval "$NIX_LISP_PREHOOK"
@@ -24,6 +24,7 @@ case "$NIX_LISP" in
                 NIX_LISP_QUIT="(quit)"
                 NIX_LISP_NODEBUG='--non-interactive'
 		NIX_LISP_FINAL_PARAMETERS=
+                NIX_LISP_FASL_TYPE="fasl"
 		;;
 	ecl)
 		NIX_LISP_LOAD_FILE="-load"
@@ -31,6 +32,7 @@ case "$NIX_LISP" in
                 NIX_LISP_QUIT="(quit)"
                 NIX_LISP_NODEBUG='--nodebug'
 		NIX_LISP_FINAL_PARAMETERS=
+                NIX_LISP_FASL_TYPE="fas"
 		;;
 	clisp)
 		NIX_LISP_LOAD_FILE="-c -l"
@@ -38,6 +40,31 @@ case "$NIX_LISP" in
                 NIX_LISP_QUIT="(quit)"
                 NIX_LISP_NODEBUG='-on-error exit'
 		NIX_LISP_FINAL_PARAMETERS="-repl"
+                NIX_LISP_FASL_TYPE="fas"
+		;;
+	lx86cl64)
+		NIX_LISP_LOAD_FILE="-l"
+		NIX_LISP_EXEC_CODE="-e"
+                NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG='-b'
+		NIX_LISP_FINAL_PARAMETERS=
+                NIX_LISP_FASL_TYPE="lx64fsl"
+		;;
+	lx86cl)
+		NIX_LISP_LOAD_FILE="-l"
+		NIX_LISP_EXEC_CODE="-e"
+                NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG='-b'
+		NIX_LISP_FINAL_PARAMETERS=
+                NIX_LISP_FASL_TYPE="lx32fsl"
+		;;
+	abcl)
+		NIX_LISP_LOAD_FILE="--load"
+		NIX_LISP_EXEC_CODE="--eval"
+                NIX_LISP_QUIT="(quit)"
+                NIX_LISP_NODEBUG=''
+		NIX_LISP_FINAL_PARAMETERS=
+                NIX_LISP_FASL_TYPE="abcl"
 		;;
 esac
 
@@ -59,7 +86,7 @@ nix_lisp_run_single_form(){
 eval "$NIX_LISP_PRELAUNCH_HOOK"
 
 [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
-	$NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \
+	$NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \
 	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
 	${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \
 	"$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 4599c630d83..6e1b84eb3e9 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh"
     substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh"
     chmod a+x "$out"/bin/*
-    
+
     substituteAll "${./setup-hook.sh}" "setup-hook-parsed"
     source setup-hook-parsed
     setLisp "${lisp}"
@@ -22,7 +22,9 @@ stdenv.mkDerivation {
     cp -r "${asdf}/lib/common-lisp"/* "$out/lib/common-lisp/"
     chmod u+rw -R "$out/lib/common-lisp/"
 
-    NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn 
+    NIX_LISP_PRELAUNCH_HOOK='
+      NIX_LISP_FASL_TYPE=lisp
+      nix_lisp_run_single_form "(progn
         (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\")
         (asdf:load-system :uiop :force :all)
         (asdf:load-system :asdf :force :all)
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 520e224e6da..1acedf4b704 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,7 +1,7 @@
 args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
   , propagatedBuildInputs ? []}:
-let 
+let
   deployConfigScript = ''
     outhash="$out"
     outhash="''${outhash##*/}"
@@ -39,7 +39,7 @@ let
     echo "#! /bin/sh" >> "$launch_script"
     echo "source '$config_script'" >> "$launch_script"
     echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
-    echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" 
+    echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
   '';
 basePackage = {
   name = "lisp-${baseName}-${version}";
@@ -66,12 +66,12 @@ basePackage = {
              (asdf:operate (quote asdf::compile-bundle-op) :${testSystem})
              (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem}))
              )"' \
-          "$out/bin/${args.baseName}-lisp-launcher.sh" ""
+          "$out/bin/${args.baseName}-lisp-launcher.sh"
     '') testSystems}
 
     eval "$postInstall"
   '';
-  propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf] 
+  propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf]
     ++ (args.propagatedBuildInputs or []);
   buildInputs = buildInputs;
   dontStrip=true;

From 77f0ad5a37c4cc48e9869cd2652bb6d511c3874e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 4 Apr 2017 22:02:14 +0900
Subject: [PATCH 0868/1744] thunderbird-bin: 45.8.0 -> 52.0

---
 .../mailreaders/thunderbird-bin/default.nix   |  14 +-
 .../mailreaders/thunderbird-bin/sources.nix   | 476 +++++++++---------
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 257 insertions(+), 234 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 851b8737495..aba121ba761 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, config
+{ stdenv, fetchurl, config, makeWrapper
 , gconf
 , alsaLib
 , at_spi2_atk
@@ -16,6 +16,7 @@
 , gst-plugins-base
 , gstreamer
 , gtk2
+, gtk3
 , kerberos
 , libX11
 , libXScrnSaver
@@ -29,6 +30,7 @@
 , libcanberra_gtk2
 , libgnome
 , libgnomeui
+, defaultIconTheme
 , mesa
 , nspr
 , nss
@@ -95,6 +97,7 @@ stdenv.mkDerivation {
       gst-plugins-base
       gstreamer
       gtk2
+      gtk3
       kerberos
       libX11
       libXScrnSaver
@@ -116,6 +119,10 @@ stdenv.mkDerivation {
       stdenv.cc.cc
     ];
 
+  buildInputs = [ gtk3 defaultIconTheme ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase =
     ''
       mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
@@ -146,6 +153,11 @@ stdenv.mkDerivation {
       GenericName=Mail Reader
       Categories=Application;Network;
       EOF
+
+      wrapProgram "$out/bin/thunderbird" \
+        --argv0 "$out/bin/.thunderbird-wrapped" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
+        --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
     '';
 
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 286911e05c6..46d7aa32e8a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,585 +1,595 @@
 {
-  version = "45.8.0";
+  version = "52.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ar/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ar/thunderbird-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b56803f7047547e0ffbe7491062e82a82b19dabf8d4a7483834720166b0fb913f4a0252bebb5653abfaaf526998a5af0c31ff8a62ad8f5ec7d9736a6d581a7d6";
+      sha512 = "83418f9890becd869c878f4ccb5f2ac9dc57103ac12818e4ff010b0ca1efc85b712692e81e458a59fdea8f878d8c8c77d7e11dd116d045db67a0aef278aab6f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ast/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ast/thunderbird-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c49d973c8b138743ea8fa0bca75f2de01ce1d051b15b5d9e6516ad7a8e489028d2198ba460abcb62a06f0738994f00885d0e26e98b5f3311dddb258622ef6f36";
+      sha512 = "7c97616d16f9ce706e878307fe11ace62f87e227c9f588bbeb6eda8c6ba51bdee280014c7c831629ca39c6fdae537506100a82ccc801887df8dfeb35ba336141";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/be/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/be/thunderbird-52.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "8e5463a97d93c70fd9fb3b5cda89ad916c7ae2abc89974536dbe2af0633e696c839a97e8dfbf35bb3c1efc7ccf1c588c5ab3e595a0cea519596ac2c112f8012f";
+      sha512 = "cb7a99fd462c6b685cba2f95029f7d4225c0dcc95101523a9d3d807f8abc458cc4c0a035a8111d5655e7b47baef1d3b974b4a785fe1803eb09431b7f36129429";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bg/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bg/thunderbird-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "912056b19247376e3f8f4f8da493391c9e094abe2723091cf22c83017fcaefa3402e3465db99ea2a4413ea3fdecb9eb6170e8091a2ce3bc191061e9697daf0cb";
+      sha512 = "f1b2f0001359bcecd3cc1c884ec089c4386fa6679521863b449e2e1cc90a70b06e2c555e18640695c9b5d1d5bd45952bbf489ac3d65bc0adcdfb02b1bfceac4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bn-BD/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bn-BD/thunderbird-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a221336fae5a44312b1fbf8027c9a6088152f96cf2e5ff55239c0256f6b824c92eddba4442b5efa9e4ae1ed81b3a7114d85fa08a785eb73a20aa0f2b86f73107";
+      sha512 = "b08b572359340e813b71643d3f13b755143a8481343134cbdf49ba7fda1290c48f628c445d57cb254e87650844fe04e9eabf4e4340ec30465d82872aa3eb3cbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/br/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/br/thunderbird-52.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "ba3d2a59ef9347cb1c23716bd308f62cdcf1399ea6a2c35ede563fa2af48e49a8ca9954f986f55e41c80647cceb218d664ebed0c7053e3ef4a0ea12395bd01d0";
+      sha512 = "7bc083526e8aa4a9c6b59adfe237b25d468c4bf07abfb1a7f76d419e62b887978616337efa814f125d06e6f61361ff0a79ce1c2792ddd5723d7dacbb1f54efd8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ca/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ca/thunderbird-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "f64e2eaa1208fbcc8be61e28ceedc113101fd6a9d7b2ac23299f36913b7c696b7a3fbb83934c4ea2ca8d23d632891a22e48ce3001425fea54f7669599da136cb";
+      sha512 = "06e73de3a64b80ba3fab93e08c8b8968d0e84c3f49896bec1c38b2fc35d3c52f5547f5d4ea21f9d2c335e202a078c1c18830e1ccc986823c58e351a85f4337ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cs/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cs/thunderbird-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "130c73d25b581988fc14f734d39bdea4d777258ba35f56f421b234a79a00cc4f322912977af0feab0b3d4ac72e3fd3d13eb26465da7b2d81d8ccbf05a42b8c0e";
+      sha512 = "ec8bd4f3f2a6c0e695ab75ddb1d73723472df2a5a2e141a812860c1a20956ffac4a119de737d0adb766ba1f2c664d12cde40158fbffe555c94a77c8054e4e7cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cy/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cy/thunderbird-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a3894db9cef7368ee824ea7015b62d378a7e8733b86eaa5fa59645fea4fe9bd9bcb1752ed12678d6ac052b42060d2a3282f23c25c4451362a0c941001352a352";
+      sha512 = "e21599c17c21c6d425c9da5ce5998c7b6be36040e0437bd742506c8cad93fbbe15ec5dd7b840b085f3f484d4b6bb99bdcb1a6a28a2610c13411b13a18b1bcb53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/da/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/da/thunderbird-52.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ae037f835dd51fc4b140ca0165f75ff26a305715a8536929d46c487d4db1e77cb10f101faea6a612579b021db597b63045deaaa7db1cea2b3d4160d8ef423a4d";
+      sha512 = "1fff0b5ed313a1c404f86a41dcdc94a0787f01f5fda836713de5713697788274619520e40f48ad559e485e1144b898df338373f3ddc85662a95deb8c39fa66ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/de/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/de/thunderbird-52.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "71255dfb152f4f204399b6ecaa837a468bce5582fb9f358a1d7bdd073e2aecd41a7302a0096f1429d20bd67a92d012172308e8df9aebde141bb7da828b158cd5";
+      sha512 = "ee7f739d8237d7d5f5936e3f520de7d572bbfd0ff19aca140381daf4b2353a42a7b6b79680440bc2a62321c8089619114bce99bc48a88aa6346228ef8d08012a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/dsb/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/dsb/thunderbird-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "39f02422d754637044fe4c75c9d677c43ff6a87229893c3eb637ff6b9c8adf541833aa929b70f2b783aa1fcf998e112645809c6256070fa746c4c95885c9232e";
+      sha512 = "9439bdeb224ee48adc0af5bc882d3dcb2fdcb988502f9ede03d2ede67261c8007336414a6935f86690e622d70ddf933efe14ca9ef3640be3de46b6c2eba090bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/el/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/el/thunderbird-52.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "3cf4cce1398e945a3cb41e5432aa0c2ed1fa386e8e553816b1478a12e1248ac709de8d21a938e6c3cd801fffb58fe6e10776b8b96bb295b5fa016492f70031e9";
+      sha512 = "aa8a94bb35c36c0913f8b76944370ac839cbe1c16021f83b3b8c317e03cc1013e35fa502af3293611f7fc89f30513bb24dfc4d89e745364e85d674afe66a0d33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-GB/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-GB/thunderbird-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "609ebe7d015af9dfd3b88ebfb04d67691314ac91d3df7cff91df3f20ba7fb12db5f44dff5c773b4b7c858cc4bc5817119fcfabff03ec550ce250a5289aaea9ab";
+      sha512 = "01b79fa4b147fc7ebc07e29582e9fb567c4b0de565d4fd13a71279ee3946b9e182e086c6c3b1b4c413688cc3dc19979e89e5dda87ce10a181be0cb252ca69f4a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-US/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-US/thunderbird-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "4294c93adb8f38617b2898c91d0362b3ab327158e1810d2304f2481bdc4e0e06e1fd2a2d6748cb491cc6c732a039fa3dd83dac801b12ec7be2d7c8cf7e986286";
+      sha512 = "a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-AR/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-AR/thunderbird-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ded0d52934a5b74e4eff172037c1abe9c15cb522897daee5173739f4a149c1891309a366d3aded2f1306c447970e72b1a2930a9adce07d57287f7f5f0e8eec73";
+      sha512 = "c2df311f50945e103bfa390413d8b0a4ac307f658aacb10b37e69eb6742756b8cac5221e27de5b96ec07e4f657851c17928f8e3dc0100b300ca97f9f643d05ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-ES/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-ES/thunderbird-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "523c9b931d9ef8319c5a30463035d84946d97b07a9714b2357637f9992a3dcda4536a29933a29340d4e4951ff2bc540d587ab290a16033bfc510ac911c32d3e7";
+      sha512 = "3d54d936ce165eaf9edfe676a42eb4cb257fa8d18cdd98e4027ac8ac76d9264a2676f39ae37459915b17d7b2473057f076bea0a28a0e68570ad8d1bf8b25c520";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/et/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/et/thunderbird-52.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "376e5cd8f50c4b10c4f71b6410528965f256b69c17f3d0d103efe6bdd28ed96d0fc47dcfb709dce617757c3cec603c5a16ac675ae12e17b093db3d1184c8ebfb";
+      sha512 = "966d12756cea32951a38cacdcc2f9854f88f8d5bc6f07677274e5ab1e9b74c875995dfc226a6df61c8ea1901d14cc7971012a9152f6bc37e4def57166be84312";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/eu/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/eu/thunderbird-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "8dba4439fadb14028903eb552ad08c62b0a63559ff5332fd2d5434179fe28a75d754b6769d1a171d7e580ec6d86fdfcad8ae6230c14c4e9aa981944013dc5b86";
+      sha512 = "ac1beb19aadbb0b0b15f53f8778e2b8109eb42913e8ec4b5817dcc31e8dfa8a6d40beb9e0c61a05507cde5d553c7af03587194129d20e388344c4d469a3b1b08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fi/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fi/thunderbird-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "40d579d59beae9070cf548f340d5b36d67d0456bb0f9569330dcaf4667d6cef71be1be4d32ffbb49446c8921486153e50d5c33ad87746f605e4d3a79b4b74a69";
+      sha512 = "5efda4136cc8152367e36a5c460a4f31c8287441599264aa4b5243173fc925475633529564c357385e511d2ac9faddd04c8bba5fa9c1ecfd2ff8e22fb002a025";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fr/thunderbird-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "80b489cb98c0a39c641c0d49cb750cd737594e6de1c9b0559208535a41f95855afbbaf987ab0cfedf5fb5b2fa1589d538b7eada05114d7259d3789fa399e20e7";
+      sha512 = "75368ffdf22424aa919fd35f47813e13a80197345504c17b4e03673d1666431d4e455d1bc76a8f69fbc25853828d2f6a0b57b705bfd37cf12ca5a3095c075916";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fy-NL/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fy-NL/thunderbird-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "6bd13607375c513be19ae9f86e806ca94d4acb087700fdf85842cd2a7eecab66735b9ca5130b013d09dcaab12134d894bb991774727d67ff71ef2cef4b0f9b49";
+      sha512 = "58edaef7cb314a54feb5367a931314e5a0dc1b308f92372a815c7b1407ea783cddf84f0ebb0c8c59c217b3f6a9ad97873ba85641735db9a2503ddd76c26f7b7a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ga-IE/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ga-IE/thunderbird-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "de4744accb4332e8509a1cb439f29d773d67f42d3964e11df83e790e6f720063b3368d3a120f746829d61741abb18baaf1f2afd9dc3bffde1ae2a118025d7973";
+      sha512 = "dd3aae859b04cb9b945083bbe6fb17ba11fb8b218fe8547c6cd4a0d3adb85051f72bfe2adbdf80ec07066ce1aa03e825b2eb153509a0614d98eca8b5565b2755";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gd/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gd/thunderbird-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "98f73337263ea57e609bab9f8f0537c15c385448c48b84185d9c8cde8550d2d2fb6adc31735c7a45eff5d1872047f7137e168b977a5686401c1f0aa21a38effb";
+      sha512 = "4230cd99c7aa2a9024e76fe52f438574384e682807c09981db24f30cf60dd76ed907f38b212e78b6250f8ee68727e91dcd20fc3b4ce74cd3ad303b9700818091";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gl/thunderbird-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b255dcc44f33c9b8d74ba664350cb6423245a146134e64292f7bd0850ddeafedfd691d8c5e4db51c019df92283b094a8d152441512aef33971ac8959a2904656";
+      sha512 = "d393b4b18458ba2fac188c63bfdccc8e9247b860069606ce21e0533a8316bca15117086216408ae86df18fa3ccfc5605e8de51b80989beed38b55ed7b98bf6ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/he/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/he/thunderbird-52.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "4c8406c16bae204a1aeb075dd061eb3a70585e439c29f585fed4bb7ee3c1d599f8fb2f12f2ad9d0521550729d7ad1a0b097349a3a318be89a37d10b749fa4fc1";
+      sha512 = "3d41e16926d986129b1d7a717464956a8ae27c75a709789eeca4d8be4875627a740f995ca9e00072e12887e5caca4d3df8ba435a60494f84aa321a99bd15c4d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hr/thunderbird-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e855a5753de07b4f4435356571178149c0eb26d9b0b81bbd41de89e88bcf30c3d970514c3548a389cf719917f29899185e1bed9d18c4b467f2d31e00d271623b";
+      sha512 = "6d8698dcb0d2ced2e893aec1221086dabd7f4f351639281c521110e24c4177f5b79360a1324843c431b7535aa59d222ae52797710c7ad41143f4fb73fcc0eb5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hsb/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hsb/thunderbird-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "8afc5a73b43ae6b43595028213ff6e21da813f9e9a93aad498e583c4ad5fcc2c5eb90ecdf911a32a68710c36a742ca1a0cc89b987789aaeb9995716783e0fff3";
+      sha512 = "0298d90aa6cedf21002df84bf753b59addb072d187b0ea3170f85c041298591994f7f842a8d86db12374e5f00abd4178820168afee738a07ed886f27ac46e9f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hu/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hu/thunderbird-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "da48fd9398349c6dd583391413add0b789d1500dd1481758a62121052bedaa739406011b5a3747fca810c74140c98498eb8c49a092ff3f184627bbc3469df90c";
+      sha512 = "be3dc6926a5ce25a6942a5b33c6d3604c74a0d54b5ae1b4974732cc1fbc4718100fad6f5a6ad77706055c5d9d2c8c2fa52d766bd758e59f44da9db727aadd326";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hy-AM/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hy-AM/thunderbird-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "588c3670d7748453e273f515255c29e5644e521f9710d1f87360a2031334f9353adba4e219b0f90c3c028102e5e02a0ffe07071a6fddea2bd2a1d972c04e1537";
+      sha512 = "001726c9b817c9b5c34778e0e6f31deca7d11d4887dfe5707e7e386bc0ef8dd9acb20f5008711d7d51902fc114590712d0264ba229934859b0089a8993deadbf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/id/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/id/thunderbird-52.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a9acd62a369249370f7c6b70bb48aaa8af06de2439b328d92ddd3092cb95fd59df679a451f42173e6901d0e9fce9159e295331479d5128fc50ca7a2c93129bbb";
+      sha512 = "df01723f6fda8f38241683972283c6d1ebf548251d5deb4f061e47d294d67271c72c05cac8aeb2e84afeb4a1af5ea29bbe6293a6a1c4654d597fff2e77b167e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/is/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/is/thunderbird-52.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "76aee81433e6d8f2f7906d754069a5aab3ff8caa2b3d503a730eefcc42ddc1ea2018049419015dd4725344dbb54d821633f10f1d0c0139ee62c230f7643c5ee9";
+      sha512 = "12112dc6a40579f16bb9d7d0628a31cdb815d7da0484983be95a1ea6aa456f8690d8c0392b164cd365c94900f0b32acdf4a9a247e795a572da9c024d5fd56470";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/it/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/it/thunderbird-52.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c7912a63ab9141a32e8f9040522900b10bb56360fd387b8b47af860814fa1541ab7ec1c59eb6376b7aacc2a22faa046d05c4a1ae81ef12bf553fdf546cfc403a";
+      sha512 = "7dc5c3a52204e4c77f7cb16c40c583eb1617d952c8f887f918479ba3268a006e13cb8d3cf21379b53b217ce7cdc4295876eb9f7e6108760d6d283538fb455bf4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ja/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ja/thunderbird-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "03f414eba62f4188bb7a368653f89f0b8d48e850751cab0fb6d706912787aa098a32934bd5c7b3026e466b23df4cc6780f6b88f1f252943b2d56b53f1ea62cb6";
+      sha512 = "43d500330ca83420787adad7de1510a6acaa958f82a265e631191d1305ccb70c0ab118c78c1948cb466603b88d023268aa32900fec2e1d81ffc29050227d2c72";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ko/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/kab/thunderbird-52.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-x86_64";
+      sha512 = "609464c5c9a86b7c645049c2c3ac63a936a0670250599290d3f6676414a112f43036bd2867bff462f8c1ba89de053041cba887f5568e519d553e0adbbfc42283";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ko/thunderbird-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d9c1cfba0ab167b4f3e16eb8ee37ca3acfd94477df51a2526975602882b93a4c86e7936f76263bddfc904900146b0ed570c641f4cd1d48904bd5b9f09aef91ac";
+      sha512 = "c3f3d2d5a981a8756a3b76048be1627076e6a822f1cd81c24bfc496ee6de2865744ef50715411d3ffd4db4389e72a1760130d63b421e65c8761a7bb673ce5f3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/lt/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/lt/thunderbird-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "5f28db94768ba285feb1a239cfd909a588a975dea16ade7793e4e1f71f8dcee1685e7370ba23cb50b253d8252a51a38a90375e8224653bfeb37e2a1e8d969d34";
+      sha512 = "cb746e1fbf5929225c91c2989d33b260fd768348ebf6c232586bd27b46e964f94443659270a6bf6017bba48abb93f533f8428ffda52996597ec8959f8efa3026";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nb-NO/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nb-NO/thunderbird-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e3078466c4a5aa5a2743c7224c279c908be05730a79bc541031efa48605e0b74fb4244e087f3cf526bab6c67c40da585815f11999ff29d6a3d0867614aa11e17";
+      sha512 = "67d93508be6d5651707ff7109b5e80fad9db5fe442d05f34834c0c05610cee9aa8b3f2b61dae8705a1ab5b5b5addc089a52928ff5655b93d4c0870dcb9dcaeb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nl/thunderbird-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "7e2bc54b6d72fa495ef99e132dc4e476bc233c88c1652fc625ed66b504b901fcef53b4968d63d7d468e734903b38ef897282c2122e4bfca5b492e2f4d44b51b6";
+      sha512 = "6b40414449c75856280987b49cf3abe6f3725b89c2a53df3c11c942523d32e8cb3195ee49bae9dbe19d507473ac6b91588ed1e75df7aa1e1418a8ac0f69e326d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nn-NO/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nn-NO/thunderbird-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "99a733996460fe3a425d7ac9d37d292ef9fdd0d1bb22aac251f592bd57f4ab2228040443ed132987cf17d971b3bb2232ba9e70aa2b6b702d73967ed55a1b3b41";
+      sha512 = "65eff88f0b0f8672bd587693c1e7d55aded95d308f624e9dfd8731b2dec948cb7ee9ffaf484b35130a63fb6d9314ef8f044363c6b41f70f3e540876b109caa41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pa-IN/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pa-IN/thunderbird-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "d43dc96e3620c8ee1257243e725743e72c64f39123d2e4648eb5a31e45175b9b01b066b85ee9cc3d9765151bc2aee32f73b50579619968ff95918189d45358ca";
+      sha512 = "0d4ac412f5d64aac841a1fb0dbdecfa80ff282aa8472df3e9e65419dac486e3086d954c17d1a535904b61b7907fc55d02376fb7a4c46dbc53f48f427673bce8c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pl/thunderbird-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "32f034261425fc41ad9b2c252aa456b1526526816d9ed66e92c49fbf8fb4b077405e2ead3256dac568e1470e29971ff84466854115f57f792a254f0723278054";
+      sha512 = "6ded5f995084a9fcee1a49f3204e2342216c9e04b5b7560e52283bb33bfe15fadadecbe9cbb6bc8643a3fc114b44dbe6c53af1b8f31ad3e3a53653f1fef944a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-BR/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-BR/thunderbird-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "65f85f596241f812a548a90a1ebf3cd24733e590cbedd600ca8d1164d3d3f5db9fb9a0e152ea05025039203f192168f60fd28a03121c31cdcf14449505d57c0d";
+      sha512 = "7199ebcaf1c206fb93fa0c42118876e2e416fdeee9907c6f43ef0244a950a13ddb74282898b52b85cc2fee3f8fa7077512f3414a916fe1a839243b5823aba7f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-PT/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-PT/thunderbird-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "fab114396e6cbee135441392dfe6baa179640174edd19ec4d1854a4adb6d3310a38e162209bea0ac532e2734a9ad4c5abc1926e0a4ca2052c62697f99c374135";
+      sha512 = "e6290824e68970d66bbe1787c18062e7638989550f5303c5e42464416a74cdcd95c6005746fcb1ed1a4703fe53032eec1fda92cd0107ca244ee9b8dbc7ee6d50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/rm/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/rm/thunderbird-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "e03da559d75887e2418119cc946bb9ae2f11027dc2109035e533da46c859f3dcaf8fec294a6bdcb10d164866bc5c3652ccb6b8276c58a91311c2bba63117f1fc";
+      sha512 = "7a7abb88f8cf6d40adfd96c2173a8ecb1f2b4eec4e12111bd6af71837b6ed154086376164c0d3fff56eccf4039c3459e275d1fbcddb42fe6efc5c837816f1f3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ro/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ro/thunderbird-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "f7bed7908706485e0cb26a663bdd6b0fd8ad8ad5e687a21e1c137c39d01427e3edce5ce58602bcd18a185445badefa519ecd841367f88f169591aabdf570b940";
+      sha512 = "27fd6ec6be3a876f2ef65f6cc65284609e03f07d71081c967bdd4aa789602cf3ac29885ca2fd710fd8f93491006f4d1e51e8106bae112cfe1b662e13c24b80b7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ru/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ru/thunderbird-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7775b9054e95d373d188e496287b2cbea1ddcd12c51681123642fbc181cff258d47b900b3dbf046f3de7d75e80eef5f343a50577a9db05ab2b56867a18f3c912";
+      sha512 = "19ca3df78354d2c6dbbfdbde975608b73bb4277351fd5d19f15183fc55b8daec2e8eb86edc7f59fe27ef8871497d54b30bf468d2f4f781dc1ec51ef77047feb9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/si/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/si/thunderbird-52.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "3e19c7e5b62b6d0bd3598ce6bfd23631abe381f7af91275aa8e424ff2950433fd5e58e912ad13c726185e528046d3bdccdb6b3e1fa540fc0cb69b18d37caa095";
+      sha512 = "28acca4bb30e303b063c88ebaf320799172421db9c859c3fec5b0bd1f02efd76e52cb82586d577fc73de5f2ee6464ff99dcb32351345d7d1aa28bb14fd856638";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sk/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sk/thunderbird-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "35a5b23cffb7a80aaab378ac17195b727b7776a0c91e1616fe9a66708adc08d6041efa55dd5b291eee823a5420b092671a34f930276521f0d757e3b5568e7861";
+      sha512 = "f62ea125270243a9f09a2b3b57fdeca752da12788301efd89cb3a3ddb72b8bf4e8befe123ed843a6e70aa42c32b14e5fab8e323bc70383be0517082101dc5f05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sl/thunderbird-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "a7b27babbcd47b4bca6e0686aefa175fab17c4ab0d7f18793a0a3755fcaf04cd85e9bf8ddaec442ab83bafede0ad9f8211add33b6cad845f7c827e3af0982f76";
+      sha512 = "bda98cb38a8334b1612ed72a286cc5df7d4310cc0a4f2a0bad9742a66a898c11f393b3fee48bef3996680ec32d7217e5b2b216ea8201d72fac234c3fad0a0bcd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sq/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sq/thunderbird-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "796d3cd98d39fbad987387f92d23c10f4176f2e612c1fa939bbbcf86eb3de5798a9c9add31549dcae001041d0318de2186e00200190f467ebfc85e5c95797cb0";
+      sha512 = "704a118df4a6279383e62c1a7a09e24ab5073540736979ceb69f57d2d5a4de39e7ec58ddb2384cf48a2924c4424fef2a405a4b5745b54ff63ed56d93a3fc31a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sr/thunderbird-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "8b296aaf9314a8b0381e567ff87e8ed261ebb976c0f63d3636d03fe2e416475dad8c500058e58793a7945ae620268854f99c97b93da0ab73a40f67d801b34af9";
+      sha512 = "9457f07c9a91a163927d1cd536e6b918fa7acaec4333a9b22ac1fb8d26bc528cd34346494184bc4d4172110620bd59faab3a2e036afd3a0f6bd871e4a8efdee2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sv-SE/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sv-SE/thunderbird-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "59e0eb3a4e1cc65fc34369b0854d7029bfe108b3cc3550bde26628d88d82c0031bbf13ed8564c7508b2acae5ffc9a912f1cbb991bc5cecf2a210bcdb181e2a05";
+      sha512 = "d9a2e8c1f76600cd9c8e2c1992269ce6a43891e58a9d870b2e2085beadcb46d7af322fa304a99c48dea2c91a68b5adc84094e179efd39034901d1f2c68686e53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ta-LK/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ta-LK/thunderbird-52.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "86719203c04b90e2d359ede21ef3bca7e2190b131a78ba4ccf6a7d9644bcb2971b541cb3c6432e6a12952a3a589769851277a257aeec594b6208918c17d76b32";
+      sha512 = "68f61602b4a6a277639df162cc404c4ee2f433daf7bc5b1ad51372e5ba1a469b111d66837be27db3f42e56239f2c34d632a8ccd92fdaea58a6306da822070ab0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/tr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/tr/thunderbird-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "5b7fa2e0881dceeb0ac371a0d84209cb9e9c414ee617766ff898b50c2b21956919410be26cc0b1e30997931519fcc491c63c6e30144a2c57af8b7b8f61cd192d";
+      sha512 = "511eb1a4dc9629b5dc7aee5fc47ea2610e367ac871814c6746094cf0250498db59da74b4e3ac84c54a26b4647d3c08b3e5252b6546421d071e203559abe942da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/uk/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/uk/thunderbird-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "8be8b331dce88d3244007066036741af4794559237811ab8d45dffe3e850383de636bb75a510d4a0500a2a78aa86d06768073a5626f5bf2676eb4d8e355eddcd";
+      sha512 = "07e8b6be8081069ae6a33e30c936ea26faa1dd9018fe78bc0d8783c7e9f4aec35a7ee8ea8fa6fa0763348423f11b4a60fa34c4f64cce1cb45d470512a7b889f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/vi/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/vi/thunderbird-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "60ff68fc5190679b4faf2e80f89b8061348f24c0426f632fc2e523be2d47b0477b2ca122fe4c9a77e8baa91d5c55ef0204fba74f65a1d7e77727abb9846c93df";
+      sha512 = "1fb6aa8661adeecbd3fde91e1158f102573e847a88b5ac2e2e79502c292a200edd4a93393fd5e44cccaaf2f91d7195722eb5e0df768fcabcaddb1681d85b5a48";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-CN/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-CN/thunderbird-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "a7da3633bb13627a81681e2539472291e0ffbef2921ae59c7fa541b0115f761295221501ea7b4e71975ba89dff559aa0f4ae1be196983854021bef823cd7c40d";
+      sha512 = "807459ac5666d19595b2095c78116921b046f0cf3c7a4958d56fce8e92e81ac34cb62137a199b7489c72aef1226d29b0c39f34fb9e30c03b1ece12668a00ce1e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-TW/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-TW/thunderbird-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "dc16cdd23ad53baa7b0863aa889a9222a14ae8e81794efad08dfffc4a6282655fcce3ff64187ce149c06d808a0010af8a084bafc59e253f094d501ee6bebbbef";
+      sha512 = "f233f514a91b558b9b792d2c72fa725f1232786797c52d37d49974562f360b5bd94a02efad1aef751ab74d94fd18de389b6dae416497bb764b474c2dcf90fb18";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ar/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ar/thunderbird-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "21c08dc4ae1655ddf62ab03ab68ff0d5fc3efd6c8cd3ccc6d757b0b684365a3316b4cf4fac5a51b21be27a5e3067fbc875bdac1a8bca5cceab6e048c10f0f177";
+      sha512 = "cb89eb4eb32ac39202cf651aecc963ca0a1b215f5bda3e23fbade26da7c760e3e0ff06184f963904441c8db5ce4f12b34d5d28a6f119c80a5a20305478ed8b54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ast/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ast/thunderbird-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3669b524e5d5800f9ef3c1c6b5f874c29ba6fbb336cebbfc9a88f857e73f9bf90ccdb0fa2f1723d4e883947e71dc0333391b9021166b5acf2e39ca3d7bf02ff1";
+      sha512 = "4cd5cdeea7420f5cc7f1dc2aac10f8db743fcac080a3ecd2b0af33403d364ff6ed711d4307b5126686e06f7d0e759c9f2ebcc69bd21b2eb297a3052a66f483ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/be/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/be/thunderbird-52.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f49f90f1998a5b7dec1e3a862b8f76bc11445d99f66cc6503675fc6629a028624e55dac5245da777b6e3acffcba24305ed199674343cb610861da9c7671c342f";
+      sha512 = "cf4306a2fee98805722391e32f11e230b6b9c400cda8e555900126f6f19e03ef8e45268fbedc81b05a1a2b408b82e740c601ec1d315d3a34257a7513d400726e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bg/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bg/thunderbird-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b46e78338269dc6c65f0eb2bcd2cb4a0dffd5c100b4b1905582c8189f79abc975f55c7edf06e1f0edbb641de86f3b6aba1ca9028d11f4fa08ea8bd1c276e41f6";
+      sha512 = "0ac427d9b8967316e5b9fe434ac20d019e93fdc4a59f4f0914069d9b9b2fb4238f9f80d030df0b1d07893a0332fd400c2359fcc6dc7bfa728774adfd098fe25e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bn-BD/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bn-BD/thunderbird-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "d349c503a13ae9b951af173a43f4f8dcbd5cab43d5a6219fe5b00e1d37efa7a0ceeeda36576f31f51bac615d6e4307611496e8036af4f9fc40dd3dfb495a6b6c";
+      sha512 = "035d95bedde2b80451c03412bc3b732f2485931421f0581c8b9d20b543fdd0237334e46e819d98762097dfe321ecd4e872495e6d7478c4632cbf793839a369ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/br/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/br/thunderbird-52.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "4afebf7eab2f7205a8760f04e566ba8d54bc2974cbd132262eedeaf880d29aaaba48ebd731bb8dd7ca537e6cc3fe444c1ae4168e3e08b7e17c55e70f763fbadb";
+      sha512 = "156ded085c9800dd6413950e2fa26a2de67834ff48712a3a893e284ff8ec6e18f2eef02031c3962d72b171dda432ac679e6a31b2ffa0f766af1ae8ff6d6ebd20";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ca/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ca/thunderbird-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6b5e9abc4fc05ed580d35baeb6c7b1462daef2352f751e318b9a7bf16d032d8a8240f83d54fa17d02a9a967e7477a36808587a9183df4274f10b59059c55fede";
+      sha512 = "7affe51b4e92dc04569affea1165bbcfeb66468d7c1c1056ce03013c924af3de6c8d979ccb898c9985b0ae076bb662d692d11d7bbbd82e59a9b3bfaf0ca8c584";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cs/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cs/thunderbird-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "1410e7bb8ffc8a4c515b1c023ffa6eedc960632c05e5e7f4675aee9e972877dfc73d09ef14deb1c308bfcc1a6333e62b24af582410854b62acf4d889c7d54158";
+      sha512 = "0c5aaeb88985ac6167c0f28f4115eb3a95be16900677ccf0cf55fa99c7194997939f141ff2bf2d497bce9260628eb2a76083c7e3a1d81511dafb829fac2a91b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cy/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cy/thunderbird-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "28b50a2fb0703f80fc9fb91d1add2305e71f2ddac99cfd086c8559f29b5a420e9e5e3d370f0b84a32f5c358661566b070844ccd0b33447ed4c5a427eec03cfa0";
+      sha512 = "0776b21cfc88061b9550ca9a0c3d77a791dcb403f7355235611d4d5861c36a1cd0f64a8ae1de3e5d76bbc560f76f2d6819ca53dc57be5d0fd2a3ebca81d7007b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/da/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/da/thunderbird-52.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "c38cffe6416ca50c78651d24d5466d6e06b2cbaa66062eb13381c4402d39a7bd55aae10cbe3400ba0fe5983309f2d70d3058a46054911399a057679b09b451be";
+      sha512 = "f22f9601cacfcb440a8657a810ad903000b1541930df88766098e1621c883e8f320c13fd09ca7958ce134d93f7aedd22f659b27fd7c50329e67659820034ef41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/de/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/de/thunderbird-52.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "101ee34b890f1f3f9bc3eedf4936b8ef1fc9edd2f5af79b9c8375326d430585fc564a76a0bbc81bb119ce9a638af60055d578b5e6f1f760100171696351f13c1";
+      sha512 = "6537e54372558d8a65f54e34aa5012b01d637f309ade5708ab040a345ec7c22cc07646caf0f84e68b5d926d24e9dd3d39fd121578ddd7027b2542b93005199f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/dsb/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/dsb/thunderbird-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "a6dd564baa36402d082d5bc2b5bc6002a5abd66b9bd545a0962fc844f4800390e527b9deaa6ca4f197d98265bd85e7d52624e32be17b2efc96b136d4a0108109";
+      sha512 = "a913816a013a3209a071c9666a92e7a876e601bf22af4f3ad6b331788b4693967d5e7a9059dfcd23fa797c7222a303e6708ec3bc39e3f4acaa9650688a2bf4fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/el/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/el/thunderbird-52.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d5611f341f3322adeb5e94f9dc83dc0de26d6dbaaaa45a904fb9add1770f77b86db57693aa3c89f69c1aeb27e98793475c900643b78a70284911a63791048069";
+      sha512 = "81e8308d1911d45fc1b4da582fee526d52245e96b4935119da542f53434abcfc9d7319acf902b706d667e03e05f4e39c8fe6b5424fd2077c862bff102eab49eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-GB/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-GB/thunderbird-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b8c71ccef1793589f5cbbac8e12ad1aef833131a51a0029c75b08e26f28b3d5dfa821a84654efffae1e41c23cf5575cfb1b55de29e9c29b1a5adc1632581129f";
+      sha512 = "e93fe34674f8cb02e9fb2b2b2695c402e2a4cb35f7b4bfbe96c41cf27e6dd0130647d236a918c9595dedac0b7450aab4c8acfb9e2f18a99979b7099353447507";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-US/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-US/thunderbird-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "dbc77f7814b3a085fdf54536d77db69ad893b0230ca1930fb5fbf916cc09e421cdf8987e7f75d726f1fe31f3c7ed0afc584da1d1b1636a2750e9e0454a6de45f";
+      sha512 = "a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-AR/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-AR/thunderbird-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "f161bccff6692a9652568530faa89012e2a7438814fc87f816cbbf93d40425133ef24250a6d1b9990bc772e9ce86d778f905d844166527ab6020687bbede4688";
+      sha512 = "bb38d967c613da3122ee421b95d5fa633581193f4899407125403f13d754f1061f78770d342bdeff0e597e1ce813283b25ecb6556aa5bd095f40386fb4e6b563";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-ES/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-ES/thunderbird-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "51ca5165f83366f0fd73fa900640b35d572656d123d14663b737e140c1903a816ca8e2980c2c121b1e0a512e9211ceef745c34d3fd8c04b21cbec84b868b468a";
+      sha512 = "77c8da8cd474ea74b0313efdea0bb428bfe164c243178fafe75075b71df8eaba764d7ae9258d00ce02fce3ed4648ce839c46f3f9e431e0123bd41bf313954fb4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/et/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/et/thunderbird-52.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a8524b1a72353ddf3d2b883b3936606b9eb3f1898aea05530c38d7d57fd03ad9c36085996fe3442f085ddf668e2fc909a704939c370ba1d2d0684253a10fa965";
+      sha512 = "323bee6b4005c78c95f1621e9a89d9faa95da44316ce01792e7488b00562d1d64ac23dcf7974d5162e52bff4b9327cfdcff0a85524869cacc4431fe6b1450436";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/eu/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/eu/thunderbird-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "6c3f12ccd7dd48258ff5972163da3617f3038f4f670223617f1b7734181234eaef5be4762156650c0398c4791fc82cfb397149f62e14bc6c873d279eaca92fb3";
+      sha512 = "d90d4364e891794147ad447f3248444218422f6140e7a202554f25a494a2fdc399823f83ce85edf496753125076b83e19a28987b2dab3aff582d1e860a238d73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fi/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fi/thunderbird-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2d417c63a5c5d5203bea96f88a51ac4b501dee7575bb43fcda3ea523e76e65dacaf16c3f6ad772b25a242aa8016fb36c4f3a04c86431ade23389a97b7cac25cb";
+      sha512 = "b0c9a426eb74f9a8ef3972f40d4a5d73a1eefadf402e65a137043ecdb9f4e0b79c4e84f78c03afaa3d6f0d455b62ecece1861bc289091f5c2354a226c7e10ffd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fr/thunderbird-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2c64e8a21306b6129a87333ff1c29ebba10f708d67636042bf6daf40bf01e5ef954038afae8d0d76c42d83ed0c8074525b13b60791f0d0e21108053c9b81822e";
+      sha512 = "9e44644cdc545e52e230e440e2277db6b465a5b36d00c7a7fdd65bf8a141e98444682dc1ab8ce2c85d15ef82e739fe3fc7225c551643244d565a06e883227dca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fy-NL/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fy-NL/thunderbird-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "fe444a91350d3c30e6254e526f5a506aedaebc92ed9632df6a4d2ee5c8f18246601bc8b853eadd54c0b02c2647cae21514a0c1767ff506bb3fd048aa431d5b7a";
+      sha512 = "f3885565bf6bd223494c2169655844023732207172808d8768f148416d8e56eeba3a154e4b9526bd5799cf400369c7f25e41a5a1b78d17d2fd266f6c1de6bb38";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ga-IE/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ga-IE/thunderbird-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "73979022d045433b27f71a7278d518b2ee42a7250b166327bfd2f94c2f747acf2d14a9ea55e254f6ade0ccc3ffdc898f61e8dfaa9c7e2b8450fdee195db97b5b";
+      sha512 = "f23f42508eb4f4deff3e5b7f39e5ff5e54bf2c973c56a9800036cc1add4b64b0c597babd60a045ed51cae86c025f8455dfb11ad0c1ecf1b774529810519c4ebd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gd/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gd/thunderbird-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e856393fe16f57ecbcdc796dd027d8f426f9c1b39fd51c4bcea8ceb82934087ab71d87e7c04ae67b12de6d063994ee4eb607cca9889c7e500272600f80d65f6c";
+      sha512 = "05b37eddcb7d8f78c0676bf918483144d98d935736b562c9fa4b60d1bf290ead4cc9328198da86379d8ed3055d4ed36170897567b3f1273824f7242925d8f55c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gl/thunderbird-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c1e8ae50ce6495e9706ff1ef4fb790c53be407eaa738e86f2a788feaa16e5e903386f59bc986497d2ae9e5dff8489007a16c0f2b8b9c37456d180794dfa82642";
+      sha512 = "59fab273843a9f1fba78c19d63bd61c0cac0fb28ecc78549dcf4d52955dc108b5e4bd963e49652c4a7e8e4b6c66ce9e62d24a8db6b67b76b234c860d889942d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/he/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/he/thunderbird-52.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "6caf34bd52e21809eb80ed88b104ed1a47a1c29abdc3b3f4059fb183a0b844449936362a1839d888e4d224ee987890982d37d27c32102cfe8029bea1371847cd";
+      sha512 = "63ad6fd03ce2503431d759d56f3ca92168a7eaf1d23aeaa7c9be5206c94d51813f3ddc06489f2e47d2a182e8dac425e35031b9ddafdc8de34a31f0b69d4c8771";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hr/thunderbird-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "230f0bd3eddf99811d8fc60e988772ed107b75981beceec053d861f977e1e3c5261c0ea51475410aeff50efd0a4e378b5e666cdd4b2bfd76ad0ae465142a28a9";
+      sha512 = "3184f7e69c48ee4972aeb4ff7c59bd5db99e5afbab54c82271059c9c2a5d6d42fee1f31030ca7c92812486d9e4c457bb35984a1dc5c055ecf9f7ad9f8e34a986";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hsb/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hsb/thunderbird-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "389b0fab729562e09c17d7ca251675ed4d333f4a79932b5ef2ffeda9d3e683adb95b7f4e4cb192fcf9416826a8aa470b7f8ae4211165b50d7a5a21fe39ba199a";
+      sha512 = "4b8a847889b02b04e80301756e403e0c1d8c38db7ad5c74d843e25f29ffbca1e7449d9e6a4ccb55042f868e3c8018ab00f6f4cd53c86518b3b922618c34b6e7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hu/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hu/thunderbird-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2d0ec213b7cf3f875518841e0c08bc6b4134173606098cd0515e93206bf2419377041d44a2737c98b17a198998b80453763e695cabedc283ebbdfb42a60abd70";
+      sha512 = "e0887449cd5668bd06101c637a235d989c93fc831f98b09c7cee031de439d7db9b0a8bb50c1b4fce47bc6c9ef8769d84824e211c7812fa40fb962f88120b9cf1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hy-AM/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hy-AM/thunderbird-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "f77164c2fc3a083e13a11417f77454a885fd4ac77a0b7695c0d2bf8169b54afcd06c32e7c78cb6bbb4ac447a3d690a423344cdab59bc6fdfe83d82bac5d0be0d";
+      sha512 = "f00f3d7c58eedffd39d012391c9464d8e0411fd557d1e52191e635503fa5610bb01137c062c455d9174ee83268f81218f9dff9272f4ade078c003f352a16e4d7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/id/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/id/thunderbird-52.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "24c383b106de72a3741d7333aa4ec53c091d41ab3638c91f5f88f8d2952d25e77223e95a728611bdfd1cbe2d4418447e588069c286f90ffec0d12c7f245c07fd";
+      sha512 = "7e0fcd2d2773a8f765c21b00b1d1945113219ad6834763aa491fcc570c5c536ebe0089c0f0495794d36a2691674fdcb8b22bd95de5a5dbef2f1426024b2bbce4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/is/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/is/thunderbird-52.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "bae6f4fa377bb76ffd8d5257f525ce43f151f44f07eaeb5c4109a3440965c36a622c41d6577113bf111335d51d211e18b1c9decac6d9c1dea6303f90b7368f94";
+      sha512 = "48d7879aef3e4528c4db7a86cc28dccf31087d171e103ed9b7bfbcab8fb07ace3353a259edd11ae20bf86ddacb31f2c11d96d460a2a2a8ca3c3935fd6d8c5df1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/it/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/it/thunderbird-52.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "6b6082972ea030e2564bffaf4e9349d33800b840c0b185bb646c53d0578a1b6360a3d85cdf1dbc534a648d34138f1c8cd26d1c0297c99795e93b93b145a100c0";
+      sha512 = "4a3437fc5e64ac4e0ed674072ff8311548cb0da1c29bed28d7d47c935aa906905e0d153d00ae434899f281d5efac9c306b2456b58c131369ff993f405491265a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ja/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ja/thunderbird-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "66c8808d49986675e9049e77328cf7b1d2fad163b193b8442ca39be1b605bce0180e29b239141509cfec6302f053eaf2197513d5d482beb6c498f6a0ae8bbd9b";
+      sha512 = "d148936fce3b77cfe79c3acd195bc837eba485d6600dd2a19a9d76765435ac6fc6688473eb8572d4bf40461dbca5562cee4baefc9c98aaddb03679748ca4c36c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ko/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/kab/thunderbird-52.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-i686";
+      sha512 = "64e1f2044f8dbb1664d8d4ba85514ed17b3c49a16770c4b64e10873e092a9424d939e7fe6bb8d6d1df5f9f3663e259206fe83149f45de16aadf6fb16a8b04755";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ko/thunderbird-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "bdb8a9d6172b6f56d29b29043c484547c9a9dc7bd1477bd8ac4aaa4bf07c0ceffe2ae1560458acefefad66e4487d62746f60b6ec56d5d91603937b0c339d5625";
+      sha512 = "886566909754431b806bef2f314cc3fcd7330e2df5119c2bf65f5f48a9cf7bc378253c4e1f1b8b6cfa409962d6a801bd6547bf2071738ee1b20306fe64318748";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/lt/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/lt/thunderbird-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "dd70d123787ef85ee1c596346bf4c40a99907c2ece2116f7fb4536cb078d162f9afe0f92b466b713d6b75bf92960de32a3b3dedd861946da5b2e946187d4ebc5";
+      sha512 = "24377735d80a0d23ceee9b5594cd37c277141b7ad33b146c7a304fa1de66326adf76443966e17fbb1995848d41374cc44137a8b2956e1254744d50a643e4db82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nb-NO/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nb-NO/thunderbird-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "caf4d3d27db952fce1f34d5c641194d555c2443b86fbecdf68869cafeed0d532d7379212f4338401743e6e26531dd98111f75bddc5e2a3af42a3a7731ec3039b";
+      sha512 = "d53d4089bc057a66cd785e263272962765b2c02eebce6e0830c84748a17cdf09d478f329b486532fbbcfea13967060d2ea2e758b07a8a6cb0a6b56c0a95d611d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nl/thunderbird-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "dd5071174889bdda282c496c4aa05158887fffc652d4c557320fab2c11e16b0cbb7e5121ef20b423d703dfbf9da52983ff288b9377ecedabfdba496f9c99eb6b";
+      sha512 = "2d23cacfa1166315e5b30562e620bb8f2fedefe62b3478d12ea4bd2a3f9bd24b29022df9c14f76756cca05eae7edc134c505faae8549f701074481d7ad3bb5ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nn-NO/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nn-NO/thunderbird-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "edd6a1384ed0060398cffb4598a7014aa13cfe83891a4cd4972db2ed6eaae5068703944a6e14b033409eaf6b6426838a0a3d708b9d83eb08907f39469fde4435";
+      sha512 = "518f61379d62f38a1b496221bc898108a693c3378488e7b450c3fb4b133317d9ca92e17e93cf502a8e79b8a3254763aaa0f6b1513487089da514e8c153c432c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pa-IN/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pa-IN/thunderbird-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "9e6227d28dc844621d1d9ac6c5536505dea0cc1d1b3d161bedf13b75a3255c5c681ce5b38bb510150f8db1add7f149119a8b5ce5b98c5f4dfe2427db6ad58581";
+      sha512 = "7ede43d3c8e60529df4ffe62a1f3ebe3c6420f8601c7838afceafe0ca553ac80328f78d82fc04ba68a5af69b71671722509697e9c73ebaa9603f6de0bc42ada4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pl/thunderbird-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8da6ec38d37df6202b751f112031e590777e587e23437cb7a4dcfeb958b27928e2f01cbd1682daa96c143df756b3c8f31f7516ca8cb30a884db2dc03f130f960";
+      sha512 = "18a211aa55724882f3531a8bd588bc418d5d136eef5ad027c18c5b00bac7d0bff6ebf4fef8d3a1d49cf46adfa10040b2cae1e5f039e817067319c66e5af6715a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-BR/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-BR/thunderbird-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "00a7ffd7509d538b9fe3e801d5c2ad069edd62665a7ce045381213b78226646b1cfe6356b5c873904277330b674608711e15f18dcf4664218b9c61048cf88e40";
+      sha512 = "d5f65af63813b27454d21df094c5b709a1f590144853e9082814ca525ee75f56f1d8aeb9df09bc49c7eeb41eebab6acd46bbc086db4f70c54b8e7be3f9939fdb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-PT/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-PT/thunderbird-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f12f544c9eb3a33f861791af9afcc987b72607c2456d7f741046ef9ad36f12552d4e9cf2682ac3f8adc108dc9d36c9fc1b013714b50ae894f72cbe367914f14b";
+      sha512 = "66677c8d8e2c9c38b7efefad3ddb14586f6bdeef74087239c7a16e66062afeb719b928a29a516bd720a716d1b05c4e8bcf21cd84f641140acc96ec1ab85165e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/rm/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/rm/thunderbird-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9a8497f13a459d5dde822edeb9516d98beed220d75735a2f620c69b1f5e75e68987420aac6bb2a77775b6b34c2e0daa277c15d1491a6a02bb0f9658a40a16526";
+      sha512 = "2692412244a2153ea701cdc5d6b41caabea82440d5f9eed85ff1024973d287fd0c60066503c8f5336bfe36a9726a0a4df8e30c2181b7d66206c6b3a23a32582c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ro/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ro/thunderbird-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "2c9c650647079eb754e471757cae6b5844ae8e19bf01ce25d91a73832483507f90e604caf11305760cab719fe4f830cace5b9313b7e2a6f07a92427f35441c55";
+      sha512 = "3592cb39b622983758c8513a977a2acbd168699ccaee5fb8b6e7cc1714334e4cc48bb48712a764c4a6954d8fbebfa5a1156a89cf41b488026fc2713934a06319";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ru/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ru/thunderbird-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4cbbe88691fd265b4d98aab61c5763f6baea168ea4cae222425973023174f765e7fa6b97fdef959ac0788a632f742715eb7e565113344147d43c228ece7f08ae";
+      sha512 = "df0ad7e0248a0471130faca0fe09f28725352927f362e906365918939d19d0d18a86fa84058463f59376ffbe4f66d574a10823b5e88be3eed8ec39d17c2e2a7a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/si/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/si/thunderbird-52.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a270a871187dc95d05cb79d9f4df7947aa58b875c2b0c588c2646f806e7e0eaeb1a62f69d38e78d40399f1c588f043b26d06c0d77cedc9949d8e3d8b026ad4a5";
+      sha512 = "67c3c007ab101d5528613913a75f512befedb6d1cf1f105c19ffb78a5906c2fc6ab01408a290da58cd04667b6c851219aee0a0df7b9a42d1d7f82b244e046d42";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sk/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sk/thunderbird-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "8cfd22b92789766c179dbb70739fcf68907c4b215e70d164c83e50f67f2c834f515176e30788ba1fcd58717fdf5642c9e1ef05640a06470146ee942737744c83";
+      sha512 = "9113fb1d2150c191abe647b761eed5747341ff779e1a02b724f604fe1193b845130cda9585adb8fd4e8f23f9a3f22a5c8c90f9acd5b3381d3f26eb95e5a74259";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sl/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sl/thunderbird-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "fbf54d81b006625f526ab496e9ec7acf9698f7c95415d61aa4bd91896db07bce9d13c835ec944f164678fca9f49be16b69d6e8b728914ec84a5a8d733d3941b4";
+      sha512 = "1ae92f74625a1fc54b0cf2073c8c687fe853dbdc318cc10a2e997f4b6e8062b500f5761128a228987a81f86a2f501163e5fbce5fde05c41a3e2ce0d74c2fc14b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sq/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sq/thunderbird-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "f8dee08b3a4e049392f7c407e9403b972c755493fe638e7917181b8281a86d70f2d1113e69b785be756774bb9aef4cb493084bc8d0d12bda0f928f4cd468f569";
+      sha512 = "45312d0b18565df69734178eb03b58cd0ea813d7ae099edc03d871a763f715483d9d6a4c375c4f4e6a081d59809beb789c01f0efbe047a6a5d7af40f3280a517";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sr/thunderbird-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "8c8fba2fc92d91f086679b6ba451eed1af4fef5c56747260f9907300f057aab354d7f8ebc411fa25821bc006a551f26e0ddf29b344846a30dc493cfef30c7375";
+      sha512 = "61756439561a7395b7f9bd55dbf16e73def6e55469a2e4bdc84207bb9aae5761002411900ed8e31e1a32c2f854b95c9ce0f35f17d15fba673b4e61e07a9675e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sv-SE/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sv-SE/thunderbird-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "caf3911023d48fc48f4834be424c01cb22bd7383582c8bfc15468401a1558351659e93955103625872b5ea3351570bf216b34e93bff9bf535eccd1789f493bca";
+      sha512 = "94cecbfb7d6f6ac060fd2b2aabdb3e049832055c969fa7d3ff518a91b3ccb39f9902910bd282c2d8796e16ea641d6443e4a87545c2328e34e6b567ce6cd2dad1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ta-LK/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ta-LK/thunderbird-52.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "99a0db9f4e7d9f05e8398f76f0dcce418d0230b8a325a1289b690a87a43febd0c17f52248bb6070ad7bd2dc60d6e877a78f1c4a23c8888b105160f131b31ec1c";
+      sha512 = "05b4d35f6288944f0fc527c0338ab5cb204d5746b86265638fe66a1921297ad2a6de166782fd5948006d6d71a70c62735afd4936a87b3691d975813fc4ee0be5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/tr/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/tr/thunderbird-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "79379c3dc58d330949aa5a0338fb38e6334ca47c964842bf090a9431e5b7267f871aaa519dd35262ed9d6e042188e998e95eb7a63c77b3592db09a81bdd95267";
+      sha512 = "98e5f9e9d2f90c6d5b05555f6977bf00179fd8dab49afc2aa157f36ec1c58a5e87043de85de90ee03c7db985f00855ee83d30537b2e514518e90ab782031b426";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/uk/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/uk/thunderbird-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a2f0efb561fd84e5881bb93145f86f9445eb6cb3ce5ce0e209fc896c797e9a554d180ed1009f369bc12790b8d03d09d429dd3d52fda4ce48d7642009c1a9920a";
+      sha512 = "1495bad171ef4cb4f32e5b02c63c7cc2b8032485192adf5e5d8d8bb8fed897e98e6ead1bf1c71f131178e0059905c82296fb2ab4275c5c979cd963c4176246e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/vi/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/vi/thunderbird-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "14a7352ac3254aa0a748e98e208f48ee0b764853b37889077f651ed1d1a401d98c35dd6cd09bb5b25a7f8c5d5c3a7b02319ddf4dcdaa7a5440aa5caae9f09a32";
+      sha512 = "23f96b086356818ee9d451651514c84212e98b0616021789e9215dee2a97cc43d06373162860def7fbe00514651b6fa0395ccebf4823a7e5622d432467dd0365";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-CN/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-CN/thunderbird-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5b991ccc4daafe744f1fffdc51882bdc72d5fadd1e570e0ff3670f7d7201a67151797a26f0222fe8cfa0ddefff45f0741da6c04d924367705347858cc028a945";
+      sha512 = "129cf69e007ea57550ee0eafcd086050ad3c70ef6671f7e56f12679bd9fafd40916e206aa932fb339bb361c4d4894bb6aff8199334c21894d48e01bdbe2a9bd5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-TW/thunderbird-45.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-TW/thunderbird-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "231abcab55934962d3b8dec164ddf48b8b7bfc0e8cd70251479351d8be5d2605e2bb823bbf6c3002bba6c431461b0bfd570f101f31b5adf7c70804610262b856";
+      sha512 = "3fcac7432ce9e1ef4edea97719628374d50173dbb0623866c9bc6aa9644a4d1cebbd640e7dae969b3a7bd067cd29a6d4ff1fb58c18f3eaf3e12c1f9d87f222ce";
     }
     ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3de94189158..802081cd7f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15702,6 +15702,7 @@ with pkgs;
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
     gconf = pkgs.gnome2.GConf;
     inherit (pkgs.gnome2) libgnome libgnomeui;
+    inherit (pkgs.gnome3) defaultIconTheme;
   };
 
   tig = gitAndTools.tig;

From 55ff94b396b735b145c807fd6ba1191ac3ac1fc1 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 4 Apr 2017 22:03:36 +0900
Subject: [PATCH 0869/1744] thunderbird: 45.8.0 -> 52.0

---
 .../mailreaders/thunderbird/default.nix       | 17 ++---
 .../mailreaders/thunderbird/gcc6.patch        | 75 -------------------
 2 files changed, 7 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6990c12439d..80d2c05584b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL
-, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
+{ stdenv, lib, fetchurl, pkgconfig, autoconf213, which, m4, gtk2, pango
+, perl, python2, zip
+, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
@@ -14,7 +15,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.8.0"; in
+let version = "52.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -22,11 +23,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha512 = "f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb";
+    sha512 = "215de8ae386f6f12d7a4338bb03bac956410be0dd4de5cca218e12241e3948c8c2540756e149bfde597cd10e399b4cb4db86619a2aa50a368ba323b413c1f93c";
   };
 
-  patches = [ ./gcc6.patch ];
-
   # New sed no longer tolerates this mistake.
   postPatch = ''
     for f in mozilla/{js/src,}/configure; do
@@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
-    [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
+    [ pkgconfig autoconf213 which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
       python2 dbus dbus_glib pango freetype fontconfig xorg.libXi
       xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
       alsaLib nspr nss libnotify xorg.pixman yasm mesa
@@ -62,22 +61,20 @@ stdenv.mkDerivation rec {
       "--enable-system-sqlite"
       "--enable-system-cairo"
       "--disable-gconf"
-      "--disable-gstreamer"
       "--enable-startup-notification"
       # "--enable-content-sandbox"            # available since 26.0, but not much info available
       # "--enable-content-sandbox-reporter"   # keeping disabled for now
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
       "--disable-updater"
       "--disable-pulseaudio"
+      "--enable-default-toolkit=cairo-gtk2"
     ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                         else [ "--disable-debug" "--enable-release"
                                "--disable-debug-symbols"
                                "--enable-optimize" "--enable-strip" ])
     ++ [
-      "--disable-javaxpcom"
       #"--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
     ]
     ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
deleted file mode 100644
index bd102220285..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1457596445 -32400
-# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d
-# Parent  27c94617d7064d566c24a42e11cd4c7ef725923d
-Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
-
-Our STL wrappers do various different things, one of which is including
-mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h,
-which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which
-circles back to our STL wrapper.
-
-But of the things our STL wrappers do, including mozalloc.h is not one
-that is necessary for cstdlib. So skip including mozalloc.h in our
-cstdlib wrapper.
-
-Additionally, some C++ sources (in media/mtransport) are including
-headers in an extern "C" block, which end up including stdlib.h, which
-ends up including cstdlib because really, this is all C++, and our
-wrapper pre-includes <new> for mozalloc.h, which fails because templates
-don't work inside extern "C". So, don't pre-include <new> when we're not
-including mozalloc.h.
-
-
-diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h
---- a/mozilla/config/gcc-stl-wrapper.template.h
-+++ b/mozilla/config/gcc-stl-wrapper.template.h
-@@ -12,33 +12,40 @@
- // compiling ObjC.
- #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
- #  error "STL code can only be used with -fno-exceptions"
- #endif
- 
- // Silence "warning: #include_next is a GCC extension"
- #pragma GCC system_header
- 
-+// Don't include mozalloc for cstdlib. See bug 1245076.
-+#ifndef moz_dont_include_mozalloc_for_cstdlib
-+#  define moz_dont_include_mozalloc_for_cstdlib
-+#endif
-+#ifndef moz_dont_include_mozalloc_for_${HEADER}
- // mozalloc.h wants <new>; break the cycle by always explicitly
- // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
- //
- //    `#include_next' does not distinguish between <file> and "file"
- //    inclusion, nor does it check that the file you specify has the
- //    same name as the current file. It simply looks for the file
- //    named, starting with the directory in the search path after the
- //    one where the current file was found.
--#include_next <new>
-+#  include_next <new>
- 
- // See if we're in code that can use mozalloc.  NB: this duplicates
- // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
- // can't build with that being included before base/basictypes.h.
--#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
--#  include "mozilla/mozalloc.h"
--#else
--#  error "STL code can only be used with infallible ::operator new()"
-+#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
-+#    include "mozilla/mozalloc.h"
-+#  else
-+#    error "STL code can only be used with infallible ::operator new()"
-+#  endif
-+
- #endif
- 
- #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
- // Enable checked iterators and other goodies
- //
- // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
- // Figure out how to resolve this with -fno-rtti.  Maybe build with
- // -frtti in DEBUG builds?
-

From 11d76ef891f48d24de51c676747f94cdeee2730c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 6 Apr 2017 16:27:36 +0300
Subject: [PATCH 0870/1744] nethack: add utils to path

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

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 735065ca18e..bf9d01800f3 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeScript, ncurses, gzip, flex, bison }:
+{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less }:
 
 let
   platform =
@@ -10,6 +10,7 @@ let
     # We probably want something different for Darwin
     else "unix";
   userDir = "~/.config/nethack";
+  binPath = lib.makeBinPath [ coreutils less ];
 
 in stdenv.mkDerivation {
   name = "nethack-3.6.0";
@@ -60,6 +61,7 @@ in stdenv.mkDerivation {
     mkdir -p $out/bin
     cat <<EOF >$out/bin/nethack
     #! ${stdenv.shell} -e
+    PATH=${binPath}:\$PATH
 
     if [ ! -d ${userDir} ]; then
       mkdir -p ${userDir}

From 56ca347872ea8fd6e52d9cca19d42cc738e5569d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 9 Apr 2017 20:17:40 +0300
Subject: [PATCH 0871/1744] firefox: misc cleanups

Move more dependencies to nativeBuildInputs.
Use wrapGAppsHook.
Add checkInstallPhase.
---
 .../networking/browsers/firefox/default.nix   | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 1ca50ec8954..86f6f995bdb 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
 , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper
@@ -6,10 +6,10 @@
 , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, enableGTK3 ? false
+, enableGTK3 ? false, gtk3, wrapGAppsHook
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
+  # of "Nightly" or whatever, enable this option.  However, those
   # binaries may not be distributed without permission from the
   # Mozilla Foundation, see
   # http://www.mozilla.org/foundation/trademarks/.
@@ -35,12 +35,12 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
   patches = lib.optional debugBuild ./fix-debug.patch;
 
   buildInputs =
-    [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2
-      python dbus dbus_glib pango freetype fontconfig xorg.libXi
+    [ gtk2 zip libIDL libjpeg zlib bzip2
+      dbus dbus_glib pango freetype fontconfig xorg.libXi
       xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
       alsaLib nspr nss libnotify xorg.pixman yasm mesa
       xorg.libXScrnSaver xorg.scrnsaverproto
-      xorg.libXext xorg.xextproto sqlite unzip makeWrapper
+      xorg.libXext xorg.xextproto sqlite unzip
       hunspell libevent libstartup_notification libvpx /* cairo */
       icu libpng jemalloc
       libpulseaudio # only headers are needed
@@ -48,7 +48,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
     ++ lib.optional enableGTK3 gtk3
     ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
 
-  nativeBuildInputs = [ autoconf213 which gnused ];
+  nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python ] ++ lib.optional enableGTK3 wrapGAppsHook;
 
   configureFlags =
     [ "--enable-application=browser"
@@ -75,10 +75,9 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
       "--disable-updater"
       "--enable-jemalloc"
       "--disable-gconf"
-      "--enable-default-toolkit=cairo-gtk2"
+      "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
       "--with-google-api-keyfile=ga"
     ]
-    ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
     ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
                       else [ "--disable-debug" "--enable-release"
                              "--enable-optimize"
@@ -112,17 +111,9 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
 
       # Remove SDK cruft. FIXME: move to a separate output?
       rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
-    '' + lib.optionalString enableGTK3
-      # argv[0] must point to firefox itself
-    ''
-      wrapProgram "$out/bin/firefox" \
-        --argv0 "$out/bin/.firefox-wrapped" \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
-        --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
-    '' +
-      # some basic testing
-    ''
-      "$out/bin/firefox" --version
+
+      # Needed to find Mozilla runtime
+      gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
     '';
 
   postFixup =
@@ -133,6 +124,13 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
           "$out"/lib/firefox-*/libxul.so
     '';
 
+  doInstallCheck = true;
+  installCheckPhase =
+    ''
+      # Some basic testing
+      "$out/bin/firefox" --version
+    '';
+
   meta = {
     description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
     homepage = http://www.mozilla.com/en-US/firefox/;

From b023370f3757a76acb244e647f29e388e076cab0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 9 Apr 2017 20:15:06 +0300
Subject: [PATCH 0872/1744] thunderbird: port changes from firefox

Fix random crashes.
Add optional GTK3 support.
---
 .../mailreaders/thunderbird/default.nix       | 151 +++++++++---------
 1 file changed, 74 insertions(+), 77 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 80d2c05584b..661d499d34e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, lib, fetchurl, pkgconfig, autoconf213, which, m4, gtk2, pango
-, perl, python2, zip
-, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper
-, hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst-plugins-base, icu
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
+, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
+, freetype, fontconfig, file, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip
+, hunspell, libevent, libstartup_notification
+, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
+, autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
+, enableGTK3 ? false, gtk3, wrapGAppsHook
 , debugBuild ? false
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Earlybird", enable this option.  However, those
+, # If you want the resulting program to call itself "Thunderbird" instead
+  # of "Earlybird" or whatever, enable this option.  However, those
   # binaries may not be distributed without permission from the
   # Mozilla Foundation, see
   # http://www.mozilla.org/foundation/trademarks/.
   enableOfficialBranding ? false
 }:
 
-let version = "52.0"; in
-let verName = "${version}"; in
-
 stdenv.mkDerivation rec {
-  name = "thunderbird-${verName}";
+  name = "thunderbird-${version}";
+  version = "52.0";
 
   src = fetchurl {
-    url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
+    url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 = "215de8ae386f6f12d7a4338bb03bac956410be0dd4de5cca218e12241e3948c8c2540756e149bfde597cd10e399b4cb4db86619a2aa50a368ba323b413c1f93c";
   };
 
@@ -33,97 +32,95 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
-    [ pkgconfig autoconf213 which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
-      python2 dbus dbus_glib pango freetype fontconfig xorg.libXi
+  # from firefox, but without sound libraries
+  buildInputs =
+    [ gtk2 zip libIDL libjpeg zlib bzip2
+      dbus dbus_glib pango freetype fontconfig xorg.libXi
       xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
-      alsaLib nspr nss libnotify xorg.pixman yasm mesa
+      nspr nss libnotify xorg.pixman yasm mesa
       xorg.libXScrnSaver xorg.scrnsaverproto
-      xorg.libXext xorg.xextproto sqlite unzip makeWrapper
-      hunspell libevent libstartup_notification cairo icu
-    ] ++ [ m4 ];
+      xorg.libXext xorg.xextproto sqlite unzip
+      hunspell libevent libstartup_notification /* cairo */
+      icu libpng jemalloc
+    ]
+    ++ lib.optional enableGTK3 gtk3;
+
+  # from firefox + m4
+  nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python ] ++ lib.optional enableGTK3 wrapGAppsHook;
+
+  configureFlags =
+    [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
+      "--enable-application=mail"
+      "--disable-alsa"
+      "--disable-pulseaudio"
 
-  configurePhase = let configureFlags = [ "--enable-application=mail" ]
-    # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx
-    ++ [
       "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
       "--with-system-nspr"
       "--with-system-nss"
       "--with-system-libevent"
-      #"--with-system-libvpx"
-      "--with-system-png"
+      "--with-system-png" # needs APNG support
       "--with-system-icu"
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
-      "--enable-system-cairo"
-      "--disable-gconf"
+      #"--enable-system-cairo"
       "--enable-startup-notification"
-      # "--enable-content-sandbox"            # available since 26.0, but not much info available
-      # "--enable-content-sandbox-reporter"   # keeping disabled for now
+      "--enable-content-sandbox"            # available since 26.0, but not much info available
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-updater"
-      "--disable-pulseaudio"
-      "--enable-default-toolkit=cairo-gtk2"
-    ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+      "--enable-jemalloc"
+      "--disable-gconf"
+      "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
+    ]
+      ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                         else [ "--disable-debug" "--enable-release"
                                "--disable-debug-symbols"
                                "--enable-optimize" "--enable-strip" ])
-    ++ [
-      #"--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
-    ]
-    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-  in ''
-    mkdir -p objdir/mozilla
-    cd objdir
-    echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
-    echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig
-    # From version 38, we need to specify the source directory to build
-    # Thunderbird. Refer to mozilla/configure and search a line with
-    # "checking for application to build" and "# Support comm-central".
-    echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig
-    echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig
-    echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig
-
-    export MOZCONFIG=`realpath ./.mozconfig`
-
-    patchShebangs ../mozilla/mach
-    ../mozilla/mach configure
-  '';
+      ++ lib.optional enableOfficialBranding "--enable-official-branding";
 
   enableParallelBuilding = true;
-  requiredSystemFeatures = [ "big-parallel" ];
 
-  buildPhase =  "../mozilla/mach build";
-
-  installPhase =
+  preConfigure =
     ''
-      ../mozilla/mach install
-
-      rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
-
-      # Create a desktop item.
-      mkdir -p $out/share/applications
-      cat > $out/share/applications/thunderbird.desktop <<EOF
-      [Desktop Entry]
-      Type=Application
-      Exec=$out/bin/thunderbird
-      Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
-      Name=Thunderbird
-      GenericName=Mail Reader
-      Categories=Application;Network;
-      EOF
+      configureScript="$(realpath ./configure)"
+      mkdir ../objdir
+      cd ../objdir
     '';
 
-    postFixup =
-      ''
-        paxmark m $out/lib/thunderbird-${version}/thunderbird
-      '';
+  preInstall =
+    ''
+      # The following is needed for startup cache creation on grsecurity kernels.
+      paxmark m ../objdir/dist/bin/xpcshell
+    '';
+
+  postInstall =
+    ''
+      # For grsecurity kernels
+      paxmark m $out/lib/thunderbird-[0-9]*/thunderbird
+
+      # Needed to find Mozilla runtime
+      gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
+    '';
+
+  postFixup =
+    # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
+    ''
+      patchelf --set-rpath "${lib.getLib libnotify
+        }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird-*/libxul.so)" \
+          "$out"/lib/thunderbird-*/libxul.so
+    '';
+
+  doInstallCheck = true;
+  installCheckPhase =
+    ''
+      # Some basic testing
+      "$out/bin/thunderbird" --version
+    '';
 
   meta = with stdenv.lib; {
     description = "A full-featured e-mail client";

From dd25b6da62ca6bb6a28a87a39e3505cf6b6a933a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 9 Apr 2017 18:33:48 -0500
Subject: [PATCH 0873/1744] cwebbin: fix src again

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

diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index f4d9de184e3..a952475b967 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   cweb = fetchurl {
-    url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb.tar.gz;
+    url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz;
     sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
   };
 

From 999cf98de9fadf368aa8eb160ecbc929e6e5499d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Apr 2017 02:43:18 +0300
Subject: [PATCH 0874/1744] firefox: enable GTK3 by default

---
 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 802081cd7f9..bfb33fb12e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13714,7 +13714,7 @@ with pkgs;
   inherit (callPackages ../applications/networking/browsers/firefox {
     inherit (gnome2) libIDL;
     libpng = libpng_apng;
-    enableGTK3 = false;
+    enableGTK3 = true;
     python = python2;
     gnused = gnused_422;
   }) firefox-unwrapped firefox-esr-unwrapped;

From e2fe47008fcf4d1c574f0da4a627790dbc556c7d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Apr 2017 02:43:26 +0300
Subject: [PATCH 0875/1744] thunderbird: enable GTK3 by default

---
 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 bfb33fb12e5..24cb5519ee8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15697,6 +15697,7 @@ with pkgs;
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome2) libIDL;
     libpng = libpng_apng;
+    enableGTK3 = true;
   };
 
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {

From 7701cbca6b55eb9dee6e61766376dba42a8b32f2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 10 Apr 2017 03:34:18 +0200
Subject: [PATCH 0876/1744] grsecurity: 4.9.20-201703310823 ->
 4.9.21-201704091948

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b32dfbc4b35..7df48850fd1 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.20";
+  version = "4.9.21";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3israf7zhq92wi0py8y299f7cz6z6xr0y4i5b1xvb46ljyx39jwrrdjrf5nxngz6c1641l9qalwzg5r15pp4gqyr09ilmwn8i7kbqwi";
+    sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d8676413e82..0a3b51a4e6e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.20";
-      grrev  = "201703310823";
-      sha512 = "0pm3wmcip73imjjx13yar5l5bhpii45mjac5vb1snypmbwqmywmikiixqslq84i1yqw0c8pi822znkz7650dhxrmdmagy0yirwfdrhf";
+    { kver   = "4.9.21";
+      grrev  = "201704091948";
+      sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From f4ff67099b1685703ca83d71e8f1aa46fb7db051 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 9 Apr 2017 22:28:27 -0700
Subject: [PATCH 0877/1744] keychain: add sigma as maintainer

---
 lib/maintainers.nix                  | 1 +
 pkgs/tools/misc/keychain/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 231574b7bb5..450d880663c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -477,6 +477,7 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   siddharthist = "Langston Barrett <langston.barrett@gmail.com>";
+  sigma = "Yann Hodique <yann.hodique@gmail.com>";
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index d32ed0b0d83..9abfdea5f7b 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     platforms =
       with stdenv.lib;
       platforms.linux ++ platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ sigma ];
   };
 }

From 08abe4fe936f5700900e9e009ead7d703ea76d5f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 10 Apr 2017 09:57:07 +0200
Subject: [PATCH 0878/1744] lispPackage.iolib: list the hidden systems to make
 sure bundles exist

---
 .../lisp-modules/quicklisp-to-nix-overrides.nix     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index ea7e790ccae..e17db11a553 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -2,7 +2,7 @@
 let
   addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
-  skipBuildPhase = x: { 
+  skipBuildPhase = x: {
     overrides = y: ((x.overrides y) // { buildPhase = "true"; });
   };
   qlnp = quicklisp-to-nix-packages;
@@ -33,8 +33,13 @@ in
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
   iolib = x: {
-    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ [pkgs.libfixposix pkgs.gcc];
-    testSystems = (x.testSystems or ["iolib"]) ++ ["iolib/os" "iolib/zstreams"];
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++
+     [pkgs.libfixposix pkgs.gcc];
+    testSystems = (x.testSystems or ["iolib"]) ++ [
+      "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf"
+      "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets"
+      "iolib/multiplex" "iolib/streams"
+    ];
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
@@ -51,7 +56,7 @@ in
   wookie = multiOverride [(addDeps (with qlnp; [
       alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
       cl-fad fast-io vom do-urlencode cl-async-ssl
-    ])) 
+    ]))
     (addNativeLibs (with pkgs; [libuv openssl]))];
   woo = addDeps (with qlnp; [
     cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io

From f12bd6e9b680a8b36ac8424b58508246c92cfd42 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 10 Apr 2017 10:09:22 +0200
Subject: [PATCH 0879/1744] lispPackage.iolib: missed one system

---
 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index e17db11a553..377f694e7a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -38,7 +38,7 @@ in
     testSystems = (x.testSystems or ["iolib"]) ++ [
       "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf"
       "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets"
-      "iolib/multiplex" "iolib/streams"
+      "iolib/multiplex" "iolib/streams" "iolib/pathnames"
     ];
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);

From ef1e28f5f6e603c3b031de97d28456c39cc1bb00 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Apr 2017 02:27:17 +0300
Subject: [PATCH 0880/1744] qt56.qtwebengine: patch more library paths

Backport 040b86a96e8cc5125762f2b026734e9c760caad9.
---
 .../qt-5/5.6/qtwebengine/default.nix          | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index 13b8296dc0e..1234c825b14 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -2,7 +2,8 @@
 
 , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
 , fontconfig, freetype, harfbuzz, icu, dbus
-, zlib, libjpeg, libpng, libtiff
+, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
+, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
 , alsaLib
 , libcap
 , pciutils
@@ -11,7 +12,7 @@
 , coreutils
 , pkgconfig, python2
 
-, stdenv # lib.optional, needsPax
+, lib, stdenv # lib.optional, needsPax
 }:
 
 qtSubmodule {
@@ -47,20 +48,33 @@ qtSubmodule {
         -docdir $out/share/doc/qt5"
   '';
   propagatedBuildInputs = [
-    dbus zlib alsaLib
-
     # Image formats
-    libjpeg libpng libtiff
+    libjpeg libpng libtiff libwebp
+
+    # Video formats
+    srtp libvpx
+
+    # Audio formats
+    libopus
 
     # Text rendering
-    fontconfig freetype harfbuzz icu
+    harfbuzz icu
+  ]
+  ++ lib.optionals (!stdenv.isDarwin) [
+    dbus zlib minizip snappy nss protobuf jsoncpp libevent
+
+    # Audio formats
+    alsaLib
+
+    # Text rendering
+    fontconfig freetype
+
+    libcap
+    pciutils
 
     # X11 libs
     xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
     xlibs.libXcomposite
-
-    libcap
-    pciutils
   ];
   patches = [
     ./chromium-clang-update-py.patch

From f68de22683b8f08f9fe5ba3081de730c6ffeee8a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Apr 2017 02:33:03 +0300
Subject: [PATCH 0881/1744] wrapGAppsHook: add librvsg as a dependency

User themes may use SVG icons which won't work if the app can't access this
library. This is quite sure to happen (e.g. Adwaita's icons are vector).
---
 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 802081cd7f9..a9ad4ac13bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -325,7 +325,7 @@ with pkgs;
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
   wrapGAppsHook = makeSetupHook {
-    deps = [ gnome3.dconf.lib gnome3.gtk makeWrapper ];
+    deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ];
   } ../build-support/setup-hooks/wrap-gapps-hook.sh;
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;

From c30b12b9a5cc35b658e65b3ff54e9c877f1380ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Apr 2017 11:13:00 +0200
Subject: [PATCH 0882/1744] glibc: fix i686 crashes via an upstream patch

Fixes #23177.
---
 pkgs/development/libraries/glibc/common.nix   |  2 ++
 .../libraries/glibc/fix-i686-memchr.patch     | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/fix-i686-memchr.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 7128f560619..3d146c54398 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
+
+      ./fix-i686-memchr.patch
     ];
 
   postPatch =
diff --git a/pkgs/development/libraries/glibc/fix-i686-memchr.patch b/pkgs/development/libraries/glibc/fix-i686-memchr.patch
new file mode 100644
index 00000000000..32564de9f3a
--- /dev/null
+++ b/pkgs/development/libraries/glibc/fix-i686-memchr.patch
@@ -0,0 +1,23 @@
+Fix i686 memchr overflow calculation (BZ#21182)
+
+https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03
+diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S
+index 910679c..e41f324 100644
+--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S
++++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S
+@@ -117,7 +117,6 @@ L(crosscache):
+ 
+ # ifndef USE_AS_RAWMEMCHR
+ 	jnz	L(match_case2_prolog1)
+-	lea	-16(%edx), %edx
+         /* Calculate the last acceptable address and check for possible
+            addition overflow by using satured math:
+            edx = ecx + edx
+@@ -125,6 +124,7 @@ L(crosscache):
+ 	add	%ecx, %edx
+ 	sbb	%eax, %eax
+ 	or	%eax, %edx
++	sub	$16, %edx
+ 	jbe	L(return_null)
+ 	lea	16(%edi), %edi
+ # else

From e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Apr 2017 11:18:13 +0200
Subject: [PATCH 0883/1744] glibc: apply the i686 patch only on i686

... to reduce rebuilding. /cc #23177.
---
 pkgs/development/libraries/glibc/common.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3d146c54398..66510919e34 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -48,9 +48,8 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
-
-      ./fix-i686-memchr.patch
-    ];
+    ]
+      ++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch;
 
   postPatch =
     # Needed for glibc to build with the gnumake 3.82

From de83f55ee346d18b63e9bbb65b87ec073041e344 Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <sargon@toppoint.de>
Date: Mon, 10 Apr 2017 11:29:15 +0200
Subject: [PATCH 0884/1744] trayer: 1.1.6 -> 1.1.7

---
 pkgs/applications/window-managers/trayer/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 296de4e1e25..146bd7e1438 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "trayer-1.1.6";
+  name = "trayer-1.1.7";
 
-  buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ];
+  buildInputs = [ pkgconfig gdk_pixbuf gtk2 ];
 
   src = fetchFromGitHub {
     owner = "sargon";
     repo = "trayer-srg";
     rev = name;
-    sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg";
+    sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
   };
 
+  preConfigure = ''
+    patchShebangs configure
+  '';
+
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {

From cbe00623251500161273aad22202a3874aa263a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 10 Apr 2017 14:25:24 +0200
Subject: [PATCH 0885/1744] wireguard: 0.0.20170324 -> 0.0.20170409

---
 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 68966dd0399..641fb046c6d 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170324";
+  version = "0.0.20170409";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51";
+    sha256 = "065vxxvdsnxk9paqbafi0c622b4qayfh3ps6zzb853qp2i6kniri";
   };
 
   meta = with stdenv.lib; {

From b4c7979363f52ccc0f71823f3bcd2c8e9e7b52c3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Apr 2017 12:36:28 +0200
Subject: [PATCH 0886/1744] libgit2: 0.24.6 -> 0.25.1

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

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 51e366ba29c..cf27249064f 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
 
 stdenv.mkDerivation (rec {
-  version = "0.24.6";
+  version = "0.25.1";
   name = "libgit2-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "070jrv690bd5dq991lc32qfnai9ywvrjzsfgi3rcw6kw4l2ynxjr";
+    sha256 = "100bah8picqjzyhpw4wd7z5vyidcb8aggin50bhbpn607h8n8bml";
   };
 
   # TODO: `cargo` (rust's package manager) surfaced a serious bug in

From 4f0dd2f746f44f427b3416c493d295f16ef2a8f3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Apr 2017 03:25:28 +0200
Subject: [PATCH 0887/1744] prometheus service: add scrapeConfigs.params option

---
 nixos/modules/services/monitoring/prometheus/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index cf9deccbffe..32af41cc62f 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -116,6 +116,13 @@ let
           The URL scheme with which to fetch metrics from targets.
         '';
       };
+      params = mkOption {
+        type = types.attrsOf (types.listOf types.str);
+        default = {};
+        description = ''
+          Optional HTTP URL parameters.
+        '';
+      };
       basic_auth = mkOption {
         type = types.nullOr (types.submodule {
           options = {

From 6049560e600d3f3072ff53680bb6428281041f94 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Apr 2017 14:27:36 +0200
Subject: [PATCH 0888/1744] jenkins: 2.49 -> 2.53

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 7b42e587752..5a0cb4911e1 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.49";
+  version = "2.53";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0c7qnrx87wrgxgh4im1i6sqlxq3hsrs119krh5vwjzx5wp6daa93";
+    sha256 = "16lgwgp4n161j4vjwkzzdz4v2d6vv62rrqmcfmb6zalyvp6wpj9r";
   };
 
   buildCommand = ''

From 205abc1fb62643550b7af6102d5ac0b40387c545 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Apr 2017 08:34:23 -0400
Subject: [PATCH 0889/1744] linux: 4.11-rc5 -> 4.11-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 f56b1df6184..491e006378b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11-rc5";
-  modDirVersion = "4.11.0-rc5";
+  version = "4.11-rc6";
+  modDirVersion = "4.11.0-rc6";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0qmb8sssh4f4zhvasy20k30r8cwc03qm5ql3b25cj16cn3frp0q7";
+    sha256 = "1lrljxlx6s9rfwbzsl9ixhihf53rm7bwwah9756ar2siimrncvmr";
   };
 
   features.iwlwifi = true;

From 5a3dca24d83c54c305c2011c460855ea3f106929 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Apr 2017 08:44:32 -0400
Subject: [PATCH 0890/1744] sbt: 0.13.14 -> 0.13.15

---
 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 309a6e13606..cf9b42abefd 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.14";
+  version = "0.13.15";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "1q4jnrva21s0rhcn561ayfp5yhd6rpxidgx6f4i5n3dla3p9zkr9";
+    sha256 = "1vvsxpg1fwfzv3mcin69gnj44v6p7kfx3z9cm761sx01qbbp7q5n";
   };
 
   patchPhase = ''

From a78ce1d4c6d9f39f591d420547291d5f36cc8b27 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Mon, 10 Apr 2017 06:03:04 -0700
Subject: [PATCH 0891/1744] tig: 2.2 -> 2.2.1 (#24770)

* tig: 2.2 -> 2.2.1

Also move to different project URLs, as requested in
https://github.com/jonas/tig/releases/tag/tig-2.2.1

* tig: fix fetching mechanism

Rework the dependencies to allow use of fetchFromGitHub.
---
 .../git-and-tools/tig/default.nix             | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index f953bbad48b..99c1dcb281c 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline, makeWrapper, git, libiconv
+{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
+, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs
 }:
 
 stdenv.mkDerivation rec {
-  name = "tig-2.2";
+  pname = "tig";
+  version = "2.2.1";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz";
-    sha256 = "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg";
+  src = fetchFromGitHub {
+    owner = "jonas";
+    repo = pname;
+    rev = name;
+    sha256 = "09xiwm57df0vzk8r2hx5p1hwy5f9q8frmdf96aba2ia9837zn3av";
   };
 
-  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]
+  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs ];
+
+  autoreconfFlags = "-I tools -v";
+
+  buildInputs = [ ncurses readline git ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
-  preConfigure = ''
-    export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml'
+  # those files are inherently impure, we'll handle the corresponding dependencies.
+  postPatch = ''
+      rm -f contrib/config.make-*
   '';
 
   enableParallelBuilding = true;
@@ -30,7 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://jonas.nitro.dk/tig/";
+    homepage = "https://jonas.github.io/tig/";
     description = "Text-mode interface for git";
     maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ];
     license = licenses.gpl2;

From b3eeca06c90287bd55579600cd816781b65a913d Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sun, 9 Apr 2017 21:45:50 +0200
Subject: [PATCH 0892/1744] django_1_7: remove

---
 pkgs/top-level/python-packages.nix | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74b00ad6ff2..0409ce9d055 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10381,31 +10381,6 @@ in {
     };
   };
 
-
-  django_1_7 = buildPythonPackage rec {
-    name = "Django-${version}";
-    version = "1.7.11";
-    disabled = pythonOlder "2.7";
-
-    src = pkgs.fetchurl {
-      url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90";
-    };
-
-    # too complicated to setup
-    doCheck = false;
-
-    # patch only $out/bin to avoid problems with starter templates (see #3134)
-    postFixup = ''
-      wrapPythonProgramsIn $out/bin "$out $pythonPath"
-    '';
-
-    meta = {
-      description = "A high-level Python Web framework";
-      homepage = https://www.djangoproject.com/;
-    };
-  };
-
   django_1_6 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.6.11.5";
@@ -10597,7 +10572,7 @@ in {
       sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
     };
 
-    propagatedBuildInputs = with self; [ django_1_7 ];
+    propagatedBuildInputs = with self; [ django ];
 
     # tests appear to be broken on 0.6.1 at least
     doCheck = ( version != "0.6.1" );

From f1f90202241d361e33f271c4e910e1ea20d99eaa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Apr 2017 15:38:28 +0200
Subject: [PATCH 0893/1744] crowd service: fix secure sso cookies

Crowd didn't detect a secure connection before.
---
 nixos/modules/services/web-apps/atlassian/crowd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 7ff7dc4e574..ce41aa4f1e1 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -137,7 +137,7 @@ in
 
         sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
-          -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \
+          -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${if cfg.proxy.secure then "true" else "false"}",' \
         '') + ''
           ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
       '';

From 7364e0e7a9cf2bfd3173c039f66144aa8cc697cc Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 10 Apr 2017 13:27:05 +0200
Subject: [PATCH 0894/1744] emby: 3.2.10 -> 3.2.12

---
 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 9e0de290143..f88b82675da 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.10";
+  version = "3.2.12";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25";
+    sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2";
   };
 
   buildInputs = with pkgs; [

From 5108c4c7b277c9adaa97173e31ffe420aff31f11 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 10 Apr 2017 16:00:25 +0200
Subject: [PATCH 0895/1744] notmuch: fix homepage and notmuch-mutt license
 (#24777)

* notmuch: fix homepage and notmuch-mutt license

notmuch-mutt's license is GPLv3. might have been changed when it was upstreamed.

* fix scheme

* fix typo in url

* fix field alignment

* use with to make statements shorter
---
 .../networking/mailreaders/notmuch/default.nix           | 9 +++++----
 .../applications/networking/mailreaders/notmuch/mutt.nix | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 212d366facb..7c48075704e 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -97,10 +97,11 @@ stdenv.mkDerivation rec {
   '';
   dontGzipMan = true; # already compressed
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mail indexer";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
-    platforms = stdenv.lib.platforms.unix;
+    homepage    = https://notmuchmail.org/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ chaoflow garbas ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 6d08ad724b2..410e5e10ceb 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     inherit version;
     description = "Mutt support for notmuch";
-    homepage    = http://notmuchmua.org/;
-    license     = with licenses; mit;
+    homepage    = https://notmuchmail.org/;
+    license     = with licenses; gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
   };

From c334daa5c226b611a9e21f8e54d9834ffc728a82 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 10 Apr 2017 14:44:29 +0300
Subject: [PATCH 0896/1744] f2fs-tools: Cleanup a bit

---
 pkgs/tools/filesystems/f2fs-tools/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index acc3b5183fe..2a590d44e21 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, autoreconfHook, libselinux, libuuid, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
   version = "1.7.0";
 
-  src = fetchurl {
-    url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz";
-    sha256 = "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k";
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0wpzklw8smnngng0dm25jdmi7v5zfhpz02dksyxpz0a7kzzvnqqm";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libselinux libuuid pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libselinux libuuid ];
 
   meta = with stdenv.lib; {
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";

From 183279002d5098ad0346e4cd341d05fcdee33df5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 10 Apr 2017 14:45:36 +0300
Subject: [PATCH 0897/1744] f2fs-tools: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 2a590d44e21..d56c5e2ed9a 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0wpzklw8smnngng0dm25jdmi7v5zfhpz02dksyxpz0a7kzzvnqqm";
+    sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 199be99c6fa7232fd32cca4329337ff37b69961e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 10 Apr 2017 14:46:40 +0300
Subject: [PATCH 0898/1744] dosfstools: 3.0.28 -> 4.1

---
 pkgs/tools/filesystems/dosfstools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 76df4f41257..8b01ea15dc7 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "dosfstools-${version}";
-  version = "3.0.28";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "dosfstools";
     repo = "dosfstools";
     rev = "v${version}";
-    sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2";
+    sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1";
   };
 
-  makeFlags = "PREFIX=$(out)";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";

From c0cef0425eff1db8ddc07e78ea5aa16eb4a9666b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 10 Apr 2017 14:49:28 +0300
Subject: [PATCH 0899/1744] btrfs-progs: 4.8.2 -> 4.10.2

---
 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 525aa2fec28..411d0c99f20 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
 }:
 
-let version = "4.8.2"; in
+let version = "4.10.2"; 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 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
+    sha256 = "02p63nz78lrr156cmbb759z76cn95hv6mmz7v592lmiq0dkxy2gd";
   };
 
   buildInputs = [

From c714f8241a4fd3d1eb272b574c39999de9fbe982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Apr 2017 16:27:03 +0200
Subject: [PATCH 0900/1744] libdrm: 2.4.76 -> 2.4.79

---
 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 82681a6d05e..de219bee382 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.76";
+  name = "libdrm-2.4.79";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a";
+    sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197";
   };
 
   outputs = [ "out" "dev" ];

From 33194ec64924472b79b1c923d62592c3e5a462a0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 10 Apr 2017 09:28:01 -0500
Subject: [PATCH 0901/1744] dropbox: 23.4.17 -> 23.4.18

This update has not been officially announced upstream, but version 23.4.17 no
longer works.
---
 pkgs/applications/networking/dropbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 44caf615205..e6b5b8ca067 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "23.4.17";
+  version = "23.4.18";
   sha256 =
     {
-      "x86_64-linux" = "047i6afghb2nphwwc8sd6dxcbfi9cdyb1w4ssvwfkmbf3mznpfrh";
-      "i686-linux"   = "186z540iv4gq2gmis3mjly070y09lsfwvk9ygmjrh6y7pd9dqa5n";
+      "x86_64-linux" = "0hil9dnhmq4d4yq277w48ql3nw8yfzjqgafb0waw6zbc6a18l7bz";
+      "i686-linux"   = "15hcmqyfyx8z7qx3val5r7b9plckh50iy0mxxh2z1wbh96l03l3a";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 785f6ce5d66505661ee416adc8ca0ef99fa38424 Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <andrewmiller237@gmail.com>
Date: Mon, 10 Apr 2017 10:31:00 -0400
Subject: [PATCH 0902/1744] pass: Fix clipboard functionality

Add the patch that was removed that allows pass's clip() function to
work with single binary coreutils. This version of the patch is also
applied to darwin.sh, so this should fix the clipboard functionality in
darwin as well.
---
 pkgs/tools/security/pass/default.nix          |  3 +-
 .../set-correct-program-name-for-sleep.patch  | 69 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 62f1a3a05dd..83394d984ad 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
     sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+  patches = [ ./set-correct-program-name-for-sleep.patch 
+            ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
new file mode 100644
index 00000000000..782e06e20fd
--- /dev/null
+++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
@@ -0,0 +1,69 @@
+From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001
+From: "Andrew R. M" <andrewmiller237@gmail.com>
+Date: Sat, 8 Apr 2017 13:50:01 -0400
+Subject: [PATCH] Patch the clip() function to work even when using
+ single-binary coreutils
+
+---
+ src/password-store.sh  | 4 ++--
+ src/platform/cygwin.sh | 4 ++--
+ src/platform/darwin.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/password-store.sh b/src/password-store.sh
+index 6a4172d..4dbd6b8 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -155,11 +155,11 @@ clip() {
+ 	# variable. Specifically, it cannot store nulls nor (non-trivally) store
+ 	# trailing new lines.
+ 	local sleep_argv0="password store sleep on display $DISPLAY"
+-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ 	local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)"
+ 	echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
+ 	(
+-		( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
++		( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
+ 		local now="$(xclip -o -selection "$X_SELECTION" | base64)"
+ 		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
+ 
+diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh
+index 6e5dd86..f3574c4 100644
+--- a/src/platform/cygwin.sh
++++ b/src/platform/cygwin.sh
+@@ -3,11 +3,11 @@
+ 
+ clip() {
+ 	local sleep_argv0="password store sleep on display $DISPLAY"
+-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ 	local before="$(base64 < /dev/clipboard)"
+ 	echo -n "$1" > /dev/clipboard
+ 	(
+-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ 		local now="$(base64 < /dev/clipboard)"
+ 		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
+ 		echo "$before" | base64 -d > /dev/clipboard
+diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
+index 86eb325..deb04c4 100644
+--- a/src/platform/darwin.sh
++++ b/src/platform/darwin.sh
+@@ -3,11 +3,11 @@
+ 
+ clip() {
+ 	local sleep_argv0="password store sleep for user $(id -u)"
+-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ 	local before="$(pbpaste | openssl base64)"
+ 	echo -n "$1" | pbcopy
+ 	(
+-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ 		local now="$(pbpaste | openssl base64)"
+ 		[[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now"
+ 		echo "$before" | openssl base64 -d | pbcopy
+-- 
+2.12.2
+

From 3ec56d8da2a1da14b09c88741ccb913065a4d342 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 4 Apr 2017 18:44:42 +0300
Subject: [PATCH 0903/1744] wineUnstable: 2.4 -> 2.5

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 4419d8025a8..c38756bc48a 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,15 +31,15 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.4";
+    version = "2.5";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "13klfadvd44zdfrzh38al99s53i02x3mlhcj5z7fq7vqwh3xzdc7";
+    sha256 = "1lnc7dnhvm1ir1hrjmihx9r47bc8wr8rhlf6pfm3lcl3nix2py8k";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "052s4y7d8lw2k0hk17zwz9bgbsl013g8953ad001y2kqjxwcnilh";
+    sha256 = "1l0sjbsajr4m7w3ar2ljwr3ffmwyv57g85a068ard3v8fv4nil22";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 6d1374238f499d0b560021ad2e521fa222c02050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Apr 2017 16:15:02 +0200
Subject: [PATCH 0904/1744] gnutls: bugfix 3.5.10 -> 3.5.11

---
 pkgs/development/libraries/gnutls/3.5.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index a1eab1a84c1..77ecd4957f7 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,10 +1,18 @@
 { callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.10";
+  version = "3.5.11";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
+    sha256 = "13z2dxxyrsb7gfpl1k2kafqh2zaigi872y5xgykhs9cyaz2mqxji";
   };
+
+  # Skip two tests introduced in 3.5.11.  Probable reasons of failure:
+  #  - pkgconfig: building against the result won't work before installing
+  #  - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox
+  postPatch = ''
+    sed '2iexit 77' -i tests/pkgconfig.sh
+    sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
+  '';
 })

From 1bb8a47803ea5015de2fcc3f99fd2323e7de1d91 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 10 Apr 2017 12:29:11 -0400
Subject: [PATCH 0905/1744] Add aggregate job for a forthcoming
 nixpkgs-darwin-unstable channel

---
 pkgs/top-level/release.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b5207879a5e..7c6954564d0 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -31,6 +31,21 @@ let
       manual = import ../../doc;
       lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
 
+      darwin-tested = pkgs.releaseTools.aggregate
+        { name = "nixpkgs-darwin-${jobs.tarball.version}";
+          meta.description = "Release-critical builds for the Nixpkgs darwin channel";
+          constituents =
+            [ jobs.tarball
+              jobs.stdenv.x86_64-darwin
+              jobs.ghc.x86_64-darwin
+              jobs.cabal2nix.x86_64-darwin
+              jobs.ruby.x86_64-darwin
+              jobs.python.x86_64-darwin
+              jobs.rustc.x86_64-darwin
+              jobs.go.x86_64-darwin
+            ];
+        };
+
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
           meta.description = "Release-critical builds for the Nixpkgs unstable channel";

From 8d18f67a9705617953d43c5a06249f94e2423fbb Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 10 Apr 2017 18:56:00 +0200
Subject: [PATCH 0906/1744] awscli: 1.11.45 -> 1.11.75

also update dependency botocore
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74b00ad6ff2..8fe1c60af47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1625,11 +1625,11 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.11.45";
+    version = "1.11.75";
       namePrefix = "";
       src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya";
+      sha256 = "0bkjyrgb78f29vvr8j2id0386d30w340wrl7krwiha725c9y3pz1";
     };
 
     # No tests included
@@ -3200,11 +3200,11 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.5.8"; # This version is required by awscli
+    version = "1.5.38"; # This version is required by awscli
     name = "botocore-${version}";
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz";
+      sha256 = "04cvsi8g8p3r5vr3vr2nb5ldyrsm0y4c2phimabbpk33wv718qyx";
     };
 
     propagatedBuildInputs =

From c7dd8a707be6c5192593cd249d8018ac9f87b9cb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 10 Apr 2017 13:51:45 -0500
Subject: [PATCH 0907/1744] golden-cheetah: fix build

- Use Qt 5.6 to fix compile error.
- Run preInstall and postInstall hooks to fix linking error.
---
 pkgs/applications/misc/golden-cheetah/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 68c9246c24b..d6da900656c 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -22,9 +22,13 @@ stdenv.mkDerivation rec {
     sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
   '';
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
     wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
+
+    runHook postInstall
   '';
   meta = {
     description = "Performance software for cyclists, runners and triathletes";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45562df3170..38b92de3d55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18434,7 +18434,7 @@ with pkgs;
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
-  golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {};
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 

From f3055a3c508b6ff3e926ece201887467dc2b5d73 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 8 Feb 2017 22:13:18 -0500
Subject: [PATCH 0908/1744] top-level/platforms.nix: Reformat and clean up
 whitespace

---
 pkgs/top-level/platforms.nix | 555 +++++++++++++++++------------------
 1 file changed, 275 insertions(+), 280 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 19cb0da58d9..665950766f7 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -28,105 +28,104 @@ rec {
     kernelBaseConfig = "multi_v5_defconfig";
     kernelArch = "arm";
     kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        BTRFS_FS m
-        XFS_FS m
-        JFS_FS m
-        EXT4_FS m
-        USB_STORAGE_CYPRESS_ATACB m
+    kernelExtraConfig = ''
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      BTRFS_FS m
+      XFS_FS m
+      JFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
 
-        # mv cesa requires this sw fallback, for mv-sha1
-        CRYPTO_SHA1 y
-        # Fast crypto
-        CRYPTO_TWOFISH y
-        CRYPTO_TWOFISH_COMMON y
-        CRYPTO_BLOWFISH y
-        CRYPTO_BLOWFISH_COMMON y
+      # mv cesa requires this sw fallback, for mv-sha1
+      CRYPTO_SHA1 y
+      # Fast crypto
+      CRYPTO_TWOFISH y
+      CRYPTO_TWOFISH_COMMON y
+      CRYPTO_BLOWFISH y
+      CRYPTO_BLOWFISH_COMMON y
 
-        IP_PNP y
-        IP_PNP_DHCP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
-        NETFILTER y
-        IP_NF_IPTABLES y
-        IP_NF_FILTER y
-        IP_NF_MATCH_ADDRTYPE y
-        IP_NF_TARGET_LOG y
-        IP_NF_MANGLE y
-        IPV6 m
-        VLAN_8021Q m
+      IP_PNP y
+      IP_PNP_DHCP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      NETFILTER y
+      IP_NF_IPTABLES y
+      IP_NF_FILTER y
+      IP_NF_MATCH_ADDRTYPE y
+      IP_NF_TARGET_LOG y
+      IP_NF_MANGLE y
+      IPV6 m
+      VLAN_8021Q m
 
-        CIFS y
-        CIFS_XATTR y
-        CIFS_POSIX y
-        CIFS_FSCACHE y
-        CIFS_ACL y
+      CIFS y
+      CIFS_XATTR y
+      CIFS_POSIX y
+      CIFS_FSCACHE y
+      CIFS_ACL y
 
-        WATCHDOG y
-        WATCHDOG_CORE y
-        ORION_WATCHDOG m
+      WATCHDOG y
+      WATCHDOG_CORE y
+      ORION_WATCHDOG m
 
-        ZRAM m
-        NETCONSOLE m
+      ZRAM m
+      NETCONSOLE m
 
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
 
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
 
-        FUSE_FS m
+      FUSE_FS m
 
-        # systemd uses cgroups
-        CGROUPS y
+      # systemd uses cgroups
+      CGROUPS y
 
-        # Latencytop 
-        LATENCYTOP y
+      # Latencytop
+      LATENCYTOP y
 
-        # Ubi for the mtd
-        MTD_UBI y
-        UBIFS_FS y
-        UBIFS_FS_XATTR y
-        UBIFS_FS_ADVANCED_COMPR y
-        UBIFS_FS_LZO y
-        UBIFS_FS_ZLIB y
-        UBIFS_FS_DEBUG n
+      # Ubi for the mtd
+      MTD_UBI y
+      UBIFS_FS y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      UBIFS_FS_LZO y
+      UBIFS_FS_ZLIB y
+      UBIFS_FS_DEBUG n
 
-        # Kdb, for kernel troubles
-        KGDB y
-        KGDB_SERIAL_CONSOLE y
-        KGDB_KDB y
-      '';
+      # Kdb, for kernel troubles
+      KGDB y
+      KGDB_SERIAL_CONSOLE y
+      KGDB_KDB y
+    '';
     kernelMakeFlags = [ "LOADADDR=0x0200000" ];
     kernelTarget = "uImage";
     uboot = "sheevaplug";
@@ -147,77 +146,76 @@ rec {
     kernelDTB = true;
     kernelArch = "arm";
     kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        BTRFS_FS y
-        XFS_FS m
-        JFS_FS y
-        EXT4_FS y
+    kernelExtraConfig = ''
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      BTRFS_FS y
+      XFS_FS m
+      JFS_FS y
+      EXT4_FS y
 
-        IP_PNP y
-        IP_PNP_DHCP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
-        NETFILTER y
-        IP_NF_IPTABLES y
-        IP_NF_FILTER y
-        IP_NF_MATCH_ADDRTYPE y
-        IP_NF_TARGET_LOG y
-        IP_NF_MANGLE y
-        IPV6 m
-        VLAN_8021Q m
+      IP_PNP y
+      IP_PNP_DHCP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      NETFILTER y
+      IP_NF_IPTABLES y
+      IP_NF_FILTER y
+      IP_NF_MATCH_ADDRTYPE y
+      IP_NF_TARGET_LOG y
+      IP_NF_MANGLE y
+      IPV6 m
+      VLAN_8021Q m
 
-        CIFS y
-        CIFS_XATTR y
-        CIFS_POSIX y
-        CIFS_FSCACHE y
-        CIFS_ACL y
+      CIFS y
+      CIFS_XATTR y
+      CIFS_POSIX y
+      CIFS_FSCACHE y
+      CIFS_ACL y
 
-        ZRAM m
+      ZRAM m
 
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
 
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
 
-        FUSE_FS m
+      FUSE_FS m
 
-        # nixos mounts some cgroup
-        CGROUPS y
+      # nixos mounts some cgroup
+      CGROUPS y
 
-        # Latencytop 
-        LATENCYTOP y
-      '';
+      # Latencytop
+      LATENCYTOP y
+    '';
     kernelTarget = "zImage";
     uboot = null;
     gcc = {
@@ -232,80 +230,79 @@ rec {
     kernelBaseConfig = "bcm2709_defconfig";
     kernelDTB = true;
     kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        BTRFS_FS y
-        XFS_FS m
-        JFS_FS y
-        EXT4_FS y
+    kernelExtraConfig = ''
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      BTRFS_FS y
+      XFS_FS m
+      JFS_FS y
+      EXT4_FS y
 
-        IP_PNP y
-        IP_PNP_DHCP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
-        NETFILTER y
-        IP_NF_IPTABLES y
-        IP_NF_FILTER y
-        IP_NF_MATCH_ADDRTYPE y
-        IP_NF_TARGET_LOG y
-        IP_NF_MANGLE y
-        IPV6 m
-        VLAN_8021Q m
+      IP_PNP y
+      IP_PNP_DHCP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      NETFILTER y
+      IP_NF_IPTABLES y
+      IP_NF_FILTER y
+      IP_NF_MATCH_ADDRTYPE y
+      IP_NF_TARGET_LOG y
+      IP_NF_MANGLE y
+      IPV6 m
+      VLAN_8021Q m
 
-        CIFS y
-        CIFS_XATTR y
-        CIFS_POSIX y
-        CIFS_FSCACHE y
-        CIFS_ACL y
+      CIFS y
+      CIFS_XATTR y
+      CIFS_POSIX y
+      CIFS_FSCACHE y
+      CIFS_ACL y
 
-        ZRAM m
+      ZRAM m
 
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
 
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
 
-        FUSE_FS m
+      FUSE_FS m
 
-        # nixos mounts some cgroup
-        CGROUPS y
+      # nixos mounts some cgroup
+      CGROUPS y
 
-        # Latencytop 
-        LATENCYTOP y
+      # Latencytop
+      LATENCYTOP y
 
-        # Disable the common config Xen, it doesn't build on ARM
-	XEN? n
-      '';
+      # Disable the common config Xen, it doesn't build on ARM
+      XEN? n
+    '';
     kernelTarget = "zImage";
     uboot = null;
   };
@@ -327,76 +324,75 @@ rec {
     kernelBaseConfig = "lemote2f_defconfig";
     kernelArch = "mips";
     kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
-        MIGRATION n
-        COMPACTION n
+    kernelExtraConfig = ''
+      MIGRATION n
+      COMPACTION n
 
-        # nixos mounts some cgroup
-        CGROUPS y
+      # nixos mounts some cgroup
+      CGROUPS y
 
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        EXT4_FS m
-        USB_STORAGE_CYPRESS_ATACB m
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
 
-        IP_PNP y
-        IP_PNP_DHCP y
-        IP_PNP_BOOTP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
+      IP_PNP y
+      IP_PNP_DHCP y
+      IP_PNP_BOOTP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
 
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
 
-        FUSE_FS m
+      FUSE_FS m
 
-        # Needed for udev >= 150
-        SYSFS_DEPRECATED_V2 n
+      # Needed for udev >= 150
+      SYSFS_DEPRECATED_V2 n
 
-        VGA_CONSOLE n
-        VT_HW_CONSOLE_BINDING y
-        SERIAL_8250_CONSOLE y
-        FRAMEBUFFER_CONSOLE y
-        EXT2_FS y
-        EXT3_FS y
-        REISERFS_FS y
-        MAGIC_SYSRQ y
+      VGA_CONSOLE n
+      VT_HW_CONSOLE_BINDING y
+      SERIAL_8250_CONSOLE y
+      FRAMEBUFFER_CONSOLE y
+      EXT2_FS y
+      EXT3_FS y
+      REISERFS_FS y
+      MAGIC_SYSRQ y
 
-        # The kernel doesn't boot at all, with FTRACE
-        FTRACE n
-      '';
+      # The kernel doesn't boot at all, with FTRACE
+      FTRACE n
+    '';
     kernelTarget = "vmlinux";
     uboot = null;
     gcc.arch = "loongson2f";
   };
-  
+
   beaglebone = armv7l-hf-multiplatform // {
     name = "beaglebone";
     kernelBaseConfig = "omap2plus_defconfig";
@@ -417,14 +413,13 @@ rec {
     kernelPreferBuiltin = true;
     uboot = null;
     kernelTarget = "zImage";
-    kernelExtraConfig =
-      ''
-        # Fix broken sunxi-sid nvmem driver.
-        TI_CPTS y
+    kernelExtraConfig = ''
+      # Fix broken sunxi-sid nvmem driver.
+      TI_CPTS y
 
-        # Hangs ODROID-XU4
-        ARM_BIG_LITTLE_CPUIDLE n
-      '';
+      # Hangs ODROID-XU4
+      ARM_BIG_LITTLE_CPUIDLE n
+    '';
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png

From 08656a73f06e27c2a73ccdfcaa434f8ee26da2fb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 6 Mar 2017 23:29:48 +0100
Subject: [PATCH 0909/1744] gpsbabel: fix darwin build

---
 pkgs/applications/misc/gpsbabel/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 6c248bc4dfa..d017c704484 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
+{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ zlib qt4 which ];
+  buildInputs = [ zlib qt4 which ]
+    ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
 
@@ -40,11 +41,11 @@ stdenv.mkDerivation rec {
     patchShebangs testo
     substituteInPlace testo \
       --replace "-x /usr/bin/hexdump" ""
-  '' + (
+  ''
     # The raymarine and gtm tests fail on i686 despite -ffloat-store.
-    if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
-    else ""
-  );
+  + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
+    # The tomtom asc test fails on darwin, see PR #23572.
+  + lib.optionalString stdenv.isDarwin "rm -v testo.d/tomtom_asc.test;";
 
   meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45562df3170..c5b51ab14cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13985,7 +13985,9 @@ with pkgs;
 
   gosmore = callPackage ../applications/misc/gosmore { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
+  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
+    inherit (darwin) IOKit;
+  };
 
   gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
 

From ce6b5b8673967d45aead38180d65288460a14640 Mon Sep 17 00:00:00 2001
From: Leandro Lisboa Penz <lpenz@lpenz.org>
Date: Tue, 28 Mar 2017 22:56:12 +0100
Subject: [PATCH 0910/1744] aspell: set default aspell data-dir if ASPELL_CONF
 is not set

if the user didn't set ASPELL_CONF, use it to point to the dictionary
location by first looking at NIX_PROFILE directories and then using
$HOME/.nix-profile.

See NixOS/nixpkgs#1000
---
 pkgs/development/libraries/aspell/default.nix | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 5af340bef07..e69bbe0d2f2 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -23,12 +23,27 @@ stdenv.mkDerivation rec {
     );
   '';
 
-  # Note: Users should define the `ASPELL_CONF' environment variable to
-  # `data-dir $HOME/.nix-profile/lib/aspell/' so that they can access
-  # dictionaries installed in their profile.
-  #
-  # We can't use `$out/etc/aspell.conf' for that purpose since Aspell
-  # doesn't expand environment variables such as `$HOME'.
+  postInstall = ''
+    local prog="$out/bin/aspell"
+    local hidden="$out/bin/.aspell-wrapped"
+    mv "$prog" "$hidden"
+    cat > "$prog" <<END
+    #! $SHELL -e
+    if [ -z "\$ASPELL_CONF" ]; then
+      for p in \$NIX_PROFILES; do
+        if [ -d "\$p/lib/aspell" ]; then
+          ASPELL_CONF="data-dir \$p/lib/aspell"
+        fi
+      done
+      if [ -z "\$ASPELL_CONF" ] && [ -d "\$HOME/.nix-profile/lib/aspell" ]; then
+        ASPELL_CONF="data-dir \$HOME/.nix-profile/lib/aspell"
+      fi
+      export ASPELL_CONF
+    fi
+    exec "$hidden" "\$@"
+    END
+    chmod +x "$prog"
+  '';
 
   meta = {
     description = "Spell checker for many languages";

From eec5775a4cbe8fec60eb7991129e1f1ae048222f Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Mon, 10 Apr 2017 12:26:12 +0200
Subject: [PATCH 0911/1744] steam: move libpciaccess as non-runtime
 dependencies

---
 pkgs/games/steam/chrootenv.nix       | 1 +
 pkgs/games/steam/runtime-wrapped.nix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 125566b8428..1fbf5a9dd1a 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -63,6 +63,7 @@ in buildFHSUserEnv rec {
     libdrm
     mono
     xorg.xkeyboardconfig
+    xlibs.libpciaccess
 
     (steamPackages.steam-runtime-wrapped.override {
       inherit nativeOnly runtimeOnly newStdcpp;
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 5cf55535db1..6274a91625f 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -50,7 +50,6 @@ let
     # Verified games requirements
     xlibs.libXmu
     xlibs.libxcb
-    xlibs.libpciaccess
     mesa_glu
     libuuid
     libogg

From c8c340b05ac2ebef9e963c89b168d5053ae57dec Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 11 Apr 2017 02:08:53 +0300
Subject: [PATCH 0912/1744] tlp service: mask systemd-rfkill

Fixes #24737.
---
 nixos/modules/services/hardware/tlp.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index f36a9e7b459..3b108c87edd 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -58,6 +58,9 @@ in
     powerManagement.cpuFreqGovernor = null;
 
     systemd.services = {
+      "systemd-rfkill@".enable = false;
+      "systemd-rfkill".enable = false;
+
       tlp = {
         description = "TLP system startup/shutdown";
 

From 842417b4bc798a2e73ec13abad625b6a1ce7cece Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 5 Apr 2017 15:49:46 -0400
Subject: [PATCH 0913/1744] elpa-packages: 2017-04-10

---
 .../editors/emacs-modes/elpa-generated.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 868f9619ce2..852967fecd5 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -820,10 +820,10 @@
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
-        version = "1.2.1";
+        version = "1.2.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
-          sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
+          url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
+          sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -940,10 +940,10 @@
       }) {};
     ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "ivy";
-        version = "0.8.0";
+        version = "0.9.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar";
-          sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p";
+          url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar";
+          sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s";
         };
         packageRequires = [ emacs ];
         meta = {

From f087fd3c70f22b92f473c8556fcfd1cba88c6644 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 5 Apr 2017 15:59:57 -0400
Subject: [PATCH 0914/1744] melpa-stable-packages: 2017-04-10

---
 .../emacs-modes/melpa-stable-generated.nix    | 696 +++++++++++++-----
 1 file changed, 506 insertions(+), 190 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 488699f8a79..abb00d1ce33 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -212,12 +212,12 @@
     ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
     melpaBuild {
         pname = "ac-clang";
-        version = "1.8.0";
+        version = "1.9.0";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
-          sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
+          rev = "c4aab21df64011916039e18094e189533018e115";
+          sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -527,12 +527,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.7";
+        version = "1.7.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -548,12 +548,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "1.7.7";
+        version = "1.7.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1031,12 +1031,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "1.8.1";
+        version = "1.8.2";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "aa54643c6d64d82c2c8d502bb710e7de87699df1";
-          sha256 = "0fbhrri816brh3283q3gisnxnginwzarsydsz881zk24kk2raq1k";
+          rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601";
+          sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1049,6 +1049,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "alda-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "jgkamat";
+          repo = "alda-mode";
+          rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
+          sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
+          sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
+          name = "alda-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/alda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
@@ -1091,22 +1112,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.2.0";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "692ac0816783725600b80b5307bf48a83053a378";
-          sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8";
+          rev = "4f7c556167e42c02d2f840aec345b8f60b71c477";
+          sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ dash emacs font-lock-plus ];
+        packageRequires = [ emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1145,12 +1166,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "0.1.7";
+        version = "0.1.8";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
-          sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
+          rev = "95fdfab07600171daccb0e9e98fb91c11237fd48";
+          sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1540,6 +1561,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apache-mode";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "apache-mode";
+          rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d";
+          sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
+          sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+          name = "apache-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/apache-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "apib-mode";
@@ -2449,6 +2491,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "beacon";
+        version = "1.3.3";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "beacon";
+          rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
+          sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
+          sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
+          name = "beacon";
+        };
+        packageRequires = [ seq ];
+        meta = {
+          homepage = "https://melpa.org/#/beacon";
+          license = lib.licenses.free;
+        };
+      }) {};
     beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beeminder";
@@ -3502,12 +3565,12 @@
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.10.0";
+        version = "3.10.1";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "dc823da05d6790e9f95e3cb75618b51d6273e303";
-          sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq";
+          rev = "99e8b116e779f97e96866891362817c1c5c6534c";
+          sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -4206,12 +4269,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0pre3";
+        version = "3.8.0pre4";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc";
-          sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw";
+          rev = "9e32b88784e5e0f14258597fde162fcaf6290fea";
+          sha256 = "1pg5gc7fbj5fjwz5za2162yrnrvrnd5dp6jd2mm9zjkipwwf2z80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4836,12 +4899,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.7";
+        version = "1.7.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -4857,12 +4920,12 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "2.0.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09";
-          sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4";
+          rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
+          sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -4902,6 +4965,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-rtags";
+        version = "2.9";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
+          sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
+          name = "company-rtags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/company-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
@@ -5241,12 +5325,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "0.8.0";
+        version = "0.9.1";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
-          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+          rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+          sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -6079,12 +6163,12 @@
     demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demangle-mode";
-        version = "1.2";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c";
-          sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7";
+          rev = "0f9436f98225e0f5a5deecea4680c173e76f0322";
+          sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -7282,12 +7366,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "0.4.1";
+        version = "0.5.5";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370";
-          sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz";
+          rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28";
+          sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
@@ -7513,12 +7597,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25";
-          sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm";
+          rev = "28a989232c276ee7fc5112c9050b1c29f628be9f";
+          sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7784,12 +7868,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.12.1";
+        version = "0.12.2";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "b52ccbd46dee2a1ece1dd6bd9be1224c323262ca";
-          sha256 = "1qdznl8z0s2hy3hhls9ccr516wai11qh663630hc0zwv4gwlwp64";
+          rev = "0ede9e7ef64017039748b8f47de4df834b0443ed";
+          sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -8057,12 +8141,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "2.1.0";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
-          sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
+          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -8078,12 +8162,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "2.1.0";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
-          sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
+          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -8674,13 +8758,13 @@
         pname = "emms";
         version = "4.1";
         src = fetchgit {
-          url = "git://git.sv.gnu.org/emms.git";
+          url = "https://git.savannah.gnu.org/git/emms.git";
           rev = "c1e1a843c3389fc585908de367ff00fdd6470965";
           sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
-          sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
+          sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
           name = "emms";
         };
         packageRequires = [];
@@ -8954,12 +9038,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "2621509bc9811c103d7efc999d4722e9d4c788e9";
-          sha256 = "1bq634bimd5ng2jc5d0aglsrdi08jihm0qx2za4vfdqvnn82gxiv";
+          rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6";
+          sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -9255,12 +9339,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.3";
+        version = "19.3.1";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a748cafdc7063d9f181ba12088db6458793ced2f";
-          sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
+          rev = "d25ad84195ca42969fbfb017a52aab8c8effc246";
+          sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9863,12 +9947,12 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
-          sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
+          rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
+          sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -11651,22 +11735,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    flycheck-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-rtags";
+        version = "2.9";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
+          sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
+          name = "flycheck-rtags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "1.2.1";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "1c67e62562a5c30b3a184ef5090bbe50bab4d681";
-          sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm";
+          rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
+          sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
-        packageRequires = [ emacs flycheck let-alist ];
+        packageRequires = [ cl-lib emacs flycheck let-alist ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-status-emoji";
           license = lib.licenses.free;
@@ -11696,12 +11801,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "1.0.8";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
-          sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
+          rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
+          sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13319,12 +13424,12 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "0.4.1";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
-          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
+          rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64";
+          sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -13925,6 +14030,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-guru";
+        version = "1.5.0";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-mode.el";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
+          sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk";
+          name = "go-guru";
+        };
+        packageRequires = [ cl-lib go-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/go-guru";
+          license = lib.licenses.free;
+        };
+      }) {};
     go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-impl";
@@ -13949,12 +14075,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "1.4.0";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "9d94107fae1b1137fb46f8cd7efc7e28f3abf2cb";
-          sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -13988,6 +14114,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-rename";
+        version = "1.5.0";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-mode.el";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
+          sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki";
+          name = "go-rename";
+        };
+        packageRequires = [ go-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/go-rename";
+          license = lib.licenses.free;
+        };
+      }) {};
     go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-scratch";
@@ -14201,12 +14348,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.13.0";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
-          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
+          rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
+          sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -15133,12 +15280,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.4";
+        version = "2.6.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
-          sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
+          rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
+          sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15448,12 +15595,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.4";
+        version = "2.6.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
-          sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
+          rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
+          sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16642,6 +16789,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hide-lines";
+        version = "20130623.1701";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "hide-lines";
+          rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0";
+          sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
+          sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
+          name = "hide-lines";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/hide-lines";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-blocks";
@@ -18031,12 +18199,12 @@
     inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inherit-local";
-        version = "1.1";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "inherit-local";
-          rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
-          sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+          rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
+          sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -18345,12 +18513,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "0.8.0";
+        version = "0.9.1";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
-          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+          rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+          sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -18387,12 +18555,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.1.5";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
-          sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
+          rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
+          sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -18426,22 +18594,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-hydra = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "0.8.0";
+        version = "0.9.1";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
-          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+          rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+          sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
           sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
           name = "ivy-hydra";
         };
-        packageRequires = [];
+        packageRequires = [ emacs hydra ivy ];
         meta = {
           homepage = "https://melpa.org/#/ivy-hydra";
           license = lib.licenses.free;
@@ -18577,13 +18745,13 @@
         pname = "jabber";
         version = "0.8.92";
         src = fetchgit {
-          url = "git://git.code.sf.net/p/emacs-jabber/git";
+          url = "https://git.code.sf.net/p/emacs-jabber/git";
           rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
           sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber";
-          sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
+          sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
           name = "jabber";
         };
         packageRequires = [];
@@ -19243,6 +19411,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-chord";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "key-chord";
+          rev = "8468998946367157830df19a1e92785d22a34178";
+          sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
+          sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
+          name = "key-chord";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/key-chord";
+          license = lib.licenses.free;
+        };
+      }) {};
     key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "key-combo";
@@ -19558,6 +19747,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "kubernetes";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "kubernetes-el";
+          rev = "795ba140104aef6f905aab61bc843596958d97db";
+          sha256 = "0l847g5pm8r7y2p0nrryhfdmrqj6h8qp9fmk6bm0xx0xnxpx01xg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
+          sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+          name = "kubernetes";
+        };
+        packageRequires = [ dash emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/kubernetes";
+          license = lib.licenses.free;
+        };
+      }) {};
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
@@ -20240,12 +20450,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.7.1";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "6409991053350ab2d3def61749b92780dd1ed095";
-          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
+          rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
+          sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -20321,22 +20531,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "m-buffer";
-        version = "0.14";
+        version = "0.15";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "61d1ed99e528840d2eee2ce07946a9d76eb6d814";
-          sha256 = "048ls0ca9yppjj0mx6g00f1vwh4ryvv6bckihxs7ynbr2jcydjr7";
+          rev = "6eb1d2535a82707a83733173bc400a0d8e520c80";
+          sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
           sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
           name = "m-buffer";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ seq ];
         meta = {
           homepage = "https://melpa.org/#/m-buffer";
           license = lib.licenses.free;
@@ -20436,12 +20646,12 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432";
-          sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z";
+          rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
+          sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -21157,12 +21367,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.2";
+        version = "0.7.3";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
-          sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
+          rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
+          sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22098,6 +22308,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-term";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "multi-term";
+          rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244";
+          sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
+          sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
+          name = "multi-term";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/multi-term";
+          license = lib.licenses.free;
+        };
+      }) {};
     multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-web-mode";
@@ -22376,14 +22607,14 @@
         pname = "navi-mode";
         version = "2.0";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "navi";
           rev = "5c979b3b3873b0e67751a1321a9e271d066f2022";
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode";
-          sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
+          sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
           name = "navi-mode";
         };
         packageRequires = [];
@@ -22626,12 +22857,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "0.5.5";
+        version = "0.5.6";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b";
-          sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i";
+          rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde";
+          sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -22728,11 +22959,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.24";
+        version = "0.24.1";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "e60b44ecf8bd5934959727496c7ef3016ff80cf6";
-          sha256 = "1q81ibvhjvnz4hbwmdna3a1xjkik21avy5im89fnkhq068kwac2j";
+          rev = "e64fdf889d0f78543557f5b72ebca1571caf497e";
+          sha256 = "0vappcyidhzka2za6zqlcygn90a1xm9xrhpr9gvdp258m8qhz6d1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -23291,15 +23522,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
         version = "3.9";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
-          sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
+          rev = "93c188938305533ea34ceca51dd53c7841598ada";
+          sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -23315,6 +23546,7 @@
           json
           popup
           s
+          shut-up
         ];
         meta = {
           homepage = "https://melpa.org/#/omnisharp";
@@ -23555,12 +23787,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "1011";
+        version = "1018";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "53469a2f0577924de1c7d887fecea409d17fd588";
-          sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
+          rev = "405bfd630f1b31bd77158bc8e79aab86812cba65";
+          sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -24657,14 +24889,14 @@
         pname = "outorg";
         version = "2.0";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "outorg";
           rev = "e946cda497bae53fca6fa1579910237e216170bf";
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg";
-          sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
+          sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
           name = "outorg";
         };
         packageRequires = [];
@@ -24678,14 +24910,14 @@
         pname = "outshine";
         version = "2.0";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "outshine";
           rev = "cf1097692b3ea0367d3c821769399fec5831e200";
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine";
-          sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
+          sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
           name = "outshine";
         };
         packageRequires = [];
@@ -24760,12 +24992,12 @@
     ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-epub";
-        version = "0.1.6";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
-          sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+          rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
+          sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -25139,13 +25371,13 @@
         pname = "paredit";
         version = "24";
         src = fetchgit {
-          url = "http://mumble.net/~campbell/git/paredit.git";
+          url = "https://mumble.net/~campbell/git/paredit.git";
           rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409";
           sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit";
-          sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
+          sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
           name = "paredit";
         };
         packageRequires = [];
@@ -26227,13 +26459,13 @@
         pname = "po-mode";
         version = "0.19.8.1";
         src = fetchgit {
-          url = "git://git.savannah.gnu.org/gettext.git";
+          url = "https://git.savannah.gnu.org/git/gettext.git";
           rev = "c737bf843616ca984c9416048a2da845e9ad3f50";
           sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
-          sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
+          sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
           name = "po-mode";
         };
         packageRequires = [];
@@ -26853,12 +27085,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.2.0";
+        version = "3.2.1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5";
-          sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
+          rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8";
+          sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28278,22 +28510,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "1.1.1";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db";
-          sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661";
+          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
+          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
           sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
           name = "rg";
         };
-        packageRequires = [ cl-lib s ];
+        packageRequires = [ cl-lib emacs s seq ];
         meta = {
           homepage = "https://melpa.org/#/rg";
           license = lib.licenses.free;
@@ -28541,8 +28773,8 @@
           sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
-          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
+          sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
           name = "rtags";
         };
         packageRequires = [];
@@ -29158,6 +29390,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sentence-highlight";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "sbelak";
+          repo = "sentence-highlight";
+          rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb";
+          sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
+          sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
+          name = "sentence-highlight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sentence-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
     servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
     melpaBuild {
         pname = "servant";
@@ -29515,6 +29768,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "showtip";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "showtip";
+          rev = "930da302809a4257e8d69425455b29e1cc91949b";
+          sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
+          sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
+          name = "showtip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/showtip";
+          license = lib.licenses.free;
+        };
+      }) {};
     shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shpec-mode";
@@ -30232,12 +30506,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "1.1.0";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "327c168febbde24c2b39cc10d26c9cfc9189e130";
-          sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly";
+          rev = "15803162483e635f3e22b2efea33ccad725e0535";
+          sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -30733,6 +31007,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sr-speedbar";
+        version = "20140914.2339";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "sr-speedbar";
+          rev = "4f816528a32eb421197a768d6dcf3a05de83f642";
+          sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
+          sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
+          name = "sr-speedbar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sr-speedbar";
+          license = lib.licenses.free;
+        };
+      }) {};
     srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "srefactor";
@@ -30988,13 +31283,13 @@
         pname = "stumpwm-mode";
         version = "0.9.8";
         src = fetchgit {
-          url = "git://git.savannah.nongnu.org/stumpwm.git";
+          url = "https://git.savannah.nongnu.org/git/stumpwm.git";
           rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
           sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode";
-          sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
+          sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
           name = "stumpwm-mode";
         };
         packageRequires = [];
@@ -31321,12 +31616,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "0.8.0";
+        version = "0.9.1";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
-          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+          rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+          sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -32181,12 +32476,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "2.1.5";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "bd89d93d9803319ba86eff0173821deb978ae2ac";
-          sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k";
+          rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
+          sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -32286,12 +32581,12 @@
     tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tox";
-        version = "0.3";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "chmouel";
           repo = "tox.el";
-          rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d";
-          sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
+          rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
+          sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
@@ -32579,12 +32874,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "abc0751c0e3f316a0064fc7342ffb89b49b02e15";
-          sha256 = "0lgsyqzfjqhygs8a3icnfsp6y20h2rqrk4wbyc1xfmkbahs7qk8y";
+          rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
+          sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -32726,12 +33021,12 @@
     unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unfill";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "99388d79f971db70c5d18dab4257301f750ed907";
-          sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
+          rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
+          sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -32897,22 +33192,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "3.1";
+        version = "3.3";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
-          sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
+          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
           sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
           name = "uptimes";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/uptimes";
           license = lib.licenses.free;
@@ -32942,12 +33237,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "1.19.3";
+        version = "1.20";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb";
-          sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z";
+          rev = "46355e96f35fc6c3373cf8268e5e531cc3748644";
+          sha256 = "1jc16vki0d20vwgkf4ns6hn5s1dzfa4x5kf2925s1489f223ski3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -33359,6 +33654,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "w32-browser";
+        version = "235";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "w32-browser";
+          rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062";
+          sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
+          sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
+          name = "w32-browser";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/w32-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
     wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wacspace";
@@ -34016,8 +34332,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "c5c0bb98b281";
-          sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
+          rev = "e85aef10521f";
+          sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

From 5a5eea34ccb69562b90252791800d0c6a87d2717 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 5 Apr 2017 15:50:10 -0400
Subject: [PATCH 0915/1744] melpa-packages: 2017-04-10

Removals:
 - dos: package removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 2071 ++++++++++-------
 1 file changed, 1201 insertions(+), 870 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 70ea1d58cf8..9ee0fb281e8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -316,12 +316,12 @@
     ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
     melpaBuild {
         pname = "ac-clang";
-        version = "20161202.725";
+        version = "20170330.1108";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
-          sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
+          rev = "c4aab21df64011916039e18094e189533018e115";
+          sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -793,6 +793,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "ac-rtags";
+        version = "20170402.653";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
+          sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641";
+          name = "ac-rtags";
+        };
+        packageRequires = [ auto-complete rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/ac-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
     melpaBuild {
         pname = "ac-skk";
@@ -1173,12 +1194,12 @@
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20161130.150";
+        version = "20170331.1209";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "ad3c73369b804a48803fdfdf2ab613e6220260de";
-          sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6";
+          rev = "54c4e57b000d54cedb3d791d054d293c8f45f2fe";
+          sha256 = "17g4j5yc7phnn95cya8sw13jm1219j1yrjzdcvadi5xdwlb9gxgz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1420,22 +1441,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "alchemist";
-        version = "20170118.142";
+        version = "20170402.2339";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "20a0c043b5df66ee1f731e1ffe53d5697915b626";
-          sha256 = "1szmjcim9mmzm45f7pb39gr0kf3y7x0kdhgvvbl9fbdzrphn02mx";
+          rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087";
+          sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
-        packageRequires = [ company dash elixir-mode emacs pkg-info ];
+        packageRequires = [ company dash elixir-mode emacs pkg-info s ];
         meta = {
           homepage = "https://melpa.org/#/alchemist";
           license = lib.licenses.free;
@@ -1448,8 +1469,8 @@
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013";
-          sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2";
+          rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
+          sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1546,22 +1567,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170328.2313";
+        version = "20170410.114";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c";
-          sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg";
+          rev = "16a0bc57107562e69cb97701d9275b446b411a8c";
+          sha256 = "0i2hrfjgxpg9n7k2n4gsl1wp93g0cv1wrcwwaw3fz0vf250f5avf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ dash emacs font-lock-plus ];
+        packageRequires = [ emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1684,12 +1705,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20170329.836";
+        version = "20170405.301";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0";
-          sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3";
+          rev = "6141aba393e992308d01b550f0b96add62440b04";
+          sha256 = "1gkkjnmczpvaw020vw1gbda3dv0h1g7fzdqs3rigwlzzajc96bj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2273,8 +2294,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b";
-          sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl";
+          rev = "dc5e218372293ade9bf42bd6782da6b127629d67";
+          sha256 = "0jyh4gi8dz5ifpl1p338rarf9h53z97xfck516fcjdbkm91rwamg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2347,16 +2368,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "apache-mode";
-        version = "20150828.714";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/apache-mode.el";
-          sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
+        version = "20170407.1140";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "apache-mode";
+          rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf";
+          sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/apache-mode";
-          sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
+          sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
           name = "apache-mode";
         };
         packageRequires = [];
@@ -2756,22 +2780,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20161203.327";
+        version = "20170408.1451";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "47ce039423f660174d097698615aaad6c77e87fb";
-          sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b";
+          rev = "0a3e94477a08c3cda7c1dd4ea05ef87208901ac0";
+          sha256 = "03fpfyamcfhc1amfnmq5r2qrzc9iws3mzwihr4nc0k5xjp7z0rhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
           name = "assess";
         };
-        packageRequires = [ dash emacs m-buffer ];
+        packageRequires = [ emacs m-buffer ];
         meta = {
           homepage = "https://melpa.org/#/assess";
           license = lib.licenses.free;
@@ -2910,8 +2934,8 @@
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096";
-          sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql";
+          rev = "0315925ac9a892e73859cf4b720f36f2727f47f1";
+          sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
@@ -3906,12 +3930,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170326.1157";
+        version = "20170407.111";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042";
-          sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06";
+          rev = "105efc84827cb764cac1e1e3a793abf106837021";
+          sha256 = "1kb5l50m8hqmdc5yjw43l53nimsbc3g9jnlkkrdywqm0kbzc5znp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3969,12 +3993,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20161229.605";
+        version = "20170404.904";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1";
-          sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48";
+          rev = "6dd5dde4d4bc0bc7758977b64e1ad1173f5f1602";
+          sha256 = "0lscjwbksdqkjzfzvdz0llpxbmwk94byyxz0fljcncxzdzwvsz6v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4095,8 +4119,8 @@
         src = fetchFromGitHub {
           owner = "hung-phan";
           repo = "babel-repl";
-          rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034";
-          sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr";
+          rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3";
+          sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl";
@@ -4429,13 +4453,13 @@
         pname = "bbdb";
         version = "20170129.2224";
         src = fetchgit {
-          url = "git://git.savannah.nongnu.org/bbdb.git";
+          url = "https://git.savannah.nongnu.org/git/bbdb.git";
           rev = "8998b3416b36873f4e49454879f2eed20c31b384";
           sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb";
-          sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
+          sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2";
           name = "bbdb";
         };
         packageRequires = [];
@@ -4514,8 +4538,8 @@
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "bbdb-csv-import";
-          rev = "21c775d776be1a6b3a096912bcdb53dab6bfaa31";
-          sha256 = "0amdn5hd72108ylss90yk550w6vzvsg91l29dycbfr8a3hrfs22x";
+          rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186";
+          sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import";
@@ -4657,12 +4681,12 @@
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20161004.756";
+        version = "20170404.906";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "c9d86457d43decf61810006752544d7f7bd5a61d";
-          sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0";
+          rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
+          sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4994,8 +5018,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
-          sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
+          rev = "103b6518e66d9acb990832f02dca093a7425ca84";
+          sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5448,10 +5472,10 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170312.1135";
+        version = "20170331.1856";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
-          sha256 = "0vr5v6laav6hhx8g9v4pjdmfjcc2bylvvjwzfby9a4s838dakgkr";
+          sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5488,12 +5512,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170318.1312";
+        version = "20170406.1153";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
-          sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
+          rev = "6dd44cdef13c3695a2890c0329f0d870cce8dfdb";
+          sha256 = "0rfc4zgyijl9gcbf1bf1hnsx2pwl02jmxxj372z7nsvjwhwc20w9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5677,12 +5701,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20170302.2236";
+        version = "20170330.1452";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "6de3e242e7b11ee2cb942547ac01823fada52605";
-          sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17";
+          rev = "7a34d6579a98d13b2887addab25947ea96502de9";
+          sha256 = "1ybb9gyw1b4fjbh02lj632vc89m9yq91dvshnbnzg0wbr77d33xr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -5840,12 +5864,12 @@
     bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
     melpaBuild {
         pname = "bts-github";
-        version = "20150108.27";
+        version = "20170401.549";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "emacs-bts-github";
-          rev = "57c23f2b842f6775f0bbbdff97eeec78474be6bc";
-          sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
+          rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad";
+          sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github";
@@ -6256,12 +6280,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170316.1516";
+        version = "20170401.703";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "677d6d3c253e69bee9e310911605833e79253ee3";
-          sha256 = "0h8kq3p2ksyiqn4f6z7flq15q3dxps2fp5a8zzfpxbs67k13nrf3";
+          rev = "f60ed2a563b3867a98ab41290b46572789c43272";
+          sha256 = "11axmbqvak8djldjp9kqcaz7q6dxkig9h193l5javgf78pfcdlki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6614,13 +6638,13 @@
         pname = "caml";
         version = "20151009.845";
         src = fetchsvn {
-          url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
+          url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
           rev = "16556";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55c90eb51ac6a69383c8b63987235d325f43fdb0/recipes/caml";
-          sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/caml";
+          sha256 = "1z5wm2h930fhl4v01i6ki8ms58n4dn4h085iac075sijp8dpih92";
           name = "caml";
         };
         packageRequires = [];
@@ -6762,8 +6786,8 @@
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "cask-package-toolset.el";
-          rev = "24fb0cf745d5e10342dbd2cdcd3d6c9910167726";
-          sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
+          rev = "bf5ae2fec2c84816d9e2b45a0799240401de9fc3";
+          sha256 = "1cy4bsrmz4x0c9hfsm789kfw1fb71h25dw8m9yjm795a0vdgskah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -6987,12 +7011,12 @@
     centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20160210.247";
+        version = "20170406.635";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "centered-window-mode";
-          rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190";
-          sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f";
+          rev = "ac8b7eca96a771e6921ffd6fad09566c0447092c";
+          sha256 = "0lkamd4qi2pp2riqw90flgq6rrz8mrjqghmzppng06dafalyfxnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7054,8 +7078,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "19de82713504f253961ad46d30943bf004f8a64c";
-          sha256 = "1x8fr5rczzppgpq7hrcvzv95s5hjpvm4ksm5wwmkvy5a8awghdyg";
+          rev = "37e40b61521efb63e1b5c8efb441e20805974fbf";
+          sha256 = "0l3455j6is72vfxlv63bsrwqiykqn4a1nys08l2vx6yxxxy7m0z4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7093,13 +7117,13 @@
         pname = "cg";
         version = "20170201.347";
         src = fetchsvn {
-          url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12088";
+          url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
+          rev = "12127";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg";
-          sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg";
+          sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5";
           name = "cg";
         };
         packageRequires = [];
@@ -7108,6 +7132,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "challenger-deep-theme";
+        version = "20170402.534";
+        src = fetchFromGitHub {
+          owner = "MaxSt";
+          repo = "challenger-deep";
+          rev = "02317915e36cb19e3e46f17fdec074677159b3a7";
+          sha256 = "02khn3wwzjxai81jrp8yaxfsa5n685l9b09ryd0wjf2hsa8ng975";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
+          sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60";
+          name = "challenger-deep-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/challenger-deep-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "change-inner";
@@ -7675,12 +7720,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170322.155";
+        version = "20170403.402";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "0816372ff483dd92eb8775c76929835b0955ae70";
-          sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn";
+          rev = "35c18ac8afefecf746fa0a77e930636736cf6541";
+          sha256 = "1r4706s8k3kpgkcn1jm9794bhpjfp0zxc4siqrr0h5hxfjnizc59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7801,12 +7846,12 @@
     ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ciel";
-        version = "20170323.2203";
+        version = "20170330.526";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804";
-          sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg";
+          rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e";
+          sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7951,7 +7996,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "299036";
+          rev = "299842";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8157,12 +8202,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 = "20170126.118";
+        version = "20170407.553";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d";
-          sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y";
+          rev = "0a25f2ed361fff056ee23cfa64eac1423c75dfeb";
+          sha256 = "1alpvwmfqm9hqgcd4bhg54pvqjc85dc7wrcajxzv00gki47gj2zs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8337,12 +8382,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170303.2310";
+        version = "20170407.312";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
-          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
+          rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
+          sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8362,8 +8407,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
-          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
+          rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
+          sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8593,8 +8638,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701";
-          sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006";
+          rev = "333c565acefef652d2593d6eadc97551865a67e6";
+          sha256 = "14dlvyxvakj1ykm27apv9iv3gxjaa5m4zs7562vih14d7bqywsc3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8899,12 +8944,12 @@
     colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "colemak-evil";
-        version = "20140508.1612";
+        version = "20170401.1626";
         src = fetchFromGitHub {
           owner = "patbl";
           repo = "colemak-evil";
-          rev = "624985835a9e8192c687b99f7d59e7d01713c453";
-          sha256 = "1bwbqb9j5cn9b42n4w8nr6sqyk40xcp06mnxn9f28w4hnjd12pqj";
+          rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7";
+          sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil";
@@ -8985,13 +9030,13 @@
         pname = "color-theme";
         version = "20080305.34";
         src = fetchbzr {
-          url = "http://bzr.savannah.gnu.org/r/color-theme/trunk";
+          url = "https://bzr.savannah.gnu.org/r/color-theme/trunk";
           rev = "57";
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d49f86519b1340420a5ee587de77a3a6fa5791c3/recipes/color-theme";
-          sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme";
+          sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy";
           name = "color-theme";
         };
         packageRequires = [];
@@ -9087,12 +9132,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170106.1620";
+        version = "20170330.33";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd";
-          sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c";
+          rev = "56d9c31a6bea3657363f79d5987d4afa6a4caf41";
+          sha256 = "19aw5bac7sgyj70g093ds43ddx69mqrwgabx0wvjcg84kfggl6j4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9792,12 +9837,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20170303.909";
+        version = "20170401.345";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
-          sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
+          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
+          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10065,12 +10110,12 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20170226.522";
+        version = "20170402.35";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "30197a39ddedef550fd98803805dc15f844fc3c6";
-          sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r";
+          rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
+          sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10131,6 +10176,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "company-rtags";
+        version = "20170405.2311";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
+          sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
+          name = "company-rtags";
+        };
+        packageRequires = [ company emacs rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/company-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-shell";
@@ -10285,8 +10351,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
-          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10348,8 +10414,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9668749635472a63e7a9282e2124325405199b79";
-          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+          rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
+          sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10637,12 +10703,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170328.737";
+        version = "20170410.24";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
-          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10763,12 +10829,12 @@
     cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cov";
-        version = "20170222.940";
+        version = "20170405.1508";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "41719590b26b20642c31d233858dc27f34b277b3";
-          sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m";
+          rev = "74e8f32433eab6b31357642ad5a7ed79a3dfbd05";
+          sha256 = "100fk11fjj8wx8lm4ln4p4b6brxfgnkxq387v6ikyigr6lascmsw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11677,8 +11743,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182";
-          sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq";
+          rev = "0558bdb4d1ed4da734ac7194f0bdbe7c030cc70e";
+          sha256 = "18hf07pyyxdgb1li26yf26g77xqdpmgkxqkhxsq5aa8chj6zv900";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11778,12 +11844,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170322.1007";
+        version = "20170404.426";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9";
-          sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz";
+          rev = "e7066a1310b2437d1b68ec5afd800d06977dd687";
+          sha256 = "116hyd5c74m713xmzsl9panvn7014r7bg4267wvla6844n1qshp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11799,12 +11865,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170328.232";
+        version = "20170410.55";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512";
-          sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k";
+          rev = "9c29ac5cca30b02c227518c472af3a645a7c3d1a";
+          sha256 = "1pk6lmzq64fzbhqvxxvymspknq96zakjb65v52a45jgl4y9c1dlr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11988,12 +12054,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170328.1604";
+        version = "20170401.1521";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96";
-          sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar";
+          rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
+          sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12093,12 +12159,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20161229.1711";
+        version = "20170408.1653";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d";
-          sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3";
+          rev = "b409028a42059c70ac3a64e5a033477f27607101";
+          sha256 = "1s5lrc1vgc9q82nyz43sg094za0ncimr67p4mhmxqqxxchfk75x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12410,8 +12476,8 @@
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "decl.el";
-          rev = "500ae2da41c65f4e35abf5cd352411ce7ed3f9df";
-          sha256 = "1slfh4sjvprmg0pa4pq1h5jiwiszak7l8hakbvjy1ycbh97gnd17";
+          rev = "b25825de88289fab5212dfd6d18874ca2748123f";
+          sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12490,12 +12556,12 @@
     deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "20161228.1930";
+        version = "20170331.1759";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9668749635472a63e7a9282e2124325405199b79";
-          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+          rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
+          sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
@@ -12742,13 +12808,13 @@
         pname = "dic-lookup-w3m";
         version = "20170315.709";
         src = fetchsvn {
-          url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/";
+          url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
           rev = "96";
           sha256 = "17g0bl94qmzalh3m6r6q10q06864d1h1nx5i7fddsamakmg89ziw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m";
-          sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
+          sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0";
           name = "dic-lookup-w3m";
         };
         packageRequires = [ stem w3m ];
@@ -13383,10 +13449,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170324.1112";
+        version = "20170409.1441";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0";
+          sha256 = "0bjpz9zaq6b158964b37llrn6jakfhzai8ahwyi8d6jsf392hljp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13685,17 +13751,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }:
+    dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }:
     melpaBuild {
         pname = "dirtree";
         version = "20140129.32";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/dirtree.el";
-          sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "dirtree";
+          rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251";
+          sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/343a34103fd435e01bb64e90536cc1e4da4e83c4/recipes/dirtree";
-          sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree";
+          sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9";
           name = "dirtree";
         };
         packageRequires = [ tree-mode windata ];
@@ -14580,24 +14648,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "dos";
-        version = "20140808.1435";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/dos.el";
-          sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c536abcb5a544e22bb339effa5bf39df96c12b9/recipes/dos";
-          sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
-          name = "dos";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/dos";
-          license = lib.licenses.free;
-        };
-      }) {};
     dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dot-mode";
@@ -14935,13 +14985,13 @@
         pname = "dsvn";
         version = "20130120.1257";
         src = fetchsvn {
-          url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1789422";
+          url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
+          rev = "1790830";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/dsvn";
-          sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dsvn";
+          sha256 = "0fl23fcnf4x9gm51761551cyr3i9954k0d5nq2c99nxzrajbnyk6";
           name = "dsvn";
         };
         packageRequires = [];
@@ -15037,12 +15087,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170328.2013";
+        version = "20170330.1409";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "1df89e837d4c28c941db879b028f92b3378745d8";
-          sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49";
+          rev = "1c8d705178607e7175341816f4a20ebd36480329";
+          sha256 = "1lav31cmnyzxpqwv74nwhld9rpjz7wl197cslzjl171ca5n322vm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15414,12 +15464,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170328.2015";
+        version = "20170409.2149";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a";
-          sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz";
+          rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28";
+          sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
@@ -15561,12 +15611,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170327.141";
+        version = "20170401.1342";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "1eea156ea6f1376d474274ce76b1d6864223c47e";
-          sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb";
+          rev = "a1c8a5045ff31001f0a0dde188e20f23640f5469";
+          sha256 = "1awrkcqk38aash3whihhjrxq9f9b568vpiaihyhcsi0773hl5h3b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15810,12 +15860,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "20170221.1002";
+        version = "20170406.609";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "8ab5c333ded9110ed2dce90ca7fd89dcb3912dd4";
-          sha256 = "127a5rf21ynw96lw1ydzdvpjpxzccn3dhvc6f24s96sg8r04hpbw";
+          rev = "2aae77b5ca2ce458f56fe67a33d5e84bb9428e5d";
+          sha256 = "1vsmpvip4dwj1jwvj5iswci14xky4mrfpqgh1g8i56p5ql9ifsmr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -16201,8 +16251,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "b196db4ca284abfbc63416582fe17cc357551fc2";
-          sha256 = "0sw0cf69yswhgnyp10qjirrb2w2p9y6pc7ni8wbw8l16pmc7vgg0";
+          rev = "a9bec9b4cdaec8fa92bec398c4c5231817e7efad";
+          sha256 = "146jq14xjab996r5ff9nschbrh4zk7grggnj7xm8bxwnr9yv0qv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16238,11 +16288,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170213.1254";
+        version = "20170407.1229";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "66d4490ec38dd992ba90b3801879d3f0ff312635";
-          sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq";
+          rev = "d15589a117ac710b70df71cdf33a33ca05e55d13";
+          sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
@@ -16279,12 +16329,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170322.650";
+        version = "20170407.618";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "2547226f2ee32726809a3a603e6797492896f170";
-          sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6";
+          rev = "39f5d329f188759662f703cc587a9973bda0aa5a";
+          sha256 = "0lais4n817lizqpjv90ajijh8dwa9znc4ib57v8y20g76yffq1gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16396,8 +16446,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "b47a94877b8b621534403a533ad147a971caaf89";
-          sha256 = "0qhy7bxgs8gbbjww438jmmqhz20aczp3bvdpbywbwcmfkadv6086";
+          rev = "cdd39a51aab1ed23ac7195297eb986fc482e8c42";
+          sha256 = "0av2lpj1rij8mcf0jxdfm6pm6pwrv1wzh095z8vsfcdda8svznxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16480,8 +16530,8 @@
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "26d1b4f7920ca32e0e76a3ffa23784a80253c9f4";
-          sha256 = "0rk1qvgdnx1xn7pmb2713i68xm05kp3cfkwvd5smbkzjj2nvbi20";
+          rev = "c0f1c01a82903a1d7f5d49eba6d9e9d373423907";
+          sha256 = "0kj4rbn86v9hjkshpyn65cmyhrnmg3s6ir6p4ricnhzv11rgkx6y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16848,12 +16898,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170305.1633";
+        version = "20170402.1842";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
-          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
+          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16918,12 +16968,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "20170125.1846";
+        version = "20170402.1842";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
-          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
+          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17048,8 +17098,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26";
-          sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y";
+          rev = "54b6221a06a32075d1d0c991f75f53c6c792830e";
+          sha256 = "1xzm86l37fjiknqbsdv14n70mgaw0105i55fbl4rf0p9q4nircmv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17380,12 +17430,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170324.227";
+        version = "20170401.1152";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f";
-          sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2";
+          rev = "9d143d1e85d6d05792e4557393edeeb155fc950e";
+          sha256 = "0wbvym7jal2n45pqd1nf10009cxlfffdsyip7yv1fixbb6b39y5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17976,13 +18026,13 @@
         pname = "emms";
         version = "20170301.1406";
         src = fetchgit {
-          url = "git://git.sv.gnu.org/emms.git";
+          url = "https://git.savannah.gnu.org/git/emms.git";
           rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a";
           sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
-          sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
+          sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
           name = "emms";
         };
         packageRequires = [];
@@ -18078,12 +18128,12 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20170322.830";
+        version = "20170330.904";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff";
-          sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94";
+          rev = "7c3dc98e86a178c217bec74fb1e5da7de00fded9";
+          sha256 = "0xdqi3fi26pj166z2f1fpl9ckdma9rsck324ha343r2y3snfzch0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18246,12 +18296,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170323.730";
+        version = "20170401.954";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "9ce171d38915c81ba0f387e013aad2e089d61d48";
-          sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f";
+          rev = "4f365dc562c8c5642719faf85b7536278c561d2e";
+          sha256 = "0j3ydg2n6dq77qpyhyqdkbxhfhzmml5b5h8cghsx0i5267grssph";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18468,12 +18518,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170318.1059";
+        version = "20170401.257";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "9ccf54cddb1d7884f36de9d7d077cee55eae410e";
-          sha256 = "0y6v9bmhspfmr3bmqf5av4n1xdwj0nx9fws0gw8n9ln92yz6w3sz";
+          rev = "bb09141e7e2a25947f891008cf6036525c8ed484";
+          sha256 = "15r76hmibpyvz87mwi9qzyn63l7k4ab5bhx5g5ziaak8q3vwwibl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19109,8 +19159,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c";
-          sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b";
+          rev = "a7307600a2b8dbcf628ae8ccf26137bc32f060cc";
+          sha256 = "0q07c7h6pzfl72i8vfb9j9l069zjblfclcxl9bnmci9kzj7ghmrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19165,16 +19215,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "ert-expectations";
-        version = "20130824.500";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/ert-expectations.el";
-          sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
+        version = "20121009.34";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "ert-expectations";
+          rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6";
+          sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55809f1a04061a26665d2995975aba429815c19e/recipes/ert-expectations";
-          sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations";
+          sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn";
           name = "ert-expectations";
         };
         packageRequires = [];
@@ -19266,22 +19319,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }:
+    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170307.2136";
+        version = "20170410.354";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "527a2f70e1de7df46e59609b245e7e99c53708d1";
-          sha256 = "19kss3hrjf1cj4lgj68qw5zszar7c7pjbqj8sxlwicnrg831mj0n";
+          rev = "25a7361365d25ad6823b99913be72d1b724083b3";
+          sha256 = "0lqxk54443x0ccxr745k5dlq6zh4kqc1dmnhh6dqcnfyc4amqs0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [ cl-lib dash s spark ];
+        packageRequires = [ cl-lib dash request s spark ];
         meta = {
           homepage = "https://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -19630,8 +19683,8 @@
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "espuds";
-          rev = "ef854367d469c6eff459d24a544addd21a4fbd23";
-          sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q";
+          rev = "67a77b92f23f9016d133543de93bfbe1b2f9a818";
+          sha256 = "0xmcdw5hw6dmcmwjp1jvdvh2ijymlkcksjscm28cj442s4sarqgs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20163,22 +20216,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-colemak-basics";
-        version = "20161117.1319";
+        version = "20170405.1037";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-colemak-basics";
-          rev = "5e56117af85e89659e9565abefef24fab7b567e8";
-          sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz";
+          rev = "207fddde50e36fc3ccd926c69ef7901e938db2ff";
+          sha256 = "06r0x6yvwa811sfb9izzld4a460wip7nn6dfxw91i6x8g825h2qd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
           sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
           name = "evil-colemak-basics";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs evil evil-snipe ];
         meta = {
           homepage = "https://melpa.org/#/evil-colemak-basics";
           license = lib.licenses.free;
@@ -20208,12 +20261,12 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "20161015.1251";
+        version = "20170410.227";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e";
-          sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg";
+          rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
+          sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -20628,12 +20681,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170312.2052";
+        version = "20170405.1418";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "62378695eb45990dec776864e16c28829136aeb6";
-          sha256 = "196ii51malqh2ahfk13rj6p4np0755zhx4pdk18090pwl4hgkzfz";
+          rev = "79f5755a65018d8e9798f52e595771e7abbbed2d";
+          sha256 = "17xx4m6j5dcgd33pjqlra5xfqwx1hdhrwqy2mqbykzxpbmadlmph";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20691,12 +20744,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "20161010.1703";
+        version = "20170408.1744";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "e2df8629971df7c905256c504ff5f90b94eebdb8";
-          sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn";
+          rev = "615f2ac3539c39d5ec11e4c9ba0958d8a9381090";
+          sha256 = "068cymahvpyzn13wnma0lfym0f0vfr36kdq7pl8qmhf8ra7xxq92";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -20884,8 +20937,8 @@
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-rsi";
-          rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
-          sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
+          rev = "65ae60866be494e4622fe383e23975e04d2a42a3";
+          sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi";
@@ -20905,8 +20958,8 @@
         src = fetchFromGitHub {
           owner = "juanjux";
           repo = "evil-search-highlight-persist";
-          rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc";
-          sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j";
+          rev = "1b130e771fc9f3bb7c80e1a50c2847a9e024ad09";
+          sha256 = "1la7gamv1qd5wsdlxjjx859zciynln3g9lnxq51iylsbfxgc2f7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist";
@@ -20943,12 +20996,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170328.1011";
+        version = "20170405.1644";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "3579123acb130e18e9bd8ff3b3029f7052528a32";
-          sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087";
+          rev = "c3e5e26c14f4a47daedb4fc48e1b0fb993aa0999";
+          sha256 = "009491hskqkvycng70n3mm7zqxlf6jjninddlcbnknyfr44y4xka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21048,12 +21101,12 @@
     evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-terminal-cursor-changer";
-        version = "20160806.2236";
+        version = "20170401.142";
         src = fetchFromGitHub {
           owner = "7696122";
           repo = "evil-terminal-cursor-changer";
-          rev = "918a741c2ad83f3aa3478863d01bf57422eb6009";
-          sha256 = "0wdn2gp93r555p7pp9pw8ma2wfs2gzvb54ncrh3ad0p8v95x1kf5";
+          rev = "b49ca4393d2f3cc6014174950059b36a5cb22949";
+          sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer";
@@ -21591,12 +21644,12 @@
     f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "f";
-        version = "20161002.800";
+        version = "20170404.1039";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "f.el";
-          rev = "4ef57d1539a964a0d02b23becbe9b5e49b805d66";
-          sha256 = "1hymz7chs177pwgfddz6prb18iqj93n1j2xzfszlgl28246939cl";
+          rev = "fabdbd4a4a8caf8684f0fa656f457a03c5dfa4de";
+          sha256 = "1983ymny8329d826kfm5f88na1lym991xnz8wjz4nd1ah52c323x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
@@ -22224,10 +22277,10 @@
       }) {};
     find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "find-dired-plus";
-        version = "20170222.1750";
+        version = "20170409.1832";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
-          sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw";
+          sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -22243,12 +22296,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20161202.2205";
+        version = "20170402.2100";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "08ab38b89d21f528fa7dc18f860191365852959a";
-          sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf";
+          rev = "a81f7d7020d5bdfcc835911d4def6f09301a1f55";
+          sha256 = "167anv3qyslfzyrcq4qnzhdx8zhbj1r0lmrvnp1spsalvcbph9ih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22342,16 +22395,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "findr";
-        version = "20130824.507";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/findr.el";
-          sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
+        version = "20130127.1232";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "findr";
+          rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3";
+          sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/66bba94ec4168441c8e43253c7e1cfd82b613431/recipes/findr";
-          sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr";
+          sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c";
           name = "findr";
         };
         packageRequires = [];
@@ -23081,8 +23137,8 @@
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
-          sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
+          rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4";
+          sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms";
@@ -23308,12 +23364,12 @@
     flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dedukti";
-        version = "20150106.651";
+        version = "20170407.258";
         src = fetchFromGitHub {
           owner = "rafoo";
           repo = "flycheck-dedukti";
-          rev = "717977c0ead0dc6e267ba2164781d92ee016b7b2";
-          sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
+          rev = "ea34af5e677fbf18a40935b531abb1d9aae59f6b";
+          sha256 = "03flfn7caxa8jpp6v3mn1mvs8lf4khcl8nsgd1nb93k7wp9x6l5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti";
@@ -23392,12 +23448,12 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20170323.634";
+        version = "20170403.1116";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3";
-          sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37";
+          rev = "879c52116989f6041ccd20f5db210f5552d5c649";
+          sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -23417,8 +23473,8 @@
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "flycheck-dogma";
-          rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e";
-          sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr";
+          rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74";
+          sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma";
@@ -23959,12 +24015,12 @@
     flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pyflakes";
-        version = "20170325.1258";
+        version = "20170330.1611";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pyflakes";
-          rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43";
-          sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na";
+          rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65";
+          sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes";
@@ -23998,48 +24054,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
+    flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "flycheck-rtags";
+        version = "20170403.957";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
+          sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
+          name = "flycheck-rtags";
+        };
+        packageRequires = [ emacs flycheck rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-rust";
-        version = "20170322.306";
+        version = "20170404.842";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-rust";
-          rev = "ae7c14758c3d33615d981f15951500feb2881b06";
-          sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb";
+          rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053";
+          sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
-        packageRequires = [ dash emacs flycheck seq ];
+        packageRequires = [ dash emacs flycheck let-alist seq ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-rust";
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }:
-    melpaBuild {
-        pname = "flycheck-scala-sbt";
-        version = "20170226.1127";
-        src = fetchFromGitHub {
-          owner = "rjmac";
-          repo = "flycheck-scala-sbt";
-          rev = "2d063d42628baf4cd4f38224013ece5b027db046";
-          sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt";
-          sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg";
-          name = "flycheck-scala-sbt";
-        };
-        packageRequires = [ emacs flycheck sbt-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/flycheck-scala-sbt";
-          license = lib.licenses.free;
-        };
-      }) {};
     flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-stack";
@@ -24064,12 +24120,12 @@
     flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "20170311.1203";
+        version = "20170405.1600";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
-          sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
+          rev = "c4e891ad287c12b83b754ada27b4550fb763c07f";
+          sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -24106,12 +24162,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "20161229.331";
+        version = "20170409.25";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
-          sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
+          rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
+          sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24194,8 +24250,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
-          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -25430,8 +25486,8 @@
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01";
-          sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp";
+          rev = "52d84393c09be34934efe3cf80849d438cffb632";
+          sha256 = "15lq5q0vzzy8hppzxn06wkm843zhnhq922sg0f9bxcnwvs7v2v99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -25468,12 +25524,12 @@
     fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fortune-cookie";
-        version = "20151110.2235";
+        version = "20170407.1517";
         src = fetchFromGitHub {
           owner = "andschwa";
           repo = "fortune-cookie";
-          rev = "9bf0d29358989e1aee61c472bd5204b9bdf46465";
-          sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
+          rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
+          sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
@@ -25759,22 +25815,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170329.953";
+        version = "20170408.1115";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e";
-          sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw";
+          rev = "88ac69fbe056972ac92f8f941aade79147df2124";
+          sha256 = "1pm8zjvfdi2qgm0313flmgwjkc7yb1k4h85kw3m0d6g02g5s9rfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
-        packageRequires = [ company dash emacs ];
+        packageRequires = [ company dash emacs flycheck quick-peek yasnippet ];
         meta = {
           homepage = "https://melpa.org/#/fstar-mode";
           license = lib.licenses.free;
@@ -25908,12 +25964,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170216.138";
+        version = "20170408.908";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9";
-          sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3";
+          rev = "dfc095d0cbb77cbdee5005bbfaea10257eea059b";
+          sha256 = "090j76qfj32i9r96cqv8kp57g9mfj3w50a125gx8h1xknqb7831a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26723,8 +26779,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
-          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26866,12 +26922,12 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "20160203.2237";
+        version = "20170403.418";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
-          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
+          rev = "77e74e8575e3be49ff19b9d79bd4b8d9d8a662e0";
+          sha256 = "1axh9v1svb6353g2mqkfk9d0b7q1g4rkscw6nj1g9z72ix4rmnch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -27475,12 +27531,12 @@
     gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnu-apl-mode";
-        version = "20170123.248";
+        version = "20170406.732";
         src = fetchFromGitHub {
           owner = "lokedhs";
           repo = "gnu-apl-mode";
-          rev = "ffa5fec15971ccec0b19f759c9191cac9ee851eb";
-          sha256 = "0hlzdvm7d0r9jh4cv9ff1wdjyfffr2417kkq0mlbv0bvqczwdd8b";
+          rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16";
+          sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -27686,8 +27742,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
-          sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
+          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
+          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28481,8 +28537,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3";
-          sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm";
+          rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
+          sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29008,12 +29064,12 @@
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20161017.1108";
+        version = "20170330.1211";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "ac87018437667c84fb5bb7e7b17e5ab2c8347272";
-          sha256 = "0gw06d9h0fn9jds8vk8dkz8ghf62jrjmxj8q0qlaisdipmdqk87n";
+          rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa";
+          sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29701,12 +29757,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170325.553";
+        version = "20170406.25";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a";
-          sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2";
+          rev = "8165d8a809c21e220a257806ebe88180cbc8694a";
+          sha256 = "1vx6liapkkfsd678nmlsx3r641v2vxxbqk82cw6cqanzp3i5p7y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29805,12 +29861,12 @@
     haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "haxe-imports";
-        version = "20160814.52";
+        version = "20170330.1604";
         src = fetchFromGitHub {
           owner = "accidentalrebel";
           repo = "emacs-haxe-imports";
-          rev = "0fbd5d26f976bcf70bf26e685b2c3c0dc465a058";
-          sha256 = "0hkyhj29imn1hrjabqjwqlj47qdwigcyclic3k3bigk06pjwalmh";
+          rev = "164e9d2b6ce420dda543d8dade27d2f28d347132";
+          sha256 = "1ymg128qpr325hakjw3b9jckq87k8nhk8jlx8hdqa1yx6rv0lfda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports";
@@ -29969,12 +30025,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170329.1221";
+        version = "20170409.1155";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
-          sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
+          rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
+          sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30557,12 +30613,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170329.1221";
+        version = "20170410.557";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
-          sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
+          rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
+          sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30914,12 +30970,12 @@
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20170110.957";
+        version = "20170404.1230";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75";
-          sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk";
+          rev = "c8650d9b34afbc236c28aee12cbee998fda8d810";
+          sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -31229,12 +31285,12 @@
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20170318.527";
+        version = "20170407.1156";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "27e619d3bd9974a8e1aebd2e10ebf658f49e620b";
-          sha256 = "01bw1papl2cblqd6kciw9aha7jkj3rilxb8mzi0avpxgm1g3d1fb";
+          rev = "b3f10af10075f1982434d4c27c5933124940942a";
+          sha256 = "102g8yb15rpyxs4pndqqbskg4b8g8ssqk9wfxs9zlyah5qcb2m33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -31397,12 +31453,12 @@
     helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hunks";
-        version = "20170225.602";
+        version = "20170406.257";
         src = fetchFromGitHub {
           owner = "torgeir";
           repo = "helm-hunks.el";
-          rev = "1ea40753244ec843f38481b0889bb7d0e8db6619";
-          sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3";
+          rev = "287685254002d47432f267884ac6a83de67ea07c";
+          sha256 = "0gfly5wv391cw7dpixxik0nqs2f7h1n8102pijjipk3g79f1f1ic";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -31648,12 +31704,12 @@
     helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-make";
-        version = "20170206.1323";
+        version = "20170409.44";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "ed406557c814bb2521cf826370e57ffe9d40d33e";
-          sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k";
+          rev = "3a5da626247095d8c1350e50a39736e3bf0db771";
+          sha256 = "1aaw6c3mw064g0ym5vz2fibq7csabqvgc8lx7wwsl35jbcx3y29c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31750,6 +31806,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }:
+    melpaBuild {
+        pname = "helm-navi";
+        version = "20170402.752";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-navi";
+          rev = "2256591174ff79f889450fdc10822316819d6476";
+          sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi";
+          sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks";
+          name = "helm-navi";
+        };
+        packageRequires = [ emacs helm navi-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-navi";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
     melpaBuild {
         pname = "helm-nixos-options";
@@ -31816,12 +31893,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170322.1209";
+        version = "20170409.1055";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904";
-          sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl";
+          rev = "07313ddf77cd38355b77a3fa0b46be998de38732";
+          sha256 = "0rscnb9lws9y6x0ggg03ran2vjpn7a61rywz3y1vvr5skf2nhs9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32152,12 +32229,12 @@
     helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-rage";
-        version = "20161201.222";
+        version = "20170331.607";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-rage";
-          rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381";
-          sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb";
+          rev = "67c62eafe8af70b330895576dcb004e45c93a98a";
+          sha256 = "0rrrkz092h7cikcafwf6blkyqsb6qwq1mkw8k4mbb8vy9bp9mx0b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32317,6 +32394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "helm-rtags";
+        version = "20170402.653";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
+          sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n";
+          name = "helm-rtags";
+        };
+        packageRequires = [ helm rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-rubygems-local";
@@ -32597,8 +32695,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "9c7204ea9d7ce232ce3ff88107854c219397528c";
-          sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy";
+          rev = "6c0a61fc31c88577dc701d9d9010367a2873439c";
+          sha256 = "1xahmb3a44iiip2fls4wfkxns08b4y2bq6jwd20ylpccj48qxmjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -33037,16 +33135,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "hide-lines";
         version = "20151127.1040";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/hide-lines.el";
-          sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "hide-lines";
+          rev = "331122bf19361130351cfe55968c2a7820329eb3";
+          sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4e010b04a4c5dddc3f7259fad929e4cb66760d/recipes/hide-lines";
-          sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
+          sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
           name = "hide-lines";
         };
         packageRequires = [];
@@ -33910,12 +34011,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170315.1829";
+        version = "20170405.1248";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "9b671c6ca7a2d76338d6f4e38966e9cdb78bd991";
-          sha256 = "1v3bd43kaihwbxvflg5kfiw2wmwjmvh5hhdzmdjlvmvqrhwsnxdc";
+          rev = "ff2b2f4afa7a449c7f01defc4227897cd9e6ae8b";
+          sha256 = "0ry8cxki1vhc9h4fkbjdglnx6rcm1wi3ws5bw6pvz20g4jvsz0iw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -34304,16 +34405,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "http-post-simple";
         version = "20131010.2058";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/http-post-simple.el";
-          sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "http-post-simple";
+          rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f";
+          sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d1df16d1c429c46ea5555021ce84d050007adfb/recipes/http-post-simple";
-          sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple";
+          sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s";
           name = "http-post-simple";
         };
         packageRequires = [];
@@ -34700,7 +34804,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170303.1455";
+        version = "20170409.1830";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -35904,12 +36008,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170325.2346";
+        version = "20170330.2134";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "4e802769559153b975f1b24d5a28bc80d212c807";
-          sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f";
+          rev = "431c06844bfb1c99b49f494aa73df3e699b48f30";
+          sha256 = "0aza4r44lxzs4fjiqc6y23b7s6r1jyvr39dkmw5570gs4lhlij1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36090,12 +36194,12 @@
     inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inherit-local";
-        version = "20161007.724";
+        version = "20170409.949";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "inherit-local";
-          rev = "426f7997af0906013846d20729a499f0ce6db634";
-          sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl";
+          rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
+          sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -36404,12 +36508,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170321.129";
+        version = "20170408.1939";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "04265e68647bbf27772df7b71c9927d451e6256f";
-          sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg";
+          rev = "b501c022f5bc40518db726ff08e544308b6bdc55";
+          sha256 = "1wacvnzg07di939782bg0nbgn81rrfqx5psxq1f9k6clzvn7f26i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36674,12 +36778,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170322.1438";
+        version = "20170404.1127";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb";
-          sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh";
+          rev = "6b9b0aa40614580b007b55f2096f3f12c46d4288";
+          sha256 = "1055rri447fwlqi7dp7dr6h4r48q9ahx76pyv1grxqf30kzv3wc5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36962,12 +37066,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170328.1957";
+        version = "20170410.47";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
-          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37004,12 +37108,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170324.401";
+        version = "20170406.107";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "1dcb258a0207053a33ac207c11f2414aa89daba2";
-          sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i";
+          rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
+          sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37067,12 +37171,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20170302.1033";
+        version = "20170410.24";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
-          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37148,6 +37252,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "ivy-rtags";
+        version = "20170402.653";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
+          sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq";
+          name = "ivy-rtags";
+        };
+        packageRequires = [ ivy rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-todo";
@@ -37279,13 +37404,13 @@
         pname = "jabber";
         version = "20170106.1603";
         src = fetchgit {
-          url = "git://git.code.sf.net/p/emacs-jabber/git";
+          url = "https://git.code.sf.net/p/emacs-jabber/git";
           rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e";
           sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber";
-          sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
+          sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
           name = "jabber";
         };
         packageRequires = [ fsm ];
@@ -37338,12 +37463,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20170321.214";
+        version = "20170410.558";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "7cd363187a8d41fe604925df51169ca9ed32f798";
-          sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp";
+          rev = "9f473f019963e1abae04f958a6c7ec221aa0aacf";
+          sha256 = "19aydkph56bd1gwqcz04viya8cr4wj98yh8kqgn9kfqxrrkkb2ic";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37716,12 +37841,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170326.1333";
+        version = "20170330.21";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "940069c397b6db841acfd21ffd15495388deba7c";
-          sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng";
+          rev = "70ee33d1cb151cff821d31540a6629d21013be04";
+          sha256 = "07hgdp5vl0blgzcs2393lzn285l2s2bf5lvngz6k1xb7zx2zwn93";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38007,12 +38132,12 @@
     jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jpop";
-        version = "20160816.348";
+        version = "20170410.550";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "jpop.el";
-          rev = "485aec3e09e4f01eeb4b737c4de99fadf79e0b31";
-          sha256 = "1a63xzczwb8frr3d4a2z864qq2wx83lgljqbqphkabx99apc749l";
+          rev = "7628b03260be96576b34459d45959ee77d8b2110";
+          sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop";
@@ -38217,12 +38342,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170321.153";
+        version = "20170330.639";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7";
-          sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v";
+          rev = "908395e3aa413b4293b35aab9d41a56f1dbe1e04";
+          sha256 = "1klwg6clx5nvj6755rakzdg62brfms1s8g9cccdkipbb8m6paffh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38322,12 +38447,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20160803.1606";
+        version = "20170402.1808";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "e8ba0c03c5c10f61b8f0b3f5d531ef1d80dec9b0";
-          sha256 = "1j02bg20ngarfwifdxz6al6394rjms2491xh4nlia7d6ihhhrafr";
+          rev = "c528c7784f6449a35a8c90db58cb73125c69987e";
+          sha256 = "0g9zc9sbs3m92qn2jx4nyd0b8s10c1nl92z5rwq9nci5wsmpqxzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -38364,12 +38489,12 @@
     json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "json-rpc";
-        version = "20160427.807";
+        version = "20170402.955";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-json-rpc";
-          rev = "5692192d25eba1b47758272e8de9d67c9ea4aecd";
-          sha256 = "0cbqhijv2zv9mhnjxadr2kbz5b6jcvciwmza22jkwds0nkn2snmp";
+          rev = "e77a62012e4d6c946666eed3a17454d5c6f83367";
+          sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc";
@@ -38470,13 +38595,13 @@
         pname = "jtags";
         version = "20160211.1229";
         src = fetchgit {
-          url = "git://git.code.sf.net/p/jtags/code";
+          url = "https://git.code.sf.net/p/jtags/code";
           rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96";
           sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c083b5368d0c0682e9e92fe6e027c9be0e0af0f1/recipes/jtags";
-          sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags";
+          sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7";
           name = "jtags";
         };
         packageRequires = [];
@@ -38763,8 +38888,8 @@
         src = fetchFromGitHub {
           owner = "wsgac";
           repo = "kanji-mode";
-          rev = "5e9d5b72468ece11cfb81b729be6babf63ede425";
-          sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy";
+          rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2";
+          sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode";
@@ -38780,12 +38905,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170329.649";
+        version = "20170407.1037";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "be544a81cff86ab1b54ad673b9229185882ca998";
-          sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya";
+          rev = "26f631dd8bfbfe7d2bf1006c477a7f29ae9fb365";
+          sha256 = "0sr86hw311j1pwcldg00mwwfq6c2qpqimnfnwhr24nx3q8z0c7ym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38882,16 +39007,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "key-chord";
         version = "20160227.438";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/key-chord.el";
-          sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "key-chord";
+          rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83";
+          sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b38ec88553f9b1dfa11b0ce82433b450eb47ebce/recipes/key-chord";
-          sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
+          sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
           name = "key-chord";
         };
         packageRequires = [];
@@ -39285,8 +39413,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44";
-          sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih";
+          rev = "46a687a4d5965290c2907cfc9e99812b358ac3bf";
+          sha256 = "0s0d097k4l6hqqs8mq1syf1529gm62qiwd4lgib7qkkabf4miq24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39362,22 +39490,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
+    kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170226.1627";
+        version = "20170409.1909";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "60141505ca027231866f7032c557afd7d085b35f";
-          sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93";
+          rev = "9af03ee3e772458061b893b9362259f6f8ad0f3a";
+          sha256 = "1185693h5zfzcfzs1n5xjzh3jxmhlsjr7q7knc19dzmkdf1vxal4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
           sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5";
           name = "kodi-remote";
         };
-        packageRequires = [ json let-alist request ];
+        packageRequires = [ elnode json let-alist request ];
         meta = {
           homepage = "https://melpa.org/#/kodi-remote";
           license = lib.licenses.free;
@@ -39470,12 +39598,12 @@
     kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kotlin-mode";
-        version = "20160720.1339";
+        version = "20170403.826";
         src = fetchFromGitHub {
           owner = "Emacs-Kotlin-Mode-Maintainers";
           repo = "kotlin-mode";
-          rev = "9e2e4c11fe3a9e8f63ce351762a2b1ac5dbe8a75";
-          sha256 = "0yzhizxb8g0zlnx97vnaqvv0pm2mx4jg7qc2hnfvc5ya02yxhc6p";
+          rev = "e5c6d845e689ed0623b864ff863cc99ca558b442";
+          sha256 = "0add2vi13caxgcxgl2yxdjccjmszs0918jm70084ry3iih8ljl37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -39551,6 +39679,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "kubernetes";
+        version = "20170410.353";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "kubernetes-el";
+          rev = "53f83a2e553647292191738ac65b1b930da748bd";
+          sha256 = "0zv17x2srqflpqf6xqi4qwz81ajghq6xv0fxprb35b4v7j5x3zzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
+          sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+          name = "kubernetes";
+        };
+        packageRequires = [ dash emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/kubernetes";
+          license = lib.licenses.free;
+        };
+      }) {};
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
@@ -39740,12 +39889,12 @@
     lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170327.352";
+        version = "20170405.417";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0";
-          sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn";
+          rev = "69e1ab9fec515c3fedc9230d7c2ef6d0b3d2ff36";
+          sha256 = "1dpl52plihsy8m4qgrj1fzms7q1fny8dr2qi9llg9j9m5apg3i0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40219,16 +40368,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "levenshtein";
-        version = "20051013.1056";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/levenshtein.el";
-          sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
+        version = "20090830.340";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "levenshtein";
+          rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c";
+          sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dd530e23d6de5a592faf4fec7394d052ff440a8b/recipes/levenshtein";
-          sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein";
+          sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl";
           name = "levenshtein";
         };
         packageRequires = [];
@@ -40578,12 +40730,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170326.801";
+        version = "20170409.48";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "15301856dbefe5138f14ade673df4a574cf15eae";
-          sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx";
+          rev = "b5f6777fde363723fd82387cf5eaa5182a8b781d";
+          sha256 = "1c1azl4q1frh3d5i58h9ar4lj8nfy920xsvvwbmjlpb4d54di9f7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40999,8 +41151,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57";
-          sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p";
+          rev = "af6290684b9dc470d885ed1d6c04185034130e04";
+          sha256 = "1wafp2iv6qvsmh37jpmrsjw0dkm3axraz2my7cr37vcalwc5ib04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41121,12 +41273,12 @@
     log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "log4e";
-        version = "20150105.505";
+        version = "20170401.604";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "log4e";
-          rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb";
-          sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
+          rev = "34309972ad02abcebbcff6b1682731978aef030c";
+          sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e";
@@ -41144,13 +41296,13 @@
         pname = "log4j-mode";
         version = "20160108.1118";
         src = fetchgit {
-          url = "git://git.code.sf.net/p/log4j-mode/code";
+          url = "https://git.code.sf.net/p/log4j-mode/code";
           rev = "26171b1e723502055e085393b0ecdcb6db406010";
           sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39321e054925a8de854942fec4ed8e7570099fc6/recipes/log4j-mode";
-          sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode";
+          sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms";
           name = "log4j-mode";
         };
         packageRequires = [];
@@ -41225,12 +41377,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170303.1225";
+        version = "20170331.1156";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "6409991053350ab2d3def61749b92780dd1ed095";
-          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
+          rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
+          sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -41285,16 +41437,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "look-mode";
         version = "20151211.1026";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/look-mode.el";
-          sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "look-mode";
+          rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56";
+          sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/245ded3ee787da7ad5f462fc6f519a963485adb5/recipes/look-mode";
-          sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode";
+          sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig";
           name = "look-mode";
         };
         packageRequires = [];
@@ -41369,12 +41524,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170311.2126";
+        version = "20170409.2355";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "0fc5400562247b5d674ae8d18f78824de12ba6b0";
-          sha256 = "1zmpkpx2nhm1vvdagrp75jz6v3d4n7zv45xp49m81xzqsyw20im0";
+          rev = "69d041662e1b20c1c2e79f6d4be12fc546c733ac";
+          sha256 = "0s335djpfvb05v8gf44ipxikn79b7h6aw1bsvsrhscy9xcf57fml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -41513,22 +41668,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    m-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "m-buffer";
-        version = "20160721.1539";
+        version = "20170407.1441";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "9c45387989bd7d813f15e56ac5d3210f5e44b1c6";
-          sha256 = "1hiasrn3irxg7s413c34zxknml6fsy3yyykkv2lidk19npy6fslh";
+          rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57";
+          sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
           sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
           name = "m-buffer";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ seq ];
         meta = {
           homepage = "https://melpa.org/#/m-buffer";
           license = lib.licenses.free;
@@ -41681,12 +41836,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170329.221";
+        version = "20170410.414";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
-          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41709,12 +41864,12 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "20170211.1601";
+        version = "20170408.1426";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "2437efb93767b352eecf27f5d5e3513e34a395ca";
-          sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f";
+          rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
+          sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -41881,8 +42036,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
-          sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42192,12 +42347,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20160615.1348";
+        version = "20170410.242";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "7a5c6e61462d2d76edcf9231d3cb70a63509269e";
-          sha256 = "19ypnqrdxragnhdxfraxrinbsiamwpmgqgjj35crjnifdcj6lqzz";
+          rev = "8ab9e0bcefb122ef5b931284c6cc329d8f8aaa82";
+          sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka";
@@ -42789,13 +42944,13 @@
         pname = "matlab-mode";
         version = "20160902.459";
         src = fetchgit {
-          url = "git://git.code.sf.net/p/matlab-emacs/src";
+          url = "https://git.code.sf.net/p/matlab-emacs/src";
           rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0";
           sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode";
-          sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode";
+          sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28";
           name = "matlab-mode";
         };
         packageRequires = [];
@@ -43034,12 +43189,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20170113.1308";
+        version = "20170402.244";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9";
-          sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa";
+          rev = "245cb51fc4b67ccfcc3296f82e8e3a74c1a1602e";
+          sha256 = "1kjpl45y3mnksvd938s1hviyxmrq9ayk9rdna8hhgmirk01fhqyf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -43055,12 +43210,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170324.222";
+        version = "20170402.2049";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
-          sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
+          rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
+          sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -43259,6 +43414,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "meson-mode";
+        version = "20170409.522";
+        src = fetchFromGitHub {
+          owner = "wentasah";
+          repo = "meson-mode";
+          rev = "7aae0da7523833d85a229ce7875185c90fa39620";
+          sha256 = "167wdmzcxs1i56hlv3daw0dlhc0mya0fz86m6db2cn8gvi0wnpvj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
+          sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
+          name = "meson-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/meson-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "message-x";
         version = "20151029.718";
@@ -44958,12 +45134,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20170323.2254";
+        version = "20170403.2222";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047";
-          sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy";
+          rev = "c57a29933e4a03e0ece8310c51a8bc2143f8b010";
+          sha256 = "0mgxldxb07ixp8jli7j5jgv2b5vfzhvdv9nszqap4hp4iz7hm50f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -45098,16 +45274,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "multi-term";
         version = "20160619.233";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/multi-term.el";
-          sha256 = "0i7gixcyqhd8ajbslfmb58rvdihzfprydwiqr730q9q0yfja36j8";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "multi-term";
+          rev = "f954e4e18b0a035151d34852387e724d87a3316f";
+          sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/multi-term";
-          sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
+          sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
           name = "multi-term";
         };
         packageRequires = [];
@@ -45621,8 +45800,8 @@
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "nameframe";
-          rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
-          sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+          rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+          sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe";
@@ -45638,12 +45817,12 @@
     nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }:
     melpaBuild {
         pname = "nameframe-perspective";
-        version = "20160927.2103";
+        version = "20170405.1819";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "nameframe";
-          rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
-          sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+          rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+          sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective";
@@ -45663,8 +45842,8 @@
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "nameframe";
-          rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
-          sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+          rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+          sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile";
@@ -45970,16 +46149,16 @@
     navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
     melpaBuild {
         pname = "navi-mode";
-        version = "20160327.134";
+        version = "20170402.1210";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "navi";
-          rev = "a6b824ab2591e89e47f7399987f4fb3fa5d9306b";
-          sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h";
+          rev = "ef9b5dd15ef96ed3192774e96cd74ee6cccf8b10";
+          sha256 = "1v0h7chq746x5vwb3fzk4djwgnkl2vg3m7pmnhxsq1nj5kfvw2vx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode";
-          sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
+          sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
           name = "navi-mode";
         };
         packageRequires = [ outorg outshine ];
@@ -46368,12 +46547,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170326.144";
+        version = "20170409.1737";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "dc81622d899976cb7d4515b592972d17d590ca20";
-          sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j";
+          rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41";
+          sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -46389,12 +46568,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170329.538";
+        version = "20170408.1048";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "94c08d19c94924b5f549aff61be84efc46e41126";
-          sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf";
+          rev = "b54285e69c1c27833dda2b50f61985240ae0d4c5";
+          sha256 = "0xir10im940vlj84xi54r0lf1w18pb4dvvqldy1sprgx62iq66z7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46456,8 +46635,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
-          sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
+          rev = "1fe1976e0d68b520f04f8ad4f619bb52c40cef78";
+          sha256 = "02mlf4gmfwwc0fclfx2h4pqs9ahcm7jd4zvr39f0w99b1xrybgf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46582,8 +46761,8 @@
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde";
-          sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7";
+          rev = "18e1506135be031db010292d27ef156e32766017";
+          sha256 = "1lqz9fda24i3zkff9nnj4gndrs2bfql80wvvfisn106a3j0ah1n8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -46725,12 +46904,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "20170325.2314";
+        version = "20170406.700";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "8df429d20d69e5fd914881a71ae3a044d02b392a";
-          sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+          rev = "f7a2f6e6e4757ae6094003b139be9a335eadfef7";
+          sha256 = "11970wjzd8hf3j66fcpyvba7ij7gf9931i584014a72p2y0l7qkg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -46767,8 +46946,8 @@
         version = "20170313.1712";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88";
-          sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2";
+          rev = "ce8c88824ab91882ea50c761b930390953cf2c34";
+          sha256 = "0c6f4qyvwwjp9d6x4v26fdp0kcrz6v42ix7ah0g14h0wa17yf9vi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48128,8 +48307,8 @@
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342";
-          sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
+          rev = "21b81c2358e2a17a636c6494eb084241d06962b7";
+          sha256 = "1241jfckijwimm6b9xfp2rjap5va5hkphcvj3qflkprq2y33y8s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -48149,8 +48328,8 @@
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "537f7191bede7156dae94622e92cec04c6cd4bdf";
-          sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
+          rev = "3818c60190eea3c8dc119d6a07531f6b68e7b673";
+          sha256 = "0ha4rxkyahcvpaydk3bi06y519sd9glqjs3a3s87i962h9a20caz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -48170,8 +48349,8 @@
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-scratch.el";
-          rev = "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973";
-          sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
+          rev = "b0f7c39c7e378694191351b234a78abae762fb85";
+          sha256 = "123qxl56d0ikwpjv5i3zh3q7xzd2i34sjgcfb732cg4xfxrpd3bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -48191,8 +48370,8 @@
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-tags.el";
-          rev = "3f88b087d492e8ef742416d6e4bf8be41e5a46c4";
-          sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
+          rev = "f949a062e8dab12e8fda39eec465d53a2f23e314";
+          sha256 = "01nawy8nadi9yspnql4wq8ssn5xgaf34yknxdjyhkswjr3bql3f4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags";
@@ -48226,15 +48405,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170216.754";
+        version = "20170404.2224";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
-          sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
+          rev = "93c188938305533ea34ceca51dd53c7841598ada";
+          sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -48250,6 +48429,7 @@
           json
           popup
           s
+          shut-up
         ];
         meta = {
           homepage = "https://melpa.org/#/omnisharp";
@@ -48548,12 +48728,12 @@
     org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "org-ac";
-        version = "20140302.413";
+        version = "20170401.607";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "org-ac";
-          rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a";
-          sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
+          rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed";
+          sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac";
@@ -48695,12 +48875,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170327.1337";
+        version = "20170403.916";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "53469a2f0577924de1c7d887fecea409d17fd588";
-          sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
+          rev = "1daf7bbd52edec82156f0289d42fc7b190f0bc3a";
+          sha256 = "0sm4gr17yi2iki28yimzk5mffp9xfpafk6abi6c6frxab0x42vg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48734,6 +48914,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-brain = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-brain";
+        version = "20170404.2329";
+        src = fetchFromGitHub {
+          owner = "Kungsgeten";
+          repo = "org-brain";
+          rev = "9424b8002238a1ffb67e78e25bc997826f37dc14";
+          sha256 = "0vn2s8p21kfnabva7ikal87hl4asgdj6hm7597hfx45w60vakn9a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
+          sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c";
+          name = "org-brain";
+        };
+        packageRequires = [ dash emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-brain";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-bullets";
@@ -49073,12 +49274,12 @@
     org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }:
     melpaBuild {
         pname = "org-drill-table";
-        version = "20140117.137";
+        version = "20170408.1205";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "org-drill-table";
-          rev = "d7b5b3743ac04f8cb1087c5c049c0520058fa89c";
-          sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
+          rev = "5662511e98697e086149a223a64f9f01fabf7330";
+          sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table";
@@ -49136,12 +49337,12 @@
     org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170327.1847";
+        version = "20170408.2046";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7";
-          sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z";
+          rev = "a3faf83fe13910596c370a0d4b9a69f9b65f6f99";
+          sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex";
@@ -49453,8 +49654,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
-          sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
+          rev = "133634706541cc22385e79ca08793cc5593f9e21";
+          sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49473,8 +49674,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
-          sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
+          rev = "133634706541cc22385e79ca08793cc5593f9e21";
+          sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49833,12 +50034,12 @@
     org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-random-todo";
-        version = "20170321.804";
+        version = "20170404.318";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-random-todo";
-          rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
-          sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
+          rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0";
+          sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -49902,12 +50103,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170325.703";
+        version = "20170410.635";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4";
-          sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w";
+          rev = "eed76b5e0ae41668349a4d4d756a478e753817f8";
+          sha256 = "1hbsj594plzwn6aym8zchigc4y98bnf9i3izij5rxv9jpiw4bcc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50077,22 +50278,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-table-sticky-header";
-        version = "20170317.1913";
+        version = "20170408.1814";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org-table-sticky-header";
-          rev = "4048357d4ac42885b207677eb6f118e167a0f20f";
-          sha256 = "1x5b931khl89yfnknndqfwhpqqqy6i8fylr59dpsffsrfp7pbqs1";
+          rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b";
+          sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
           sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
           name = "org-table-sticky-header";
         };
-        packageRequires = [ org ];
+        packageRequires = [ emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-table-sticky-header";
           license = lib.licenses.free;
@@ -50896,22 +51097,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "outorg";
-        version = "20160327.132";
+        version = "20170402.1415";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "outorg";
-          rev = "456b1500b560ead633ce723986a48c33fb52ab76";
-          sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf";
+          rev = "c279ad21517b3c0e07950b0c175d9a69f77cfaf3";
+          sha256 = "1l6w6kfwk1519alksxx1d9cgn04ndwldqkmh98df0z1dgc801b2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg";
-          sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
+          sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
           name = "outorg";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/outorg";
           license = lib.licenses.free;
@@ -50920,16 +51121,16 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20161024.2158";
+        version = "20170402.1158";
         src = fetchFromGitHub {
-          owner = "tj64";
+          owner = "alphapapa";
           repo = "outshine";
-          rev = "d45a512d149996ca232c0218e2d6b5bc802285a9";
-          sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh";
+          rev = "87d7ed5e34d9ed515e526a9e8470e62da7300949";
+          sha256 = "1mm22qs0j1cyr95daj1wv961g9y0pcalr21cnryyilyb3g5dgq29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine";
-          sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
+          sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
           name = "outshine";
         };
         packageRequires = [ cl-lib outorg ];
@@ -50983,12 +51184,12 @@
     owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
     melpaBuild {
         pname = "owdriver";
-        version = "20141011.738";
+        version = "20170401.612";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "owdriver";
-          rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86";
-          sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
+          rev = "d934f182bafe29aa16c173440eff3fef08b0ec10";
+          sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver";
@@ -51050,8 +51251,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903";
-          sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9";
+          rev = "c3ac9201777a0a7a5fa572b3504543138f7039eb";
+          sha256 = "1l2v4sh0jhzwngcgx93w85wr5f1d67pbi4sc9ks2csfj9awcw63b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51067,12 +51268,12 @@
     ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-epub";
-        version = "20170328.1131";
+        version = "20170331.114";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3";
-          sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg";
+          rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
+          sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -51193,12 +51394,12 @@
     ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-latex-chinese";
-        version = "20170313.2146";
+        version = "20170401.439";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ox-latex-chinese";
-          rev = "7bc56542dc488d24f22f2653232b1cf5dab17c5f";
-          sha256 = "1hs0rrk8bcyskay945d7phjj5ln8j8gr01qybqnl6a6mfrcpv2b2";
+          rev = "f79d25443987a169a1234f5fbb2bc115cccea33e";
+          sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -51319,12 +51520,12 @@
     ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-qmd";
-        version = "20160606.504";
+        version = "20170402.957";
         src = fetchFromGitHub {
           owner = "0x60df";
           repo = "ox-qmd";
-          rev = "b41ffcf47af1a635596df31d4b0a704f274b5654";
-          sha256 = "1zv8kh7hlskj4g1c4k3cx0hzraal3inn75yzxs08ndvycdsn6cky";
+          rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec";
+          sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd";
@@ -51550,12 +51751,12 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20161014.2251";
+        version = "20170409.2149";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e";
-          sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f";
+          rev = "5ed001d66463ecc8906f773452702e848e09f2d8";
+          sha256 = "1rkbyqabikbgv3zzr0g7f9qqgr4jpf8qh6qvjlivk9wb594dr0qd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -51592,12 +51793,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170324.1727";
+        version = "20170404.751";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
-          sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
+          rev = "a8358b3f8fd8dba1d3a883012e2f8e3614f42af2";
+          sha256 = "1bcx152wkgwvh4w86rgh2hhy07klzjfs97sfr3vc7j00si7ps65i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51987,15 +52188,15 @@
       }) {};
     paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "paredit";
-        version = "20160615.1325";
+        version = "20170405.1149";
         src = fetchgit {
-          url = "http://mumble.net/~campbell/git/paredit.git";
-          rev = "7c27746a8eb259ae24b5dce9380801c4846258f0";
-          sha256 = "02s8cvrpcdp8xr7m8bfgwiy7wl9bc4834jlm071ypzx5xfip3zxd";
+          url = "https://mumble.net/~campbell/git/paredit.git";
+          rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b";
+          sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit";
-          sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
+          sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
           name = "paredit";
         };
         packageRequires = [];
@@ -53012,12 +53213,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170311.716";
+        version = "20170401.218";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "6b3987b6c085da52a4a1e1a8433bd4a6f3f411d4";
-          sha256 = "0w2wmy1mhpjfmm0js5h0nqwwmj2xzpasc1m40slwh0lcm9176w9c";
+          rev = "651fe02ff10eece65c01ac8d286174cc8ffa87fa";
+          sha256 = "1nij6mrz2fm411z97z13dyy38i482dkpj50fjsgnlc9pmggykqnx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -53411,12 +53612,12 @@
     php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
     melpaBuild {
         pname = "php-auto-yasnippets";
-        version = "20170324.914";
+        version = "20170330.1814";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-auto-yasnippets";
-          rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032";
-          sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l";
+          rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5";
+          sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
@@ -53495,12 +53696,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170307.1750";
+        version = "20170405.844";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "c761c97e53d50a015bf8d5d554f4917267b0f6dc";
-          sha256 = "0hy0bzscv3hakldmjynsm9rz91v5lyb7rp20ljzfvbzzbkbxzdai";
+          rev = "11674976ee981bb05fb79c5b6de6973b53d51e98";
+          sha256 = "0d1vz95kplyrymv3i9c5k2p2pg2smrv0bkp3kyrjx73nsq2n981k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -54247,13 +54448,13 @@
         pname = "po-mode";
         version = "20160827.857";
         src = fetchgit {
-          url = "git://git.savannah.gnu.org/gettext.git";
+          url = "https://git.savannah.gnu.org/git/gettext.git";
           rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913";
           sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
-          sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
+          sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
           name = "po-mode";
         };
         packageRequires = [];
@@ -54532,22 +54733,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "pophint";
-        version = "20150930.1034";
+        version = "20170403.701";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "emacs-pophint";
-          rev = "fc02a155e28ae27466bedabc756e75c936b01266";
-          sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
+          rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59";
+          sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
-        packageRequires = [ log4e popup yaxception ];
+        packageRequires = [ log4e yaxception ];
         meta = {
           homepage = "https://melpa.org/#/pophint";
           license = lib.licenses.free;
@@ -54556,12 +54757,12 @@
     poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "poporg";
-        version = "20170303.526";
+        version = "20170403.51";
         src = fetchFromGitHub {
           owner = "QBobWatson";
           repo = "poporg";
-          rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed";
-          sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821";
+          rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a";
+          sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg";
@@ -54619,12 +54820,12 @@
     popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "popup-edit-menu";
-        version = "20170329.452";
+        version = "20170404.725";
         src = fetchFromGitHub {
           owner = "debugfan";
           repo = "popup-edit-menu";
-          rev = "bd823ae3068e053804258697848392492538914c";
-          sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g";
+          rev = "925600a6e29183841199e866cf55e566a6a1b002";
+          sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu";
@@ -54928,12 +55129,12 @@
     prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prassee-theme";
-        version = "20170329.758";
+        version = "20170406.1953";
         src = fetchFromGitHub {
           owner = "prassee";
           repo = "prassee-emacs-theme";
-          rev = "5be0ad067182881012bea5ae352636eaff06b01b";
-          sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf";
+          rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa";
+          sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -55405,12 +55606,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170309.30";
+        version = "20170407.319";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "0c307c8cbf6162fa992bcdbdd1940bf6eff28253";
-          sha256 = "18m35h9r1gs96hkgqmjhkwnlg5dj9knh227n2k9xckg161mld2fg";
+          rev = "323fb845f2da0fc95ac27efd11f4d696f5fe647d";
+          sha256 = "1c0iv9k9sapv4f49qsarivg46xkpw1ckdyh7qizv1ailb3q9faax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -55808,8 +56009,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182";
-          sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0";
+          rev = "efec7571047c680e11354bd30bf8bd3dfda15ff0";
+          sha256 = "1rika22vx05f6jd5a89n31gv62k5r2y31qi9hb5y2ycdghfyd6nz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56568,12 +56769,12 @@
     pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pylint";
-        version = "20160728.1033";
+        version = "20170402.555";
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "da2e9724a195ea48451222457e56fbb9311186da";
-          sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr";
+          rev = "79f45263a8904533160d3fa0d4e69b11d3d7d315";
+          sha256 = "0fcf8yw40nslc5zhl525np6w0y6sghjhsf0bf5vg2p7l2jwf205r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -56929,8 +57130,8 @@
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1";
-          sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27";
+          rev = "a39ab429d6544dff17e933f8d98530da4f8c636f";
+          sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -56985,6 +57186,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quick-peek";
+        version = "20170327.27";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "quick-peek";
+          rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc";
+          sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek";
+          sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq";
+          name = "quick-peek";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/quick-peek";
+          license = lib.licenses.free;
+        };
+      }) {};
     quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quick-preview";
@@ -57097,8 +57319,8 @@
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "40f99f69b46edbf0855c92d908c11e29bf2e817c";
-          sha256 = "18gf9fzn30190mgdgijzqxyh11q1kmx94fixs6c7gv927i8j7whm";
+          rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33";
+          sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -57114,12 +57336,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170315.1216";
+        version = "20170407.858";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "1c2c8964c5d16bf5c4ead2be8d19abc0244f59e6";
-          sha256 = "0cxi81rgqv4ri96gbzr2p2mnwyp3jn3klsvds9jkmgw6dd5q4b8a";
+          rev = "3332895078ebc5e2f547538913eccb1db63ec0ca";
+          sha256 = "09a251m0j8ican0myp96755ykg6z2bp0kgggwbdbg4af6bwz3a13";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -57897,12 +58119,12 @@
     rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rebecca-theme";
-        version = "20170220.1342";
+        version = "20170406.2136";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "c42e33227a18258145156e69627b713b303ee702";
-          sha256 = "0nkf3jf8x95ybw29gwkivfc3pnaiga7awz2mpyjm5bnz4i335mkm";
+          rev = "ddbc2e0ceaa4849ddd284a9265211b61a8777106";
+          sha256 = "0d4yk6gkswfx7hkwgq5s9qc2bi73041fcsigpzvl2q0smb8202cr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -58126,8 +58348,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
-          sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0";
+          rev = "b1167e3a65694f3c40966f73a3e15ae78f48585d";
+          sha256 = "0f7yzyyqa1mpw15wr56p92kmcx2h2m46x6932qk5fhn7zihik97p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -58747,12 +58969,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20170313.939";
+        version = "20170403.1125";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "38603b019b703f6e78f640478ee6412ba743f7b1";
-          sha256 = "0zvknsakxfzkbfi7sg61q1m3484h1a0h6clzxd8hg4xifw6crf9y";
+          rev = "67bbbf0635b252a0c76854036c5d7ad864938a6c";
+          sha256 = "0dyfgwnrxc8yyw743ijpgn2hnmxsfvblw80hj8x66ajb0k3j8lnw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -58993,12 +59215,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170318.657";
+        version = "20170322.1049";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "6c85ce6974b67644dce5a607285f04197fe4874e";
-          sha256 = "09r5rnnwxyqkf9kzpragwqxhhlgpr49kbvxc6ci18bkcs44vvcnw";
+          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
+          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -59249,8 +59471,8 @@
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "a43d56d79a0595374a8414979b758fbea3cab0a8";
-          sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9";
+          rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87";
+          sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -59329,12 +59551,12 @@
     rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "rpn-calc";
-        version = "20170328.349";
+        version = "20170402.1833";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "rpn-calc";
-          rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62";
-          sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb";
+          rev = "4d8aa137b31392a76a0fd4eaf676291029c1aad9";
+          sha256 = "0m373xzxx6ywrxll0qqsnyx55bfp0phbw6mcczz53yw9kpf3mf22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -59392,16 +59614,16 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170329.1245";
+        version = "20170408.1642";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8d868af718f29e7428658fe56979e05659f3a9c3";
-          sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69";
+          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
-          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
+          sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
           name = "rtags";
         };
         packageRequires = [];
@@ -59457,13 +59679,13 @@
         pname = "ruby-additional";
         version = "20161115.2259";
         src = fetchsvn {
-          url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58216";
+          url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+          rev = "58302";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional";
-          sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-additional";
+          sha256 = "0w88hijkr7rjm8ig65n20bqkb1ymqmb3wdwc6bskp26d49w85xjg";
           name = "ruby-additional";
         };
         packageRequires = [ emacs ruby-mode ];
@@ -59537,13 +59759,13 @@
         pname = "ruby-electric";
         version = "20150424.752";
         src = fetchsvn {
-          url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58216";
+          url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+          rev = "58302";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric";
-          sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
+          sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8";
           name = "ruby-electric";
         };
         packageRequires = [];
@@ -59786,12 +60008,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170117.824";
+        version = "20170405.707";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "0de149a9ad04f652cd7a59a9ef67be8a7d86ba76";
-          sha256 = "0cj12mz47k20d2lrnwr81ijbs42wjpdzmw646yghvazdrq23b12h";
+          rev = "19e6f604a0c9d838a1426604d70ce3af0960621d";
+          sha256 = "0phggsdcnjcc8zxw66ida1a6hq8ccqh66islhm6ix1yaycrwvhms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -60189,8 +60411,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "714e14e4a6b8eb62677784de6213e1cde79a6554";
-          sha256 = "0yq86lm8754899lvx9g9w4y34gsw91xw51m9rsk59x7jfd2lfq6x";
+          rev = "e34e519c1276e7f1b299fea40fea2f114c7ef455";
+          sha256 = "09rfxip87iad670xxw0www8ig12qavpjs1ys7x5nzga7aw3apij2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60269,12 +60491,12 @@
     scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scheme-complete";
-        version = "20160604.533";
+        version = "20170410.617";
         src = fetchFromGitHub {
           owner = "ashinn";
           repo = "scheme-complete";
-          rev = "bc7f0bd687c9a6625393053fb6490b4f37c82505";
-          sha256 = "0xa0md847v3qizvf22jrb1rwynrdp7dbxv32rf4vl8yjsh44wspn";
+          rev = "6bf844202cb9e8490ce37a414374be3f04eefca4";
+          sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete";
@@ -60972,17 +61194,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }:
+    sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sentence-highlight";
-        version = "20121026.750";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el";
-          sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
+        version = "20170405.2352";
+        src = fetchFromGitHub {
+          owner = "sbelak";
+          repo = "sentence-highlight";
+          rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa";
+          sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1f41eba284e297177e89b9b7a8da4779eb6fdcba/recipes/sentence-highlight";
-          sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
+          sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
           name = "sentence-highlight";
         };
         packageRequires = [];
@@ -61325,16 +61549,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "shell-command";
-        version = "20090621.632";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/shell-command.el";
-          sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
+        version = "20090830.340";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "shell-command";
+          rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd";
+          sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/shell-command";
-          sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command";
+          sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk";
           name = "shell-command";
         };
         packageRequires = [];
@@ -61385,16 +61612,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "shell-history";
-        version = "20100504.150";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/shell-history.el";
-          sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
+        version = "20100505.139";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "shell-history";
+          rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c";
+          sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/039854cf1b41b18423876170c5f48300bf3fe29a/recipes/shell-history";
-          sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history";
+          sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy";
           name = "shell-history";
         };
         packageRequires = [];
@@ -61713,16 +61943,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "showtip";
-        version = "20080329.1959";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/showtip.el";
-          sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
+        version = "20090830.340";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "showtip";
+          rev = "930da302809a4257e8d69425455b29e1cc91949b";
+          sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/19636728b501dadddaad9743635fd51ceb12cc07/recipes/showtip";
-          sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
+          sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
           name = "showtip";
         };
         packageRequires = [];
@@ -62299,12 +62532,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170328.2044";
+        version = "20170331.2242";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8";
-          sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2";
+          rev = "86756c37968cbbc171e52e416ef656af2a2258a8";
+          sha256 = "1vhcfmyk9swf5h7gka9fbwq2s3x4a540km6wjxqynmpw8c45q154";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63030,12 +63263,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170312.450";
+        version = "20170401.315";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "2acdee84701021049bea0925988df61e340c2311";
-          sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313";
+          rev = "a5f39550d419ca10eb0075f799c0864ade7c88d7";
+          sha256 = "07j9cr06v78xnsfnd9ixpddiap7il3xrd0fpsyxyl9xsb2gp3jgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63386,12 +63619,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20170326.1920";
+        version = "20170406.1736";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "349980879a66493ed421e9c83f4857662267b8df";
-          sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj";
+          rev = "15803162483e635f3e22b2efea33ccad725e0535";
+          sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -64538,16 +64771,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "sr-speedbar";
         version = "20161025.131";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el";
-          sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "sr-speedbar";
+          rev = "77a83fb50f763a465c021eca7343243f465b4a47";
+          sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar";
-          sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
+          sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
           name = "sr-speedbar";
         };
         packageRequires = [];
@@ -64643,12 +64879,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170110.1756";
+        version = "20170406.2158";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d";
-          sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g";
+          rev = "99d14509289943b29c702232076704c11f19a82b";
+          sha256 = "1khgabsmg8vwpvpligvxwgqq275sh33w4704dpwyq1h25jq317bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
@@ -65162,13 +65398,13 @@
         pname = "stumpwm-mode";
         version = "20140130.1816";
         src = fetchgit {
-          url = "git://git.savannah.nongnu.org/stumpwm.git";
+          url = "https://git.savannah.nongnu.org/git/stumpwm.git";
           rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
           sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode";
-          sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
+          sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
           name = "stumpwm-mode";
         };
         packageRequires = [];
@@ -65284,12 +65520,12 @@
     subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "subemacs";
-        version = "20160105.359";
+        version = "20170401.234";
         src = fetchFromGitHub {
           owner = "kbauer";
           repo = "subemacs";
-          rev = "d693919991de6b93f0797daae2a12285e54ae27e";
-          sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
+          rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac";
+          sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs";
@@ -65842,12 +66078,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170328.737";
+        version = "20170410.24";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
-          sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65986,6 +66222,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "symbol-overlay";
+        version = "20170408.449";
+        src = fetchFromGitHub {
+          owner = "wolray";
+          repo = "symbol-overlay";
+          rev = "06c5a46ef7f105ac0281a881b5b4f914e2de314b";
+          sha256 = "1nr564zmi9wsxnpdk3i7hsrpy3dnj9gk153ki2kz3v0fdbkqwy62";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
+          sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis";
+          name = "symbol-overlay";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/symbol-overlay";
+          license = lib.licenses.free;
+        };
+      }) {};
     symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symon";
@@ -67010,6 +67267,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "terminal-here";
+        version = "20170403.547";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "terminal-here";
+          rev = "5f98902c65f0d8130e1ae11b9d1c95bff276962e";
+          sha256 = "0mmjch5jl19dv5y6057vk1wpnialz0ax8wghjmy1xx4yjd1n8rgx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
+          sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj";
+          name = "terminal-here";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/terminal-here";
+          license = lib.licenses.free;
+        };
+      }) {};
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
@@ -67346,12 +67624,12 @@
     theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "theme-looper";
-        version = "20160924.2205";
+        version = "20170330.1829";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "66788db264b3d94f25a077f9a6cecfa1c8ad2c96";
-          sha256 = "1wckby9q7c6xdq0kv0x0fdjr9gplj4an5s3kx78dqrxcjj12a35d";
+          rev = "4c07f6f6e1c733d274e26ed8eb03cc5bb6e9149a";
+          sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper";
@@ -67406,10 +67684,10 @@
     thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
     melpaBuild {
         pname = "thing-cmds";
-        version = "20170307.1538";
+        version = "20170331.1338";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thing-cmds.el";
-          sha256 = "16bfjak7953mhmn7abd3pq8cqh8njir5x5x7acqs8zmd9n9qpni6";
+          sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
@@ -67531,8 +67809,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7";
-          sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1";
+          rev = "2d65c2365f19f637bc732222e71d78727bf0b709";
+          sha256 = "0g347bhy6hppkl4769ahfyw2cbl0dqhv889c0xf8wbzfbsn9kaz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -67588,12 +67866,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170325.602";
+        version = "20170406.2103";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23";
-          sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm";
+          rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
+          sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67888,12 +68166,12 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20160807.2022";
+        version = "20170401.2140";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "b2b154b0cbe495f25de1bd9bccc76666ef209342";
-          sha256 = "1bdd31aravm01ahy3ksgfdm65rknzj2v5a69vnag36ap7lj4ax49";
+          rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28";
+          sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -67930,12 +68208,12 @@
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "20170324.103";
+        version = "20170404.15";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "f0b94e07bb4b32db039088a58578bced29256431";
-          sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h";
+          rev = "d30b57f16d158fa859b0626f5350520f3ee86f44";
+          sha256 = "0q0wshcxn60c87lml2fxrhikrj7zay48ijrwj334yzwp26dvm422";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -68282,8 +68560,8 @@
         src = fetchFromGitHub {
           owner = "chmouel";
           repo = "tox.el";
-          rev = "27a074b21238855ce3c33d22e42d69e2c2921205";
-          sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk";
+          rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
+          sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
@@ -68316,6 +68594,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tql-mode";
+        version = "20170402.1846";
+        src = fetchFromGitHub {
+          owner = "tiros-dev";
+          repo = "tql-mode";
+          rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018";
+          sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
+          sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns";
+          name = "tql-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/tql-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
@@ -68469,16 +68768,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "transpose-frame";
         version = "20151126.626";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/transpose-frame.el";
-          sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "transpose-frame";
+          rev = "011f420c3496b69fc22d789f64cb8091834feba7";
+          sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7682372c9075e19fcef2a2462c30010ee324cd14/recipes/transpose-frame";
-          sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame";
+          sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b";
           name = "transpose-frame";
         };
         packageRequires = [];
@@ -68529,16 +68831,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "tree-mode";
         version = "20151104.531";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/tree-mode.el";
-          sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "tree-mode";
+          rev = "b06078826d5875d74b0e7b7ac47b0d0917610534";
+          sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc67872b6463bebbf06ef9a44521ab2a029fa359/recipes/tree-mode";
-          sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode";
+          sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b";
           name = "tree-mode";
         };
         packageRequires = [];
@@ -69701,22 +70006,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "20170326.515";
+        version = "20170402.143";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
-          sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
+          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
           sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
           name = "uptimes";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/uptimes";
           license = lib.licenses.free;
@@ -69785,12 +70090,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170327.1449";
+        version = "20170405.1028";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
-          sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
+          rev = "103b6518e66d9acb990832f02dca093a7425ca84";
+          sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69831,8 +70136,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309";
-          sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0";
+          rev = "f64e9d2e78ed626216ad29098b23ef200ecdc770";
+          sha256 = "0g01p5qrwiah4z4hahv7a4a4nzrznqcwjnljns1zyk49n63rfrmh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70076,22 +70381,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-darcs";
-        version = "20151225.1228";
+        version = "20170409.623";
         src = fetchFromGitHub {
           owner = "velkyel";
           repo = "vc-darcs";
-          rev = "f9b4cd89ed7eff91009ce27d9e1d2fb555a5efff";
-          sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h";
+          rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d";
+          sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs";
           sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
           name = "vc-darcs";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/vc-darcs";
           license = lib.licenses.free;
@@ -70688,12 +70993,12 @@
     vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vlf";
-        version = "20161030.840";
+        version = "20170330.1613";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "vlfi";
-          rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0";
-          sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8";
+          rev = "eaa362922734a6fc0b1228a040be267faec07d3c";
+          sha256 = "1s2yqknwg02nnsy7b1lr2si4mj8sz3wkm0criqwnbhh380k5sypr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -70832,12 +71137,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20170329.612";
+        version = "20170403.2159";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "cbd1e35375309f0c813b5689a765c483caef6d60";
-          sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d";
+          rev = "95ca5d13f55b7863fe187865c8c4f6e378af11a1";
+          sha256 = "18dxqfkgg2ii6ys6vsi2y7jx26rk3pwh1z3wnqpw225x2jzfz7rv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -70850,16 +71155,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "w32-browser";
-        version = "20170308.1518";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/w32-browser.el";
-          sha256 = "0pp3fl2r5g32qv8ysiwnznpc5na7cqh3vp5mq59yfhv5p6myayxj";
+        version = "20170101.1154";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "w32-browser";
+          rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6";
+          sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser";
-          sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
+          sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
           name = "w32-browser";
         };
         packageRequires = [];
@@ -70927,6 +71235,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "waf-mode";
+        version = "20170403.1240";
+        src = fetchgit {
+          url = "https://bitbucket.org/dvalchuk/waf-mode";
+          rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f";
+          sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode";
+          sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h";
+          name = "waf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/waf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "waher-theme";
@@ -71245,12 +71573,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170320.1240";
+        version = "20170408.1147";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "4d16489eb14e47f3d63b4bdd4d9f7177133a973c";
-          sha256 = "0xgij4ln7r8q56c79m729nayr66bzmlkfbmmy8pr33rca6m66hfr";
+          rev = "f6b8fe78d053a4aba180c4d8037c303f0e4ae453";
+          sha256 = "0wrb88yh26fpl8fg4w9wbvg7xmd6kpsrv3lh79f8q4xzfpl2g56h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -71581,12 +71909,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170315.1055";
+        version = "20170407.605";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
-          sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
+          rev = "bb30f56868ae4888a8ac5a406c7c7ee2ff168f9b";
+          sha256 = "1v50qa611lqj0hjp8v6pnyqvnmljkd0p5g9aj517kv5d7b2rk1dj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -71792,8 +72120,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6";
-          sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd";
+          rev = "8e56c97e19b838a63a79e0a8f69c9c448f04b1ed";
+          sha256 = "0s7y2py0hx0nixqiqz63mj8qb3h8jfpkwrkz6nl093zrxpmby3wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71908,16 +72236,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "windata";
-        version = "20080412.755";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/windata.el";
-          sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
+        version = "20090830.340";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "windata";
+          rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625";
+          sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a813e89fc19130d9cdc68f16bba00a0a501427b/recipes/windata";
-          sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata";
+          sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb";
           name = "windata";
         };
         packageRequires = [];
@@ -72160,8 +72491,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "c5c0bb98b281";
-          sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
+          rev = "e85aef10521f";
+          sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72765,12 +73096,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170124.1342";
+        version = "20170407.251";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "0bd47dc9b570a1526cd3e387280280f20f6a5602";
-          sha256 = "1nl8xgkcvnpp4iwcxvvdr3fb6kz5zjxdvkk6ldnybrcypg0xndsg";
+          rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390";
+          sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -73458,12 +73789,12 @@
     yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaml-mode";
-        version = "20170213.1023";
+        version = "20170406.241";
         src = fetchFromGitHub {
           owner = "yoshiki";
           repo = "yaml-mode";
-          rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e";
-          sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af";
+          rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6";
+          sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -73686,12 +74017,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170326.1030";
+        version = "20170409.2044";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "5043a961215158619199cf03a85a0c063a28c644";
-          sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk";
+          rev = "47f37f70f4748e30010b700b5eca39d5cd063616";
+          sha256 = "0rl0hd6cwa5jvzi3aixws90hvin4p7ppylc4jn7v8cnhy2hckzjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -73789,12 +74120,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170329.1433";
+        version = "20170404.2353";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
-          sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -73862,12 +74193,12 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20170307.906";
+        version = "20170330.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "7ab8df0bd646e0571a4d27cbaa4f62b60f625bad";
-          sha256 = "0qh8d14vpaj6hbhxv8zmr7sg85wfjqb2gf30b56lnrvkl783v50b";
+          rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44";
+          sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -74053,8 +74384,8 @@
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed";
-          sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi";
+          rev = "c7e4d3aa3062aa6c89408720e5b68856a39cd401";
+          sha256 = "0yqb9wbq4ava9i02skyvjh6n1gd9lcp7lz1a2skzihc2hmnjw2jg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -74422,11 +74753,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170326.1630";
+        version = "20170409.2251";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "ef1de4ed0def";
-          sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5";
+          rev = "7b93cb98f370";
+          sha256 = "020rp458a3xgxxd2gb091w1xgd78rl10z9f68y81cxi2gnfv91qb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From 769b991be6c44292c09cc2a6a3f5d882b6110ec0 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 21 Mar 2017 16:49:17 -0400
Subject: [PATCH 0916/1744] openssh: 7.4p1 -> 7.5p1

Release notes are available at https://www.openssh.com/txt/release-7.5.
Mostly a bugfix release, no major backwards-incompatible changes.

Remove deprecated `UsePrivilegeSeparation` option,
which is now mandatory.
---
 nixos/modules/services/networking/ssh/sshd.nix | 2 --
 pkgs/tools/networking/openssh/default.nix      | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 42b50d0426a..bebf4e145ca 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -316,8 +316,6 @@ in
 
         UsePAM yes
 
-        UsePrivilegeSeparation sandbox
-
         AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
         ${concatMapStrings (port: ''
           Port ${toString port}
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 1c66900c06b..79cdac87489 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,8 +21,8 @@ let
   gssapiSrc = fetchpatch {
     name = "openssh-gssapi.patch";
     url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
-        + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa";
-    sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2";
+        + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef";
+    sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3";
   };
 
 in
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
   # Please ensure that openssh_with_kerberos still builds when
   # bumping the version here!
   name = "openssh-${version}";
-  version = "7.4p1";
+  version = "7.5p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
+    sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
   };
 
   prePatch = optionalString hpnSupport

From 669f5819e20a4d21b6054b64e079ac2a555d4b1c Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 1 Feb 2017 00:46:19 -0500
Subject: [PATCH 0917/1744] bcrypt: add required dependency on `six`

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

diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
index 94f04880c8e..8a099983521 100644
--- a/pkgs/development/python-modules/bcrypt.nix
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, isPyPy, fetchurl
-, cffi, pycparser, mock, pytest, py }:
+, cffi, pycparser, mock, pytest, py, six }:
 
 with stdenv.lib;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil";
   };
   buildInputs = [ pycparser mock pytest py ];
-  propagatedBuildInputs = optional (!isPyPy) cffi;
+  propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
 
   meta = {
     maintainers = with maintainers; [ domenkozar ];

From 0168e48186bd5bbb5915bf3c591179cedd28802d Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 31 Jan 2017 23:43:11 -0500
Subject: [PATCH 0918/1744] passlib: switch from insecure pybcrypt to bcrypt

Also propagated bcrypt so that
downstream dependencies are able to use the bcrypt backend.
---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74b00ad6ff2..8201d2bb43e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8774,7 +8774,8 @@ in {
       sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
     };
 
-    buildInputs = with self; [ nose pybcrypt];
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ bcrypt ];
 
     meta = {
       description = "A password hashing library for Python";

From 189479a4ba67fa935a1d407f4a4b87837fc53456 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 2 Feb 2017 17:59:39 -0500
Subject: [PATCH 0919/1744] radicale: Add NixOS test with Python 2

Includes testing bcrypt authentication.
---
 nixos/tests/radicale.nix | 70 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 nixos/tests/radicale.nix

diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
new file mode 100644
index 00000000000..ea834d2768d
--- /dev/null
+++ b/nixos/tests/radicale.nix
@@ -0,0 +1,70 @@
+let
+  port = 5232;
+  radicaleOverlay = self: super: {
+    radicale = super.radicale.overrideAttrs (oldAttrs: {
+      propagatedBuildInputs = with self.pythonPackages;
+        (oldAttrs.propagatedBuildInputs or []) ++ [
+          passlib
+        ];
+    });
+  };
+  common = { config, pkgs, ...}: {
+    services.radicale = {
+      enable = true;
+      config = let home = config.users.extraUsers.radicale.home; in ''
+        [server]
+        hosts = 127.0.0.1:${builtins.toString port}
+        daemon = False
+        [encoding]
+        [well-known]
+        [auth]
+        type = htpasswd
+        htpasswd_filename = /etc/radicale/htpasswd
+        htpasswd_encryption = bcrypt
+        [git]
+        [rights]
+        [storage]
+        type = filesystem
+        filesystem_folder = ${home}/collections
+        [logging]
+        [headers]
+      '';
+    };
+    # WARNING: DON'T DO THIS IN PRODUCTION!
+    # This puts secrets (albeit hashed) directly into the Nix store for ease of testing.
+    environment.etc."radicale/htpasswd".source = with pkgs; let
+      py = python.withPackages(ps: with ps; [ passlib ]);
+    in runCommand "htpasswd" {} ''
+        ${py}/bin/python -c "
+from passlib.apache import HtpasswdFile
+ht = HtpasswdFile(
+    '$out',
+    new=True,
+    default_scheme='bcrypt'
+)
+ht.set_password('someuser', 'really_secret_password')
+ht.save()
+"
+    '';
+  };
+
+in import ./make-test.nix {
+  name = "radicale";
+
+  # Test radicale with bcrypt-based htpasswd authentication
+  nodes = {
+    py2 = { config, pkgs, ... }@args: (common args) // {
+      nixpkgs.overlays = [
+        radicaleOverlay
+      ];
+    };
+  };
+
+  testScript = ''
+    for my $machine ($py2) {
+      $machine->waitForUnit('radicale.service');
+      $machine->waitForOpenPort(${builtins.toString port});
+      $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');
+    }
+  '';
+}

From 8ce337fd965d6089178b9198e235747f82bf5844 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 31 Jan 2017 23:16:13 -0500
Subject: [PATCH 0920/1744] radicale: Remove optional deps on Python 3

None of these dependencies is required for radicale to function,
and flup in particular prevents usage with Python 3.
---
 pkgs/servers/radicale/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 47bdad75343..4e0ff0c23f6 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
     pythonPackages.flup
     pythonPackages.ldap
     pythonPackages.sqlalchemy

From 9821f82d7cff4bd56b6b4156628b6ed6adf4fc1f Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 11 Feb 2017 15:34:46 -0500
Subject: [PATCH 0921/1744] radicale: Disable tests on Python 3

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

diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 4e0ff0c23f6..b7282a36baf 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
     pythonPackages.sqlalchemy
   ];
 
-  doCheck = true;
+  doCheck = !pythonPackages.isPy3k;
 
   meta = with stdenv.lib; {
     homepage = http://www.radicale.org/;

From a3143b18e00f18a7fff1cb6181d4feaeffd24142 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 11 Feb 2017 15:28:38 -0500
Subject: [PATCH 0922/1744] radicale: Also run NixOS test on Python 3

---
 nixos/tests/radicale.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index ea834d2768d..f0d46d48a75 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -58,10 +58,19 @@ in import ./make-test.nix {
         radicaleOverlay
       ];
     };
+    py3 = { config, pkgs, ... }@args: (common args) // {
+      nixpkgs.overlays = [
+        (self: super: {
+          python = self.python3;
+          pythonPackages = self.python3.pkgs;
+        })
+        radicaleOverlay
+      ];
+    };
   };
 
   testScript = ''
-    for my $machine ($py2) {
+    for my $machine ($py2, $py3) {
       $machine->waitForUnit('radicale.service');
       $machine->waitForOpenPort(${builtins.toString port});
       $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');

From 8f4d778509271c8cd1e1b8ab1f01c2de038cc7ba Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Mon, 20 Mar 2017 12:13:27 -0400
Subject: [PATCH 0923/1744] radicale: Add aneeshusa as maintainer

---
 nixos/modules/services/networking/radicale.nix | 2 ++
 nixos/tests/radicale.nix                       | 5 +++--
 pkgs/servers/radicale/default.nix              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index f9300fdabc5..ef860e7e5df 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -57,4 +57,6 @@ in
       serviceConfig.Group = "radicale";
     };
   };
+
+  meta.maintainers = with lib.maintainers; [ aneeshusa ];
 }
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index f0d46d48a75..4c2ed8456dd 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -48,8 +48,9 @@ ht.save()
     '';
   };
 
-in import ./make-test.nix {
+in import ./make-test.nix ({ lib, ... }: {
   name = "radicale";
+  meta.maintainers = with lib.maintainers; [ aneeshusa ];
 
   # Test radicale with bcrypt-based htpasswd authentication
   nodes = {
@@ -76,4 +77,4 @@ in import ./make-test.nix {
       $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');
     }
   '';
-}
+})
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index b7282a36baf..a701ad5d833 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     license = licenses.gpl3Plus;
     platform = platforms.all;
-    maintainers = with maintainers; [ edwtjo pSub ];
+    maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
   };
 }

From 4a4719c6ec37cf8f36d52c992f247b6e05734fe5 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Mon, 10 Apr 2017 20:54:23 -0400
Subject: [PATCH 0924/1744] keepassx-community: 2.1.3 -> 2.1.4

KeePassXC has a new bugfix release available: https://github.com/keepassxreboot/keepassxc/releases/tag/2.1.4
---
 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 a5defaf5c29..e103f62fd3c 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1zamk3dc44fn61b880i3l1r0np2sx2hs05cvcf2x4748r3xicacf";
+    sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8";
   };
 
   cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];

From 288a79187cdb6e92c8354b3e06cebbdc8ad65d4a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 7 Apr 2017 23:05:04 +0200
Subject: [PATCH 0925/1744] tesseract: Reintroduce enableLanguages

I've removed that attribute in 68bc260ca2d71a676dd6afdb3524d4fff483016b,
because the language files no longer were distributed as seperate files,
but if we for example only want to use the English training data, the
closure size of Tesseract gets quite large (around 1.2 GB), which is a
bit much just to be able to run NixOS VM tests.

For this reason I've also switched the VM tests back to using only the
English language.

Tested using the following VM tests (the ones that have OCR enabled) on
x86_64-linux:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/lib/testing.nix                         |  2 +-
 .../graphics/tesseract/default.nix            | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 8539fef0a19..d8b5df004df 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -93,7 +93,7 @@ rec {
 
       vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
 
-      ocrProg = tesseract;
+      ocrProg = tesseract.override { enableLanguages = [ "eng" ]; };
 
       # Generate onvenience wrappers for running the test driver
       # interactively with the specified network, and for starting the
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 1f1da9a389f..b5e1707c4fe 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff
 , icu, pango, opencl-headers
+
+# Supported list of languages or `null' for all available languages
+, enableLanguages ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +28,30 @@ stdenv.mkDerivation rec {
 
   LIBLEPT_HEADERSDIR = "${leptonica}/include";
 
-  postInstall = "cp -Rt \"$out/share/tessdata\" \"$tessdata/\"*";
+  # Copy the .traineddata files of the languages specified in enableLanguages
+  # into `$out/share/tessdata' and check afterwards if copying was successful.
+  postInstall = let
+    mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
+    mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
+    findLangArgs = if enableLanguages != null
+                   then "\\( ${mkFindArgs enableLanguages} \\)"
+                   else "-iname '*.traineddata'";
+  in ''
+    numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
+      ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
+
+    ${if enableLanguages != null then ''
+      expected=${toString (builtins.length enableLanguages)}
+    '' else ''
+      expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
+    ''}
+
+    if [ "$numLangs" -ne "$expected" ]; then
+      echo "Expected $expected languages, but $numLangs" \
+           "were copied to \`$out/share/tessdata'" >&2
+      exit 1
+    fi
+  '';
 
   meta = {
     description = "OCR engine";

From 42bb63f803c5f8e84a4ff7c86c9be37c8264f409 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 8 Apr 2017 00:11:14 +0200
Subject: [PATCH 0926/1744] leptonica: 1.72 -> 1.74.1

The changes are a bit too big to include it here in the commit message,
so if you want the details of what changed, please visit this URL:

http://leptonica.org/source/version-notes.html

I have also provided openjpeg, giflib and libwebp as dependencies so
that Leptonica is able to read/write those file formats.

Additionally I've added a patch that uses pkgconfig to resolve all
dependencies (except giflib), because unlike AC_CHECK_LIB() the
PKG_CHECK_MODULES() macro defines *_LIBS variables to include the linker
search path.

Unfortunately that patch alone is not enough, because the *_LIBS
variable are substituted by the upstream configure.ac to *not* include
the linker search paths, so we need to remove the AC_SUBST() calls
within PKG_CHECK_MODULES().

The only dependency that's not yet using PKG_CHECK_MODULES() is giflib,
because giflib doesn't have a pkg-config description file, therefore
we're using substituteInPlace to insert the linker search path after the
lept.pc file was generated by configure.

Another thing that we no longer need is the dependency on libpng version
1.2, because Leptonica now also works with more recent libpng versions.

Tested by building the package itself and also the following packages
that immediately depend on leptonica:

 * k2pdfopt
 * tesseract
 * jbig2enc

All of these packages succeeded to build on x86_64-linux.

The main reason why I'm bumping Leptonica to version 1.74.1 is that we
need at least version 1.74 to bump Tesseract to the latest upstream
version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../libraries/leptonica/default.nix           | 36 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index eacab92d36b..b9b6c3c7c24 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,14 +1,38 @@
-{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig
+, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib
+}:
 
-stdenv.mkDerivation {
-  name = "leptonica-1.72";
+stdenv.mkDerivation rec {
+  name = "leptonica-${version}";
+  version = "1.74.1";
 
   src = fetchurl {
-    url = http://www.leptonica.org/source/leptonica-1.72.tar.gz;
-    sha256 = "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr";
+    url = "http://www.leptonica.org/source/${name}.tar.gz";
+    sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl";
   };
 
-  buildInputs = [ libpng libtiff libjpeg zlib ];
+  patches = stdenv.lib.singleton (fetchpatch {
+    # configure: Support pkg-config
+    url = "https://github.com/DanBloomberg/leptonica/commit/"
+        + "4476d162cc191a0fefb2ce434153e12bbf188664.patch";
+    sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s";
+  });
+
+  postPatch = ''
+    # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will
+    # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and
+    # using the ones that are set here in Leptonica's configure.ac do not
+    # include -L linker flags.
+    sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac
+
+    # The giflib package doesn't ship a pkg-config file, so we need to inject
+    # the linker search path.
+    substituteInPlace configure.ac --replace -lgif \
+      ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"}
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];
 
   meta = {
     description = "Image processing and analysis library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38b92de3d55..7062bedd9b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8059,9 +8059,7 @@ with pkgs;
 
   levmar = callPackage ../development/libraries/levmar { };
 
-  leptonica = callPackage ../development/libraries/leptonica {
-    libpng = libpng12;
-  };
+  leptonica = callPackage ../development/libraries/leptonica { };
 
   lib3ds = callPackage ../development/libraries/lib3ds { };
 

From c381fa9b632ede763729a6df39565f27b9e0b4b3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 8 Apr 2017 02:43:18 +0200
Subject: [PATCH 0927/1744] tesseract: 3.04.01 -> 3.05.00

Upstream changelog:

 * Made some fine tuning to the hOCR output.
 * Added TSV as another optional output format.
 * Fixed ABI break introduced in 3.04.00 with the AnalyseLayout()
   method.
 * text2image tool - Enable all OpenType ligatures available in a font.
   This feature requires Pango 1.38 or newer.
 * Training tools - Replaced asserts with tprintf() and exit(1).
 * Fixed Cygwin compatibility.
 * Improved multipage tiff processing.
 * Improved the embedded pdf font (pdf.ttf).
 * Enable selection of OCR engine mode from command line.
 * Changed tesseract command line parameter '-psm' to '--psm'.
 * Added new C API for orientation and script detection, removed the old
   one.
 * Increased minimum autoconf version to 2.59.
 * Removed dead code.
 * Fixed many compiler warning.
 * Fixed memory and resource leaks.
 * Fixed some issues with the 'Cube' OCR engine.
 * Fixed some openCL issues.
 * Added option to build Tesseract with CMake build system.
 * Implemented CPPAN support for easy Windows building.

The upstream URL of the change log is:

https://github.com/tesseract-ocr/tesseract/releases/tag/3.05.00

Tested by building against the following packages that directly depend
on it:

 * vapoursynth (with ocrSupport = true)
 * pyocr (fails)
 * vobsub2srt

Also tested against the following NixOS VM tests that have OCR enabled:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

All of the packages and tests except pyocr build/succeed on
x86_64-linux.

Fixing pyocr is outside of the scope of this commit and will happen very
soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/graphics/tesseract/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index b5e1707c4fe..14335a4c2a9 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff
-, icu, pango, opencl-headers
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, leptonica, libpng, libtiff, icu, pango, opencl-headers
 
 # Supported list of languages or `null' for all available languages
 , enableLanguages ? null
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
-  version = "3.04.01";
+  version = "3.05.00";
 
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
     rev = version;
-    sha256 = "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv";
+    sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
   };
 
   tessdata = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
 
   LIBLEPT_HEADERSDIR = "${leptonica}/include";

From 121751e10fde1c3b079d7c9fa3551b04df93863d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 9 Apr 2017 23:14:01 +0200
Subject: [PATCH 0928/1744] pyocr: 0.4.4 -> 0.4.6

Upstream changes for version 0.4.5:

 * Clean up exceptions raised when OCR fails:
 * Now, all tools raise only exceptions inheriting from
   pyocr.PyocrException
 * There is now one and only one TesseractError (shared between
   pyocr.libtesseract and pyocr.tesseract)

Upstream changes for version 0.4.6:

 * hOCR outputs: Generate valid XHTML files

The full upstream changelog can be found at:

https://github.com/jflesch/pyocr/blob/master/ChangeLog

Note that because of the version bump of Tesseract neither version 0.4.4
nor version 0.4.6 succeed to build, so we need to fix this up soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8fe1c60af47..b4165f0d6b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20873,14 +20873,14 @@ in {
 
   pyocr = buildPythonPackage rec {
     name = "pyocr-${version}";
-    version = "0.4.4";
+    version = "0.4.6";
 
     # Don't fetch from PYPI because it doesn't contain tests.
     src = pkgs.fetchFromGitHub {
       owner = "jflesch";
       repo = "pyocr";
       rev = version;
-      sha256 = "09s7dxin8ams0f3xab60f45l3nn236a8win9yfyq9aqy9mm946ak";
+      sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
     };
 
     postPatch = ''

From 49cf9346422aecb6fc174af548d562803b4dd791 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 9 Apr 2017 23:19:12 +0200
Subject: [PATCH 0929/1744] pyocr: Add patch to support Tesseract 3.05.00

This is from the commit message I've written for the upstream pull
request (jflesch/pyocr#62):

    This is a bit more involved, because Tesseract 3.05.00 comes not
    only with improvements but also with a few quirks we need to deal
    with.

    The first quirk is that the order arguments of the `tesseract'
    command now matters and the list of configurations has to be at the
    end of the command line. So we add a new attribute tesseract_flags
    to the BaseBuilder class that contains a list of all the flags to
    pass to `tesseract', the tesseract_configs attribute however remains
    pretty much the same but now only really contains a list of configs
    instead of being mixed with flag arguments.

    Another quirk has to do with Leptonica >= 1.74 which Tesseract
    3.05.00 now requires. Leptonica has special handling of files that
    reside in /tmp and assumes that it's an internal temporary file of
    Leptonica. In order to deal with it, we now run Tesseract in a
    temporary directory, which contains the input/output files and use
    the relative name of these files because Leptonica only searches for
    path names beginning with /tmp.

    Fortunately the last item we need to address is not really a quirk,
    but an API change. In Tesseract 3.05.00 there is now a new function
    called TessBaseAPIDetectOrientationScript(), which doesn't fill the
    OSResults object anymore but now allows to pass the values we're
    interested in directly by reference. We need to use this new
    function because the old function TessBaseAPIDetectOS() now *always*
    returns false.

I've tested this specifically on NixOS and in conjunction with Paperwork
(the only package that's using pyocr so far) and all the tests of the
dependency chain are now succeeding. However, I didn't do manual tests
of Paperwork though.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../python-modules/pyocr-tesseract.patch      | 316 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 318 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyocr-tesseract.patch

diff --git a/pkgs/development/python-modules/pyocr-tesseract.patch b/pkgs/development/python-modules/pyocr-tesseract.patch
new file mode 100644
index 00000000000..d09a7c57352
--- /dev/null
+++ b/pkgs/development/python-modules/pyocr-tesseract.patch
@@ -0,0 +1,316 @@
+This patch is required for pyocr to work with Tesseract version 3.05.00
+and has been submitted upstream at the following URL:
+
+https://github.com/jflesch/pyocr/pull/62
+
+diff --git a/src/pyocr/builders.py b/src/pyocr/builders.py
+index 73c964d..20f390c 100644
+--- a/src/pyocr/builders.py
++++ b/src/pyocr/builders.py
+@@ -240,8 +240,10 @@ class BaseBuilder(object):
+         cuneiform_args : Arguments passed to the Cuneiform command line.
+     """
+ 
+-    def __init__(self, file_extensions, tesseract_configs, cuneiform_args):
++    def __init__(self, file_extensions, tesseract_flags, tesseract_configs,
++                 cuneiform_args):
+         self.file_extensions = file_extensions
++        self.tesseract_flags = tesseract_flags
+         self.tesseract_configs = tesseract_configs
+         self.cuneiform_args = cuneiform_args
+ 
+@@ -298,7 +300,7 @@ class TextBuilder(BaseBuilder):
+     def __init__(self, tesseract_layout=3, cuneiform_dotmatrix=False,
+                  cuneiform_fax=False, cuneiform_singlecolumn=False):
+         file_ext = ["txt"]
+-        tess_conf = ["-psm", str(tesseract_layout)]
++        tess_flags = ["-psm", str(tesseract_layout)]
+         cun_args = ["-f", "text"]
+         # Add custom cuneiform parameters if needed
+         for par, arg in [(cuneiform_dotmatrix, "--dotmatrix"),
+@@ -306,7 +308,7 @@ class TextBuilder(BaseBuilder):
+                          (cuneiform_singlecolumn, "--singlecolumn")]:
+             if par:
+                 cun_args.append(arg)
+-        super(TextBuilder, self).__init__(file_ext, tess_conf, cun_args)
++        super(TextBuilder, self).__init__(file_ext, tess_flags, [], cun_args)
+         self.tesseract_layout = tesseract_layout
+         self.built_text = []
+ 
+@@ -540,9 +542,11 @@ class WordBoxBuilder(BaseBuilder):
+ 
+     def __init__(self, tesseract_layout=1):
+         file_ext = ["html", "hocr"]
+-        tess_conf = ["hocr", "-psm", str(tesseract_layout)]
++        tess_flags = ["-psm", str(tesseract_layout)]
++        tess_conf = ["hocr"]
+         cun_args = ["-f", "hocr"]
+-        super(WordBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
++        super(WordBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
++                                             cun_args)
+         self.word_boxes = []
+         self.tesseract_layout = tesseract_layout
+ 
+@@ -614,9 +618,11 @@ class LineBoxBuilder(BaseBuilder):
+ 
+     def __init__(self, tesseract_layout=1):
+         file_ext = ["html", "hocr"]
+-        tess_conf = ["hocr", "-psm", str(tesseract_layout)]
++        tess_flags = ["-psm", str(tesseract_layout)]
++        tess_conf = ["hocr"]
+         cun_args = ["-f", "hocr"]
+-        super(LineBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
++        super(LineBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
++                                             cun_args)
+         self.lines = []
+         self.tesseract_layout = tesseract_layout
+ 
+diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
+index 0c2259a..f7ab309 100644
+--- a/src/pyocr/libtesseract/tesseract_raw.py
++++ b/src/pyocr/libtesseract/tesseract_raw.py
+@@ -263,11 +263,22 @@ if g_libtesseract:
+     ]
+     g_libtesseract.TessDeleteText.restype = None
+ 
+-    g_libtesseract.TessBaseAPIDetectOS.argtypes = [
+-        ctypes.c_void_p,  # TessBaseAPI*
+-        ctypes.POINTER(OSResults),
+-    ]
+-    g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool
++    if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'):
++        g_libtesseract.TessBaseAPIDetectOrientationScript.argtypes = [
++            ctypes.c_void_p,  # TessBaseAPI*
++            ctypes.POINTER(ctypes.c_int),  # orient_deg
++            ctypes.POINTER(ctypes.c_float),  # orient_conf
++            ctypes.POINTER(ctypes.c_char_p),  # script_name
++            ctypes.POINTER(ctypes.c_float),  # script_conf
++        ]
++        g_libtesseract.TessBaseAPIDetectOrientationScript.restype = \
++            ctypes.c_bool
++    else:
++        g_libtesseract.TessBaseAPIDetectOS.argtypes = [
++            ctypes.c_void_p,  # TessBaseAPI*
++            ctypes.POINTER(OSResults),
++        ]
++        g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool
+ 
+ 
+ def init(lang=None):
+@@ -526,15 +537,37 @@ def detect_os(handle):
+     global g_libtesseract
+     assert(g_libtesseract)
+ 
+-    results = OSResults()
+-    r = g_libtesseract.TessBaseAPIDetectOS(
+-        ctypes.c_void_p(handle),
+-        ctypes.pointer(results)
+-    )
+-    if not r:
+-        raise TesseractError("detect_orientation failed",
+-                             "TessBaseAPIDetectOS() failed")
+-    return {
+-        "orientation": results.best_orientation_id,
+-        "confidence": results.best_oconfidence,
+-    }
++    # Use the new API function if it is available, because since Tesseract
++    # 3.05.00 the old API function _always_ returns False.
++    if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'):
++        orientation_deg = ctypes.c_int(0)
++        orientation_confidence = ctypes.c_float(0.0)
++
++        r = g_libtesseract.TessBaseAPIDetectOrientationScript(
++            ctypes.c_void_p(handle),
++            ctypes.byref(orientation_deg),
++            ctypes.byref(orientation_confidence),
++            None,  # script_name
++            None  # script_confidence
++        )
++
++        if not r:
++            raise TesseractError("detect_orientation failed",
++                                 "TessBaseAPIDetectOrientationScript() failed")
++        return {
++            "orientation": round(orientation_deg.value / 90),
++            "confidence": orientation_confidence.value,
++        }
++    else:  # old API (before Tesseract 3.05.00)
++        results = OSResults()
++        r = g_libtesseract.TessBaseAPIDetectOS(
++            ctypes.c_void_p(handle),
++            ctypes.pointer(results)
++        )
++        if not r:
++            raise TesseractError("detect_orientation failed",
++                                 "TessBaseAPIDetectOS() failed")
++        return {
++            "orientation": results.best_orientation_id,
++            "confidence": results.best_oconfidence,
++        }
+diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
+index 99b0121..658c96b 100755
+--- a/src/pyocr/tesseract.py
++++ b/src/pyocr/tesseract.py
+@@ -22,6 +22,8 @@ import os
+ import subprocess
+ import sys
+ import tempfile
++import contextlib
++import shutil
+ 
+ from . import builders
+ from . import error
+@@ -62,9 +64,11 @@ class CharBoxBuilder(builders.BaseBuilder):
+ 
+     def __init__(self):
+         file_ext = ["box"]
++        tess_flags = []
+         tess_conf = ["batch.nochop", "makebox"]
+         cun_args = []
+-        super(CharBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
++        super(CharBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
++                                             cun_args)
+         self.tesseract_layout = 1
+ 
+     @staticmethod
+@@ -173,18 +177,19 @@ def detect_orientation(image, lang=None):
+         TesseractError --- if no script detected on the image
+     """
+     _set_environment()
+-    with temp_file(".bmp") as input_file:
+-        command = [TESSERACT_CMD, input_file.name, 'stdout', "-psm", "0"]
++    with temp_dir() as tmpdir:
++        command = [TESSERACT_CMD, "input.bmp", 'stdout', "-psm", "0"]
+         if lang is not None:
+             command += ['-l', lang]
+ 
+         if image.mode != "RGB":
+             image = image.convert("RGB")
+-        image.save(input_file.name)
++        image.save(os.path.join(tmpdir, "input.bmp"))
+ 
+         proc = subprocess.Popen(command, stdin=subprocess.PIPE, shell=False,
+                                 startupinfo=g_subprocess_startup_info,
+                                 creationflags=g_creation_flags,
++                                cwd=tmpdir,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT)
+         proc.stdin.close()
+@@ -224,8 +229,8 @@ def get_available_builders():
+     ]
+ 
+ 
+-def run_tesseract(input_filename, output_filename_base, lang=None,
+-                  configs=None):
++def run_tesseract(input_filename, output_filename_base, cwd=None, lang=None,
++                  flags=None, configs=None):
+     '''
+     Runs Tesseract:
+         `TESSERACT_CMD` \
+@@ -238,6 +243,8 @@ def run_tesseract(input_filename, output_filename_base, lang=None,
+         input_filename --- image to read
+         output_filename_base --- file name in which must be stored the result
+             (without the extension)
++        cwd --- Run Tesseract in the specified working directory or use current
++            one if None
+         lang --- Tesseract language to use (if None, none will be specified)
+         config --- List of Tesseract configs to use (if None, none will be
+             specified)
+@@ -252,10 +259,13 @@ def run_tesseract(input_filename, output_filename_base, lang=None,
+     if lang is not None:
+         command += ['-l', lang]
+ 
++    if flags is not None:
++        command += flags
++
+     if configs is not None:
+         command += configs
+ 
+-    proc = subprocess.Popen(command,
++    proc = subprocess.Popen(command, cwd=cwd,
+                             startupinfo=g_subprocess_startup_info,
+                             creationflags=g_creation_flags,
+                             stdout=subprocess.PIPE,
+@@ -301,11 +311,18 @@ class ReOpenableTempfile(object):
+             self.name = None
+ 
+ 
+-def temp_file(suffix):
+-    ''' Returns a temporary file '''
+-    if os.name == 'nt':  # Windows
+-        return ReOpenableTempfile(suffix)
+-    return tempfile.NamedTemporaryFile(prefix='tess_', suffix=suffix)
++@contextlib.contextmanager
++def temp_dir():
++    """
++    A context manager for maintaining a temporary directory
++    """
++    # NOTE: Drop this as soon as we don't support Python 2.7 anymore, because
++    # since Python 3.2 there is a context manager called TemporaryDirectory().
++    path = tempfile.mkdtemp(prefix='tess_')
++    try:
++        yield path
++    finally:
++        shutil.rmtree(path)
+ 
+ 
+ def image_to_string(image, lang=None, builder=None):
+@@ -329,23 +346,20 @@ def image_to_string(image, lang=None, builder=None):
+ 
+     if builder is None:
+         builder = builders.TextBuilder()
+-    with temp_file(".bmp") as input_file:
+-        with temp_file('') as output_file:
+-            output_file_name_base = output_file.name
+-
++    with temp_dir() as tmpdir:
+         if image.mode != "RGB":
+             image = image.convert("RGB")
+-        image.save(input_file.name)
+-        (status, errors) = run_tesseract(input_file.name,
+-                                         output_file_name_base,
++        image.save(os.path.join(tmpdir, "input.bmp"))
++        (status, errors) = run_tesseract("input.bmp", "output", cwd=tmpdir,
+                                          lang=lang,
++                                         flags=builder.tesseract_flags,
+                                          configs=builder.tesseract_configs)
+         if status:
+             raise TesseractError(status, errors)
+ 
+         output_file_name = "ERROR"
+         for file_extension in builder.file_extensions:
+-            output_file_name = ('%s.%s' % (output_file_name_base,
++            output_file_name = ('%s.%s' % (os.path.join(tmpdir, "output"),
+                                            file_extension))
+             if not os.access(output_file_name, os.F_OK):
+                 continue
+diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
+index ccddd07..1ac2a4b 100644
+--- a/tests/tests_libtesseract.py
++++ b/tests/tests_libtesseract.py
+@@ -33,8 +33,9 @@ class TestContext(unittest.TestCase):
+             (3, 3, 0),
+             (3, 4, 0),
+             (3, 4, 1),
++            (3, 5, 0),
+         ), ("Tesseract does not have the expected version"
+-            " (3.4.0) ! Some tests will be skipped !"))
++            " (3.5.0) ! Some tests will be skipped !"))
+ 
+     def test_langs(self):
+         langs = libtesseract.get_available_languages()
+diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
+index e29c512..fa4d483 100644
+--- a/tests/tests_tesseract.py
++++ b/tests/tests_tesseract.py
+@@ -27,8 +27,9 @@ class TestContext(unittest.TestCase):
+             (3, 3, 0),
+             (3, 4, 0),
+             (3, 4, 1),
++            (3, 5, 0),
+         ), ("Tesseract does not have the expected version"
+-            " (3.4.0) ! Some tests will be skipped !"))
++            " (3.5.0) ! Some tests will be skipped !"))
+ 
+     def test_langs(self):
+         langs = tesseract.get_available_languages()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4165f0d6b8..9f65ef80b14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20883,6 +20883,8 @@ in {
       sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
     };
 
+    patches = [ ../development/python-modules/pyocr-tesseract.patch ];
+
     postPatch = ''
       sed -i \
         -e 's,^\(TESSERACT_CMD *= *\).*,\1"${pkgs.tesseract}/bin/tesseract",' \

From 7b5263e1a63a69b7dd5f05dd54d9355bc6648fe1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Apr 2017 02:30:45 +0200
Subject: [PATCH 0930/1744] tesseract: Package version 4.x from Git master

Tesseract 4 has got a new long short-term memory neural networking based
OCR engine which really helps a lot in terms of accuracy and our VM
tests.

I ran the new version across a bunch of different screenshots and
comparing the results to the 3.x branch and it really makes a big
difference, especially with various font rendering settings.

The only downside of this is that version 4 hasn't been released yet and
is in alpha state right now, but it will eventually get there and the
only solutions that came into my mind sticking to version 3 were really
sub-par:

 * Use several passes with different color negation on the screenshots.
 * Train Tesseract 3 specifically for screenshots. This is sub-par
   because we'd need to do it for Tesseract 4 from scratch again.
 * Change the test systems so that it specifically uses *only* OCR an
   font when displaying. I've actually tried this but this also isn't
   accurate enough with our default font rendering setup.
 * Turn off special font rendering settings for our tests. In
   conjunction with changing to an OCR font this might work but it won't
   catch all the cases, because applications might use their own font
   rendering.

Given that version 4 is faster[1] when it comes to OCR detection and also
the points just mentioned I think even using the alpha version just for
tests isn't going to hurt anybody.

[1]: https://github.com/tesseract-ocr/tesseract/wiki/4.0-Accuracy-and-Performance

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/graphics/tesseract/4.x.nix | 61 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/applications/graphics/tesseract/4.x.nix

diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix
new file mode 100644
index 00000000000..577bff91e35
--- /dev/null
+++ b/pkgs/applications/graphics/tesseract/4.x.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig
+, leptonica, libpng, libtiff, icu, pango, opencl-headers
+
+# Supported list of languages or `null' for all available languages
+, enableLanguages ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "tesseract-${version}";
+  version = "4.00.00alpha-git-20170410";
+
+  src = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tesseract";
+    rev = "36a995bdc92eb2dd8bc5a63205708944a3f990a1";
+    sha256 = "0xz3krvap8sdm27v1dyb34lcdmx11wzvxyszpppfsfmjgkvg19bq";
+  };
+
+  tessdata = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tessdata";
+    rev = "8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40";
+    sha256 = "0idwkv4qsmmqhrxcgyhy32yldl3vk054m7dkv4fjswfnalgsx794";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];
+  buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
+
+  # Copy the .traineddata files of the languages specified in enableLanguages
+  # into `$out/share/tessdata' and check afterwards if copying was successful.
+  postInstall = let
+    mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
+    mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
+    findLangArgs = if enableLanguages != null
+                   then "\\( ${mkFindArgs enableLanguages} \\)"
+                   else "-iname '*.traineddata'";
+  in ''
+    numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
+      ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
+
+    ${if enableLanguages != null then ''
+      expected=${toString (builtins.length enableLanguages)}
+    '' else ''
+      expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
+    ''}
+
+    if [ "$numLangs" -ne "$expected" ]; then
+      echo "Expected $expected languages, but $numLangs" \
+           "were copied to \`$out/share/tessdata'" >&2
+      exit 1
+    fi
+  '';
+
+  meta = {
+    description = "OCR engine";
+    homepage = http://code.google.com/p/tesseract-ocr/;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7062bedd9b1..29caabbda57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15687,6 +15687,7 @@ with pkgs;
   };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
+  tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { });
 
   tetraproc = callPackage ../applications/audio/tetraproc { };
 

From a443bdc0a637aac3e6c0b8ba9d71f101f60d221d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 9 Apr 2017 23:34:26 +0200
Subject: [PATCH 0931/1744] nixos/testing: Improve quality of OCR

First of all, we're now using ImageMagick to improve the screenshot so
that Tesseract has an esier time to recognize the text. The resulting
image of this post-processing is a scaled up black-and-white version
with the backgrounds almost entirely removed and the text edges a bit
blurred, so the screen shots now more or less resemble an image from a
scanner rather. This is what Tesseract is trained for by default.

As mentioned in the previous commit we now also use Tesseract 4, which
further improves the quality of text recognition.

I've spent countless hours just to test different postprocessing
variants and testing what works best for our tests and this is the one
that worked best so far. It's certainly not perfect and I'd like to
avoid the scaling step but we're way better off than before.

In addition to this, the OCR process is now done without an intermediate
file, solely using pipes.

I've tested this using the following VM tests which have OCR enabled:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

All of the tests still succeed and comparing some of the recognition
results to the earlier results it now also detects a lot more text than
before this commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/lib/test-driver/Machine.pm | 18 +++++++++++-------
 nixos/lib/testing.nix            |  5 +++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 30664406b26..c619264eb94 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -542,16 +542,20 @@ sub getScreenText {
     $self->nest("performing optical character recognition", sub {
         my $tmpbase = Cwd::abs_path(".")."/ocr";
         my $tmpin = $tmpbase."in.ppm";
-        my $tmpout = "$tmpbase.ppm";
 
         $self->sendMonitorCommand("screendump $tmpin");
-        system("ppmtopgm $tmpin | pamscale 4 -filter=lanczos > $tmpout") == 0
-            or die "cannot scale screenshot";
+
+        my $magickArgs = "-filter Catrom -density 72 -resample 300 "
+                       . "-contrast -normalize -despeckle -type grayscale "
+                       . "-sharpen 1 -posterize 3 -negate -gamma 100 "
+                       . "-blur 1x65535";
+        my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2";
+
+        $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`;
+        my $status = $? >> 8;
         unlink $tmpin;
-        system("tesseract $tmpout $tmpbase") == 0 or die "OCR failed";
-        unlink $tmpout;
-        $text = read_file("$tmpbase.txt");
-        unlink "$tmpbase.txt";
+
+        die "OCR failed with exit code $status" if $status != 0;
     });
     return $text;
 }
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index d8b5df004df..58c447c76db 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -93,7 +93,7 @@ rec {
 
       vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
 
-      ocrProg = tesseract.override { enableLanguages = [ "eng" ]; };
+      ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };
 
       # Generate onvenience wrappers for running the test driver
       # interactively with the specified network, and for starting the
@@ -111,7 +111,8 @@ rec {
           vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
           wrapProgram $out/bin/nixos-test-driver \
             --add-flags "''${vms[*]}" \
-            ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
+            ${lib.optionalString enableOCR
+              "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \
             --run "testScript=\"\$(cat $out/test-script)\"" \
             --set testScript '$testScript' \
             --set VLANS '${toString vlans}'

From 5d5c0d590f35934bab23aadc2e1d8d6b6b2118b0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Apr 2017 03:16:45 +0200
Subject: [PATCH 0932/1744] Revert "sddm: Fix test."

This reverts commit 0a6a06346a3c928a3115dfd700993c5c06b0a1e9.

The commit replaced the text to search for from ALICE to BOB, because
our OCR detection only caught "BOB FOOBAR" but missed "ALICE FOOBAR"
completely.

With the improvements to our OCR system this no longer is the case and
the test passes successfully with this reverted.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @shlevy
---
 nixos/tests/sddm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index f78a77efbf0..82be9bc1d72 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -24,7 +24,7 @@ let
         user = nodes.machine.config.users.extraUsers.alice;
       in ''
         startAll;
-        $machine->waitForText(qr/BOB/);
+        $machine->waitForText(qr/ALICE/);
         $machine->screenshot("sddm");
         $machine->sendChars("${user.password}\n");
         $machine->waitForFile("/home/alice/.Xauthority");

From d6454e6a1593f12e17d982a1ad30c97ca7cf130a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Apr 2017 03:38:39 +0200
Subject: [PATCH 0933/1744] gnutls: try to fix build on Darwin, after update

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

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 77ecd4957f7..c3560c43e47 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, libunistring, ... } @ args:
+{ callPackage, stdenv, fetchurl, libunistring, darwin, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "3.5.11";
@@ -15,4 +15,6 @@ callPackage ./generic.nix (args // rec {
     sed '2iexit 77' -i tests/pkgconfig.sh
     sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
   '';
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.Security;
 })

From 47a5f9acee9d75c7549802a2526013631510403d Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 10 Apr 2017 22:41:55 -0400
Subject: [PATCH 0934/1744] nixos: Add nm-openvpn to the networkmanager group

This is to satisfy the polkit restriction limiting
org.freedesktop.NetworkManager.* dbus messages to members of that
group.

Should help with #24806
---
 nixos/modules/services/networking/networkmanager.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7fb2be78698..220107a2411 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -241,6 +241,7 @@ in {
     users.extraUsers = [{
       name = "nm-openvpn";
       uid = config.ids.uids.nm-openvpn;
+      extraGroups = [ "networkmanager" ];
     }];
 
     systemd.packages = cfg.packages;

From 0b034797e1bde2d57d57410a95f24b19d3f4d8a8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 10 Apr 2017 23:08:14 -0400
Subject: [PATCH 0935/1744] bonnie: fix on Darwin

---
 .../filesystems/bonnie/bonnie-homebrew.patch  | 157 ------------------
 pkgs/tools/filesystems/bonnie/default.nix     |   2 -
 2 files changed, 159 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch

diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
deleted file mode 100644
index e4903143f11..00000000000
--- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Copyright 2009-2016 Homebrew contributors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. 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.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-
-# Changes included in this patchset:
-# 1) Explicitly use clang/clang++ in Makefile
-# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol"
-#    Remove the construct in favor of macro targets min()/max() provided by the library
-#    Files affected: port.h.in port.h duration.cpp bonnie++.cpp
-# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of
-#    splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place.
-#    The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked.
-#    Files affected: bonnie++.cp
-
-diff --git i/Makefile w/Makefile
-index 4bb5103..8f7ed41 100644
---- i/Makefile
-+++ w/Makefile
-@@ -10,8 +10,8 @@ eprefix=${prefix}
- #MORE_WARNINGS=-Weffc++
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
- CFLAGS=-O2  -DNDEBUG $(WFLAGS) $(MORECFLAGS)
--CXX=g++ $(CFLAGS)
--LINK=g++
-+CXX=clang++ $(CFLAGS)
-+LINK=clang++
- THREAD_LFLAGS=-lpthread
-
- INSTALL=/usr/bin/install -c
-diff --git i/bonnie++.cpp w/bonnie++.cpp
-index 8c5a43a..8a4b3dc 100644
---- i/bonnie++.cpp
-+++ w/bonnie++.cpp
-@@ -73,7 +73,7 @@ public:
-   void set_io_chunk_size(int size)
-     { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
-   void set_file_chunk_size(int size)
--    { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
-+    { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
- 
-   // Return the page-aligned version of the local buffer
-   char *buf() { return m_buf_pa; }
-@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag)
-  , m_buf(NULL)
-  , m_buf_pa(NULL)
- {
--  pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
-+  pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
-   SetName(".");
- }
- 
-@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
-       {
-         char *sbuf = _strdup(optarg);
-         char *size = strtok(sbuf, ":");
--#ifdef _LARGEFILE64_SOURCE
-         file_size = size_from_str(size, "gt");
--#else
--        file_size = size_from_str(size, "g");
--#endif
-         size = strtok(NULL, "");
-         if(size)
-         {
-@@ -384,17 +380,8 @@ int main(int argc, char *argv[])
-     if(file_size % 1024 > 512)
-       file_size = file_size + 1024 - (file_size % 1024);
-   }
--#ifndef _LARGEFILE64_SOURCE
--  if(file_size == 2048)
--    file_size = 2047;
--  if(file_size > 2048)
--  {
--    fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
--    usage();
--  }
--#endif
--  globals.byte_io_size = __min(file_size, globals.byte_io_size);
--  globals.byte_io_size = __max(0, globals.byte_io_size);
-+  globals.byte_io_size = min(file_size, globals.byte_io_size);
-+  globals.byte_io_size = max(0, globals.byte_io_size);
- 
-   if(machine == NULL)
-   {
-@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
-      && (directory_max_size < directory_min_size || directory_max_size < 0
-      || directory_min_size < 0) )
-     usage();
--#ifndef _LARGEFILE64_SOURCE
--  if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
--  {
--    fprintf(stderr
--   , "The small chunk size and large IO size make this test impossible in 32bit.\n");
--    usage();
--  }
--#endif
-   if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
-   {
-     fprintf(stderr
-diff --git i/duration.cpp w/duration.cpp
-index efa3fd3..f943155 100644
---- i/duration.cpp
-+++ w/duration.cpp
-@@ -38,7 +38,7 @@ double Duration_Base::stop()
-   getTime(&tv);
-   double ret;
-   ret = tv - m_start;
--  m_max = __max(m_max, ret);
-+  m_max = max(m_max, ret);
-   return ret;
- }
- 
-diff --git i/port.h w/port.h
-index 8d53622..2e1f112 100644
---- i/port.h
-+++ w/port.h
-@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
- #endif
- 
- typedef int FILE_TYPE;
--#define __min min
--#define __max max
- typedef unsigned int UINT;
- typedef unsigned long ULONG;
- typedef const char * PCCHAR;
-diff --git i/port.h.in w/port.h.in
-index 69c8f24..8359d72 100644
---- i/port.h.in
-+++ w/port.h.in
-@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
- #endif
- 
- typedef int FILE_TYPE;
--#define __min min
--#define __max max
- typedef unsigned int UINT;
- typedef unsigned long ULONG;
- typedef const char * PCCHAR;
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index 65a722c7408..c120073866d 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
     sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;
-
   enableParallelBuilding = true;
 
   meta = {

From 5db1fe64c0a30e8a10cfb524018a471df2bbc3fa Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 10 Apr 2017 23:00:10 -0400
Subject: [PATCH 0936/1744] plasma-nm: patch in the correct path to openvpn
 executable

Fixes #24808
---
 .../plasma-nm/0002-openvpn-binary-path.patch        | 13 +++++++++++++
 pkgs/desktops/plasma-5/plasma-nm/default.nix        |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch

diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
new file mode 100644
index 00000000000..3bc871f0906
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
@@ -0,0 +1,13 @@
+diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
+index 2f11ba1d..310f11b4 100644
+--- a/vpn/openvpn/openvpnadvancedwidget.cpp
++++ b/vpn/openvpn/openvpnadvancedwidget.cpp
+@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
+     connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
+ 
+     // start openVPN process and get its cipher list
+-    const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin");
++    const QString openVpnBinary = "@openvpn@/bin/openvpn";
+     const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
+     const QStringList versionArgs(QLatin1String("--version"));
+ 
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index da57653bb08..5d5b73d875c 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -4,7 +4,7 @@
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
 , kxmlgui, mobile_broadband_provider_info
 , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-, qca-qt5, qtdeclarative, solid
+, qca-qt5, qtdeclarative, solid, openvpn
 }:
 
 plasmaPackage {
@@ -14,6 +14,10 @@ plasmaPackage {
       src = ./0001-mobile-broadband-provider-info-path.patch;
       inherit mobile_broadband_provider_info;
     })
+    (substituteAll {
+      src = ./0002-openvpn-binary-path.patch;
+      inherit openvpn;
+    })
   ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [

From 7c75940c5e63161fbb6e75c1f8b204fca60e7dcd Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 10 Apr 2017 23:47:51 -0400
Subject: [PATCH 0937/1744] plasma-nm: enable parallel building

This thing takes a long time to build.
---
 pkgs/desktops/plasma-5/plasma-nm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 5d5b73d875c..736d59b4041 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -27,4 +27,5 @@ plasmaPackage {
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
     qca-qt5 solid
   ];
+  enableParallelBuilding = true;
 }

From 881595ac0325a5622aa02e1d078e98b450fa4496 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 11 Apr 2017 06:33:16 +0200
Subject: [PATCH 0938/1744] ethrun: init at 0.1.0

---
 pkgs/applications/altcoins/default.nix |  1 +
 pkgs/applications/altcoins/ethrun.nix  | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/altcoins/ethrun.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index fbc3d1c36f9..14723fd06a4 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -32,6 +32,7 @@ rec {
   namecoind = callPackage ./namecoind.nix { };
 
   ethabi = callPackage ./ethabi.nix { };
+  ethrun = callPackage ./ethrun.nix { };
 
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
new file mode 100644
index 00000000000..f61a5884fd4
--- /dev/null
+++ b/pkgs/applications/altcoins/ethrun.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "ethrun-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "dapphub";
+    repo = "ethrun";
+    rev = "v${version}";
+    sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
+  };
+
+  depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq";
+
+  meta = {
+    description = "Directly run Ethereum bytecode";
+    homepage = https://github.com/dapphub/ethrun/;
+    maintainers = [stdenv.lib.maintainers.dbrock];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29caabbda57..18ccdd346c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12874,6 +12874,7 @@ with pkgs;
 
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
+  ethrun = self.altcoins.ethrun;
 
   stellar-core = self.altcoins.stellar-core;
 

From f1fdc988844926f90c855f55b66955d61034569a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 11 Apr 2017 01:03:11 -0500
Subject: [PATCH 0939/1744] pugixml: fixup darwin

---
 .../development/libraries/pugixml/default.nix |  3 ---
 .../libraries/pugixml/no-long-long.patch      | 19 -------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/pugixml/no-long-long.patch

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 8c40ff2be20..d9d0afa2bde 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
     sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
   '';
 
-  patches = []
-    ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ];
-
   meta = with stdenv.lib; {
     description = "Light-weight, simple and fast XML parser for C++ with XPath support";
     homepage = http://pugixml.org/;
diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch
deleted file mode 100644
index 46c54e85a1d..00000000000
--- a/pkgs/development/libraries/pugixml/no-long-long.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Get rid of long-long feature. This breaks on AppleClang compilers.
----
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40a7ab0..c84f0f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,9 +26,9 @@ else()
- endif()
- 
- # Enable C++11 long long for compilers that are capable of it
--if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
--	target_compile_features(pugixml PUBLIC cxx_long_long_type)
--endif()
-+# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
-+# 	target_compile_features(pugixml PUBLIC cxx_long_long_type)
-+# endif()
- 
- set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
- 

From da1d13bc0791e9effccd697792e745346ba00a45 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon, 10 Apr 2017 23:11:16 -0700
Subject: [PATCH 0940/1744] webkgitgtk: fix 2.14 on macOS

Includes the patches from macports and fixes an issue with the
`otool -L` output that was causing g-ir-scanner to fail.
The paths in the macports patches have been modified so that they
will work with `patches` in nix (an extra directory level was
added).
---
 .../absolute_shlib_path.patch                 |  9 +--
 pkgs/development/libraries/webkitgtk/2.14.nix | 58 ++++++++++++++---
 .../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 +++++++++++++++++++
 6 files changed, 237 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/webkitgtk/PR-152650-2.patch
 create mode 100644 pkgs/development/libraries/webkitgtk/PR-153138.patch
 create mode 100644 pkgs/development/libraries/webkitgtk/PR-157554.patch
 create mode 100644 pkgs/development/libraries/webkitgtk/PR-157574.patch

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 49e059befdb..75d9281dfb0 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -57,15 +57,16 @@ 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,24 @@ def _resolve_libtool(options, binary, libraries):
+@@ -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':
--        pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
+     if platform.system() == 'Darwin':
+         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'''
 +        (
 +          (?:
@@ -85,7 +86,7 @@ index 838d343..ca7fc0d 100644
  
  
  # This is a what we do for non-la files. We assume that we are on an
-@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
+@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries):
                  m = pattern.search(line)
                  if m:
                      del patterns[library]
diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 99a41ec0c18..a1b22094855 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
 , gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
-, libidn
+, libidn, libedit, readline, mesa, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
 , gst-plugins-base
 }:
@@ -18,12 +18,27 @@ stdenv.mkDerivation rec {
     description = "Web content rendering engine, GTK+ port";
     homepage = "http://webkitgtk.org/";
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     hydraPlatforms = [];
     maintainers = with maintainers; [ ];
   };
 
-  preConfigure = "patchShebangs Tools";
+  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";
@@ -32,29 +47,54 @@ stdenv.mkDerivation rec {
 
   # see if we can clean this up....
 
-  patches = [ ./finding-harfbuzz-icu.patch ];
+  patches = [ ./finding-harfbuzz-icu.patch ]
+  	++ optionals stdenv.isDarwin [
+    ./PR-152650-2.patch
+    ./PR-153138.patch
+    ./PR-157554.patch
+    ./PR-157574.patch
+  ];
 
   cmakeFlags = [
   "-DPORT=GTK"
   "-DUSE_LIBHYPHEN=0"
-  "-DENABLE_GLES2=ON"
+  ]
+  ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
+  ++ optionals stdenv.isDarwin [
+  "-DUSE_SYSTEM_MALLOC=ON"
+  "-DUSE_ACCELERATE=0"
+  "-DENABLE_INTROSPECTION=ON"
+  "-DENABLE_MINIBROWSER=OFF"
+  "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
+  "-DENABLE_MINIBROWSER=OFF"
+  "-DENABLE_VIDEO=ON"
+  "-DENABLE_QUARTZ_TARGET=ON"
+  "-DENABLE_X11_TARGET=OFF"
+  "-DENABLE_OPENGL=OFF"
+  "-DENABLE_WEB_AUDIO=OFF"
+  "-DENABLE_WEBGL=OFF"
+  "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
+  "-DENABLE_GTKDOC=OFF"
   ];
 
   # XXX: WebKit2 missing include path for gst-plugins-base.
   # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
+                     + (optionalString stdenv.isDarwin " -lintl");
 
   nativeBuildInputs = [
     cmake perl python2 ruby bison gperf sqlite
     pkgconfig gettext gobjectIntrospection
   ];
 
-  buildInputs = [
-    gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
+  buildInputs = libintlOrEmpty ++ [
+    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
     gst-plugins-base libxkbcommon epoxy at_spi2_core
   ] ++ optional enableGeoLocation geoclue2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ]);
+    ++ (with xlibs; [ libXdmcp libXt libXtst ])
+    ++ optionals stdenv.isDarwin [ libedit readline mesa ]
+    ++ optional stdenv.isLinux wayland;
 
   propagatedBuildInputs = [
     libsoup gtk3
diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
new file mode 100644
index 00000000000..db84a4a6b26
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
@@ -0,0 +1,62 @@
+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_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
+ set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
+ set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
+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
new file mode 100644
index 00000000000..833921f6806
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-153138.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000..615e805c92c
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-157554.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 00000000000..d9b0795afa5
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-157574.patch
@@ -0,0 +1,62 @@
+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__ */

From 5dfe0f7ee624389debc63772b7e110826ba384ba Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon, 10 Apr 2017 23:17:16 -0700
Subject: [PATCH 0941/1744] gtksourceview: fix version 3 on macOS

Add darwin to the list of supported platforms for gtksourceview.
---
 pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
index aac1739a6e9..3dfbe6fbf0b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = [ ./nix_share_path.patch ];
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = gnome3.maintainers;
   };
 }

From 9ae8ce813e7ed78c138e432c2f04995d5f56dd62 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 04:45:33 +0300
Subject: [PATCH 0942/1744] dosfstools: Use --enable-compat-symlinks

http://hydra.nixos.org/build/51461475
---
 pkgs/tools/filesystems/dosfstools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 8b01ea15dc7..d6a4e83a533 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
+  configureFlags = [ "--enable-compat-symlinks" ];
+
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
     repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;

From 4d5ed187d3a645028e3d18ccc519a153633be113 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon, 10 Apr 2017 23:26:42 -0700
Subject: [PATCH 0943/1744] gtk-mac-integration: fix gtk3 version

Include a Gtk3 version of gtk-mac-integration.
Add gobjectIntrospection to gtk-mac-integration.
Use propagatedBuildInputs for gtk.
---
 pkgs/development/libraries/gtk-mac-integration/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 30ac8f2fe28..f9ce0aa4b81 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "gtk-mac-integration-2.0.8";
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
-  buildInputs = [ glib gtk ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];
+  buildInputs = [ glib ];
+  propagatedBuildInputs = [ gtk ];
 
   preAutoreconf = ''
     gtkdocize
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29caabbda57..0f39b647637 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7846,6 +7846,10 @@ with pkgs;
     gtk = gtk2;
   };
 
+  gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
+    gtk = gtk3;
+  };
+
   gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
 
   gtkspell2 = callPackage ../development/libraries/gtkspell { };

From e09b950f5423904562c98e31417683a2b5560ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Apr 2017 08:46:58 +0200
Subject: [PATCH 0944/1744] openvpn: remove no longer correct
 systemd-notify.patch

This patch was only necessary for 2.3.x, while 2.4.0 improved
its own systemd notify support.

See: https://github.com/NixOS/nixpkgs/issues/24817
---
 pkgs/tools/networking/openvpn/default.nix     |  2 --
 .../networking/openvpn/systemd-notify.patch   | 22 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/tools/networking/openvpn/systemd-notify.patch

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index f609c90ad50..a8f3a5a19ae 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg";
   };
 
-  patches = optional stdenv.isLinux ./systemd-notify.patch;
-
   buildInputs = [ lzo openssl pkgconfig ]
                   ++ optionals stdenv.isLinux [ pam systemd iproute ]
                   ++ optional pkcs11Support pkcs11helper;
diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch
deleted file mode 100644
index c0ac8ae89d3..00000000000
--- a/pkgs/tools/networking/openvpn/systemd-notify.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c
---- openvpn-2.3.1-orig/src/openvpn/init.c	2013-03-20 09:28:14.000000000 +0100
-+++ openvpn-2.3.1/src/openvpn/init.c	2014-04-22 13:02:21.351026640 +0200
-@@ -48,6 +48,8 @@
- 
- #include "occ-inline.h"
- 
-+#include <systemd/sd-daemon.h>
-+
- static struct context *static_context; /* GLOBAL */
- 
- /*
-@@ -1375,6 +1375,9 @@
-     /* Reset the unsuccessful connection counter on complete initialisation */
-     c->options.unsuccessful_attempts = 0;
- 
-+    /* Tell systemd we're ready. */
-+    sd_notify(0, "READY=1");
-+
-     /* If we delayed UID/GID downgrade or chroot, do it now */
-     do_uid_gid_chroot (c, true);
- 

From b002d6a8681e4961d9f5c3ee8ca1b06d1a31c450 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 09:45:50 +0300
Subject: [PATCH 0945/1744] Revert "btrfs-progs: 4.8.2 -> 4.10.2"

This reverts commit c0cef0425eff1db8ddc07e78ea5aa16eb4a9666b.

The output of the command-line tool has changed somewhat and at least
nixos-generate-config.pl needs modifications to match. I'm leaving that
to someone who knows a bit more about btrfs.

Issue #24810.
---
 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 411d0c99f20..525aa2fec28 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
 }:
 
-let version = "4.10.2"; in
+let version = "4.8.2"; 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 = "02p63nz78lrr156cmbb759z76cn95hv6mmz7v592lmiq0dkxy2gd";
+    sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
   };
 
   buildInputs = [

From c178ee4726f2123515b47e7853442e16ec3883ed Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 11 Apr 2017 05:39:03 +0200
Subject: [PATCH 0946/1744] ethabi: 0.2.1 -> 1.0.4

---
 pkgs/applications/altcoins/ethabi.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index b92a656c083..d2532e0d41e 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ethabi-${version}";
-  version = "0.2.1";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
-    owner = "ethcore";
+    owner = "paritytech";
     repo = "ethabi";
-    rev = "fbed04984cab0db8767e01054ee16271b8e36281";
-    sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd";
+    rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f";
+    sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
   };
 
-  depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52";
+  depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
 
   meta = {
     description = "Ethereum function call encoding (ABI) utility";

From bb2eb5b0e8d18424e87918819c9291f3b697e92f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 11 Apr 2017 03:22:32 -0500
Subject: [PATCH 0947/1744] ibtool: use xib2nib src

---
 pkgs/development/tools/ibtool/default.nix   | 22 +++++++++++++++++++++
 pkgs/development/tools/ibtool/nsplist.nix   | 14 +++++++++++++
 pkgs/development/tools/ibtool/plist-cpp.nix | 14 +++++++++++++
 pkgs/os-specific/darwin/ibtool/default.nix  | 20 -------------------
 pkgs/top-level/all-packages.nix             |  2 +-
 5 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/tools/ibtool/default.nix
 create mode 100644 pkgs/development/tools/ibtool/nsplist.nix
 create mode 100644 pkgs/development/tools/ibtool/plist-cpp.nix
 delete mode 100644 pkgs/os-specific/darwin/ibtool/default.nix

diff --git a/pkgs/development/tools/ibtool/default.nix b/pkgs/development/tools/ibtool/default.nix
new file mode 100644
index 00000000000..17b9a77a7a1
--- /dev/null
+++ b/pkgs/development/tools/ibtool/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, callPackage, fetchFromGitHub, pugixml, boost }:
+
+let
+
+  NSPlist = callPackage ./nsplist.nix { };
+  PlistCpp = callPackage ./plist-cpp.nix { inherit NSPlist; };
+
+in
+
+stdenv.mkDerivation {
+  name = "xib2nib-730e177";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "xib2nib";
+    rev = "636fe783e8625bbdd7bfeaf85470ba3eb7b90359";
+    sha256 = "08fhx8rww95h1fpl1cwhd82bcqv1k51k542v4kawjf8w814g5y1c";
+  };
+
+  buildInputs = [ PlistCpp pugixml boost ];
+  makeFlags = [ "PREFIX=$(out)" ];
+}
diff --git a/pkgs/development/tools/ibtool/nsplist.nix b/pkgs/development/tools/ibtool/nsplist.nix
new file mode 100644
index 00000000000..557cb5b3bd5
--- /dev/null
+++ b/pkgs/development/tools/ibtool/nsplist.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation {
+  name = "nsplist-713decf";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "NSPlist";
+    rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a";
+    sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
+  };
+
+  buildInputs = [ cmake ];
+}
diff --git a/pkgs/development/tools/ibtool/plist-cpp.nix b/pkgs/development/tools/ibtool/plist-cpp.nix
new file mode 100644
index 00000000000..3e15489898d
--- /dev/null
+++ b/pkgs/development/tools/ibtool/plist-cpp.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
+
+stdenv.mkDerivation {
+  name = "plistcpp-11615d";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "PlistCpp";
+    rev = "11615deab3369356a182dabbf5bae30574967264";
+    sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
+  };
+
+  buildInputs = [ cmake boost NSPlist pugixml ];
+}
diff --git a/pkgs/os-specific/darwin/ibtool/default.nix b/pkgs/os-specific/darwin/ibtool/default.nix
deleted file mode 100644
index 556426ac62d..00000000000
--- a/pkgs/os-specific/darwin/ibtool/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "ibtool";
-  src = "/usr/bin/ibtool";
-
-  unpackPhase = "true";
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p "$out"/bin
-    ln -s "$src" "$out"/bin
-  '';
-
-  meta = with stdenv.lib; {
-    platforms   = platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f6598f975..9c909a49a97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18408,5 +18408,5 @@ with pkgs;
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
-  ibtool = callPackage ../os-specific/darwin/ibtool {};
+  ibtool = callPackage ../development/tools/ibtool {};
 }

From d84029f2960784938de2bf32d03be367762aec04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 6 Apr 2017 16:14:45 +0200
Subject: [PATCH 0948/1744] ruby-modules: check tzinfo version

tzinfo 0.3.xx does not contain the file

lib/tzinfo/zoneinfo_data_source.rb

it is only included in the 1.x branch.

closes #24080
closes #24682
---
 pkgs/development/ruby-modules/gem-config/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 02fe9f50558..e115b2c679d 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -211,7 +211,7 @@ in
     buildInputs = [ curl ];
   };
 
-  tzinfo = attrs: {
+  tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
     dontBuild = false;
     postPatch = ''
       substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \

From c7e1a25765d403bb352b07cc44c2110d25b654c5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:50:19 +0300
Subject: [PATCH 0949/1744] gawk: 4.1.3 -> 4.1.4

---
 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 271a89b784d..1a1590b82d4 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -5,11 +5,11 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.3";
+  name = "gawk-4.1.4";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
+    sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak";
   };
 
   # When we do build separate interactive version, it makes sense to always include man.

From 5de624e437ae7207f29429cad3920748040b53d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:53:37 +0300
Subject: [PATCH 0950/1744] gmp: 6.1.1 -> 6.1.2

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

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index bb4e40dd3a7..e30c15e629e 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -3,11 +3,11 @@
 let inherit (stdenv.lib) optional optionalString; in
 
 let self = stdenv.mkDerivation rec {
-  name = "gmp-6.1.1";
+  name = "gmp-6.1.2";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
     urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
-    sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458";
+    sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj";
   };
 
   #outputs TODO: split $cxx due to libstdc++ dependency

From 72b2cbe3b7c2ecc97203d04eedade5722359817d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:53:49 +0300
Subject: [PATCH 0951/1744] libsigsegv: 2.10 -> 2.11

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

diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 3353fbf9e8d..1cbd5bb52f5 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libsigsegv-2.10";
+  name = "libsigsegv-2.11";
 
   src = fetchurl {
     url = "mirror://gnu/libsigsegv/${name}.tar.gz";
-    sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44";
+    sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
   };
 
   # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch

From 6b84ee9f965a7787cdbe4e2e82aa3f305c478098 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:54:06 +0300
Subject: [PATCH 0952/1744] lzma: 5.2.2 -> 5.2.3

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

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 3092bd840c4..55ab89993c7 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xz-5.2.2";
+  name = "xz-5.2.3";
 
   src = fetchurl {
     url = "http://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg";
+    sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x";
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];

From 8eb25e12451f0efd68ab7edab2d0bb3a9f2d8735 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:54:18 +0300
Subject: [PATCH 0953/1744] lzo: 2.09 -> 2.10

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

diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 23168de43ed..8739c9d25d5 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.09";
+  name = "lzo-2.10";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j";
+    sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60";
   };
 
   configureFlags = [ "--enable-shared" ];

From d550c9071206013cb90ee9317080db82e286f69b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:54:30 +0300
Subject: [PATCH 0954/1744] patchutils: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 75922a6c830..28b3b6ed5b7 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchutils-0.3.3";
+  name = "patchutils-0.3.4";
 
   src = fetchurl {
     url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
-    sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
+    sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
   };
 
   patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one

From 1ccd871fde18054e7abed0d76f197cbc196fef9b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:55:36 +0300
Subject: [PATCH 0955/1744] procps: 3.3.11 -> 3.3.12

---
 pkgs/os-specific/linux/procps-ng/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index afe1a438860..c52dfbe461a 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, ncurses }:
 
-stdenv.mkDerivation {
-  name = "procps-3.3.11";
+stdenv.mkDerivation rec {
+  name = "procps-${version}";
+  version = "3.3.12";
 
   src = fetchurl {
-    url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz;
-    sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9";
+    url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
+    sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf";
   };
 
   buildInputs = [ ncurses ];

From 7f8202bf839e150b3824dbbcba585725a076bed2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 13:45:29 +0300
Subject: [PATCH 0956/1744] Fix tarball evaluation

http://hydra.nixos.org/build/51460386

This seems the path of least resistance. Adding "x86_64-darwin" to
supportedSystems causes other errors.
---
 maintainers/scripts/all-tarballs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix
index 552f8802296..d981a1fa7db 100644
--- a/maintainers/scripts/all-tarballs.nix
+++ b/maintainers/scripts/all-tarballs.nix
@@ -14,5 +14,5 @@ removeAttrs (import ../../pkgs/top-level/release.nix
     supportedSystems = [ "x86_64-linux" ];
   })
   [ # Remove jobs whose evaluation depends on a writable Nix store.
-    "tarball" "unstable"
+    "tarball" "unstable" "darwin-tested"
   ]

From e4b48c71864400a0e2ba79258668ff9b4762cd82 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 14:00:49 +0300
Subject: [PATCH 0957/1744] libsigsegv: Remove aarch64 patch, enable tests

The aarch64 patch has been applied upstream. Let's hope that the new
release fixes the tests as well.
---
 pkgs/development/libraries/libsigsegv/aarch64.patch | 12 ------------
 pkgs/development/libraries/libsigsegv/default.nix   |  9 +--------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/libsigsegv/aarch64.patch

diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch
deleted file mode 100644
index 7bb48a230ce..00000000000
--- a/pkgs/development/libraries/libsigsegv/aarch64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure b/configure
-index 6c4e868..0298e19 100755
---- a/configure
-+++ b/configure
-@@ -14501,6 +14501,7 @@ else
- 
-     case "$host_cpu" in
-             a29k | \
-+      aarch64* | \
-       alpha* | \
-       arc | \
-       arm* | strongarm* | xscale* | \
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 1cbd5bb52f5..0e644686af0 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -8,14 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
   };
 
-  # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch
-  # but applied directly to configure since we can't use autoreconf while bootstrapping.
-  patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64"
-    then [ ./aarch64.patch ]
-    else null; # TODO: change to lib.optional on next mass rebuild
-
-  # https://github.com/NixOS/nixpkgs/issues/6028
-  doCheck = false;
+  doCheck = true;
 
   meta = {
     homepage = http://www.gnu.org/software/libsigsegv/;

From 39e95aa159ec002f1c1f4bfa28e0eb944e80da5c Mon Sep 17 00:00:00 2001
From: "Vince v. Oosten" <vince@vince.lol>
Date: Mon, 10 Apr 2017 23:36:35 +0200
Subject: [PATCH 0958/1744] add disk storage to libvirt

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 96649a0927e..9eb4c116485 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,7 +4,7 @@
 , 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
+, curl, libiconv, gmp, xen, zfs, parted
 }:
 
 with stdenv.lib;
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
     "--with-test"
     "--with-esx"
     "--with-remote"
+    "--with-storage-disk"
   ] ++ optionals stdenv.isLinux [
     "--with-attr"
     "--with-apparmor"

From 285097af2781cde7eaf819dba39f6d2bfad51692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 11 Apr 2017 14:16:28 +0200
Subject: [PATCH 0959/1744] rustRegistry: 2017-04-08 -> 2017-04-11

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index ce8605a27e8..77133d1e6af 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-04-08";
-  rev = "9876afbb35a2fe28748990f76d91eaae827e2aae";
-  sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh";
+  version = "2017-04-11";
+  rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38";
+  sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy";
 
   src = fetchFromGitHub {
       inherit rev;

From 8c8942a5e4785440eacf3353c3a1885a8d800c59 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 10 Apr 2017 23:33:22 +0200
Subject: [PATCH 0960/1744] firefox-bin: alsaLib.dev is needed

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 01cd7a1df38..5bd275ba31d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -82,6 +82,7 @@ stdenv.mkDerivation {
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
       alsaLib
+      alsaLib.dev
       atk
       cairo
       curl

From 8fcb9275d124bce01f45c68a12d7d2aba2689519 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 11 Apr 2017 13:12:26 +0200
Subject: [PATCH 0961/1744] pypi2nix: 1.6.0 -> 1.8.0

---
 pkgs/development/tools/pypi2nix/default.nix | 36 ++++++++++++++-------
 pkgs/top-level/all-packages.nix             |  4 ++-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 1e6b6690e71..e6c2467bc8a 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
+{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git
+, nix-prefetch-hg
 }:
 
 let
 
-  version = "1.6.0";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
+    sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za";
   };
 
   click = fetchurl {
-    url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-    sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
+    url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
+    sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
   };
 
   requests = fetchurl {
-    url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
-    sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
+    url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
+    sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
   };
 
 in stdenv.mkDerivation rec {
@@ -27,7 +28,11 @@ in stdenv.mkDerivation rec {
     click
     requests
   ];
-  buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
+  buildInputs = [
+    pythonPackages.python pythonPackages.flake8
+    zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
+  ];
+
   sourceRoot = ".";
 
   postUnpack = ''
@@ -47,13 +52,14 @@ in stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py
-    sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
+    sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
+    sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py
   '';
 
   commonPhase = ''
     mkdir -p $out/bin
 
-    echo "#!${python.interpreter}" >  $out/bin/pypi2nix
+    echo "#!${pythonPackages.python.interpreter}" >  $out/bin/pypi2nix
     echo "import pypi2nix.cli" >> $out/bin/pypi2nix
     echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
 
@@ -62,8 +68,16 @@ in stdenv.mkDerivation rec {
     export PYTHONPATH=$out/pkgs:$PYTHONPATH
   '';
 
+  # flake8 doesn't run on python3
+  doCheck = false;
+  checkPhase = ''
+    flake8 ${src}/src
+  '';
+
   installPhase = commonPhase + ''
-    wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
+    wrapProgram $out/bin/pypi2nix \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin"
   '';
 
   shellHook = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1a4541b3e4..1fe64af36d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6073,7 +6073,9 @@ with pkgs;
 
   pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
 
-  pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
+  pypi2nix = callPackage ../development/tools/pypi2nix {
+    pythonPackages = python3Packages;
+  };
 
   svg2tikz = python27Packages.svg2tikz;
 

From 3dd66ec6e91c49bff788a0fe43e8b5244800601b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 11 Apr 2017 15:02:45 +0200
Subject: [PATCH 0962/1744] nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 93463509b79..96848f5cd40 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -121,12 +121,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5122_c60715e";
+    suffix = "pre5152_915f62fa";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
-      sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
+      rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9";
+      sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
     };
     fromGit = true;
   });

From 4f61dd7581a8ed08ae90c5d617fc12c95f6fc495 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Tue, 11 Apr 2017 15:30:42 +0300
Subject: [PATCH 0963/1744] bonnie: Update Darwin patch

---
 .../filesystems/bonnie/bonnie-homebrew.patch  | 90 ++-----------------
 1 file changed, 7 insertions(+), 83 deletions(-)

diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
index e4903143f11..aba80e7938d 100644
--- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
+++ b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
@@ -1,3 +1,7 @@
+Derivied from a patch distributed with the Homebrew formula:
+https://github.com/Homebrew/homebrew-core/blob/6ae11ea82c00dc8c11297ecc3f06bc33979862d8/Formula/bonnie++.rb
+
+
 Copyright 2009-2016 Homebrew contributors.
 
 Redistribution and use in source and binary forms, with or without
@@ -23,52 +27,15 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 # Changes included in this patchset:
-# 1) Explicitly use clang/clang++ in Makefile
-# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol"
-#    Remove the construct in favor of macro targets min()/max() provided by the library
-#    Files affected: port.h.in port.h duration.cpp bonnie++.cpp
 # 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of
 #    splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place.
 #    The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked.
 #    Files affected: bonnie++.cp
 
-diff --git i/Makefile w/Makefile
-index 4bb5103..8f7ed41 100644
---- i/Makefile
-+++ w/Makefile
-@@ -10,8 +10,8 @@ eprefix=${prefix}
- #MORE_WARNINGS=-Weffc++
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
- CFLAGS=-O2  -DNDEBUG $(WFLAGS) $(MORECFLAGS)
--CXX=g++ $(CFLAGS)
--LINK=g++
-+CXX=clang++ $(CFLAGS)
-+LINK=clang++
- THREAD_LFLAGS=-lpthread
-
- INSTALL=/usr/bin/install -c
 diff --git i/bonnie++.cpp w/bonnie++.cpp
 index 8c5a43a..8a4b3dc 100644
 --- i/bonnie++.cpp
 +++ w/bonnie++.cpp
-@@ -73,7 +73,7 @@ public:
-   void set_io_chunk_size(int size)
-     { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
-   void set_file_chunk_size(int size)
--    { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
-+    { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
- 
-   // Return the page-aligned version of the local buffer
-   char *buf() { return m_buf_pa; }
-@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag)
-  , m_buf(NULL)
-  , m_buf_pa(NULL)
- {
--  pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
-+  pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
-   SetName(".");
- }
- 
 @@ -294,11 +294,7 @@ int main(int argc, char *argv[])
        {
          char *sbuf = _strdup(optarg);
@@ -81,7 +48,7 @@ index 8c5a43a..8a4b3dc 100644
          size = strtok(NULL, "");
          if(size)
          {
-@@ -384,17 +380,8 @@ int main(int argc, char *argv[])
+@@ -384,15 +380,6 @@ int main(int argc, char *argv[])
      if(file_size % 1024 > 512)
        file_size = file_size + 1024 - (file_size % 1024);
    }
@@ -94,13 +61,9 @@ index 8c5a43a..8a4b3dc 100644
 -    usage();
 -  }
 -#endif
--  globals.byte_io_size = __min(file_size, globals.byte_io_size);
--  globals.byte_io_size = __max(0, globals.byte_io_size);
-+  globals.byte_io_size = min(file_size, globals.byte_io_size);
-+  globals.byte_io_size = max(0, globals.byte_io_size);
+   globals.byte_io_size = min(file_size, globals.byte_io_size);
+   globals.byte_io_size = max(0, globals.byte_io_size);
  
-   if(machine == NULL)
-   {
 @@ -465,14 +452,6 @@ int main(int argc, char *argv[])
       && (directory_max_size < directory_min_size || directory_max_size < 0
       || directory_min_size < 0) )
@@ -116,42 +79,3 @@ index 8c5a43a..8a4b3dc 100644
    if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
    {
      fprintf(stderr
-diff --git i/duration.cpp w/duration.cpp
-index efa3fd3..f943155 100644
---- i/duration.cpp
-+++ w/duration.cpp
-@@ -38,7 +38,7 @@ double Duration_Base::stop()
-   getTime(&tv);
-   double ret;
-   ret = tv - m_start;
--  m_max = __max(m_max, ret);
-+  m_max = max(m_max, ret);
-   return ret;
- }
- 
-diff --git i/port.h w/port.h
-index 8d53622..2e1f112 100644
---- i/port.h
-+++ w/port.h
-@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
- #endif
- 
- typedef int FILE_TYPE;
--#define __min min
--#define __max max
- typedef unsigned int UINT;
- typedef unsigned long ULONG;
- typedef const char * PCCHAR;
-diff --git i/port.h.in w/port.h.in
-index 69c8f24..8359d72 100644
---- i/port.h.in
-+++ w/port.h.in
-@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
- #endif
- 
- typedef int FILE_TYPE;
--#define __min min
--#define __max max
- typedef unsigned int UINT;
- typedef unsigned long ULONG;
- typedef const char * PCCHAR;

From 29b415dcdb9bca8655f09f7fee46be268bb9af87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 11 Apr 2017 15:36:51 +0200
Subject: [PATCH 0964/1744] Add nixUnstable.perl-bindings

---
 pkgs/tools/package-management/nix/default.nix | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 96848f5cd40..629c9b68536 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -16,7 +16,8 @@ let
     outputs = [ "out" "dev" "man" "doc" ];
 
     nativeBuildInputs =
-      [ perl pkgconfig ]
+      [ pkgconfig ]
+      ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ]
       ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
 
     buildInputs = [ curl openssl sqlite xz ]
@@ -43,12 +44,12 @@ let
       [ "--with-store-dir=${storeDir}"
         "--localstatedir=${stateDir}"
         "--sysconfdir=/etc"
-        "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
-        "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
         "--disable-init-state"
         "--enable-gc"
       ]
-      ++ lib.optional (!lib.versionAtLeast version "1.12pre") [
+      ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [
+        "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
+        "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
         "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
       ];
 
@@ -97,13 +98,33 @@ let
       maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.all;
     };
+
+    passthru = { inherit fromGit; };
+  };
+
+  perl-bindings = { nix }: stdenv.mkDerivation {
+    name = "nix-perl-" + nix.version;
+
+    inherit (nix) src;
+
+    postUnpack = "sourceRoot=$sourceRoot/perl";
+
+    nativeBuildInputs =
+      [ perl pkgconfig curl nix libsodium ]
+      ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ];
+
+    configureFlags =
+      [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
+        "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
+        "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
+      ];
   };
 
 in rec {
 
   nix = nixStable;
 
-  nixStable = common rec {
+  nixStable = (common rec {
     name = "nix-1.11.8";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@@ -117,9 +138,9 @@ in rec {
         --replace 'std::less<Symbol>, gc_allocator<Value *>' \
                   'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >'
     '';
-  };
+  }) // { perl-bindings = nixStable; };
 
-  nixUnstable = lib.lowPrio (common rec {
+  nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
     suffix = "pre5152_915f62fa";
     src = fetchFromGitHub {
@@ -129,6 +150,6 @@ in rec {
       sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
     };
     fromGit = true;
-  });
+  })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
 
 }

From 00c3bd1561b5027562e827341e71cfd2fab1904c Mon Sep 17 00:00:00 2001
From: Vince van Oosten <vvanoosten@computest.nl>
Date: Tue, 11 Apr 2017 16:05:07 +0200
Subject: [PATCH 0965/1744] add parted to build inputs

---
 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 9eb4c116485..9449a8f538f 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+    attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted
   ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl xen

From 3ab45f4b369c9c741b55ddedeaac4c797dc61c04 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 18:08:51 +0200
Subject: [PATCH 0966/1744] treewide: use boolToString function

---
 lib/trivial.nix                               |  5 ++++
 .../config/fonts/fontconfig-penultimate.nix   |  2 +-
 nixos/modules/config/fonts/fontconfig.nix     |  2 +-
 nixos/modules/services/cluster/kubernetes.nix | 14 +++++------
 .../continuous-integration/hydra/default.nix  |  2 +-
 .../modules/services/databases/cassandra.nix  |  8 +++---
 nixos/modules/services/databases/mongodb.nix  |  2 --
 nixos/modules/services/logging/graylog.nix    |  5 ++--
 nixos/modules/services/misc/cgminer.nix       |  2 +-
 nixos/modules/services/misc/confd.nix         |  2 +-
 .../modules/services/misc/matrix-synapse.nix  | 25 +++++++++----------
 nixos/modules/services/misc/nix-daemon.nix    |  4 +--
 .../services/misc/taskserver/default.nix      |  2 +-
 .../modules/services/monitoring/collectd.nix  |  2 +-
 nixos/modules/services/monitoring/grafana.nix | 12 ++++-----
 .../services/network-filesystems/netatalk.nix |  2 +-
 .../services/network-filesystems/samba.nix    |  2 +-
 .../services/network-filesystems/tahoe.nix    |  6 ++---
 nixos/modules/services/networking/aiccu.nix   | 15 ++++++-----
 nixos/modules/services/networking/btsync.nix  |  9 +++----
 .../networking/firefox/sync-server.nix        |  2 +-
 nixos/modules/services/networking/i2pd.nix    | 20 +++++++--------
 .../networking/ircd-hybrid/default.nix        |  2 +-
 .../modules/services/networking/mosquitto.nix |  2 +-
 nixos/modules/services/networking/murmur.nix  | 10 ++++----
 nixos/modules/services/networking/prosody.nix |  4 +--
 nixos/modules/services/networking/sslh.nix    |  2 +-
 nixos/modules/services/networking/znc.nix     |  2 +-
 .../services/security/oauth2_proxy.nix        | 17 ++++++-------
 .../modules/services/torrent/transmission.nix |  3 +--
 .../services/web-apps/atlassian/crowd.nix     |  2 +-
 .../services/web-apps/quassel-webserver.nix   |  4 +--
 nixos/modules/services/web-apps/tt-rss.nix    |  2 --
 .../services/x11/display-managers/sddm.nix    |  2 +-
 .../services/x11/hardware/multitouch.nix      |  2 +-
 .../java-modules/build-maven-package.nix      |  2 +-
 .../ocaml-modules/mtime/default.nix           | 10 +++++---
 .../ocaml-modules/nocrypto/default.nix        |  2 +-
 .../ocaml-modules/notty/default.nix           |  2 +-
 pkgs/development/ocaml-modules/vg/default.nix | 14 ++++++-----
 40 files changed, 111 insertions(+), 118 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index acbd687dd98..62906339e60 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -30,6 +30,11 @@ rec {
   /* boolean “and” */
   and = x: y: x && y;
 
+  /* Convert a boolean to a string.
+     Note that toString on a bool returns "1" and "".
+  */
+  boolToString = b: if b then "true" else "false";
+
   /* Merge two attribute sets shallowly, right side trumps left
 
      Example:
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 83d6532774e..3e163b8ec51 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.fonts.fontconfig;
 
-  fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";
+  fcBool = x: "<bool>" + (boolToString x) + "</bool>";
 
   # back-supported fontconfig version and package
   # version is used for font cache generation
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index d44b583447a..12f5ca2e799 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -20,7 +20,7 @@ with lib;
 
 let cfg = config.fonts.fontconfig;
 
-    fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";
+    fcBool = x: "<bool>" + (boolToString x) + "</bool>";
 
     # back-supported fontconfig version and package
     # version is used for font cache generation
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 9ccc7295019..bf7b44c698c 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -612,8 +612,8 @@ in {
             --require-kubeconfig \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
-            --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
-            --register-schedulable=${if cfg.kubelet.registerSchedulable then "true" else "false"} \
+            --register-node=${boolToString cfg.kubelet.registerNode} \
+            --register-schedulable=${boolToString cfg.kubelet.registerSchedulable} \
             ${optionalString (cfg.kubelet.tlsCertFile != null)
               "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \
             ${optionalString (cfg.kubelet.tlsKeyFile != null)
@@ -621,7 +621,7 @@ in {
             --healthz-bind-address=${cfg.kubelet.healthz.bind} \
             --healthz-port=${toString cfg.kubelet.healthz.port} \
             --hostname-override=${cfg.kubelet.hostname} \
-            --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
+            --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \
             --root-dir=${cfg.dataDir} \
             --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
             ${optionalString (cfg.kubelet.clusterDns != "")
@@ -670,14 +670,14 @@ in {
             --bind-address=0.0.0.0 \
             ${optionalString (cfg.apiserver.advertiseAddress != null)
               "--advertise-address=${cfg.apiserver.advertiseAddress}"} \
-            --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
+            --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\
             ${optionalString (cfg.apiserver.tlsCertFile != null)
               "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
             ${optionalString (cfg.apiserver.tlsKeyFile != null)
               "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \
             ${optionalString (cfg.apiserver.tokenAuth != null)
               "--token-auth-file=${cfg.apiserver.tokenAuth}"} \
-            --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \
+            --kubelet-https=${boolToString cfg.apiserver.kubeletHttps} \
             ${optionalString (cfg.apiserver.kubeletClientCaFile != null)
               "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \
             ${optionalString (cfg.apiserver.kubeletClientCertFile != null)
@@ -719,7 +719,7 @@ in {
           ExecStart = ''${cfg.package}/bin/kube-scheduler \
             --address=${cfg.scheduler.address} \
             --port=${toString cfg.scheduler.port} \
-            --leader-elect=${if cfg.scheduler.leaderElect then "true" else "false"} \
+            --leader-elect=${boolToString cfg.scheduler.leaderElect} \
             --kubeconfig=${kubeconfig} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
@@ -744,7 +744,7 @@ in {
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \
             --kubeconfig=${kubeconfig} \
-            --leader-elect=${if cfg.controllerManager.leaderElect then "true" else "false"} \
+            --leader-elect=${boolToString cfg.controllerManager.leaderElect} \
             ${if (cfg.controllerManager.serviceAccountKeyFile!=null)
               then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}"
               else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index fa550f68b33..57f592a2e55 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -328,7 +328,7 @@ in
           IN_SYSTEMD = "1"; # to get log severity levels
         };
         serviceConfig =
-          { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${if cfg.useSubstitutes then "true" else "false"}";
+          { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${boolToString cfg.useSubstitutes}";
             ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock";
             User = "hydra-queue-runner";
             Restart = "always";
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 5df4ae57f80..1e5cd8f5413 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -21,8 +21,8 @@ let
   cassandraConf = ''
     cluster_name: ${cfg.clusterName}
     num_tokens: 256
-    auto_bootstrap: ${if cfg.autoBootstrap then "true" else "false"}
-    hinted_handoff_enabled: ${if cfg.hintedHandOff then "true" else "false"}
+    auto_bootstrap: ${boolToString cfg.autoBootstrap}
+    hinted_handoff_enabled: ${boolToString cfg.hintedHandOff}
     hinted_handoff_throttle_in_kb: ${builtins.toString cfg.hintedHandOffThrottle}
     max_hints_delivery_threads: 2
     max_hint_window_in_ms: 10800000 # 3 hours
@@ -62,7 +62,7 @@ let
     rpc_keepalive: true
     rpc_server_type: sync
     thrift_framed_transport_size_in_mb: 15
-    incremental_backups: ${if cfg.incrementalBackups then "true" else "false"}
+    incremental_backups: ${boolToString cfg.incrementalBackups}
     snapshot_before_compaction: false
     auto_snapshot: true
     column_index_size_in_kb: 64
@@ -89,7 +89,7 @@ let
       truststore: ${cfg.trustStorePath}
       truststore_password: ${cfg.trustStorePassword}
     client_encryption_options:
-      enabled: ${if cfg.clientEncryption then "true" else "false"}
+      enabled: ${boolToString cfg.clientEncryption}
       keystore: ${cfg.keyStorePath}
       keystore_password: ${cfg.keyStorePassword}
     internode_compression: all
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 38e46a0c6ef..c56564f57f3 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  b2s = x: if x then "true" else "false";
-
   cfg = config.services.mongodb;
 
   mongodb = cfg.package;
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 95283096662..9f0fb11f025 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -4,16 +4,15 @@ with lib;
 
 let
   cfg = config.services.graylog;
-  configBool = b: if b then "true" else "false";
 
   confFile = pkgs.writeText "graylog.conf" ''
-    is_master = ${configBool cfg.isMaster}
+    is_master = ${boolToString cfg.isMaster}
     node_id_file = ${cfg.nodeIdFile}
     password_secret = ${cfg.passwordSecret}
     root_username = ${cfg.rootUsername}
     root_password_sha2 = ${cfg.rootPasswordSha2}
     elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
-    elasticsearch_discovery_zen_ping_multicast_enabled = ${configBool cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
+    elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
     elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
     message_journal_dir = ${cfg.messageJournalDir}
     mongodb_uri = ${cfg.mongodbUri}
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 5f97cc03414..d5071d8ff76 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.cgminer;
 
   convType = with builtins;
-    v: if isBool v then (if v then "true" else "false") else toString v;
+    v: if isBool v then boolToString v else toString v;
   mergedHwConfig =
     mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')
       (foldAttrs (n: a: [n] ++ a) [] cfg.hardware);
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index fe13013286b..8e9bec15dd4 100755
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -12,7 +12,7 @@ let
     nodes = [ ${concatMapStringsSep "," (s: ''"${s}"'') cfg.nodes}, ]
     prefix = "${cfg.prefix}"
     log-level = "${cfg.logLevel}"
-    watch = ${if cfg.watch then "true" else "false"}
+    watch = ${boolToString cfg.watch}
   '';
 
 in {
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 4a1bea50c14..ae9826968b1 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -5,9 +5,8 @@ with lib;
 let
   cfg = config.services.matrix-synapse;
   logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
-  mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${fromBool r.compress}}'';
-  mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
-  fromBool = x: if x then "true" else "false";
+  mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}'';
+  mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
   configFile = pkgs.writeText "homeserver.yaml" ''
 ${optionalString (cfg.tls_certificate_path != null) ''
 tls_certificate_path: "${cfg.tls_certificate_path}"
@@ -18,7 +17,7 @@ tls_private_key_path: "${cfg.tls_private_key_path}"
 ${optionalString (cfg.tls_dh_params_path != null) ''
 tls_dh_params_path: "${cfg.tls_dh_params_path}"
 ''}
-no_tls: ${fromBool cfg.no_tls}
+no_tls: ${boolToString cfg.no_tls}
 ${optionalString (cfg.bind_port != null) ''
 bind_port: ${toString cfg.bind_port}
 ''}
@@ -30,7 +29,7 @@ bind_host: "${cfg.bind_host}"
 ''}
 server_name: "${cfg.server_name}"
 pid_file: "/var/run/matrix-synapse.pid"
-web_client: ${fromBool cfg.web_client}
+web_client: ${boolToString cfg.web_client}
 ${optionalString (cfg.public_baseurl != null) ''
 public_baseurl: "${cfg.public_baseurl}"
 ''}
@@ -58,8 +57,8 @@ media_store_path: "/var/lib/matrix-synapse/media"
 uploads_path: "/var/lib/matrix-synapse/uploads"
 max_upload_size: "${cfg.max_upload_size}"
 max_image_pixels: "${cfg.max_image_pixels}"
-dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails}
-url_preview_enabled: ${fromBool cfg.url_preview_enabled}
+dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails}
+url_preview_enabled: ${boolToString cfg.url_preview_enabled}
 ${optionalString (cfg.url_preview_enabled == true) ''
 url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist}
 url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist}
@@ -67,10 +66,10 @@ url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist}
 ''}
 recaptcha_private_key: "${cfg.recaptcha_private_key}"
 recaptcha_public_key: "${cfg.recaptcha_public_key}"
-enable_registration_captcha: ${fromBool cfg.enable_registration_captcha}
+enable_registration_captcha: ${boolToString cfg.enable_registration_captcha}
 turn_uris: ${builtins.toJSON cfg.turn_uris}
 turn_shared_secret: "${cfg.turn_shared_secret}"
-enable_registration: ${fromBool cfg.enable_registration}
+enable_registration: ${boolToString cfg.enable_registration}
 ${optionalString (cfg.registration_shared_secret != null) ''
 registration_shared_secret: "${cfg.registration_shared_secret}"
 ''}
@@ -78,15 +77,15 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
 turn_user_lifetime: "${cfg.turn_user_lifetime}"
 user_creation_max_duration: ${cfg.user_creation_max_duration}
 bcrypt_rounds: ${cfg.bcrypt_rounds}
-allow_guest_access: ${fromBool cfg.allow_guest_access}
+allow_guest_access: ${boolToString cfg.allow_guest_access}
 trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers}
 room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}
 ${optionalString (cfg.macaroon_secret_key != null) ''
   macaroon_secret_key: "${cfg.macaroon_secret_key}"
 ''}
-expire_access_token: ${fromBool cfg.expire_access_token}
-enable_metrics: ${fromBool cfg.enable_metrics}
-report_stats: ${fromBool cfg.report_stats}
+expire_access_token: ${boolToString cfg.expire_access_token}
+enable_metrics: ${boolToString cfg.enable_metrics}
+report_stats: ${boolToString cfg.report_stats}
 signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key"
 key_refresh_interval: "${cfg.key_refresh_interval}"
 perspectives:
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4fe89838e29..bf1304ee7ac 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -41,12 +41,12 @@ let
         build-users-group = nixbld
         build-max-jobs = ${toString (cfg.maxJobs)}
         build-cores = ${toString (cfg.buildCores)}
-        build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox}
+        build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
         build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths)
         binary-caches = ${toString cfg.binaryCaches}
         trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
         binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
-        auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"}
+        auto-optimise-store = ${boolToString cfg.autoOptimiseStore}
         ${optionalString cfg.requireSignedBinaryCaches ''
           signed-binary-caches = *
         ''}
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index ba9f52f1904..ab9a6ce32f4 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -128,7 +128,7 @@ let
         certBits = cfg.pki.auto.bits;
         clientExpiration = cfg.pki.auto.expiration.client;
         crlExpiration = cfg.pki.auto.expiration.crl;
-        isAutoConfig = if needToCreateCA then "True" else "False";
+        isAutoConfig = boolToString needToCreateCA;
       }}" > "$out/main.py"
       cat > "$out/setup.py" <<EOF
       from setuptools import setup
diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 641da60e9ad..79a8a1ff5ae 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -8,7 +8,7 @@ let
   conf = pkgs.writeText "collectd.conf" ''
     BaseDir "${cfg.dataDir}"
     PIDFile "${cfg.pidFile}"
-    AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"}
+    AutoLoadPlugin ${boolToString cfg.autoLoadPlugin}
     Hostname "${config.networking.hostName}"
 
     LoadPlugin syslog
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 97806d5d83e..4fbacef788f 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -5,8 +5,6 @@ with lib;
 let
   cfg = config.services.grafana;
 
-  b2s = val: if val then "true" else "false";
-
   envOptions = {
     PATHS_DATA = cfg.dataDir;
     PATHS_PLUGINS = "${cfg.dataDir}/plugins";
@@ -32,16 +30,16 @@ let
     SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword;
     SECURITY_SECRET_KEY = cfg.security.secretKey;
 
-    USERS_ALLOW_SIGN_UP = b2s cfg.users.allowSignUp;
-    USERS_ALLOW_ORG_CREATE = b2s cfg.users.allowOrgCreate;
-    USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg;
+    USERS_ALLOW_SIGN_UP = boolToString cfg.users.allowSignUp;
+    USERS_ALLOW_ORG_CREATE = boolToString cfg.users.allowOrgCreate;
+    USERS_AUTO_ASSIGN_ORG = boolToString cfg.users.autoAssignOrg;
     USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole;
 
-    AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable;
+    AUTH_ANONYMOUS_ENABLED = boolToString cfg.auth.anonymous.enable;
     AUTH_ANONYMOUS_ORG_NAME = cfg.auth.anonymous.org_name;
     AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role;
 
-    ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable;
+    ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable;
   } // cfg.extraOptions;
 
 in {
diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix
index bff54406a2b..1dd869043f0 100644
--- a/nixos/modules/services/network-filesystems/netatalk.nix
+++ b/nixos/modules/services/network-filesystems/netatalk.nix
@@ -9,7 +9,7 @@ let
   extmapFile = pkgs.writeText "extmap.conf" cfg.extmap;
 
   afpToString = x: if builtins.typeOf x == "bool"
-                   then (if x then "true" else "false")
+                   then boolToString x
                    else toString x;
 
   volumeConfig = name:
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 6ae5292fc30..87c4f7a8ebc 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -5,7 +5,7 @@ with lib;
 let
 
   smbToString = x: if builtins.typeOf x == "bool"
-                   then (if x then "true" else "false")
+                   then boolToString x
                    else toString x;
 
   cfg = config.services.samba;
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 3d78ac096a2..9815a5434ee 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -290,14 +290,14 @@ in
                 shares.total = ${toString settings.client.shares.total}
 
                 [storage]
-                enabled = ${if settings.storage.enable then "true" else "false"}
+                enabled = ${boolToString settings.storage.enable}
                 reserved_space = ${settings.storage.reservedSpace}
 
                 [helper]
-                enabled = ${if settings.helper.enable then "true" else "false"}
+                enabled = ${boolToString settings.helper.enable}
 
                 [sftpd]
-                enabled = ${if settings.sftpd.enable then "true" else "false"}
+                enabled = ${boolToString settings.sftpd.enable}
                 ${optionalString (settings.sftpd.port != null)
                   "port = ${toString settings.sftpd.port}"}
                 ${optionalString (settings.sftpd.hostPublicKeyFile != null)
diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix
index aeb0910d624..ac755270951 100644
--- a/nixos/modules/services/networking/aiccu.nix
+++ b/nixos/modules/services/networking/aiccu.nix
@@ -5,7 +5,6 @@ with lib;
 let
 
   cfg = config.services.aiccu;
-  showBool = b: if b then "true" else "false";
   notNull = a: ! isNull a;
   configFile = pkgs.writeText "aiccu.conf" ''
     ${if notNull cfg.username then "username " + cfg.username else ""}
@@ -13,16 +12,16 @@ let
     protocol ${cfg.protocol}
     server ${cfg.server}
     ipv6_interface ${cfg.interfaceName}
-    verbose ${showBool cfg.verbose}
+    verbose ${boolToString cfg.verbose}
     daemonize true
-    automatic ${showBool cfg.automatic}
-    requiretls ${showBool cfg.requireTLS}
+    automatic ${boolToString cfg.automatic}
+    requiretls ${boolToString cfg.requireTLS}
     pidfile ${cfg.pidFile}
-    defaultroute ${showBool cfg.defaultRoute}
+    defaultroute ${boolToString cfg.defaultRoute}
     ${if notNull cfg.setupScript then cfg.setupScript else ""}
-    makebeats ${showBool cfg.makeHeartBeats}
-    noconfigure ${showBool cfg.noConfigure}
-    behindnat ${showBool cfg.behindNAT}
+    makebeats ${boolToString cfg.makeHeartBeats}
+    noconfigure ${boolToString cfg.noConfigure}
+    behindnat ${boolToString cfg.behindNAT}
     ${if cfg.localIPv4Override then "local_ipv4_override" else ""}
   '';
 
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 92e9fa7be41..6e479a5860a 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -9,7 +9,6 @@ let
 
   listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort);
 
-  boolStr = x: if x then "true" else "false";
   optionalEmptyStr = b: v: optionalString (b != "") v;
 
   webUIConfig = optionalString cfg.enableWebUI
@@ -31,7 +30,7 @@ let
   sharedFoldersRecord =
     concatStringsSep "," (map (entry:
       let helper = attr: v:
-        if (entry ? attr) then boolStr entry.attr else boolStr v;
+        if (entry ? attr) then boolToString entry.attr else boolToString v;
       in
       ''
         {
@@ -65,11 +64,11 @@ let
         "listening_port":  ${toString cfg.listeningPort},
         "use_gui":         false,
 
-        "check_for_updates": ${boolStr cfg.checkForUpdates},
-        "use_upnp":          ${boolStr cfg.useUpnp},
+        "check_for_updates": ${boolToString cfg.checkForUpdates},
+        "use_upnp":          ${boolToString cfg.useUpnp},
         "download_limit":    ${toString cfg.downloadLimit},
         "upload_limit":      ${toString cfg.uploadLimit},
-        "lan_encrypt_data":  ${boolStr cfg.encryptLAN},
+        "lan_encrypt_data":  ${boolToString cfg.encryptLAN},
 
         ${webUIConfig}
         ${sharedFoldersConfig}
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index 5c14ceff6a0..3a95b9c4ec9 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -19,7 +19,7 @@ let
     [syncserver]
     public_url = ${cfg.publicUrl}
     ${optionalString (cfg.sqlUri != "") "sqluri = ${cfg.sqlUri}"}
-    allow_new_users = ${if cfg.allowNewUsers then "true" else "false"}
+    allow_new_users = ${boolToString cfg.allowNewUsers}
 
     [browserid]
     backend = tokenserver.verifiers.LocalVerifier
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index c5b27350b3c..24a3196bed4 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -10,8 +10,6 @@ let
 
   extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
 
-  toYesNo = b: if b then "true" else "false";
-
   mkEndpointOpt = name: addr: port: {
     enable = mkEnableOption name;
     name = mkOption {
@@ -76,10 +74,10 @@ let
 
   i2pdConf = pkgs.writeText "i2pd.conf"
   ''
-  ipv4 = ${toYesNo cfg.enableIPv4}
-  ipv6 = ${toYesNo cfg.enableIPv6}
-  notransit = ${toYesNo cfg.notransit}
-  floodfill = ${toYesNo cfg.floodfill}
+  ipv4 = ${boolToString cfg.enableIPv4}
+  ipv6 = ${boolToString cfg.enableIPv6}
+  notransit = ${boolToString cfg.notransit}
+  floodfill = ${boolToString cfg.floodfill}
   netid = ${toString cfg.netid}
   ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
   ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
@@ -88,14 +86,14 @@ let
   transittunnels = ${toString cfg.limits.transittunnels}
 
   [upnp]
-  enabled = ${toYesNo cfg.upnp.enable}
+  enabled = ${boolToString cfg.upnp.enable}
   name = ${cfg.upnp.name}
 
   [precomputation]
-  elgamal = ${toYesNo cfg.precomputation.elgamal}
+  elgamal = ${boolToString cfg.precomputation.elgamal}
 
   [reseed]
-  verify = ${toYesNo cfg.reseed.verify}
+  verify = ${boolToString cfg.reseed.verify}
   file = ${cfg.reseed.file}
   urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
 
@@ -107,11 +105,11 @@ let
       (proto: let portStr = toString proto.port; in
         ''
           [${proto.name}]
-          enabled = ${toYesNo proto.enable}
+          enabled = ${boolToString proto.enable}
           address = ${proto.address}
           port = ${toString proto.port}
           ${if proto ? keys then "keys = ${proto.keys}" else ""}
-          ${if proto ? auth then "auth = ${toYesNo proto.auth}" else ""}
+          ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
           ${if proto ? user then "user = ${proto.user}" else ""}
           ${if proto ? pass then "pass = ${proto.pass}" else ""}
           ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index ede57c5046d..bd583fb020e 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -12,7 +12,7 @@ let
     substFiles = [ "=>/conf" ./ircd.conf ];
     inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps;
 
-    ipv6Enabled = if config.networking.enableIPv6 then "true" else "false";
+    ipv6Enabled = boolToString config.networking.enableIPv6;
 
     inherit (cfg) serverName sid description adminEmail
             extraPort;
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 2325424ff3c..5451500b56f 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -16,7 +16,7 @@ let
     pid_file /run/mosquitto/pid
     acl_file ${aclFile}
     persistence true
-    allow_anonymous ${if cfg.allowAnonymous then "true" else "false"}
+    allow_anonymous ${boolToString cfg.allowAnonymous}
     bind_address ${cfg.host}
     port ${toString cfg.port}
     ${listenerConf}
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 81f968ae9fe..c961857c77a 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -26,21 +26,21 @@ let
 
     textmessagelength=${toString cfg.textMsgLength}
     imagemessagelength=${toString cfg.imgMsgLength}
-    allowhtml=${if cfg.allowHtml then "true" else "false"}
+    allowhtml=${boolToString cfg.allowHtml}
     logdays=${toString cfg.logDays}
-    bonjour=${if cfg.bonjour then "true" else "false"}
-    sendversion=${if cfg.sendVersion then "true" else "false"}
+    bonjour=${babelToString cfg.bonjour}
+    sendversion=${babelToString cfg.sendVersion}
 
     ${if cfg.registerName     == "" then "" else "registerName="+cfg.registerName}
     ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}
     ${if cfg.registerUrl      == "" then "" else "registerUrl="+cfg.registerUrl}
     ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}
 
-    certrequired=${if cfg.clientCertRequired then "true" else "false"}
+    certrequired=${babelToString cfg.clientCertRequired}
     ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
     ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}
     ${if cfg.sslCa   == "" then "" else "sslCA="+cfg.sslCa}
-    
+
     ${cfg.extraConfig}
   '';
 in
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index feaa007de15..fb9c9dc67f2 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -219,7 +219,7 @@ in
 
       data_path = "/var/lib/prosody"
 
-      allow_registration = ${ if cfg.allowRegistration then "true" else "false" };
+      allow_registration = ${boolToString cfg.allowRegistration};
 
       ${ optionalString cfg.modules.console "console_enabled = true;" }
 
@@ -244,7 +244,7 @@ in
 
       ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
         VirtualHost "${v.domain}"
-          enabled = ${if v.enabled then "true" else "false"};
+          enabled = ${boolToString v.enabled};
           ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) }
           ${ v.extraConfig }
         '') cfg.virtualHosts) }
diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index bd584a3a85d..e3d65c49fbf 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.services.sslh;
   configFile = pkgs.writeText "sslh.conf" ''
-    verbose: ${if cfg.verbose then "true" else "false"};
+    verbose: ${boolToString cfg.verbose};
     foreground: true;
     inetd: false;
     numeric: false;
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 6d68b790e86..1c63d800e26 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -35,7 +35,7 @@ let
             Port = ${toString confOpts.port}
             IPv4 = true
             IPv6 = true
-            SSL = ${if confOpts.useSSL then "true" else "false"}
+            SSL = ${boolToString confOpts.useSSL}
     </Listener>
     
     <User ${confOpts.userName}>
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index caa7d9d5081..e292fd9851e 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -10,9 +10,6 @@ let
   #   repeatedArgs (arg: "--arg=${arg}") args
   repeatedArgs = concatMapStringsSep " ";
 
-  # 'toString' doesn't quite do what we want for bools.
-  fromBool = x: if x then "true" else "false";
-
   # oauth2_proxy provides many options that are only relevant if you are using
   # a certain provider. This set maps from provider name to a function that
   # takes the configuration and returns a string that can be inserted into the
@@ -49,24 +46,24 @@ let
     --client-secret='${cfg.clientSecret}' \
     ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \
     --cookie-expire='${cfg.cookie.expire}' \
-    --cookie-httponly=${fromBool cfg.cookie.httpOnly} \
+    --cookie-httponly=${boolToString cfg.cookie.httpOnly} \
     --cookie-name='${cfg.cookie.name}' \
     --cookie-secret='${cfg.cookie.secret}' \
-    --cookie-secure=${fromBool cfg.cookie.secure} \
+    --cookie-secure=${boolToString cfg.cookie.secure} \
     ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \
     ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \
     ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \
     --http-address='${cfg.httpAddress}' \
-    ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${fromBool cfg.htpasswd.displayForm}"} \
+    ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \
     ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \
-    --pass-access-token=${fromBool cfg.passAccessToken} \
-    --pass-basic-auth=${fromBool cfg.passBasicAuth} \
-    --pass-host-header=${fromBool cfg.passHostHeader} \
+    --pass-access-token=${boolToString cfg.passAccessToken} \
+    --pass-basic-auth=${boolToString cfg.passBasicAuth} \
+    --pass-host-header=${boolToString cfg.passHostHeader} \
     --proxy-prefix='${cfg.proxyPrefix}' \
     ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \
     ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \
     ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \
-    --request-logging=${fromBool cfg.requestLogging} \
+    --request-logging=${boolToString cfg.requestLogging} \
     ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \
     ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \
     ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 5b2e4ca1606..1f319df794b 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -15,8 +15,7 @@ let
 
   # Strings must be quoted, ints and bools must not (for settings.json).
   toOption = x:
-    if x == true then "true"
-    else if x == false then "false"
+    if isBool x then boolToString x
     else if isInt x then toString x
     else toString ''"${x}"'';
 
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index ce41aa4f1e1..b54c91d7de9 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -137,7 +137,7 @@ in
 
         sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
-          -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${if cfg.proxy.secure then "true" else "false"}",' \
+          -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \
         '') + ''
           ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
       '';
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
index d19e4bc5827..2ba5698d6cb 100644
--- a/nixos/modules/services/web-apps/quassel-webserver.nix
+++ b/nixos/modules/services/web-apps/quassel-webserver.nix
@@ -12,11 +12,11 @@ let
         port: ${toString cfg.quasselCorePort},  // quasselcore port
         initialBacklogLimit: ${toString cfg.initialBacklogLimit},  // Amount of backlogs to fetch per buffer on connection
         backlogLimit: ${toString cfg.backlogLimit},  // Amount of backlogs to fetch per buffer after first retrieval
-        securecore: ${if cfg.secureCore then "true" else "false"},  // Connect to the core using SSL
+        securecore: ${boolToString cfg.secureCore},  // Connect to the core using SSL
         theme: '${cfg.theme}'  // Default UI theme
       },
       themes: ['default', 'darksolarized'],  //  Available themes
-      forcedefault: ${if cfg.forceHostAndPort then "true" else "false"},  // Will force default host and port to be used, and will hide the corresponding fields in the UI
+      forcedefault: ${boolToString cfg.forceHostAndPort},  // Will force default host and port to be used, and will hide the corresponding fields in the UI
       prefixpath: '${cfg.prefixPath}'  // Configure this if you use a reverse proxy
     };
   '';
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 5193814da72..76b0ee6da96 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -6,8 +6,6 @@ let
 
   configVersion = 26;
 
-  boolToString = b: if b then "true" else "false";
-
   cacheDir = "cache";
   lockDir = "lock";
   feedIconsDir = "feed-icons";
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index affc1261d19..99c03ca81c2 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -59,7 +59,7 @@ let
     [Autologin]
     User=${cfg.autoLogin.user}
     Session=${defaultSessionName}.desktop
-    Relogin=${if cfg.autoLogin.relogin then "true" else "false"}
+    Relogin=${boolToString cfg.autoLogin.relogin}
     ''}
 
     ${cfg.extraConfig}
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index 0e9eb021494..c03bb3b494f 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
@@ -74,7 +74,7 @@ in {
           MatchIsTouchpad "on"
           Identifier "Touchpads"
           Driver "mtrack"
-          Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}"
+          Option "IgnorePalm" "${boolToString cfg.ignorePalm}"
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
           Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index d83b43ffd75..b3c3e1732e0 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     echo "<settings><mirrors>\
       <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\
       <localRepository>$out/m2/</localRepository></settings>" >> $out/m2/settings.xml
-    ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+    ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
     cp ./target/*.jar $out/m2/${m2Path}
     cp -v ./target/*.jar $out/target/
   '';
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index a26109bd4f9..5e18d1fd6e4 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
 , jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04")
 }:
 
+with lib;
+
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-mtime-0.8.3";
 
@@ -15,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml findlib ocamlbuild opam ]
   ++ stdenv.lib.optional jsooSupport js_of_ocaml;
 
-  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}";
+  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}";
 
   installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation {
     description = "Monotonic wall-clock time for OCaml";
     homepage = http://erratique.ch/software/mtime;
     inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index f9240f7507c..91ab694eb6f 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \
-    ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"}
+    ${topkg.buildPhase} --with-lwt ${boolToString withLwt}
   '';
   inherit (topkg) installPhase;
 
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
index b967728d048..950395bd7ea 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -29,7 +29,7 @@ buildOcaml rec {
                           optional withLwt lwt;
 
   buildPhase = topkg.buildPhase
-  + " --with-lwt ${if withLwt then "true" else "false"}";
+  + " --with-lwt ${boolToString withLwt}";
 
   inherit (topkg) installPhase;
 
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index cb7878ac731..ba33081486d 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
 , uchar, result, gg, uutf, otfm, js_of_ocaml,
   pdfBackend ? true, # depends on uutf and otfm
   htmlcBackend ? true # depends on js_of_ocaml
 }:
 
+with lib;
+
 let
   inherit (stdenv.lib) optionals versionAtLeast;
 
   pname = "vg";
   version = "0.9.0";
   webpage = "http://erratique.ch/software/${pname}";
-  sob = b: if b then "true" else "false";
 in
 
 assert versionAtLeast ocaml.version "4.02.0";
@@ -35,13 +36,14 @@ stdenv.mkDerivation rec {
   unpackCmd = "tar xjf $src";
 
   buildPhase = topkg.buildPhase
-  + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}"
-  + " --with-js_of_ocaml ${sob htmlcBackend}"
-  + " --with-cairo2 false";
+    + " --with-uutf ${boolToString pdfBackend}"
+    + " --with-otfm ${boolToString pdfBackend}"
+    + " --with-js_of_ocaml ${boolToString htmlcBackend}"
+    + " --with-cairo2 false";
 
   inherit (topkg) installPhase;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Declarative 2D vector graphics for OCaml";
     longDescription = ''
     Vg is an OCaml module for declarative 2D vector graphics. In Vg, images

From e3559c23c2c0c721627b60dae34c6de1ab685570 Mon Sep 17 00:00:00 2001
From: edanaher <github@edanaher.net>
Date: Tue, 11 Apr 2017 12:28:05 -0400
Subject: [PATCH 0967/1744] acme: Add "domain" option to separate domain from
 name

Fixes #24731.
---
 nixos/modules/security/acme.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index ada198e0e58..5301ac14805 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -19,6 +19,12 @@ let
         '';
       };
 
+      domain = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Domain to fetch certificate for (defaults to the entry name)";
+      };
+
       email = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -157,9 +163,10 @@ in
           servicesLists = mapAttrsToList certToServices cfg.certs;
           certToServices = cert: data:
               let
+                domain = if data.domain != null then data.domain else cert;
                 cpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
-                cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
+                cmdline = [ "-v" "-d" 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 6047401a71b736bd8f203127bb05ea5592237b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 11 Apr 2017 19:12:07 +0200
Subject: [PATCH 0968/1744] pythonPackages.boto3: disable tests (fails due to
 network access)

The test failure started happening with commit
8d18f67a9705617953d43c5a0624 ("awscli: 1.11.45 -> 1.11.75"). That commit
also updates botocore, a dependency of boto3.

This unbreaks 'nixops' (a dependee).
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fea23a137e7..2a3a9dfb943 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3187,6 +3187,9 @@ in {
       runHook postCheck
     '';
 
+    # Network access
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/boto/boto3;
       license = stdenv.lib.licenses.asl20;

From 9c830c845644a353491b0da41982df57a32e49aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 11 Apr 2017 19:32:01 +0200
Subject: [PATCH 0969/1744] hydra: add dependency on Nix' perl bindings

This unbreaks the build since the latest nixUnstable update
(3dd66ec6e91c).

It's basically the same fix as in hydra git repo:

  https://github.com/nixos/hydra/commit/a0376a92e5fd90f38d784df3000cdc76ccf314b3
---
 pkgs/development/tools/misc/hydra/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 4b0768af1e2..1e04a10eccd 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -55,6 +55,7 @@ let
         TextTable
         XMLSimple
         nixUnstable
+        nixUnstable.perl-bindings
         git
         boehmgc
       ];

From 29ed67faeab1e136b7006cb07c14f093504587ee Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 19:39:25 +0200
Subject: [PATCH 0970/1744] libressl_2_5: 2.5.1 -> 2.5.3

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

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

From e8351fd30519e1b268eeb006c5b18cdb7f73e7fa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 19:39:40 +0200
Subject: [PATCH 0971/1744] libressl: 2.5 branch is now stable

---
 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 1fe64af36d7..181d036f9ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9261,7 +9261,7 @@ with pkgs;
 
   openslp = callPackage ../development/libraries/openslp {};
 
-  libressl = libressl_2_4;
+  libressl = libressl_2_5;
   libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
     fetchurl = fetchurlBoot;
   };

From d45df036c3aac928c84b2512ddb11d1a78335fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 27 Feb 2017 17:20:25 +0100
Subject: [PATCH 0972/1744] release(-lib).nix: add nixpkgsArgs parameter

This allows customizing the nixpkgs arguments by the caller. My use case
is creating a personal nixpkgs channel containing some unfree packages.

The default is still to not build unfree packages, so for nixpkgs this
is no functional change.
---
 pkgs/top-level/release-lib.nix | 8 +++-----
 pkgs/top-level/release.nix     | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index a6e574a7d11..59d571f0bd1 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,17 +1,15 @@
 { supportedSystems
 , packageSet ? (import ../..)
 , scrubJobs ? true
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
 with import ../../lib;
 
 rec {
 
-  # Ensure that we don't build packages marked as unfree.
-  allPackages = args: packageSet (args // {
-    config.allowUnfree = false;
-    config.inHydra = true;
-  });
+  allPackages = args: packageSet (args // nixpkgsArgs);
 
   pkgs = pkgsFor "x86_64-linux";
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 7c6954564d0..66ff9a9e6b9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -15,9 +15,11 @@
   supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
-with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
+with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
 
 let
 

From 73f04ddd57edfa7944e8f68c13e98c2022ce9968 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 19:57:28 +0200
Subject: [PATCH 0973/1744] nginxMainline: 1.11.10 -> 1.11.13

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

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index a9f3d74e99c..388c355c3f7 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.11.10";
-  sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp";
+  version = "1.11.13";
+  sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn";
 })

From 9561fecd02a547e2a47afdc9afc51af72f2e3eff Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Apr 2017 20:18:53 +0200
Subject: [PATCH 0974/1744] gpsbabel: fix build with llvm-4

---
 pkgs/applications/misc/gpsbabel/clang-4.patch | 22 +++++++++++++++++++
 pkgs/applications/misc/gpsbabel/default.nix   |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/gpsbabel/clang-4.patch

diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch
new file mode 100644
index 00000000000..6bd19ae6044
--- /dev/null
+++ b/pkgs/applications/misc/gpsbabel/clang-4.patch
@@ -0,0 +1,22 @@
+diff --git a/bushnell.cc b/bushnell.cc
+index 8fa844d..40707c4 100644
+--- a/bushnell.cc
++++ b/bushnell.cc
+@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name)
+     name = "Waypoint";
+   }
+
+-  for (t = bushnell_icons; t->icon > 0; t++) {
++  for (t = bushnell_icons; t->icon != 0; t++) {
+     if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
+       return t->symbol;
+     }
+@@ -147,7 +147,7 @@ static const char*
+ bushnell_get_name_from_symbol(signed int s)
+ {
+   icon_mapping_t* t;
+-  for (t = bushnell_icons; t->icon > 0; t++) {
++  for (t = bushnell_icons; t->icon != 0; t++) {
+     if (s == t->symbol) {
+       return t->icon;
+     }
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index d017c704484..ace89cd8a21 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./clang-4.patch
     (fetchpatch {
       url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
       sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
@@ -44,8 +45,8 @@ stdenv.mkDerivation rec {
   ''
     # The raymarine and gtm tests fail on i686 despite -ffloat-store.
   + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
-    # The tomtom asc test fails on darwin, see PR #23572.
-  + lib.optionalString stdenv.isDarwin "rm -v testo.d/tomtom_asc.test;";
+    # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
+  + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
 
   meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";

From 1e1b68b4a02f7e671b8e56d841b4c0962e5d6be9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 23:13:28 +0300
Subject: [PATCH 0975/1744] patchutils: Drop patch applied upstream

---
 pkgs/tools/text/patchutils/default.nix        |  2 -
 .../tools/text/patchutils/drop-comments.patch | 84 -------------------
 2 files changed, 86 deletions(-)
 delete mode 100644 pkgs/tools/text/patchutils/drop-comments.patch

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 28b3b6ed5b7..8a066864d22 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
   };
 
-  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
-
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/patchutils/drop-comments.patch b/pkgs/tools/text/patchutils/drop-comments.patch
deleted file mode 100644
index e02693a5683..00000000000
--- a/pkgs/tools/text/patchutils/drop-comments.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 58987954647f51dc42fb13b7759923c6170dd905 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Fri, 9 May 2014 16:23:27 +0100
-Subject: Make --clean drop comments after '@@' lines as well (trac #29).
-
-
-diff --git a/Makefile.am b/Makefile.am
-index 99ad2a3..f3c6dbc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -198,6 +198,7 @@ TESTS = tests/newline1/run-test \
- 	tests/convert1/run-test \
- 	tests/convert2/run-test \
- 	tests/clean1/run-test \
-+	tests/clean2/run-test \
- 	tests/stdin/run-test
- 
- # These ones don't work yet.
-diff --git a/src/filterdiff.c b/src/filterdiff.c
-index 383e72b..6ca2316 100644
---- a/src/filterdiff.c
-+++ b/src/filterdiff.c
-@@ -2,7 +2,7 @@
-  * filterdiff - extract (or exclude) a diff from a diff file
-  * lsdiff - show which files are modified by a patch
-  * grepdiff - show files modified by a patch containing a regexp
-- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh <twaugh@redhat.com>
-+ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013, 2014 Tim Waugh <twaugh@redhat.com>
-  *
-  * 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
-@@ -408,7 +408,8 @@ do_unified (FILE *f, char *header[2], int match, char **line,
- 							 " Hunk #%lu, %s",
- 							 hunknum, bestname);
- 
--					fputs (trailing, output_to);
-+					fputs (clean_comments ? "\n" : trailing,
-+					       output_to);
- 					break;
- 				case Before:
- 					// Note the initial line number
-diff --git a/tests/clean2/run-test b/tests/clean2/run-test
-new file mode 100755
-index 0000000..42320df
---- /dev/null
-+++ b/tests/clean2/run-test
-@@ -0,0 +1,34 @@
-+#!/bin/sh
-+
-+# This is a filterdiff(1) testcase.
-+# Test: Make sure --clean removes hunk-level comments.
-+
-+
-+. ${top_srcdir-.}/tests/common.sh
-+
-+cat << EOF > diff
-+non-diff line
-+--- a/file1
-++++ b/file1
-+@@ -0,0 +1 @@ this is a hunk-level comment
-++a
-+EOF
-+
-+${FILTERDIFF} --clean diff 2>errors >filtered || exit 1
-+[ -s errors ] && exit 1
-+
-+cat << EOF | cmp - filtered || exit 1
-+--- a/file1
-++++ b/file1
-+@@ -0,0 +1 @@
-++a
-+EOF
-+
-+${FILTERDIFF} --clean -x file1 diff 2>errors >filtered || exit 1
-+[ -s errors ] && exit 1
-+cat << EOF | cmp - filtered || exit 1
-+--- a/file1
-++++ b/file1
-+@@ -0,0 +1 @@
-++a
-+EOF
--- 
-cgit v0.10.1
-

From 0d86c0692fcf353bb8fd12d213db292ebb7651e4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 23:37:31 +0300
Subject: [PATCH 0976/1744] gawk: Disable tests that don't work in sandbox

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 1a1590b82d4..3a504e9478c 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
   # When we do build separate interactive version, it makes sense to always include man.
   outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
 
-  doCheck = !(
+  # FIXME: 4.1.4 testsuite breaks when only C locales are available
+  doCheck = false /*!(
        stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
     || stdenv.isDarwin # XXX: `locale' segfaults
     || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
     || stdenv.isFreeBSD
-  );
+  )*/;
 
   nativeBuildInputs = [ xz.bin ];
   buildInputs =

From d916ce2ef40e412c361805531eff5966a309da1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 11 Apr 2017 22:45:41 +0200
Subject: [PATCH 0977/1744] nixos/lighttpd: set $HOME for gitweb sub-service

This allows gitweb to expand '~' in /etc/gitconfig. Without a $HOME
variable, it fails to list any projects and instead show the text
"No such projects found" in the UI.

Setting $HOME to the gitweb project root seems like a sensible value.
---
 nixos/modules/services/web-servers/lighttpd/gitweb.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index f12cc973446..c8d9836b0b6 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
@@ -60,7 +60,8 @@ in
               "/gitweb/"        => "${pkgs.git}/share/gitweb/gitweb.cgi"
           )
           setenv.add-environment = (
-              "GITWEB_CONFIG" => "${gitwebConfigFile}"
+              "GITWEB_CONFIG" => "${gitwebConfigFile}",
+              "HOME" => "${cfg.projectroot}"
           )
       }
     '';

From 9b7b950832e6ae97c301e8328b797e8b39efb545 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 30 Mar 2017 22:03:40 +0200
Subject: [PATCH 0978/1744] /lib/default.nix: Add file docstring & unit test
 hint

---
 lib/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 09a64f754d8..632b12510e8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,3 +1,8 @@
+/* Library of low-level helper functions for nix expressions.
+ *
+ * Please implement (mostly) exhaustive unit tests
+ * for new functions in `./tests.nix'.
+ */
 let
 
   # trivial, often used functions

From 048114eb4f79f3e125dadee106b454e3d72ccdfc Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 18:17:32 +0100
Subject: [PATCH 0979/1744] compile-daemon: init at 2013-03-08

---
 .../tools/compile-daemon/default.nix          | 25 ++++++++++
 .../development/tools/compile-daemon/deps.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 75 insertions(+)
 create mode 100644 pkgs/development/tools/compile-daemon/default.nix
 create mode 100644 pkgs/development/tools/compile-daemon/deps.nix

diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
new file mode 100644
index 00000000000..bad35e2422b
--- /dev/null
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "compile-daemon-unstable-${version}";
+  version = "2017-03-08";
+  rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
+
+  goPackagePath = "github.com/githubnemo/CompileDaemon";
+
+  src = fetchFromGitHub {
+    owner = "githubnemo";
+    repo = "CompileDaemon";
+    inherit rev;
+    sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Very simple compile daemon for Go";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ profpatsch ];
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/pkgs/development/tools/compile-daemon/deps.nix
new file mode 100644
index 00000000000..53771ddad9f
--- /dev/null
+++ b/pkgs/development/tools/compile-daemon/deps.nix
@@ -0,0 +1,48 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel
+[
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23";
+      sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18";
+      sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "57fdcb988a5c543893cc61bce354a6e24ab70022";
+      sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "99f16d856c9836c42d24e7ab64ea72916925fa97";
+      sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "629574ca2a5df945712d3079857300b5e4da0236";
+      sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b0359a9239..800ed948c27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6403,6 +6403,8 @@ with pkgs;
 
   coan = callPackage ../development/tools/analysis/coan { };
 
+  compile-daemon = callPackage ../development/tools/compile-daemon { };
+
   complexity = callPackage ../development/tools/misc/complexity { };
 
   cookiecutter = pythonPackages.cookiecutter;

From cf957fedea1660f30a3f8d9156e3f5de712cb3eb Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 11 Apr 2017 15:39:17 +0200
Subject: [PATCH 0980/1744] pythonPackages.phonenumbers: init at 8.4.0

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
new file mode 100644
index 00000000000..ead0e3d858d
--- /dev/null
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "phonenumbers-8.4.0";
+
+  meta = {
+    description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
+    homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
+    license     = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ fadenb ];
+  };
+
+  src = fetchurl {
+    url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
+    sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a3a9dfb943..e1397846934 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -118,6 +118,8 @@ in {
     };
   };
 
+  phonenumbers = callPackage ../development/python-modules/phonenumbers { };
+
   agate-dbf = buildPythonPackage rec {
     name = "agate-dbf-0.1.0";
     disabled = isPy3k;

From 0f64656dcab231c64dd2c48ba84d82fd32fa91f8 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 11 Apr 2017 15:39:57 +0200
Subject: [PATCH 0981/1744] matrix-synapse: 0.19.3 -> 0.20.0

---
 pkgs/servers/matrix-synapse/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 2d5ad9e2742..85ebb5a8043 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.19.3";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
+    sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h";
   };
 
   patches = [ ./matrix-synapse.patch ];
@@ -41,6 +41,7 @@ in pythonPackages.buildPythonApplication rec {
     signedjson systemd twisted ujson unpaddedbase64 pyyaml
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack lxml matrix-synapse-ldap3
+    phonenumbers jsonschema
   ];
 
   # Checks fail because of Tox.

From ffa2bc2382a82994755c60f8bab1193dc62fd3fa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 12 Apr 2017 10:39:51 +0800
Subject: [PATCH 0982/1744] terragrunt: 0.11.0 -> 0.11.1

---
 .../networking/cluster/terragrunt/default.nix  |  4 ++--
 .../networking/cluster/terragrunt/deps.nix     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 28fc7fcc666..7ed2cef0e3b 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.11.0";
+  version = "0.11.1";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
+    sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 31f9f9a2b70..b98a38f8352 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
 [
   {
     goPackagePath = "github.com/aws/aws-sdk-go";
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "78568b07950e5e7948496878fe99b9436add41d4";
-      sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
+      rev = "c790b8046767d9c773ad83c327ab988312f85a94";
+      sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
-      sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
+      rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
+      sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "db1efb556f84b25a0a13a04aad883943538ad2e0";
-      sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h";
+      rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
+      sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
-      sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
+      rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
+      sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
     };
   }
 ]

From c90058e7748e95f01ceed9544c14fbf753fe77f0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 02:59:18 -0500
Subject: [PATCH 0983/1744] ibtool: update to newer hash

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

diff --git a/pkgs/development/tools/ibtool/default.nix b/pkgs/development/tools/ibtool/default.nix
index 17b9a77a7a1..bc4bf4bb948 100644
--- a/pkgs/development/tools/ibtool/default.nix
+++ b/pkgs/development/tools/ibtool/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "xib2nib";
-    rev = "636fe783e8625bbdd7bfeaf85470ba3eb7b90359";
-    sha256 = "08fhx8rww95h1fpl1cwhd82bcqv1k51k542v4kawjf8w814g5y1c";
+    rev = "97c6a53aab83d919805efcae33cf80690e953d1e";
+    sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq";
   };
 
   buildInputs = [ PlistCpp pugixml boost ];

From 457570f61a2fdad28d56117c0dc7d285a5c06236 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 02:59:54 -0500
Subject: [PATCH 0984/1744] pinentry_mac: switch to pure version

Fixes #24734
---
 pkgs/tools/security/pinentry-mac/default.nix | 14 ++++++++------
 pkgs/top-level/all-packages.nix              |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index ba3e8b1818d..6aa14ab90e7 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -1,20 +1,22 @@
-{ fetchurl, stdenv, xcbuild }:
+{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
 
-  src = fetchurl {
-    url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz";
-    sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271";
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "pinentry-mac";
+    rev = "77fc993d1040ed2319d9e53af78146be318c1fdd";
+    sha256 = "0rkmp6wb8wvmhipavn1bdmbw6564hc2b99dxqysr6yxr2xqs6fcz";
   };
 
-  buildInputs = [ xcbuild ];
+  buildInputs = [ xcbuild libiconv Cocoa ncurses ];
 
   dontUseXcbuild = true;
 
   installPhase = ''
     mkdir -p $out/Applications
-    mv build/Release/pinentry-mac.app $out/Applications
+    mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications
   '';
 
   passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c909a49a97..95b50aa463f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3479,7 +3479,9 @@ with pkgs;
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
-  pinentry_mac = callPackage ../tools/security/pinentry-mac { };
+  pinentry_mac = callPackage ../tools/security/pinentry-mac {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   pingtcp = callPackage ../tools/networking/pingtcp { };
 

From f6860a6685553098bd7c295f0d435ec934ae7cef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 03:21:58 -0500
Subject: [PATCH 0985/1744] xcbuild: remove unnecessary flags

---
 pkgs/development/tools/xcbuild/platform.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index 01693ce8e5b..cacf9467356 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -177,7 +177,6 @@ let
       Type = "ProductType";
       Identifier = "com.apple.product-type.bundle";
       Name = "Bundle";
-      DefaultTargetName = "Bundle";
       DefaultBuildProperties = {
         FULL_PRODUCT_NAME = "$(WRAPPER_NAME)";
         MACH_O_TYPE = "mh_bundle";
@@ -189,7 +188,6 @@ let
         LIBRARY_FLAG_PREFIX = "-l";
         LIBRARY_FLAG_NOSPACE = "YES";
         STRIP_STYLE = "non-global";
-        GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
       };
       PackageTypes = [ "com.apple.package-type.wrapper" ];
       IsWrapper = "YES";
@@ -201,23 +199,12 @@ let
       Type = "ProductType";
       BasedOn = "com.apple.product-type.bundle";
       Name = "Application";
-      DefaultTargetName = "Application";
       DefaultBuildProperties = {
         MACH_O_TYPE = "mh_execute";
-        GCC_DYNAMIC_NO_PIC = "NO";
-        GCC_SYMBOLS_PRIVATE_EXTERN = "YES";
-        GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
         WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
         WRAPPER_EXTENSION = "app";
-        INSTALL_PATH = "$(LOCAL_APPS_DIR)";
-        STRIP_STYLE = "all";
       };
       PackageTypes = [ "com.apple.package-type.wrapper.application" ];
-      CanEmbedCompilerSanitizerLibraries = "YES";
-      RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks";
-      ValidateEmbeddedBinaries = "YES";
-      ProvisioningProfileSupported = "YES";
-      ProvisioningProfileRequired = "NO";
     }
   ];
 

From d697e5c8ee16c4a364aedf0d0ecde1fd9e4c9c9e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 03:23:28 -0500
Subject: [PATCH 0986/1744] ibtool: rename xib2nib

---
 pkgs/development/tools/xcbuild/toolchain.nix             | 4 ++--
 pkgs/development/tools/{ibtool => xib2nib}/default.nix   | 0
 pkgs/development/tools/{ibtool => xib2nib}/nsplist.nix   | 0
 pkgs/development/tools/{ibtool => xib2nib}/plist-cpp.nix | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/tools/{ibtool => xib2nib}/default.nix (100%)
 rename pkgs/development/tools/{ibtool => xib2nib}/nsplist.nix (100%)
 rename pkgs/development/tools/{ibtool => xib2nib}/plist-cpp.nix (100%)

diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
index cdf4a673cc5..9e34360909f 100644
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ b/pkgs/development/tools/xcbuild/toolchain.nix
@@ -1,7 +1,7 @@
 {stdenv, writeText, toolchainName, xcbuild, fetchurl
 , llvm, cctools, gcc, bootstrap_cmds, binutils
 , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper
-, ibtool}:
+, xib2nib}:
 
 let
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
     ln -s ${cctools}/bin/ranlib
     ln -s ${cctools}/bin/redo_prebinding
 
-    ln -s ${ibtool}/bin/ibtool
+    ln -s ${xib2nib}/bin/ibtool
   '' +
     # No point including the entire gcc closure if we don't already have it
     (if stdenv.cc.isClang then ''
diff --git a/pkgs/development/tools/ibtool/default.nix b/pkgs/development/tools/xib2nib/default.nix
similarity index 100%
rename from pkgs/development/tools/ibtool/default.nix
rename to pkgs/development/tools/xib2nib/default.nix
diff --git a/pkgs/development/tools/ibtool/nsplist.nix b/pkgs/development/tools/xib2nib/nsplist.nix
similarity index 100%
rename from pkgs/development/tools/ibtool/nsplist.nix
rename to pkgs/development/tools/xib2nib/nsplist.nix
diff --git a/pkgs/development/tools/ibtool/plist-cpp.nix b/pkgs/development/tools/xib2nib/plist-cpp.nix
similarity index 100%
rename from pkgs/development/tools/ibtool/plist-cpp.nix
rename to pkgs/development/tools/xib2nib/plist-cpp.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95b50aa463f..e7500292dcf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18410,5 +18410,5 @@ with pkgs;
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
-  ibtool = callPackage ../development/tools/ibtool {};
+  xib2nib = callPackage ../development/tools/xib2nib {};
 }

From 1781ec934f5a815d13b768a77a4bde8798db26d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 03:28:33 -0500
Subject: [PATCH 0987/1744] xib2nib: move nsplist, plistcpp to own folder

These libraries could be used by other packages so list them in
all-packages.nix as well.
---
 .../nsplist.nix => libraries/NSPlist/default.nix}        | 2 +-
 .../plist-cpp.nix => libraries/PlistCpp/default.nix}     | 2 +-
 pkgs/development/tools/xib2nib/default.nix               | 9 +--------
 pkgs/top-level/all-packages.nix                          | 5 +++++
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/development/{tools/xib2nib/nsplist.nix => libraries/NSPlist/default.nix} (91%)
 rename pkgs/development/{tools/xib2nib/plist-cpp.nix => libraries/PlistCpp/default.nix} (92%)

diff --git a/pkgs/development/tools/xib2nib/nsplist.nix b/pkgs/development/libraries/NSPlist/default.nix
similarity index 91%
rename from pkgs/development/tools/xib2nib/nsplist.nix
rename to pkgs/development/libraries/NSPlist/default.nix
index 557cb5b3bd5..c06d98876de 100644
--- a/pkgs/development/tools/xib2nib/nsplist.nix
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
-  name = "nsplist-713decf";
+  name = "NSPlist-713decf";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/tools/xib2nib/plist-cpp.nix b/pkgs/development/libraries/PlistCpp/default.nix
similarity index 92%
rename from pkgs/development/tools/xib2nib/plist-cpp.nix
rename to pkgs/development/libraries/PlistCpp/default.nix
index 3e15489898d..511915be39f 100644
--- a/pkgs/development/tools/xib2nib/plist-cpp.nix
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
 
 stdenv.mkDerivation {
-  name = "plistcpp-11615d";
+  name = "PlistCpp-11615d";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index bc4bf4bb948..5f516ee97cb 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -1,11 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, pugixml, boost }:
-
-let
-
-  NSPlist = callPackage ./nsplist.nix { };
-  PlistCpp = callPackage ./plist-cpp.nix { inherit NSPlist; };
-
-in
+{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
   name = "xib2nib-730e177";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7500292dcf..b981dd492d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18410,5 +18410,10 @@ with pkgs;
 
   messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
+  NSPlist = callPackage ../development/libraries/NSPlist {};
+
+  PlistCpp = callPackage ../development/libraries/PlistCpp {};
+
   xib2nib = callPackage ../development/tools/xib2nib {};
+
 }

From 3d1d805245c1b0788e1ce4a01d8455e30ac15739 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 05:20:33 -0500
Subject: [PATCH 0988/1744] Revert "xcbuild: try to fix sdk not found"

This reverts commit 87e6b2c50fb4520d9ef910418f3c686d830dc3df.
---
 pkgs/development/tools/xcbuild/platform.nix | 2 +-
 pkgs/development/tools/xcbuild/wrapper.nix  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index cacf9467356..31692d9bee6 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -228,6 +228,6 @@ stdenv.mkDerivation {
 
     mkdir -p $out/Developer/SDKs/
     cd $out/Developer/SDKs/
-    ln -s ${sdk} macosx10.10.sdk
+    ln -s ${sdk}
   '';
 }
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index 3dfc7f36343..ab6605e91b1 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,13 +60,9 @@ stdenv.mkDerivation {
       --add-flags "DERIVED_DATA_DIR=." \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcrun \
-      --add-flags "-sdk macosx10.10" \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcode-select \
       --set DEVELOPER_DIR "$out"
-
-    mkdir -p $out/usr/bin/
-    ln -s $out/bin/xcrun $out/usr/bin/xcrun
   '';
 
   inherit (xcbuild) meta;

From 6239da6ade413ce89503d608c9b827ac17359e64 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 12 Apr 2017 13:05:22 +0200
Subject: [PATCH 0989/1744] diamond: init at 0.8.36

---
 .../science/biology/diamond/default.nix       | 41 +++++++++++++++++++
 .../diamond/diamond-0.8.36-no-warning.patch   | 20 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/science/biology/diamond/default.nix
 create mode 100644 pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch

diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
new file mode 100644
index 00000000000..a45e5df2f52
--- /dev/null
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, cmake, gcc, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "diamond-0.8.36";
+
+  src = fetchurl {
+    url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz";
+    sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh";
+  };
+
+  patches = [
+    ./diamond-0.8.36-no-warning.patch
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib ];
+
+  meta = with stdenv.lib; {
+    description = "Accelerated BLAST compatible local sequence aligner";
+    longDescription = ''
+      A sequence aligner for protein and translated DNA
+      searches and functions as a drop-in replacement for the NCBI BLAST
+      software tools. It is suitable for protein-protein search as well as
+      DNA-protein search on short reads and longer sequences including contigs
+      and assemblies, providing a speedup of BLAST ranging up to x20,000.
+
+      DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter).
+
+      If you use DIAMOND in published research, please cite
+      B. Buchfink, Xie C., D. Huson,
+      "Fast and sensitive protein alignment using DIAMOND",
+      Nature Methods 12, 59-60 (2015).
+        '';
+    homepage = https://github.com/bbuchfink/diamond;
+    license = {
+      fullName = "University of Tuebingen, Benjamin Buchfink";
+      url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING;
+    };
+    maintainers = [ maintainers.metabar ];
+  };
+}
diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
new file mode 100644
index 00000000000..a16d475c556
--- /dev/null
+++ b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
@@ -0,0 +1,20 @@
+diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h
+--- diamond-0.8.36/src/dp/scalar_traceback.h	2017-02-06 16:32:05.000000000 +0100
++++ diamond-0.8.36-patched/src/dp/scalar_traceback.h	2017-02-23 15:13:24.000000000 +0100
+@@ -19,6 +19,7 @@
+ #ifndef SCALAR_TRACEBACK_H_
+ #define SCALAR_TRACEBACK_H_
+ 
++#include <cmath>
+ #include <exception>
+ #include "../basic/score_matrix.h"
+ 
+@@ -31,7 +32,7 @@
+ template<>
+ inline bool almost_equal<float>(float x, float y)
+ {
+-	return abs(x - y) < 0.001f;
++	return std::abs(x - y) < 0.001f;
+ }
+ 
+ template<typename _score>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 800ed948c27..74c99f7fa57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17192,6 +17192,8 @@ with pkgs;
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
+  diamond = callPackage ../applications/science/biology/diamond { };
+
   ecopcr = callPackage ../applications/science/biology/ecopcr { };
 
   emboss = callPackage ../applications/science/biology/emboss { };

From 54bbf91479762d0a9300e5871c4ef4dbadf22f52 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 12 Apr 2017 14:41:43 +0300
Subject: [PATCH 0990/1744] buildFHSEnv: add ACLOCAL_PATH

Fixes #24620.
---
 pkgs/build-support/build-fhs-userenv/env.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 9a1897695a9..9c228b39114 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -52,11 +52,12 @@ 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 PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
-    # Force compilers to look in default search paths
+    # Force compilers and other tools to look in default search paths
     export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
     export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
+    export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+    export ACLOCAL_PATH=/usr/share/aclocal
 
     ${profile}
   '';

From 224a8f7358be8ff152a89dd6042119789ba72a03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Apr 2017 09:13:56 -0400
Subject: [PATCH 0991/1744] linux: 4.9.21 -> 4.9.22

---
 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 6e36ab81aa5..ff022201c8b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.21";
+  version = "4.9.22";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p";
+    sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv";
   };
 
   kernelPatches = args.kernelPatches;

From c1ef227b37859e77e4cee2045312e2f036a8c7e7 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 12 Apr 2017 15:01:51 +0200
Subject: [PATCH 0992/1744] radarr: 0.2.0.535 -> 0.2.0.596

---
 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 446927745a9..a2b8a072fa2 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.535";
+  version = "0.2.0.596";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr";
+    sha256 = "0pcvd41ls90h12j0kfxn9yrcap5dhb22vjm87xa5pg031fca7xy0";
   };
 
   buildInputs = [ makeWrapper ];

From 6860eedfd60be0a33b9eb127235e9438fa911514 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Apr 2017 09:16:08 -0400
Subject: [PATCH 0993/1744] linux: 4.10.9 -> 4.10.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index 252eb2498cc..e24cb7ae38b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.9";
+  version = "4.10.10";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1y8cpwhkcb8lsryiyqqr1w58snw26x3x6c4f9v1xnh9grz0s4j6h";
+    sha256 = "0hbzbzykay1yyrqz06lx9rwhf1xzzjs21i561gi4fjkm1bazv8l4";
   };
 
   kernelPatches = args.kernelPatches;

From 5f05792417a41724cf31085a5390861e2131b65c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Apr 2017 09:17:53 -0400
Subject: [PATCH 0994/1744] linux: 4.4.60 -> 4.4.61

---
 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 718c76b8dfa..c059a770818 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.60";
+  version = "4.4.61";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f";
+    sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih";
   };
 
   kernelPatches = args.kernelPatches;

From 13e9cc15f147fd2f472a53c4b40588f48b73e0b5 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 12 Apr 2017 15:12:53 +0200
Subject: [PATCH 0995/1744] smokeping service: restart on-failure

---
 nixos/modules/services/networking/smokeping.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index bac79474527..c5c131cb4c5 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -288,8 +288,11 @@ in
     };
     systemd.services.smokeping = {
       wantedBy = [ "multi-user.target"];
-      serviceConfig.User = cfg.user;
-      serviceConfig.PermissionsStartOnly = true;
+      serviceConfig = {
+        User = cfg.user;
+        PermissionsStartOnly = true;
+        Restart = "on-failure";
+      };
       preStart = ''
         mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
         rm -f ${smokepingHome}/cropper

From 474d112b7a942afd9206e0f8a81b6ba9bb9b95bc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Apr 2017 15:44:18 +0200
Subject: [PATCH 0996/1744] nano: 2.8.0 -> 2.8.1

See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00005.html
for release announcement
---
 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 f3a5a27bd36..645880a13e0 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.8.0";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
+    sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 8c5660807899a6c5c7e0f5e815770960181f8804 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 12 Apr 2017 16:51:42 +0300
Subject: [PATCH 0997/1744] unity3d: 5.3.5 -> 5.5.3

Also add udev to dependencies and don't strip unneeded ones.
Fixes #22513.
---
 pkgs/development/tools/unity3d/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 73cb902ae69..d9459134fea 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
-, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr
+, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
 , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
 , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
 , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -11,7 +11,7 @@ let
   libPath64 = lib.makeLibraryPath [
     gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr
     alsaLib GConf cups libcap fontconfig freetype pango
-    cairo dbus expat zlib libpng12
+    cairo dbus expat zlib libpng12 udev
     libX11 libXcursor libXdamage libXfixes libXrender libXi
     libXcomposite libXext libXrandr libXtst libSM libICE libxcb
   ];
@@ -25,19 +25,16 @@ let
     gnome-sharp gtk-sharp-2_0
   ];
 
-  ver = "5.3.5";
+  ver = "5.5.3";
   build = "f1";
-  date = "20160525";
-  pkgVer = "${ver}${build}";
-  fullVer = "${pkgVer}+${date}";
 
 in stdenv.mkDerivation rec {
   name = "unity-editor-${version}";
-  version = pkgVer;
+  version = "${ver}x${build}";
 
   src = fetchurl {
-    url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh";
-    sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm";
+    url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
+    sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
   };
 
   nosuidLib = ./unity-nosuid.c;
@@ -46,9 +43,10 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "monodevelop" ];
 
+  sourceRoot = "unity-editor-${version}Linux";
+
   unpackPhase = ''
     echo -e 'q\ny' | fakeroot sh $src
-    sourceRoot="unity-editor-${pkgVer}"
   '';
 
   buildPhase = ''
@@ -125,6 +123,7 @@ in stdenv.mkDerivation rec {
   '';
 
   dontStrip = true;
+  dontPatchELF = true;
 
   meta = with stdenv.lib; {
     homepage = https://unity3d.com/;

From 635822da82377d67a02588a58a5fc1e9c5abfc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Apr 2017 15:53:50 +0200
Subject: [PATCH 0998/1744] nixos: escape brackets in systemd units

One day we should just whitelist instead of blacklist chars.

Fixes https://github.com/NixOS/nixops/issues/614
---
 nixos/modules/system/boot/systemd-lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 7dbf3b25cdb..7c01f8ea9b7 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -10,7 +10,7 @@ rec {
 
   makeUnit = name: unit:
     let
-      pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
+      pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""] name;
     in
     if unit.enable then
       pkgs.runCommand "unit-${pathSafeName}"

From f08e89d2568925d4b94f1d62d6a2f9e4e8a57fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Wed, 12 Apr 2017 16:10:46 +0200
Subject: [PATCH 0999/1744] chromium: flashplayer: 25.0.0.127 -> 25.0.0.148

---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index f202aee3828..581a45da3d8 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "25.0.0.127";
+    version = "25.0.0.148";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14";
+      sha256 = "1888n0mbzhbvi95kq19fzw310p7nr9h3g5d3nyzq5fnvj0lcfxsf";
       stripRoot = false;
     };
 

From e7c76d3c25883139f4c86b2afb181868b074ded7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 12 Apr 2017 18:12:16 +0300
Subject: [PATCH 1000/1744] makeWrapper: search for free unwrapped file name

---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 96e50773138..eebde886a88 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -132,6 +132,9 @@ wrapProgram() {
     local prog="$1"
     local hidden
     hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+    while [ -e "$hidden" ]; do
+      hidden="${hidden}_"
+    done
     mv "$prog" "$hidden"
     # Silence warning about unexpanded $0:
     # shellcheck disable=SC2016

From 60e0130ea1e3451cd12493e49b209f0208806c01 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 12 Apr 2017 18:12:23 +0300
Subject: [PATCH 1001/1744] blueman: use wrapGAppsHook

---
 pkgs/tools/bluetooth/blueman/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 508fc781069..6dce2a38798 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
-, hicolor_icon_theme, librsvg
+, hicolor_icon_theme, librsvg, wrapGAppsHook
 , withPulseAudio ? true, libpulseaudio }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
     sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
+  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ];
 
   buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
                   gsettings_desktop_schemas hicolor_icon_theme ]
@@ -32,12 +32,8 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
 
-  postFixup = ''
-    makeWrapperArgs="\
-      --prefix PATH ':' ${binPath} \
-      --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
-      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-      --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
+  preFixup = ''
+    makeWrapperArgs="--prefix PATH ':' ${binPath}"
     wrapPythonPrograms
   '';
 

From b2c87fbf98cf5d4a57cb4528cf60cabefc4d5282 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Apr 2017 12:40:24 -0400
Subject: [PATCH 1002/1744] lib: Add test for composeExtensions

---
 lib/tests.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/tests.nix b/lib/tests.nix
index 1a9a5accd1c..d93cadf2533 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -277,4 +277,14 @@ runTests {
     expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
   };
 
+  testComposeExtensions = {
+    expr = let obj = makeExtensible (self: { foo = self.bar; });
+               f = self: super: { bar = false; baz = true; };
+               g = self: super: { bar = super.baz or false; };
+               f_o_g = composeExtensions f g;
+               composed = obj.extend f_o_g;
+           in composed.foo;
+    expected = true;
+  };
+
 }

From 3fa5605b416bcfabf6884cce04716ef11786fa51 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Apr 2017 18:58:24 +0200
Subject: [PATCH 1003/1744] grsecurity: 4.9.21-201704091948 ->
 4.9.22-201704120836

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 7df48850fd1..779a80208d1 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.21";
+  version = "4.9.22";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
+    sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0a3b51a4e6e..2f0073ef25f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.21";
-      grrev  = "201704091948";
-      sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
+    { kver   = "4.9.22";
+      grrev  = "201704120836";
+      sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From a883581ddb56e9907452b7c3f9146f1fc7f92161 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Apr 2017 19:00:55 +0200
Subject: [PATCH 1004/1744] suitesparse_4_2: remove bogus NIX_CFLAGS

NIX_CFLAGS should be NIX_CFLAGS_COMPILE; since pic is the default, we
simply remove the bogus declaration.

Tested with nix-build -A suitesparse_4_2
---
 pkgs/development/libraries/science/math/suitesparse/4.2.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 070e2b1be1f..7e71eafef69 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
     "LAPACK="
   ];
 
-  NIX_CFLAGS = "-fPIC";
-
   meta = with stdenv.lib; {
     homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
     description = "A suite of sparse matrix algorithms";

From 540a6412e30e8f27bdd82f13b308524db2431f6c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Apr 2017 19:01:49 +0200
Subject: [PATCH 1005/1744] suitesparse_4_4: NIX_CFLAGS -> NIX_CFLAGS_COMPILE

Tested with nix-build -A suitesparse_4_4
---
 pkgs/development/libraries/science/math/suitesparse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 7712a2890f1..f38de088424 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     "LAPACK="
   ];
 
-  NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
 
   postInstall = ''
     # Build and install shared library

From 13a0ad3108c720ebdccaa2a42a67d6ccf9fde8c8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Apr 2017 19:17:04 +0200
Subject: [PATCH 1006/1744] opal: NIX_CFLAGS -> NIX_CFLAGS_COMPILE

Seeing as the build already passes, I suspect this is strictly redundant
...

Tested with nix-build -A opal
---
 pkgs/development/libraries/opal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index c79c3cbe4d6..5090aa874ec 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1";
+  NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1";
 
   patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
       

From f94e0a0dc72dc718c424d2992ce17ccc2eacbab2 Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Wed, 12 Apr 2017 17:46:07 +0100
Subject: [PATCH 1007/1744] thunderbird: add option to enable calendar

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 661d499d34e..69286202823 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -7,6 +7,7 @@
 , autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false, gtk3, wrapGAppsHook
+, enableCalendar ? true
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird" instead
   # of "Earlybird" or whatever, enable this option.  However, those
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
       "--disable-gconf"
       "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
     ]
+      ++ lib.optional enableCalendar "--enable-calendar"
       ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                         else [ "--disable-debug" "--enable-release"
                                "--disable-debug-symbols"

From 124e5dd3eb9e3e8fe322d3c62e4501b2043ac898 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 13 Apr 2017 00:07:01 +0300
Subject: [PATCH 1008/1744] qutebrowser: cleanup wrappers

---
 .../applications/networking/browsers/qutebrowser/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index eb26811cfb8..a8c49b9fd4a 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -74,11 +74,8 @@ in buildPythonApplication rec {
   '';
 
   postFixup = ''
-    mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
-    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \
+    wrapQtProgram $out/bin/qutebrowser \
       ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
-
-    sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
   '';
 
   meta = {

From e2abd55a3b4e4b758f4397feeb344674cf114d1c Mon Sep 17 00:00:00 2001
From: Sean Haugh <seanphaugh@gmail.com>
Date: Wed, 12 Apr 2017 16:13:03 -0500
Subject: [PATCH 1009/1744] licenses: add MirOS license

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4d4a3c1a954..000a55224ea 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -357,6 +357,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Lucent Public License v1.02";
   };
 
+  miros = {
+    fullname = "MirOS License";
+    url = https://opensource.org/licenses/MirOS;
+  };
+
   # spdx.org does not (yet) differentiate between the X11 and Expat versions
   # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
   mit = spdx {

From 5eb098dbd84320b004fcc51e4a6c47ce362e0514 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Wed, 12 Apr 2017 14:21:59 -0700
Subject: [PATCH 1010/1744] hugo: 0.18.1 -> 0.20

---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 479 +++++++++++++-----------
 2 files changed, 255 insertions(+), 228 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 05a4db7a250..895299f75b6 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.18.1";
+  version = "0.20";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81";
+    sha256 = "1dzvwldhf73ycmazq9xnridj7p3m3q6qv47rvk3vgj0xj6c107ij";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 0a95b083c0b..e2e2d093dde 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,173 +1,38 @@
 [
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
-      sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev = "a622679ebd7a3b813862379232f645f8e690e43f";
-      sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
-    };
-  }
-  {
-    goPackagePath = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
-      sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
-    };
-  }
-  {
-    goPackagePath = "github.com/kardianos/osext";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kardianos/osext";
-      rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
-      sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev = "54864211433d45cb780682431585b3e573b49e4a";
-      sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-multierror";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-multierror";
-      rev = "56912fb08d85084aa318edcf2bba735b97cf35c5";
-      sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
-    };
-  }
   {
     goPackagePath = "github.com/BurntSushi/toml";
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
+      rev = "99064174e013895bbd9b025c31100bd1d9b590ca";
+      sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/mapstructure";
+    goPackagePath = "github.com/PuerkitoBio/purell";
     fetch = {
       type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev = "281073eb9eb092240d33ef253c404f1cca550309";
-      sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
+      url = "https://github.com/PuerkitoBio/purell";
+      rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4";
+      sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
     };
   }
   {
-    goPackagePath = "golang.org/x/text";
+    goPackagePath = "github.com/PuerkitoBio/urlesc";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e";
-      sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14";
+      url = "https://github.com/PuerkitoBio/urlesc";
+      rev = "5bd2802263f21d8788851d5305584c82a5c75d7e";
+      sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp";
     };
   }
   {
-    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    goPackagePath = "github.com/bep/gitmap";
     fetch = {
       type = "git";
-      url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
-      sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/russross/blackfriday";
-      rev = "d18b67ae0afd61dae240896eae1785f00709aa31";
-      sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf";
-    };
-  }
-  {
-    goPackagePath = "github.com/yosssi/ace";
-    fetch = {
-      type = "git";
-      url = "https://github.com/yosssi/ace";
-      rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d";
-      sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/viper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/viper";
-      rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15";
-      sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "b83537d79690b75cac5e021b036ae16792bf0f20";
-      sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/jwalterweatherman";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/jwalterweatherman";
-      rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46";
-      sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z";
-    };
-  }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8";
-      sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm";
-    };
-  }
-  {
-    goPackagePath = "github.com/magiconair/properties";
-    fetch = {
-      type = "git";
-      url = "https://github.com/magiconair/properties";
-      rev = "c265cfa48dda6474e208715ca93e987829f572f8";
-      sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3";
+      url = "https://github.com/bep/gitmap";
+      rev = "dcb907b39a0690430d435eb8f63cd8811961231f";
+      sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856";
     };
   }
   {
@@ -180,39 +45,21 @@
     };
   }
   {
-    goPackagePath = "github.com/eknkc/amber";
+    goPackagePath = "github.com/chaseadamsio/goorgeous";
     fetch = {
       type = "git";
-      url = "https://github.com/eknkc/amber";
-      rev = "91774f050c1453128146169b626489e60108ec03";
-      sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis";
+      url = "https://github.com/chaseadamsio/goorgeous";
+      rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407";
+      sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3";
     };
   }
   {
-    goPackagePath = "github.com/spf13/afero";
+    goPackagePath = "github.com/cpuguy83/go-md2man";
     fetch = {
       type = "git";
-      url = "https://github.com/spf13/afero";
-      rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8";
-      sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cast";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cast";
-      rev = "27b586b42e29bec072fe7379259cc719e1289da6";
-      sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7";
-      sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa";
+      sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6";
     };
   }
   {
@@ -225,57 +72,66 @@
     };
   }
   {
-    goPackagePath = "github.com/spf13/fsync";
+    goPackagePath = "github.com/eknkc/amber";
     fetch = {
       type = "git";
-      url = "https://github.com/spf13/fsync";
-      rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b";
-      sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z";
+      url = "https://github.com/eknkc/amber";
+      rev = "9be5e8aae85904f63d505e0c00e5e0881d44ef4d";
+      sha256 = "1hmsqxwajgpmg1svzjqxf4n81qy7qs6m39cjv69jkhz9lpwc305j";
     };
   }
   {
-    goPackagePath = "github.com/cpuguy83/go-md2man";
+    goPackagePath = "github.com/fortytw2/leaktest";
     fetch = {
       type = "git";
-      url = "https://github.com/cpuguy83/go-md2man";
-      rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599";
-      sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj";
+      url = "https://github.com/fortytw2/leaktest";
+      rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14";
+      sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m";
     };
   }
   {
-    goPackagePath = "github.com/miekg/mmark";
+    goPackagePath = "github.com/fsnotify/fsnotify";
     fetch = {
       type = "git";
-      url = "https://github.com/miekg/mmark";
-      rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a";
-      sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
+      sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
     };
   }
   {
-    goPackagePath = "github.com/spf13/nitro";
+    goPackagePath = "github.com/gorilla/websocket";
     fetch = {
       type = "git";
-      url = "https://github.com/spf13/nitro";
-      rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
-      sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
+      url = "https://github.com/gorilla/websocket";
+      rev = "adf16b31781325cbd41085c5be901d95b4d1f33d";
+      sha256 = "0f93k3igbqqwsl734lxnkbfajc4lcyzg4szg15vb26qn939b5ccx";
     };
   }
   {
-    goPackagePath = "github.com/PuerkitoBio/purell";
+    goPackagePath = "github.com/hashicorp/hcl";
     fetch = {
       type = "git";
-      url = "https://github.com/PuerkitoBio/purell";
-      rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3";
-      sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "80e628d796135357b3d2e33a985c666b9f35eee1";
+      sha256 = "0l85a7ir60hycb3mqsxmrz18f1kax03k55afsahr8xf46pjp5pyb";
     };
   }
   {
-    goPackagePath = "github.com/pkg/sftp";
+    goPackagePath = "github.com/inconshreveable/mousetrap";
     fetch = {
       type = "git";
-      url = "https://github.com/pkg/sftp";
-      rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472";
-      sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/kardianos/osext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/osext";
+      rev = "9b883c5eb462dd5cb1b0a7a104fe86bc6b9bd391";
+      sha256 = "0cyhbgsxwdfnwy57pdfivvjfy951gxbg9qlsjbwm6vs3gfws07mr";
     };
   }
   {
@@ -292,26 +148,35 @@
     fetch = {
       type = "git";
       url = "https://github.com/kyokomi/emoji";
-      rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9";
-      sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp";
+      rev = "7e06b236c489543f53868841f188a294e3383eab";
+      sha256 = "1q2j0k5a8qqka1syc9zwmf1cvm6k628kf2g1nmghp2kdr7q1xmyb";
     };
   }
   {
-    goPackagePath = "github.com/pkg/errors";
+    goPackagePath = "github.com/magiconair/properties";
     fetch = {
       type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "494e70f7620561491c2ca11e185bbef4b70060da";
-      sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9";
+      url = "https://github.com/magiconair/properties";
+      rev = "9c47895dc1ce54302908ab8a43385d1f5df2c11c";
+      sha256 = "0497bacr3gc7352gcwb07wyw7vb9m04xfd82mw0hpnzzw3kfnav3";
     };
   }
   {
-    goPackagePath = "github.com/PuerkitoBio/urlesc";
+    goPackagePath = "github.com/miekg/mmark";
     fetch = {
       type = "git";
-      url = "https://github.com/PuerkitoBio/urlesc";
-      rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
-      sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
+      url = "https://github.com/miekg/mmark";
+      rev = "2d4f1dd6f87cad351b9323bbaa6f6c586f0c4bee";
+      sha256 = "1ak54nvmryx73g16q6qaac9x0klhbxxmk1j6zlnfvvibnkj2pa90";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bfdb1a85537d60bc7e954e600c250219ea497417";
+      sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8";
     };
   }
   {
@@ -319,17 +184,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575";
-      sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd";
-    };
-  }
-  {
-    goPackagePath = "github.com/pelletier/go-toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pelletier/go-toml";
-      rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d";
-      sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7";
+      rev = "4df9b06c0c1ffd8538a3cfa9d888f8f52985b302";
+      sha256 = "1cbbvq9l822p7vrscvaah3zybsj5yxcsq9fgvgsg062njbb0x41f";
     };
   }
   {
@@ -337,17 +193,188 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-buffruneio";
-      rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d";
-      sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f";
+      rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
+      sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
     };
   }
   {
-    goPackagePath = "github.com/bep/gitmap";
+    goPackagePath = "github.com/pelletier/go-toml";
     fetch = {
       type = "git";
-      url = "https://github.com/bep/gitmap";
-      rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac";
-      sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "fee7787d3f811af92276f5ff10107092e95b7a1d";
+      sha256 = "0srx5hr35f9qzn5dnqqa0msyjknwn7vcq0jmlkvfxgaq0ygd6s3r";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302";
+      sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/sftp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/sftp";
+      rev = "4d0e916071f68db74f8a73926335f809396d6b42";
+      sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
+      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
+      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
+      sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "ce135a4ebeee6cfe9a26c93ee0d37825f26113c7";
+      sha256 = "1a2ahiyynn1kdjznqvzjfm5g5bc098gfw857bw9qikhdljvsnjiy";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "7be4beda01ec05d0b93d80b3facd2b6f44080d94";
+      sha256 = "0jd2ya8kn763z16c3q5jl1x6raw2f3xq3vbaf4ppiy70zqzscmyg";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/fsync";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/fsync";
+      rev = "12a01e648f05a938100a26858d2d59a120307a18";
+      sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+      sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/nitro";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/nitro";
+      rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
+      sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "9ff6c6923cfffbcd502984b8e0c80539a94968b7";
+      sha256 = "0mfrxzyl8x7araa126lh8l3sihbbgfbzgkrg3v3cx7y4n3wrsqvn";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "7538d73b4eb9511d85a9f1dfef202eeb8ac260f4";
+      sha256 = "0i4q715bjp018zw1b52zgx79j4s7s8l26dyrw8cslshibkx0frnl";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+    };
+  }
+  {
+    goPackagePath = "github.com/yosssi/ace";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yosssi/ace";
+      rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56";
+      sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "453249f01cfeb54c3d549ddb75ff152ca243f9d8";
+      sha256 = "0akybbzgi3v507a39bgnkk79rfhj8gflr7538g5a0177z5i9ygwa";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "906cda9512f77671ab44f8c8563b13a8e707b230";
+      sha256 = "0aa33n5a2zzrm2pnjyc3xkdmf8hq2qpafgdp8v6fxfb0swqjl2n3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547";
+      sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "0ad425fe45e885577bef05dc1c50f72e33188b16";
+      sha256 = "1jz0i8iagfd703flx5z006kisjixpm8iy4hiwywgbh31wypsxxyl";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "a3f3340b5840cee44f372bddb5880fcbc419b46a";
+      sha256 = "1djb53a8ikwgkfpf8namgf4d8pq1mq6q9q2c7q0z8x4dxf3whxj7";
     };
   }
 ]

From 80c295f50fe42a6df48d4504b0bd8420ed04e75d Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 20 Mar 2017 12:36:57 -0400
Subject: [PATCH 1011/1744] pythonPackages.distro: init 1.0.3

- tested on darwin
- tested on nixos
---
 .../python-modules/distro/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/distro/default.nix

diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
new file mode 100644
index 00000000000..9b79d82328f
--- /dev/null
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "distro";
+  version = "1.0.3";
+
+  buildInputs = [ pytest pytestcov tox];
+
+  checkPhase = ''
+    touch tox.ini
+    tox
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d";
+  };
+
+  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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1397846934..7c5a1d06f37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32191,6 +32191,8 @@ EOF
 
   nitpick = callPackage ../applications/version-management/nitpick { };
 
+  distro = callPackage ../development/python-modules/distro { };
+
 });
 
 in fix' (extends overrides packages)

From c919ceda06dad76968a27050b1091492c363156e Mon Sep 17 00:00:00 2001
From: Sean Haugh <seanphaugh@gmail.com>
Date: Wed, 12 Apr 2017 16:13:12 -0500
Subject: [PATCH 1012/1744] envypn-font: init at 1.7.1

---
 pkgs/data/fonts/envypn-font/default.nix | 36 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/data/fonts/envypn-font/default.nix

diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
new file mode 100644
index 00000000000..203b68f5e5d
--- /dev/null
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation rec {
+  name = "envypn-font-1.7.1";
+
+  src = fetchurl {
+    url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz";
+    sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  unpackPhase = ''
+    tar -xzf $src --strip-components=1
+  '';
+
+  installPhase = ''
+    # install the pcf fonts (for xorg applications)
+    fontDir="$out/share/fonts/envypn"
+    mkdir -p "$fontDir"
+    mv *.pcf.gz "$fontDir"
+
+    cd "$fontDir"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      Readable bitmap font inspired by Envy Code R
+    '';
+    homepage = "http://ywstd.fr/p/pj/#envypn";
+    license = licenses.miros;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e20c102ea90..cf1712edea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12437,6 +12437,8 @@ with pkgs;
 
   encode-sans = callPackage ../data/fonts/encode-sans { };
 
+  envypn-font = callPackage ../data/fonts/envypn-font { };
+
   fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
 
   fira = callPackage ../data/fonts/fira { };

From 416337b95c8adfcd2072be4a4b577f613f8af742 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Apr 2017 19:33:03 -0400
Subject: [PATCH 1013/1744] atom: 1.15.0 -> 1.16.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 60e17982b5b..e9546c16d62 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.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx";
+    sha256 = "10qzhfz34i7x7z5fv5a73a6aiwxvanyn0v825a6yz9qfc2mg4shd";
     name = "${name}.deb";
   };
 

From 47e82ef817a170186037fa4294d8c858fc9e2b06 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Apr 2017 19:40:05 -0400
Subject: [PATCH 1014/1744] gradle: 3.4.1 -> 3.5

---
 pkgs/development/tools/build-managers/gradle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 28b6601cab6..51aaf5e6a79 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-3.4.1";
-    nativeVersion = "0.13";
+    name = "gradle-3.5";
+    nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv";
+      sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b";
     };
   };
 

From 1fd7bf9ee3e7e26526aca139ea881afd478932c3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 12 Apr 2017 20:30:07 -0400
Subject: [PATCH 1015/1744] nano: remove unnecessary Darwin-specific behavior

It seems to compile just fine without this now that we're on 2.8.1
---
 pkgs/applications/editors/nano/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 645880a13e0..bfc3b7c79fa 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -36,15 +36,6 @@ in stdenv.mkDerivation rec {
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}
     ${optionalString enableTiny "--enable-tiny"}
-  ''
-  # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available
-  # during configure but then can't find it at build time.
-    + optionalString stdenv.isDarwin ''
-    nano_cv_flag_reg_extended=REG_EXTENDED
-  '';
-
-  postPatch = optionalString stdenv.isDarwin ''
-    substituteInPlace src/text.c --replace "__time_t" "time_t"
   '';
 
   postInstall = ''

From 4672fe6998c04b7f8b56785b7bc42efc9f013d2f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 20:03:29 -0500
Subject: [PATCH 1016/1744] pinentry_mac: use precompiled .nib's

sadly, xib2nib hasn't been working like i though. I've just
precompiled into our modified pinentry_mac. Eventually we can get this
fixed but it's not as easy as first thought.
---
 pkgs/tools/security/pinentry-mac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index 6aa14ab90e7..4cba1c7e617 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "pinentry-mac";
-    rev = "77fc993d1040ed2319d9e53af78146be318c1fdd";
-    sha256 = "0rkmp6wb8wvmhipavn1bdmbw6564hc2b99dxqysr6yxr2xqs6fcz";
+    rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4";
+    sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq";
   };
 
   buildInputs = [ xcbuild libiconv Cocoa ncurses ];

From 9e5fe7738a5abdd2357c3d72899ca1712a36de3a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 Apr 2017 20:07:55 -0500
Subject: [PATCH 1017/1744] xib2nib: add meta

also:
- NSPlist
- PlistCpp
---
 pkgs/development/libraries/NSPlist/default.nix  | 7 +++++++
 pkgs/development/libraries/PlistCpp/default.nix | 8 ++++++++
 pkgs/development/tools/xib2nib/default.nix      | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix
index c06d98876de..bfee9961984 100644
--- a/pkgs/development/libraries/NSPlist/default.nix
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -11,4 +11,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ matthewbauer ];
+    description = "Parses .plist files";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix
index 511915be39f..f7703b731b9 100644
--- a/pkgs/development/libraries/PlistCpp/default.nix
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -11,4 +11,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ cmake boost NSPlist pugixml ];
+
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ matthewbauer ];
+    description = "CPP bindings for Plist";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index 5f516ee97cb..d585a35b0bc 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -12,4 +12,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ PlistCpp pugixml boost ];
   makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ matthewbauer ];
+    description = "Compiles CocoaTouch .xib files into .nib";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
 }

From acf45e0f9ce28107b1218414d05c93287b97f59b Mon Sep 17 00:00:00 2001
From: mucaho <mucaho@gmail.com>
Date: Thu, 13 Apr 2017 01:38:01 +0200
Subject: [PATCH 1018/1744] pythonPackages.pluginbase: init at 0.5

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

diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix
new file mode 100644
index 00000000000..9d90c617fc1
--- /dev/null
+++ b/pkgs/development/python-modules/pluginbase/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.5";
+  pname = "pluginbase";
+
+  buildInputs = [ pytest tox ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mitsuhiko/pluginbase;
+    description = "A support library for building plugins sytems in Python";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c5a1d06f37..a16f9342cb0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32191,6 +32191,8 @@ EOF
 
   nitpick = callPackage ../applications/version-management/nitpick { };
 
+  pluginbase = callPackage ../development/python-modules/pluginbase { };
+
   distro = callPackage ../development/python-modules/distro { };
 
 });

From fe2ced1ea895a224b97a4d3cfb47782cdd0ceb0a Mon Sep 17 00:00:00 2001
From: mucaho <mucaho@gmail.com>
Date: Thu, 13 Apr 2017 01:39:18 +0200
Subject: [PATCH 1019/1744] pythonPackages.node-semver: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
new file mode 100644
index 00000000000..0bd569fd4ad
--- /dev/null
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.1.1";
+  pname = "node-semver";
+
+  buildInputs = [ pytest tox ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2";
+  };
+
+  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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a16f9342cb0..e8453d23a5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32193,6 +32193,8 @@ EOF
 
   pluginbase = callPackage ../development/python-modules/pluginbase { };
 
+  node-semver = callPackage ../development/python-modules/node-semver { };
+
   distro = callPackage ../development/python-modules/distro { };
 
 });

From 8d5e55a0f0b1c546ec69701a54a6cd43c4aa5339 Mon Sep 17 00:00:00 2001
From: mucaho <mucaho@gmail.com>
Date: Thu, 13 Apr 2017 01:40:33 +0200
Subject: [PATCH 1020/1744] conan: init at 0.21.2

---
 .../tools/build-managers/conan/default.nix    | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/conan/default.nix

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
new file mode 100644
index 00000000000..417e492f7d0
--- /dev/null
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "0.21.2";
+  pname = "conan";
+
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    requests2 fasteners pyyaml pyjwt colorama patch
+    bottle pluginbase six distro pylint node-semver
+  ];
+
+  # enable tests once all of these pythonPackages available:
+  # [ nose nose_parameterized mock WebTest codecov ]
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://conan.io;
+    description = "Decentralized and portable C/C++ package manager";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e20c102ea90..55ea877c237 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6407,6 +6407,8 @@ with pkgs;
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
+  conan = callPackage ../development/tools/build-managers/conan { };
+
   cookiecutter = pythonPackages.cookiecutter;
 
   ctags = callPackage ../development/tools/misc/ctags { };

From b306e672a18aa3fccc58eebf6e329df851db0ae8 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Thu, 13 Apr 2017 11:53:35 +0800
Subject: [PATCH 1021/1744] hivemind: init at git-2017-04-13

Hivemind is a peer-to-peer oracle protocol which absorbs accurate data
into a blockchain so that bitcoin-users can speculate in prediction
markets.
---
 pkgs/applications/altcoins/default.nix  |  3 ++
 pkgs/applications/altcoins/hivemind.nix | 39 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/altcoins/hivemind.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index fbc3d1c36f9..b51acea061f 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -22,6 +22,9 @@ rec {
   freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
   go-ethereum = callPackage ./go-ethereum.nix { };
 
+  hivemind = callPackage ./hivemind.nix { withGui = true; };
+  hivemindd = callPackage ./hivemind.nix { withGui = false; };
+
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };
 
diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
new file mode 100644
index 00000000000..179a96c0449
--- /dev/null
+++ b/pkgs/applications/altcoins/hivemind.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version;
+  version = "git-2017-04-13";
+
+  src = fetchFromGitHub {
+    owner = "bitcoin-hivemind";
+    repo = "hivemind";
+    rev = "147973cfe76867410578d91d6f0a8df105cab4e0";
+    sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc protobuf libevent]
+                  ++ optionals stdenv.isLinux [ utillinux ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" 
+                     "--with-incompatible-bdb"
+                   ] ++ optionals withGui [ "--with-gui=qt4" ];
+
+  meta = {
+    description = "Peer-to-Peer oracle protocol";
+    longDescription= ''
+      Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data
+      into a blockchain so that Bitcoin-users can speculate in Prediction
+      Markets.
+    '';
+    homepage = "https://bitcoinhivemind.com";
+    maintainers = with maintainers; [ canndrew ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}

From 42fd72091e09b52b19efbbb99c89e832a9202311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Apr 2017 09:27:08 +0200
Subject: [PATCH 1022/1744] gnutls: use 3.5.10 on Darwin for now

This contains a revert of d6454e6a1.
---
 pkgs/development/libraries/gnutls/3.5.10.nix | 10 ++++++++++
 pkgs/development/libraries/gnutls/3.5.nix    |  4 +---
 pkgs/top-level/all-packages.nix              | 12 +++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/gnutls/3.5.10.nix

diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix
new file mode 100644
index 00000000000..a1eab1a84c1
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.5.10.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, libunistring, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.5.10";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
+    sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
+  };
+})
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index c3560c43e47..77ecd4957f7 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,4 +1,4 @@
-{ callPackage, stdenv, fetchurl, libunistring, darwin, ... } @ args:
+{ callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "3.5.11";
@@ -15,6 +15,4 @@ callPackage ./generic.nix (args // rec {
     sed '2iexit 77' -i tests/pkgconfig.sh
     sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
   '';
-
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.Security;
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29caabbda57..f362efa1d01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7735,9 +7735,15 @@ with pkgs;
 
   gnutls = gnutls35;
 
-  gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
+  gnutls35 = callPackage
+    (if stdenv.isDarwin
+      # Avoid > 3.5.10 due to frameworks for now; see discussion on:
+      # https://github.com/NixOS/nixpkgs/commit/d6454e6a1
+      then ../development/libraries/gnutls/3.5.10.nix
+      else ../development/libraries/gnutls/3.5.nix)
+    {
+      guileBindings = config.gnutls.guile or false;
+    };
 
   gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
     guileBindings = config.gnutls.guile or false;

From 42d7fa2c7160d513c9e043b9f6e1ba6b58b4deaa Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Thu, 13 Apr 2017 16:40:32 +0800
Subject: [PATCH 1023/1744] hivemind: rename unstable package

---
 pkgs/applications/altcoins/hivemind.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
index 179a96c0449..1b2682f7d4c 100644
--- a/pkgs/applications/altcoins/hivemind.nix
+++ b/pkgs/applications/altcoins/hivemind.nix
@@ -5,7 +5,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "git-2017-04-13";
+  version = "unstable";
 
   src = fetchFromGitHub {
     owner = "bitcoin-hivemind";

From 5ca7e8a69ae94d4c122c7fa69d77e749e83dbebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 13 Apr 2017 12:26:45 +0200
Subject: [PATCH 1024/1744] fcron: do not chmod at all

fcron does handle permissions on its own correctly
---
 nixos/modules/services/scheduling/fcron.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index bd1ecb40969..bc631bdd044 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -143,10 +143,12 @@ in
       };
 
       preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -m 0770 -p /var/spool/fcron
-        ${pkgs.coreutils}/bin/chown -R fcron:fcron /var/spool/fcron
+        install \
+          --mode 0770 \
+          --owner fcron \
+          --group fcron \
+          --directory /var/spool/fcron
         # load system crontab file
-        set -x
         #${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
       '';
 

From d3c737a080b20638394139948934557d081a6d0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 13 Apr 2017 13:06:11 +0200
Subject: [PATCH 1025/1744] gcc-snapshot: 7-20161211 -> 7-20170409

---
 pkgs/development/compilers/gcc/snapshot/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 81bed7119ea..12eb8b3a542 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -60,7 +60,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "7-20161211";
+let version = "7-20170409";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -217,7 +217,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2";
-    sha256 = "114rrrm5d5cawmr3161d2wgjlzkb9l1imj1p7fnypwz7y85l1661";
+    sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67";
   };
 
   inherit patches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14b732889ab..de7a44f50ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5085,7 +5085,7 @@ with pkgs;
     cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
-    isl = if !stdenv.isDarwin then isl_0_14 else null;
+    isl = isl_0_17;
   }));
 
   gfortran = gfortran5;

From bf4be8f1dd29612a4e706589ce2bde9be9742ce9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Apr 2017 19:31:43 +0800
Subject: [PATCH 1026/1744] k8s: convert int to string to avoid interpolation
 error

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

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 9ccc7295019..25eaf70850c 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -45,7 +45,7 @@ let
   cniConfig = pkgs.buildEnv {
     name = "kubernetes-cni-config";
     paths = imap (i: entry:
-      pkgs.writeTextDir "${10+i}-${entry.type}.conf" (builtins.toJSON entry)
+      pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
     ) cfg.kubelet.cni.config;
   };
 

From a3ee3b51d7236a9b039c6c7e8df9ea8a26c689ef Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Apr 2017 19:32:10 +0800
Subject: [PATCH 1027/1744] k8s: use slice and target for kubernetes

---
 nixos/modules/services/cluster/kubernetes.nix | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 25eaf70850c..25a410d0dbe 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -597,7 +597,7 @@ in {
     (mkIf cfg.kubelet.enable {
       systemd.services.kubelet = {
         description = "Kubernetes Kubelet Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "network.target" "docker.service" "kube-apiserver.service" ];
         path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ];
         preStart = ''
@@ -606,6 +606,7 @@ in {
           ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages}
         '';
         serviceConfig = {
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kubelet \
             --pod-manifest-path=${manifests} \
             --kubeconfig=${kubeconfig} \
@@ -655,9 +656,10 @@ in {
     (mkIf cfg.apiserver.enable {
       systemd.services.kube-apiserver = {
         description = "Kubernetes Kubelet Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "network.target" "docker.service" ];
         serviceConfig = {
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-apiserver \
             --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \
             ${optionalString (cfg.etcd.caFile != null)
@@ -713,9 +715,10 @@ in {
     (mkIf cfg.scheduler.enable {
       systemd.services.kube-scheduler = {
         description = "Kubernetes Scheduler Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
         serviceConfig = {
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-scheduler \
             --address=${cfg.scheduler.address} \
             --port=${toString cfg.scheduler.port} \
@@ -735,11 +738,12 @@ in {
     (mkIf cfg.controllerManager.enable {
       systemd.services.kube-controller-manager = {
         description = "Kubernetes Controller Manager Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
         serviceConfig = {
           RestartSec = "30s";
           Restart = "on-failure";
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-controller-manager \
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \
@@ -767,10 +771,11 @@ in {
     (mkIf cfg.proxy.enable {
       systemd.services.kube-proxy = {
         description = "Kubernetes Proxy Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
         path = [pkgs.iptables];
         serviceConfig = {
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-proxy \
             --kubeconfig=${kubeconfig} \
             --bind-address=${cfg.proxy.address} \
@@ -786,9 +791,10 @@ in {
     (mkIf cfg.dns.enable {
       systemd.services.kube-dns = {
         description = "Kubernetes Dns Service";
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
         serviceConfig = {
+          Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-dns \
             --kubecfg-file=${kubeconfig} \
             --dns-port=${toString cfg.dns.port} \
@@ -836,6 +842,11 @@ in {
         cfg.proxy.enable ||
         cfg.dns.enable
     ) {
+      systemd.targets.kubernetes = {
+        description = "Kubernetes";
+        wantedBy = [ "multi-user.target" ];
+      };
+
       systemd.tmpfiles.rules = [
         "d /opt/cni/bin 0755 root root -"
         "d /var/run/kubernetes 0755 kubernetes kubernetes -"

From 73c8797d169efffe2207b79615d4af6294cd097e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 13 Apr 2017 13:42:28 +0200
Subject: [PATCH 1028/1744] gce/create-gce.sh: rewrite using nix-shell shebang
 and bash (#24869)

* google-cloud-sdk: 150.0.0 -> 151.0.0

- gce/create-gce.sh: rewrite using nix-shell shebang and bash
- allows to run the script without being the same directory
- nix-shell install google-cloud-sdk
- some shellcheck cleanups and scripting best practice
- gce/create-gce.sh: do not clobber NIX_PATH: this allows NIX_PATH to be overwritten to build a different release
- gce/create-gce.sh: remove legacy hydra option
---
 nixos/maintainers/scripts/gce/create-gce.sh   | 28 ++++++++++++-------
 pkgs/tools/admin/google-cloud-sdk/default.nix |  8 +++---
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 7f8a0d23027..ef1801fe54b 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -1,15 +1,23 @@
-#! /bin/sh -e
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p google-cloud-sdk
 
-BUCKET_NAME=${BUCKET_NAME:-nixos-images}
-export NIX_PATH=nixpkgs=../../../..
-export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
-export TIMESTAMP=$(date +%Y%m%d%H%M)
+set -euo pipefail
+
+BUCKET_NAME="${BUCKET_NAME:-nixos-images}"
+TIMESTAMP="$(date +%Y%m%d%H%M)"
+export TIMESTAMP
 
 nix-build '<nixpkgs/nixos>' \
-   -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10
+   -A config.system.build.googleComputeImage \
+   --arg configuration "{ imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]; }" \
+   --argstr system x86_64-linux \
+   -o gce \
+   -j 10
 
-img=$(echo gce/*.tar.gz)
-if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then
-  gsutil cp $img gs://${BUCKET_NAME}/$(basename $img)
+img_path=$(echo gce/*.tar.gz)
+img_name=$(basename "$img_path")
+img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
+if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
+  gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
 fi
-gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img)
+gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name"
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 7c410a1a4f4..67bbb510b13 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "150.0.0";
+  version = "151.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "0zg6jnn93dq53glds4cghksyghb4d4z0i2h38na0r88mr8hzmx1l";
+        sha256 = "1d1h6jiqs3grsb6c61v6dkb4l2qv6v8g7wbzgaqkmn09xdbaq40l";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "1vbc360z2da3blwx51asw7jh0v0v6wsrv20z36yq0hccmljlh24w";
+        sha256 = "05idf0g505s8diaz28ij9yqig2wwn43lyppfs483m7vnx5hk62j5";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "1q66aap3qidfsa8gm13jff3dprx8qarhjkx5ib65439fy4zj0bca";
+        sha256 = "01hf7pp1v57dxx6f2pz7j13fjdnrfp7gjmzjdlhlx4rnvxrd6i3f";
       };
 
   buildInputs = [python27 makeWrapper];

From 15bb499df939674c992b1c42e915821193116af2 Mon Sep 17 00:00:00 2001
From: Michael Leandersson <tripokey@gmail.com>
Date: Wed, 12 Apr 2017 17:24:17 +0200
Subject: [PATCH 1029/1744] kakoune: 2017-02-09-> 2017-04-12

fixes #24847
fixes #24738
---
 pkgs/applications/editors/kakoune/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 4590939b516..067aff5ee69 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -3,25 +3,20 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "kakoune-nightly-${version}";
-  version = "2017-02-09";
+  name = "kakoune-unstable-${version}";
+  version = "2017-04-12";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14";
-    sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi";
+    rev = "7482d117cc85523e840dff595134dcb9cdc62207";
+    sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh";
   };
   buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
 
-  buildPhase = ''
-    sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
-    substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
+  postPatch = ''
     export PREFIX=$out
-    (cd src && make )
-  '';
-
-  installPhase = ''
-    (cd src && make install)
+    cd src
+    sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile
   '';
 
   meta = {

From d606717588827d26e7838ecb1580bf7928f4369e Mon Sep 17 00:00:00 2001
From: Toni Schmidbauer <toni@stderr.at>
Date: Thu, 6 Apr 2017 09:55:57 +0200
Subject: [PATCH 1030/1744] davmail: 4.7.2 -> 4.8.0

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

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index bb4a4a71009..a349d1fb53e 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "davmail-4.7.2";
+  name = "davmail-4.8.0";
   src = fetchurl {
-    url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz";
-    sha256 = "196jr44kksb197biz984z664llf9z3d8rlnjm2iqcmgkjhx1mgy3";
+    url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz";
+    sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62";
   };
 
   buildInputs = [ makeWrapper ];

From 1dee38f259c28f08a9694923301290fa82f5d81f Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 13 Apr 2017 14:12:50 +0200
Subject: [PATCH 1031/1744] BLCR 0.8.5b4 *do* work with Linux 3.10.

---
 pkgs/os-specific/linux/blcr/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index c2e3fa4b9e1..ab1a93b3a70 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,14 +1,10 @@
 { stdenv, lib, fetchurl, kernel, perl, makeWrapper }:
 
-# BLCR 0.8.5 should works for kernel version up to 3.7.1
-# BLCR 0.8.6 should works for kernel version up to 3.17.x
+# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
 
 assert stdenv.isLinux;
 assert builtins.compareVersions "3.18" kernel.version == 1;
 
-# it doesn't compile anymore on 3.12
-assert lib.versionAtLeast kernel.version "3.14";
-
 stdenv.mkDerivation {
   name = "blcr_${kernel.version}-0.8.6pre4";
 

From 20fea7f4491919e93dae9b83e861b4bab881f568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 13 Apr 2017 14:32:48 +0200
Subject: [PATCH 1032/1744] davmail: remove unrelated files from $out/bin

---
 .../networking/davmail/default.nix            | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index a349d1fb53e..b491f287e70 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -7,19 +7,21 @@ stdenv.mkDerivation rec {
     sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62";
   };
 
-  buildInputs = [ makeWrapper ];
-
-  meta = {
-    description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
-    maintainers = [ stdenv.lib.maintainers.hinton ];
-    platforms = stdenv.lib.platforms.all;
-    homepage = "http://davmail.sourceforce.net/";
-    license = stdenv.lib.licenses.gpl2;
-  };
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-  mkdir -p $out/bin
-  cp ./* $out/bin/ -R
-  wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
-   '';
+    mkdir -p $out/share/davmail
+    cp -R ./* $out/share/davmail
+    makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \
+      --prefix PATH : ${jre}/bin \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://davmail.sourceforce.net/;
+    description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
+    maintainers = [ maintainers.hinton ];
+    platforms = platforms.all;
+    license = licenses.gpl2;
+  };
 }

From dcbb2bf75149adb2ca33b773a85a54e6fddffb61 Mon Sep 17 00:00:00 2001
From: Christoph-Simon Senjak <you@example.com>
Date: Thu, 13 Apr 2017 01:14:03 +0200
Subject: [PATCH 1033/1744] teamviewer: keep RTlib directory

Added the formerly deleted RTlib directory, included its
patchelf commands. Beforehand the client failed, because
TVGuiDelegate did not find all symbols.

fixes #24862
---
 .../networking/remote/teamviewer/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 288fa438361..5c9e96c6527 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 alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
+  deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ 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
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     rm -R \
       $out/share/teamviewer/logfiles \
       $out/share/teamviewer/config \
-      $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
+      $out/share/teamviewer/tv_bin/xdg-utils \
       $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}
 
     ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
 
     sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
 
-    for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
+    for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do
       echo "patching $i"
-      patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
+      patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
     done
-    for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
+    for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ;  do
       echo "patching $i"
-      patchelf --set-rpath ${tvldpath32} $i || true
+      patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
     done
     ${if stdenv.system == "x86_64-linux" then ''
       patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
@@ -81,6 +81,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     description = "Desktop sharing application, providing remote support and online meetings";
     platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with maintainers; [ jagajaga ];
+    maintainers = with maintainers; [ jagajaga dasuxullebt ];
   };
 }

From 82b6a8f413f3729c531712e262322c40f4bb2898 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 13 Apr 2017 14:59:53 +0200
Subject: [PATCH 1034/1744] rustRegistry: 2017-04-11 -> 2017-04-13

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 77133d1e6af..7f866f69660 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-04-11";
-  rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38";
-  sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy";
+  version = "2017-04-13";
+  rev = "5758a926a647716bd650978ad53aeb4a0c5f9b45";
+  sha256 = "1fnwh62k8fbflciv1qg3r9fsqn1xy72flyv15ii3mpja2vqzkdi2";
 
   src = fetchFromGitHub {
       inherit rev;

From dcca9b17e3ee1b72f683642c22884c93f7284ffe Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 13 Apr 2017 15:25:25 +0200
Subject: [PATCH 1035/1744] pijul: 0.4.1 -> 0.4.4

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 134e6998670..b9848f45aab 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -4,11 +4,11 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.4.1";
+  version = "0.4.4";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a";
+    sha256 = "8f133b7e14bfa84156c103126d53b12c6dfb996dcdebcf1091199ff9c77f3713";
   };
 
   sourceRoot = "${name}/pijul";
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   doCheck = false;
   
-  depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7";
+  depsSha256 = "1zdvnarg182spgydmqwxxr929j44d771zkq7gyh152173i0xqb20";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";

From 1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 13 Apr 2017 16:28:09 +0300
Subject: [PATCH 1036/1744] make-bootstrap-tools.nix: Fix bzip2

Apparently our native bzip2 builds switched to using dynamic libraries at some point.
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 3 +--
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 1a762bd87c7..613edfafd95 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -221,8 +221,7 @@ rec {
         # GCC has certain things built in statically. See
         # pkgs/stdenv/linux/default.nix for the details.
         cp -d ${isl}/lib/libisl*.so* $out/lib
-        # Also this is needed since bzip2 uses a custom build system
-        # for native builds but autoconf (via a patch) for cross builds
+
         cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
 
         # Copy binutils.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 42015a79a3e..2ce73eb781d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -122,6 +122,8 @@ rec {
         cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
 
+        cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
+
         # Copy binutils.
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin

From e8014ce2438ab04852db504b2a8f84d7bbf3582a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 13 Apr 2017 16:27:13 +0200
Subject: [PATCH 1037/1744] beancount: 2.0b13 -> 2.0b15

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

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 72f6c5de8a1..70d5180191e 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2.0b13";
+  version = "2.0b15";
   name = "beancount-${version}";
   namePrefix = "";
 
   src = pkgs.fetchurl {
     url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm";
+    sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k";
   };
 
   buildInputs = with pythonPackages; [ nose ];

From d4fbb4779b88190e5b3a376360eb5fb97dba2f57 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 13 Apr 2017 15:27:19 +0100
Subject: [PATCH 1038/1744] terraform: 0.9.2 -> 0.9.3

---
 .../networking/cluster/terraform/default.nix    | 17 +++--------------
 pkgs/top-level/all-packages.nix                 |  4 ++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index aad5d1a8032..76984fed340 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -49,20 +49,9 @@ in {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_2 = generic {
-    version = "0.9.2";
-    sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
-
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/hashicorp/terraform/pull/13237.patch";
-        sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
-      })
-      (fetchpatch {
-        url = "https://github.com/hashicorp/terraform/pull/13248.patch";
-        sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
-      })
-    ];
+  terraform_0_9_3 = generic {
+    version = "0.9.3";
+    sha256 = "00z72lwv0cprz1jjy0cr8dicl00zwc1zwsxzjssqnq0187sswkxw";
 
     postPatch = ''
       rm builtin/providers/dns/data_dns_cname_record_set_test.go
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0573f504fd..14a3e9c9fb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18193,10 +18193,10 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_2;
+    terraform_0_9_3;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_2;
+  terraform_0_9 = terraform_0_9_3;
   terraform = terraform_0_9;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {

From 3d04aafffd1707c21bfc056b6d2f8f3efd66d843 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 13 Apr 2017 16:29:26 +0200
Subject: [PATCH 1039/1744] fava: 1.2 -> 1.3

---
 pkgs/applications/office/fava/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index a246c7290a5..437a0cbbd13 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,17 +1,19 @@
 { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.2";
+  version = "1.3";
   name = "fava-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/beancount/fava/archive/v${version}.tar.gz";
-    sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw";
+  src = fetchFromGitHub {
+    owner = "beancount";
+    repo = "fava";
+    rev = "v${version}";
+    sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8";
   };
 
   assets = fetchzip {
-    url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
-    sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp";
+    url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz";
+    sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
   };
 
   buildInputs = with python3Packages; [ pytest_30 ];

From 798e358a02aab8c9156020d99f7beda1061f1988 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Thu, 13 Apr 2017 08:10:39 -0700
Subject: [PATCH 1040/1744] cayley: init at 0.6.1

---
 pkgs/servers/cayley/default.nix |  30 ++++
 pkgs/servers/cayley/deps.nix    | 272 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |   2 +
 3 files changed, 304 insertions(+)
 create mode 100644 pkgs/servers/cayley/default.nix
 create mode 100644 pkgs/servers/cayley/deps.nix

diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
new file mode 100644
index 00000000000..9249d7cc347
--- /dev/null
+++ b/pkgs/servers/cayley/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "cayley-${version}";
+  version = "0.6.1";
+
+  goPackagePath = "github.com/cayleygraph/cayley";
+
+  src = fetchFromGitHub {
+    owner = "cayleygraph";
+    repo = "cayley";
+    rev = "v${version}";
+    sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildFlagsArray = ''
+    -ldflags=
+      -X=main.Version=${version}
+  '';
+  
+  meta = {
+    homepage = "https://cayley.io/";
+    description = "A graph database inspired by Freebase and Knowledge Graph";
+    maintainers = with stdenv.lib.maintainers; [ sigma ];
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
new file mode 100644
index 00000000000..1e6fadf9f4d
--- /dev/null
+++ b/pkgs/servers/cayley/deps.nix
@@ -0,0 +1,272 @@
+[
+  {
+    goPackagePath = "github.com/badgerodon/peg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/badgerodon/peg";
+      rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
+      sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11";
+    };
+  }
+  {
+    goPackagePath = "github.com/boltdb/bolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boltdb/bolt";
+      rev = "a705895fdad108f053eae7ee011ed94a0541ee13";
+      sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r";
+    };
+  }
+  {
+    goPackagePath = "github.com/cznic/mathutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cznic/mathutil";
+      rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd";
+      sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "2df174808ee097f90d259e432cc04442cf60be21";
+      sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g";
+    };
+  }
+  {
+    goPackagePath = "github.com/dlclark/regexp2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dlclark/regexp2";
+      rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5";
+      sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz";
+    };
+  }
+  {
+    goPackagePath = "github.com/dop251/goja";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dop251/goja";
+      rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca";
+      sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61";
+      sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "888eb0692c857ec880338addf316bd662d5e630e";
+      sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "ad28ea4487f05916463e2423a55166280e8254b5";
+      sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "b59a38004596b696aca7aa2adccfa68760864d86";
+      sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "0dad96c0b94f8dee039aa40467f767467392a0af";
+      sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
+    };
+  }
+  {
+    goPackagePath = "github.com/linkeddata/gojsonld";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linkeddata/gojsonld";
+      rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31";
+      sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i";
+    };
+  }
+  {
+    goPackagePath = "github.com/pborman/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/uuid";
+      rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
+      sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+    };
+  }
+  {
+    goPackagePath = "github.com/peterh/liner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterh/liner";
+      rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
+      sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+      sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
+    };
+  }
+  {
+    goPackagePath = "github.com/robertkrimen/otto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/robertkrimen/otto";
+      rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d";
+      sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb";
+      sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d";
+      sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab";
+      sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18";
+      sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g";
+    };
+  }
+  {
+    goPackagePath = "github.com/syndtr/goleveldb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/syndtr/goleveldb";
+      rev = "4875955338b0a434238a31165cb87255ab6e9e4a";
+      sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i";
+    };
+  }
+  {
+    goPackagePath = "github.com/syndtr/gosnappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/syndtr/gosnappy";
+      rev = "156a073208e131d7d2e212cb749feae7c339e846";
+      sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "6a513affb38dc9788b449d59ffed099b8de18fa0";
+      sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
+      sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c";
+      sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05";
+      sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
+      sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+    };
+  }
+  {
+    goPackagePath = "github.com/dennwc/graphql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dennwc/graphql";
+      rev = "fd5c4aa13f2119414084f229600de0d73f174436";
+      sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0573f504fd..b919b98d9c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10587,6 +10587,8 @@ with pkgs;
   bosun = callPackage ../servers/monitoring/bosun { };
   scollector = bosun;
 
+  cayley = callPackage ../servers/cayley { };
+
   charybdis = callPackage ../servers/irc/charybdis {};
 
   couchdb = callPackage ../servers/http/couchdb {

From cf68f546b1d5648c1d83f33e265c019c9f971c10 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 22 Feb 2017 06:01:09 +0000
Subject: [PATCH 1041/1744] libguestfs: 1.29.5 -> 1.34.4

---
 pkgs/development/libraries/hivex/default.nix  |  4 +--
 .../libraries/hivex/hivex-syms.patch          |  6 ++--
 .../libraries/libguestfs/default.nix          | 29 ++++++++++++++-----
 .../libguestfs/libguestfs-syms.patch          |  8 ++---
 .../ocaml-modules/ocaml-libvirt/default.nix   | 20 +++++++++----
 5 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 76836b69d2a..eced02fd33e 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.11";
+  version = "1.3.14";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
-    sha256 = "0y3nqykwy58divxkv7gmsb067dasyfz3apbp437hl57rgrndyfn6";
+    sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b";
   };
 
   patches = [ ./hivex-syms.patch ];
diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/development/libraries/hivex/hivex-syms.patch
index 2280ade59a6..bacd34e8515 100644
--- a/pkgs/development/libraries/hivex/hivex-syms.patch
+++ b/pkgs/development/libraries/hivex/hivex-syms.patch
@@ -1,6 +1,6 @@
-diff -rupN hivex-1.3.11/lib/Makefile.am hivex-1.3.11-new/lib/Makefile.am
---- hivex-1.3.11/lib/Makefile.am	2013-09-10 13:04:12.000000000 +0200
-+++ hivex-1.3.11-new/lib/Makefile.am	2014-11-06 01:31:05.956106861 +0100
+diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am
+--- hivex-1.3.14/lib/Makefile.am	2013-09-10 13:04:12.000000000 +0200
++++ hivex-1.3.14-new/lib/Makefile.am	2014-11-06 01:31:05.956106861 +0100
 @@ -40,8 +40,7 @@ libhivex_la_SOURCES = \
  
  libhivex_la_LIBADD =  ../gnulib/lib/libgnu.la $(LTLIBOBJS)
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 02e75788d01..3f7542254cd 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,32 +1,45 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
+, getopt, perlPackages, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.29.5";
+  version = "1.34.4";
 
   appliance = fetchurl {
-    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.26.0.tar.xz";
-    sha256 = "1kzvgmy845kclvr93y6rdpss2q0p8yfqg14r0i1pi5r4zc68yvj4";
+    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.34.0.tar.xz";
+    sha256 = "0d7kg6ck9hwsqrxch69fhn49sbsjc8c40fr4753c35cq49f7xp6d";
   };
 
   src = fetchurl {
-    url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz";
-    sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h";
+    url = "http://libguestfs.org/download/1.34-stable/libguestfs-${version}.tar.gz";
+    sha256 = "1ca9i9d03pnfm7qqixvl48d7n0hn4ldmzlh2wcws45441prdxw3z";
   };
 
   buildInputs = [
     makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt numactl xen libapparmor
-  ];
+    SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
+  ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]);
 
+  prePatch = ''
+    # build-time scripts
+    substituteInPlace run.in        --replace '#!/bin/bash' '#!/bin/sh'
+    substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh'
+
+    # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
+    substituteInPlace ocaml/Makefile.am            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace ocaml/Makefile.in            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace v2v/test-harness/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace v2v/test-harness/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+  '';
   configureFlags = "--disable-appliance --disable-daemon";
   patches = [ ./libguestfs-syms.patch ];
   NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
+  installFlags = "REALLY_INSTALL=yes";
 
   postInstall = ''
     for bin in $out/bin/*; do
diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
index 44cdc4e69b2..88c9ec0e430 100644
--- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
+++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
@@ -1,7 +1,7 @@
-diff -rupN libguestfs-1.29.5/src/Makefile.am libguestfs-1.29.5-new/src/Makefile.am
---- libguestfs-1.29.5/src/Makefile.am	2014-11-05 16:43:08.000000000 +0100
-+++ libguestfs-1.29.5-new/src/Makefile.am	2014-11-05 20:07:45.760730596 +0100
-@@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \
+diff -rupN libguestfs-1.34.4/src/Makefile.am libguestfs-1.34.4-new/src/Makefile.am
+--- libguestfs-1.34.4/src/Makefile.am	2017-02-22 07:49:07.322357165 +0000
++++ libguestfs-1.34.4-new/src/Makefile.am	2017-02-22 07:50:03.437454422 +0000
+@@ -172,8 +172,7 @@ libguestfs_la_LIBADD = \
  # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'.
  # Include the version script to limit which symbols are exported.
  libguestfs_la_LDFLAGS = \
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 439beaa24ff..01b761e4e4a 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchurl, libvirt, ocaml, findlib }:
+{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
   name = "ocaml-libvirt-${version}";
-  version = "0.6.1.4";
+  version = "0.6.1.5"; # FIXME: libguestfs depends on not yet released 0.6.1.5, so the latest post-0.6.1.4 master from git is used
 
-  src = fetchurl {
-    url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz";
-    sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd";
+  src = fetchgit {
+    url = "git://git.annexia.org/git/ocaml-libvirt.git";
+    rev = "8853f5a49587f00a7d2a5c8c7e52480a16bbdb02";
+    sha256 = "1lnsvyb6dll58blacc629nz1lzc20p7ayqn9pag1rrx5i54q9v24";
   };
 
   propagatedBuildInputs = [ libvirt ];
 
-  buildInputs = [ ocaml findlib ];
+  nativeBuildInputs = [ autoconf findlib ];
+
+  buildInputs = [ ocaml ];
 
   createFindlibDestdir = true;
 
+  preConfigure = ''
+    substituteInPlace configure.ac --replace 0.6.1.4 0.6.1.5
+    autoconf
+  '';
+
   buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";
 
   installPhase = "make install-opt";

From 94753af68ce76e0a8991d711ad54c927b6f891ed Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 31 Mar 2017 02:19:02 +0000
Subject: [PATCH 1042/1744] libguestfs: 1.34.4 -> 1.34.6

---
 pkgs/development/libraries/libguestfs/default.nix        | 8 ++++----
 pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 3f7542254cd..0b7e889a631 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -6,16 +6,16 @@
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.34.4";
+  version = "1.34.6";
 
   appliance = fetchurl {
-    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.34.0.tar.xz";
-    sha256 = "0d7kg6ck9hwsqrxch69fhn49sbsjc8c40fr4753c35cq49f7xp6d";
+    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz";
+    sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125";
   };
 
   src = fetchurl {
     url = "http://libguestfs.org/download/1.34-stable/libguestfs-${version}.tar.gz";
-    sha256 = "1ca9i9d03pnfm7qqixvl48d7n0hn4ldmzlh2wcws45441prdxw3z";
+    sha256 = "1bdn6jsxm7krl4bpzwx47lg1xlhp5wfzizy03vspkgcppgp2q36s";
   };
 
   buildInputs = [
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 01b761e4e4a..0ad5d09d687 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -2,12 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml-libvirt-${version}";
-  version = "0.6.1.5"; # FIXME: libguestfs depends on not yet released 0.6.1.5, so the latest post-0.6.1.4 master from git is used
+  rev = "3169af3";
+  version = "0.6.1.4-rev.${rev}"; # 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 = "8853f5a49587f00a7d2a5c8c7e52480a16bbdb02";
-    sha256 = "1lnsvyb6dll58blacc629nz1lzc20p7ayqn9pag1rrx5i54q9v24";
+    rev = rev;
+    sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
   };
 
   propagatedBuildInputs = [ libvirt ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   preConfigure = ''
-    substituteInPlace configure.ac --replace 0.6.1.4 0.6.1.5
     autoconf
   '';
 

From dc0e338e01a75a8c7f79961d76eb10d8e023806b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 13 Apr 2017 15:50:32 +0000
Subject: [PATCH 1043/1744] libguestfs: 1.34.6 -> 1.36.3

---
 pkgs/development/libraries/libguestfs/default.nix         | 6 +++---
 .../libraries/libguestfs/libguestfs-syms.patch            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 0b7e889a631..7902cf67c8d 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.34.6";
+  version = "1.36.3";
 
   appliance = fetchurl {
     url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://libguestfs.org/download/1.34-stable/libguestfs-${version}.tar.gz";
-    sha256 = "1bdn6jsxm7krl4bpzwx47lg1xlhp5wfzizy03vspkgcppgp2q36s";
+    url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz";
+    sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
index 88c9ec0e430..09c4b1393ce 100644
--- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
+++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
@@ -1,7 +1,7 @@
-diff -rupN libguestfs-1.34.4/src/Makefile.am libguestfs-1.34.4-new/src/Makefile.am
---- libguestfs-1.34.4/src/Makefile.am	2017-02-22 07:49:07.322357165 +0000
-+++ libguestfs-1.34.4-new/src/Makefile.am	2017-02-22 07:50:03.437454422 +0000
-@@ -172,8 +172,7 @@ libguestfs_la_LIBADD = \
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -168,8 +168,7 @@ libguestfs_la_LIBADD = \
  # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'.
  # Include the version script to limit which symbols are exported.
  libguestfs_la_LDFLAGS = \

From 78635ce26b84dea646c7b00598c2596477882ce3 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 13 Apr 2017 18:45:11 +0200
Subject: [PATCH 1044/1744] vim-elixir: 2017-03-29 -> 2017-04-13

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 90559742057..f818962b8ae 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,11 +647,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-03-29";
+    name = "vim-elixir-2017-04-13";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "9482415ab27fddf8125524f54d9e500bb9541756";
-      sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq";
+      rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205";
+      sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8";
     };
     dependencies = [];
 

From 034ea00b98101922fd70507692f87b97fbccf836 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 13 Apr 2017 20:45:41 +0200
Subject: [PATCH 1045/1744] pythonPackages.PyICU: 1.9.5 -> 1.9.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd84c3f14aa..9f0dbb91068 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20679,11 +20679,11 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-1.9.5";
+    name = "PyICU-1.9.6";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k";
+      sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5";
     };
 
     buildInputs = [ pkgs.icu ];

From 9d794180196c42929cc95c262492ad8a52f1fe1b Mon Sep 17 00:00:00 2001
From: lucas8 <luc.linux@mailoo.org>
Date: Thu, 13 Apr 2017 22:14:19 +0200
Subject: [PATCH 1046/1744] fanficfare: init at 2.9.0

---
 pkgs/tools/text/fanficfare/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/text/fanficfare/default.nix

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
new file mode 100644
index 00000000000..38eadf40ae3
--- /dev/null
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, python27Packages }:
+
+python27Packages.buildPythonApplication rec {
+  version = "2.9.0";
+  name = "fanficfare-${version}";
+  nameprefix = "";
+
+  src = fetchurl {
+    url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
+    sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398";
+  };
+
+  propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
+
+  meta = with stdenv.lib; {
+    description = "FanFicFare is a tool for making eBooks from fanfiction web sites";
+    homepage = "https://github.com/JimmXinu/FanFicFare";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lucas8 ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f1287a3576..f1097820b9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1709,6 +1709,8 @@ with pkgs;
       pillow;
   };
 
+  fanficfare = callPackage ../tools/text/fanficfare { };
+
   fastd = callPackage ../tools/networking/fastd { };
 
   fatsort = callPackage ../tools/filesystems/fatsort { };

From de0f09035377d4ebd6d183168d7e94bff82eecf5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 13 Apr 2017 23:44:03 +0200
Subject: [PATCH 1047/1744] josm: 11639 -> 11826

---
 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 6dd0f532f18..753d27b3376 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 = "11639";
+  version = "11826";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb";
+    sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2";
   };
 
   phases = [ "installPhase" ];

From 77c8470e0a76607f32b290b263fad5e3ecc0f2d6 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 13 Apr 2017 18:11:10 -0400
Subject: [PATCH 1048/1744] latte-dock: 0.5.98 -> 0.6.0

---
 pkgs/applications/misc/latte-dock/default.nix | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 8792a07e3e9..cdde0beb827 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }:
+{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }:
 
-let version = "0.5.98"; in
+let version = "0.6.0";
 
-stdenv.mkDerivation {
-  name = "latte-dock-${version}";
+    unwrapped = stdenv.mkDerivation {
+      name = "latte-dock-${version}";
 
-  src = fetchFromGitHub {
-    owner = "psifidotos";
-    repo = "Latte-Dock";
-    rev = version;
-    sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh";
-  };
+      src = fetchFromGitHub {
+        owner = "psifidotos";
+        repo = "Latte-Dock";
+        rev = "v${version}";
+        sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+      };
 
-  buildInputs = [ plasma-framework ];
+      buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
 
-  nativeBuildInputs = [ cmake ];
+      nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
-    description = "Dock-style app launcher based on Plasma frameworks";
-    homepage = https://github.com/psifidotos/Latte-Dock;
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.benley ];
-  };
+      enableParallelBuilding = true;
+
+      meta = with stdenv.lib; {
+        description = "Dock-style app launcher based on Plasma frameworks";
+        homepage = https://github.com/psifidotos/Latte-Dock;
+        license = licenses.gpl2;
+        platforms = platforms.unix;
+        maintainers = [ maintainers.benley ];
+      };
+    };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/latte-dock" ];
 }

From 552efadbef953162099e6185edc4aad67dae773f Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 13 Apr 2017 18:58:14 -0400
Subject: [PATCH 1049/1744] chromium: 57.0.2987.110 -> 57.0.2987.133 [security]

CVE-2017-5055: Use after free in printing. Credit to Wadih Matar
CVE-2017-5054: Heap buffer overflow in V8. Credit to Nicolas Trippar of Zimperium zLabs
CVE-2017-5052: Bad cast in Blink. Credit to JeongHoon Shin
CVE-2017-5056: Use after free in Blink. Credit to anonymous
CVE-2017-5053: Out of bounds memory access in V8. Credit to Team Sniper (Keen Lab and PC Mgr) reported through ZDI (ZDI-CAN-4587)
---
 .../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 176784ea7a4..2800a3ed5d2 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 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
-    sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh";
-    version = "58.0.3029.19";
+    sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2";
+    sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9";
+    version = "58.0.3029.68";
   };
   dev = {
-    sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
-    sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578";
-    version = "58.0.3029.19";
+    sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8";
+    sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0";
+    version = "59.0.3067.0";
   };
   stable = {
-    sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va";
-    sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn";
-    version = "57.0.2987.110";
+    sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh";
+    sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja";
+    version = "57.0.2987.133";
   };
 }

From 9ea655dcdd2d37d27db7fffa9b5d7807212cb93c Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 13 Apr 2017 19:17:39 -0700
Subject: [PATCH 1050/1744] electron: 1.4.15 -> 1.6.2

---
 pkgs/applications/editors/atom/env.nix      | 1 +
 pkgs/development/tools/electron/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 228a21dc430..8f6c5f5c290 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -10,6 +10,7 @@ let
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
     xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
+    xorg.libxcb
   ];
 
   libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 3d5c23678db..f2db32c5eec 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 let
-  version = "1.4.15";
+  version = "1.6.2";
   name = "electron-${version}";
 
   meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "07b9jdbjrf3siv205wd1dphq6ly0hkaapzvj87d2yjfiyzv3cbsl";
+      sha256 = "1dhyr8zkisnhjzk2v2zi8zp0jqg0v3g095xa430af6i1rm0qhs13";
       name = "${name}.zip";
     };
 
@@ -45,7 +45,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "0p8gkyq4qczzia26wrnbs91vdqzxhgq515cmsrwvhw87mc9fka4k";
+      sha256 = "11jfh4xvdrpda5ni08kl6wcg67ww9viagszk8gi00z0rlczrsbkf";
       name = "${name}.zip";
     };
 

From 6f69681dad1c937614dbbb767f95480ea630d781 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Thu, 13 Apr 2017 23:21:38 -0500
Subject: [PATCH 1051/1744] Add hardening, bump hash to HaLVM

---
 pkgs/development/compilers/halvm/2.4.0.nix           | 8 ++++----
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index c167f4bdd75..08e74bdb78e 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
   isHaLVM = true;
   isGhcjs = false;
   src = fetchgit {
-    rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925";
+    rev = "65fad65966eb7e60f234453a35aeb564a09d2595";
     url = "https://github.com/GaloisInc/HaLVM";
-    sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167";
+    sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k";
   };
   prePatch = ''
-    sed -i '312 d' Makefile
-    sed -i '316,446 d' Makefile # Removes RPM packaging
+    sed -i '305 d' Makefile
+    sed -i '309,439 d' Makefile # Removes RPM packaging
     sed -i '20 d' src/scripts/halvm-cabal.in
     sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in
   '';
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d39e1bacd71..0c51f208f46 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs, nodejs
+, jailbreak-cabal, hscolour, cpphs, nodejs, lib
 }: let isCross = (ghc.cross or null) != null; in
 
 { pname
@@ -53,7 +53,7 @@
 , shellHook ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
-, hardeningDisable ? []
+, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
 } @ args:
 
 assert editedCabalFile != null -> revision != null;

From 304d30ce3f22ca8b275236de6e2c2e7f6e0b1934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Apr 2017 10:31:31 +0200
Subject: [PATCH 1052/1744] all-tarballs: fixup evaluation (and the tarball
 job)

---
 maintainers/scripts/all-tarballs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix
index 552f8802296..d981a1fa7db 100644
--- a/maintainers/scripts/all-tarballs.nix
+++ b/maintainers/scripts/all-tarballs.nix
@@ -14,5 +14,5 @@ removeAttrs (import ../../pkgs/top-level/release.nix
     supportedSystems = [ "x86_64-linux" ];
   })
   [ # Remove jobs whose evaluation depends on a writable Nix store.
-    "tarball" "unstable"
+    "tarball" "unstable" "darwin-tested"
   ]

From f8efcf1c0c5076e486ca184df34c0c53d666b8f2 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 14 Apr 2017 01:34:55 -0700
Subject: [PATCH 1053/1744] hugo: 0.20 -> 0.20.1

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 895299f75b6..5702b858d6a 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.20";
+  version = "0.20.1";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1dzvwldhf73ycmazq9xnridj7p3m3q6qv47rvk3vgj0xj6c107ij";
+    sha256 = "1mxg9mp98n32q1qsqd9f9izsq1s18a7jsw8gcyh9vbspdnyghb7q";
   };
 
   goDeps = ./deps.nix;

From 6b73c0f198c59dd1e67aac39076c3076517c9d38 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 13 Apr 2017 01:54:04 -0700
Subject: [PATCH 1054/1744] netcat-openbsd: pkgconfig is a nativeBuildInput

---
 pkgs/tools/networking/netcat-openbsd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index 9933b512006..ef539cbb51f 100644
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ b/pkgs/tools/networking/netcat-openbsd/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ pkgconfig libbsd ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libbsd ];
+
   sourceRoot = name;
   patches = [ "../debian/patches/*.patch" ];
 

From bd45ec6416d9560b050cf098c4eccc1051df0900 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 13 Apr 2017 01:55:29 -0700
Subject: [PATCH 1055/1744] buildEnv: use buildPackages.perl so crossDrv works

---
 pkgs/build-support/buildenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index dc05ec1678c..47e2c1b904c 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -2,7 +2,7 @@
 # a fork of the buildEnv in the Nix distribution.  Most changes should
 # eventually be merged back into the Nix distribution.
 
-{ perl, runCommand, lib }:
+{ buildPackages, runCommand, lib }:
 
 { name
 
@@ -66,6 +66,6 @@ runCommand name
     passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
   }
   ''
-    ${perl}/bin/perl -w ${./builder.pl}
+    ${buildPackages.perl}/bin/perl -w ${./builder.pl}
     eval "$postBuild"
   ''

From 980ced505fd4da90ae75d1582da6825ef51476c1 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 7 Feb 2017 09:16:29 -0800
Subject: [PATCH 1056/1744] coreutils: fixing ccCross.libc lookup

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 455937f3a67..d87976cbc5e 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       ++ optional aclSupport acl.crossDrv
       ++ optional attrSupport attr.crossDrv
       ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
-      ++ optional (stdenv.ccCross.libc ? libiconv)
+      ++ optional (stdenv ? ccCross.libc.libiconv)
         stdenv.ccCross.libc.libiconv.crossDrv;
 
     # Prevents attempts of running 'help2man' on cross-built binaries.

From da20d0e488ba645e6c9271705209333cfdd703db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Apr 2017 11:05:42 +0200
Subject: [PATCH 1057/1744] murmur service: fix typos from #24830

---
 nixos/modules/services/networking/murmur.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index c961857c77a..13d7c3254f9 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -28,15 +28,15 @@ let
     imagemessagelength=${toString cfg.imgMsgLength}
     allowhtml=${boolToString cfg.allowHtml}
     logdays=${toString cfg.logDays}
-    bonjour=${babelToString cfg.bonjour}
-    sendversion=${babelToString cfg.sendVersion}
+    bonjour=${boolToString cfg.bonjour}
+    sendversion=${boolToString cfg.sendVersion}
 
     ${if cfg.registerName     == "" then "" else "registerName="+cfg.registerName}
     ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}
     ${if cfg.registerUrl      == "" then "" else "registerUrl="+cfg.registerUrl}
     ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}
 
-    certrequired=${babelToString cfg.clientCertRequired}
+    certrequired=${boolToString cfg.clientCertRequired}
     ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
     ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}
     ${if cfg.sslCa   == "" then "" else "sslCA="+cfg.sslCa}

From 7f09c06c5858f52d1fdfe82e89f92c4864e4f57f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Mar 2017 17:05:00 +0100
Subject: [PATCH 1058/1744] usbredir: Use dev output

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

diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 76912f19ab5..f4ec0242224 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libusb ];
   propagatedBuildInputs = [ libusb ];
 
+  outputs = [ "out" "dev" ];
+
   meta = with stdenv.lib; {
     description = "USB traffic redirection protocol";
     homepage = http://spice-space.org/page/UsbRedir;

From 77e71c2f99d0d3216aacd46291ad722d9ceccc19 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 14 Apr 2017 11:34:13 +0200
Subject: [PATCH 1059/1744] mutt: 1.8.0 -> 1.8.1

From the announce email:

    This is a bug fix release.  In particular, it has fixes for setenv,
    sidebar_whitelist, some refresh issues, and a potential segfault.
    Details can be seen in the ChangeLog file.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 92d1a3446c0..8eb1169b5a2 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125";
+    sha256 = "1b8dggq5x1b77a9i9250b3jhv2iddfzhr9rix1yfzckdms65mr8b";
   };
 
   patchPhase = optionalString (openssl != null) ''

From 72605647a40c8099c626884a784693390b442907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Apr 2017 11:41:36 +0200
Subject: [PATCH 1060/1744] flashplayer: 25.0.0.127 -> 25.0.0.148

---
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 72a1f171dec..bf0b91544ad 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -60,7 +60,7 @@
 
 let
   arch =
-    if      stdenv.system == "x86_64-linux" then
+    if stdenv.system == "x86_64-linux" then
       "x86_64"
     else if stdenv.system == "i686-linux"   then
       "i386"
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "25.0.0.127";
+  version = "25.0.0.148";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva"
+          "1jxxnbd357ndw8b64lw4pwkg9j0shy0ns7xw0f36awimq7bclr8d"
         else
-          "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx"
+          "1k0zyy4mz307r7ph4pnmyqaa0fdw2f52apala6dbrys0wdl05yfg"
       else
         if arch == "x86_64" then
-          "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn"
+          "0n77a2z0928vd4bjgx69igzxvn8l9wrfh79j6knygdpnsbr3pybj"
         else
-          "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d";
+          "1cb1h37av4icfhl4vjngsa3nfcrcdvzliwxdg22rshimlkfgr7vx";
   };
 
   nativeBuildInputs = [ unzip ];

From 6a1f168b1ee6cd01e5eece33d6151bf658f232a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Apr 2017 11:42:32 +0200
Subject: [PATCH 1061/1744] flashplayer-standalone: 25.0.0.127 -> 25.0.0.148

---
 .../mozilla-plugins/flashplayer/standalone.nix         | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 178b86b61c6..4d65a7e9a62 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,15 +49,13 @@
 
 let
   arch =
-    if      stdenv.system == "x86_64-linux" then
+    if stdenv.system == "x86_64-linux" then
       "x86_64"
-    else if stdenv.system == "i686-linux"   then
-      "i386"
     else throw "Flash Player is not supported on this platform";
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "25.0.0.127";
+  version = "25.0.0.148";
 
   src = fetchurl {
     url =
@@ -67,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51"
+        "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r"
       else
-        "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2";
+        "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6704f45be7..309ef69e6ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13766,15 +13766,15 @@ with pkgs;
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
-      debug = config.flashplayer.debug or false;
+    debug = config.flashplayer.debug or false;
   };
 
   flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix {
-      debug = config.flashplayer.debug or false;
+    debug = config.flashplayer.debug or false;
   };
 
   flashplayer-standalone-debugger = flashplayer-standalone.override {
-      debug = true;
+    debug = true;
   };
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };

From c395568b7a959c8a95a91097fb1e517ced21a46c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 17 Mar 2017 17:20:48 +0100
Subject: [PATCH 1062/1744] openssh_hpn: use new sources and version (7_5_P1)

Close #23990.
---
 pkgs/tools/networking/openssh/default.nix | 31 ++++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 79cdac87489..0bcb0baaab8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam
+{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
 , etcDir ? null
 , hpnSupport ? false
 , withKerberos ? false
@@ -12,11 +12,6 @@ assert withGssapiPatches -> withKerberos;
 
 let
 
-  hpnSrc = fetchurl {
-    url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
-    sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
-  };
-
   # **please** update this patch when you update to a new openssh release.
   gssapiSrc = fetchpatch {
     name = "openssh-gssapi.patch";
@@ -33,16 +28,16 @@ stdenv.mkDerivation rec {
   name = "openssh-${version}";
   version = "7.5p1";
 
-  src = fetchurl {
-    url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
-  };
-
-  prePatch = optionalString hpnSupport
-    ''
-      gunzip -c ${hpnSrc} | patch -p1
-      export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
-    '';
+  src = if hpnSupport then
+      fetchurl {
+        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz";
+        sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn";
+      }
+    else
+      fetchurl {
+        url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
+        sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
+      };
 
   patches =
     [
@@ -55,7 +50,8 @@ stdenv.mkDerivation rec {
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
-    ++ optional withKerberos kerberos;
+    ++ optional withKerberos kerberos
+    ++ optional hpnSupport autoreconfHook;
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
@@ -94,6 +90,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ eelco aneeshusa ];
-    broken = hpnSupport; # probably after 6.7 update
   };
 }

From 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Apr 2017 12:28:01 +0200
Subject: [PATCH 1063/1744] glib: 2.50.3 -> 2.52.1

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5d8d98af8d3..96175d04a4e 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -42,8 +42,8 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.50";
-  ver_min = "3";
+  ver_maj = "2.52";
+  ver_min = "1";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999";
+    sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

From 862fc1b46592d974e020979ef03e569c82aece13 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 14 Apr 2017 19:04:55 +0800
Subject: [PATCH 1064/1744] tensor: init at (post) 0.3

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

diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
new file mode 100644
index 00000000000..ed78274c799
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
+
+let
+  rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
+
+in stdenv.mkDerivation rec {
+  name = "tensor-git-${stdenv.lib.strings.substring 0 8 rev}";
+
+  src = fetchgit {
+    url = "https://github.com/davidar/tensor.git";
+    fetchSubmodules = true;
+    inherit rev;
+    sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
+  };
+
+  parallelBuilding = true;
+
+  buildInputs = [ qtbase qtquickcontrols ];
+  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+
+  desktopItem = makeDesktopItem {
+    name = "tensor";
+    exec = "@bin@";
+    icon = "tensor.png";
+    comment = meta.description;
+    desktopName = "Tensor Matrix Client";
+    genericName = meta.description;
+    categories = "Chat;Utility";
+    mimeType = "text/xml";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 tensor $out/bin/tensor
+    install -Dm644 client/logo.png \
+                   $out/share/icons/hicolor/512x512/apps/tensor.png
+    install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
+                   $out/share/applications/tensor.desktop
+
+    wrapQtProgram $out/bin/tensor
+
+    substituteInPlace $out/share/applications/tensor.desktop \
+      --subst-var-by bin $out/bin/tensor
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://matrix.org/docs/projects/client/tensor.html;
+    description = "Cross-platform Qt5/QML-based Matrix client";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 309ef69e6ee..39aeecfcdbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -652,6 +652,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
+
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
   blitz = callPackage ../development/libraries/blitz {

From 31a28a38a10bd46579c0566fe03ca3f60fa33c72 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Wed, 12 Apr 2017 14:22:08 +0300
Subject: [PATCH 1065/1744] pythonPackages.bleach: remove the 'platforms'
 attribute; update homepage

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1397846934..8568b7096a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2986,11 +2986,10 @@ in {
         to do lots of things, you're probably outside the use cases. Either
         trust those users, or don't.
       '';
-      homepage = https://github.com/jsocol/bleach;
-      downloadPage = https://github.com/jsocol/bleach/releases;
+      homepage = https://github.com/mozilla/bleach;
+      downloadPage = https://github.com/mozilla/bleach/releases;
       license = licenses.asl20;
       maintainers = with maintainers; [ prikhi ];
-      platforms = platforms.linux;
     };
   };
 

From 31fef05c7ca0f7e55773b75a1db71c8fc2fe07c0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Apr 2017 19:26:05 +0000
Subject: [PATCH 1066/1744] ocamlPackages.lwt: 2.6.0 -> 2.7.1

---
 .../development/ocaml-modules/lwt/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index d3a373ab4db..53d5a25a39e 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,19 +1,30 @@
 { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
 , ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
-, ppx_tools, result
+, ppx_tools, result, cppo
 , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 }:
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  then {
+    version = "2.7.1";
+    sha256 = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
+  } else {
+    version = "2.6.0";
+    sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+  };
+in
+
 stdenv.mkDerivation rec {
   name = "ocaml-lwt-${version}";
-  version = "2.6.0";
+  inherit (param) version;
 
   src = fetchzip {
     url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
-    sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+    inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ]
+  buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
   ++ stdenv.lib.optional ppxSupport ppx_tools;
 
   propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ];

From b6f88093a21efdf3cc24ac716015b4db5e9e3df0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Fri, 14 Apr 2017 15:13:10 +0200
Subject: [PATCH 1067/1744] icoutils: update to 0.31.3

---
 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 70f9e29d0f5..8b26f4ce3c8 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.1";
+  name = "icoutils-0.31.3";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6";
+    sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152";
   };
 
   buildInputs = [ makeWrapper libpng perl ];

From 9a10e5ae462bcbaeae7e556695b9329eba4cb72a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Apr 2017 15:44:18 +0200
Subject: [PATCH 1068/1744] nano: 2.8.0 -> 2.8.1

See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00005.html
for release announcement

(cherry picked from commit 474d112b7a942afd9206e0f8a81b6ba9bb9b95bc)
---
 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 cd220a4bd7e..bfc3b7c79fa 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.8.0";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
+    sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 3ed0d7e2dfd5c197a29c3142f69eaa48d71cade9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 Sep 2015 20:05:06 +0300
Subject: [PATCH 1069/1744] kernel-config: Explicitly enable CONFIG_NETFILTER

This is needed by the NixOS firewall, but isn't enabled by the ARM
defconfig nor kernelAutoModules (as 'm' doesn't seem to be an option)
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 39c19ceeff7..2c4dbc7d20f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -123,6 +123,7 @@ with stdenv.lib;
   ${optionalString (versionOlder version "3.13") ''
     IPV6_PRIVACY y
   ''}
+  NETFILTER y
   NETFILTER_ADVANCED y
   IP_ROUTE_VERBOSE y
   IP_MROUTE_MULTIPLE_TABLES y

From 0ac07ac53133b334cf64c8d31a2a8f397b8de646 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Mon, 20 Mar 2017 12:22:58 -0700
Subject: [PATCH 1070/1744] plex: 1.3.3.3148 -> 1.5.5.3634

---
 pkgs/servers/plex/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 122d5bd7dc9..618bc17d0a7 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.3.3.3148";
-    vsnHash = "b38628e";
-    sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y";
+    version = "1.5.5.3634";
+    vsnHash = "995f1dead";
+    sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h";
   };
 
 in stdenv.mkDerivation rec {
@@ -36,7 +36,14 @@ in stdenv.mkDerivation rec {
 
     # Now we need to patch up the executables and libraries to work on Nix.
     # Side note: PLEASE don't put spaces in your binary names. This is stupid.
-    for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do
+    for bin in "Plex Media Server"              \
+               "Plex DLNA Server"               \
+               "Plex Media Scanner"             \
+               "Plex Media Server Tests"        \
+               "Plex Relay"                     \
+               "Plex Script Host"               \
+               "Plex Transcoder"                \
+               "Plex Tuner Service"             ; do
       patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
       patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
     done
@@ -67,7 +74,7 @@ in stdenv.mkDerivation rec {
     homepage = http://plex.tv/;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ];
+    maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ];
     description = "Media / DLNA server";
     longDescription = ''
       Plex is a media server which allows you to store your media and play it

From 5a50b266624bceee5243c6eadf86d958768bfa6c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Fri, 14 Apr 2017 11:19:29 -0700
Subject: [PATCH 1071/1744] plex: Don't overwrite primary database on restart

This change fixes two major issues:

  1. If you don't use SIGQUIT to stop Plex it will corrupt its own
     database :(

  2. Newer versions of Plex keep metadata in the
     `com.plexapp.plugins.library.db` database.  This is the file that
     we copy into `/var/lib/plex/.skeleton`.  If we copy the empty
     database on top of this one the user will lose their entire
     library metadata.  This change skips the copy if the file
     already exists.
---
 nixos/modules/services/misc/plex.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index f6bf2dee986..9c0bea8d3bf 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -93,7 +93,9 @@ in
         # why this is done.
         test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
         for db in "com.plexapp.plugins.library.db"; do
-            cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
+            if [ ! -e  "${cfg.dataDir}/.skeleton/$db" ]; then
+              cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
+            fi
             chmod u+w "${cfg.dataDir}/.skeleton/$db"
             chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db"
         done
@@ -136,6 +138,7 @@ in
         Group = cfg.group;
         PermissionsStartOnly = "true";
         ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server";
+        KillSignal = "SIGQUIT";
         Restart = "on-failure";
       };
       environment = {

From 3f69d10342e26172af33e926d287561c57d1dda2 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Fri, 14 Apr 2017 12:10:28 -0700
Subject: [PATCH 1072/1744] atomicparsley: 0.9.0 -> 0.9.6

---
 pkgs/tools/video/atomicparsley/casts.patch | 38 ----------------------
 pkgs/tools/video/atomicparsley/default.nix | 35 ++++++++------------
 2 files changed, 14 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/tools/video/atomicparsley/casts.patch

diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch
deleted file mode 100644
index b70a3cbcf85..00000000000
--- a/pkgs/tools/video/atomicparsley/casts.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig	2015-03-13 15:38:16.817904490 -0600
-+++ AtomicParsley-source-0.9.0/AtomicParsley.cpp	2015-03-13 15:48:07.595273416 -0600
-@@ -1447,7 +1447,7 @@
- 	uint32_t atom_offsets = 0;
- 	char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path
- 	if (output_path == NULL) {
--		char* orig_suffix = strrchr(originating_file, '.');
-+		char* orig_suffix = strrchr((char*)originating_file, (int)'.');
- 		if (orig_suffix == NULL) {
- 			fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n");
- 			path_len = strlen(originating_file);
-@@ -4464,7 +4464,7 @@
- void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) {
- 	char* suffix = NULL;
- 	if (forced_suffix == NULL) {
--		suffix = strrchr(filePath, '.');
-+		suffix = strrchr((char*)filePath, (int)'.');
- 	} else {
- 		suffix = forced_suffix;
- 	}
-@@ -4480,7 +4480,7 @@
- 		memcpy(temp_path, filePath, base_len);
- 		memcpy(temp_path + base_len, file_kind, strlen(file_kind));
- #else
--		char* file_name = strrchr(filePath, '/');
-+		char* file_name = strrchr((char*)filePath, (int)'/');
- 		size_t file_name_len = strlen(file_name);
- 		memcpy(temp_path, filePath, filepath_len-file_name_len+1);
- 		memcpy(temp_path + strlen(temp_path), ".", 1);
-@@ -5006,7 +5006,7 @@
- 			free_modified_name = true;
- 			if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension
- 				uint16_t filename_len = strlen(m4aFile);
--				char* suffix = strrchr(m4aFile, '.');
-+				char* suffix = strrchr((char*)m4aFile, (int)'.');
- 				memcpy(originating_file, m4aFile, filename_len+1 );
- 				memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
- 			}
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index b2eb5366618..701850758bc 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,39 +1,32 @@
-{ stdenv, fetchurl, unzip, darwin }:
+{ stdenv, fetchhg, autoreconfHook, zlib, darwin }:
 
 stdenv.mkDerivation rec {
   name = "atomicparsley-${version}";
-  product = "AtomicParsley";
-  version = "0.9.0";
+  version = "0.9.6";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip";
-    sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
+  src = fetchhg {
+    url = "https://bitbucket.org/wez/atomicparsley";
+    sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
   };
 
-  patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch;
+  buildInputs =
+    [ autoreconfHook
+      zlib
+    ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
-  buildInputs = [ unzip ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
-
-  setSourceRoot = "sourceRoot=${product}-source-${version}";
-
-  buildPhase = "bash build";
   installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
 
-  postPatch = ''
-    substituteInPlace build \
-      --replace 'g++' 'c++'
-    substituteInPlace AP_NSImage.mm \
-      --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType'
-  '';
-
   meta = with stdenv.lib; {
     description = ''
       A lightweight command line program for reading, parsing and
       setting metadata into MPEG-4 files
     '';
 
-    homepage = http://atomicparsley.sourceforge.net/;
+    longDescription = ''
+      This is a maintained fork of the original AtomicParsley.
+    '';
+
+    homepage = https://bitbucket.org/wez/atomicparsley;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ pjones ];

From 6c94cbc75c736a3cd0e5a7afa9547893b8ca87d8 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 14 Apr 2017 15:20:43 -0400
Subject: [PATCH 1073/1744] jetbrains.idea-{community,ultimate}: 2017.1 ->
 2017.1.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7e9c5e48ad0..26b4d3833f3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -233,12 +233,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.1";
+    version = "2017.1.1";
     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 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm";
+      sha256 = "1222xkw7n424ihqxyjk352nnx9ka6as7ajwafgb2f27hfiz8d3li";
     };
     wmClass = "jetbrains-idea-ce";
   };
@@ -269,12 +269,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.1";
+    version = "2017.1.1";
     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}.tar.gz";
-      sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225";
+      sha256 = "18z9kv2nk8fgpns8r4ra39hs4d2v3knnwv9a996wrrbsfc9if8lp";
     };
     wmClass = "jetbrains-idea";
   };

From 21efba54ca69e0498938707aa5d9cf4046feff58 Mon Sep 17 00:00:00 2001
From: Adam Ruzicka <a.ruzicka@outlook.com>
Date: Fri, 14 Apr 2017 22:09:20 +0200
Subject: [PATCH 1074/1744] cjdns: 18 -> 19.1

---
 pkgs/tools/networking/cjdns/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 3000aacafa3..3f2d81249d1 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,20 +1,14 @@
 { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
 
-let version = "18"; in
+let version = "19.1"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
   src = fetchurl {
     url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
-    sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap";
+    sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188";
   };
 
-  patches = [(fetchpatch {
-    name = "glibc-2.25.diff";
-    url = https://github.com/cjdelisle/cjdns/pull/1017.diff;
-    sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f";
-  })];
-
   buildInputs = [ which python27 nodejs ] ++
     # for flock
     stdenv.lib.optional stdenv.isLinux utillinux;

From 91d2dc00bb12dc5b3aa51ea5391b7ba12b38269d Mon Sep 17 00:00:00 2001
From: Kai <kai.harries@gmail.com>
Date: Fri, 14 Apr 2017 22:34:36 +0200
Subject: [PATCH 1075/1744] nitrokey-app: 0.5.1 -> 0.6.3 (#24219)

* nitrokey-app: 0.5.1 -> 0.6.3

* Fix (native)buildInputs and refactor
---
 .../nitrokey-app/FixInstallDestination.patch  | 54 ++-----------------
 pkgs/tools/security/nitrokey-app/default.nix  | 16 +++---
 2 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
index 74e466069d9..7acd7239b39 100644
--- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
+++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
@@ -1,57 +1,11 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -251,23 +251,23 @@
-       #      ${CMAKE_SOURCE_DIR}/data/icons/48x48
-       #      ${CMAKE_SOURCE_DIR}/data/icons/128x128
-     ${CMAKE_SOURCE_DIR}/data/icons/
--    DESTINATION usr/share/icons/
-+    DESTINATION share/icons/
-   )
- 
-   install(FILES
-     ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
--    DESTINATION usr/share/applications
-+    DESTINATION share/applications
-   )
- 
-   install(FILES
-     ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
--    DESTINATION usr/share/pixmaps
-+    DESTINATION share/pixmaps
-   )
- 
-   # Install Nitrokey udev rules
-   install(FILES
-    ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
--   DESTINATION usr/lib/udev/rules.d
-+   DESTINATION lib/udev/rules.d
-   )
- 
+@@ -273,7 +273,7 @@
    # Install autocompletion scripts
-@@ -278,7 +278,7 @@
- 
    install(FILES
-    ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
--   DESTINATION usr/share/locale/de_DE/LC_MESSAGES
-+   DESTINATION share/locale/de_DE/LC_MESSAGES
+    ${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app
+-    DESTINATION /etc/bash_completion.d
++    DESTINATION etc/bash_completion.d
    )
  
    install(FILES
-@@ -286,7 +286,7 @@
-     ${CMAKE_SOURCE_DIR}/images/quit.png
-     ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
-     ${CMAKE_SOURCE_DIR}/images/settings.png
--    DESTINATION usr/share/nitrokey
-+    DESTINATION share/nitrokey
-   )
- 
- ENDIF () # NOT WIN32
-@@ -299,7 +299,7 @@
-   ${resources_ouput}
- )
- 
--INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
-+INSTALL(TARGETS nitrokey-app DESTINATION bin)
- 
- TARGET_LINK_LIBRARIES(nitrokey-app
-   ${QT_LIBRARIES}
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 91d5e75272b..5e1baa4f57b 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -2,27 +2,29 @@
 
 stdenv.mkDerivation rec {
   name = "nitrokey-app";
-  version = "0.5.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
+    sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
   };
 
   buildInputs = [
-    cmake
     libusb1
-    pkgconfig
     qt5.qtbase
   ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
   patches = [
      ./FixInstallDestination.patch
      ./HeaderPath.patch
   ];
   cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
-  meta = {
+  meta = with stdenv.lib; {
     description      = "Provides extra functionality for the Nitrokey Pro and Storage";
     longDescription  = ''
        The nitrokey-app provides a QT system tray widget with wich you can
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage         = https://github.com/Nitrokey/nitrokey-app;
     repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
-    license          = stdenv.lib.licenses.gpl3;
-    maintainer       = stdenv.lib.maintainers.kaiha;
+    license          = licenses.gpl3;
+    maintainer       = maintainers.kaiha;
   };
 }

From 896432e4ac48c4fa84b1a7ee27bb5a385f27e9ca Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 14 Apr 2017 15:50:53 -0500
Subject: [PATCH 1076/1744] speedtest-cli: 1.0.3 > 1.0.4

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

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 3be1d194d82..8ccc924d9f6 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
   
   src = fetchFromGitHub {
     owner = "sivel";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83";
+    sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2";
   };
 
   meta = with stdenv.lib; {

From 28f87e414186e2f16a094ac354dfe079965e8fe5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 14 Apr 2017 21:41:15 +0300
Subject: [PATCH 1077/1744] stdenv: ARM bootstrap: Update bootstrap tarballs to
 latest hydra-built ones

Fixes sandboxed build of glibc. Discussion about a similar failure on aarch64 at:
https://github.com/NixOS/nixpkgs/commit/8bfa9f528c88243578246798c7c2ddde045e0de0.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1349278 based on nixpkgs
commit 1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.

armv5tel job: http://hydra.nixos.org/build/51569718
armv6l job: http://hydra.nixos.org/build/51569717
armv7l job: http://hydra.nixos.org/build/51569713
---
 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix | 8 ++++----
 pkgs/stdenv/linux/bootstrap-files/armv6l.nix   | 8 ++++----
 pkgs/stdenv/linux/bootstrap-files/armv7l.nix   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index 9781414895b..37471e9ce42 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox;
-    sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox;
+    sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz;
-    sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz;
+    sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index 76fe900b9ae..44718975682 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox;
-    sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox;
+    sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz;
-    sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz;
+    sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index 91452d639c4..b97fd9967ea 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox;
-    sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox;
+    sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz;
-    sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd";
+    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz;
+    sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn";
   };
 }

From f89504d06746f50d1b7915ad6b31fc58a3449541 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 7 Feb 2017 09:17:28 -0800
Subject: [PATCH 1078/1744] kmod: crossDrv should use native xz

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

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 138130fa82e..5d0dca7b6be 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }:
+{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }:
 
 let
   systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
@@ -14,13 +14,14 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
-  buildInputs = [ xz /* zlib */ ];
+  buildInputs = [ xz ];
+  # HACK until BUG issue #21191 is addressed
+  crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"'';
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--with-xz"
     "--with-modulesdirs=${modulesDirs}"
-    # "--with-zlib"
   ];
 
   patches = [ ./module-dir.patch ];

From 04b30942bf859d29fd3c73368970b51cf9e3bcd0 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 14 Apr 2017 19:57:38 -0700
Subject: [PATCH 1079/1744] ghq: init at 0.7.4

---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/ghq/default.nix             | 33 ++++++++++++++++
 .../git-and-tools/ghq/deps.nix                | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/ghq/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/ghq/deps.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 281a3914986..5546d597e36 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -30,6 +30,8 @@ rec {
 
   diff-so-fancy = callPackage ./diff-so-fancy { };
 
+  ghq = callPackage ./ghq { };
+
   git = appendToName "minimal" gitBase;
 
   # The full-featured Git.
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
new file mode 100644
index 00000000000..4ba86a2a086
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "ghq-${version}";
+  version = "0.7.4";
+
+  goPackagePath = "github.com/motemen/ghq";
+
+  src = fetchFromGitHub {
+    owner = "motemen";
+    repo = "ghq";
+    rev = "v${version}";
+    sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildFlagsArray = ''
+    -ldflags=
+      -X=main.Version=${version}
+  '';
+
+  postInstall = ''
+    install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq
+  '';
+
+  meta = {
+    description = "Remote repository management made easy";
+    homepage = https://github.com/motemen/ghq;
+    maintainers = with stdenv.lib.maintainers; [ sigma ];
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
new file mode 100644
index 00000000000..ec54803a6e7
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
@@ -0,0 +1,38 @@
+[
+  {
+    goPackagePath = "github.com/codegangsta/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codegangsta/cli";
+      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/motemen/go-colorine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/motemen/go-colorine";
+      rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472";
+      sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l";
+    };
+  }
+  {
+    goPackagePath = "github.com/daviddengcn/go-colortext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/daviddengcn/go-colortext";
+      rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
+      sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffc1b066d84..04a181d1176 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13836,6 +13836,8 @@ with pkgs;
 
   getxbook = callPackage ../applications/misc/getxbook {};
 
+  ghq = gitAndTools.ghq;
+
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
     inherit (gnome2) libart_lgpl;
     webkit = null;

From e0ed784c0673d3f456366bcfde0b17a4b34f9443 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 14 Apr 2017 19:54:50 -0700
Subject: [PATCH 1080/1744] fzf: 0.16.4 -> 0.16.6

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 84b074de6cc..6001a785c7a 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.4";
+  version = "0.16.6";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn";
+    sha256 = "0nzjbm40c4w9d0d34s5qnr9jkrh1vkn508xl2lfwfvmnzsnb9xbn";
   };
 
   outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 170761078c9..2f033c5b1c2 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/junegunn/go-runewidth";
-      rev = "63c378b851290989b19ca955468386485f118c65";
-      sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d";
+      rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";
+      sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "854ae91cdcbf914b499b1d7641d07859f3653481";
-      sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7";
+      rev = "abc5fa7ad02123a41f02bf1391c9760f7586e608";
+      sha256 = "1kdfbz46jnpm2hip79db6jvw5m4z4vh7x7rr798mzqdn6fsad7jb";
     };
   }
 ]

From 7a8ef9c6bde12dd7891b7332369630c1a534cb9b Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 14 Apr 2017 19:54:09 -0700
Subject: [PATCH 1081/1744] lftp: 4.7.6 -> 4.7.7

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

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index d6ae4a0e5a9..ae62195342f 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "lftp-${version}";
-  version = "4.7.6";
+  version = "4.7.7";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7";
+    sha256 = "104jvzmvbmblfg8n8ffrnrrg8za5l25n53lbkawwy5x3m4h1yi7y";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 76b8ce3023f49d3daf039a49f7779a3f58df1a5b Mon Sep 17 00:00:00 2001
From: Sophia Gold <sophiagoldnyc@gmail.com>
Date: Fri, 14 Apr 2017 23:07:37 -0400
Subject: [PATCH 1082/1744] simgrid: 3.11.1 -> 3.15

---
 .../science/misc/simgrid/default.nix             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 7656668f056..c042e062e50 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx
-, libunwind, elfutils
+{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx
+, libunwind, elfutils, python3, doxygen
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.11.1";
+  version = "3.15";
   name = "simgrid-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz";
-    sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp";
+    url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz";
+    sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i";
   };
 
-  buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind
-    elfutils
+  buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind
+    elfutils python3 doxygen
     ];
 
   preConfigure =
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
        # Enable more functionality.
        export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on
          -Denable_latency_bound_tracking=on -Denable_lua=on
-	 -Denable_ns3=on -Denable_gtnets=on
+	 -Denable_ns3=off -Denable_gtnets=on
 	 "
     '';
 

From b7d2ffeb46801729b2e5080fe8e7529cad81e78d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 15 Apr 2017 16:02:30 +0800
Subject: [PATCH 1083/1744] tensor: use date as version i/o git rev

---
 .../instant-messengers/tensor/default.nix     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index ed78274c799..0dfda79e767 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,32 +1,30 @@
 { stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
 
-let
-  rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
-
-in stdenv.mkDerivation rec {
-  name = "tensor-git-${stdenv.lib.strings.substring 0 8 rev}";
+stdenv.mkDerivation rec {
+  name = "tensor-git-${version}";
+  version = "2017-02-21";
 
   src = fetchgit {
-    url = "https://github.com/davidar/tensor.git";
+    url             = "https://github.com/davidar/tensor.git";
+    rev             = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
+    sha256          = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
     fetchSubmodules = true;
-    inherit rev;
-    sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
   };
 
-  parallelBuilding = true;
+  enableParallelBuilding = true;
 
   buildInputs = [ qtbase qtquickcontrols ];
   nativeBuildInputs = [ qmakeHook makeQtWrapper ];
 
   desktopItem = makeDesktopItem {
-    name = "tensor";
-    exec = "@bin@";
-    icon = "tensor.png";
-    comment = meta.description;
+    name        = "tensor";
+    exec        = "@bin@";
+    icon        = "tensor.png";
+    comment     = meta.description;
     desktopName = "Tensor Matrix Client";
     genericName = meta.description;
-    categories = "Chat;Utility";
-    mimeType = "text/xml";
+    categories  = "Chat;Utility";
+    mimeType    = "application/x-chat";
   };
 
   installPhase = ''
@@ -51,5 +49,7 @@ in stdenv.mkDerivation rec {
     description = "Cross-platform Qt5/QML-based Matrix client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
+    inherit (qtbase.meta) platforms;
+    inherit version;
   };
 }

From fed7d4a6e95fa715ec3e28221790c8ec11d9a9c4 Mon Sep 17 00:00:00 2001
From: armijnhemel <armijnhemel@users.noreply.github.com>
Date: Sat, 15 Apr 2017 10:18:04 +0200
Subject: [PATCH 1084/1744] RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910)

---
 pkgs/tools/package-management/rpm/default.nix       | 13 ++++++++-----
 .../rpm/rpm-4.13.0.1-bfd-config.patch               | 11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 6c3a63119b0..c5a929ccd6f 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.13.0-rc1";
+  name = "rpm-${version}";
+  version = "4.13.0.1";
 
   src = fetchurl {
-    url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2";
-    sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp";
+    url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2";
+    sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
-  propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ];
+  propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ];
 
   NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
 
@@ -25,6 +26,8 @@ stdenv.mkDerivation rec {
     "--sharedstatedir=/com"
   ];
 
+  patches = [ ./rpm-4.13.0.1-bfd-config.patch ];
+
   postPatch = ''
     # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
     substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable}
diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch
new file mode 100644
index 00000000000..b8192b24f13
--- /dev/null
+++ b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch
@@ -0,0 +1,11 @@
+diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c
+--- rpm-4.13.0.1/tools/sepdebugcrcfix.c	2017-02-16 10:40:09.988649399 +0100
++++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c	2017-04-15 00:02:21.151359876 +0200
+@@ -28,6 +28,7 @@
+ #include <error.h>
+ #include <libelf.h>
+ #include <gelf.h>
++#include <config.h>
+ #include <bfd.h>
+ 
+ #define _(x) x

From d5afba485b4a9b5d5d273f241d12bd8f7d890e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 10:23:24 +0200
Subject: [PATCH 1085/1744] rpm: fix rpmquery/rpmverify symlinks

---
 pkgs/tools/package-management/rpm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index c5a929ccd6f..78d815eb7c1 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
     for tool in ld nm objcopy objdump strip; do
       sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/"
     done
+
+    # symlinks produced by build are incorrect
+    ln -sf $out/bin/{rpm,rpmquery}
+    ln -sf $out/bin/{rpm,rpmverify}
   '';
 
   meta = with stdenv.lib; {

From 2fde20e271a9b0ffa29b1abaea155e6b76b50194 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 15 Apr 2017 16:33:07 +0800
Subject: [PATCH 1086/1744] haskell-modules: fix shell hook

26623240e93f8454ac69f66a3a025d98a7e94b71 lacks a newline
---
 pkgs/development/haskell-modules/generic-builder.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d39e1bacd71..57d14880640 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -330,9 +330,11 @@ stdenv.mkDerivation ({
         export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
         export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
         export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
-        '' + (if isHaLVM
-	       then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''
-	       else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"'') + "${shellHook}";
+        ${if isHaLVM
+            then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''
+            else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''}
+        ${shellHook}
+      '';
     };
   };
 

From b454dcd0e0f6ce98a97114e1b7d2da13abad644d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 15 Apr 2017 10:53:38 +0200
Subject: [PATCH 1087/1744] safefile: init at 1.0.5

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

diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
new file mode 100644
index 00000000000..50f4d74d15c
--- /dev/null
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "safefile";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz";
+    sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78";
+  };
+
+  buildInputs = [];
+
+  passthru = {
+    updateScript = ''
+      cd ${toString ./.}
+      ${toString <nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh>} default.nix
+    '';
+  };
+
+  meta = {
+    inherit version;
+    description = "File open routines to safely open a file when in the presence of an attack";
+    license = stdenv.lib.licenses.asl20 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://research.cs.wisc.edu/mist/safefile/";
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04a181d1176..a735c6a2e67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9715,6 +9715,8 @@ with pkgs;
 
   sad = callPackage ../applications/science/logic/sad { };
 
+  safefile = callPackage ../development/libraries/safefile {};
+
   sbc = callPackage ../development/libraries/sbc { };
 
   schroedinger = callPackage ../development/libraries/schroedinger { };

From 4f3caee682c878d7b53d1b19b914efa0aab0a60d Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Sat, 15 Apr 2017 12:32:46 +0300
Subject: [PATCH 1088/1744] intel-gpu-tools: 1.17 -> 1.18 (#24920)

Version 1.17 fails to build with the current libdrm
because of a changed struct (`drm_event_vblank`).

I had to patch `tools/Makefile.am` to use `GLIB_CFLAGS`;
otherwise, the build failed to find `glib.h`.
---
 pkgs/development/tools/misc/intel-gpu-tools/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index e7520091d1d..f644160b9a3 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps }:
+, procps, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.17";
+  name = "intel-gpu-tools-1.18";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6";
+    sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake ];
   buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
     libXext libXv libXrandr glib bison libunwind python3 procps ];
 
   preBuild = ''
     patchShebangs debugger/system_routine/pre_cpp.py
+    substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
   '';
 
   meta = with stdenv.lib; {

From 45cb7c2c0efc61e9871562fe343efcea3c9171db Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 15 Apr 2017 12:03:47 +0200
Subject: [PATCH 1089/1744] comic-relief: change download URL

The previous URL is broken.
---
 pkgs/data/fonts/comic-relief/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix
index a8b2b786efa..31c89215ea7 100644
--- a/pkgs/data/fonts/comic-relief/default.nix
+++ b/pkgs/data/fonts/comic-relief/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip";
+    url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip";
     sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch";
   };
 

From 33cfee81777341cd335ccbe237db329b3fc7c444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 11:14:55 +0200
Subject: [PATCH 1090/1744] buildRustPackage: add cargoBuildFlags

---
 pkgs/build-support/rust/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 91569d0c070..1287d401e4a 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -7,6 +7,7 @@
 , buildInputs ? []
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
+, cargoBuildFlags ? []
 , ... } @ args:
 
 let
@@ -92,9 +93,9 @@ in stdenv.mkDerivation (args // {
     )
   '' + (args.prePatch or "");
 
-  buildPhase = args.buildPhase or ''
-    echo "Running cargo build --release"
-    cargo build --release
+  buildPhase = with builtins; args.buildPhase or ''
+    echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
+    cargo build --release ${concatStringsSep " " cargoBuildFlags}
   '';
 
   checkPhase = args.checkPhase or ''

From be70c02461e4e9e0ff163159a85edaef6188a313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 12:42:09 +0200
Subject: [PATCH 1091/1744] buildRustPackage: add standard package hooks

when overriding build phases also the standard hooks should be called
---
 pkgs/build-support/rust/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 1287d401e4a..087bc653aa3 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -27,7 +27,11 @@ in stdenv.mkDerivation (args // {
 
   buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs;
 
-  configurePhase = args.configurePhase or "true";
+  configurePhase = args.configurePhase or ''
+    runHook preConfigure
+    # noop
+    runHook postConfigure
+  '';
 
   postUnpack = ''
     eval "$cargoDepsHook"
@@ -94,21 +98,27 @@ in stdenv.mkDerivation (args // {
   '' + (args.prePatch or "");
 
   buildPhase = with builtins; args.buildPhase or ''
+    runHook preBuild
     echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
     cargo build --release ${concatStringsSep " " cargoBuildFlags}
+    runHook postBuild
   '';
 
   checkPhase = args.checkPhase or ''
+    runHook preCheck
     echo "Running cargo test"
     cargo test
+    runHook postCheck
   '';
 
   doCheck = args.doCheck or true;
 
   installPhase = args.installPhase or ''
+    runHook preInstall
     mkdir -p $out/bin
     for f in $(find target/release -maxdepth 1 -type f); do
       cp $f $out/bin
     done;
+    runHook postInstall
   '';
 })

From e8d5af0bd8824cafe76e134b3777ac5584509e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 13:10:29 +0200
Subject: [PATCH 1092/1744] buildRustPackage: only copy executables to bin

in newer rust versions also *.rlib files are put into this directory
---
 pkgs/build-support/rust/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 087bc653aa3..2275a065594 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -116,9 +116,7 @@ in stdenv.mkDerivation (args // {
   installPhase = args.installPhase or ''
     runHook preInstall
     mkdir -p $out/bin
-    for f in $(find target/release -maxdepth 1 -type f); do
-      cp $f $out/bin
-    done;
+    find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \;
     runHook postInstall
   '';
 })

From dac0ad26c951d29a21484a31b88a99bb7a58442f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 15 Apr 2017 03:12:43 +0900
Subject: [PATCH 1093/1744] thunderbird-bin: 52.0 -> 52.0.1

---
 .../mailreaders/thunderbird-bin/sources.nix   | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 46d7aa32e8a..1b42957f908 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.0";
+  version = "52.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ar/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ar/thunderbird-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "83418f9890becd869c878f4ccb5f2ac9dc57103ac12818e4ff010b0ca1efc85b712692e81e458a59fdea8f878d8c8c77d7e11dd116d045db67a0aef278aab6f9";
+      sha512 = "1543d3b17ac8a6a437b34df0b3d33081b86554107321716b534471c86415a80fd4cb7f35fb60be7482a7476bdc4d2c5f9fe29dbd8381ff841e1f0daf2007e8a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ast/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ast/thunderbird-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7c97616d16f9ce706e878307fe11ace62f87e227c9f588bbeb6eda8c6ba51bdee280014c7c831629ca39c6fdae537506100a82ccc801887df8dfeb35ba336141";
+      sha512 = "b7b9543253530cb3f166d155465d320d30138542974e71cc92e5c3be6efe12014ff2db5b63372297f7cd3bf72cd1a866606f1bbb288504b6a272e7820ada1bdf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/be/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/be/thunderbird-52.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "cb7a99fd462c6b685cba2f95029f7d4225c0dcc95101523a9d3d807f8abc458cc4c0a035a8111d5655e7b47baef1d3b974b4a785fe1803eb09431b7f36129429";
+      sha512 = "f9283894e7c9bbeafb8fa6dbd2aeb1756b8d2456fe06c4278741c79171197b505d9a3d4b8e1cc3b18cf22be71555e1eded616ef0ed2648958b0d4d07f9d96654";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bg/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bg/thunderbird-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f1b2f0001359bcecd3cc1c884ec089c4386fa6679521863b449e2e1cc90a70b06e2c555e18640695c9b5d1d5bd45952bbf489ac3d65bc0adcdfb02b1bfceac4e";
+      sha512 = "486e2b3e149b73d3bc272546f7cc55b9d8da97d48808ca5aa0c3fc12d5bc0ea49c353f8b2c95ca398cc6938e67087f8ace8bd9bbbffe75712fe64b05994937e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bn-BD/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bn-BD/thunderbird-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "b08b572359340e813b71643d3f13b755143a8481343134cbdf49ba7fda1290c48f628c445d57cb254e87650844fe04e9eabf4e4340ec30465d82872aa3eb3cbc";
+      sha512 = "da54a9b78deb56de84623e71e60083aaa53dd8180f6d63f6ecc5133af846e5f773e63ce9131dc751178210994765a4e3daf68c582e180dd25f26d4f8e95e9646";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/br/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/br/thunderbird-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7bc083526e8aa4a9c6b59adfe237b25d468c4bf07abfb1a7f76d419e62b887978616337efa814f125d06e6f61361ff0a79ce1c2792ddd5723d7dacbb1f54efd8";
+      sha512 = "b647bc0aa73ca1d4deca50f70d5cb78bc95663c7c1668464c1b2d6d0e944f69ad73de28dd3868a6ac3461c5e64e74e206d508569d52ae8aa2a1da8f1164c4d94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ca/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ca/thunderbird-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "06e73de3a64b80ba3fab93e08c8b8968d0e84c3f49896bec1c38b2fc35d3c52f5547f5d4ea21f9d2c335e202a078c1c18830e1ccc986823c58e351a85f4337ac";
+      sha512 = "3c9562e14e20d90d76e6c8b39ef3047899fa094a5639ddffd716b687adb484a97cb6036e3228cdfb207086b28917b74fc44eca07408e7882f45941e50dfbfed6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cs/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cs/thunderbird-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "ec8bd4f3f2a6c0e695ab75ddb1d73723472df2a5a2e141a812860c1a20956ffac4a119de737d0adb766ba1f2c664d12cde40158fbffe555c94a77c8054e4e7cd";
+      sha512 = "ed20a0b054d4e86ed1577c8a2672aa692ef47345243716f6dc840910b29cd915df75f8be9ac05bef385afb5721739fb08276c4bf48a51178fa46033c1131c1be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cy/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cy/thunderbird-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "e21599c17c21c6d425c9da5ce5998c7b6be36040e0437bd742506c8cad93fbbe15ec5dd7b840b085f3f484d4b6bb99bdcb1a6a28a2610c13411b13a18b1bcb53";
+      sha512 = "2dcc1d221db9bb647f5bf454a767f692e5eb592d1c6af52e144c55cfc81f0e3e05ddc2e3c4cb66b0031e09531641716009d062f340a5948233165564a3d5a5d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/da/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/da/thunderbird-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1fff0b5ed313a1c404f86a41dcdc94a0787f01f5fda836713de5713697788274619520e40f48ad559e485e1144b898df338373f3ddc85662a95deb8c39fa66ee";
+      sha512 = "1046c0ecf657a9c5b30e99175f6200e541bb5f33031f1a440b26d12d6de0c558e15f8c2f965a05e59f83c46849944e010bcbdeb6fe100672d97acf0d4038febc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/de/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/de/thunderbird-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "ee7f739d8237d7d5f5936e3f520de7d572bbfd0ff19aca140381daf4b2353a42a7b6b79680440bc2a62321c8089619114bce99bc48a88aa6346228ef8d08012a";
+      sha512 = "10842eafd14068ae5d2447fc2d3aa35066af97a6e49b88d38bcf37be1e754d2403b1c039dc09f418128cd9369da6e0afee278914dd41a2ce48cb4872a7d4d18c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/dsb/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/dsb/thunderbird-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9439bdeb224ee48adc0af5bc882d3dcb2fdcb988502f9ede03d2ede67261c8007336414a6935f86690e622d70ddf933efe14ca9ef3640be3de46b6c2eba090bc";
+      sha512 = "f7e6b05dfc94f64c988c761877d02ad3c66a7cc47e2818d267d7839d0b1fa7688ecfac8fd3af98e9e9318806a78e4559d6cfe45de0d96b7f5f8d411c6f6cf051";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/el/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/el/thunderbird-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "aa8a94bb35c36c0913f8b76944370ac839cbe1c16021f83b3b8c317e03cc1013e35fa502af3293611f7fc89f30513bb24dfc4d89e745364e85d674afe66a0d33";
+      sha512 = "0ac5a23a38987a5af15bbb8e458a89df378b89fdd8721063d6df16a3658201ef1fb4f2d04b6272e1d9d43c1d2273df4cc0fc79b7d374f1fdaf7335c77fdd9381";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-GB/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-GB/thunderbird-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "01b79fa4b147fc7ebc07e29582e9fb567c4b0de565d4fd13a71279ee3946b9e182e086c6c3b1b4c413688cc3dc19979e89e5dda87ce10a181be0cb252ca69f4a";
+      sha512 = "73f42d30f8fea9063e984d9b44c82aac545a20833133cead89ea147e92595e66da2a1f3d3bd0c09bd1584482474607e6856ba17ff80edff51b169aaba03bdfac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-US/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-US/thunderbird-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464";
+      sha512 = "51eafcc7466a2136ddad110fc43640c578d69758e53eace8da52a11ea86869b5d05e537b6132c3c49eb6bc6fc5bad77f2967a472c160963a41775b34600b7582";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-AR/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-AR/thunderbird-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "c2df311f50945e103bfa390413d8b0a4ac307f658aacb10b37e69eb6742756b8cac5221e27de5b96ec07e4f657851c17928f8e3dc0100b300ca97f9f643d05ee";
+      sha512 = "b57cbef7843364917632605dafc056323adeb9d06da7e53a65a4450e009fa1f2c54cb5380ed886db4530e845bd6f39cd160ac90f19f99d63ca1f85af09ed77fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-ES/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-ES/thunderbird-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "3d54d936ce165eaf9edfe676a42eb4cb257fa8d18cdd98e4027ac8ac76d9264a2676f39ae37459915b17d7b2473057f076bea0a28a0e68570ad8d1bf8b25c520";
+      sha512 = "408adb2ef60bbad16152ceaebc8f26c62fb829960e941dc5fc2814b183b780bd0fe79847351395321026a0ef53f703b72b6f4bdc233b3284d050e8bde35c0beb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/et/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/et/thunderbird-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "966d12756cea32951a38cacdcc2f9854f88f8d5bc6f07677274e5ab1e9b74c875995dfc226a6df61c8ea1901d14cc7971012a9152f6bc37e4def57166be84312";
+      sha512 = "3186c5a026029e7b7b4dec47079b69b7f33398b2cf276b9bbf0b726d64709f176e45e31e0abb74c4302d693aae0ecafcde945c78da097cc2b0c1499481c78ea0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/eu/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/eu/thunderbird-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ac1beb19aadbb0b0b15f53f8778e2b8109eb42913e8ec4b5817dcc31e8dfa8a6d40beb9e0c61a05507cde5d553c7af03587194129d20e388344c4d469a3b1b08";
+      sha512 = "c60d3e2ab30e84628158ac65dc5c58ffe5a7b9dc7c3d5e5135456ac4be4d4734a4f4dc7d65c15f400dacc55fddc739934f3978f6184a93a662466b759938d1c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fi/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fi/thunderbird-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5efda4136cc8152367e36a5c460a4f31c8287441599264aa4b5243173fc925475633529564c357385e511d2ac9faddd04c8bba5fa9c1ecfd2ff8e22fb002a025";
+      sha512 = "14aadef508eabbaaf81a2304934f3848e3831f9d8df2413a49002be36f951c87355e1954d84d58509086c1b0e0aa1de5865edb733d0a07b655942830c83ffa18";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fr/thunderbird-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "75368ffdf22424aa919fd35f47813e13a80197345504c17b4e03673d1666431d4e455d1bc76a8f69fbc25853828d2f6a0b57b705bfd37cf12ca5a3095c075916";
+      sha512 = "0711ff8a5955ef185678b27e8e43704c652d9024ab4b8558eddfc2c94f87dd24603f144f391f35580c3fd512cd44ca729253501495860e6799440e56c4895c67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fy-NL/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fy-NL/thunderbird-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "58edaef7cb314a54feb5367a931314e5a0dc1b308f92372a815c7b1407ea783cddf84f0ebb0c8c59c217b3f6a9ad97873ba85641735db9a2503ddd76c26f7b7a";
+      sha512 = "99e49dcc4085db1895b0e2ec2e7a769fb608415135d550485fea03ccc99f325771682f725c78578944c82b2f18aeb207c8abceb86db5390056d27c291f19556d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ga-IE/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ga-IE/thunderbird-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "dd3aae859b04cb9b945083bbe6fb17ba11fb8b218fe8547c6cd4a0d3adb85051f72bfe2adbdf80ec07066ce1aa03e825b2eb153509a0614d98eca8b5565b2755";
+      sha512 = "f0bc291e1b3dc2e226aaa48e5b87c1e6690ccd04b4b62b36fc654e86173c9dc6ef47170524ceffbb59093bd4188a3cb01a894469daa4bf49a0a8895034d17645";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gd/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gd/thunderbird-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4230cd99c7aa2a9024e76fe52f438574384e682807c09981db24f30cf60dd76ed907f38b212e78b6250f8ee68727e91dcd20fc3b4ce74cd3ad303b9700818091";
+      sha512 = "65388bee6e5f8255779f319eb0d47310762ac6d3ff6b61f3accb151e52dfff8e079aa16be714fe4a89bd722bf72b65f930384d555d68016a27b71bd236388f7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gl/thunderbird-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "d393b4b18458ba2fac188c63bfdccc8e9247b860069606ce21e0533a8316bca15117086216408ae86df18fa3ccfc5605e8de51b80989beed38b55ed7b98bf6ad";
+      sha512 = "64c439a0d2a75a3b9a460966c585913656884da7cf7f81f58e612c9f2523ac690a8585bca61e60fe31e13ed6f07d484e3dab6bff876fa247dc1488f084d8a6b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/he/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/he/thunderbird-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3d41e16926d986129b1d7a717464956a8ae27c75a709789eeca4d8be4875627a740f995ca9e00072e12887e5caca4d3df8ba435a60494f84aa321a99bd15c4d2";
+      sha512 = "7b20a5d996164daca9ce2d6af03a987eb67394eba01c942b29aca3009ee062f0c57cc011baede67c09a7b0dba63e029a5fb5753d18edc34c87926fd16651e208";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hr/thunderbird-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "6d8698dcb0d2ced2e893aec1221086dabd7f4f351639281c521110e24c4177f5b79360a1324843c431b7535aa59d222ae52797710c7ad41143f4fb73fcc0eb5e";
+      sha512 = "4419fac97644cf895021bd974e15466936b45babab7634e35855ddecb2575a43cf9be65cbf83c1c27648b58b656c9f6b4e8d454be901b479cdf86180f244a646";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hsb/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hsb/thunderbird-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "0298d90aa6cedf21002df84bf753b59addb072d187b0ea3170f85c041298591994f7f842a8d86db12374e5f00abd4178820168afee738a07ed886f27ac46e9f1";
+      sha512 = "0f31903823ee2cada852aefa8d19b64ef9ee9e9f80fb709481c155a7a4c97169703a35e7de1f2b805fd91d98321dad81fe0321775c4bf9af5f01d38ab75c70a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hu/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hu/thunderbird-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "be3dc6926a5ce25a6942a5b33c6d3604c74a0d54b5ae1b4974732cc1fbc4718100fad6f5a6ad77706055c5d9d2c8c2fa52d766bd758e59f44da9db727aadd326";
+      sha512 = "a2972f056d54b7d22ff090e43144ee16f38b01a1d6ba76dcebeebfdae086bde752008fdc89650947944bc80c82078f94995db8bf8daf339ec0a8fa5475435477";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hy-AM/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hy-AM/thunderbird-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "001726c9b817c9b5c34778e0e6f31deca7d11d4887dfe5707e7e386bc0ef8dd9acb20f5008711d7d51902fc114590712d0264ba229934859b0089a8993deadbf";
+      sha512 = "47e80c575adae2327cecb5c41ed747c9d4da5ecc9e9ff8afc5dd35764b039050aa07dcbdb79d50fd7a4d8eff6f233f1a3cac3365e6a4db26e0058030d82a0f6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/id/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/id/thunderbird-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "df01723f6fda8f38241683972283c6d1ebf548251d5deb4f061e47d294d67271c72c05cac8aeb2e84afeb4a1af5ea29bbe6293a6a1c4654d597fff2e77b167e8";
+      sha512 = "3d8f7a87727e772aa9435bf0e381703003f9a1fee98d71dd7f3fdb7add574a0c5245dcf8903895fa858ec2afbb9823d658db4fd800427d29c71ca93546adcd8d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/is/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/is/thunderbird-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "12112dc6a40579f16bb9d7d0628a31cdb815d7da0484983be95a1ea6aa456f8690d8c0392b164cd365c94900f0b32acdf4a9a247e795a572da9c024d5fd56470";
+      sha512 = "5ba20b28c08cf19f12acf887b92959a09cfb471776ab1805feda15ec4d406a23ab9c6c719a64ad2a65684f9e1bad00dd2f321285bfa85bf8e2f5aea5ffcc26e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/it/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/it/thunderbird-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "7dc5c3a52204e4c77f7cb16c40c583eb1617d952c8f887f918479ba3268a006e13cb8d3cf21379b53b217ce7cdc4295876eb9f7e6108760d6d283538fb455bf4";
+      sha512 = "127471777e937b3b02f07bd66366680eea194171554bf7f11659331fcba414b49d0ce07457d754f5131084ea89d90d6e9d4e62929fe3d7c8c4a3d58b1b34b72c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ja/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ja/thunderbird-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "43d500330ca83420787adad7de1510a6acaa958f82a265e631191d1305ccb70c0ab118c78c1948cb466603b88d023268aa32900fec2e1d81ffc29050227d2c72";
+      sha512 = "aa013a6c50d660a150b2b4247eaee467ca1a1a232d268121a8e8113386c9575e2667f4cf75c1e7ae77458869a9bd4d2f7972c5cb2aa919296bbf3aca44d48093";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/kab/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/kab/thunderbird-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "609464c5c9a86b7c645049c2c3ac63a936a0670250599290d3f6676414a112f43036bd2867bff462f8c1ba89de053041cba887f5568e519d553e0adbbfc42283";
+      sha512 = "6f4f4b27c658103dd6c4a9d2c9cfdca09097539eef1e123bda9f11d185a25f0cb944e96d37e9a2c36664700948c4b052a5eaf463e4fb045fe6def4773b19a8c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ko/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ko/thunderbird-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c3f3d2d5a981a8756a3b76048be1627076e6a822f1cd81c24bfc496ee6de2865744ef50715411d3ffd4db4389e72a1760130d63b421e65c8761a7bb673ce5f3d";
+      sha512 = "4efbc262f563e03ec78a10658772c9c3b446e5c378159d35a68b432d1b582dac589723525a26e337a2739c0ea116cbaadfe8fae110ad172fd7268a7c5e76c50f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/lt/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/lt/thunderbird-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "cb746e1fbf5929225c91c2989d33b260fd768348ebf6c232586bd27b46e964f94443659270a6bf6017bba48abb93f533f8428ffda52996597ec8959f8efa3026";
+      sha512 = "b1f1cbdd9642e283144200d716783a212948bec80e1b5d27046e80c22349e8b103e98f31bbbe392f4a1467805bbb28801b0f8c597808f03bc6fdc9110cef2900";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nb-NO/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nb-NO/thunderbird-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "67d93508be6d5651707ff7109b5e80fad9db5fe442d05f34834c0c05610cee9aa8b3f2b61dae8705a1ab5b5b5addc089a52928ff5655b93d4c0870dcb9dcaeb6";
+      sha512 = "51e675ca839bb7d205121b7023244a9716eb4b7f400c534f6b3a3275aceaf827262a816b790492d3cf01b6f01d64b7cb0c1f2385d1ecc74dad0f450f8d1b26dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nl/thunderbird-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6b40414449c75856280987b49cf3abe6f3725b89c2a53df3c11c942523d32e8cb3195ee49bae9dbe19d507473ac6b91588ed1e75df7aa1e1418a8ac0f69e326d";
+      sha512 = "866a4d117196834fc415e6dc394c82a9cef6747c838068abf0efef5cb5e03f26d65f5c3e9ccd90fe7229a8785817736ee574d73424ac50633650bfe6c9848633";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nn-NO/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nn-NO/thunderbird-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "65eff88f0b0f8672bd587693c1e7d55aded95d308f624e9dfd8731b2dec948cb7ee9ffaf484b35130a63fb6d9314ef8f044363c6b41f70f3e540876b109caa41";
+      sha512 = "664d8941c433fc04fa836f1dbec12ad73ce3cf9d19d898c8cd6b6c9fc283380e7af27a0ab949881f5b6151595a6c584f938aee6f88e5239fa2de0403813c3388";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pa-IN/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pa-IN/thunderbird-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0d4ac412f5d64aac841a1fb0dbdecfa80ff282aa8472df3e9e65419dac486e3086d954c17d1a535904b61b7907fc55d02376fb7a4c46dbc53f48f427673bce8c";
+      sha512 = "4dfb57686154b3542fef873d08037fb86f7574260884494872433496b82f0b58a14710931fdd0bd5dbe7372658691b2e953a4fd794378a993f97fd6c8c9ac496";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pl/thunderbird-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6ded5f995084a9fcee1a49f3204e2342216c9e04b5b7560e52283bb33bfe15fadadecbe9cbb6bc8643a3fc114b44dbe6c53af1b8f31ad3e3a53653f1fef944a0";
+      sha512 = "47041481a2cc660bd6de4a018aa77ee4f8217fc7091b37ab8c26d1ec1dcb0678ea80130ee84289dcacd6266431da4532a66b041faba56f1bd8746e991c748a82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-BR/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-BR/thunderbird-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "7199ebcaf1c206fb93fa0c42118876e2e416fdeee9907c6f43ef0244a950a13ddb74282898b52b85cc2fee3f8fa7077512f3414a916fe1a839243b5823aba7f7";
+      sha512 = "3001331547a05bf5b76620886096fb80cc594c625a335fc613408da5c43075c15abb0a6803cc34c740cef5d7ed9339e21c2db3a8a736901350674ab3b1024514";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-PT/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-PT/thunderbird-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "e6290824e68970d66bbe1787c18062e7638989550f5303c5e42464416a74cdcd95c6005746fcb1ed1a4703fe53032eec1fda92cd0107ca244ee9b8dbc7ee6d50";
+      sha512 = "402dc645810068339fb9fc18d6e3f025c48013281e3604e9a3da8228ee6cdd304ad3d2c10781dedbae9dbba3737fb122a3fd5abc3c856d1afaaaed2d7e23042e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/rm/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/rm/thunderbird-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "7a7abb88f8cf6d40adfd96c2173a8ecb1f2b4eec4e12111bd6af71837b6ed154086376164c0d3fff56eccf4039c3459e275d1fbcddb42fe6efc5c837816f1f3f";
+      sha512 = "4789cbabb8ba897a508e9dff91fcf838eae8fb4d330f500bb7f545cf46efbffd978801016898bc89bd6f9fc558df2737c427c16e2ec40c0a7866301abd7450c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ro/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ro/thunderbird-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "27fd6ec6be3a876f2ef65f6cc65284609e03f07d71081c967bdd4aa789602cf3ac29885ca2fd710fd8f93491006f4d1e51e8106bae112cfe1b662e13c24b80b7";
+      sha512 = "fbeb8ae935f69efe85b1fb45969b8142b197d340293034c088ed50cdb563466128e305f8ad2c1586c9c18c2fd5fd4042b95ac15aa9e2783fcda2c67a6aa941b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ru/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ru/thunderbird-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "19ca3df78354d2c6dbbfdbde975608b73bb4277351fd5d19f15183fc55b8daec2e8eb86edc7f59fe27ef8871497d54b30bf468d2f4f781dc1ec51ef77047feb9";
+      sha512 = "a0a21b2ea3720b776b3a7944c1a9030ab80451a4405afd87f49b424326cfa69769e7e9bb54071c7747f4fe4af8f18fc3a9f8db73a848c554d9d4f3eded8cb9f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/si/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/si/thunderbird-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "28acca4bb30e303b063c88ebaf320799172421db9c859c3fec5b0bd1f02efd76e52cb82586d577fc73de5f2ee6464ff99dcb32351345d7d1aa28bb14fd856638";
+      sha512 = "bb919c3b00f4122cfaefad1a88a68d3dcc88f09bc6db717cee14ba3ab76adc4b4c1ff32dcbbe0babe7336856c31153eb69e2297d88ca60f9e561aab083344710";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sk/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sk/thunderbird-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "f62ea125270243a9f09a2b3b57fdeca752da12788301efd89cb3a3ddb72b8bf4e8befe123ed843a6e70aa42c32b14e5fab8e323bc70383be0517082101dc5f05";
+      sha512 = "c6e1e049a264bac92fc103b3242fa36dc38caecfe22b909c41ac86e570d7f3c9a7b39ad9d8f9f918fafb60f91e0e3fcd925a598c9f7deb6f7874a92436de6ec6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sl/thunderbird-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bda98cb38a8334b1612ed72a286cc5df7d4310cc0a4f2a0bad9742a66a898c11f393b3fee48bef3996680ec32d7217e5b2b216ea8201d72fac234c3fad0a0bcd";
+      sha512 = "7af3e5a875077f94ef0e7aefd1b170d8f8285fe99b9c59ef568c055253f812949127a37557b88f2097282de8f1615d272abdee51713b30f376b08300c29bc814";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sq/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sq/thunderbird-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "704a118df4a6279383e62c1a7a09e24ab5073540736979ceb69f57d2d5a4de39e7ec58ddb2384cf48a2924c4424fef2a405a4b5745b54ff63ed56d93a3fc31a1";
+      sha512 = "ff37ad0845c95ff043c906bf80b7221a541a1eb038ee2be63d7b2d8d1cc8ecf26698b2fed0433334454203e09c98d4166e972e07968fa32e17d826811687613d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sr/thunderbird-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "9457f07c9a91a163927d1cd536e6b918fa7acaec4333a9b22ac1fb8d26bc528cd34346494184bc4d4172110620bd59faab3a2e036afd3a0f6bd871e4a8efdee2";
+      sha512 = "487c92ecc4123607466a0e758a16dd87537be32750b12a206129281ec42afc8fc672cebdf948b3233850b8b31338abc829ef60f8a10187eab6bedcc11cd6e11e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sv-SE/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sv-SE/thunderbird-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d9a2e8c1f76600cd9c8e2c1992269ce6a43891e58a9d870b2e2085beadcb46d7af322fa304a99c48dea2c91a68b5adc84094e179efd39034901d1f2c68686e53";
+      sha512 = "e0eb86726198982cc14db6bf1c2b7fda2b60492ed318978c6c9349ad7514eb0a35798a3179ba1cc71c84f3219439068c957c38bc87207e5ad81c200378f5ea1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ta-LK/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ta-LK/thunderbird-52.0.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "68f61602b4a6a277639df162cc404c4ee2f433daf7bc5b1ad51372e5ba1a469b111d66837be27db3f42e56239f2c34d632a8ccd92fdaea58a6306da822070ab0";
+      sha512 = "7a3ab20a071e8cd1728104c31260e3b443cf5c88e116240ce4575c544708fcd5ba386385c72d38b98c1ad76c1d58ff3553828d547e1e64e179521edbe5d31388";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/tr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/tr/thunderbird-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "511eb1a4dc9629b5dc7aee5fc47ea2610e367ac871814c6746094cf0250498db59da74b4e3ac84c54a26b4647d3c08b3e5252b6546421d071e203559abe942da";
+      sha512 = "6ffd911857ecc23c6a41181b684cb9cf9eadc7a76ecb1cade7ae1a5cedca1cff5b18660d76d6b10d722f28493a618417ccf31037229a1af62281c04360a986a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/uk/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/uk/thunderbird-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "07e8b6be8081069ae6a33e30c936ea26faa1dd9018fe78bc0d8783c7e9f4aec35a7ee8ea8fa6fa0763348423f11b4a60fa34c4f64cce1cb45d470512a7b889f1";
+      sha512 = "751b43543f7ec4684f4f71450aa301e5f63ea252901cec77593ff637fbb054a578d7fc13a58ba05247af46e86af11f1ec7f0151ab49eb4f824fb11c03c15c6cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/vi/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/vi/thunderbird-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "1fb6aa8661adeecbd3fde91e1158f102573e847a88b5ac2e2e79502c292a200edd4a93393fd5e44cccaaf2f91d7195722eb5e0df768fcabcaddb1681d85b5a48";
+      sha512 = "9aa955924e9a7cf6dbf9f9ad94e9d8cff9f91cda4da5ddb8a1e9d2719081ba5adce1cdb57ec55a76473679c63dddc9ac95589503adfa5d4ad00afae6002ff4fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-CN/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-CN/thunderbird-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "807459ac5666d19595b2095c78116921b046f0cf3c7a4958d56fce8e92e81ac34cb62137a199b7489c72aef1226d29b0c39f34fb9e30c03b1ece12668a00ce1e";
+      sha512 = "3bf34fb329ea1bceab24b0249c138e82c3725569ac82023a33d70c8a94e559f9d930b277bfb8df34571e4e2195293ee997de95c6dc22285be9e3ef15bd145ebf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-TW/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-TW/thunderbird-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "f233f514a91b558b9b792d2c72fa725f1232786797c52d37d49974562f360b5bd94a02efad1aef751ab74d94fd18de389b6dae416497bb764b474c2dcf90fb18";
+      sha512 = "f8928de4dce61b52fd69305023ff4893e35cfba2aa712dc34dc7deb024a36cd7c12a662a497a21e7f647b14779216a3aa2b6a01f84751860dea04b388b265c6a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ar/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ar/thunderbird-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "cb89eb4eb32ac39202cf651aecc963ca0a1b215f5bda3e23fbade26da7c760e3e0ff06184f963904441c8db5ce4f12b34d5d28a6f119c80a5a20305478ed8b54";
+      sha512 = "1a5f8a3da90724b1a85b63b7fee31d104e4ba1620b25e6823fa556d8f675335f3c25dce0499defbf8277c3fb6db98c58500aa6ec1460a194715d2d87942a35ed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ast/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ast/thunderbird-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4cd5cdeea7420f5cc7f1dc2aac10f8db743fcac080a3ecd2b0af33403d364ff6ed711d4307b5126686e06f7d0e759c9f2ebcc69bd21b2eb297a3052a66f483ce";
+      sha512 = "a4f5994657846378b0a472deb03d87fc30d27b35d9787c8fa53a7b428dbd4f3b0bef988863894606dc9b6c2370965353bba4b54140602a5acb7f3da433822f72";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/be/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/be/thunderbird-52.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "cf4306a2fee98805722391e32f11e230b6b9c400cda8e555900126f6f19e03ef8e45268fbedc81b05a1a2b408b82e740c601ec1d315d3a34257a7513d400726e";
+      sha512 = "2c029ac149cfab2eef9e1812dfaf755692265df49bc564f665e34308a1124f749a47850cfc19d1b15a16ee63aaa319ffce97e7025e894aa4a94c91cf81998f28";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bg/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bg/thunderbird-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0ac427d9b8967316e5b9fe434ac20d019e93fdc4a59f4f0914069d9b9b2fb4238f9f80d030df0b1d07893a0332fd400c2359fcc6dc7bfa728774adfd098fe25e";
+      sha512 = "ece638e2a33645df20d4c59b157efc57650b591b78e774dc5f82174495faa6afe9e80aac62e5fa106feb29d5cd7369313e3a182adc65e7c9f870a7d0e9e796e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bn-BD/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bn-BD/thunderbird-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "035d95bedde2b80451c03412bc3b732f2485931421f0581c8b9d20b543fdd0237334e46e819d98762097dfe321ecd4e872495e6d7478c4632cbf793839a369ce";
+      sha512 = "8c799ded0a1d090bc8a82044dbbe843f737d9e0481db6ddf33b1609e19b0f7535249677b22a53d71a3f7cf430adeb86421eb2383cad5c73317da71c2c15e50b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/br/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/br/thunderbird-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "156ded085c9800dd6413950e2fa26a2de67834ff48712a3a893e284ff8ec6e18f2eef02031c3962d72b171dda432ac679e6a31b2ffa0f766af1ae8ff6d6ebd20";
+      sha512 = "9417121f1d26d5be82e4857b87283857b072e433e0d90c191902a118489f165add64a5241309934a0b91cb21128c92326a4ce98622a2b2444e55d5bf7ddf57ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ca/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ca/thunderbird-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7affe51b4e92dc04569affea1165bbcfeb66468d7c1c1056ce03013c924af3de6c8d979ccb898c9985b0ae076bb662d692d11d7bbbd82e59a9b3bfaf0ca8c584";
+      sha512 = "0b0e29ac69055336f5e157bb48d86316f36d86f0e984a11a000e4c4518478e8198cd4eb2d6815c1c6456d17c6047d92ff5ae0f6ef4f26a96bd172b8c0a8c308d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cs/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cs/thunderbird-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "0c5aaeb88985ac6167c0f28f4115eb3a95be16900677ccf0cf55fa99c7194997939f141ff2bf2d497bce9260628eb2a76083c7e3a1d81511dafb829fac2a91b4";
+      sha512 = "6124454cd4ded6cecf953beab5fff1ed6105ba881624b83fef6c0d8798bab161a63abc3b0dd9a94fff5ed850f638feb95f5de4b9268b9ea71b9fb5eb52618407";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cy/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cy/thunderbird-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "0776b21cfc88061b9550ca9a0c3d77a791dcb403f7355235611d4d5861c36a1cd0f64a8ae1de3e5d76bbc560f76f2d6819ca53dc57be5d0fd2a3ebca81d7007b";
+      sha512 = "b1f0c7dae07a7130f1e9f2abfeff12008ce40f7486ef14964c17c7e665c3b4ceb52e48d504965da78993117f5bb12e14853c2a740b00a71c03574445f1129db9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/da/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/da/thunderbird-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f22f9601cacfcb440a8657a810ad903000b1541930df88766098e1621c883e8f320c13fd09ca7958ce134d93f7aedd22f659b27fd7c50329e67659820034ef41";
+      sha512 = "5b1e6fd39cfd1d206a1a670a25df98ea73f490be5880a5190ab918b9ffc852000085c0ad89dec1dcea25c101a7ccc43bbc531f63a5dae95a515e0152dd2eee21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/de/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/de/thunderbird-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6537e54372558d8a65f54e34aa5012b01d637f309ade5708ab040a345ec7c22cc07646caf0f84e68b5d926d24e9dd3d39fd121578ddd7027b2542b93005199f1";
+      sha512 = "5690e0d91c4969f36805e21348fd5d868cf02dc524f24081b4af9afde85ec053a76f4b7a7746c591514973cf18b0e153b9e54112393aeea501e7696b3f63b0ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/dsb/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/dsb/thunderbird-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "a913816a013a3209a071c9666a92e7a876e601bf22af4f3ad6b331788b4693967d5e7a9059dfcd23fa797c7222a303e6708ec3bc39e3f4acaa9650688a2bf4fb";
+      sha512 = "8b5663ccb6402578181d84ae92a823d86c243fcdb77a25c69e6be660d137fadde4fae5ca5385bc393d9809ae06bb9b57c68791c8d06c864e710e9f33ab2183e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/el/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/el/thunderbird-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "81e8308d1911d45fc1b4da582fee526d52245e96b4935119da542f53434abcfc9d7319acf902b706d667e03e05f4e39c8fe6b5424fd2077c862bff102eab49eb";
+      sha512 = "0cbf7aeb360ac59d4d4dcac603194c03082e37325c0aa08e79a872f819f5cb25484f0cd7577333194d12a80260ac665fc964b4300c49c2f96c6a6e885cc8b8c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-GB/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-GB/thunderbird-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "e93fe34674f8cb02e9fb2b2b2695c402e2a4cb35f7b4bfbe96c41cf27e6dd0130647d236a918c9595dedac0b7450aab4c8acfb9e2f18a99979b7099353447507";
+      sha512 = "fd565d48ceeaddca038265577fef52643218afdcaeda5d022ea125012ed565628670aeb6db3822830a39b43b8372d843129dbeaabaabe7904e93a2389c03957c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-US/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-US/thunderbird-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066";
+      sha512 = "a0c4dbb1f39e9bacf8fdd7660d280142c072ab709204f02a2ea4eb7dab9a4475a121551c98fedb4cac2f1700b0adace7e7af04decd8c2d65bb14a4bc58bf8b59";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-AR/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-AR/thunderbird-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "bb38d967c613da3122ee421b95d5fa633581193f4899407125403f13d754f1061f78770d342bdeff0e597e1ce813283b25ecb6556aa5bd095f40386fb4e6b563";
+      sha512 = "205893ac76ba91d29ed6f169da01b0ac548e03985eae64955c5493969060c7eb31b6fe0557ecf17301576e1a4b637f2615818ef38322f91bb366c747530dfe22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-ES/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-ES/thunderbird-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "77c8da8cd474ea74b0313efdea0bb428bfe164c243178fafe75075b71df8eaba764d7ae9258d00ce02fce3ed4648ce839c46f3f9e431e0123bd41bf313954fb4";
+      sha512 = "6ffbb09840acf9033a7f1f1b19e81d6d51cb90f2578c741c42a81f2e7413d4e9f47afbf756a7b317dd7e7d66ffd025c0d2af31c765c7a8318a291e63d4eeb8a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/et/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/et/thunderbird-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "323bee6b4005c78c95f1621e9a89d9faa95da44316ce01792e7488b00562d1d64ac23dcf7974d5162e52bff4b9327cfdcff0a85524869cacc4431fe6b1450436";
+      sha512 = "79907c40de73a6761bc94b72395eddfd44cac795c6ab0614e764f467f59eb506829c9957ac3fa338feea8a900134195fe549c6b4568655078904337755319523";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/eu/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/eu/thunderbird-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d90d4364e891794147ad447f3248444218422f6140e7a202554f25a494a2fdc399823f83ce85edf496753125076b83e19a28987b2dab3aff582d1e860a238d73";
+      sha512 = "dd799f923143380e7a639a9ba313e24dc4457e6a0ec9d6b266103e64c606db2ee702f56fca746049972b2fb63f03713307ee7a19ca7b3dcb93ac6d6cabc897db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fi/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fi/thunderbird-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "b0c9a426eb74f9a8ef3972f40d4a5d73a1eefadf402e65a137043ecdb9f4e0b79c4e84f78c03afaa3d6f0d455b62ecece1861bc289091f5c2354a226c7e10ffd";
+      sha512 = "1aed6627a6a0a72d5e0d52b1831d4f756205d92aadccff43a1b9543d0d426b2cea3b9d20ca1829f29b1c9a1a832a43a7cbe9b870aab138df3133c2e886d826c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fr/thunderbird-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9e44644cdc545e52e230e440e2277db6b465a5b36d00c7a7fdd65bf8a141e98444682dc1ab8ce2c85d15ef82e739fe3fc7225c551643244d565a06e883227dca";
+      sha512 = "c3d1fc74da5379825e180c3a3d0569c83a3f0098eeb396fd73eb3470d054207317506fead5b116a32b7a3e2a4c7c98431da9eb16548daef3baab052d53f432ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fy-NL/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fy-NL/thunderbird-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "f3885565bf6bd223494c2169655844023732207172808d8768f148416d8e56eeba3a154e4b9526bd5799cf400369c7f25e41a5a1b78d17d2fd266f6c1de6bb38";
+      sha512 = "c557220187979d06f1697511a69dac852c3f6662e6474b9d8bd0f0d49b5211d5963b1b6dc75a0e3f831bc724f3e28e0548da7cd67e8ab90c29901e07ec802f03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ga-IE/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ga-IE/thunderbird-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f23f42508eb4f4deff3e5b7f39e5ff5e54bf2c973c56a9800036cc1add4b64b0c597babd60a045ed51cae86c025f8455dfb11ad0c1ecf1b774529810519c4ebd";
+      sha512 = "02b3ba15ab86764cf41d275aea8d39310455e74e0f00418c91151bfea623385efe0c59202dc499a7f3e72cb6c64c7c30ce35663c1fe69a761a1761865f7852a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gd/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gd/thunderbird-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "05b37eddcb7d8f78c0676bf918483144d98d935736b562c9fa4b60d1bf290ead4cc9328198da86379d8ed3055d4ed36170897567b3f1273824f7242925d8f55c";
+      sha512 = "24086d6f92611b0b8a9e3b79e42a5494dca7147bf8597df33d5d3ff745a1bac41ce39156f7df43bd6c21b4e845474ca085f9082cf4207cfec982c50a88fc6c16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gl/thunderbird-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "59fab273843a9f1fba78c19d63bd61c0cac0fb28ecc78549dcf4d52955dc108b5e4bd963e49652c4a7e8e4b6c66ce9e62d24a8db6b67b76b234c860d889942d2";
+      sha512 = "66b9b1f073b352a6c3147e44631b88cd79e1985a4d6dabea142170871cb795778edcf2e7c2f0d4b94dbf35b24783b26e30534402d2a5e05cf2587609183820f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/he/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/he/thunderbird-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "63ad6fd03ce2503431d759d56f3ca92168a7eaf1d23aeaa7c9be5206c94d51813f3ddc06489f2e47d2a182e8dac425e35031b9ddafdc8de34a31f0b69d4c8771";
+      sha512 = "b52223e1314043ea50a70184e7812533b389cc58c6e0442daa96975955645478ee161e60f4a8e4f517164efac83e0157bfe6a88d25d056f3849ebd3652b39d56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hr/thunderbird-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "3184f7e69c48ee4972aeb4ff7c59bd5db99e5afbab54c82271059c9c2a5d6d42fee1f31030ca7c92812486d9e4c457bb35984a1dc5c055ecf9f7ad9f8e34a986";
+      sha512 = "010c2ae0a21e167613b88c110ed93e6e60920e8343c6ef22159dddd116f2cdaec18a6545132bac87d828ea717d6090979ad88483093cc280f9f97292fae1e456";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hsb/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hsb/thunderbird-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4b8a847889b02b04e80301756e403e0c1d8c38db7ad5c74d843e25f29ffbca1e7449d9e6a4ccb55042f868e3c8018ab00f6f4cd53c86518b3b922618c34b6e7c";
+      sha512 = "1f7b6864a4760ad77c3b93f56eaa80f07c89cfbbf03523c71c74f7677c4a3b7b54505cc720990308477316d7e30839916b1c51cff8d3cd5c9af99919df8a3f38";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hu/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hu/thunderbird-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "e0887449cd5668bd06101c637a235d989c93fc831f98b09c7cee031de439d7db9b0a8bb50c1b4fce47bc6c9ef8769d84824e211c7812fa40fb962f88120b9cf1";
+      sha512 = "5ef71ed0803dfbc0c4ecb28de017969e40b9df3c6099866863004914fff1804a010f721d779f43e6b240d7b309b7877664b5d96ea2c5dfef6fe0403b3592c359";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hy-AM/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hy-AM/thunderbird-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "f00f3d7c58eedffd39d012391c9464d8e0411fd557d1e52191e635503fa5610bb01137c062c455d9174ee83268f81218f9dff9272f4ade078c003f352a16e4d7";
+      sha512 = "2271c6d528dfd2e61c98dc976a0aadc20d39bd8d1e7cdeefe7cdebd9e0eedcfc17e6503c8b204d560b2b9bdd05b5a87de5b0422268e39ef8fc1a31874a7807e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/id/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/id/thunderbird-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "7e0fcd2d2773a8f765c21b00b1d1945113219ad6834763aa491fcc570c5c536ebe0089c0f0495794d36a2691674fdcb8b22bd95de5a5dbef2f1426024b2bbce4";
+      sha512 = "6469eed9762451392ff88ef76a4811b4122413050c4eb5b7f7ccc97e34ae0ce5c00ac8ccd41aeda92a9478d335f62bc2055e7200d1bae5217cc7370275ff72e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/is/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/is/thunderbird-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "48d7879aef3e4528c4db7a86cc28dccf31087d171e103ed9b7bfbcab8fb07ace3353a259edd11ae20bf86ddacb31f2c11d96d460a2a2a8ca3c3935fd6d8c5df1";
+      sha512 = "6b46c946d456408152f7058540a1247f278b0d228717f089582f11a2e6c8221834fb09da48c93aa8ccd68fab537719d0f8ec3b16cd043ce6b59113cce75d1018";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/it/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/it/thunderbird-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4a3437fc5e64ac4e0ed674072ff8311548cb0da1c29bed28d7d47c935aa906905e0d153d00ae434899f281d5efac9c306b2456b58c131369ff993f405491265a";
+      sha512 = "2fa1ad4d939fd916e29d3f76bbc55f2eef4823225d32bf2292e03fc59c81d24657aabdd228df092e4039ddd555e7ea3a39c840bec58154f10c8535a79a2d3814";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ja/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ja/thunderbird-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d148936fce3b77cfe79c3acd195bc837eba485d6600dd2a19a9d76765435ac6fc6688473eb8572d4bf40461dbca5562cee4baefc9c98aaddb03679748ca4c36c";
+      sha512 = "c4ad832486169e0bbbc1a14a7da399e0149b236a8ad9b71ec723a6c9098c4c90446e0c2c8ae0e4ccd78a48fdf8096f6b0290b0f6ab74469a53b8259358e6ea03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/kab/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/kab/thunderbird-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "64e1f2044f8dbb1664d8d4ba85514ed17b3c49a16770c4b64e10873e092a9424d939e7fe6bb8d6d1df5f9f3663e259206fe83149f45de16aadf6fb16a8b04755";
+      sha512 = "9cfafbe2030610fa01901600c6661af69f9bd66f10c76ab227da966cc860e4a1ab9c07a80b3901d72ee440762536ddd0c1d478539f1087215dfe130e507df79a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ko/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ko/thunderbird-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "886566909754431b806bef2f314cc3fcd7330e2df5119c2bf65f5f48a9cf7bc378253c4e1f1b8b6cfa409962d6a801bd6547bf2071738ee1b20306fe64318748";
+      sha512 = "640c0f3466aebfb43b88e8a580797661a2eb016f4eea4d9dd081009f4bdb17008bbcae1759a2d70d8dda3159f024813ee943b2a88a0c21a97f14f4079dc7744a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/lt/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/lt/thunderbird-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "24377735d80a0d23ceee9b5594cd37c277141b7ad33b146c7a304fa1de66326adf76443966e17fbb1995848d41374cc44137a8b2956e1254744d50a643e4db82";
+      sha512 = "9a5c403ea9456d2f27b77c7a46120f45eddad60fc2d93617b246d5b7b7cc59a93698d00dfc35b33997cac5ff71ffb036469f63e8553cf8cc6a73de8959b76b9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nb-NO/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nb-NO/thunderbird-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d53d4089bc057a66cd785e263272962765b2c02eebce6e0830c84748a17cdf09d478f329b486532fbbcfea13967060d2ea2e758b07a8a6cb0a6b56c0a95d611d";
+      sha512 = "c485347ea4518875bcc384259bbb63b1bf2b6c1e5fb76e7540bea9ac664c0f6b517c563144489ce6ce3a65fc6aa9736088040020e073627fca032ae53c3c6e2f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nl/thunderbird-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "2d23cacfa1166315e5b30562e620bb8f2fedefe62b3478d12ea4bd2a3f9bd24b29022df9c14f76756cca05eae7edc134c505faae8549f701074481d7ad3bb5ae";
+      sha512 = "fab94d96dd0a0cd8370c336acda2049c58c73b7f22f7975d8304a33d81950ebf82a14a335dbea02d8e78a63512b4bac041965516948812d9ee833342fd54c951";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nn-NO/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nn-NO/thunderbird-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "518f61379d62f38a1b496221bc898108a693c3378488e7b450c3fb4b133317d9ca92e17e93cf502a8e79b8a3254763aaa0f6b1513487089da514e8c153c432c1";
+      sha512 = "63917ddf88f0731c228bf04513a753216c9393f2a9eef685ef36d0d6d442491e6eddcbf4e77cc87c4b588878667aec08c4346f3418a148af77585b0b037285b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pa-IN/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pa-IN/thunderbird-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7ede43d3c8e60529df4ffe62a1f3ebe3c6420f8601c7838afceafe0ca553ac80328f78d82fc04ba68a5af69b71671722509697e9c73ebaa9603f6de0bc42ada4";
+      sha512 = "c49d476f02431e3ef23680ffb3dd58dc226e5b6c25003df7a98bebf69a0bb0167d60edc0ff764c9e36aeb9e7a06f19fec4651bee293f986b30688cec2f6d1d9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pl/thunderbird-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "18a211aa55724882f3531a8bd588bc418d5d136eef5ad027c18c5b00bac7d0bff6ebf4fef8d3a1d49cf46adfa10040b2cae1e5f039e817067319c66e5af6715a";
+      sha512 = "3764defe3440f4c283d9c9e806c05653017f70921d84778a40d71bfc4028d146b8aff5114631050fb3eca8c9f1b33e40f5440c647fadf238ce36dc0eb5245a27";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-BR/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-BR/thunderbird-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d5f65af63813b27454d21df094c5b709a1f590144853e9082814ca525ee75f56f1d8aeb9df09bc49c7eeb41eebab6acd46bbc086db4f70c54b8e7be3f9939fdb";
+      sha512 = "3c016085676d2fb8b98685d7785f4163ebe4382f051760f2596e072f37c8d5121cdf87b5a90448a1360213fe2f6c1c369be04d744c22d39f7ce4dc6135fe458b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-PT/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-PT/thunderbird-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "66677c8d8e2c9c38b7efefad3ddb14586f6bdeef74087239c7a16e66062afeb719b928a29a516bd720a716d1b05c4e8bcf21cd84f641140acc96ec1ab85165e1";
+      sha512 = "79ee1c273c74993b5e98ad9fb3c8434284e414dd14a70028525d214454f83ee1a1475531dd001d1b34ec37eb903f12f9675b388e7728c51c52164020e5cda0db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/rm/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/rm/thunderbird-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2692412244a2153ea701cdc5d6b41caabea82440d5f9eed85ff1024973d287fd0c60066503c8f5336bfe36a9726a0a4df8e30c2181b7d66206c6b3a23a32582c";
+      sha512 = "f150d1652924fc6a5f3ab9116a1000c08c99cc597fb433c3c27a4b4008768cd63034ccf6ed75870fa4444af02cbad33d0d11433017a3df461d98af59c1d6c8d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ro/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ro/thunderbird-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3592cb39b622983758c8513a977a2acbd168699ccaee5fb8b6e7cc1714334e4cc48bb48712a764c4a6954d8fbebfa5a1156a89cf41b488026fc2713934a06319";
+      sha512 = "524f5266679084fa3d3dd97daa66d2c1c729c70e9d1a77dbb6565e0d8e15dba507f33c4ce4e4ab11a31f69dfafcb67b0d7ef2b20c21b8d98608d242f63313e2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ru/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ru/thunderbird-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "df0ad7e0248a0471130faca0fe09f28725352927f362e906365918939d19d0d18a86fa84058463f59376ffbe4f66d574a10823b5e88be3eed8ec39d17c2e2a7a";
+      sha512 = "fdc15364d34e676db345189247033b25a6b7cff4cf6b0096845a672e0ecb4d5ae41105b139c6814f359c5f4c2cdb2165faccca1028fe085bca1dd165920030e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/si/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/si/thunderbird-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "67c3c007ab101d5528613913a75f512befedb6d1cf1f105c19ffb78a5906c2fc6ab01408a290da58cd04667b6c851219aee0a0df7b9a42d1d7f82b244e046d42";
+      sha512 = "d6782f94a20cc654801f3f17cc0b01fef195423b83c4f0ee9582de6af4f7fca97ec12649ae0de432d9ca2f3f1519b399a82609e70f101cea30f85e377dbabd4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sk/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sk/thunderbird-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9113fb1d2150c191abe647b761eed5747341ff779e1a02b724f604fe1193b845130cda9585adb8fd4e8f23f9a3f22a5c8c90f9acd5b3381d3f26eb95e5a74259";
+      sha512 = "0c3072655ebffc0527f678a1b68cf56b117ea7b247891e12b80c22f2a4936ae087dafe17144d58a406d5b5bf38d2e6090c5146b6d3d34fa5b3ccd911cc960e58";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sl/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sl/thunderbird-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "1ae92f74625a1fc54b0cf2073c8c687fe853dbdc318cc10a2e997f4b6e8062b500f5761128a228987a81f86a2f501163e5fbce5fde05c41a3e2ce0d74c2fc14b";
+      sha512 = "439dd725c83bf40b258712385ef8a5286e92b10dc77996c16c6cd22589f7ea276ced47788bae29a6ecc3d2d785f25ce99c98a18fd4f9e0330478645803cc0944";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sq/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sq/thunderbird-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "45312d0b18565df69734178eb03b58cd0ea813d7ae099edc03d871a763f715483d9d6a4c375c4f4e6a081d59809beb789c01f0efbe047a6a5d7af40f3280a517";
+      sha512 = "59b342d58a04cd4b71f1ae67ba66e3d10f4f464612f6e072c838fa5cf3479ada72fa7be09a10508dcc62da10983cd284f20ca6e4e6874fc92433337332733d51";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sr/thunderbird-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "61756439561a7395b7f9bd55dbf16e73def6e55469a2e4bdc84207bb9aae5761002411900ed8e31e1a32c2f854b95c9ce0f35f17d15fba673b4e61e07a9675e9";
+      sha512 = "1cb49257c91ba6afa41aeaa60380b812017210ea102dec90e405fa80ba48fbf8df70d4128c6c0bbab3bfabf81ee21b06c8180f38cbd87715093ae872f4c941e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sv-SE/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sv-SE/thunderbird-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "94cecbfb7d6f6ac060fd2b2aabdb3e049832055c969fa7d3ff518a91b3ccb39f9902910bd282c2d8796e16ea641d6443e4a87545c2328e34e6b567ce6cd2dad1";
+      sha512 = "28c6554e85186f5eefd79f63c9d0b3d258ce76c29156e70c1badbfc71e201ee82889223d7c60a98e3fd44644937378892725136781e9a1644007c80207ba1cb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ta-LK/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ta-LK/thunderbird-52.0.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "05b4d35f6288944f0fc527c0338ab5cb204d5746b86265638fe66a1921297ad2a6de166782fd5948006d6d71a70c62735afd4936a87b3691d975813fc4ee0be5";
+      sha512 = "9f04041814a6f806b9b24aceedb9a7e608384b65a9b607994eded3813af83467c4ab8d85beb972775da7daaf0a86ab55bd74bbdda2a499323b6761550f568a61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/tr/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/tr/thunderbird-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "98e5f9e9d2f90c6d5b05555f6977bf00179fd8dab49afc2aa157f36ec1c58a5e87043de85de90ee03c7db985f00855ee83d30537b2e514518e90ab782031b426";
+      sha512 = "bceaae576db6d1f49c40e9e361b77580f5bf142945ebf20b3cf38b0b61d8a68a2b9478b5a1dfea114daec363aec5934fbcef4ae88638626fe3ff93a28f07ccd0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/uk/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/uk/thunderbird-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "1495bad171ef4cb4f32e5b02c63c7cc2b8032485192adf5e5d8d8bb8fed897e98e6ead1bf1c71f131178e0059905c82296fb2ab4275c5c979cd963c4176246e6";
+      sha512 = "e88f4f496e3dd19655e76a3b79e4519a05e76390fb3acf05d194a300bc459a1e66b082a6150b9f4ec82308c881de402b30474764f946f81f55c1ea6e483e4161";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/vi/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/vi/thunderbird-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "23f96b086356818ee9d451651514c84212e98b0616021789e9215dee2a97cc43d06373162860def7fbe00514651b6fa0395ccebf4823a7e5622d432467dd0365";
+      sha512 = "1c361e41b1ba06d9a08cfbb5532619311d81e3a7717eb0dd2d289195f198be7fea2558df707f97a49846fe073a0c775cfae610ed3fabeaa2cedbb1fa7c21d8ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-CN/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-CN/thunderbird-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "129cf69e007ea57550ee0eafcd086050ad3c70ef6671f7e56f12679bd9fafd40916e206aa932fb339bb361c4d4894bb6aff8199334c21894d48e01bdbe2a9bd5";
+      sha512 = "fabe94285cbc1ca40e398dd41747fcfb0a51aaefe3346835ac6e3946d5d8ce1610d39c55276e2c6e02f7a1424af46a06529d5533aeb83b8448aff0dd9183a6b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-TW/thunderbird-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-TW/thunderbird-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3fcac7432ce9e1ef4edea97719628374d50173dbb0623866c9bc6aa9644a4d1cebbd640e7dae969b3a7bd067cd29a6d4ff1fb58c18f3eaf3e12c1f9d87f222ce";
+      sha512 = "f4764c8fae1231d1e10c30baf99583c534fb403ff03ca9a61a472d932645590ee863b56feb13df13438a7eef83e55445be196a9f62078a0e18961edb043bbec9";
     }
     ];
 }

From 692ea2b6e95421dd217ff78be8daa5f41edf2dcd Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 15 Apr 2017 22:09:15 +0900
Subject: [PATCH 1094/1744] thunderbird: 52.0 -> 52.0.1

---
 .../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 69286202823..bb82cac0e84 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.0";
+  version = "52.0.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "215de8ae386f6f12d7a4338bb03bac956410be0dd4de5cca218e12241e3948c8c2540756e149bfde597cd10e399b4cb4db86619a2aa50a368ba323b413c1f93c";
+    sha512 = "7b8324a230a10b738b9a28c31b195bfb149b1f47eec6662d93a7d0c424d56303dbc2bca6645b30323c6da86628d6e49de359e1067081a5d0bd66541174a8be48";
   };
 
   # New sed no longer tolerates this mistake.

From b9d9083322add2026935898d5a372a3a2464e92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 14:36:10 +0200
Subject: [PATCH 1095/1744] powertop: add module

---
 nixos/modules/module-list.nix    |  1 +
 nixos/modules/tasks/powertop.nix | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 nixos/modules/tasks/powertop.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f7608a57d71..0cd02d259e4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -659,6 +659,7 @@
   ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
   ./tasks/trackpoint.nix
+  ./tasks/powertop.nix
   ./testing/service-runner.nix
   ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix
new file mode 100644
index 00000000000..6f57f5f5c25
--- /dev/null
+++ b/nixos/modules/tasks/powertop.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.powerManagment.powertop;
+in {
+  ###### interface
+
+  options.powerManagment.powertop.enable = mkEnableOption "powertop auto tuning on startup";
+
+  ###### implementation
+
+  config = mkIf (cfg.enable) {
+    systemd.services = {
+      powertop = {
+        wantedBy = [ "multi-user.target" ];
+        description = "Powertop tunings";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = "yes";
+          ExecStart = "${pkgs.powertop}/bin/powertop --auto-tune";
+        };
+      };
+    };
+  };
+}

From f09c2e774577b41114c44b14e0cb58e3031c407d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sat, 15 Apr 2017 15:35:42 +0200
Subject: [PATCH 1096/1744] chrome 59 requieres gtk3

---
 .../networking/browsers/google-chrome/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index abc314f8569..e06d8cc3062 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus_libs, gtk2, gdk_pixbuf, gcc
+, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc
 
 # command line arguments which are always set e.g "--disable-gpu"
 , commandLineArgs ? ""
@@ -47,13 +47,14 @@ let
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
     alsaLib libXdamage libXtst libXrandr expat cups
-    dbus_libs gtk2 gdk_pixbuf gcc
+    dbus_libs gdk_pixbuf gcc
     systemd
     libexif
     liberation_ttf curl utillinux xdg_utils wget
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap
-  ] ++ optional pulseSupport libpulseaudio;
+  ] ++ optional pulseSupport libpulseaudio
+    ++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]);
 
   suffix = if channel != "stable" then "-" + channel else "";
 

From 7df8e53d288915d2623479e117ce3c855bc3df7c Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 12 Apr 2017 00:09:42 +0200
Subject: [PATCH 1097/1744] psc-package: init at 0.1.1

---
 .../purescript/psc-package/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/compilers/purescript/psc-package/default.nix

diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
new file mode 100644
index 00000000000..70ef8b63277
--- /dev/null
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -0,0 +1,26 @@
+{ haskellPackages, mkDerivation, fetchFromGitHub, lib }:
+
+with lib;
+
+mkDerivation rec {
+  pname = "psc-package";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "purescript";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l";
+  };
+
+  isLibrary = false;
+  isExecutable = true;
+
+  executableHaskellDepends = with haskellPackages; [
+    aeson aeson-pretty optparse-applicative system-filepath turtle
+  ];
+
+  description = "An experimental package manager for PureScript";
+  license = licenses.bsd3;
+  maintainers = with lib.maintainers; [ profpatsch ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a735c6a2e67..b4345da9466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5232,6 +5232,8 @@ with pkgs;
   all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
 
   purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
+  psc-package = haskell.lib.justStaticExecutables
+    (haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
 
   inherit (ocamlPackages) haxe;
 

From 209e8e53fb2278c1d09c4759868ad82a8e21e851 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Sat, 15 Apr 2017 09:10:05 -0700
Subject: [PATCH 1098/1744] cargo-edit: init at 0.1.6

---
 .../package-management/cargo-edit/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-edit/default.nix

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
new file mode 100644
index 00000000000..4a34e62322d
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, zlib, openssl }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "cargo-edit-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "killercup";
+    repo = "cargo-edit";
+    rev = "v${version}";
+    sha256 = "16wvix2zkpzl1hhlsvd6mkps8fw5k4n2dvjk9m10gg27pixmiync";
+  };
+
+  buildInputs = [ zlib openssl ];
+
+  depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq";
+
+  meta = with stdenv.lib; {
+    description = "A utility for managing cargo dependencies from the command line";
+    homepage = https://github.com/killercup/cargo-edit;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ jb55 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4345da9466..fe519d3c09b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5582,6 +5582,8 @@ with pkgs;
   cargo = rust.cargo;
   rustc = rust.rustc;
 
+  cargo-edit = callPackage ../tools/package-management/cargo-edit { };
+
   rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
 
   makeRustPlatform = rust: lib.fix (self:

From 5b065a5ba580480f9a714380d53102835743b7fb Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sun, 2 Apr 2017 01:38:14 +0200
Subject: [PATCH 1099/1744] glyr: init at 1.0.10

---
 pkgs/tools/audio/glyr/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/audio/glyr/default.nix

diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
new file mode 100644
index 00000000000..e98667b8c04
--- /dev/null
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake
+, curl, glib, sqlite, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.10";
+  name = "glyr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sahib";
+    repo = "glyr";
+    rev = "${version}";
+    sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
+  };
+
+  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
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4345da9466..db7653a5767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -539,6 +539,8 @@ with pkgs;
 
   gcsfuse = callPackage ../tools/filesystems/gcsfuse { };
 
+  glyr = callPackage ../tools/audio/glyr { };
+
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
   pass = callPackage ../tools/security/pass { };

From f0fac3b578086066b47360de17618448d066b30e Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 15 Apr 2017 18:58:56 +0200
Subject: [PATCH 1100/1744] abcde: add glyr as dep to enable getalbumart

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

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 2f8a6fcdad6..a729d5cd4ef 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
-, lame, flac, eject, mkcue
+, lame, flac, eject, mkcue, glyr
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
@@ -52,7 +52,7 @@ in
          --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac ]}
+        ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"

From b7b85316fd49bd7b6ba17b7f7d931d77d67d748e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sat, 15 Apr 2017 20:36:57 +0200
Subject: [PATCH 1101/1744] prettier: init at 1.1.0

---
 .../node-packages/node-packages-v4.nix        | 2347 +++++++++--------
 .../node-packages/node-packages-v6.nix        | 1892 +++++++------
 .../node-packages/node-packages.json          |    1 +
 3 files changed, 2375 insertions(+), 1865 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index a9bdefd03a4..22cd44ddad6 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -625,13 +625,13 @@ let
         sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
       };
     };
-    "azure-arm-trafficmanager-0.10.5" = {
+    "azure-arm-trafficmanager-0.12.0" = {
       name = "azure-arm-trafficmanager";
       packageName = "azure-arm-trafficmanager";
-      version = "0.10.5";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz";
-        sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01";
+        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz";
+        sha1 = "609e585c0253960a91deaf773dae1ce184ce414b";
       };
     };
     "azure-arm-dns-0.11.1" = {
@@ -697,13 +697,13 @@ let
         sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
       };
     };
-    "azure-asm-compute-0.17.0" = {
+    "azure-asm-compute-0.18.0" = {
       name = "azure-asm-compute";
       packageName = "azure-asm-compute";
-      version = "0.17.0";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz";
-        sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90";
+        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
+        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
       };
     };
     "azure-asm-hdinsight-0.10.2" = {
@@ -814,13 +814,13 @@ let
         sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
       };
     };
-    "azure-storage-2.0.0" = {
+    "azure-storage-2.1.0" = {
       name = "azure-storage";
       packageName = "azure-storage";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz";
-        sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz";
+        sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01";
       };
     };
     "azure-arm-batch-0.3.0" = {
@@ -1750,13 +1750,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "brace-expansion-1.1.6" = {
+    "brace-expansion-1.1.7" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz";
-        sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
+        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
       };
     };
     "balanced-match-0.4.2" = {
@@ -2002,13 +2002,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.2.0" = {
+    "async-2.3.0" = {
       name = "async";
       packageName = "async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz";
-        sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32";
+        url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz";
+        sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9";
       };
     };
     "lodash-4.17.4" = {
@@ -2227,13 +2227,13 @@ let
         sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.11.0" = {
+    "sshpk-1.13.0" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.11.0";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz";
-        sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
+        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
       };
     };
     "assert-plus-1.0.0" = {
@@ -2443,13 +2443,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.6" = {
+    "readable-stream-2.2.9" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.6";
+      version = "2.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
-        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz";
+        sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2461,6 +2461,15 @@ let
         sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
+    "string_decoder-1.0.0" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz";
+        sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2965,13 +2974,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.4.1" = {
+    "hosted-git-info-2.4.2" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
-        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
+        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3325,13 +3334,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.5" = {
+    "buffer-5.0.6" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.5";
+      version = "5.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
-        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz";
+        sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3442,13 +3451,13 @@ let
         sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
       };
     };
-    "https-browserify-0.0.1" = {
+    "https-browserify-1.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
-      version = "0.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
-        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz";
+        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
     "insert-module-globals-7.0.1" = {
@@ -3559,13 +3568,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.6.3" = {
+    "stream-http-2.7.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.6.3";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
-        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz";
+        sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6";
       };
     };
     "subarg-1.0.0" = {
@@ -3946,13 +3955,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "hmac-drbg-1.0.0" = {
+    "hmac-drbg-1.0.1" = {
       name = "hmac-drbg";
       packageName = "hmac-drbg";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz";
-        sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5";
+        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+        sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -4639,13 +4648,13 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "parse-torrent-5.8.2" = {
+    "parse-torrent-5.8.3" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.2";
+      version = "5.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz";
-        sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz";
+        sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c";
       };
     };
     "pump-0.3.5" = {
@@ -4837,31 +4846,31 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
-    "magnet-uri-5.1.5" = {
+    "magnet-uri-5.1.6" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
-        sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz";
+        sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3";
       };
     };
-    "parse-torrent-file-4.0.1" = {
+    "parse-torrent-file-4.0.2" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz";
-        sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz";
+        sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe";
       };
     };
-    "simple-get-2.4.0" = {
+    "simple-get-2.5.1" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.4.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
-        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz";
+        sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4990,13 +4999,13 @@ let
         sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
       };
     };
-    "fs-chunk-store-1.6.4" = {
+    "fs-chunk-store-1.6.5" = {
       name = "fs-chunk-store";
       packageName = "fs-chunk-store";
-      version = "1.6.4";
+      version = "1.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz";
-        sha1 = "5aa0025d58533118552e815f5986f39f93b06e69";
+        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz";
+        sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156";
       };
     };
     "hat-0.0.3" = {
@@ -5062,22 +5071,22 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-piece-1.1.0" = {
+    "torrent-piece-1.1.1" = {
       name = "torrent-piece";
       packageName = "torrent-piece";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz";
-        sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
+        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz";
+        sha1 = "50346e42a43b35daf2a86f414afb153629a854be";
       };
     };
-    "random-access-file-1.5.0" = {
+    "random-access-file-1.6.1" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.5.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
-        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz";
+        sha1 = "33358436f43076d34a058db47177a691319f0e99";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5098,6 +5107,15 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
+    "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";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -5395,13 +5413,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.2.2" = {
+    "ws-2.2.3" = {
       name = "ws";
       packageName = "ws";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz";
-        sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01";
+        url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz";
+        sha1 = "f36c9719a56dff813f455af912a2078145bbd940";
       };
     };
     "ultron-1.1.0" = {
@@ -5872,13 +5890,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.17" = {
+    "big-integer-1.6.19" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.17";
+      version = "1.6.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
-        sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz";
+        sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0";
       };
     };
     "sax-1.1.4" = {
@@ -5971,13 +5989,13 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "init-package-json-1.9.5" = {
+    "init-package-json-1.9.6" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.9.5";
+      version = "1.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz";
-        sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz";
+        sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61";
       };
     };
     "nopt-3.0.6" = {
@@ -6070,13 +6088,13 @@ let
         sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
       };
     };
-    "xcode-0.9.1" = {
+    "xcode-0.9.3" = {
       name = "xcode";
       packageName = "xcode";
-      version = "0.9.1";
+      version = "0.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz";
-        sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95";
+        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz";
+        sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3";
       };
     };
     "browserify-transform-tools-1.5.3" = {
@@ -6205,6 +6223,15 @@ let
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
+    "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";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6484,13 +6511,13 @@ let
         sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
       };
     };
-    "type-is-1.6.14" = {
+    "type-is-1.6.15" = {
       name = "type-is";
       packageName = "type-is";
-      version = "1.6.14";
+      version = "1.6.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
-        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz";
+        sha1 = "cab10fb4909e441c82842eafe1ad646c81804410";
       };
     };
     "utils-merge-1.0.0" = {
@@ -6574,13 +6601,13 @@ let
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
-    "npm-package-arg-4.2.1" = {
+    "npm-package-arg-5.0.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "4.2.1";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
-        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz";
+        sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872";
       };
     };
     "promzard-0.3.0" = {
@@ -7402,49 +7429,40 @@ let
         sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
       };
     };
-    "pegjs-0.9.0" = {
+    "pegjs-0.10.0" = {
       name = "pegjs";
       packageName = "pegjs";
-      version = "0.9.0";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz";
-        sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369";
+        url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz";
+        sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd";
       };
     };
-    "simple-plist-0.1.4" = {
+    "simple-plist-0.2.1" = {
       name = "simple-plist";
       packageName = "simple-plist";
-      version = "0.1.4";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz";
-        sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d";
+        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
+        sha1 = "71766db352326928cf3a807242ba762322636723";
       };
     };
-    "bplist-parser-0.0.6" = {
-      name = "bplist-parser";
-      packageName = "bplist-parser";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
-        sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
-      };
-    };
-    "bplist-creator-0.0.4" = {
+    "bplist-creator-0.0.7" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
-      version = "0.0.4";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz";
-        sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991";
+        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz";
+        sha1 = "37df1536092824b87c42f957b01344117372ae45";
       };
     };
-    "stream-buffers-0.2.6" = {
+    "stream-buffers-2.2.0" = {
       name = "stream-buffers";
       packageName = "stream-buffers";
-      version = "0.2.6";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz";
-        sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc";
+        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz";
+        sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
       };
     };
     "async-1.5.2" = {
@@ -7663,13 +7681,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "form-data-2.1.2" = {
+    "form-data-2.1.4" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
-        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
       };
     };
     "har-validator-4.2.1" = {
@@ -7708,13 +7726,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-4.11.5" = {
+    "ajv-4.11.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.5";
+      version = "4.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
-        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz";
+        sha1 = "947e93049790942b2a2d60a8289b28924d39f987";
       };
     };
     "har-schema-1.0.5" = {
@@ -7843,13 +7861,13 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.2.0" = {
+    "rc-1.2.1" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz";
-        sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz";
+        sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -8276,13 +8294,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.1" = {
+    "nan-2.6.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.1";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
-        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
+        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
       };
     };
     "jsonparse-0.0.6" = {
@@ -9242,13 +9260,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "espree-3.4.0" = {
+    "espree-3.4.1" = {
       name = "espree";
       packageName = "espree";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz";
-        sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
+        url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz";
+        sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2";
       };
     };
     "esquery-1.0.0" = {
@@ -9296,13 +9314,13 @@ let
         sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
       };
     };
-    "ignore-3.2.6" = {
+    "ignore-3.2.7" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz";
-        sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz";
+        sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd";
       };
     };
     "inquirer-0.12.0" = {
@@ -9323,13 +9341,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.2" = {
+    "js-yaml-3.8.3" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
-        sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
+        sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
       };
     };
     "levn-0.3.0" = {
@@ -9494,13 +9512,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.4" = {
+    "acorn-5.0.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.4";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
-        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz";
+        sha1 = "c460df08491463f028ccb82eab3730bf01087b3d";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -10097,13 +10115,13 @@ let
         sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
       };
     };
-    "arr-flatten-1.0.1" = {
+    "arr-flatten-1.0.2" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz";
-        sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b";
+        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz";
+        sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996";
       };
     };
     "expand-range-1.8.2" = {
@@ -10448,13 +10466,13 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
-    "simple-git-1.69.0" = {
+    "simple-git-1.70.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.69.0";
+      version = "1.70.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz";
-        sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz";
+        sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -10494,13 +10512,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.4" = {
+    "coffee-script-1.12.5" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.4";
+      version = "1.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
-        sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
+        sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
       };
     };
     "jade-1.11.0" = {
@@ -10584,13 +10602,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.20" = {
+    "uglify-js-2.8.22" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.20";
+      version = "2.8.22";
       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-2.8.22.tgz";
+        sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
       };
     };
     "void-elements-2.0.1" = {
@@ -13221,6 +13239,15 @@ let
         sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
       };
     };
+    "npm-package-arg-4.2.1" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
+        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
+      };
+    };
     "retry-0.8.0" = {
       name = "retry";
       packageName = "retry";
@@ -13824,13 +13851,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.21" = {
+    "node-red-node-email-0.1.22" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.21";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz";
-        sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz";
+        sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e";
       };
     };
     "node-red-node-twitter-0.1.10" = {
@@ -13842,13 +13869,13 @@ let
         sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
       };
     };
-    "node-red-node-rbe-0.1.6" = {
+    "node-red-node-rbe-0.1.8" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
-        sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz";
+        sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc";
       };
     };
     "bcrypt-1.0.2" = {
@@ -14031,13 +14058,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.11" = {
+    "moment-timezone-0.5.13" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.11";
+      version = "0.5.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
-        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz";
+        sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
     "content-disposition-0.5.1" = {
@@ -14139,22 +14166,22 @@ let
         sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
       };
     };
-    "help-me-1.0.1" = {
+    "help-me-1.1.0" = {
       name = "help-me";
       packageName = "help-me";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz";
-        sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
+        url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz";
+        sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "mqtt-packet-5.2.2" = {
+    "mqtt-packet-5.3.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.2";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz";
-        sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz";
+        sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206";
       };
     };
     "reinterval-1.1.0" = {
@@ -14193,6 +14220,42 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
+    "glob-stream-6.1.0" = {
+      name = "glob-stream";
+      packageName = "glob-stream";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz";
+        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
+      };
+    };
+    "is-negated-glob-1.0.0" = {
+      name = "is-negated-glob";
+      packageName = "is-negated-glob";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
+        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
+      };
+    };
+    "ordered-read-streams-1.0.0" = {
+      name = "ordered-read-streams";
+      packageName = "ordered-read-streams";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz";
+        sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a";
+      };
+    };
+    "to-absolute-glob-2.0.1" = {
+      name = "to-absolute-glob";
+      packageName = "to-absolute-glob";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz";
+        sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
+      };
+    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -14940,13 +15003,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-4.0.1" = {
+    "mailcomposer-4.0.2" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
-        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz";
+        sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -15075,15 +15138,6 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
-    "hosted-git-info-2.2.0" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
-      };
-    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -15156,15 +15210,6 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "node-gyp-3.5.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -15174,13 +15219,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.6" = {
+    "npm-registry-client-8.1.1" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.6";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz";
-        sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
+        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
       };
     };
     "opener-1.4.3" = {
@@ -15525,13 +15570,13 @@ let
         sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998";
       };
     };
-    "registry-auth-token-3.1.0" = {
+    "registry-auth-token-3.1.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "3.1.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
-        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz";
+        sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf";
       };
     };
     "argparse-0.1.15" = {
@@ -15786,13 +15831,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.26.1" = {
+    "snyk-1.28.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.26.1";
+      version = "1.28.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz";
-        sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz";
+        sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151";
       };
     };
     "spawn-please-0.2.0" = {
@@ -15903,22 +15948,22 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-module-1.7.0" = {
+    "snyk-module-1.8.1" = {
       name = "snyk-module";
       packageName = "snyk-module";
-      version = "1.7.0";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz";
-        sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a";
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
+        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
-    "snyk-policy-1.7.0" = {
+    "snyk-policy-1.7.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz";
-        sha1 = "2151c751ab1edc040fc6b94a872aa989db492324";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz";
+        sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -16318,15 +16363,6 @@ let
         sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
-    "gelf-stream-0.2.4" = {
-      name = "gelf-stream";
-      packageName = "gelf-stream";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
-        sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
-      };
-    };
     "mediawiki-title-0.5.6" = {
       name = "mediawiki-title";
       packageName = "mediawiki-title";
@@ -16383,6 +16419,15 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
+    "yargs-5.0.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+      };
+    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -16437,22 +16482,13 @@ let
         sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
       };
     };
-    "gelfling-0.2.0" = {
-      name = "gelfling";
-      packageName = "gelfling";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
-        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
-      };
-    };
-    "bunyan-1.8.9" = {
+    "bunyan-1.8.10" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.9";
+      version = "1.8.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz";
-        sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz";
+        sha1 = "201fedd26c7080b632f416072f53a90b9a52981c";
       };
     };
     "bunyan-syslog-udp-0.1.0" = {
@@ -16672,6 +16708,15 @@ let
         sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
       };
     };
+    "yargs-parser-3.2.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+      };
+    };
     "airplayer-2.0.0" = {
       name = "airplayer";
       packageName = "airplayer";
@@ -16762,15 +16807,6 @@ let
         sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728";
       };
     };
-    "stream-buffers-2.2.0" = {
-      name = "stream-buffers";
-      packageName = "stream-buffers";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz";
-        sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
-      };
-    };
     "consume-http-header-1.0.0" = {
       name = "consume-http-header";
       packageName = "consume-http-header";
@@ -17554,6 +17590,96 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
+    "ast-types-0.9.8" = {
+      name = "ast-types";
+      packageName = "ast-types";
+      version = "0.9.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz";
+        sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078";
+      };
+    };
+    "babylon-7.0.0-beta.8" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "7.0.0-beta.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz";
+        sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949";
+      };
+    };
+    "flow-parser-0.43.0" = {
+      name = "flow-parser";
+      packageName = "flow-parser";
+      version = "0.43.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz";
+        sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7";
+      };
+    };
+    "jest-validate-19.0.0" = {
+      name = "jest-validate";
+      packageName = "jest-validate";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz";
+        sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173";
+      };
+    };
+    "jest-matcher-utils-19.0.0" = {
+      name = "jest-matcher-utils";
+      packageName = "jest-matcher-utils";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz";
+        sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d";
+      };
+    };
+    "leven-2.1.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    };
+    "pretty-format-19.0.0" = {
+      name = "pretty-format";
+      packageName = "pretty-format";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz";
+        sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84";
+      };
+    };
+    "ansi-styles-3.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz";
+        sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1";
+      };
+    };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+      };
+    };
     "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
@@ -18698,22 +18824,13 @@ let
         sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
       };
     };
-    "express-4.14.1" = {
-      name = "express";
-      packageName = "express";
-      version = "4.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
-        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
-      };
-    };
-    "express-session-1.14.2" = {
+    "express-session-1.15.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.2";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
-        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
+        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -18770,13 +18887,13 @@ let
         sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
       };
     };
-    "npm-4.1.2" = {
+    "npm-4.5.0" = {
       name = "npm";
       packageName = "npm";
-      version = "4.1.2";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+        url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
+        sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
       };
     };
     "octicons-3.5.0" = {
@@ -18797,13 +18914,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.5" = {
+    "raven-1.2.1" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.5";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz";
-        sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf";
+        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
+        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
       };
     };
     "signals-1.0.0" = {
@@ -18815,13 +18932,13 @@ let
         sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
       };
     };
-    "snapsvg-0.4.0" = {
+    "snapsvg-0.5.1" = {
       name = "snapsvg";
       packageName = "snapsvg";
-      version = "0.4.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz";
-        sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
+        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz";
+        sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
     "winston-2.3.1" = {
@@ -18833,13 +18950,13 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
+    "yargs-7.1.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+        url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz";
+        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
       };
     };
     "color-string-1.5.2" = {
@@ -18851,15 +18968,6 @@ let
         sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
-      };
-    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -18896,13 +19004,13 @@ let
         sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
       };
     };
-    "crc-3.4.1" = {
+    "crc-3.4.4" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.1";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
-        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
       };
     };
     "broadway-0.2.10" = {
@@ -19031,15 +19139,6 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "mississippi-1.2.0" = {
-      name = "mississippi";
-      packageName = "mississippi";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
-      };
-    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -19058,13 +19157,22 @@ let
         sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
-    "eve-0.4.2" = {
+    "eve-0.5.3" = {
       name = "eve";
       packageName = "eve";
-      version = "0.4.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz";
-        sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
+        url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz";
+        sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42";
+      };
+    };
+    "yargs-parser-5.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz";
+        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
       };
     };
     "kew-0.1.7" = {
@@ -19130,6 +19238,15 @@ let
         sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
       };
     };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
     "loader-runner-2.3.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
@@ -19202,15 +19319,6 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
-      };
-    };
     "os-browserify-0.2.1" = {
       name = "os-browserify";
       packageName = "os-browserify";
@@ -19310,15 +19418,6 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "leven-2.1.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
-      };
-    };
     "node-emoji-1.5.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
@@ -19364,6 +19463,15 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
+    "v8-compile-cache-1.1.0" = {
+      name = "v8-compile-cache";
+      packageName = "v8-compile-cache";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz";
+        sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
+      };
+    };
     "regenerator-runtime-0.10.3" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -19865,10 +19973,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.8";
+    version = "1.9.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz";
-      sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz";
+      sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -20007,10 +20115,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.11";
+    version = "0.10.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz";
-      sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz";
+      sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -20059,7 +20167,7 @@ in
       sources."azure-arm-servermanagement-0.1.2"
       sources."azure-arm-network-0.18.0"
       sources."azure-arm-powerbiembedded-0.1.0"
-      sources."azure-arm-trafficmanager-0.10.5"
+      sources."azure-arm-trafficmanager-0.12.0"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
       sources."azure-arm-rediscache-0.2.3"
@@ -20067,7 +20175,7 @@ in
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
       sources."azure-keyvault-0.11.0"
-      sources."azure-asm-compute-0.17.0"
+      sources."azure-asm-compute-0.18.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-trafficmanager-0.10.3"
       sources."azure-asm-mgmt-0.10.1"
@@ -20088,7 +20196,7 @@ in
           sources."moment-2.14.1"
         ];
       })
-      (sources."azure-storage-2.0.0" // {
+      (sources."azure-storage-2.1.0" // {
         dependencies = [
           sources."browserify-mime-1.2.9"
           sources."extend-1.2.1"
@@ -20231,7 +20339,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -20299,7 +20407,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.2.0" // {
+              (sources."async-2.3.0" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -20368,7 +20476,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -20427,13 +20535,13 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -20549,13 +20657,13 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -20574,14 +20682,14 @@ in
                       sources."prepend-http-1.0.4"
                       (sources."read-all-stream-2.2.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
                               sources."isarray-1.0.0"
                               sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -20615,7 +20723,7 @@ in
                   sources."minimist-1.2.0"
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -20752,7 +20860,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -20804,7 +20912,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -20832,10 +20940,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.1.0";
+    version = "14.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz";
-      sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz";
+      sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -20868,7 +20976,7 @@ in
           sources."pako-0.2.9"
         ];
       })
-      (sources."buffer-5.0.5" // {
+      (sources."buffer-5.0.6" // {
         dependencies = [
           sources."base64-js-1.2.0"
           sources."ieee754-1.1.8"
@@ -20925,7 +21033,7 @@ in
                 dependencies = [
                   sources."brorand-1.1.0"
                   sources."hash.js-1.0.3"
-                  sources."hmac-drbg-1.0.0"
+                  sources."hmac-drbg-1.0.1"
                   sources."minimalistic-assert-1.0.0"
                   sources."minimalistic-crypto-utils-1.0.1"
                 ];
@@ -20955,7 +21063,7 @@ in
                 dependencies = [
                   sources."brorand-1.1.0"
                   sources."hash.js-1.0.3"
-                  sources."hmac-drbg-1.0.0"
+                  sources."hmac-drbg-1.0.1"
                   sources."minimalistic-assert-1.0.0"
                   sources."minimalistic-crypto-utils-1.0.1"
                 ];
@@ -21021,7 +21129,7 @@ in
           })
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -21043,7 +21151,7 @@ in
         ];
       })
       sources."htmlescape-1.1.1"
-      sources."https-browserify-0.0.1"
+      sources."https-browserify-1.0.0"
       sources."inherits-2.0.3"
       (sources."insert-module-globals-7.0.1" // {
         dependencies = [
@@ -21094,12 +21202,13 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.6" // {
+      (sources."readable-stream-2.2.9" // {
         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."string_decoder-1.0.0"
           sources."util-deprecate-1.0.2"
         ];
       })
@@ -21127,7 +21236,7 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.6.3" // {
+      (sources."stream-http-2.7.0" // {
         dependencies = [
           sources."builtin-status-codes-3.0.0"
           sources."to-arraybuffer-1.0.1"
@@ -21291,7 +21400,7 @@ in
               sources."map-obj-1.0.1"
               (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
-                  sources."hosted-git-info-2.4.1"
+                  sources."hosted-git-info-2.4.2"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -21449,17 +21558,17 @@ in
               sources."minimist-0.0.10"
             ];
           })
-          (sources."parse-torrent-5.8.2" // {
+          (sources."parse-torrent-5.8.3" // {
             dependencies = [
               sources."blob-to-buffer-1.2.6"
               sources."get-stdin-5.0.1"
-              (sources."magnet-uri-5.1.5" // {
+              (sources."magnet-uri-5.1.6" // {
                 dependencies = [
                   sources."thirty-two-1.0.2"
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."parse-torrent-file-4.0.1" // {
+              (sources."parse-torrent-file-4.0.2" // {
                 dependencies = [
                   sources."bencode-0.11.0"
                   (sources."simple-sha1-2.1.0" // {
@@ -21470,7 +21579,7 @@ in
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."simple-get-2.4.0" // {
+              (sources."simple-get-2.5.1" // {
                 dependencies = [
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -21518,15 +21627,16 @@ in
                   })
                 ];
               })
-              (sources."fs-chunk-store-1.6.4" // {
+              (sources."fs-chunk-store-1.6.5" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.5.0" // {
+                  (sources."random-access-file-1.6.1" // {
                     dependencies = [
+                      sources."buffer-alloc-unsafe-1.0.0"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -21605,7 +21715,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -21669,7 +21779,7 @@ in
                       })
                       sources."random-iterate-1.0.1"
                       sources."run-series-1.1.4"
-                      (sources."simple-get-2.4.0" // {
+                      (sources."simple-get-2.5.1" // {
                         dependencies = [
                           sources."simple-concat-1.0.0"
                           sources."unzip-response-2.0.1"
@@ -21679,13 +21789,13 @@ in
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -21694,18 +21804,19 @@ in
                       (sources."simple-websocket-4.3.1" // {
                         dependencies = [
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
-                          (sources."ws-2.2.2" // {
+                          (sources."ws-2.2.3" // {
                             dependencies = [
+                              sources."safe-buffer-5.0.1"
                               sources."ultron-1.1.0"
                             ];
                           })
@@ -21731,7 +21842,7 @@ in
                   sources."run-parallel-1.1.6"
                 ];
               })
-              sources."torrent-piece-1.1.0"
+              sources."torrent-piece-1.1.1"
             ];
           })
           sources."windows-no-runnable-0.0.6"
@@ -21832,13 +21943,13 @@ in
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -21884,10 +21995,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.4";
+    version = "1.12.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
-      sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
+      sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -21911,7 +22022,7 @@ in
           sources."ansi-0.3.1"
           (sources."bplist-parser-0.1.1" // {
             dependencies = [
-              sources."big-integer-1.6.17"
+              sources."big-integer-1.6.19"
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
@@ -21938,7 +22049,7 @@ in
           })
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -22017,7 +22128,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -22139,7 +22250,7 @@ in
                             dependencies = [
                               sources."brorand-1.1.0"
                               sources."hash.js-1.0.3"
-                              sources."hmac-drbg-1.0.0"
+                              sources."hmac-drbg-1.0.1"
                               sources."minimalistic-assert-1.0.0"
                               sources."minimalistic-crypto-utils-1.0.1"
                             ];
@@ -22169,7 +22280,7 @@ in
                             dependencies = [
                               sources."brorand-1.1.0"
                               sources."hash.js-1.0.3"
-                              sources."hmac-drbg-1.0.0"
+                              sources."hmac-drbg-1.0.1"
                               sources."minimalistic-assert-1.0.0"
                               sources."minimalistic-crypto-utils-1.0.1"
                             ];
@@ -22235,7 +22346,7 @@ in
                       })
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -22308,12 +22419,13 @@ in
                   sources."punycode-1.4.1"
                   sources."querystring-es3-0.2.1"
                   sources."read-only-stream-2.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -22341,7 +22453,7 @@ in
                     ];
                   })
                   sources."stream-browserify-2.0.1"
-                  (sources."stream-http-2.6.3" // {
+                  (sources."stream-http-2.7.0" // {
                     dependencies = [
                       sources."builtin-status-codes-3.0.0"
                       sources."to-arraybuffer-1.0.1"
@@ -22498,7 +22610,7 @@ in
                   sources."serve-static-1.12.1"
                   sources."setprototypeof-1.0.3"
                   sources."statuses-1.3.1"
-                  (sources."type-is-1.6.14" // {
+                  (sources."type-is-1.6.15" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
                       (sources."mime-types-2.1.15" // {
@@ -22535,7 +22647,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -22551,7 +22663,7 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          (sources."init-package-json-1.9.5" // {
+          (sources."init-package-json-1.9.6" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -22564,7 +22676,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -22580,9 +22692,15 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."npm-package-arg-4.2.1" // {
+              (sources."npm-package-arg-5.0.1" // {
                 dependencies = [
-                  sources."hosted-git-info-2.4.1"
+                  sources."hosted-git-info-2.4.2"
+                  (sources."osenv-0.1.4" // {
+                    dependencies = [
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
                   sources."semver-5.3.0"
                 ];
               })
@@ -22601,7 +22719,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -22705,7 +22823,7 @@ in
               })
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -22741,13 +22859,13 @@ in
                   (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -22846,7 +22964,7 @@ in
                   sources."forever-agent-0.6.1"
                   (sources."form-data-1.0.1" // {
                     dependencies = [
-                      (sources."async-2.2.0" // {
+                      (sources."async-2.3.0" // {
                         dependencies = [
                           sources."lodash-4.17.4"
                         ];
@@ -22906,7 +23024,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.11.0" // {
+                      (sources."sshpk-1.13.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -23071,7 +23189,7 @@ in
                           })
                           (sources."minimatch-3.0.3" // {
                             dependencies = [
-                              (sources."brace-expansion-1.1.6" // {
+                              (sources."brace-expansion-1.1.7" // {
                                 dependencies = [
                                   sources."balanced-match-0.4.2"
                                   sources."concat-map-0.0.1"
@@ -23096,20 +23214,31 @@ in
           })
           sources."unorm-1.3.3"
           sources."valid-identifier-0.0.1"
-          (sources."xcode-0.9.1" // {
+          (sources."xcode-0.9.3" // {
             dependencies = [
-              sources."node-uuid-1.4.7"
-              sources."pegjs-0.9.0"
-              (sources."simple-plist-0.1.4" // {
+              sources."pegjs-0.10.0"
+              (sources."simple-plist-0.2.1" // {
                 dependencies = [
-                  sources."bplist-parser-0.0.6"
-                  (sources."bplist-creator-0.0.4" // {
+                  (sources."bplist-creator-0.0.7" // {
                     dependencies = [
-                      sources."stream-buffers-0.2.6"
+                      sources."stream-buffers-2.2.0"
+                    ];
+                  })
+                  (sources."bplist-parser-0.1.1" // {
+                    dependencies = [
+                      sources."big-integer-1.6.19"
+                    ];
+                  })
+                  (sources."plist-2.0.1" // {
+                    dependencies = [
+                      sources."base64-js-1.1.2"
+                      sources."xmlbuilder-8.2.2"
+                      sources."xmldom-0.1.27"
                     ];
                   })
                 ];
               })
+              sources."uuid-3.0.1"
             ];
           })
         ];
@@ -23240,14 +23369,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -23279,7 +23408,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -23392,13 +23521,13 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -23423,14 +23552,14 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
                               sources."isarray-1.0.0"
                               sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -23441,7 +23570,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -23601,7 +23730,7 @@ in
       (sources."hiredis-0.4.1" // {
         dependencies = [
           sources."bindings-1.2.1"
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
         ];
       })
       (sources."json-rpc2-0.8.1" // {
@@ -23815,13 +23944,13 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -23950,14 +24079,14 @@ in
           sources."split2-2.1.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -23987,13 +24116,13 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -24036,14 +24165,14 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -24087,7 +24216,7 @@ in
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.2.0" // {
+      (sources."async-2.3.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -24112,14 +24241,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -24151,7 +24280,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -24331,7 +24460,7 @@ in
           sources."minimist-1.2.0"
           (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -24442,10 +24571,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.18.0";
+    version = "3.19.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz";
-      sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
+      sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
@@ -24474,13 +24603,13 @@ in
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             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."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -24524,9 +24653,9 @@ in
           })
         ];
       })
-      (sources."espree-3.4.0" // {
+      (sources."espree-3.4.1" // {
         dependencies = [
-          sources."acorn-4.0.4"
+          sources."acorn-5.0.3"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -24587,7 +24716,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -24604,7 +24733,7 @@ in
         ];
       })
       sources."globals-9.17.0"
-      sources."ignore-3.2.6"
+      sources."ignore-3.2.7"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
         dependencies = [
@@ -24679,7 +24808,7 @@ in
           sources."tryit-1.0.3"
         ];
       })
-      (sources."js-yaml-3.8.2" // {
+      (sources."js-yaml-3.8.3" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -24747,7 +24876,7 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.11.5" // {
+          (sources."ajv-4.11.6" // {
             dependencies = [
               sources."co-4.6.0"
             ];
@@ -24915,7 +25044,7 @@ in
                     dependencies = [
                       (sources."arr-diff-2.0.0" // {
                         dependencies = [
-                          sources."arr-flatten-1.0.1"
+                          sources."arr-flatten-1.0.2"
                         ];
                       })
                       sources."array-unique-0.2.1"
@@ -25001,13 +25130,13 @@ in
               (sources."readdirp-2.1.0" // {
                 dependencies = [
                   sources."graceful-fs-4.1.11"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -25016,7 +25145,7 @@ in
               })
               (sources."fsevents-1.1.1" // {
                 dependencies = [
-                  sources."nan-2.5.1"
+                  sources."nan-2.6.2"
                   (sources."node-pre-gyp-0.6.34" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
@@ -25040,13 +25169,13 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.6" // {
+                              (sources."readable-stream-2.2.9" // {
                                 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."string_decoder-0.10.31"
+                                  sources."string_decoder-1.0.0"
                                   sources."util-deprecate-1.0.2"
                                 ];
                               })
@@ -25080,7 +25209,7 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -25100,14 +25229,14 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.1.2" // {
+                          (sources."form-data-2.1.4" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
                           })
                           (sources."har-validator-4.2.1" // {
                             dependencies = [
-                              (sources."ajv-4.11.5" // {
+                              (sources."ajv-4.11.6" // {
                                 dependencies = [
                                   sources."co-4.6.0"
                                   (sources."json-stable-stringify-1.0.1" // {
@@ -25139,7 +25268,7 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.11.0" // {
+                              (sources."sshpk-1.13.0" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
@@ -25224,13 +25353,13 @@ in
                               sources."wrappy-1.0.2"
                             ];
                           })
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -25245,7 +25374,7 @@ in
           })
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -25344,7 +25473,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -25391,7 +25520,7 @@ in
       sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
-      (sources."async-2.2.0" // {
+      (sources."async-2.3.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -25402,7 +25531,7 @@ in
           sources."microee-0.0.2"
         ];
       })
-      sources."simple-git-1.69.0"
+      sources."simple-git-1.70.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -25434,7 +25563,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -25478,7 +25607,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.4"
+      sources."coffee-script-1.12.5"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
@@ -25546,7 +25675,7 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.8.20" // {
+          (sources."uglify-js-2.8.22" // {
             dependencies = [
               sources."source-map-0.5.6"
               (sources."yargs-3.10.0" // {
@@ -25627,7 +25756,7 @@ in
       })
       (sources."msgpack-1.0.2" // {
         dependencies = [
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
         ];
       })
     ];
@@ -25736,14 +25865,14 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -25778,7 +25907,7 @@ in
                 dependencies = [
                   (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."arr-flatten-1.0.1"
+                      sources."arr-flatten-1.0.2"
                     ];
                   })
                   sources."array-unique-0.2.1"
@@ -25983,7 +26112,7 @@ in
               })
               (sources."minimatch-2.0.10" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -26124,7 +26253,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -26190,7 +26319,7 @@ in
           })
           (sources."minimatch-2.0.10" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -26283,7 +26412,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -26307,7 +26436,7 @@ in
               sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.8.20" // {
+          (sources."uglify-js-2.8.22" // {
             dependencies = [
               sources."source-map-0.5.6"
               (sources."yargs-3.10.0" // {
@@ -26358,7 +26487,7 @@ in
           })
         ];
       })
-      (sources."js-yaml-3.8.2" // {
+      (sources."js-yaml-3.8.3" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -26482,7 +26611,7 @@ in
       })
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -26535,10 +26664,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.2";
+    version = "3.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
-      sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
+      sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
     };
     dependencies = [
       (sources."argparse-1.0.9" // {
@@ -26559,10 +26688,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.5.0";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz";
-      sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
+      url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz";
+      sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -26595,7 +26724,7 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -26616,7 +26745,7 @@ in
                 dependencies = [
                   (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."arr-flatten-1.0.1"
+                      sources."arr-flatten-1.0.2"
                     ];
                   })
                   sources."array-unique-0.2.1"
@@ -26702,13 +26831,13 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -26717,7 +26846,7 @@ in
           })
           (sources."fsevents-1.1.1" // {
             dependencies = [
-              sources."nan-2.5.1"
+              sources."nan-2.6.2"
               (sources."node-pre-gyp-0.6.34" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
@@ -26741,13 +26870,13 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -26781,7 +26910,7 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.2.0" // {
+                  (sources."rc-1.2.1" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
@@ -26801,14 +26930,14 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.1.2" // {
+                      (sources."form-data-2.1.4" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
                       })
                       (sources."har-validator-4.2.1" // {
                         dependencies = [
-                          (sources."ajv-4.11.5" // {
+                          (sources."ajv-4.11.6" // {
                             dependencies = [
                               sources."co-4.6.0"
                               (sources."json-stable-stringify-1.0.1" // {
@@ -26840,7 +26969,7 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.11.0" // {
+                          (sources."sshpk-1.13.0" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
@@ -26897,13 +27026,13 @@ in
                           sources."wrappy-1.0.2"
                         ];
                       })
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -27014,7 +27143,7 @@ in
       sources."mime-1.3.4"
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -27366,7 +27495,7 @@ in
                   })
                 ];
               })
-              (sources."type-is-1.6.14" // {
+              (sources."type-is-1.6.15" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
                   (sources."mime-types-2.1.15" // {
@@ -27493,14 +27622,14 @@ in
     dependencies = [
       (sources."through2-2.0.3" // {
         dependencies = [
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -27544,7 +27673,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -27574,7 +27703,7 @@ in
                 dependencies = [
                   (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."arr-flatten-1.0.1"
+                      sources."arr-flatten-1.0.2"
                     ];
                   })
                   sources."array-unique-0.2.1"
@@ -27701,14 +27830,14 @@ in
             ];
           })
           sources."object-assign-4.1.1"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -27819,7 +27948,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -27912,13 +28041,13 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -27932,7 +28061,7 @@ in
           })
           (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -27952,7 +28081,7 @@ in
           })
           (sources."npm-package-arg-4.2.1" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
             ];
           })
           (sources."once-1.4.0" // {
@@ -27972,14 +28101,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -28011,7 +28140,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -28062,7 +28191,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -28081,14 +28210,14 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -28182,7 +28311,7 @@ in
                       })
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -28278,7 +28407,7 @@ in
       sources."graceful-fs-4.1.11"
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -28301,14 +28430,14 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -28360,14 +28489,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -28399,7 +28528,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -28461,10 +28590,10 @@ in
   node-inspector = nodeEnv.buildNodePackage {
     name = "node-inspector";
     packageName = "node-inspector";
-    version = "1.0.0";
+    version = "1.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz";
-      sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz";
+      sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -28515,7 +28644,7 @@ in
                 dependencies = [
                   (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."big-integer-1.6.17"
+                      sources."big-integer-1.6.19"
                     ];
                   })
                   (sources."meow-3.7.0" // {
@@ -28539,7 +28668,7 @@ in
                       sources."map-obj-1.0.1"
                       (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.4.1"
+                          sources."hosted-git-info-2.4.2"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -28722,7 +28851,7 @@ in
           sources."serve-static-1.12.1"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -28746,7 +28875,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -28762,7 +28891,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -28786,7 +28915,7 @@ in
       })
       (sources."v8-debug-1.0.1" // {
         dependencies = [
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
           (sources."node-pre-gyp-0.6.34" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -28810,14 +28939,14 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -28863,14 +28992,14 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.2" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
                   (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-4.11.5" // {
+                      (sources."ajv-4.11.6" // {
                         dependencies = [
                           sources."co-4.6.0"
                           (sources."json-stable-stringify-1.0.1" // {
@@ -28902,7 +29031,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.11.0" // {
+                      (sources."sshpk-1.13.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -28952,7 +29081,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -28994,7 +29123,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -29009,14 +29138,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -29029,7 +29158,7 @@ in
       })
       (sources."v8-profiler-5.7.0" // {
         dependencies = [
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
           (sources."node-pre-gyp-0.6.34" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -29053,14 +29182,14 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -29106,14 +29235,14 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.2" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
                   (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-4.11.5" // {
+                      (sources."ajv-4.11.6" // {
                         dependencies = [
                           sources."co-4.6.0"
                           (sources."json-stable-stringify-1.0.1" // {
@@ -29145,7 +29274,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.11.0" // {
+                      (sources."sshpk-1.13.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -29195,7 +29324,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -29237,7 +29366,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -29252,14 +29381,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -29361,14 +29490,14 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -29402,7 +29531,7 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -29422,14 +29551,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -29461,7 +29590,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -29511,7 +29640,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -29559,7 +29688,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -29574,14 +29703,14 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -29615,7 +29744,7 @@ in
                 dependencies = [
                   (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."arr-flatten-1.0.1"
+                      sources."arr-flatten-1.0.2"
                     ];
                   })
                   sources."array-unique-0.2.1"
@@ -29702,13 +29831,13 @@ in
           (sources."readdirp-2.1.0" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -29717,7 +29846,7 @@ in
           })
           (sources."fsevents-1.1.1" // {
             dependencies = [
-              sources."nan-2.5.1"
+              sources."nan-2.6.2"
               (sources."node-pre-gyp-0.6.34" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
@@ -29741,13 +29870,13 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -29781,7 +29910,7 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.2.0" // {
+                  (sources."rc-1.2.1" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
@@ -29801,14 +29930,14 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.1.2" // {
+                      (sources."form-data-2.1.4" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
                       })
                       (sources."har-validator-4.2.1" // {
                         dependencies = [
-                          (sources."ajv-4.11.5" // {
+                          (sources."ajv-4.11.6" // {
                             dependencies = [
                               sources."co-4.6.0"
                               (sources."json-stable-stringify-1.0.1" // {
@@ -29840,7 +29969,7 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.11.0" // {
+                          (sources."sshpk-1.13.0" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
@@ -29920,13 +30049,13 @@ in
                           sources."wrappy-1.0.2"
                         ];
                       })
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -29975,7 +30104,7 @@ in
       })
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -30075,13 +30204,13 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -30106,14 +30235,14 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
                               sources."isarray-1.0.0"
                               sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -30124,7 +30253,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -30212,7 +30341,7 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               (sources."mime-types-2.1.15" // {
                 dependencies = [
@@ -30249,13 +30378,13 @@ in
               sources."domhandler-2.3.0"
               sources."domutils-1.5.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -30289,7 +30418,7 @@ in
       })
       (sources."cron-1.2.1" // {
         dependencies = [
-          (sources."moment-timezone-0.5.11" // {
+          (sources."moment-timezone-0.5.13" // {
             dependencies = [
               sources."moment-2.18.1"
             ];
@@ -30378,7 +30507,7 @@ in
               })
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               (sources."mime-types-2.1.15" // {
                 dependencies = [
@@ -30460,14 +30589,15 @@ in
               })
             ];
           })
-          (sources."help-me-1.0.1" // {
+          (sources."help-me-1.1.0" // {
             dependencies = [
               sources."callback-stream-1.1.0"
-              (sources."glob-stream-5.3.5" // {
+              (sources."glob-stream-6.1.0" // {
                 dependencies = [
                   sources."extend-3.0.0"
-                  (sources."glob-5.0.15" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
+                      sources."fs.realpath-1.0.0"
                       (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
@@ -30475,7 +30605,7 @@ in
                       })
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -30501,106 +30631,52 @@ in
                       sources."path-dirname-1.0.2"
                     ];
                   })
-                  (sources."micromatch-2.3.11" // {
-                    dependencies = [
-                      (sources."arr-diff-2.0.0" // {
-                        dependencies = [
-                          sources."arr-flatten-1.0.1"
-                        ];
-                      })
-                      sources."array-unique-0.2.1"
-                      (sources."braces-1.8.5" // {
-                        dependencies = [
-                          (sources."expand-range-1.8.2" // {
-                            dependencies = [
-                              (sources."fill-range-2.2.3" // {
-                                dependencies = [
-                                  sources."is-number-2.1.0"
-                                  (sources."isobject-2.1.0" // {
-                                    dependencies = [
-                                      sources."isarray-1.0.0"
-                                    ];
-                                  })
-                                  sources."randomatic-1.1.6"
-                                  sources."repeat-string-1.6.1"
-                                ];
-                              })
-                            ];
-                          })
-                          sources."preserve-0.2.0"
-                          sources."repeat-element-1.1.2"
-                        ];
-                      })
-                      (sources."expand-brackets-0.1.5" // {
-                        dependencies = [
-                          sources."is-posix-bracket-0.1.1"
-                        ];
-                      })
-                      sources."extglob-0.3.2"
-                      sources."filename-regex-2.0.0"
-                      sources."is-extglob-1.0.0"
-                      sources."is-glob-2.0.1"
-                      (sources."kind-of-3.1.0" // {
-                        dependencies = [
-                          sources."is-buffer-1.1.5"
-                        ];
-                      })
-                      (sources."normalize-path-2.1.1" // {
-                        dependencies = [
-                          sources."remove-trailing-separator-1.0.1"
-                        ];
-                      })
-                      (sources."object.omit-2.0.1" // {
-                        dependencies = [
-                          (sources."for-own-0.1.5" // {
-                            dependencies = [
-                              sources."for-in-1.0.2"
-                            ];
-                          })
-                          sources."is-extendable-0.1.1"
-                        ];
-                      })
-                      (sources."parse-glob-3.0.4" // {
-                        dependencies = [
-                          (sources."glob-base-0.3.0" // {
-                            dependencies = [
-                              sources."glob-parent-2.0.0"
-                            ];
-                          })
-                          sources."is-dotfile-1.0.2"
-                        ];
-                      })
-                      (sources."regex-cache-0.4.3" // {
-                        dependencies = [
-                          sources."is-equal-shallow-0.1.3"
-                          sources."is-primitive-2.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."ordered-read-streams-0.3.0" // {
+                  sources."is-negated-glob-1.0.0"
+                  (sources."ordered-read-streams-1.0.0" // {
                     dependencies = [
                       sources."is-stream-1.1.0"
                     ];
                   })
-                  (sources."through2-0.6.5" // {
+                  (sources."pumpify-1.3.5" // {
                     dependencies = [
-                      (sources."readable-stream-1.0.34" // {
+                      (sources."duplexify-3.5.0" // {
                         dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."isarray-0.0.1"
-                          sources."string_decoder-0.10.31"
+                          (sources."end-of-stream-1.0.0" // {
+                            dependencies = [
+                              (sources."once-1.3.3" // {
+                                dependencies = [
+                                  sources."wrappy-1.0.2"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."stream-shift-1.0.0"
                         ];
                       })
                     ];
                   })
-                  (sources."to-absolute-glob-0.1.1" // {
+                  sources."remove-trailing-separator-1.0.1"
+                  (sources."to-absolute-glob-2.0.1" // {
                     dependencies = [
                       (sources."extend-shallow-2.0.1" // {
                         dependencies = [
                           sources."is-extendable-0.1.1"
                         ];
                       })
+                      (sources."is-absolute-0.2.6" // {
+                        dependencies = [
+                          (sources."is-relative-0.2.1" // {
+                            dependencies = [
+                              (sources."is-unc-path-0.1.2" // {
+                                dependencies = [
+                                  sources."unc-path-regex-0.1.2"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."is-windows-0.2.0"
+                        ];
+                      })
                     ];
                   })
                   (sources."unique-stream-2.2.1" // {
@@ -30610,11 +30686,7 @@ in
                           sources."jsonify-0.0.0"
                         ];
                       })
-                      (sources."through2-filter-2.0.0" // {
-                        dependencies = [
-                          sources."through2-2.0.3"
-                        ];
-                      })
+                      sources."through2-filter-2.0.0"
                     ];
                   })
                 ];
@@ -30624,19 +30696,20 @@ in
           })
           sources."inherits-2.0.3"
           sources."minimist-1.2.0"
-          (sources."mqtt-packet-5.2.2" // {
+          (sources."mqtt-packet-5.3.0" // {
             dependencies = [
               sources."bl-1.2.0"
               sources."process-nextick-args-1.0.7"
+              sources."safe-buffer-5.0.1"
             ];
           })
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             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."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -30832,7 +30905,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.2.0" // {
+                  (sources."async-2.3.0" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -30901,7 +30974,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -30937,7 +31010,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.21" // {
+      (sources."node-red-node-email-0.1.22" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -31054,14 +31127,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -31093,7 +31166,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -31131,7 +31204,7 @@ in
           })
         ];
       })
-      sources."node-red-node-rbe-0.1.6"
+      sources."node-red-node-rbe-0.1.8"
       (sources."bcrypt-1.0.2" // {
         dependencies = [
           sources."bindings-1.2.1"
@@ -31148,14 +31221,14 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -31209,14 +31282,14 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.2" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
                   (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-4.11.5" // {
+                      (sources."ajv-4.11.6" // {
                         dependencies = [
                           sources."co-4.6.0"
                           (sources."json-stable-stringify-1.0.1" // {
@@ -31248,7 +31321,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.11.0" // {
+                      (sources."sshpk-1.13.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -31297,7 +31370,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -31344,7 +31417,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -31453,7 +31526,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.12.4"
+          sources."coffee-script-1.12.5"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -31514,7 +31587,7 @@ in
       sources."moment-2.1.0"
       (sources."nodemailer-0.3.35" // {
         dependencies = [
-          (sources."mailcomposer-4.0.1" // {
+          (sources."mailcomposer-4.0.2" // {
             dependencies = [
               (sources."buildmail-4.0.1" // {
                 dependencies = [
@@ -31580,10 +31653,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.4.4";
+    version = "4.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz";
-      sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37";
+      url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
+      sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -31632,7 +31705,7 @@ in
             dependencies = [
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -31649,7 +31722,7 @@ in
           sources."fs.realpath-1.0.0"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -31662,12 +31735,12 @@ in
       })
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.2"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.5" // {
+      (sources."init-package-json-1.9.6" // {
         dependencies = [
           sources."promzard-0.3.0"
         ];
@@ -31734,11 +31807,11 @@ in
           sources."run-queue-1.0.3"
         ];
       })
-      (sources."node-gyp-3.5.0" // {
+      (sources."node-gyp-3.6.0" // {
         dependencies = [
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -31763,7 +31836,7 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.1"
-      (sources."npm-registry-client-7.4.6" // {
+      (sources."npm-registry-client-8.1.1" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -31831,13 +31904,13 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.2.6" // {
+      (sources."readable-stream-2.2.9" // {
         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."string_decoder-0.10.31"
+          sources."string_decoder-1.0.0"
           sources."util-deprecate-1.0.2"
         ];
       })
@@ -31854,14 +31927,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -31893,7 +31966,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -32084,9 +32157,9 @@ in
                       })
                     ];
                   })
-                  (sources."registry-auth-token-3.1.0" // {
+                  (sources."registry-auth-token-3.1.2" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."minimist-1.2.0"
@@ -32097,7 +32170,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."minimist-1.2.0"
@@ -32187,14 +32260,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -32226,7 +32299,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -32281,7 +32354,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -32306,14 +32379,14 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -32403,7 +32476,7 @@ in
                       })
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -32453,7 +32526,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.4"
+      sources."coffee-script-1.12.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32465,10 +32538,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.4";
+    version = "2.10.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz";
-      sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz";
+      sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -32558,7 +32631,7 @@ in
                 dependencies = [
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -32575,7 +32648,7 @@ in
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -32593,7 +32666,7 @@ in
           sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
-          (sources."init-package-json-1.9.5" // {
+          (sources."init-package-json-1.9.6" // {
             dependencies = [
               sources."promzard-0.3.0"
               (sources."validate-npm-package-name-3.0.0" // {
@@ -32623,7 +32696,7 @@ in
             dependencies = [
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -32704,13 +32777,13 @@ in
               (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -32879,7 +32952,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -32976,7 +33049,7 @@ in
       sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.26.1" // {
+      (sources."snyk-1.28.1" // {
         dependencies = [
           sources."abbrev-1.1.0"
           sources."ansi-escapes-1.4.0"
@@ -33092,14 +33165,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -33131,7 +33204,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -33221,19 +33294,14 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          (sources."snyk-module-1.7.0" // {
+          (sources."snyk-module-1.8.1" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
-              (sources."validate-npm-package-name-2.2.2" // {
-                dependencies = [
-                  sources."builtins-0.0.7"
-                ];
-              })
+              sources."hosted-git-info-2.4.2"
             ];
           })
-          (sources."snyk-policy-1.7.0" // {
+          (sources."snyk-policy-1.7.1" // {
             dependencies = [
-              (sources."js-yaml-3.8.2" // {
+              (sources."js-yaml-3.8.3" // {
                 dependencies = [
                   (sources."argparse-1.0.9" // {
                     dependencies = [
@@ -33250,7 +33318,7 @@ in
             dependencies = [
               (sources."minimatch-3.0.2" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -33370,14 +33438,14 @@ in
                                     ];
                                   })
                                   sources."read-all-stream-3.1.0"
-                                  (sources."readable-stream-2.2.6" // {
+                                  (sources."readable-stream-2.2.9" // {
                                     dependencies = [
                                       sources."buffer-shims-1.0.0"
                                       sources."core-util-is-1.0.2"
                                       sources."isarray-1.0.0"
                                       sources."inherits-2.0.3"
                                       sources."process-nextick-args-1.0.7"
-                                      sources."string_decoder-0.10.31"
+                                      sources."string_decoder-1.0.0"
                                       sources."util-deprecate-1.0.2"
                                     ];
                                   })
@@ -33390,9 +33458,9 @@ in
                                   })
                                 ];
                               })
-                              (sources."registry-auth-token-3.1.0" // {
+                              (sources."registry-auth-token-3.1.2" // {
                                 dependencies = [
-                                  (sources."rc-1.2.0" // {
+                                  (sources."rc-1.2.1" // {
                                     dependencies = [
                                       sources."deep-extend-0.4.1"
                                       sources."ini-1.3.4"
@@ -33403,7 +33471,7 @@ in
                               })
                               (sources."registry-url-3.1.0" // {
                                 dependencies = [
-                                  (sources."rc-1.2.0" // {
+                                  (sources."rc-1.2.1" // {
                                     dependencies = [
                                       sources."deep-extend-0.4.1"
                                       sources."ini-1.3.4"
@@ -33474,7 +33542,7 @@ in
                               })
                               (sources."normalize-package-data-2.3.6" // {
                                 dependencies = [
-                                  sources."hosted-git-info-2.4.1"
+                                  sources."hosted-git-info-2.4.2"
                                   (sources."is-builtin-module-1.0.0" // {
                                     dependencies = [
                                       sources."builtin-modules-1.1.1"
@@ -33599,13 +33667,13 @@ in
                                 ];
                               })
                               sources."inherits-2.0.3"
-                              (sources."readable-stream-2.2.6" // {
+                              (sources."readable-stream-2.2.9" // {
                                 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."string_decoder-0.10.31"
+                                  sources."string_decoder-1.0.0"
                                   sources."util-deprecate-1.0.2"
                                 ];
                               })
@@ -33630,14 +33698,14 @@ in
                                   sources."pinkie-2.0.4"
                                 ];
                               })
-                              (sources."readable-stream-2.2.6" // {
+                              (sources."readable-stream-2.2.9" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
                                   sources."isarray-1.0.0"
                                   sources."inherits-2.0.3"
                                   sources."process-nextick-args-1.0.7"
-                                  sources."string_decoder-0.10.31"
+                                  sources."string_decoder-1.0.0"
                                   sources."util-deprecate-1.0.2"
                                 ];
                               })
@@ -33648,7 +33716,7 @@ in
                       })
                       (sources."registry-url-3.1.0" // {
                         dependencies = [
-                          (sources."rc-1.2.0" // {
+                          (sources."rc-1.2.1" // {
                             dependencies = [
                               sources."deep-extend-0.4.1"
                               sources."ini-1.3.4"
@@ -33792,14 +33860,14 @@ in
                         ];
                       })
                       sources."read-all-stream-3.1.0"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -33812,9 +33880,9 @@ in
                       })
                     ];
                   })
-                  (sources."registry-auth-token-3.1.0" // {
+                  (sources."registry-auth-token-3.1.2" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -33826,7 +33894,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -33861,10 +33929,10 @@ in
   parsoid = nodeEnv.buildNodePackage {
     name = "parsoid";
     packageName = "parsoid";
-    version = "0.6.1";
+    version = "0.7.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
-      sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz";
+      sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -33903,7 +33971,7 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -34035,7 +34103,7 @@ in
           sources."serve-static-1.12.1"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -34061,7 +34129,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -34092,7 +34160,7 @@ in
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.8.20" // {
+              (sources."uglify-js-2.8.22" // {
                 dependencies = [
                   sources."source-map-0.5.6"
                   (sources."yargs-3.10.0" // {
@@ -34178,12 +34246,7 @@ in
           sources."unpipe-1.0.0"
         ];
       })
-      (sources."gelf-stream-0.2.4" // {
-        dependencies = [
-          sources."gelfling-0.2.0"
-        ];
-      })
-      (sources."js-yaml-3.8.2" // {
+      (sources."js-yaml-3.8.3" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -34210,14 +34273,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -34249,7 +34312,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -34298,11 +34361,11 @@ in
       (sources."service-runner-2.2.5" // {
         dependencies = [
           sources."bluebird-3.5.0"
-          (sources."bunyan-1.8.9" // {
+          (sources."bunyan-1.8.10" // {
             dependencies = [
               (sources."dtrace-provider-0.8.1" // {
                 dependencies = [
-                  sources."nan-2.5.1"
+                  sources."nan-2.6.2"
                 ];
               })
               (sources."mv-2.1.1" // {
@@ -34325,7 +34388,7 @@ in
                           sources."inherits-2.0.3"
                           (sources."minimatch-3.0.3" // {
                             dependencies = [
-                              (sources."brace-expansion-1.1.6" // {
+                              (sources."brace-expansion-1.1.7" // {
                                 dependencies = [
                                   sources."balanced-match-0.4.2"
                                   sources."concat-map-0.0.1"
@@ -34382,14 +34445,14 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -34460,7 +34523,7 @@ in
                       })
                       (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.4.1"
+                          sources."hosted-git-info-2.4.2"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -34529,7 +34592,7 @@ in
         ];
       })
       sources."simplediff-0.1.1"
-      (sources."yargs-4.8.1" // {
+      (sources."yargs-5.0.0" // {
         dependencies = [
           (sources."cliui-3.2.0" // {
             dependencies = [
@@ -34594,7 +34657,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -34648,7 +34711,7 @@ in
           sources."which-module-1.0.0"
           sources."window-size-0.2.0"
           sources."y18n-3.2.1"
-          (sources."yargs-parser-2.4.1" // {
+          (sources."yargs-parser-3.2.0" // {
             dependencies = [
               sources."camelcase-3.0.0"
             ];
@@ -34684,20 +34747,20 @@ in
               })
               (sources."bplist-parser-0.1.1" // {
                 dependencies = [
-                  sources."big-integer-1.6.17"
+                  sources."big-integer-1.6.19"
                 ];
               })
               (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -34827,7 +34890,7 @@ in
                   sources."map-obj-1.0.1"
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -34968,13 +35031,13 @@ in
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -35038,17 +35101,17 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.2" // {
+      (sources."parse-torrent-5.8.3" // {
         dependencies = [
           sources."blob-to-buffer-1.2.6"
           sources."get-stdin-5.0.1"
-          (sources."magnet-uri-5.1.5" // {
+          (sources."magnet-uri-5.1.6" // {
             dependencies = [
               sources."thirty-two-1.0.2"
               sources."uniq-1.0.1"
             ];
           })
-          (sources."parse-torrent-file-4.0.1" // {
+          (sources."parse-torrent-file-4.0.2" // {
             dependencies = [
               sources."bencode-0.11.0"
               (sources."simple-sha1-2.1.0" // {
@@ -35059,7 +35122,7 @@ in
               sources."uniq-1.0.1"
             ];
           })
-          (sources."simple-get-2.4.0" // {
+          (sources."simple-get-2.5.1" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -35083,7 +35146,7 @@ in
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -35104,15 +35167,16 @@ in
               })
             ];
           })
-          (sources."fs-chunk-store-1.6.4" // {
+          (sources."fs-chunk-store-1.6.5" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.5.0" // {
+              (sources."random-access-file-1.6.1" // {
                 dependencies = [
+                  sources."buffer-alloc-unsafe-1.0.0"
                   (sources."debug-2.6.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
@@ -35196,7 +35260,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -35261,7 +35325,7 @@ in
                   })
                   sources."random-iterate-1.0.1"
                   sources."run-series-1.1.4"
-                  (sources."simple-get-2.4.0" // {
+                  (sources."simple-get-2.5.1" // {
                     dependencies = [
                       sources."simple-concat-1.0.0"
                       sources."unzip-response-2.0.1"
@@ -35271,13 +35335,13 @@ in
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -35286,18 +35350,19 @@ in
                   (sources."simple-websocket-4.3.1" // {
                     dependencies = [
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.2.6" // {
+                      (sources."readable-stream-2.2.9" // {
                         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."string_decoder-0.10.31"
+                          sources."string_decoder-1.0.0"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      (sources."ws-2.2.2" // {
+                      (sources."ws-2.2.3" // {
                         dependencies = [
+                          sources."safe-buffer-5.0.1"
                           sources."ultron-1.1.0"
                         ];
                       })
@@ -35328,7 +35393,7 @@ in
               sources."run-parallel-1.1.6"
             ];
           })
-          sources."torrent-piece-1.1.0"
+          sources."torrent-piece-1.1.1"
         ];
       })
       sources."windows-no-runnable-0.0.6"
@@ -35840,7 +35905,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -35863,7 +35928,7 @@ in
       })
       (sources."fluent-ffmpeg-2.1.0" // {
         dependencies = [
-          (sources."async-2.2.0" // {
+          (sources."async-2.3.0" // {
             dependencies = [
               sources."lodash-4.17.4"
             ];
@@ -35946,7 +36011,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -35998,7 +36063,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.2.0" // {
+              (sources."async-2.3.0" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -36026,7 +36091,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -36123,6 +36188,98 @@ in
     };
     production = true;
   };
+  prettier = nodeEnv.buildNodePackage {
+    name = "prettier";
+    packageName = "prettier";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz";
+      sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8";
+    };
+    dependencies = [
+      sources."ast-types-0.9.8"
+      (sources."babel-code-frame-6.22.0" // {
+        dependencies = [
+          sources."js-tokens-3.0.1"
+        ];
+      })
+      sources."babylon-7.0.0-beta.8"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."ansi-styles-2.2.1"
+          sources."escape-string-regexp-1.0.5"
+          (sources."has-ansi-2.0.0" // {
+            dependencies = [
+              sources."ansi-regex-2.1.1"
+            ];
+          })
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.1.1"
+            ];
+          })
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."esutils-2.0.2"
+      sources."flow-parser-0.43.0"
+      sources."get-stdin-5.0.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."inherits-2.0.3"
+          (sources."minimatch-3.0.3" // {
+            dependencies = [
+              (sources."brace-expansion-1.1.7" // {
+                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."jest-validate-19.0.0" // {
+        dependencies = [
+          sources."jest-matcher-utils-19.0.0"
+          sources."leven-2.1.0"
+          (sources."pretty-format-19.0.0" // {
+            dependencies = [
+              (sources."ansi-styles-3.0.0" // {
+                dependencies = [
+                  (sources."color-convert-1.9.0" // {
+                    dependencies = [
+                      sources."color-name-1.1.2"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      sources."minimist-1.2.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Prettier is an opinionated JavaScript formatter";
+      homepage = "https://github.com/prettier/prettier#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   react-tools = nodeEnv.buildNodePackage {
     name = "react-tools";
     packageName = "react-tools";
@@ -36155,7 +36312,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -36319,14 +36476,14 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.2" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
                   (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-4.11.5" // {
+                      (sources."ajv-4.11.6" // {
                         dependencies = [
                           sources."co-4.6.0"
                           (sources."json-stable-stringify-1.0.1" // {
@@ -36358,7 +36515,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.11.0" // {
+                      (sources."sshpk-1.13.0" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -36516,7 +36673,7 @@ in
           sources."serve-static-1.12.1"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -36562,7 +36719,7 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -36606,7 +36763,7 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      (sources."js-yaml-3.8.2" // {
+      (sources."js-yaml-3.8.3" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -36634,14 +36791,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -36673,7 +36830,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -36719,11 +36876,11 @@ in
           sources."sigmund-1.0.1"
         ];
       })
-      (sources."bunyan-1.8.9" // {
+      (sources."bunyan-1.8.10" // {
         dependencies = [
           (sources."dtrace-provider-0.8.1" // {
             dependencies = [
-              sources."nan-2.5.1"
+              sources."nan-2.6.2"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -36741,7 +36898,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -36818,13 +36975,13 @@ in
                   })
                   sources."entities-1.1.1"
                   sources."inherits-2.0.3"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -36867,12 +37024,12 @@ in
       })
       (sources."fs-ext-0.6.0" // {
         dependencies = [
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
         ];
       })
       (sources."crypt3-0.2.0" // {
         dependencies = [
-          sources."nan-2.5.1"
+          sources."nan-2.6.2"
         ];
       })
     ];
@@ -36916,7 +37073,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -36924,14 +37081,14 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -37018,7 +37175,7 @@ in
           })
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.1"
+              sources."nan-2.6.2"
             ];
           })
         ];
@@ -37027,7 +37184,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.1"
+              sources."nan-2.6.2"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -37050,7 +37207,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -37096,14 +37253,14 @@ in
           (sources."sshpk-agent-1.2.1" // {
             dependencies = [
               sources."assert-plus-0.1.5"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -37198,7 +37355,7 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              (sources."brace-expansion-1.1.7" // {
                 dependencies = [
                   sources."balanced-match-0.4.2"
                   sources."concat-map-0.0.1"
@@ -37315,14 +37472,14 @@ in
                   sources."prr-0.0.0"
                 ];
               })
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -37351,7 +37508,7 @@ in
       })
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -37487,7 +37644,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -37554,7 +37711,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -37642,10 +37799,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.8.20";
+    version = "2.8.22";
     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-2.8.22.tgz";
+      sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
     };
     dependencies = [
       sources."source-map-0.5.6"
@@ -37705,10 +37862,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.11";
+    version = "1.1.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz";
-      sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz";
+      sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2";
     };
     dependencies = [
       sources."async-2.1.5"
@@ -37743,7 +37900,7 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -37797,7 +37954,7 @@ in
           sources."whatwg-fetch-2.0.3"
         ];
       })
-      (sources."express-4.14.1" // {
+      (sources."express-4.15.2" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
@@ -37814,22 +37971,26 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
-          sources."etag-1.7.0"
-          (sources."finalhandler-0.5.1" // {
+          sources."etag-1.8.0"
+          (sources."finalhandler-1.0.1" // {
             dependencies = [
-              sources."statuses-1.3.1"
+              (sources."debug-2.6.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
               sources."unpipe-1.0.0"
             ];
           })
-          sources."fresh-0.3.0"
+          sources."fresh-0.5.0"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
@@ -37845,23 +38006,23 @@ in
               sources."ipaddr.js-1.3.0"
             ];
           })
-          sources."qs-6.2.0"
+          sources."qs-6.4.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.2" // {
+          (sources."send-0.15.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.1" // {
+              (sources."http-errors-1.6.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.2"
-              sources."statuses-1.3.1"
             ];
           })
-          (sources."type-is-1.6.14" // {
+          sources."setprototypeof-1.0.3"
+          sources."statuses-1.3.1"
+          (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
               (sources."mime-types-2.1.15" // {
@@ -37875,14 +38036,14 @@ in
           sources."vary-1.1.1"
         ];
       })
-      (sources."express-session-1.14.2" // {
+      (sources."express-session-1.15.2" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.1"
-          (sources."debug-2.2.0" // {
+          sources."crc-3.4.4"
+          (sources."debug-2.6.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
@@ -38021,7 +38182,7 @@ in
         ];
       })
       sources."hasher-1.2.0"
-      sources."ignore-3.2.6"
+      sources."ignore-3.2.7"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
@@ -38034,13 +38195,13 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.17.1"
+      sources."moment-2.18.1"
       (sources."node-cache-4.1.1" // {
         dependencies = [
           sources."clone-2.1.1"
         ];
       })
-      (sources."npm-4.1.2" // {
+      (sources."npm-4.5.0" // {
         dependencies = [
           (sources."JSONStream-1.3.1" // {
             dependencies = [
@@ -38048,12 +38209,15 @@ in
               sources."through-2.3.8"
             ];
           })
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
+          sources."ansi-regex-2.1.1"
           sources."ansicolors-0.3.2"
           sources."ansistyles-0.1.3"
-          sources."aproba-1.0.4"
+          sources."aproba-1.1.1"
           sources."archy-1.0.0"
           sources."asap-2.0.5"
+          sources."bluebird-3.5.0"
+          sources."call-limit-1.1.0"
           sources."chownr-1.0.1"
           sources."cmd-shim-2.0.2"
           (sources."columnify-1.5.4" // {
@@ -38085,7 +38249,7 @@ in
                 dependencies = [
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -38102,7 +38266,7 @@ in
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -38115,21 +38279,17 @@ in
           })
           sources."graceful-fs-4.1.11"
           sources."has-unicode-2.0.1"
-          sources."hosted-git-info-2.1.5"
+          sources."hosted-git-info-2.4.2"
           sources."iferr-0.1.5"
           sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
-          (sources."init-package-json-1.9.5" // {
+          (sources."init-package-json-1.9.6" // {
             dependencies = [
               sources."promzard-0.3.0"
-              (sources."validate-npm-package-name-3.0.0" // {
-                dependencies = [
-                  sources."builtins-1.0.3"
-                ];
-              })
             ];
           })
+          sources."lazy-property-1.0.0"
           sources."lockfile-1.0.3"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
@@ -38141,7 +38301,7 @@ in
           sources."lodash.union-4.6.0"
           sources."lodash.uniq-4.5.0"
           sources."lodash.without-4.4.0"
-          (sources."mississippi-1.2.0" // {
+          (sources."mississippi-1.3.0" // {
             dependencies = [
               (sources."concat-stream-1.6.0" // {
                 dependencies = [
@@ -38161,6 +38321,11 @@ in
               sources."end-of-stream-1.4.0"
               sources."flush-write-stream-1.0.2"
               sources."from2-2.3.0"
+              (sources."parallel-transform-1.1.0" // {
+                dependencies = [
+                  sources."cyclist-0.2.2"
+                ];
+              })
               sources."pump-1.0.2"
               sources."pumpify-1.3.5"
               (sources."stream-each-1.2.0" // {
@@ -38175,11 +38340,17 @@ in
               })
             ];
           })
-          (sources."node-gyp-3.5.0" // {
+          (sources."move-concurrently-1.0.1" // {
+            dependencies = [
+              sources."copy-concurrently-1.0.3"
+              sources."run-queue-1.0.3"
+            ];
+          })
+          (sources."node-gyp-3.6.0" // {
             dependencies = [
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -38262,22 +38433,22 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             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."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
           sources."realize-package-specifier-3.0.3"
-          (sources."request-2.79.0" // {
+          (sources."request-2.81.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.6.0"
-              sources."caseless-0.11.0"
+              sources."caseless-0.12.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
                   sources."delayed-stream-1.0.0"
@@ -38285,43 +38456,24 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
-              (sources."har-validator-2.0.6" // {
+              (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."chalk-1.1.3" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      sources."has-ansi-2.0.0"
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.16.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
+                      sources."co-4.6.0"
+                      (sources."json-stable-stringify-1.0.1" // {
                         dependencies = [
-                          sources."is-property-1.0.2"
+                          sources."jsonify-0.0.0"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
                     ];
                   })
+                  sources."har-schema-1.0.5"
                 ];
               })
               (sources."hawk-3.1.3" // {
@@ -38343,7 +38495,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -38367,14 +38519,16 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.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.4.3"
+              sources."tunnel-agent-0.6.0"
             ];
           })
           sources."retry-0.10.1"
@@ -38416,10 +38570,135 @@ in
             ];
           })
           sources."unpipe-1.0.0"
-          sources."uuid-3.0.1"
-          (sources."validate-npm-package-name-2.2.2" // {
+          (sources."update-notifier-2.1.0" // {
             dependencies = [
-              sources."builtins-0.0.7"
+              (sources."boxen-1.0.0" // {
+                dependencies = [
+                  (sources."ansi-align-1.1.0" // {
+                    dependencies = [
+                      (sources."string-width-1.0.2" // {
+                        dependencies = [
+                          sources."code-point-at-1.1.0"
+                          (sources."is-fullwidth-code-point-1.0.0" // {
+                            dependencies = [
+                              sources."number-is-nan-1.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                  sources."camelcase-4.1.0"
+                  sources."cli-boxes-1.0.0"
+                  (sources."string-width-2.0.0" // {
+                    dependencies = [
+                      sources."is-fullwidth-code-point-2.0.0"
+                    ];
+                  })
+                  (sources."term-size-0.1.1" // {
+                    dependencies = [
+                      (sources."execa-0.4.0" // {
+                        dependencies = [
+                          (sources."cross-spawn-async-2.2.5" // {
+                            dependencies = [
+                              (sources."lru-cache-4.0.2" // {
+                                dependencies = [
+                                  sources."pseudomap-1.0.2"
+                                  sources."yallist-2.1.2"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."is-stream-1.1.0"
+                          sources."npm-run-path-1.0.0"
+                          sources."object-assign-4.1.1"
+                          sources."path-key-1.0.0"
+                          sources."strip-eof-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."widest-line-1.0.0" // {
+                    dependencies = [
+                      (sources."string-width-1.0.2" // {
+                        dependencies = [
+                          sources."code-point-at-1.1.0"
+                          (sources."is-fullwidth-code-point-1.0.0" // {
+                            dependencies = [
+                              sources."number-is-nan-1.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."chalk-1.1.3" // {
+                dependencies = [
+                  sources."ansi-styles-2.2.1"
+                  sources."escape-string-regexp-1.0.5"
+                  sources."has-ansi-2.0.0"
+                  sources."supports-color-2.0.0"
+                ];
+              })
+              (sources."configstore-3.0.0" // {
+                dependencies = [
+                  (sources."dot-prop-4.1.1" // {
+                    dependencies = [
+                      sources."is-obj-1.0.1"
+                    ];
+                  })
+                  (sources."unique-string-1.0.0" // {
+                    dependencies = [
+                      sources."crypto-random-string-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."is-npm-1.0.0"
+              (sources."latest-version-3.1.0" // {
+                dependencies = [
+                  (sources."package-json-4.0.0" // {
+                    dependencies = [
+                      (sources."got-6.7.1" // {
+                        dependencies = [
+                          (sources."create-error-class-3.0.2" // {
+                            dependencies = [
+                              sources."capture-stack-trace-1.0.0"
+                            ];
+                          })
+                          sources."duplexer3-0.1.4"
+                          sources."get-stream-3.0.0"
+                          sources."is-redirect-1.0.0"
+                          sources."is-retry-allowed-1.1.0"
+                          sources."is-stream-1.1.0"
+                          sources."lowercase-keys-1.0.0"
+                          sources."safe-buffer-5.0.1"
+                          sources."timed-out-4.0.1"
+                          sources."unzip-response-2.0.1"
+                          (sources."url-parse-lax-1.0.0" // {
+                            dependencies = [
+                              sources."prepend-http-1.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."registry-auth-token-3.1.2"
+                      sources."registry-url-3.1.0"
+                    ];
+                  })
+                ];
+              })
+              sources."lazy-req-2.0.0"
+              sources."semver-diff-2.1.0"
+              sources."xdg-basedir-3.0.0"
+            ];
+          })
+          sources."uuid-3.0.1"
+          (sources."validate-npm-package-name-3.0.0" // {
+            dependencies = [
+              sources."builtins-1.0.3"
             ];
           })
           (sources."which-1.2.14" // {
@@ -38429,7 +38708,6 @@ in
           })
           sources."wrappy-1.0.2"
           sources."write-file-atomic-1.3.1"
-          sources."ansi-regex-2.1.1"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -38451,19 +38729,19 @@ in
           })
         ];
       })
-      (sources."npm-registry-client-7.4.6" // {
+      (sources."npm-registry-client-8.1.1" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.6" // {
+              (sources."readable-stream-2.2.9" // {
                 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."string_decoder-0.10.31"
+                  sources."string_decoder-1.0.0"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -38472,7 +38750,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -38490,9 +38768,19 @@ in
               })
             ];
           })
-          (sources."npm-package-arg-4.2.1" // {
+          (sources."npm-package-arg-5.0.1" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
+              (sources."osenv-0.1.4" // {
+                dependencies = [
+                  sources."os-tmpdir-1.0.2"
+                ];
+              })
+              (sources."validate-npm-package-name-3.0.0" // {
+                dependencies = [
+                  sources."builtins-1.0.3"
+                ];
+              })
             ];
           })
           (sources."once-1.4.0" // {
@@ -38512,14 +38800,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -38551,7 +38839,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -38595,14 +38883,14 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -38652,7 +38940,7 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-1.1.5" // {
+      (sources."raven-1.2.1" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."json-stringify-safe-5.0.1"
@@ -38661,7 +38949,7 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
@@ -38669,7 +38957,7 @@ in
           sources."strip-json-comments-2.0.1"
         ];
       })
-      (sources."rimraf-2.5.4" // {
+      (sources."rimraf-2.6.1" // {
         dependencies = [
           (sources."glob-7.1.1" // {
             dependencies = [
@@ -38682,7 +38970,7 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -38701,26 +38989,22 @@ in
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-static-1.11.2" // {
+      (sources."serve-static-1.12.1" // {
         dependencies = [
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."parseurl-1.3.1"
-          (sources."send-0.14.2" // {
+          (sources."send-0.15.1" // {
             dependencies = [
-              (sources."debug-2.2.0" // {
-                dependencies = [
-                  sources."ms-0.7.1"
-                ];
-              })
+              sources."debug-2.6.1"
               sources."depd-1.1.0"
               sources."destroy-1.0.4"
-              sources."etag-1.7.0"
-              sources."fresh-0.3.0"
-              (sources."http-errors-1.5.1" // {
+              sources."etag-1.8.0"
+              sources."fresh-0.5.0"
+              (sources."http-errors-1.6.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
+                  sources."setprototypeof-1.0.3"
                 ];
               })
               sources."mime-1.3.4"
@@ -38737,9 +39021,9 @@ in
         ];
       })
       sources."signals-1.0.0"
-      (sources."snapsvg-0.4.0" // {
+      (sources."snapsvg-0.5.1" // {
         dependencies = [
-          sources."eve-0.4.2"
+          sources."eve-0.5.3"
         ];
       })
       (sources."socket.io-1.7.3" // {
@@ -38912,7 +39196,7 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."yargs-6.6.0" // {
+      (sources."yargs-7.1.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
           (sources."cliui-3.2.0" // {
@@ -38977,7 +39261,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -39030,7 +39314,7 @@ in
           })
           sources."which-module-1.0.0"
           sources."y18n-3.2.1"
-          sources."yargs-parser-4.2.1"
+          sources."yargs-parser-5.0.0"
         ];
       })
     ];
@@ -39133,7 +39417,7 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.3" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
+                          (sources."brace-expansion-1.1.7" // {
                             dependencies = [
                               sources."balanced-match-0.4.2"
                               sources."concat-map-0.0.1"
@@ -39185,7 +39469,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.2.0" // {
+                  (sources."async-2.3.0" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -39213,7 +39497,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -39325,15 +39609,19 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.3.2";
+    version = "2.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz";
-      sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz";
+      sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a";
     };
     dependencies = [
-      sources."acorn-4.0.11"
-      sources."acorn-dynamic-import-2.0.2"
-      (sources."ajv-4.11.5" // {
+      sources."acorn-5.0.3"
+      (sources."acorn-dynamic-import-2.0.2" // {
+        dependencies = [
+          sources."acorn-4.0.11"
+        ];
+      })
+      (sources."ajv-4.11.6" // {
         dependencies = [
           sources."co-4.6.0"
           (sources."json-stable-stringify-1.0.1" // {
@@ -39344,7 +39632,7 @@ in
         ];
       })
       sources."ajv-keywords-1.5.1"
-      (sources."async-2.2.0" // {
+      (sources."async-2.3.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -39357,12 +39645,12 @@ in
       })
       sources."interpret-1.0.2"
       sources."json-loader-0.5.4"
+      sources."json5-0.5.1"
       sources."loader-runner-2.3.0"
       (sources."loader-utils-0.2.17" // {
         dependencies = [
           sources."big.js-3.1.3"
           sources."emojis-list-2.1.0"
-          sources."json5-0.5.1"
           sources."object-assign-4.1.1"
         ];
       })
@@ -39373,14 +39661,14 @@ in
               sources."prr-0.0.0"
             ];
           })
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -39443,7 +39731,7 @@ in
                     dependencies = [
                       sources."brorand-1.1.0"
                       sources."hash.js-1.0.3"
-                      sources."hmac-drbg-1.0.0"
+                      sources."hmac-drbg-1.0.1"
                       sources."minimalistic-assert-1.0.0"
                       sources."minimalistic-crypto-utils-1.0.1"
                     ];
@@ -39473,7 +39761,7 @@ in
                     dependencies = [
                       sources."brorand-1.1.0"
                       sources."hash.js-1.0.3"
-                      sources."hmac-drbg-1.0.0"
+                      sources."hmac-drbg-1.0.1"
                       sources."minimalistic-assert-1.0.0"
                       sources."minimalistic-crypto-utils-1.0.1"
                     ];
@@ -39533,13 +39821,14 @@ in
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -39548,7 +39837,7 @@ in
               sources."inherits-2.0.3"
             ];
           })
-          (sources."stream-http-2.6.3" // {
+          (sources."stream-http-2.7.0" // {
             dependencies = [
               sources."builtin-status-codes-3.0.0"
               sources."inherits-2.0.3"
@@ -39588,7 +39877,7 @@ in
         ];
       })
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.20" // {
+      (sources."uglify-js-2.8.22" // {
         dependencies = [
           (sources."yargs-3.10.0" // {
             dependencies = [
@@ -39647,7 +39936,7 @@ in
                     dependencies = [
                       (sources."arr-diff-2.0.0" // {
                         dependencies = [
-                          sources."arr-flatten-1.0.1"
+                          sources."arr-flatten-1.0.2"
                         ];
                       })
                       sources."array-unique-0.2.1"
@@ -39735,7 +40024,7 @@ in
                 dependencies = [
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -39743,13 +40032,13 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     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."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -39758,7 +40047,7 @@ in
               })
               (sources."fsevents-1.1.1" // {
                 dependencies = [
-                  sources."nan-2.5.1"
+                  sources."nan-2.6.2"
                   (sources."node-pre-gyp-0.6.34" // {
                     dependencies = [
                       (sources."nopt-4.0.1" // {
@@ -39777,13 +40066,13 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.6" // {
+                              (sources."readable-stream-2.2.9" // {
                                 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."string_decoder-0.10.31"
+                                  sources."string_decoder-1.0.0"
                                   sources."util-deprecate-1.0.2"
                                 ];
                               })
@@ -39817,7 +40106,7 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.2.0" // {
+                      (sources."rc-1.2.1" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
@@ -39837,7 +40126,7 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.1.2" // {
+                          (sources."form-data-2.1.4" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
@@ -39866,7 +40155,7 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.11.0" // {
+                              (sources."sshpk-1.13.0" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
@@ -39915,7 +40204,7 @@ in
                               })
                               (sources."minimatch-3.0.3" // {
                                 dependencies = [
-                                  (sources."brace-expansion-1.1.6" // {
+                                  (sources."brace-expansion-1.1.7" // {
                                     dependencies = [
                                       sources."balanced-match-0.4.2"
                                       sources."concat-map-0.0.1"
@@ -39951,7 +40240,7 @@ in
                             dependencies = [
                               (sources."minimatch-3.0.3" // {
                                 dependencies = [
-                                  (sources."brace-expansion-1.1.6" // {
+                                  (sources."brace-expansion-1.1.7" // {
                                     dependencies = [
                                       sources."balanced-match-0.4.2"
                                       sources."concat-map-0.0.1"
@@ -39966,13 +40255,13 @@ in
                               sources."wrappy-1.0.2"
                             ];
                           })
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -40058,7 +40347,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.6" // {
                     dependencies = [
-                      sources."hosted-git-info-2.4.1"
+                      sources."hosted-git-info-2.4.2"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -40143,10 +40432,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.21.3";
+    version = "0.22.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz";
-      sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz";
+      sha1 = "fd8511dc29225b925be967dc185772cc59de5888";
     };
     dependencies = [
       (sources."babel-runtime-6.23.0" // {
@@ -40156,7 +40445,7 @@ in
         ];
       })
       sources."bytes-2.5.0"
-      sources."camelcase-3.0.0"
+      sources."camelcase-4.1.0"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."ansi-styles-2.2.1"
@@ -40190,11 +40479,6 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."defaults-1.0.3" // {
-        dependencies = [
-          sources."clone-1.0.2"
-        ];
-      })
       sources."detect-indent-5.0.0"
       sources."ini-1.3.4"
       (sources."inquirer-3.0.6" // {
@@ -40282,7 +40566,7 @@ in
       })
       (sources."minimatch-3.0.3" // {
         dependencies = [
-          (sources."brace-expansion-1.1.6" // {
+          (sources."brace-expansion-1.1.7" // {
             dependencies = [
               sources."balanced-match-0.4.2"
               sources."concat-map-0.0.1"
@@ -40335,14 +40619,14 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -40413,14 +40697,14 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-4.11.5" // {
+              (sources."ajv-4.11.6" // {
                 dependencies = [
                   sources."co-4.6.0"
                   (sources."json-stable-stringify-1.0.1" // {
@@ -40452,7 +40736,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.11.0" // {
+              (sources."sshpk-1.13.0" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -40537,20 +40821,21 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
           sources."xtend-4.0.1"
         ];
       })
+      sources."v8-compile-cache-1.1.0"
       (sources."validate-npm-package-license-3.0.1" // {
         dependencies = [
           (sources."spdx-correct-1.0.2" // {
@@ -40721,14 +41006,14 @@ in
             ];
           })
           sources."read-all-stream-3.1.0"
-          (sources."readable-stream-2.2.6" // {
+          (sources."readable-stream-2.2.9" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
+              sources."string_decoder-1.0.0"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -40870,14 +41155,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
+              (sources."form-data-2.1.4" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-4.2.1" // {
                 dependencies = [
-                  (sources."ajv-4.11.5" // {
+                  (sources."ajv-4.11.6" // {
                     dependencies = [
                       sources."co-4.6.0"
                       (sources."json-stable-stringify-1.0.1" // {
@@ -40909,7 +41194,7 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.11.0" // {
+                  (sources."sshpk-1.13.0" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
@@ -40971,7 +41256,7 @@ in
           sources."minimist-1.2.0"
           (sources."normalize-package-data-2.3.6" // {
             dependencies = [
-              sources."hosted-git-info-2.4.1"
+              sources."hosted-git-info-2.4.2"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -41014,7 +41299,7 @@ in
           })
           (sources."registry-url-3.1.0" // {
             dependencies = [
-              (sources."rc-1.2.0" // {
+              (sources."rc-1.2.1" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -41033,9 +41318,9 @@ in
       })
       (sources."package-json-2.4.0" // {
         dependencies = [
-          (sources."registry-auth-token-3.1.0" // {
+          (sources."registry-auth-token-3.1.2" // {
             dependencies = [
-              (sources."rc-1.2.0" // {
+              (sources."rc-1.2.1" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -41047,7 +41332,7 @@ in
           })
           (sources."registry-url-3.1.0" // {
             dependencies = [
-              (sources."rc-1.2.0" // {
+              (sources."rc-1.2.1" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
@@ -41115,7 +41400,7 @@ in
               })
               (sources."normalize-package-data-2.3.6" // {
                 dependencies = [
-                  sources."hosted-git-info-2.4.1"
+                  sources."hosted-git-info-2.4.2"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -41223,13 +41508,13 @@ in
                         dependencies = [
                           sources."inherits-2.0.3"
                           sources."typedarray-0.0.6"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -41288,14 +41573,14 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -41438,7 +41723,7 @@ in
               })
               (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  (sources."brace-expansion-1.1.7" // {
                     dependencies = [
                       sources."balanced-match-0.4.2"
                       sources."concat-map-0.0.1"
@@ -41477,7 +41762,7 @@ in
                   sources."inherits-2.0.3"
                   (sources."minimatch-3.0.3" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
+                      (sources."brace-expansion-1.1.7" // {
                         dependencies = [
                           sources."balanced-match-0.4.2"
                           sources."concat-map-0.0.1"
@@ -41526,13 +41811,13 @@ in
                         dependencies = [
                           sources."inherits-2.0.3"
                           sources."typedarray-0.0.6"
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             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."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
@@ -41584,14 +41869,14 @@ in
             dependencies = [
               (sources."through2-2.0.3" // {
                 dependencies = [
-                  (sources."readable-stream-2.2.6" // {
+                  (sources."readable-stream-2.2.9" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
+                      sources."string_decoder-1.0.0"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -41623,14 +41908,14 @@ in
                     dependencies = [
                       (sources."first-chunk-stream-2.0.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.6" // {
+                          (sources."readable-stream-2.2.9" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
                               sources."isarray-1.0.0"
                               sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
+                              sources."string_decoder-1.0.0"
                               sources."util-deprecate-1.0.2"
                             ];
                           })
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 08070fe0e5f..d61af12b713 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -625,13 +625,13 @@ let
         sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
       };
     };
-    "azure-arm-trafficmanager-0.10.5" = {
+    "azure-arm-trafficmanager-0.12.0" = {
       name = "azure-arm-trafficmanager";
       packageName = "azure-arm-trafficmanager";
-      version = "0.10.5";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz";
-        sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01";
+        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz";
+        sha1 = "609e585c0253960a91deaf773dae1ce184ce414b";
       };
     };
     "azure-arm-dns-0.11.1" = {
@@ -697,13 +697,13 @@ let
         sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
       };
     };
-    "azure-asm-compute-0.17.0" = {
+    "azure-asm-compute-0.18.0" = {
       name = "azure-asm-compute";
       packageName = "azure-asm-compute";
-      version = "0.17.0";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz";
-        sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90";
+        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
+        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
       };
     };
     "azure-asm-hdinsight-0.10.2" = {
@@ -814,13 +814,13 @@ let
         sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
       };
     };
-    "azure-storage-2.0.0" = {
+    "azure-storage-2.1.0" = {
       name = "azure-storage";
       packageName = "azure-storage";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz";
-        sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz";
+        sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01";
       };
     };
     "azure-arm-batch-0.3.0" = {
@@ -1741,13 +1741,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "brace-expansion-1.1.6" = {
+    "brace-expansion-1.1.7" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz";
-        sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
+        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
       };
     };
     "balanced-match-0.4.2" = {
@@ -1993,13 +1993,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.2.0" = {
+    "async-2.3.0" = {
       name = "async";
       packageName = "async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz";
-        sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32";
+        url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz";
+        sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9";
       };
     };
     "lodash-4.17.4" = {
@@ -2218,13 +2218,13 @@ let
         sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.11.0" = {
+    "sshpk-1.13.0" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.11.0";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz";
-        sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
+        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
       };
     };
     "assert-plus-1.0.0" = {
@@ -2434,13 +2434,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.6" = {
+    "readable-stream-2.2.9" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.6";
+      version = "2.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
-        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz";
+        sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2452,6 +2452,15 @@ let
         sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
+    "string_decoder-1.0.0" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz";
+        sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2938,13 +2947,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.4.1" = {
+    "hosted-git-info-2.4.2" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
-        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
+        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3298,13 +3307,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.5" = {
+    "buffer-5.0.6" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.5";
+      version = "5.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
-        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz";
+        sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3415,13 +3424,13 @@ let
         sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
       };
     };
-    "https-browserify-0.0.1" = {
+    "https-browserify-1.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
-      version = "0.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
-        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz";
+        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
     "insert-module-globals-7.0.1" = {
@@ -3532,13 +3541,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.6.3" = {
+    "stream-http-2.7.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.6.3";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
-        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz";
+        sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6";
       };
     };
     "subarg-1.0.0" = {
@@ -3919,13 +3928,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "hmac-drbg-1.0.0" = {
+    "hmac-drbg-1.0.1" = {
       name = "hmac-drbg";
       packageName = "hmac-drbg";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz";
-        sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5";
+        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+        sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -4612,13 +4621,13 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "parse-torrent-5.8.2" = {
+    "parse-torrent-5.8.3" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.2";
+      version = "5.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz";
-        sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz";
+        sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c";
       };
     };
     "pump-0.3.5" = {
@@ -4810,31 +4819,31 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
-    "magnet-uri-5.1.5" = {
+    "magnet-uri-5.1.6" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
-        sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz";
+        sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3";
       };
     };
-    "parse-torrent-file-4.0.1" = {
+    "parse-torrent-file-4.0.2" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz";
-        sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz";
+        sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe";
       };
     };
-    "simple-get-2.4.0" = {
+    "simple-get-2.5.1" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.4.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
-        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz";
+        sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4963,13 +4972,13 @@ let
         sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
       };
     };
-    "fs-chunk-store-1.6.4" = {
+    "fs-chunk-store-1.6.5" = {
       name = "fs-chunk-store";
       packageName = "fs-chunk-store";
-      version = "1.6.4";
+      version = "1.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz";
-        sha1 = "5aa0025d58533118552e815f5986f39f93b06e69";
+        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz";
+        sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156";
       };
     };
     "hat-0.0.3" = {
@@ -5035,22 +5044,22 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-piece-1.1.0" = {
+    "torrent-piece-1.1.1" = {
       name = "torrent-piece";
       packageName = "torrent-piece";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz";
-        sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
+        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz";
+        sha1 = "50346e42a43b35daf2a86f414afb153629a854be";
       };
     };
-    "random-access-file-1.5.0" = {
+    "random-access-file-1.6.1" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.5.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
-        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz";
+        sha1 = "33358436f43076d34a058db47177a691319f0e99";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5071,6 +5080,15 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
+    "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";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -5368,13 +5386,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.2.2" = {
+    "ws-2.2.3" = {
       name = "ws";
       packageName = "ws";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz";
-        sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01";
+        url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz";
+        sha1 = "f36c9719a56dff813f455af912a2078145bbd940";
       };
     };
     "ultron-1.1.0" = {
@@ -5863,13 +5881,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.17" = {
+    "big-integer-1.6.19" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.17";
+      version = "1.6.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
-        sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz";
+        sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0";
       };
     };
     "sax-1.1.4" = {
@@ -5962,13 +5980,13 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "init-package-json-1.9.5" = {
+    "init-package-json-1.9.6" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.9.5";
+      version = "1.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz";
-        sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz";
+        sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61";
       };
     };
     "nopt-3.0.6" = {
@@ -6061,13 +6079,13 @@ let
         sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
       };
     };
-    "xcode-0.9.1" = {
+    "xcode-0.9.3" = {
       name = "xcode";
       packageName = "xcode";
-      version = "0.9.1";
+      version = "0.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz";
-        sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95";
+        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz";
+        sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3";
       };
     };
     "browserify-transform-tools-1.5.3" = {
@@ -6196,6 +6214,15 @@ let
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
+    "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";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6484,13 +6511,13 @@ let
         sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
       };
     };
-    "type-is-1.6.14" = {
+    "type-is-1.6.15" = {
       name = "type-is";
       packageName = "type-is";
-      version = "1.6.14";
+      version = "1.6.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
-        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz";
+        sha1 = "cab10fb4909e441c82842eafe1ad646c81804410";
       };
     };
     "utils-merge-1.0.0" = {
@@ -6574,13 +6601,13 @@ let
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
-    "npm-package-arg-4.2.1" = {
+    "npm-package-arg-5.0.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "4.2.1";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
-        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz";
+        sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872";
       };
     };
     "promzard-0.3.0" = {
@@ -7150,6 +7177,15 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
+    "npm-package-arg-4.2.1" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
+        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
+      };
+    };
     "request-2.81.0" = {
       name = "request";
       packageName = "request";
@@ -7168,13 +7204,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "form-data-2.1.2" = {
+    "form-data-2.1.4" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
-        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
       };
     };
     "har-validator-4.2.1" = {
@@ -7213,13 +7249,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-4.11.5" = {
+    "ajv-4.11.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.5";
+      version = "4.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
-        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz";
+        sha1 = "947e93049790942b2a2d60a8289b28924d39f987";
       };
     };
     "har-schema-1.0.5" = {
@@ -7501,49 +7537,40 @@ let
         sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
       };
     };
-    "pegjs-0.9.0" = {
+    "pegjs-0.10.0" = {
       name = "pegjs";
       packageName = "pegjs";
-      version = "0.9.0";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz";
-        sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369";
+        url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz";
+        sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd";
       };
     };
-    "simple-plist-0.1.4" = {
+    "simple-plist-0.2.1" = {
       name = "simple-plist";
       packageName = "simple-plist";
-      version = "0.1.4";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz";
-        sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d";
+        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
+        sha1 = "71766db352326928cf3a807242ba762322636723";
       };
     };
-    "bplist-parser-0.0.6" = {
-      name = "bplist-parser";
-      packageName = "bplist-parser";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
-        sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
-      };
-    };
-    "bplist-creator-0.0.4" = {
+    "bplist-creator-0.0.7" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
-      version = "0.0.4";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz";
-        sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991";
+        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz";
+        sha1 = "37df1536092824b87c42f957b01344117372ae45";
       };
     };
-    "stream-buffers-0.2.6" = {
+    "stream-buffers-2.2.0" = {
       name = "stream-buffers";
       packageName = "stream-buffers";
-      version = "0.2.6";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz";
-        sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc";
+        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz";
+        sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
       };
     };
     "async-1.5.2" = {
@@ -7834,13 +7861,13 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.2.0" = {
+    "rc-1.2.1" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz";
-        sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz";
+        sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -8267,13 +8294,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.1" = {
+    "nan-2.6.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.1";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
-        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
+        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
       };
     };
     "jsonparse-0.0.6" = {
@@ -9233,13 +9260,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "espree-3.4.0" = {
+    "espree-3.4.1" = {
       name = "espree";
       packageName = "espree";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz";
-        sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
+        url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz";
+        sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2";
       };
     };
     "esquery-1.0.0" = {
@@ -9287,13 +9314,13 @@ let
         sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
       };
     };
-    "ignore-3.2.6" = {
+    "ignore-3.2.7" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz";
-        sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz";
+        sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd";
       };
     };
     "inquirer-0.12.0" = {
@@ -9314,13 +9341,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.2" = {
+    "js-yaml-3.8.3" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
-        sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
+        sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
       };
     };
     "levn-0.3.0" = {
@@ -9485,13 +9512,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.4" = {
+    "acorn-5.0.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.4";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
-        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz";
+        sha1 = "c460df08491463f028ccb82eab3730bf01087b3d";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -10088,13 +10115,13 @@ let
         sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
       };
     };
-    "arr-flatten-1.0.1" = {
+    "arr-flatten-1.0.2" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz";
-        sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b";
+        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz";
+        sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996";
       };
     };
     "expand-range-1.8.2" = {
@@ -10439,13 +10466,13 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
-    "simple-git-1.69.0" = {
+    "simple-git-1.70.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.69.0";
+      version = "1.70.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz";
-        sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz";
+        sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -10485,13 +10512,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.4" = {
+    "coffee-script-1.12.5" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.4";
+      version = "1.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
-        sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
+        sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
       };
     };
     "jade-1.11.0" = {
@@ -10575,13 +10602,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.20" = {
+    "uglify-js-2.8.22" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.20";
+      version = "2.8.22";
       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-2.8.22.tgz";
+        sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
       };
     };
     "void-elements-2.0.1" = {
@@ -13824,13 +13851,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.21" = {
+    "node-red-node-email-0.1.22" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.21";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz";
-        sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz";
+        sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e";
       };
     };
     "node-red-node-twitter-0.1.10" = {
@@ -13842,13 +13869,13 @@ let
         sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
       };
     };
-    "node-red-node-rbe-0.1.6" = {
+    "node-red-node-rbe-0.1.8" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
-        sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz";
+        sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc";
       };
     };
     "bcrypt-1.0.2" = {
@@ -14031,13 +14058,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.11" = {
+    "moment-timezone-0.5.13" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.11";
+      version = "0.5.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
-        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz";
+        sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
     "content-disposition-0.5.1" = {
@@ -14139,22 +14166,22 @@ let
         sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
       };
     };
-    "help-me-1.0.1" = {
+    "help-me-1.1.0" = {
       name = "help-me";
       packageName = "help-me";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz";
-        sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
+        url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz";
+        sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "mqtt-packet-5.2.2" = {
+    "mqtt-packet-5.3.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.2";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz";
-        sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz";
+        sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206";
       };
     };
     "reinterval-1.1.0" = {
@@ -14193,6 +14220,42 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
+    "glob-stream-6.1.0" = {
+      name = "glob-stream";
+      packageName = "glob-stream";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz";
+        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
+      };
+    };
+    "is-negated-glob-1.0.0" = {
+      name = "is-negated-glob";
+      packageName = "is-negated-glob";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
+        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
+      };
+    };
+    "ordered-read-streams-1.0.0" = {
+      name = "ordered-read-streams";
+      packageName = "ordered-read-streams";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz";
+        sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a";
+      };
+    };
+    "to-absolute-glob-2.0.1" = {
+      name = "to-absolute-glob";
+      packageName = "to-absolute-glob";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz";
+        sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
+      };
+    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -14940,13 +15003,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-4.0.1" = {
+    "mailcomposer-4.0.2" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
-        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz";
+        sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -15075,15 +15138,6 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
-    "hosted-git-info-2.2.0" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
-      };
-    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -15156,15 +15210,6 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "node-gyp-3.5.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -15174,13 +15219,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.6" = {
+    "npm-registry-client-8.1.1" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.6";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz";
-        sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
+        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
       };
     };
     "opener-1.4.3" = {
@@ -15525,13 +15570,13 @@ let
         sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998";
       };
     };
-    "registry-auth-token-3.1.0" = {
+    "registry-auth-token-3.1.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "3.1.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
-        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz";
+        sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf";
       };
     };
     "argparse-0.1.15" = {
@@ -15786,13 +15831,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.26.1" = {
+    "snyk-1.28.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.26.1";
+      version = "1.28.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz";
-        sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz";
+        sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151";
       };
     };
     "spawn-please-0.2.0" = {
@@ -15903,22 +15948,22 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-module-1.7.0" = {
+    "snyk-module-1.8.1" = {
       name = "snyk-module";
       packageName = "snyk-module";
-      version = "1.7.0";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz";
-        sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a";
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
+        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
-    "snyk-policy-1.7.0" = {
+    "snyk-policy-1.7.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz";
-        sha1 = "2151c751ab1edc040fc6b94a872aa989db492324";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz";
+        sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -16318,15 +16363,6 @@ let
         sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
-    "gelf-stream-0.2.4" = {
-      name = "gelf-stream";
-      packageName = "gelf-stream";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
-        sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
-      };
-    };
     "mediawiki-title-0.5.6" = {
       name = "mediawiki-title";
       packageName = "mediawiki-title";
@@ -16383,6 +16419,15 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
+    "yargs-5.0.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+      };
+    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -16437,22 +16482,13 @@ let
         sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
       };
     };
-    "gelfling-0.2.0" = {
-      name = "gelfling";
-      packageName = "gelfling";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
-        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
-      };
-    };
-    "bunyan-1.8.9" = {
+    "bunyan-1.8.10" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.9";
+      version = "1.8.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz";
-        sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz";
+        sha1 = "201fedd26c7080b632f416072f53a90b9a52981c";
       };
     };
     "bunyan-syslog-udp-0.1.0" = {
@@ -16663,6 +16699,15 @@ let
         sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
       };
     };
+    "yargs-parser-3.2.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+      };
+    };
     "airplayer-2.0.0" = {
       name = "airplayer";
       packageName = "airplayer";
@@ -16753,15 +16798,6 @@ let
         sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728";
       };
     };
-    "stream-buffers-2.2.0" = {
-      name = "stream-buffers";
-      packageName = "stream-buffers";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz";
-        sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
-      };
-    };
     "consume-http-header-1.0.0" = {
       name = "consume-http-header";
       packageName = "consume-http-header";
@@ -17545,6 +17581,96 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
+    "ast-types-0.9.8" = {
+      name = "ast-types";
+      packageName = "ast-types";
+      version = "0.9.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz";
+        sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078";
+      };
+    };
+    "babylon-7.0.0-beta.8" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "7.0.0-beta.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz";
+        sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949";
+      };
+    };
+    "flow-parser-0.43.0" = {
+      name = "flow-parser";
+      packageName = "flow-parser";
+      version = "0.43.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz";
+        sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7";
+      };
+    };
+    "jest-validate-19.0.0" = {
+      name = "jest-validate";
+      packageName = "jest-validate";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz";
+        sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173";
+      };
+    };
+    "jest-matcher-utils-19.0.0" = {
+      name = "jest-matcher-utils";
+      packageName = "jest-matcher-utils";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz";
+        sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d";
+      };
+    };
+    "leven-2.1.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    };
+    "pretty-format-19.0.0" = {
+      name = "pretty-format";
+      packageName = "pretty-format";
+      version = "19.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz";
+        sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84";
+      };
+    };
+    "ansi-styles-3.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz";
+        sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1";
+      };
+    };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+      };
+    };
     "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
@@ -18689,22 +18815,13 @@ let
         sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
       };
     };
-    "express-4.14.1" = {
-      name = "express";
-      packageName = "express";
-      version = "4.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
-        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
-      };
-    };
-    "express-session-1.14.2" = {
+    "express-session-1.15.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.2";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
-        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
+        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -18761,13 +18878,13 @@ let
         sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
       };
     };
-    "npm-4.1.2" = {
+    "npm-4.5.0" = {
       name = "npm";
       packageName = "npm";
-      version = "4.1.2";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+        url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
+        sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
       };
     };
     "octicons-3.5.0" = {
@@ -18788,13 +18905,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.5" = {
+    "raven-1.2.1" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.5";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz";
-        sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf";
+        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
+        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
       };
     };
     "signals-1.0.0" = {
@@ -18806,13 +18923,13 @@ let
         sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
       };
     };
-    "snapsvg-0.4.0" = {
+    "snapsvg-0.5.1" = {
       name = "snapsvg";
       packageName = "snapsvg";
-      version = "0.4.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz";
-        sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
+        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz";
+        sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
     "winston-2.3.1" = {
@@ -18824,13 +18941,13 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
+    "yargs-7.1.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+        url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz";
+        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
       };
     };
     "color-string-1.5.2" = {
@@ -18842,15 +18959,6 @@ let
         sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
-      };
-    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -18887,13 +18995,13 @@ let
         sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
       };
     };
-    "crc-3.4.1" = {
+    "crc-3.4.4" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.1";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
-        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
       };
     };
     "broadway-0.2.10" = {
@@ -19022,15 +19130,6 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "mississippi-1.2.0" = {
-      name = "mississippi";
-      packageName = "mississippi";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
-      };
-    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -19049,13 +19148,22 @@ let
         sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
-    "eve-0.4.2" = {
+    "eve-0.5.3" = {
       name = "eve";
       packageName = "eve";
-      version = "0.4.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz";
-        sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
+        url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz";
+        sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42";
+      };
+    };
+    "yargs-parser-5.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz";
+        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
       };
     };
     "kew-0.1.7" = {
@@ -19121,6 +19229,15 @@ let
         sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
       };
     };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
     "loader-runner-2.3.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
@@ -19193,15 +19310,6 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
-      };
-    };
     "os-browserify-0.2.1" = {
       name = "os-browserify";
       packageName = "os-browserify";
@@ -19301,15 +19409,6 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "leven-2.1.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
-      };
-    };
     "node-emoji-1.5.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
@@ -19355,6 +19454,15 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
+    "v8-compile-cache-1.1.0" = {
+      name = "v8-compile-cache";
+      packageName = "v8-compile-cache";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz";
+        sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
+      };
+    };
     "regenerator-runtime-0.10.3" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -19856,10 +19964,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.8";
+    version = "1.9.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz";
-      sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz";
+      sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -19937,10 +20045,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.11";
+    version = "0.10.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz";
-      sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz";
+      sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -19964,7 +20072,7 @@ in
       sources."azure-arm-servermanagement-0.1.2"
       sources."azure-arm-network-0.18.0"
       sources."azure-arm-powerbiembedded-0.1.0"
-      sources."azure-arm-trafficmanager-0.10.5"
+      sources."azure-arm-trafficmanager-0.12.0"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
       sources."azure-arm-rediscache-0.2.3"
@@ -19972,7 +20080,7 @@ in
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
       sources."azure-keyvault-0.11.0"
-      sources."azure-asm-compute-0.17.0"
+      sources."azure-asm-compute-0.18.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-trafficmanager-0.10.3"
       sources."azure-asm-mgmt-0.10.1"
@@ -19993,7 +20101,7 @@ in
           sources."moment-2.14.1"
         ];
       })
-      (sources."azure-storage-2.0.0" // {
+      (sources."azure-storage-2.1.0" // {
         dependencies = [
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
@@ -20145,7 +20253,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
@@ -20162,7 +20270,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.2.0"
+          sources."async-2.3.0"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -20208,7 +20316,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20241,7 +20349,8 @@ in
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."http-response-object-1.1.0"
@@ -20332,7 +20441,7 @@ in
       sources."timed-out-2.0.0"
       sources."end-of-stream-1.0.0"
       sources."inherits-2.0.3"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
@@ -20340,7 +20449,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
@@ -20355,7 +20464,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -20411,7 +20520,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.5.0"
@@ -20435,10 +20544,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.1.0";
+    version = "14.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz";
-      sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz";
+      sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -20450,7 +20559,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.0.5"
+      sources."buffer-5.0.6"
       sources."cached-path-relative-1.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -20468,7 +20577,7 @@ in
       sources."glob-7.1.1"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
-      sources."https-browserify-0.0.1"
+      sources."https-browserify-1.0.0"
       sources."inherits-2.0.3"
       sources."insert-module-globals-7.0.1"
       (sources."labeled-stream-splicer-2.0.0" // {
@@ -20484,12 +20593,16 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      sources."readable-stream-2.2.6"
+      (sources."readable-stream-2.2.9" // {
+        dependencies = [
+          sources."string_decoder-1.0.0"
+        ];
+      })
       sources."resolve-1.3.2"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.3"
+      sources."stream-http-2.7.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       sources."syntax-error-1.3.0"
@@ -20547,7 +20660,7 @@ in
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
-      sources."hmac-drbg-1.0.0"
+      sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -20559,7 +20672,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."function-bind-1.1.0"
@@ -20696,7 +20809,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -20734,7 +20847,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.2" // {
+      (sources."parse-torrent-5.8.3" // {
         dependencies = [
           sources."get-stdin-5.0.1"
         ];
@@ -20785,9 +20898,9 @@ in
       sources."mute-stream-0.0.4"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.5"
-      sources."parse-torrent-file-4.0.1"
-      sources."simple-get-2.4.0"
+      sources."magnet-uri-5.1.6"
+      sources."parse-torrent-file-4.0.2"
+      sources."simple-get-2.5.1"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-0.11.0"
@@ -20807,7 +20920,7 @@ in
       sources."ini-1.1.0"
       sources."bitfield-0.1.0"
       sources."bncode-0.5.3"
-      (sources."fs-chunk-store-1.6.4" // {
+      (sources."fs-chunk-store-1.6.5" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -20821,8 +20934,8 @@ in
       sources."peer-wire-swarm-0.12.1"
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
-      sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.5.0" // {
+      sources."torrent-piece-1.1.1"
+      (sources."random-access-file-1.6.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -20831,6 +20944,7 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
+      sources."buffer-alloc-unsafe-1.0.0"
       sources."inherits-2.0.3"
       sources."ip-1.1.5"
       sources."flatten-0.0.1"
@@ -20852,7 +20966,7 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       (sources."bittorrent-dht-6.4.2" // {
@@ -20882,15 +20996,17 @@ in
       sources."run-series-1.1.4"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
-          sources."ws-2.2.2"
+          sources."readable-stream-2.2.9"
+          sources."ws-2.2.3"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."string2compact-1.2.2"
@@ -20904,6 +21020,7 @@ in
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
@@ -20940,8 +21057,9 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."exit-on-epipe-1.0.0"
@@ -20962,10 +21080,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.4";
+    version = "1.12.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
-      sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
+      sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -21021,14 +21139,14 @@ in
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
       sources."unorm-1.4.1"
-      sources."big-integer-1.6.17"
+      sources."big-integer-1.6.19"
       sources."sax-1.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."os-homedir-1.0.2"
@@ -21062,7 +21180,7 @@ in
           sources."underscore-1.2.1"
         ];
       })
-      (sources."init-package-json-1.9.5" // {
+      (sources."init-package-json-1.9.6" // {
         dependencies = [
           sources."glob-7.1.1"
         ];
@@ -21118,11 +21236,7 @@ in
       })
       sources."tar-1.0.2"
       sources."valid-identifier-0.0.1"
-      (sources."xcode-0.9.1" // {
-        dependencies = [
-          sources."node-uuid-1.4.7"
-        ];
-      })
+      sources."xcode-0.9.3"
       sources."browserify-transform-tools-1.5.3"
       sources."falafel-1.2.0"
       sources."through-2.3.8"
@@ -21190,15 +21304,16 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.6" // {
+      (sources."readable-stream-2.2.9" // {
         dependencies = [
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.3"
+      sources."stream-http-2.7.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.3.0" // {
@@ -21256,7 +21371,7 @@ in
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
-      sources."hmac-drbg-1.0.0"
+      sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -21346,7 +21461,7 @@ in
       sources."serve-static-1.12.1"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
@@ -21356,7 +21471,7 @@ in
       sources."http-errors-1.6.1"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
-      sources."npm-package-arg-4.2.1"
+      sources."npm-package-arg-5.0.1"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
       (sources."read-package-json-2.0.5" // {
@@ -21366,7 +21481,7 @@ in
       })
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-3.0.0"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.6"
@@ -21417,6 +21532,7 @@ in
       sources."npm-install-checks-1.0.7"
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
+          sources."npm-package-arg-4.2.1"
           sources."request-2.81.0"
         ];
       })
@@ -21424,7 +21540,11 @@ in
       sources."npmlog-2.0.4"
       sources."path-is-inside-1.0.2"
       sources."read-installed-4.0.3"
-      sources."realize-package-specifier-3.0.3"
+      (sources."realize-package-specifier-3.0.3" // {
+        dependencies = [
+          sources."npm-package-arg-4.2.1"
+        ];
+      })
       sources."retry-0.10.1"
       (sources."rimraf-2.5.4" // {
         dependencies = [
@@ -21455,7 +21575,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -21471,7 +21591,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."ajv-4.11.5" // {
+      (sources."ajv-4.11.6" // {
         dependencies = [
           sources."json-stable-stringify-1.0.1"
         ];
@@ -21488,7 +21608,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21529,7 +21649,7 @@ in
         ];
       })
       sources."node-uuid-1.4.8"
-      (sources."async-2.2.0" // {
+      (sources."async-2.3.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -21545,14 +21665,16 @@ in
       sources."pinkie-2.0.4"
       sources."isexe-2.0.0"
       sources."ctype-0.5.3"
-      sources."pegjs-0.9.0"
-      (sources."simple-plist-0.1.4" // {
+      sources."pegjs-0.10.0"
+      (sources."simple-plist-0.2.1" // {
         dependencies = [
-          sources."bplist-parser-0.0.6"
+          sources."plist-2.0.1"
+          sources."base64-js-1.1.2"
+          sources."xmlbuilder-8.2.2"
         ];
       })
-      sources."bplist-creator-0.0.4"
-      sources."stream-buffers-0.2.6"
+      sources."bplist-creator-0.0.7"
+      sources."stream-buffers-2.2.0"
       (sources."configstore-1.4.0" // {
         dependencies = [
           sources."uuid-2.0.3"
@@ -21610,7 +21732,7 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."rc-1.2.0"
+      sources."rc-1.2.1"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-2.0.1"
       sources."is-finite-1.0.2"
@@ -21732,7 +21854,7 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.2.1"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
       sources."faye-websocket-0.11.1"
@@ -21835,8 +21957,9 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."pump-1.0.2"
@@ -21849,8 +21972,9 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       (sources."through2-0.6.5" // {
@@ -21874,9 +21998,10 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."once-1.3.3"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."lru-cache-2.7.3"
@@ -21943,7 +22068,7 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."async-2.2.0"
+      sources."async-2.3.0"
       sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
@@ -21959,7 +22084,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -21977,7 +22102,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -21992,7 +22117,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22099,7 +22224,7 @@ in
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -22137,10 +22262,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.18.0";
+    version = "3.19.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz";
-      sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
+      sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
@@ -22149,19 +22274,19 @@ in
       sources."debug-2.6.3"
       sources."doctrine-2.0.0"
       sources."escope-3.6.0"
-      sources."espree-3.4.0"
+      sources."espree-3.4.1"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.1"
       sources."globals-9.17.0"
-      sources."ignore-3.2.6"
+      sources."ignore-3.2.7"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.16.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.2"
+      sources."js-yaml-3.8.3"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -22192,12 +22317,12 @@ in
       sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."ms-0.7.2"
       sources."es6-map-0.1.5"
@@ -22214,7 +22339,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."event-emitter-0.3.5"
       sources."object-assign-4.1.1"
-      sources."acorn-4.0.4"
+      sources."acorn-5.0.3"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -22242,7 +22367,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."ansi-escapes-1.4.0"
@@ -22284,7 +22409,7 @@ in
       sources."rechoir-0.6.2"
       sources."resolve-1.3.2"
       sources."path-parse-1.0.5"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -22428,7 +22553,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -22450,14 +22575,14 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.34"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -22466,7 +22591,7 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -22508,7 +22633,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22526,7 +22651,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -22541,7 +22666,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22578,7 +22703,7 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-0.7.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       (sources."event-stream-0.5.3" // {
@@ -22613,10 +22738,10 @@ in
       sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
-      sources."async-2.2.0"
+      sources."async-2.3.0"
       sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
-      sources."simple-git-1.69.0"
+      sources."simple-git-1.70.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.2"
@@ -22649,7 +22774,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."abbrev-1.1.0"
@@ -22672,7 +22797,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.4"
+      sources."coffee-script-1.12.5"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -22699,7 +22824,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.8.20" // {
+      (sources."uglify-js-2.8.22" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -22747,7 +22872,7 @@ in
       sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22807,8 +22932,9 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."vinyl-0.5.3"
@@ -22865,7 +22991,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -22938,7 +23064,7 @@ in
       sources."glob2base-0.0.12"
       sources."unique-stream-1.0.0"
       sources."inflight-1.0.6"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."find-index-0.1.1"
@@ -23018,7 +23144,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       (sources."cli-0.6.6" // {
@@ -23098,7 +23224,7 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      (sources."js-yaml-3.8.2" // {
+      (sources."js-yaml-3.8.3" // {
         dependencies = [
           sources."esprima-3.1.3"
         ];
@@ -23129,7 +23255,7 @@ in
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       (sources."optimist-0.6.1" // {
@@ -23137,7 +23263,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.8.20" // {
+      (sources."uglify-js-2.8.22" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -23232,7 +23358,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
     ];
@@ -23277,10 +23403,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.2";
+    version = "3.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz";
-      sha1 = "02d3e2c0f6beab20248d412c352203827d786721";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
+      sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -23298,10 +23424,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.5.0";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz";
-      sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
+      url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz";
+      sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -23335,6 +23461,7 @@ in
           sources."readable-stream-1.0.34"
           sources."semver-4.3.6"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."mime-1.3.4"
@@ -23362,7 +23489,7 @@ in
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
       sources."raw-body-2.2.0"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."ms-0.7.2"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
@@ -23394,7 +23521,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -23415,19 +23542,19 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.34"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -23466,7 +23593,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -23481,7 +23608,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -23496,7 +23623,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23540,7 +23667,7 @@ in
       sources."inflight-1.0.6"
       sources."eventemitter3-1.2.0"
       sources."requires-port-1.0.0"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
@@ -23717,7 +23844,7 @@ in
           sources."statuses-1.2.1"
         ];
       })
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."vhost-3.0.2"
       sources."iconv-lite-0.4.11"
       sources."on-finished-2.3.0"
@@ -23786,14 +23913,14 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."xtend-4.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -23804,6 +23931,7 @@ in
           sources."through2-0.6.5"
           sources."readable-stream-1.0.34"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."graceful-fs-4.1.11"
@@ -23837,7 +23965,7 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
@@ -23863,7 +23991,7 @@ in
         ];
       })
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -23969,7 +24097,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."lodash._baseassign-3.2.0"
@@ -24057,15 +24185,15 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -24079,7 +24207,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24097,7 +24225,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -24112,7 +24240,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24143,7 +24271,7 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
@@ -24222,7 +24350,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
@@ -24232,12 +24360,12 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
@@ -24258,7 +24386,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24276,7 +24404,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -24291,7 +24419,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24331,10 +24459,10 @@ in
   node-inspector = nodeEnv.buildNodePackage {
     name = "node-inspector";
     packageName = "node-inspector";
-    version = "1.0.0";
+    version = "1.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz";
-      sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz";
+      sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -24347,7 +24475,7 @@ in
       })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
-      sources."rc-1.2.0"
+      sources."rc-1.2.1"
       sources."semver-4.3.6"
       (sources."serve-favicon-2.4.2" // {
         dependencies = [
@@ -24395,7 +24523,7 @@ in
       sources."bplist-parser-0.1.1"
       sources."meow-3.7.0"
       sources."untildify-2.1.0"
-      sources."big-integer-1.6.17"
+      sources."big-integer-1.6.19"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -24409,7 +24537,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -24465,7 +24593,7 @@ in
       sources."serve-static-1.12.1"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
       sources."mime-types-2.1.15"
@@ -24484,14 +24612,14 @@ in
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."truncate-1.0.5"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       (sources."node-pre-gyp-0.6.34" // {
         dependencies = [
           sources."rimraf-2.6.1"
@@ -24515,12 +24643,12 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
@@ -24535,7 +24663,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24551,7 +24679,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -24566,7 +24694,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24626,7 +24754,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -24646,13 +24774,13 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
@@ -24674,7 +24802,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24692,7 +24820,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -24707,7 +24835,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24740,7 +24868,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."block-stream-0.0.9"
@@ -24805,7 +24933,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -24827,19 +24955,19 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.34"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -24879,7 +25007,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24897,7 +25025,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -24912,7 +25040,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24959,7 +25087,7 @@ in
       sources."lodash._getnative-3.9.1"
       sources."lodash.isarguments-3.1.0"
       sources."lodash.isarray-3.0.4"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."event-stream-3.3.4"
@@ -25083,18 +25211,18 @@ in
       sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.21"
+      sources."node-red-node-email-0.1.22"
       (sources."node-red-node-twitter-0.1.10" // {
         dependencies = [
           sources."request-2.81.0"
           sources."caseless-0.12.0"
-          sources."form-data-2.1.2"
+          sources."form-data-2.1.4"
           sources."har-validator-4.2.1"
           sources."qs-6.4.0"
           sources."tunnel-agent-0.6.0"
         ];
       })
-      sources."node-red-node-rbe-0.1.6"
+      sources."node-red-node-rbe-0.1.8"
       sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
@@ -25104,7 +25232,7 @@ in
       sources."iconv-lite-0.4.13"
       sources."on-finished-2.3.0"
       sources."qs-6.2.0"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."ms-0.7.1"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.2"
@@ -25139,17 +25267,17 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.1"
-      sources."moment-timezone-0.5.11"
+      sources."moment-timezone-0.5.13"
       sources."moment-2.18.1"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
@@ -25193,9 +25321,9 @@ in
       sources."commist-1.0.0"
       sources."concat-stream-1.6.0"
       sources."end-of-stream-1.4.0"
-      sources."help-me-1.0.1"
+      sources."help-me-1.1.0"
       sources."minimist-1.2.0"
-      sources."mqtt-packet-5.2.2"
+      sources."mqtt-packet-5.3.0"
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.1.1"
@@ -25206,86 +25334,28 @@ in
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."callback-stream-1.1.0"
-      (sources."glob-stream-5.3.5" // {
-        dependencies = [
-          sources."through2-0.6.5"
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."glob-stream-6.1.0"
       sources."through2-2.0.3"
       sources."extend-3.0.0"
-      sources."glob-5.0.15"
+      sources."glob-7.1.1"
       sources."glob-parent-3.1.0"
-      (sources."micromatch-2.3.11" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
-      sources."ordered-read-streams-0.3.0"
-      sources."to-absolute-glob-0.1.1"
+      sources."is-negated-glob-1.0.0"
+      sources."ordered-read-streams-1.0.0"
+      sources."pumpify-1.3.5"
+      sources."remove-trailing-separator-1.0.1"
+      sources."to-absolute-glob-2.0.1"
       sources."unique-stream-2.2.1"
+      sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
       sources."is-extglob-2.1.1"
-      sources."arr-diff-2.0.0"
-      sources."array-unique-0.2.1"
-      sources."braces-1.8.5"
-      sources."expand-brackets-0.1.5"
-      (sources."extglob-0.3.2" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-        ];
-      })
-      sources."filename-regex-2.0.0"
-      sources."kind-of-3.1.0"
-      sources."normalize-path-2.1.1"
-      sources."object.omit-2.0.1"
-      (sources."parse-glob-3.0.4" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
-      sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
-      sources."expand-range-1.8.2"
-      sources."preserve-0.2.0"
-      sources."repeat-element-1.1.2"
-      sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
-      sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
-      sources."repeat-string-1.6.1"
-      sources."is-posix-bracket-0.1.1"
-      sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
-      sources."for-own-0.1.5"
-      sources."is-extendable-0.1.1"
-      sources."for-in-1.0.2"
-      (sources."glob-base-0.3.0" // {
-        dependencies = [
-          sources."glob-parent-2.0.0"
-          sources."is-glob-2.0.1"
-          sources."is-extglob-1.0.0"
-        ];
-      })
-      sources."is-dotfile-1.0.2"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-primitive-2.0.0"
       sources."is-stream-1.1.0"
-      sources."extend-shallow-2.0.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."through2-filter-2.0.0"
-      sources."jsonify-0.0.0"
-      sources."bl-1.2.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
@@ -25293,6 +25363,18 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
+      sources."extend-shallow-2.0.1"
+      sources."is-absolute-0.2.6"
+      sources."is-extendable-0.1.1"
+      sources."is-relative-0.2.1"
+      sources."is-windows-0.2.0"
+      sources."is-unc-path-0.1.2"
+      sources."unc-path-regex-0.1.2"
+      sources."json-stable-stringify-1.0.1"
+      sources."through2-filter-2.0.0"
+      sources."jsonify-0.0.0"
+      sources."bl-1.2.0"
+      sources."safe-buffer-5.0.1"
       sources."abbrev-1.1.0"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
@@ -25309,7 +25391,10 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
       sources."sax-1.2.2"
@@ -25320,12 +25405,14 @@ in
           sources."sax-0.6.1"
           sources."readable-stream-1.0.34"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       (sources."request-2.74.0" // {
         dependencies = [
           sources."bl-1.1.2"
           sources."readable-stream-2.0.6"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."addressparser-0.1.3"
@@ -25337,7 +25424,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.2.0"
+          sources."async-2.3.0"
         ];
       })
       sources."har-validator-2.0.6"
@@ -25377,7 +25464,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25409,6 +25496,7 @@ in
         dependencies = [
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."libmime-1.2.0"
@@ -25446,10 +25534,9 @@ in
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
       sources."uuid-3.0.1"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."bindings-1.2.1"
@@ -25458,7 +25545,7 @@ in
         dependencies = [
           sources."request-2.81.0"
           sources."caseless-0.12.0"
-          sources."form-data-2.1.2"
+          sources."form-data-2.1.4"
           sources."har-validator-4.2.1"
           sources."qs-6.4.0"
           sources."tunnel-agent-0.6.0"
@@ -25471,16 +25558,13 @@ in
       })
       sources."npmlog-4.0.2"
       sources."rc-1.1.7"
-      (sources."rimraf-2.5.4" // {
-        dependencies = [
-          sources."glob-7.1.1"
-        ];
-      })
+      sources."rimraf-2.5.4"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
           sources."readable-stream-2.1.5"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."are-we-there-yet-1.1.2"
@@ -25500,7 +25584,6 @@ in
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
@@ -25578,7 +25661,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.4"
+      sources."coffee-script-1.12.5"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -25607,7 +25690,7 @@ in
       sources."tinycolor-0.0.1"
       sources."options-0.0.6"
       sources."zeparser-0.0.5"
-      sources."mailcomposer-4.0.1"
+      sources."mailcomposer-4.0.2"
       sources."simplesmtp-0.3.35"
       sources."optimist-0.6.1"
       sources."buildmail-4.0.1"
@@ -25643,10 +25726,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.4.4";
+    version = "4.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz";
-      sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37";
+      url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
+      sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -25672,12 +25755,12 @@ in
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.2.0"
+      sources."hosted-git-info-2.4.2"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      sources."init-package-json-1.9.5"
+      sources."init-package-json-1.9.6"
       sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
@@ -25688,7 +25771,7 @@ in
       sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
-      (sources."node-gyp-3.5.0" // {
+      (sources."node-gyp-3.6.0" // {
         dependencies = [
           sources."nopt-3.0.6"
         ];
@@ -25699,7 +25782,7 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.1"
-      sources."npm-registry-client-7.4.6"
+      sources."npm-registry-client-8.1.1"
       sources."npm-user-validate-0.1.5"
       sources."npmlog-4.0.2"
       sources."once-1.4.0"
@@ -25711,7 +25794,7 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."realize-package-specifier-3.0.3"
       sources."request-2.81.0"
       sources."retry-0.10.1"
@@ -25725,6 +25808,7 @@ in
           sources."from2-1.3.0"
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."strip-ansi-3.0.1"
@@ -25758,7 +25842,7 @@ in
       sources."proto-list-1.2.4"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.3"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
@@ -25812,7 +25896,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -25820,7 +25904,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -25837,7 +25921,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -25852,7 +25936,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25918,7 +26002,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.0"
       sources."got-6.7.1"
-      sources."registry-auth-token-3.1.0"
+      sources."registry-auth-token-3.1.2"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
@@ -25931,7 +26015,7 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -25989,7 +26073,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.4"
+      sources."coffee-script-1.12.5"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.81.0"
@@ -26007,7 +26091,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -26025,7 +26109,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -26040,7 +26124,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26074,7 +26158,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
@@ -26082,12 +26166,12 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
@@ -26139,10 +26223,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.4";
+    version = "2.10.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz";
-      sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz";
+      sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -26165,7 +26249,7 @@ in
       sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.26.1" // {
+      (sources."snyk-1.28.1" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -26221,7 +26305,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.5" // {
+      (sources."init-package-json-1.9.6" // {
         dependencies = [
           sources."validate-npm-package-name-3.0.0"
         ];
@@ -26264,7 +26348,11 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.1.5"
+      (sources."readable-stream-2.1.5" // {
+        dependencies = [
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."realize-package-specifier-3.0.3"
       sources."request-2.75.0"
       sources."retry-0.10.1"
@@ -26302,7 +26390,7 @@ in
       sources."proto-list-1.2.4"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.3"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
@@ -26337,7 +26425,7 @@ in
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
         ];
       })
       sources."typedarray-0.0.6"
@@ -26345,7 +26433,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -26356,6 +26444,7 @@ in
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."caseless-0.11.0"
@@ -26394,7 +26483,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26442,8 +26531,8 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-module-1.7.0"
-      sources."snyk-policy-1.7.0"
+      sources."snyk-module-1.8.1"
+      sources."snyk-policy-1.7.1"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -26507,7 +26596,7 @@ in
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
-      sources."js-yaml-3.8.2"
+      sources."js-yaml-3.8.3"
       sources."argparse-1.0.9"
       sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
@@ -26537,7 +26626,7 @@ in
       sources."is-obj-1.0.1"
       sources."package-json-2.4.0"
       sources."got-5.7.1"
-      sources."registry-auth-token-3.1.0"
+      sources."registry-auth-token-3.1.2"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer2-0.1.4"
@@ -26555,7 +26644,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -26613,10 +26702,10 @@ in
   parsoid = nodeEnv.buildNodePackage {
     name = "parsoid";
     packageName = "parsoid";
-    version = "0.6.1";
+    version = "0.7.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
-      sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz";
+      sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -26656,8 +26745,7 @@ in
           sources."ms-0.7.1"
         ];
       })
-      sources."gelf-stream-0.2.4"
-      sources."js-yaml-3.8.2"
+      sources."js-yaml-3.8.3"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.8"
@@ -26672,19 +26760,17 @@ in
       })
       (sources."service-runner-2.2.5" // {
         dependencies = [
-          sources."gelf-stream-1.1.1"
           sources."yargs-6.6.0"
-          sources."gelfling-0.3.1"
           sources."camelcase-3.0.0"
           sources."cliui-3.2.0"
         ];
       })
       sources."simplediff-0.1.1"
-      (sources."yargs-4.8.1" // {
+      (sources."yargs-5.0.0" // {
         dependencies = [
           sources."cliui-3.2.0"
           sources."window-size-0.2.0"
-          sources."yargs-parser-2.4.1"
+          sources."yargs-parser-3.2.0"
           sources."camelcase-3.0.0"
         ];
       })
@@ -26698,7 +26784,7 @@ in
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
       sources."raw-body-2.2.0"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."ms-0.7.2"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
@@ -26754,12 +26840,12 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.20" // {
+      (sources."uglify-js-2.8.22" // {
         dependencies = [
           sources."source-map-0.5.6"
           sources."yargs-3.10.0"
@@ -26789,7 +26875,6 @@ in
       sources."object-keys-1.0.11"
       sources."define-properties-1.1.2"
       sources."foreach-2.0.5"
-      sources."gelfling-0.2.0"
       sources."argparse-1.0.9"
       sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
@@ -26799,7 +26884,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -26815,7 +26900,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -26830,7 +26915,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26856,13 +26941,15 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."bluebird-3.5.0"
-      sources."bunyan-1.8.9"
+      sources."bunyan-1.8.10"
       sources."bunyan-syslog-udp-0.1.0"
+      sources."gelf-stream-1.1.1"
       sources."hot-shots-4.4.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."dnscache-1.0.1"
@@ -26870,7 +26957,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -26878,29 +26965,33 @@ in
       })
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
+      sources."gelfling-0.3.1"
       sources."kad-git+https://github.com/gwicke/kad.git#master"
       sources."clarinet-0.11.0"
       sources."colors-1.1.2"
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."buffer-shims-1.0.0"
@@ -26909,8 +27000,9 @@ in
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.0"
         ];
       })
       sources."get-caller-file-1.0.2"
@@ -26946,7 +27038,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -26994,14 +27086,14 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."parse-torrent-5.8.2" // {
+      (sources."parse-torrent-5.8.3" // {
         dependencies = [
           sources."get-stdin-5.0.1"
         ];
       })
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
-      sources."rc-1.2.0"
+      sources."rc-1.2.1"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -27027,15 +27119,15 @@ in
       sources."plist-1.2.0"
       sources."reverse-http-1.2.0"
       sources."stream-buffers-2.2.0"
-      sources."big-integer-1.6.17"
+      sources."big-integer-1.6.19"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
@@ -27084,7 +27176,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -27131,9 +27223,9 @@ in
       sources."is-promise-2.1.0"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.5"
-      sources."parse-torrent-file-4.0.1"
-      sources."simple-get-2.4.0"
+      sources."magnet-uri-5.1.6"
+      sources."parse-torrent-file-4.0.2"
+      sources."simple-get-2.5.1"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-0.11.0"
@@ -27147,7 +27239,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."bitfield-0.1.0"
       sources."bncode-0.5.3"
-      (sources."fs-chunk-store-1.6.4" // {
+      (sources."fs-chunk-store-1.6.5" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -27161,8 +27253,8 @@ in
       sources."peer-wire-swarm-0.12.1"
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
-      sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.5.0" // {
+      sources."torrent-piece-1.1.1"
+      (sources."random-access-file-1.6.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -27171,6 +27263,7 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
+      sources."buffer-alloc-unsafe-1.0.0"
       sources."debug-2.6.3"
       sources."ms-0.7.2"
       sources."flatten-0.0.1"
@@ -27180,6 +27273,7 @@ in
           sources."readable-stream-1.1.14"
           sources."bncode-0.2.3"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."speedometer-0.1.4"
@@ -27190,7 +27284,7 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       (sources."bittorrent-dht-6.4.2" // {
@@ -27221,7 +27315,7 @@ in
       sources."simple-peer-6.4.4"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."ws-2.2.2"
+          sources."ws-2.2.3"
         ];
       })
       sources."string2compact-1.2.2"
@@ -27518,7 +27612,7 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."which-1.2.14"
@@ -27575,7 +27669,7 @@ in
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."is-stream-1.1.0"
@@ -27601,7 +27695,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.2.0"
+      sources."async-2.3.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -27610,7 +27704,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27665,6 +27759,60 @@ in
     };
     production = true;
   };
+  prettier = nodeEnv.buildNodePackage {
+    name = "prettier";
+    packageName = "prettier";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz";
+      sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8";
+    };
+    dependencies = [
+      sources."ast-types-0.9.8"
+      sources."babel-code-frame-6.22.0"
+      sources."babylon-7.0.0-beta.8"
+      sources."chalk-1.1.3"
+      sources."esutils-2.0.2"
+      sources."flow-parser-0.43.0"
+      sources."get-stdin-5.0.1"
+      sources."glob-7.1.1"
+      sources."jest-validate-19.0.0"
+      sources."minimist-1.2.0"
+      sources."js-tokens-3.0.1"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.7"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."jest-matcher-utils-19.0.0"
+      sources."leven-2.1.0"
+      (sources."pretty-format-19.0.0" // {
+        dependencies = [
+          sources."ansi-styles-3.0.0"
+        ];
+      })
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Prettier is an opinionated JavaScript formatter";
+      homepage = "https://github.com/prettier/prettier#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   react-tools = nodeEnv.buildNodePackage {
     name = "react-tools";
     packageName = "react-tools";
@@ -27698,7 +27846,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
@@ -27802,7 +27950,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -27819,7 +27967,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -27834,7 +27982,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27909,14 +28057,14 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.8.2"
+      sources."js-yaml-3.8.3"
       sources."cookies-0.7.0"
       sources."request-2.81.0"
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.9"
+      sources."bunyan-1.8.10"
       sources."handlebars-2.0.0"
       sources."highlight.js-8.9.1"
       sources."lunr-0.7.2"
@@ -27929,6 +28077,7 @@ in
       (sources."readable-stream-1.1.14" // {
         dependencies = [
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."fs-ext-0.6.0"
@@ -27964,7 +28113,7 @@ in
       sources."serve-static-1.12.1"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
       sources."mime-types-2.1.15"
@@ -27994,7 +28143,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -28010,7 +28159,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -28025,7 +28174,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28056,7 +28205,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -28068,7 +28217,7 @@ in
       sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."optimist-0.3.7"
@@ -28088,7 +28237,7 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.6"
+          sources."readable-stream-2.2.9"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -28105,7 +28254,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."jsonparse-1.3.0"
       sources."through-2.3.8"
@@ -28140,9 +28289,9 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."set-immediate-shim-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."buffer-shims-1.0.0"
@@ -28150,7 +28299,7 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -28249,7 +28398,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."mkdirp-0.5.1"
@@ -28261,7 +28410,7 @@ in
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."sshpk-agent-1.2.1"
@@ -28284,11 +28433,11 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."buffer-shims-1.0.0"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
@@ -28326,7 +28475,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."amdefine-1.0.1"
@@ -28397,21 +28546,21 @@ in
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
     ];
@@ -28501,7 +28650,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -28544,7 +28693,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28606,10 +28755,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.8.20";
+    version = "2.8.22";
     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-2.8.22.tgz";
+      sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
     };
     dependencies = [
       sources."source-map-0.5.6"
@@ -28640,10 +28789,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.11";
+    version = "1.1.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz";
-      sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz";
+      sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2";
     };
     dependencies = [
       sources."async-2.1.5"
@@ -28654,12 +28803,24 @@ in
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
       sources."diff2html-2.3.0"
-      sources."express-4.14.1"
-      sources."express-session-1.14.2"
+      (sources."express-4.15.2" // {
+        dependencies = [
+          sources."debug-2.6.1"
+          sources."qs-6.4.0"
+          sources."setprototypeof-1.0.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."express-session-1.15.2" // {
+        dependencies = [
+          sources."debug-2.6.3"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.6"
+      sources."ignore-3.2.7"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.2"
       sources."lodash-4.17.4"
@@ -28668,21 +28829,21 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.17.1"
+      sources."moment-2.18.1"
       sources."node-cache-4.1.1"
-      (sources."npm-4.1.2" // {
+      (sources."npm-4.5.0" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."bluebird-3.5.0"
           sources."nopt-4.0.1"
-          sources."request-2.79.0"
+          sources."request-2.81.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-2.1.2"
+          sources."form-data-2.1.4"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.2"
-          sources."tunnel-agent-0.4.3"
+          sources."qs-6.4.0"
+          sources."tunnel-agent-0.6.0"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
           sources."boom-2.10.1"
@@ -28690,14 +28851,12 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-7.4.6" // {
+      (sources."npm-registry-client-8.1.1" // {
         dependencies = [
           sources."request-2.81.0"
-          sources."caseless-0.12.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-2.1.2"
-          sources."har-validator-4.2.1"
+          sources."form-data-2.1.4"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
@@ -28715,22 +28874,22 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.1.5" // {
+      (sources."raven-1.2.1" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."uuid-3.0.0"
         ];
       })
-      (sources."rc-1.1.7" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
-      sources."serve-static-1.11.2"
+      sources."serve-static-1.12.1"
       sources."signals-1.0.0"
-      sources."snapsvg-0.4.0"
+      sources."snapsvg-0.5.1"
       (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -28749,6 +28908,7 @@ in
           sources."readable-stream-1.0.27-1"
           sources."async-0.9.2"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       (sources."temp-0.8.3" // {
@@ -28762,7 +28922,11 @@ in
           sources."colors-1.0.3"
         ];
       })
-      sources."yargs-6.6.0"
+      (sources."yargs-7.1.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -28772,7 +28936,7 @@ in
       sources."on-finished-2.3.0"
       sources."qs-6.2.0"
       sources."raw-body-2.1.7"
-      sources."type-is-1.6.14"
+      sources."type-is-1.6.15"
       sources."ms-0.7.1"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.2"
@@ -28803,18 +28967,26 @@ in
       sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      sources."finalhandler-0.5.1"
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      (sources."finalhandler-1.0.1" // {
+        dependencies = [
+          sources."debug-2.6.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.2" // {
+      (sources."send-0.15.1" // {
         dependencies = [
+          sources."debug-2.6.1"
+          sources."http-errors-1.6.1"
           sources."ms-0.7.2"
+          sources."setprototypeof-1.0.3"
         ];
       })
       sources."utils-merge-1.0.0"
@@ -28824,7 +28996,7 @@ in
       sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."crc-3.4.1"
+      sources."crc-3.4.4"
       sources."on-headers-1.0.1"
       sources."uid-safe-2.1.4"
       sources."random-bytes-1.0.0"
@@ -28908,11 +29080,13 @@ in
       sources."underscore-1.5.2"
       sources."clone-2.1.1"
       sources."JSONStream-1.3.1"
+      sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."archy-1.0.0"
       sources."asap-2.0.5"
+      sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
@@ -28930,22 +29104,20 @@ in
       })
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.4.2"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
-      (sources."init-package-json-1.9.5" // {
-        dependencies = [
-          sources."validate-npm-package-name-3.0.0"
-        ];
-      })
+      sources."init-package-json-1.9.6"
+      sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      sources."mississippi-1.2.0"
-      (sources."node-gyp-3.5.0" // {
+      sources."mississippi-1.3.0"
+      sources."move-concurrently-1.0.1"
+      (sources."node-gyp-3.6.0" // {
         dependencies = [
           sources."minimatch-3.0.3"
           sources."nopt-3.0.6"
@@ -28967,7 +29139,7 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
       sources."sha-2.0.1"
@@ -28978,6 +29150,7 @@ in
           sources."from2-1.3.0"
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."strip-ansi-3.0.1"
@@ -28986,16 +29159,12 @@ in
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
+      sources."update-notifier-2.1.0"
       sources."uuid-3.0.1"
-      (sources."validate-npm-package-name-2.2.2" // {
-        dependencies = [
-          sources."builtins-0.0.7"
-        ];
-      })
+      sources."validate-npm-package-name-3.0.0"
       sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -29020,13 +29189,12 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
       sources."promzard-0.3.0"
-      sources."builtins-1.0.3"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       sources."concat-stream-1.6.0"
@@ -29039,13 +29207,17 @@ in
       sources."end-of-stream-1.4.0"
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
+      sources."parallel-transform-1.1.0"
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
       sources."through2-2.0.3"
       sources."typedarray-0.0.6"
       sources."stream-shift-1.0.0"
+      sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
+      sources."copy-concurrently-1.0.3"
+      sources."run-queue-1.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
@@ -29069,40 +29241,33 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."extend-3.0.0"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."pinkie-promise-2.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."is-property-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."ajv-4.11.6"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."assert-plus-0.2.0"
       (sources."jsprim-1.4.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29130,23 +29295,70 @@ in
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
+      (sources."boxen-1.0.0" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."chalk-1.1.3"
+      sources."configstore-3.0.0"
+      sources."is-npm-1.0.0"
+      sources."latest-version-3.1.0"
+      sources."lazy-req-2.0.0"
+      sources."semver-diff-2.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."ansi-align-1.1.0"
+      sources."camelcase-4.1.0"
+      sources."cli-boxes-1.0.0"
+      sources."term-size-0.1.1"
+      sources."widest-line-1.0.0"
+      sources."execa-0.4.0"
+      (sources."cross-spawn-async-2.2.5" // {
+        dependencies = [
+          sources."lru-cache-4.0.2"
+        ];
+      })
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-1.0.0"
+      sources."path-key-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
+      sources."dot-prop-4.1.1"
+      sources."unique-string-1.0.0"
+      sources."is-obj-1.0.1"
+      sources."crypto-random-string-1.0.0"
+      sources."package-json-4.0.0"
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.1.2"
+      sources."registry-url-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."get-stream-3.0.0"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+      sources."builtins-1.0.3"
       sources."isexe-2.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
-      sources."ajv-4.11.5"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-2.0.1"
-      sources."eve-0.4.2"
+      sources."eve-0.5.3"
       (sources."engine.io-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -29211,7 +29423,6 @@ in
       sources."formidable-1.0.14"
       sources."cookiejar-2.0.1"
       sources."reduce-component-1.0.1"
-      sources."camelcase-3.0.0"
       sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."get-caller-file-1.0.2"
@@ -29221,13 +29432,19 @@ in
       sources."require-main-filename-1.0.1"
       sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      sources."yargs-parser-4.2.1"
+      (sources."yargs-parser-5.0.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
       sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
@@ -29315,7 +29532,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."is-stream-1.1.0"
@@ -29341,7 +29558,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.2.0"
+      sources."async-2.3.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -29350,7 +29567,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29410,29 +29627,38 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.3.2";
+    version = "2.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz";
-      sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz";
+      sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a";
     };
     dependencies = [
-      sources."acorn-4.0.11"
-      sources."acorn-dynamic-import-2.0.2"
-      sources."ajv-4.11.5"
+      sources."acorn-5.0.3"
+      (sources."acorn-dynamic-import-2.0.2" // {
+        dependencies = [
+          sources."acorn-4.0.11"
+        ];
+      })
+      sources."ajv-4.11.6"
       sources."ajv-keywords-1.5.1"
-      sources."async-2.2.0"
+      sources."async-2.3.0"
       sources."enhanced-resolve-3.1.0"
       sources."interpret-1.0.2"
       sources."json-loader-0.5.4"
+      sources."json5-0.5.1"
       sources."loader-runner-2.3.0"
       sources."loader-utils-0.2.17"
       sources."memory-fs-0.4.1"
       sources."mkdirp-0.5.1"
-      sources."node-libs-browser-2.0.0"
+      (sources."node-libs-browser-2.0.0" // {
+        dependencies = [
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.20" // {
+      (sources."uglify-js-2.8.22" // {
         dependencies = [
           sources."yargs-3.10.0"
         ];
@@ -29453,16 +29679,15 @@ in
       sources."object-assign-4.1.1"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
-      sources."json5-0.5.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
@@ -29480,7 +29705,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.3"
+      sources."stream-http-2.7.0"
       sources."timers-browserify-2.0.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -29520,7 +29745,7 @@ in
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
-      sources."hmac-drbg-1.0.0"
+      sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -29569,7 +29794,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.1"
+      sources."arr-flatten-1.0.2"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -29589,14 +29814,14 @@ in
       sources."binary-extensions-1.8.0"
       sources."minimatch-3.0.3"
       sources."set-immediate-shim-1.0.1"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."nan-2.5.1"
+      sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.34"
       sources."nopt-4.0.1"
       sources."npmlog-4.0.2"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -29634,7 +29859,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -29663,7 +29888,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29729,7 +29954,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -29764,21 +29989,20 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.21.3";
+    version = "0.22.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz";
-      sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz";
+      sha1 = "fd8511dc29225b925be967dc185772cc59de5888";
     };
     dependencies = [
       sources."babel-runtime-6.23.0"
       sources."bytes-2.5.0"
-      sources."camelcase-3.0.0"
+      sources."camelcase-4.1.0"
       sources."chalk-1.1.3"
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
       sources."death-1.1.0"
       sources."debug-2.6.3"
-      sources."defaults-1.0.3"
       sources."detect-indent-5.0.0"
       sources."ini-1.3.4"
       sources."inquirer-3.0.6"
@@ -29802,6 +30026,7 @@ in
       sources."strip-bom-3.0.0"
       sources."tar-2.2.1"
       sources."tar-stream-1.5.2"
+      sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.4.1"
       sources."regenerator-runtime-0.10.3"
@@ -29814,7 +30039,6 @@ in
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."ms-0.7.2"
-      sources."clone-1.0.2"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
@@ -29840,7 +30064,7 @@ in
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
@@ -29868,12 +30092,12 @@ in
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       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."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
@@ -29895,7 +30119,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -29913,7 +30137,7 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -29928,7 +30152,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30097,7 +30321,7 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.6"
+      sources."readable-stream-2.2.9"
       sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
@@ -30108,7 +30332,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
       sources."decamelize-1.2.0"
@@ -30152,7 +30376,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
+      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -30168,7 +30392,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.5"
+      sources."ajv-4.11.6"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
@@ -30183,7 +30407,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.11.0" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30219,7 +30443,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.1"
+      sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -30230,14 +30454,14 @@ in
       sources."strip-indent-1.0.1"
       sources."get-stdin-4.0.1"
       sources."registry-url-3.1.0"
-      (sources."rc-1.2.0" // {
+      (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-2.0.1"
-      sources."registry-auth-token-3.1.0"
+      sources."registry-auth-token-3.1.2"
       sources."execall-1.0.0"
       sources."clone-regexp-1.0.0"
       sources."is-regexp-1.0.0"
@@ -30310,7 +30534,7 @@ in
       sources."walk-2.3.9"
       sources."minimatch-3.0.3"
       sources."foreachasync-3.0.0"
-      sources."brace-expansion-1.1.6"
+      sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."diff-2.2.3"
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 80e6383a6f4..11c4368270c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -49,6 +49,7 @@
 , "peerflix"
 , "peerflix-server"
 , "phantomjs"
+, "prettier"
 , "react-tools"
 , "s3http"
 , "semver"

From 27e750e29bfb921638935d9f86a7e4919ab073d0 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sun, 16 Apr 2017 00:24:53 +0200
Subject: [PATCH 1102/1744] etcd module: fix extraConf manual link

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

diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 1de02d76ba0..7c91462883f 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -119,7 +119,7 @@ in {
     extraConf = mkOption {
       description = ''
         Etcd extra configuration. See
-        <link xlink:href='https://github.com/coreos/etcd/blob/master/Documentation/configuration.md#environment-variables' />
+        <link xlink:href='https://github.com/coreos/etcd/blob/master/Documentation/op-guide/configuration.md#configuration-flags' />
       '';
       type = types.attrsOf types.str;
       default = {};

From fe7fc0b2aec9d56de6187e760daf97e50cd6ecb5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 16 Apr 2017 12:19:58 +0800
Subject: [PATCH 1103/1744] calibre: 2.82.0 -> 2.83.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 39f3a12b90a..8d34a126daa 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.82.0";
+  version = "2.83.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k";
+    sha256 = "1ar6hkcl50lhgwccss759201cqgnwasqmhw9japgnz04fj66w5ln";
   };
 
   patches = [
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
 
   dontUseQmakeConfigure = true;
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
 
   buildInputs = [

From 58db2099b4daf5c0d96913f639307e9494fc504b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 16 Apr 2017 13:52:23 +0800
Subject: [PATCH 1104/1744] spotify: 1.0.52.717 -> 1.0.53.758

Additionally:

 - some minor cleanups
 - define meta.platforms so hydra doesn't try to evaluate at all on i686 instead
   of waiting for "assert" to fail.

As spotify is distributing a i686 version, there really is no reason not to
support that. Someone just has to add support for it.
---
 pkgs/applications/audio/spotify/default.nix | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1d1d0d6a6f0..765f0e9e5a7 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,7 @@ let
   # Please update the stable branch!
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
-  version = "1.0.52.717.g2f08534a-47";
+  version = "1.0.53.758.gde3fc4b2-33";
 
   deps = [
     alsaLib
@@ -51,23 +51,24 @@ in
 stdenv.mkDerivation {
   name = "spotify-${version}";
 
-  src =
-    fetchurl {
-      url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7";
-    };
+  src = fetchurl {
+    url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
+    sha256 = "1sh6bv23yx0fcbmf60c2yyi6411ij85k4jalpjlck2w26nfj1b3g";
+  };
 
   buildInputs = [ dpkg makeWrapper ];
 
+  doConfigure = false;
+  doBuild = false;
+  dontStrip = true;
+  dontPatchELF = true;
+
   unpackPhase = ''
     runHook preUnpack
     dpkg-deb -x $src .
     runHook postUnpack
   '';
 
-  configurePhase = "runHook preConfigure; runHook postConfigure";
-  buildPhase = "runHook preBuild; runHook postBuild";
-
   installPhase =
     ''
       runHook preInstall
@@ -110,13 +111,11 @@ stdenv.mkDerivation {
       runHook postInstall
     '';
 
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.spotify.com/;
     description = "Play music from the Spotify music service";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri ];
+    platforms = [ "x86_64-linux" ];
   };
 }

From 2ec6e82b7fffe354c127f81d7d74e9f8b1dc0c6f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 16 Apr 2017 09:13:32 +0200
Subject: [PATCH 1105/1744] gpxsee: 2.17 -> 4.3

---
 pkgs/applications/misc/gpxsee/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index edc8bbc3f77..493fbd6a7ca 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, qmakeHook }:
+{ stdenv, fetchFromGitHub, qmakeHook, qttools }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "2.17";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "1422kgj972ydasqqm0k02qf3v2py7if2ibri7yjg8awqilacy6by";
+    sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf";
   };
 
-  nativeBuildInputs = [ qmakeHook ];
-  
-  patchPhase = ''
-    sed -i '/lang\/gpxsee_cs.qm/d' gpxsee.qrc
+  nativeBuildInputs = [ qmakeHook qttools ];
+
+  preConfigure = ''
+    lrelease lang/*.ts
   '';
 
   preFixup = ''
     mkdir -p $out/bin
     cp GPXSee $out/bin
   '';
-  
+
   meta = with stdenv.lib; {
     homepage = http://tumic.wz.cz/gpxsee;
     description = "GPX viewer and analyzer";

From 3adc59d5ae6ab94846ce8d8008393c165e9c19d5 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 16 Apr 2017 09:42:37 +0200
Subject: [PATCH 1106/1744] gpxsee: fix open dialog and online maps

---
 pkgs/applications/misc/gpxsee/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 493fbd6a7ca..5b977d13796 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qttools }:
+{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
@@ -11,15 +11,19 @@ stdenv.mkDerivation rec {
     sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf";
   };
 
-  nativeBuildInputs = [ qmakeHook qttools ];
+  nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
 
   preConfigure = ''
+    substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
     lrelease lang/*.ts
   '';
 
   preFixup = ''
-    mkdir -p $out/bin
-    cp GPXSee $out/bin
+    install -Dm755 GPXSee $out/bin/GPXSee
+    wrapQtProgram $out/bin/GPXSee
+
+    mkdir -p $out/share/gpxsee
+    cp pkg/maps.txt $out/share/gpxsee
   '';
 
   meta = with stdenv.lib; {

From 605ce9b2413a18ca43c8843890e4d775b694b58a Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 16 Apr 2017 09:53:05 +0200
Subject: [PATCH 1107/1744] cppcheck: 0.76.1 -> 0.78 (#24937)

* cppcheck: 0.76.1 -> 0.78

* cppcheck: enable rule-file support
---
 pkgs/development/tools/analysis/cppcheck/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index e25cb696a65..a394105faf4 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
+{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.76.1";
+  version = "1.78";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv";
+    sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4";
   };
 
+  buildInputs = [ pcre ];
   nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
 
-  makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg'';
+  makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg HAVE_RULES=yes'';
 
   outputs = [ "out" "man" ];
 

From 9ee21439123db2fdd6be977761507131a91bc892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Apr 2017 10:25:07 +0200
Subject: [PATCH 1108/1744] treewide: remove unused buildEnv parameters

---
 pkgs/applications/editors/lighttable/default.nix               | 2 +-
 .../applications/networking/browsers/google-chrome/default.nix | 2 +-
 pkgs/applications/networking/cluster/panamax/api/default.nix   | 2 +-
 pkgs/development/beam-modules/build-rebar3.nix                 | 2 +-
 pkgs/development/guile-modules/guile-sdl2/default.nix          | 3 +--
 pkgs/os-specific/linux/nvidia-x11/generic.nix                  | 2 +-
 pkgs/tools/audio/darkice/default.nix                           | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 68f5e14891f..74a83c1278a 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem
+{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
 , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
 }:
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index abc314f8569..ef5e32b7cda 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchurl, patchelf, bash
+{ stdenv, fetchurl, patchelf, bash
 
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 3347af83585..6a8fe283491 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
+{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
 , ruby, libxslt, libxml2, sqlite, openssl, docker
 , dataDir ? "/var/lib/panamax-api" }@args:
 
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index de2c6d40d40..224d111026a 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -1,5 +1,5 @@
 { stdenv, writeText, erlang, rebar3, openssl, libyaml,
-  pc, buildEnv, lib }:
+  pc, lib }:
 
 { name, version
 , src
diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix
index 8d98ace71f8..313580fe600 100644
--- a/pkgs/development/guile-modules/guile-sdl2/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl2/default.nix
@@ -8,8 +8,7 @@
   fetchgit,
   guile,
   libtool,
-  pkgconfig,
-  buildEnv
+  pkgconfig
   }:
 stdenv.mkDerivation rec {
   name = "guile-sdl2-${version}";
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4573766b78b..e4e67a6abfd 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -8,7 +8,7 @@
 , preferGtk2 ? false
 }:
 
-{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl
+{ stdenv, callPackage, callPackage_i686, fetchurl
 , kernel ? null, xorg, zlib, perl, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index bb2df52f84c..3cfb9a05b2d 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchurl, pkgconfig
+{ stdenv, fetchurl, pkgconfig
 , libjack2, alsaLib, libpulseaudio
 , faac, lame, libogg, libopus, libvorbis, libsamplerate
 }:

From 5c8ffe0311ca2bdd477cc6bc3c9b101ca75e16e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Apr 2017 10:40:53 +0200
Subject: [PATCH 1109/1744] Python 3.x: do not regenerate _sysconfigdata

This commit fixes several issues:

- as reported in https://github.com/NixOS/nixpkgs/issues/24924 it was
possible that the file _sysconfigdata.pyc was generated after the actual
build of the CPython interpreter. We forgot to regenerate that file
during the build. This is now fixed

- the expression of the 3.3 interpreter now also includes some of the
determinism patches even though the output isn't yet reproducible. The
reason for adding them is that this makes the expressions of the
different interpreters more similar.

- references to -dev packages are now also removed in the 3.6 package,
thereby reducing its closure size
---
 .../python/cpython/3.3/default.nix            | 29 +++++++++++++++----
 .../python/cpython/3.4/default.nix            | 19 +++++-------
 .../python/cpython/3.5/default.nix            | 18 +++++-------
 .../python/cpython/3.6/default.nix            |  7 +++++
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index 3ab0de96704..c561a1ed750 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -50,7 +50,17 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  postPatch = optionalString (x11Support && (tix != null)) ''
+  # Determinism: The interpreter is patched to write null timestamps when compiling python files.
+  # This way python doesn't try to update them when we freeze timestamps in nix store.
+  DETERMINISTIC_BUILD=1;
+  # Determinism: We fix the hashes of str, bytes and datetime objects.
+  PYTHONHASHSEED=0;
+
+  postPatch = ''
+    # Determinism
+    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
+#     # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist.
+  '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';
 
@@ -80,12 +90,17 @@ in stdenv.mkDerivation {
       fi
     done
     touch $out/lib/python${majorVersion}/test/__init__.py
+
     ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
     paxmark E $out/bin/python${majorVersion}
 
     # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
     echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
 
+    # Determinism: Windows installers were not deterministic.
+    # We're also not interested in building Windows installers.
+    find "$out" -name 'wininst*.exe' | xargs -r rm -f
+
     # Use Python3 as default python
     ln -s "$out/bin/idle3" "$out/bin/idle"
     ln -s "$out/bin/pip3" "$out/bin/pip"
@@ -93,18 +108,20 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3" "$out/bin/python"
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-  '';
 
-  postFixup = ''
     # Get rid of retained dependencies on -dev packages, and remove
     # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
     for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
       sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
     done
 
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-
+    # Determinism: rebuild all bytecode
+    # We exclude lib2to3 because that's Python 2 code which fails
+    # We rebuild three times, once for each optimization level
+    find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
   passthru = let
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 58e4f21bb4a..b2a4d849c94 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -132,6 +132,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level
@@ -140,18 +147,6 @@ in stdenv.mkDerivation {
     find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
-  postFixup = ''
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-
-  '';
-
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 082f6ff6789..76f445f7a50 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -134,6 +134,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level
@@ -142,17 +149,6 @@ in stdenv.mkDerivation {
     find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
-  postFixup = ''
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-  '';
-
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 2acca2b8a3c..3c96bf38b6a 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -134,6 +134,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level

From 4ecafcf5b2db712782bb59f1710351c91d03c3df Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 16 Apr 2017 16:52:51 +0800
Subject: [PATCH 1110/1744] quaternion: init at 2017-04-15

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

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
new file mode 100644
index 00000000000..689d47244cb
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "quaternion-git-${version}";
+  version = "2017-04-15";
+
+  # quaternion and tensor share the same libqmatrixclient library as a git submodule
+  #
+  # As all 3 projects are in very early stages, we simply load the submodule.
+  #
+  # At some point in the future, we should separate out libqmatrixclient into its own
+  # derivation.
+
+  src = fetchgit {
+    url             = "https://github.com/Fxrh/Quaternion.git";
+    rev             = "c35475a6755cdb75e2a6c8ca5b943685d07d9707";
+    sha256          = "0cm5j4vdnp5cljfnv5jqf89ccymspaqc6j9bb4c1x891vr42np0m";
+    fetchSubmodules = true;
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ qtbase qtquickcontrols ];
+  nativeBuildInputs = [ cmake makeQtWrapper ];
+
+  cmakeFlags = [
+    "-Wno-dev"
+  ];
+
+  postInstall = ''
+    wrapQtProgram $out/bin/quaternion
+
+    substituteInPlace $out/share/applications/quaternion.desktop \
+      --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://matrix.org/docs/projects/client/quaternion.html;
+    description = "Cross-platform desktop IM client for the Matrix protocol";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit (qtbase.meta) platforms;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db7653a5767..bd7a22b3515 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -654,6 +654,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
+
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 
   blink1-tool = callPackage ../tools/misc/blink1-tool { };

From 99d4ed58616358c71b81370130b3610744370028 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Apr 2017 10:48:58 +0800
Subject: [PATCH 1111/1744] bluetooth: use upstream's recommendation for
 enabling interfaces

bluez no longer recommends spawning "hciconfig <device> up" from a udev rule as
the main bluez daemon now supports automatically enabling power for all devices.

Reference: http://www.bluez.org/release-of-bluez-5-35/
---
 nixos/modules/services/hardware/bluetooth.nix | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index f1fcb436934..4a8cd86b0b1 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -6,9 +6,7 @@ let
   bluez-bluetooth = pkgs.bluez;
   cfg = config.hardware.bluetooth;
 
-in
-
-{
+in {
 
   ###### interface
 
@@ -32,6 +30,8 @@ in
         '';
         description = ''
           Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
+
+          NOTE: We already include [Policy], so any configuration under the Policy group should come first.
         '';
       };
     };
@@ -45,7 +45,12 @@ in
     environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
 
     environment.etc = singleton {
-      source = pkgs.writeText "main.conf" cfg.extraConfig;
+      source = pkgs.writeText "main.conf" ''
+        [Policy]
+        AutoEnable=${lib.boolToString cfg.powerOnBoot}
+
+        ${cfg.extraConfig}
+      '';
       target = "bluetooth/main.conf";
     };
 
@@ -53,29 +58,11 @@ in
     services.dbus.packages = [ bluez-bluetooth ];
     systemd.packages       = [ bluez-bluetooth ];
 
-    services.udev.extraRules = optionalString cfg.powerOnBoot ''
-      ACTION=="add", KERNEL=="hci[0-9]*", ENV{SYSTEMD_WANTS}="bluetooth-power@%k.service"
-    '';
-
     systemd.services = {
       bluetooth = {
         wantedBy = [ "bluetooth.target" ];
         aliases  = [ "dbus-org.bluez.service" ];
       };
-
-      "bluetooth-power@" = mkIf cfg.powerOnBoot {
-        description = "Power up bluetooth controller";
-        after = [
-          "bluetooth.service"
-          "suspend.target"
-          "sys-subsystem-bluetooth-devices-%i.device"
-        ];
-        wantedBy = [ "suspend.target" ];
-
-        serviceConfig.Type      = "oneshot";
-        serviceConfig.ExecStart = "${pkgs.bluez.out}/bin/hciconfig %i up";
-      };
-
     };
 
     systemd.user.services = {

From c2da0fb22c1ccea46995854311fa02eaa9ce8916 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 16 Apr 2017 11:30:10 +0200
Subject: [PATCH 1112/1744] clac: init at 20170416

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd7a22b3515..60bec868987 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -771,6 +771,8 @@ with pkgs;
   cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
 
   ckbcomp = callPackage ../tools/X11/ckbcomp { };
+  
+  clac = callPackage ../tools/misc/clac {};
 
   clasp = callPackage ../tools/misc/clasp { };
 

From 3507da085f6373302385c0c44f7370d095ab5d83 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 14 Apr 2017 13:59:28 +0300
Subject: [PATCH 1113/1744] dropbear: fix static build

Fixes #24839. Also change default sftp-server path to a more canonical.
---
 pkgs/tools/networking/dropbear/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index b1f726ad27d..aeace91df19 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, zlib, enableStatic ? false,
-sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
+{ stdenv, lib, fetchurl, glibc, zlib
+, enableStatic ? false
+, sftpPath ? "/run/current-system/sw/libexec/sftp-server"
+}:
 
 stdenv.mkDerivation rec {
   name = "dropbear-2016.74";
@@ -11,7 +13,7 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = enableStatic;
 
-  configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static";
+  configureFlags = lib.optional enableStatic "LDFLAGS=-static";
 
   CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
 
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     ./pass-path.patch
   ];
 
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
 
   meta = with stdenv.lib; {
     homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html";

From 2f09105f3b6f57f29c1bc2f5469f764315020a8f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 16 Apr 2017 12:58:09 +0300
Subject: [PATCH 1114/1744] mumble_git: 1.3.0-git-2016-04-10 -> 2017-04-16

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index adcfa656eb9..3ec24bb2022 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -123,14 +123,14 @@ let
   };
 
   gitSource = rec {
-    version = "1.3.0-git-2016-04-10";
+    version = "2017-04-16";
     qtVersion = 5;
 
     # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291";
-      sha256 = "07c1r26i0b5z7i787nr4mc60799skdzsh764ckk3gdi76agp2r2z";
+      rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf";
+      sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh";
     };
   };
 in {

From ba7151e2b5a2d2bb9769042f00ed10b31e1f57d1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 16 Apr 2017 12:02:25 +0200
Subject: [PATCH 1115/1744] clac: add missing expression body; thanks @joachifm
 for the catch

---
 pkgs/tools/misc/clac/default.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/clac/default.nix

diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
new file mode 100644
index 00000000000..9fd8711a3d0
--- /dev/null
+++ b/pkgs/tools/misc/clac/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "clac";
+  version = "0.0.0.20170416";
+
+  src = fetchFromGitHub {
+    owner = "soveran";
+    repo = "clac";
+    rev = "828600b01e80166bc435d4d73506f0c3e16f2459";
+    sha256 = "08fhhvjrc7rn5fjjdqlallr76m6ybj3wm5gx407jbgfbky0fj7mb";
+  };
+
+  buildInputs = [];
+  makeFlags = ["PREFIX=$(out)"];
+
+  postInstall = ''
+    mkdir -p "$out/share/doc/${pname}"
+    cp README* LICENSE "$out/share/doc/${pname}"
+  '';
+
+  meta = {
+    inherit version;
+    description = "Interactive stack-based calculator";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/soveran/clac";
+  };
+}

From 2065eea424c40c85c3db953cc757fb1a4d42ee49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Apr 2017 11:33:04 +0200
Subject: [PATCH 1116/1744] mesa: reduce usage of the attribute and explain why

---
 pkgs/applications/audio/x42-plugins/default.nix | 4 ++--
 pkgs/development/tools/godot/default.nix        | 4 ++--
 pkgs/development/tools/vogl/default.nix         | 4 ++--
 pkgs/top-level/all-packages.nix                 | 6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 69288880cb2..a0fcfe81102 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
-, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
+, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
   version = "20161230";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5";
   };
 
-  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
+  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
 
   makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
 
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 7ebbc1b88e3..a2ff8410889 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor
 , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
-, libpulseaudio, mesa, mesa_glu, zlib }:
+, libpulseaudio, mesa_glu, zlib }:
 
 stdenv.mkDerivation rec {
   name    = "godot-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender
-    freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib
+    freetype openssl alsaLib libpulseaudio mesa_glu zlib
   ];
 
   patches = [ ./pkg_config_additions.patch ];
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index f3967b0d923..56f15d62154 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -3,7 +3,7 @@
 , makeQtWrapper, qtbase, qtx11extras
 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
-, freeglut, mesa, mesa_glu
+, freeglut, mesa_glu
 }:
 stdenv.mkDerivation rec {
   name = "vogl-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     qtbase qtx11extras
     libdwarf libjpeg_turbo libunwind lzma tinyxml libX11
     SDL2 SDL2_gfx SDL2_image SDL2_ttf
-    freeglut mesa mesa_glu
+    freeglut mesa_glu
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60bec868987..e899c645c39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9077,10 +9077,12 @@ with pkgs;
     in mo.drivers
   );
 
+  # Please, avoid using this attribute.  It was meant as transitional hack
+  # for packages that assume that libGLU and libGL live in the same prefix.
+  # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether
+  # you need libGLU or not (_glu propagates _noglu).
   mesa = mesaDarwinOr (buildEnv {
     name = "mesa-${mesa_noglu.version}";
-    # FIXME: this causes mesa to have a runtime dependency on
-    # mesa_noglu.dev.
     paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ];
     meta = {
       platforms = lib.platforms.unix;

From 98777646f9524af7fd7a782efc6c7ad41cac796f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Apr 2017 11:58:18 +0200
Subject: [PATCH 1117/1744] wxGTK*: avoid the mesa attribute

Tested building all wxGTK* and execution of codeblocks.
---
 pkgs/development/libraries/wxGTK-2.8/default.nix | 9 +++++----
 pkgs/development/libraries/wxGTK-2.9/default.nix | 9 +++++----
 pkgs/development/libraries/wxGTK-3.0/default.nix | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index e263708c18e..9538f1dd1f8 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
 , gstreamer, gst-plugins-base, GConf, libX11, cairo
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
+, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
+, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
-assert withMesa -> mesa != null;
+assert withMesa -> mesa_glu != null && mesa_noglu != null;
 
 with stdenv.lib;
 
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ]
-    ++ optional withMesa mesa;
+    ++ optional withMesa mesa_glu;
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
     "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
   SEARCH_LIB =
     "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
-    + optionalString withMesa "${mesa.out}/lib ";
+    + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
 
   # Work around a bug in configure.
   NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ];
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index e19f0bc3a76..28cd79b5549 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
 , gstreamer, gst-plugins-base, GConf, setfile
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
+, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
+, compat24 ? false, compat26 ? true, unicode ? true
 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
 }:
 
-assert withMesa -> mesa != null;
+assert withMesa -> mesa_glu != null && mesa_noglu != null;
 
 with stdenv.lib;
 
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
-    ++ optional withMesa mesa
+    ++ optional withMesa mesa_glu
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -39,7 +40,7 @@ stdenv.mkDerivation {
       # allow building on 64-bit
       [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
 
-  SEARCH_LIB = optionalString withMesa "${mesa}/lib";
+  SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
 
   preConfigure = "
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index f40595d4eac..4fea863827f 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
 , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
+, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
+, compat24 ? false, compat26 ? true, unicode ? true
 , withWebKit ? false, webkitgtk2 ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
-assert withMesa -> mesa != null;
+assert withMesa -> mesa_glu != null && mesa_noglu != null;
 assert withWebKit -> webkitgtk2 != null;
 
 with stdenv.lib;
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
-    ++ optional withMesa mesa
+    ++ optional withMesa mesa_glu
     ++ optional withWebKit webkitgtk2
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
@@ -50,7 +51,7 @@ stdenv.mkDerivation {
     ++ optionals withWebKit
       ["--enable-webview" "--enable-webview-webkit"];
 
-  SEARCH_LIB = optionalString withMesa "${mesa}/lib";
+  SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
 
   preConfigure = "
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

From 8356c6ca2f902d2f4d9add71671226130e287258 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 16 Apr 2017 19:42:25 +0800
Subject: [PATCH 1118/1744] handbrake: 1.0.3 -> 1.0.7

---
 pkgs/applications/video/handbrake/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index f62e274874c..7d0cfb45530 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -23,14 +23,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.3";
+  version = "1.0.7";
   name = "handbrake-${version}";
 
   src = fetchFromGitHub {
     owner  = "HandBrake";
     repo   = "HandBrake";
     rev    = "${version}";
-    sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5";
+    sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57";
   };
 
   nativeBuildInputs = [
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     patchShebangs scripts
 
@@ -85,6 +87,11 @@ stdenv.mkDerivation rec {
     cd build
   '';
 
+  # icon-theme.cache belongs in the icon theme, not in individual packages
+  postInstall = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://handbrake.fr/;
     description = "A tool for ripping DVDs into video files";

From 12d44c093dacf3a8151e33951b468e2225ddd1a7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 16 Apr 2017 19:48:52 +0800
Subject: [PATCH 1119/1744] quaternion: get rid of superfluous icon-theme.cache

---
 .../networking/instant-messengers/quaternion/default.nix        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 689d47244cb..781a4a18b9c 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
 
     substituteInPlace $out/share/applications/quaternion.desktop \
       --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {

From 9fc61d0db5016b6b2c220b1bd7c2348d5449aaf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Apr 2017 14:14:51 +0200
Subject: [PATCH 1120/1744] simgrid: fixup sandboxed build after update #24915

---
 pkgs/applications/science/misc/simgrid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index c042e062e50..8a3645705ab 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
        do
          sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
        done
+       patchShebangs ./tools/
     '';
 
   # Fixing the few tests that fail is left as an exercise to the reader.

From 65c99b7d6a021376c67ea684faf6b17137816528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Apr 2017 14:19:31 +0200
Subject: [PATCH 1121/1744] libgit2-glib: 0.24.4 -> 0.25.0

partially addresses #24807
---
 pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
index 6922a7aee1b..b9abde42cbd 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
@@ -1,12 +1,12 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: rec {
-  major = "0.24";
-  minor = "4";
+  major = "0.25";
+  minor = "0";
   name = "libgit2-glib-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz";
-    sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s";
+    sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa";
   };
 }

From ea16d72bf3b5d776bed85e2f879dd827b223d402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Apr 2017 14:20:49 +0200
Subject: [PATCH 1122/1744] gitg: 3.22.0 -> 3.23.90

---
 pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix | 9 ++++-----
 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix     | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
index 8d9ee143ac2..b3646abd6dd 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
@@ -20,12 +20,11 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ shared_mime_info
                             gnome3.gnome_themes_standard ];
 
-  buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
-                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
-                  librsvg libsecret dconf
-                  gobjectIntrospection gnome3.adwaita-icon-theme ];
+  buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas
+                  libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas
+                  librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ];
 
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ];
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=758240
   preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
index bc9e517aceb..5a78b8d0ca6 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gitg-3.22.0";
+  name = "gitg-3.23.90";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz;
-    sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf";
+    url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz;
+    sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg";
   };
 }

From 3e915ae9950128e3bdb9881c02c223a13097904c Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Wed, 12 Apr 2017 18:50:21 +0200
Subject: [PATCH 1123/1744] Adds myself as a maintainer

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 450d880663c..8fa3f117dee 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -461,6 +461,7 @@
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
+  rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
   s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";

From e9380248dd93cf1c7d2f09427c788a2552b2cc12 Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Sun, 16 Apr 2017 14:37:53 +0200
Subject: [PATCH 1124/1744] gdrive: init at 2.1.0

Adds the go-based Google Drive CLI application "gdrive".
---
 .../networking/gdrive/default.nix             | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/gdrive/default.nix

diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix
new file mode 100644
index 00000000000..f39fac2605a
--- /dev/null
+++ b/pkgs/applications/networking/gdrive/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name    = "gdrive-${version}";
+  version = "2.1.0";
+  rev     = "${version}";
+
+  goPackagePath = "github.com/prasmussen/gdrive";
+
+  src = fetchFromGitHub {
+    owner  = "prasmussen";
+    repo   = "gdrive";
+    sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7";
+    inherit rev;
+  };
+
+  meta = with stdenv.lib; {
+    homepage    = https://github.com/prasmussen/gdrive;
+    description = "A command line utility for interacting with Google Drive";
+    platforms   = platforms.linux;
+    license     = licenses.mit;
+    maintainers = [ maintainers.rzetterberg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 800ed948c27..d3ddcbc594f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -940,6 +940,8 @@ with pkgs;
 
   gdrivefs = python27Packages.gdrivefs;
 
+  gdrive = callPackage ../applications/networking/gdrive { };
+
   go-dependency-manager = callPackage ../development/tools/gdm { };
 
   gencfsm = callPackage ../tools/security/gencfsm { };

From d990aa716327abb018e8352dcf7ba2fcfb4fc34c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 20 Feb 2017 19:57:16 +0000
Subject: [PATCH 1125/1744] Refactor nixos-install to separate out filesystem
 build logic

The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
---
 .../modules/installer/tools/nixos-install.sh  | 153 ++++--------------
 .../installer/tools/nixos-prepare-root.sh     | 105 ++++++++++++
 nixos/modules/installer/tools/tools.nix       |  13 +-
 nixos/tests/installer.nix                     |  18 ++-
 pkgs/tools/package-management/nix/default.nix |   5 +-
 5 files changed, 164 insertions(+), 130 deletions(-)
 create mode 100644 nixos/modules/installer/tools/nixos-prepare-root.sh

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 57bc249360e..e2ae2ee9fdf 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -87,38 +87,6 @@ if ! test -e "$mountPoint"; then
     exit 1
 fi
 
-
-# Mount some stuff in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
-mkdir -m 01777 -p $mountPoint/tmp
-mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var
-mkdir -m 0700 -p $mountPoint/root
-mount --rbind /dev $mountPoint/dev
-mount --rbind /proc $mountPoint/proc
-mount --rbind /sys $mountPoint/sys
-mount --rbind / $mountPoint/tmp/root
-mount -t tmpfs -o "mode=0755" none $mountPoint/run
-rm -rf $mountPoint/var/run
-ln -s /run $mountPoint/var/run
-for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done
-for f in /etc/passwd /etc/group;      do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done
-
-cp -Lf "@cacert@" "$mountPoint/tmp/ca-cert.crt"
-export SSL_CERT_FILE=/tmp/ca-cert.crt
-# For Nix 1.7
-export CURL_CA_BUNDLE=/tmp/ca-cert.crt
-
-if [ -n "$runChroot" ]; then
-    if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
-        echo "$0: installation not finished; cannot chroot into installation directory"
-        exit 1
-    fi
-    ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
-    exec chroot $mountPoint "${chrootCommand[@]}"
-fi
-
-
 # Get the path of the NixOS configuration file.
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
@@ -130,121 +98,60 @@ if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then
 fi
 
 
-# Create the necessary Nix directories on the target device, if they
-# don't already exist.
-mkdir -m 0755 -p \
-    $mountPoint/nix/var/nix/gcroots \
-    $mountPoint/nix/var/nix/temproots \
-    $mountPoint/nix/var/nix/userpool \
-    $mountPoint/nix/var/nix/profiles \
-    $mountPoint/nix/var/nix/db \
-    $mountPoint/nix/var/log/nix/drvs
-
-mkdir -m 1775 -p $mountPoint/nix/store
-chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
-
-
-# There is no daemon in the chroot.
-unset NIX_REMOTE
-
-
-# We don't have locale-archive in the chroot, so clear $LANG.
-export LANG=
-export LC_ALL=
-export LC_TIME=
-
-
 # Builds will use users that are members of this group
 extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
 
-
 # Inherit binary caches from the host
+# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... 
 binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')"
 extraBuildFlags+=(--option "binary-caches" "$binary_caches")
 
+nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")"
+export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG"
+unset NIXOS_CONFIG
 
-# Copy Nix to the Nix store on the target device, unless it's already there.
-if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /dev/null; then
-    echo "copying Nix to $mountPoint...."
-    for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do
-        echo "  $i"
-        chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
-        @rsync@/bin/rsync -a $i $mountPoint/nix/store/
-    done
-
-    # Register the paths in the Nix closure as valid.  This is necessary
-    # to prevent them from being deleted the first time we install
-    # something.  (I.e., Nix will see that, e.g., the glibc path is not
-    # valid, delete it to get it out of the way, but as a result nothing
-    # will work anymore.)
-    chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
-fi
+# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough?
 
 
-# Create the required /bin/sh symlink; otherwise lots of things
-# (notably the system() function) won't work.
-mkdir -m 0755 -p $mountPoint/bin
-# !!! assuming that @shell@ is in the closure
-ln -sf @shell@ $mountPoint/bin/sh
+# A place to drop temporary closures
+trap "rm -rf $tmpdir" EXIT
+tmpdir="$(mktemp -d)"
 
+# Build a closure (on the host; we then copy it into the guest)
+function closure() {
+    nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import <nixpkgs> {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\""
+}
 
-# Build hooks likely won't function correctly in the minimal chroot; just disable them.
-unset NIX_BUILD_HOOK
-
-# Make the build below copy paths from the CD if possible.  Note that
-# /tmp/root in the chroot is the root of the CD.
-export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES
-
-p=@nix@/libexec/nix/substituters
-export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl
-
+system_closure="$tmpdir/system.closure"
 
 if [ -z "$closure" ]; then
-    # Get the absolute path to the NixOS/Nixpkgs sources.
-    nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))"
-
-    nixEnvAction="-f <nixpkgs/nixos> --set -A system"
+    expr="(import <nixpkgs/nixos> {}).system"
+    system_root="$(nix-build -E "$expr")"
+    system_closure="$(closure "$expr")"
 else
-    nixpkgs=""
-    nixEnvAction="--set $closure"
+    system_root=$closure
+    # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure
+    # to the filesytem we're preparing. Also delete it on exit!
+    nix-store --export $(nix-store -qR $closure) > $system_closure
 fi
 
-# Build the specified Nix expression in the target store and install
-# it into the system configuration profile.
-echo "building the system configuration..."
-NIX_PATH="nixpkgs=/tmp/root/$nixpkgs:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
-    chroot $mountPoint @nix@/bin/nix-env \
-    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system $nixEnvAction
+channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
+channel_closure="$tmpdir/channel.closure"
+nix-store --export $channel_root > $channel_closure
 
+# Populate the target root directory with the basics
+@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure
 
-# Copy the NixOS/Nixpkgs sources to the target as the initial contents
-# of the NixOS channel.
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
-mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
-srcs=$(nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")
-if [ -z "$noChannelCopy" ] && [ -n "$srcs" ]; then
-    echo "copying NixOS/Nixpkgs sources..."
-    chroot $mountPoint @nix@/bin/nix-env \
-        "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
-fi
-mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
-ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
-
-
-# Get rid of the /etc bind mounts.
-for f in /etc/passwd /etc/group; do [ -f "$f" ] && umount $mountPoint/$f; done
+# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
+chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
 
+mount --rbind /dev $mountPoint/dev
+mount --rbind /proc $mountPoint/proc
+mount --rbind /sys $mountPoint/sys
 
 # Grub needs an mtab.
 ln -sfn /proc/mounts $mountPoint/etc/mtab
 
-
-# Mark the target as a NixOS installation, otherwise
-# switch-to-configuration will chicken out.
-touch $mountPoint/etc/NIXOS
-
-
 # Switch to the new system configuration.  This will install Grub with
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
new file mode 100644
index 00000000000..c374330f846
--- /dev/null
+++ b/nixos/modules/installer/tools/nixos-prepare-root.sh
@@ -0,0 +1,105 @@
+#! @shell@
+
+# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything
+# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image-
+# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs,
+# it could be useful in other contexts as well.
+#
+# Current behavior:
+#  - set up basic filesystem structure
+#  - make Nix store etc.
+#  - copy Nix, system, channel, and misceallaneous closures to target Nix store
+#  - register validity of all paths in the target store
+#  - set up channel and system profiles
+
+# Ensure a consistent umask.
+umask 0022
+
+set -e
+
+mountPoint="$1"
+channel="$2"
+system="$3"
+shift 3
+closures="$@"
+
+PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin"
+
+if ! test -e "$mountPoint"; then
+    echo "mount point $mountPoint doesn't exist"
+    exit 1
+fi
+
+# Create a few of the standard directories in the target root directory.
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
+mkdir -m 01777 -p $mountPoint/tmp
+mkdir -m 0755 -p $mountPoint/tmp/root
+mkdir -m 0755 -p $mountPoint/var
+mkdir -m 0700 -p $mountPoint/root
+
+ln -s /run $mountPoint/var/run
+
+# Create the necessary Nix directories on the target device
+mkdir -m 0755 -p \
+    $mountPoint/nix/var/nix/gcroots \
+    $mountPoint/nix/var/nix/temproots \
+    $mountPoint/nix/var/nix/userpool \
+    $mountPoint/nix/var/nix/profiles \
+    $mountPoint/nix/var/nix/db \
+    $mountPoint/nix/var/log/nix/drvs
+
+mkdir -m 1775 -p $mountPoint/nix/store
+
+# All Nix operations below should operate on our target store, not /nix/store.
+# N.B: this relies on Nix 1.12 or higher
+export NIX_REMOTE=local?root=$mountPoint
+
+# Copy our closures to the Nix store on the target mount point, unless they're already there.
+for i in $closures; do
+    # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`,
+    # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and
+    # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion.
+    if [[ "$i" =~ \.closure$ ]]; then
+        echo "importing serialized closure $i to $mountPoint..."
+        nix-store --import < $i
+    else
+        # There has to be a better way to do this, right?
+        echo "copying closure $i to $mountPoint..."
+        for j in $(perl @pathsFromGraph@ $i); do
+            echo "  $j... "
+            rsync -a $j $mountPoint/nix/store/
+        done
+
+        nix-store --register-validity < $i
+    fi
+done
+
+# Create the required /bin/sh symlink; otherwise lots of things
+# (notably the system() function) won't work.
+if [ ! -x $mountPoint/@shell@ ]; then
+    echo "Error: @shell@ wasn't included in the closure" >&2
+    exit 1
+fi
+mkdir -m 0755 -p $mountPoint/bin
+ln -sf @shell@ $mountPoint/bin/sh
+
+echo "setting the system closure to '$system'..."
+nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system"
+
+ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
+
+# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
+mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
+mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
+mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
+
+if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
+    echo "copying channel..."
+    nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
+fi
+mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
+ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
+
+# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
+touch $mountPoint/etc/NIXOS
+
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index a35f6ad8ae5..a3bae78c0ff 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -4,7 +4,6 @@
 { config, pkgs, modulesPath, ... }:
 
 let
-
   cfg = config.installer;
 
   makeProg = args: pkgs.substituteAll (args // {
@@ -17,6 +16,14 @@ let
     src = ./nixos-build-vms/nixos-build-vms.sh;
   };
 
+  nixos-prepare-root = makeProg {
+    name = "nixos-prepare-root";
+    src = ./nixos-prepare-root.sh;
+
+    nix = pkgs.nixUnstable;
+    inherit (pkgs) perl pathsFromGraph rsync utillinux coreutils;
+  };
+
   nixos-install = makeProg {
     name = "nixos-install";
     src = ./nixos-install.sh;
@@ -26,6 +33,7 @@ let
     cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
     root_uid = config.ids.uids.root;
     nixbld_gid = config.ids.gids.nixbld;
+    prepare_root = nixos-prepare-root;
 
     nixClosure = pkgs.runCommand "closure"
       { exportReferencesGraph = ["refs" config.nix.package.out]; }
@@ -69,6 +77,7 @@ in
 
     environment.systemPackages =
       [ nixos-build-vms
+        nixos-prepare-root
         nixos-install
         nixos-rebuild
         nixos-generate-config
@@ -77,7 +86,7 @@ in
       ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
+      inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild;
     };
 
   };
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 35dd00fe630..3ab3c1bac48 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -34,6 +34,12 @@ let
           boot.loader.systemd-boot.enable = true;
         ''}
 
+        users.extraUsers.alice = {
+          isNormalUser = true;
+          home = "/home/alice";
+          description = "Alice Foobar";
+        };
+
         hardware.enableAllFirmware = lib.mkForce false;
 
         ${replaceChars ["\n"] ["\n  "] extraConfig}
@@ -96,7 +102,7 @@ let
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "boot-after-install" });
 
       # For example to enter LUKS passphrase.
       ${preBootCommands}
@@ -118,11 +124,17 @@ let
       $machine->waitForUnit("swap.target");
       $machine->succeed("cat /proc/swaps | grep -q /dev");
 
+      # Check that the store is in good shape
+      $machine->succeed("nix-store --verify --check-contents >&2");
+
       # Check whether the channel works.
       $machine->succeed("nix-env -iA nixos.procps >&2");
       $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
+      # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon)
+      $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2");
+
       # We need to a writable nix-store on next boot.
       $machine->copyFileFromHost(
           "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
@@ -139,7 +151,7 @@ let
       $machine->shutdown;
 
       # Check whether a writable store build works
-      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "rebuild-switch" });
       ${preBootCommands}
       $machine->waitForUnit("multi-user.target");
       $machine->copyFileFromHost(
@@ -150,7 +162,7 @@ let
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
-      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", "boot-after-rebuild-switch" });
       ${preBootCommands}
       $machine->waitForUnit("network.target");
       $machine->shutdown;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 629c9b68536..eaab261adef 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -131,12 +131,13 @@ in rec {
       sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
     };
 
-    # 1.11.8 doesn't yet have the patch to work on LLVM 4, so we patch it for now. Take this out once
-    # we move to a higher version. I'd pull the specific patch from upstream but it doesn't apply cleanly.
+    # Until 1.11.9 is released, we do this :)
     patchPhase = ''
       substituteInPlace src/libexpr/json-to-value.cc \
         --replace 'std::less<Symbol>, gc_allocator<Value *>' \
                   'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >'
+
+      sed -i '/if (settings.readOnlyMode) {/a curSchema = getSchema();' src/libstore/local-store.cc
     '';
   }) // { perl-bindings = nixStable; };
 

From ab2e09ca11f4a61728b95ba984dad65ba1031c4c Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 16 Apr 2017 12:23:57 -0400
Subject: [PATCH 1126/1744] vscode: 1.11.1 -> 1.11.2

---
 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 b6734d09d0e..3d710296219 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.11.1";
+  version = "1.11.2";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94";
-    "x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc";
-    "x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6";
+    "i686-linux" = "0cd3iwd5aizixfxc6ayrpvx6k1zk8nsfhd8i3rgz4p4zzfnx6ri5";
+    "x86_64-linux" = "1y3qgm7p1vchh02mqgn8d8pxxnifxfs6hbv01q8zjw3gb7m4anw3";
+    "x86_64-darwin" = "1v8x466080rpm0rfiv1mr2adbpia6j5v9pbsspwm0ndc7ly0h71k";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From d3284576d409b79e619935101fe241f94275201d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 16 Apr 2017 18:39:00 +0200
Subject: [PATCH 1127/1744] emscripten: 1.37.3 -> 1.37.9

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 pkgs/development/compilers/emscripten/default.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index b5d2ba66e75..d3d7561ddfb 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
-  rev = "1.37.3";
+  rev = "1.37.9";
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x";
+    sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil";
+    sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 05df6e9359a..351e045b50a 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  rev = "1.37.3";
+  rev = "1.37.9";
   appdir = "share/emscripten";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x";
+    sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp";
     inherit rev;
   };
 

From 1ff676526c3106636ab98595e426b82e486cadcd Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sun, 16 Apr 2017 13:22:56 -0400
Subject: [PATCH 1128/1744] iosevka: 1.12.1 -> 1.12.5

---
 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 ac7dcea31b1..5fde19e0128 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.12.1";
+  version = "1.12.5";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
-    sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj";
+    sha256 = "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi";
   };
 
   sourceRoot = ".";

From 851b58458179915be77f8198c1aa33fbb769f47a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 16 Apr 2017 19:25:36 +0200
Subject: [PATCH 1129/1744] compile uiop/version with uiop, seems needed for
 monolithic bundles in some cases

---
 pkgs/development/lisp-modules/clwrapper/default.nix          | 1 +
 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 6e1b84eb3e9..2088439c61d 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
         (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\")
         (asdf:load-system :uiop :force :all)
         (asdf:load-system :asdf :force :all)
+        (ignore-errors (asdf:load-system :uiop/version :force :all))
       )"' \
       "$out/bin/common-lisp.sh"
   '';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 377f694e7a8..2725c354d35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -134,6 +134,9 @@ in
   plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
   uiop = x: {
+    testSystems = (x.testSystems or ["uiop"]) ++ [
+      "uiop/version"
+    ];
     overrides = y: (x.overrides y) // {
       postInstall = ((x.overrides y).postInstall or "") + ''
         cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop"

From 07dff62ac4fd81d3def9e520073144b63dd31896 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 16 Apr 2017 10:27:19 -0700
Subject: [PATCH 1130/1744] hugo: 0.20.1 -> 0.20.2

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 5702b858d6a..57b844de97b 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.20.1";
+  version = "0.20.2";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1mxg9mp98n32q1qsqd9f9izsq1s18a7jsw8gcyh9vbspdnyghb7q";
+    sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy";
   };
 
   goDeps = ./deps.nix;

From cb624198e8a05f5c1397d74202bee85ed9eacecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sat, 15 Apr 2017 21:25:59 +0200
Subject: [PATCH 1131/1744] git-open: init at 1.3.0

---
 lib/maintainers.nix                           |  1 +
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-open/default.nix        | 32 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-open/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 450d880663c..ed162461d96 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -238,6 +238,7 @@
   jgillich = "Jakob Gillich <jakob@gillich.me>";
   jhhuh = "Ji-Haeng Huh <jhhuh.note@gmail.com>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
+  jlesquembre = "José Luis Lafuente <jl@lafuente.me>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 5546d597e36..6e0338da919 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -70,6 +70,8 @@ rec {
 
   git-octopus = callPackage ./git-octopus { };
 
+  git-open = callPackage ./git-open { };
+
   git-radar = callPackage ./git-radar { };
 
   git-remote-hg = callPackage ./git-remote-hg { };
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
new file mode 100644
index 00000000000..6b696821f1c
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -0,0 +1,32 @@
+{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "git-open-${version}";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "paulirish";
+    repo = "git-open";
+    rev = "v${version}";
+    sha256 = "005am4phf7j4ybc9k1hqsxjb7gv2i56a3axrza866pwwx1ayrhpq";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp git-open $out/bin
+    wrapProgram $out/bin/git-open \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/paulirish/git-open;
+    description = "Open the GitHub page or website for a repository in your browser";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.jlesquembre ];
+  };
+}

From d2e46b9f70219086ebac1813a7322b45fd3ef2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 16 Apr 2017 20:10:44 +0200
Subject: [PATCH 1132/1744] dhcpcd service: clear exit code of exitHook
 (#24909)

* dhcpcd: clear exit code of exitHook

* dhcpcd: restart ntp server in oneshot in exit-hook
---
 nixos/modules/services/networking/dhcpcd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7eeceb7407c..cdba14be21f 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -71,8 +71,7 @@ let
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation. This also
           # applies to openntpd.
-          ${config.systemd.package}/bin/systemctl try-restart ntpd.service
-          ${config.systemd.package}/bin/systemctl try-restart openntpd.service
+          ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true
       fi
 
       ${cfg.runHook}

From c2130eca44633d716aa005c566b63a6952b2600d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 16 Apr 2017 20:41:06 +0200
Subject: [PATCH 1133/1744] logcheck: point homepage to alioth.debian.org

The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all.  Fix by using the
homepage debian points to instead.

Fixes https://github.com/NixOS/nixpkgs/issues/24952
---
 pkgs/tools/system/logcheck/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 9c2a42eeb5a..40cee73dcd2 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail.
       Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
     '';
-    homepage = http://logcheck.org;
+    homepage = http://logcheck.alioth.debian.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bluescreen303 ];
     

From 73a21ae6c93f1d37d68e21c31768f4df6e92e403 Mon Sep 17 00:00:00 2001
From: xNWDD <xNWDD@users.noreply.github.com>
Date: Sun, 16 Apr 2017 20:56:08 +0200
Subject: [PATCH 1134/1744] jucipp: init at 1.2.3 (#24788)

* jucipp: init at 1.2.3

* jucipp: removed imagemagick dependency

was used earlier during package development to raster the icon,
decided it was better to wait for svgs to get fixed, forgot to clean

* juicipp: fix static libraries weren't linking
---
 pkgs/applications/editors/jucipp/default.nix | 73 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/editors/jucipp/default.nix

diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
new file mode 100644
index 00000000000..ae4f1e6ad52
--- /dev/null
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -0,0 +1,73 @@
+{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
+  boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
+  libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
+  coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "juicipp-${version}";
+  version = "1.2.3";
+
+  meta = {
+    homepage = https://github.com/cppit/jucipp;
+    description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ xnwdd ];
+  };
+
+  src = fetchgit {
+    url = "https://github.com/cppit/jucipp.git";
+    rev = "refs/tags/v${version}";
+    deepClone = true;
+    sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [
+    dbus_libs
+    openssl
+    libxml2
+    gnome3.gtksourceview
+    at_spi2_core
+    pcre
+    epoxy
+    boost
+    libXdmcp
+    cmake
+    aspell
+    libgit2
+    libxkbcommon
+    gnome3.gtkmm3
+    libpthreadstubs
+    gnome3.gtksourceviewmm
+    llvmPackages.clang.cc
+    llvmPackages.lldb
+    gnome3.dconf
+  ];
+
+
+  lintIncludes = let
+    p = "arguments.emplace_back(\"-I";
+    e = "\");";
+    v = stdenv.lib.getVersion llvmPackages.clang;
+  in
+    p+llvmPackages.libcxx+"/include/c++/v1"+e
+    +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e
+    +p+glibc.dev+"/include"+e;
+
+  preConfigure = ''
+    sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt
+    sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc
+  '';
+  cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so";
+  postInstall = ''
+    mv $out/bin/juci $out/bin/.juci
+    makeWrapper "$out/bin/.juci" "$out/bin/juci" \
+      --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \
+      --set NO_AT_BRIDGE 1 \
+      --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell"
+  '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a734e1746be..70172e9e102 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2491,6 +2491,8 @@ with pkgs;
 
   jsduck = callPackage ../development/tools/jsduck { };
 
+  jucipp = callPackage ../applications/editors/jucipp { };
+
   jwhois = callPackage ../tools/networking/jwhois { };
 
   k2pdfopt = callPackage ../applications/misc/k2pdfopt { };

From e760c7bd6a76ed27d156d7df3d493af2a9558f11 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxc@cs.arizona.edu>
Date: Sun, 16 Apr 2017 12:09:22 -0700
Subject: [PATCH 1135/1744] openshot-qt: 2.2.0 -> 2.3.1 (#24868)

* openshot-qt: 2.2.0 -> 2.3.1

* openshot-qt: use buildPythonApplication

* openshot: get dialogs in gtk environments working
---
 .../video/openshot-qt/default.nix             | 36 ++++++++-----------
 .../video/openshot-qt/libopenshot.nix         |  4 +--
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 3232e9c089b..656ec1163dc 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,39 +1,33 @@
 { stdenv, fetchFromGitHub
-, doxygen, python3Packages, ffmpeg, libopenshot
-, qtbase, qtmultimedia, makeQtWrapper }:
+, doxygen, python3Packages, libopenshot
+, makeQtWrapper, wrapGAppsHook, gtk3 }:
 
-with stdenv.lib;
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
   name = "openshot-qt-${version}";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
     rev = "v${version}";
-    sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037";
+    sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw";
   };
-    
-  buildInputs =
-  [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ];
 
-  nativeBuildInputs =
-  [ doxygen makeQtWrapper ];
+  nativeBuildInputs = [ doxygen wrapGAppsHook ];
 
-  installPhase = ''
-    mkdir -p $(toPythonPath $out)
-    cp -r src/* $(toPythonPath $out)
-    mkdir -p $out/bin
-    echo "#/usr/bin/env sh" >$out/bin/openshot-qt
-    echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt
-    chmod +x $out/bin/openshot-qt
-    wrapQtProgram $out/bin/openshot-qt \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
+  buildInputs = [ gtk3 ];
+
+  propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ];
+
+
+  preConfigure = ''
+    # tries to create caching directories during install
+    export HOME=$(mktemp -d)
   '';
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://openshot.org/;
     description = "Free, open-source video editor";
     longDescription = ''
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index dd141043169..b45460c426c 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.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f";
+    sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6";
   };
 
   patchPhase = ''

From 71d8ce6f4be68731b9a43e545323d6d9be0ed229 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@users.noreply.github.com>
Date: Sun, 16 Apr 2017 16:08:20 -0400
Subject: [PATCH 1136/1744] nvidia: 340.101 -> 340.102 (#24694)

---
 pkgs/os-specific/linux/nvidia-x11/default.nix   | 10 +++++-----
 pkgs/os-specific/linux/nvidia-x11/fs52243.patch | 14 ++++++++++++++
 pkgs/os-specific/linux/nvidia-x11/generic.nix   | 14 +++++++++++++-
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/fs52243.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index f04ff107ea6..f5e849e95e1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,11 +22,11 @@ in
   };
 
   legacy_340 = generic {
-    version = "340.101";
-    sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz";
-    sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj";
-    settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9";
-    persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0";
+    version = "340.102";
+    sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1";
+    sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib";
+    settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
+    persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
     useGLVND = false;
   };
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
new file mode 100644
index 00000000000..212df64fa61
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
@@ -0,0 +1,14 @@
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -115,7 +115,11 @@
+ };
+ 
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++    .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
++#else
+     .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+     .fops = &nv_drm_fops,
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index e4e67a6abfd..44a96f9bc0d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -43,8 +43,20 @@ let
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
     # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
-    patches = if libsOnly || versionOlder version "375"
+    patches = if libsOnly
               then null
+              else if versionOlder version "340"
+              then null
+              else if versionOlder version "375"
+              then [
+                     (fetchurl {
+                         url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx;
+                         sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l";
+                     })
+                         # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
+                         # with datestamps removed
+                     ./fs52243.patch
+                   ]
               else [ (fetchurl {
                       url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
                      }) ];

From 5042e9d00979c32b33cfb2406fa4e5e0a91db91f Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Sun, 16 Apr 2017 20:58:40 +0000
Subject: [PATCH 1137/1744] network-interfaces-scripted: Add static parameter
 for default gateway

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 720891d518a..f6f104ce7a6 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -120,7 +120,7 @@ let
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway.interface != null)
-                      "dev ${cfg.defaultGateway.interface}"} || true
+                      "dev ${cfg.defaultGateway.interface}"} proto static || true
                 ''}
                 ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
@@ -130,7 +130,7 @@ let
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway6.interface != null)
-                      "dev ${cfg.defaultGateway6.interface}"} || true
+                      "dev ${cfg.defaultGateway6.interface}"} proto static || true
                 ''}
               '';
           };

From c192f77b2b8a5046d0787e7bd7043a0be952713b Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Sun, 16 Apr 2017 17:34:22 -0400
Subject: [PATCH 1138/1744] dbvisualizer: 9.5 -> 9.5.7

---
 pkgs/applications/misc/dbvisualizer/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix
index f6dd06e6c89..7aa19ffb301 100644
--- a/pkgs/applications/misc/dbvisualizer/default.nix
+++ b/pkgs/applications/misc/dbvisualizer/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, jre, coreutils, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "dbvisualizer-9.5";
+  name = "dbvisualizer-9.5.7";
 
   src = fetchurl {
-    url = https://www.dbvis.com/product_download/dbvis-9.5/media/dbvis_unix_9_5.tar.gz;
-    sha256 = "1bdc03039b50807206fd72ecf8ba0b940f5bb0386f483e10b7c0b2fa75cac021";
+    url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz;
+    sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr";
   };
 
   buildInputs = [ makeWrapper ];
-  
+
   installPhase = ''
     mkdir -p $out/bin
     cp -a . $out
-    ln -sf $out/dbvis $out/bin    
+    ln -sf $out/dbvis $out/bin
     wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre}
   '';
-  
+
   meta = {
     description = "The universal database tool";
     homepage = https://www.dbvis.com/;

From 18f5ba5a3e8286f8741b181125a1f92c76a6cdd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Apr 2017 23:35:40 +0200
Subject: [PATCH 1139/1744] brackets: 1.8 -> 1.9

Use rpath instead of buildEnv. Also add cups.

fixes #24775
---
 .../applications/editors/brackets/default.nix | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index bba66366e6b..23cb16c0733 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,28 +1,24 @@
 { stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
 , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }:
+with stdenv.lib;
+
 let
-  bracketsEnv = buildEnv {
-    name = "env-brackets";
-    paths = [
-      gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5
-      dbus.lib systemd.lib
-    ];
-  };
+  bracketsLibs = makeLibraryPath [
+    gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd
+  ];
 in
 stdenv.mkDerivation rec {
   name = "brackets-${version}";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
-    sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42";
+    sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
     name = "${name}.deb";
   };
 
   phases = [ "installPhase" "fixupPhase" ];
 
-  buildInputs = [ makeWrapper ];
-
   installPhase = ''
     mkdir -p $out
     ar p $src data.tar.xz | tar -C $out -xJ
@@ -33,27 +29,26 @@ stdenv.mkDerivation rec {
 
     ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
 
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \
-      $out/opt/brackets/Brackets
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/opt/brackets/Brackets-node
-
-    patchelf \
-      --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \
-      $out/opt/brackets/lib/libcef.so
-
-    wrapProgram $out/opt/brackets/brackets \
-      --prefix LD_LIBRARY_PATH : "${bracketsEnv}/lib:${bracketsEnv}/lib64"
-
     substituteInPlace $out/opt/brackets/brackets.desktop \
       --replace "Exec=/opt/brackets/brackets" "Exec=brackets"
     mkdir -p $out/share/applications
     ln -s $out/opt/brackets/brackets.desktop $out/share/applications/
   '';
 
-  meta = with stdenv.lib; {
+  postFixup = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \
+      $out/opt/brackets/Brackets
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${bracketsLibs}" \
+      $out/opt/brackets/Brackets-node
+
+    patchelf --set-rpath "${bracketsLibs}" \
+      $out/opt/brackets/lib/libcef.so
+  '';
+
+  meta = {
     description = "An open source code editor for the web, written in JavaScript, HTML and CSS";
     homepage = http://brackets.io/;
     license = licenses.mit;

From f5fa05677d941c8d27d0852de9b43f7e2148ae04 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sat, 15 Apr 2017 21:11:34 +0200
Subject: [PATCH 1140/1744] thunderbird: (re)add features lost in refactoring

The refactoring in b023370f3757a76acb244e647f29e388e076cab0 ported
changes from firefox-unwrpped, but dropped features in firefox's
wrapper.

Add the desktop item and remove useless dev files.
---
 .../mailreaders/thunderbird/default.nix       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 69286202823..54d7723026a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -15,6 +15,7 @@
   # Mozilla Foundation, see
   # http://www.mozilla.org/foundation/trademarks/.
   enableOfficialBranding ? false
+, makeDesktopItem
 }:
 
 stdenv.mkDerivation rec {
@@ -107,6 +108,32 @@ stdenv.mkDerivation rec {
 
       # Needed to find Mozilla runtime
       gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
+
+      # TODO: Move to a dev output?
+      rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
+
+      ${ let desktopItem = makeDesktopItem {
+          name = "thunderbird";
+          exec = "$out/bin/thunderbird %U";
+          desktopName = "Thunderbird";
+          icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png";
+          genericName = "Main Reader";
+          categories = "Application;Network";
+          mimeType = stdenv.lib.concatStringsSep ";" [
+            # Email
+            "x-scheme-handler/mailto"
+            "message/rfc822"
+            # Newsgroup
+            "x-scheme-handler/news"
+            "x-scheme-handler/snews"
+            "x-scheme-handler/nntp"
+            # Feed
+            "x-scheme-handler/feed"
+            "application/rss+xml"
+            "application/x-extension-rss"
+          ];
+        }; in desktopItem.buildCommand
+      }
     '';
 
   postFixup =

From af416aae81c03f61db690b2154d49bb654234a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Apr 2017 00:25:26 +0200
Subject: [PATCH 1141/1744] cargo: remove unnecessary rm

Since cargo build became a rust package, postInstall hook was no longer
called. When the hook was reenabled in
cdd11368426380db545cad84c76e350e5e201adc, it revealed that scripts
leftover from the component based installer are no longer present.
---
 pkgs/development/compilers/rust/cargo.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index f0d7e0dabc2..2d4d6ad4db1 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -24,12 +24,6 @@ rustPlatform.buildRustPackage rec {
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
   postInstall = ''
-    rm "$out/lib/rustlib/components" \
-       "$out/lib/rustlib/install.log" \
-       "$out/lib/rustlib/rust-installer-version" \
-       "$out/lib/rustlib/uninstall.sh" \
-       "$out/lib/rustlib/manifest-cargo"
-
     # NOTE: We override the `http.cainfo` option usually specified in
     # `.cargo/config`. This is an issue when users want to specify
     # their own certificate chain as environment variables take

From 62b1bd180f91ec90e719b9116e73f65e259c27e7 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Thu, 13 Apr 2017 12:08:05 -0800
Subject: [PATCH 1142/1744] pythonPackages.iso-639: init at 0.4.5

---
 .../python-modules/iso-639/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/iso-639/default.nix

diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix
new file mode 100644
index 00000000000..f44bb7caf3d
--- /dev/null
+++ b/pkgs/development/python-modules/iso-639/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "iso-639";
+  version = "0.4.5";
+
+  src = fetchurl {
+    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
+    sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/noumar/iso639;
+    description = "ISO 639 library for Python";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ zraexy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59bf5fa1007..4c3a74974fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13273,6 +13273,8 @@ in {
       license = with licenses; [ lgpl21 ];
     };
   };
+  
+  iso-639 = callPackage ../development/python-modules/iso-639 {};
 
   iso8601 = buildPythonPackage rec {
     name = "iso8601-${version}";

From ab031bf9b72da792c1d55a5db08331abc63fd0e6 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Thu, 13 Apr 2017 12:14:00 -0800
Subject: [PATCH 1143/1744] pythonPackages.iso3166: init at 0.8

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

diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
new file mode 100644
index 00000000000..d85860a5986
--- /dev/null
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+ 
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "iso3166";
+  version = "0.8";
+
+  src = fetchurl {
+    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
+    sha256 = "fbeb17bed90d15b1f6d6794aa2ea458e5e273a1d29b6f4939423c97640e14933";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/deactivated/python-iso3166;
+    description = "Self-contained ISO 3166-1 country definitions";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zraexy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c3a74974fc..495c661aeba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13275,6 +13275,8 @@ in {
   };
   
   iso-639 = callPackage ../development/python-modules/iso-639 {};
+  
+  iso3166 = callPackage ../development/python-modules/iso3166 {};
 
   iso8601 = buildPythonPackage rec {
     name = "iso8601-${version}";

From 51770c85e49b42c6aaa5ebfd9cb37171e8374863 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Thu, 13 Apr 2017 12:18:55 -0800
Subject: [PATCH 1144/1744] streamlink: 0.3.0 -> 0.5.0

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

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 462d74c9672..163218c0478 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }:
+{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.3.0";
+  version = "0.5.0";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = "${version}";
-    sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j";
+    sha256 = "08q7f1fnm3zhs1knrkl6npr4yvpblqbiwa0m9r186ny11jq2dyib";
   };
 
-  propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ];
+  buildInputs = with pythonPackages; [ pytest mock ];
+
+  propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests2 iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/streamlink/streamlink;
@@ -25,6 +27,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.dezgeg ];
+    maintainers = with maintainers; [ dezgeg zraexy ];
   };
 }

From a7d2be1471bb31bb047027aa0d3f06370926e0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Apr 2017 00:47:12 +0200
Subject: [PATCH 1145/1744] pythonPackages.iso3166: enable tests

fixes #24884
---
 .../python-modules/iso3166/default.nix        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index d85860a5986..4d9792ebbb8 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl, buildPythonPackage }:
- 
+{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "iso3166";
   version = "0.8";
 
-  src = fetchurl {
-    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
-    sha256 = "fbeb17bed90d15b1f6d6794aa2ea458e5e273a1d29b6f4939423c97640e14933";
+  src = fetchFromGitHub {
+    owner = "deactivated";
+    repo = "python-iso3166";
+    # repo has no version tags
+    rev = "f04e499447bbff10af701cf3dd81f6bcdf02f7d7";
+    sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx";
   };
 
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/deactivated/python-iso3166;
     description = "Self-contained ISO 3166-1 country definitions";

From da9a147b7bf851644f8809fea99ae9b2f6b3cdeb Mon Sep 17 00:00:00 2001
From: Andrew Miloradovsky <miloradovsky@gmail.com>
Date: Sat, 15 Apr 2017 08:02:28 +0000
Subject: [PATCH 1146/1744] dale: init at 20170416

Lisp-flavoured C. Dale is a system (no GC) programming language
that uses S-expressions for syntax and supports syntactic macros.
---
 pkgs/development/compilers/dale/default.nix | 35 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/compilers/dale/default.nix

diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
new file mode 100644
index 00000000000..d1fb9b21243
--- /dev/null
+++ b/pkgs/development/compilers/dale/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }:
+
+let version = "20170416";
+    doCheck = false;
+in stdenv.mkDerivation {
+  name = "dale-${version}";
+
+  src = fetchFromGitHub {
+    owner = "tomhrr";
+    repo = "dale";
+    rev = "ecc5ea91efef8a263c7dddd6925983df5b5258b2";
+    sha256 = "0naly7jsfriiqf68q210ay9ppcvidbwwcxksy5zwy1m17aq5kxaw";
+  };
+
+  buildInputs = [ cmake libffi llvm_35 ] ++
+                stdenv.lib.optional doCheck perl;
+
+  inherit doCheck;
+
+  checkTarget = "tests";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Lisp-flavoured C";
+    longDescription = ''
+      Dale is a system (no GC) programming language that uses
+      S-expressions for syntax and supports syntactic macros.
+    '';
+    homepage = "https://github.com/tomhrr/dale";
+    license = licenses.mit;
+    maintainers = with maintainers; [ amiloradovsky ];
+    platforms = platforms.linux;  # fails on Darwin, linking vs. FFI
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffc1b066d84..c4c58e019c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -826,6 +826,8 @@ with pkgs;
 
   daemontools = callPackage ../tools/admin/daemontools { };
 
+  dale = callPackage ../development/compilers/dale { };
+
   dante = callPackage ../servers/dante { };
 
   datamash = callPackage ../tools/misc/datamash { };

From 5ca1646bb0404a21dcfc4b3842f0651c1d19b3cc Mon Sep 17 00:00:00 2001
From: Tim Stewart <tim@stoo.org>
Date: Sun, 16 Apr 2017 02:39:02 -0400
Subject: [PATCH 1147/1744] docker: improve reproducibility of layers

This patch fixes file modification times to $SOURCE_DATE_EPOCH, and
ensures that files originating from the store are owned by root:root.
Both changes improve reproducibility, and the latter allows proper
building on a host where the store is owned by a non-root user.
---
 pkgs/build-support/docker/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 27575053954..7f63664dadd 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -209,7 +209,7 @@ rec {
 
       postMount = ''
         echo "Packing raw image..."
-        tar -C mnt --mtime=0 -cf $out .
+        tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
       '';
     };
 
@@ -247,7 +247,7 @@ rec {
         echo "Adding contents..."
         for item in $contents; do
           echo "Adding $item"
-          rsync -ak $item/ layer/
+          rsync -ak --chown=0:0 $item/ layer/
         done
       else
         echo "No contents to add to layer."
@@ -260,7 +260,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --mtime=0 -cf $out/layer.tar .
+      tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -310,7 +310,7 @@ rec {
         echo "Adding contents..."
         for item in ${toString contents}; do
           echo "Adding $item..."
-          rsync -ak $item/ layer/
+          rsync -ak --chown=0:0 $item/ layer/
         done
       '';
 
@@ -340,7 +340,7 @@ rec {
 
         echo "Packing layer..."
         mkdir $out
-        tar -C layer --mtime=0 -cf $out/layer.tar .
+        tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
@@ -467,7 +467,8 @@ 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=0 --no-recursion --files-from newFiles
+        tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
+          --owner=0 --group=0 --no-recursion --files-from newFiles
 
         echo "Adding meta..."
 
@@ -496,7 +497,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime=0 -c . | pigz -nT > $out
+        tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From a0466f7f226b82dd22863b6dc222c9a13d16abd5 Mon Sep 17 00:00:00 2001
From: Roman Kuznetsov <roman@kuznero.com>
Date: Mon, 27 Mar 2017 15:26:31 +0200
Subject: [PATCH 1148/1744] fsharp: 4.0.1.1 -> 4.1.7

Build F# with default mono version

Introduce separate fsharp41 packages
---
 .../compilers/fsharp41/default.nix            | 87 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 pkgs/top-level/dotnet-packages.nix            | 77 ++++++++++++++++
 3 files changed, 168 insertions(+)
 create mode 100644 pkgs/development/compilers/fsharp41/default.nix

diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
new file mode 100644
index 00000000000..35e6749659e
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -0,0 +1,87 @@
+# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
+
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }:
+
+stdenv.mkDerivation rec {
+  name = "fsharp-${version}";
+  version = "4.1.7";
+
+  src = fetchurl {
+    url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
+    sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl";
+  };
+
+  buildInputs = [
+    pkgconfig
+    autoconf
+    automake
+    which
+    mono
+    dotnetbuildhelpers
+    dotnetPackages.FsCheck262
+    dotnetPackages.FSharpCompilerTools
+    dotnetPackages.FSharpCore
+    dotnetPackages.FSharpData225
+    dotnetPackages.FsLexYacc704
+    dotnetPackages.MicrosoftDiaSymReader
+    dotnetPackages.MicrosoftDiaSymReaderPortablePdb
+    dotnetPackages.NUnit350
+    dotnetPackages.SystemCollectionsImmutable131
+    dotnetPackages.SystemReflectionMetadata
+    dotnetPackages.SystemValueTuple
+  ];
+
+  configurePhase = ''
+    substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh"
+    ./autogen.sh --prefix $out
+  '';
+
+  preBuild = ''
+    substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true"
+    substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" ""
+    substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" ""
+    substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" ""
+    substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" ""
+
+    rm -rf packages
+    mkdir packages
+
+    ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2
+    ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4
+    ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
+    ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5
+    ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4
+    ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0
+    ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0
+    ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0
+    ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1
+    ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2
+    ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0
+  '';
+
+  # Make sure the executables use the right mono binary,
+  # and set up some symlinks for backwards compatibility.
+  postInstall = ''
+    substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono "
+    substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono "
+    substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
+    ln -s $out/bin/fsharpc $out/bin/fsc
+    ln -s $out/bin/fsharpi $out/bin/fsi
+    for dll in "$out/lib/mono/fsharp"/FSharp*.dll
+    do
+      create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
+    done
+  '';
+
+  # To fix this error when running:
+  # The file "/nix/store/path/whatever.exe" is an not a valid CIL image
+  dontStrip = true;
+
+  meta = {
+    description = "A functional CLI language";
+    homepage = "http://fsharp.org/";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
+    platforms = with stdenv.lib.platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70172e9e102..5401d3c4d62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5259,6 +5259,10 @@ with pkgs;
 
   fsharp = callPackage ../development/compilers/fsharp { };
 
+  fsharp41 = callPackage ../development/compilers/fsharp41 {
+    mono = mono46;
+  };
+
   fstar = callPackage ../development/compilers/fstar {
     ocamlPackages = ocaml-ng.ocamlPackages_4_02;
   };
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 71f2326b937..ac4c5eaac64 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -46,6 +46,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net40/*" ];
   };
 
+  FSharpCore = fetchNuGet {
+    baseName = "FSharp.Core";
+    version = "4.0.0.1";
+    sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn";
+    outputFiles = [ "*" ];
+  };
+
+  FSharpData225 = fetchNuGet {
+    baseName = "FSharp.Data";
+    version = "2.2.5";
+    sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724";
+    outputFiles = [ "*" ];
+  };
+
   FSharpDataSQLProvider = fetchNuGet {
     baseName = "SQLProvider";
     version = "0.0.9-alpha";
@@ -60,6 +74,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net45/*" ];
   };
 
+  FsCheck262 = fetchNuGet {
+    baseName = "FsCheck";
+    version = "2.6.2";
+    sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl";
+    outputFiles = [ "*" ];
+  };
+
   FsCheckNunit = fetchNuGet {
     baseName = "FsCheck.Nunit";
     version = "1.0.4";
@@ -67,6 +88,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net45/*" ];
   };
 
+  FSharpCompilerTools = fetchNuGet {
+    baseName = "FSharp.Compiler.Tools";
+    version = "4.1.4";
+    sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8";
+    outputFiles = [ "*" ];
+  };
+
   FsLexYacc = fetchNuGet {
     baseName = "FsLexYacc";
     version = "6.1.0";
@@ -74,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "build/*" ];
   };
 
+  FsLexYacc704 = fetchNuGet {
+    baseName = "FsLexYacc";
+    version = "7.0.4";
+    sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi";
+    outputFiles = [ "*" ];
+  };
+
   FsPickler = fetchNuGet {
     baseName = "FsPickler";
     version = "1.2.9";
@@ -102,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  NUnit350 = fetchNuGet {
+    baseName = "NUnit";
+    version = "3.5.0";
+    sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z";
+    outputFiles = [ "*" ];
+  };
+
   NUnit2 = fetchNuGet {
     baseName = "NUnit";
     version = "2.6.4";
@@ -153,6 +195,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "tools/*" ];
   };
 
+  SystemValueTuple = fetchNuGet {
+    baseName = "System.ValueTuple";
+    version = "4.3.0";
+    sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88";
+    outputFiles = [ "*" ];
+  };
+
   RestSharp = fetchNuGet {
     baseName = "RestSharp";
     version = "105.2.3";
@@ -195,6 +244,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  MicrosoftDiaSymReader = fetchNuGet {
+    baseName = "Microsoft.DiaSymReader";
+    version = "1.1.0";
+    sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88";
+    outputFiles = [ "*" ];
+  };
+
+  MicrosoftDiaSymReaderPortablePdb = fetchNuGet {
+    baseName = "Microsoft.DiaSymReader.PortablePdb";
+    version = "1.2.0";
+    sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz";
+    outputFiles = [ "*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";
@@ -210,6 +273,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ];
   };
 
+  SystemCollectionsImmutable131 = fetchNuGet {
+    baseName = "System.Collections.Immutable";
+    version = "1.3.1";
+    sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2";
+    outputFiles = [ "*" ];
+  };
+
+  SystemReflectionMetadata = fetchNuGet {
+    baseName = "System.Reflection.Metadata";
+    version = "1.4.2";
+    sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i";
+    outputFiles = [ "*" ];
+  };
+
   Suave = fetchNuGet {
     baseName = "Suave";
     version = "0.29.0";

From f029fc8cdc10dc8648761c3fa1aac128c55586f5 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Mon, 17 Apr 2017 03:49:43 -0500
Subject: [PATCH 1149/1744] csscompressor: init at 0.9.4 (#24946)

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

diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor.nix
new file mode 100644
index 00000000000..a9aad8d40e5
--- /dev/null
+++ b/pkgs/development/python-modules/csscompressor.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "csscompressor";
+  version = "0.9.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b";
+  };
+
+  doCheck = false; # No tests
+
+  meta = {
+    description = "A python port of YUI CSS Compressor";
+    homepage = https://pypi.python.org/pypi/csscompressor;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [stdenv.lib.maintainers.ahmedtd];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 495c661aeba..fc9e96cc5f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2524,6 +2524,8 @@ in {
     doCheck = false; # lazy packager
   };
 
+  csscompressor = callPackage ../development/python-modules/csscompressor.nix {};
+
   csvkit = buildPythonPackage rec {
     name = "csvkit-${version}";
     version = "0.9.1";

From 3efdf24584774b85237ce7c7c99009a291464af6 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Mon, 17 Apr 2017 03:50:57 -0500
Subject: [PATCH 1150/1744] htmlmin: init at 0.1.10 (#24945)

---
 pkgs/development/python-modules/htmlmin.nix | 20 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix          |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/htmlmin.nix

diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix
new file mode 100644
index 00000000000..35f86479a4e
--- /dev/null
+++ b/pkgs/development/python-modules/htmlmin.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "htmlmin";
+  version = "0.1.10";
+  name = "${pname}-${version}";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63";
+  };
+
+  # Tests run fine in a normal source checkout, but not when being built by nix.
+  doCheck = false;
+
+  meta = {
+    description = "A configurable HTML Minifier with safety features";
+    homepage = https://pypi.python.org/pypi/htmlmin;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [stdenv.lib.maintainers.ahmedtd];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc9e96cc5f6..a3e0b3feaa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7749,6 +7749,9 @@ in {
     };
   });
 
+
+  htmlmin = callPackage ../development/python-modules/htmlmin.nix {};
+
   httpauth = buildPythonPackage rec {
     version = "0.3";
     name = "httpauth-${version}";

From 2d1115b9de1326f6b3359f796f773e15a46ed09e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 17 Apr 2017 17:06:14 +0800
Subject: [PATCH 1151/1744] sensu: 0.28.0 -> 0.29.0

---
 pkgs/servers/monitoring/sensu/Gemfile.lock | 33 ++++++++++--------
 pkgs/servers/monitoring/sensu/gemset.nix   | 40 +++++++++++++---------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index ee425b6edf9..0d01c227145 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -12,51 +12,54 @@ GEM
     em-worker (0.0.2)
       eventmachine
     eventmachine (1.2.2)
-    ffi (1.9.17)
-    oj (2.14.6)
+    ffi (1.9.18)
+    oj (2.18.1)
     parse-cron (0.1.4)
-    sensu (0.28.0)
+    sensu (0.29.0)
       em-http-server (= 0.1.8)
       eventmachine (= 1.2.2)
       parse-cron (= 0.1.4)
       sensu-extension (= 1.5.1)
-      sensu-extensions (= 1.7.1)
-      sensu-json (= 2.0.1)
+      sensu-extensions (= 1.9.0)
+      sensu-json (= 2.1.0)
       sensu-logger (= 1.2.1)
-      sensu-redis (= 2.1.0)
-      sensu-settings (= 9.9.0)
+      sensu-redis (= 2.1.1)
+      sensu-settings (= 10.0.0)
       sensu-spawn (= 2.2.1)
       sensu-transport (= 7.0.2)
     sensu-extension (1.5.1)
       eventmachine
-    sensu-extensions (1.7.1)
+    sensu-extensions (1.9.0)
       sensu-extension
+      sensu-extensions-check-dependencies (= 1.0.1)
       sensu-extensions-debug (= 1.0.0)
       sensu-extensions-json (= 1.0.0)
-      sensu-extensions-occurrences (= 1.1.0)
+      sensu-extensions-occurrences (= 1.2.0)
       sensu-extensions-only-check-output (= 1.0.0)
       sensu-extensions-ruby-hash (= 1.0.0)
       sensu-json (>= 1.1.0)
       sensu-logger
       sensu-settings
+    sensu-extensions-check-dependencies (1.0.1)
+      sensu-extension
     sensu-extensions-debug (1.0.0)
       sensu-extension
     sensu-extensions-json (1.0.0)
       sensu-extension
-    sensu-extensions-occurrences (1.1.0)
+    sensu-extensions-occurrences (1.2.0)
       sensu-extension
     sensu-extensions-only-check-output (1.0.0)
       sensu-extension
     sensu-extensions-ruby-hash (1.0.0)
       sensu-extension
-    sensu-json (2.0.1)
-      oj (= 2.14.6)
+    sensu-json (2.1.0)
+      oj (= 2.18.1)
     sensu-logger (1.2.1)
       eventmachine
       sensu-json
-    sensu-redis (2.1.0)
+    sensu-redis (2.1.1)
       eventmachine
-    sensu-settings (9.9.0)
+    sensu-settings (10.0.0)
       parse-cron
       sensu-json (>= 1.1.0)
     sensu-spawn (2.2.1)
@@ -76,4 +79,4 @@ DEPENDENCIES
   sensu
 
 BUNDLED WITH
-   1.14.4
+   1.14.6
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 273496e2fb4..1df8d419cb6 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -50,18 +50,18 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
       type = "gem";
     };
-    version = "1.9.17";
+    version = "1.9.18";
   };
   oj = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk";
+      sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f";
       type = "gem";
     };
-    version = "2.14.6";
+    version = "2.18.1";
   };
   parse-cron = {
     source = {
@@ -74,10 +74,10 @@
   sensu = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx";
+      sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7";
       type = "gem";
     };
-    version = "0.28.0";
+    version = "0.29.0";
   };
   sensu-extension = {
     source = {
@@ -90,10 +90,18 @@
   sensu-extensions = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g";
+      sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.9.0";
+  };
+  sensu-extensions-check-dependencies = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2";
+      type = "gem";
+    };
+    version = "1.0.1";
   };
   sensu-extensions-debug = {
     source = {
@@ -114,10 +122,10 @@
   sensu-extensions-occurrences = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja";
+      sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.0";
   };
   sensu-extensions-only-check-output = {
     source = {
@@ -138,10 +146,10 @@
   sensu-json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4";
+      sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.1.0";
   };
   sensu-logger = {
     source = {
@@ -154,18 +162,18 @@
   sensu-redis = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg";
+      sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   sensu-settings = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i";
+      sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli";
       type = "gem";
     };
-    version = "9.9.0";
+    version = "10.0.0";
   };
   sensu-spawn = {
     source = {

From 5a7b029fa97bed4831684d4038b509fb9f3fa9b1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 17 Apr 2017 07:41:19 -0400
Subject: [PATCH 1152/1744] linux: 4.11-rc6 -> 4.11-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 491e006378b..932c6602842 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11-rc6";
-  modDirVersion = "4.11.0-rc6";
+  version = "4.11-rc7";
+  modDirVersion = "4.11.0-rc7";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1lrljxlx6s9rfwbzsl9ixhihf53rm7bwwah9756ar2siimrncvmr";
+    sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5";
   };
 
   features.iwlwifi = true;

From 10eef8c19687bac5628054a129044db9807c468e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2017 12:36:29 +0200
Subject: [PATCH 1153/1744] rustup: init at 1.2.0

---
 doc/languages-frameworks/rust.md              |  4 +-
 .../0001-use-hardcoded-dynamic-linker.patch   | 75 +++++++++++++++++++
 .../development/tools/rust/rustup/default.nix | 55 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 4 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch
 create mode 100644 pkgs/development/tools/rust/rustup/default.nix

diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 657e1642d2d..ef6ebc392b3 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -17,8 +17,8 @@ into the `environment.systemPackages` or bring them into scope with
 `nix-shell -p rustStable.rustc -p rustStable.cargo`.
 
 There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regulary. For daily builds see
-[Using the Rust nightlies overlay](#using-the-rust-nightlies-overlay)
+These are not updated very regulary. For daily builds use either rustup from
+nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
 
 ## Packaging Rust applications
 
diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch
new file mode 100644
index 00000000000..3b429c1745e
--- /dev/null
+++ b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch
@@ -0,0 +1,75 @@
+From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Sat, 15 Apr 2017 20:42:10 +0200
+Subject: [PATCH] use hardcoded dynamic-linker
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ src/rustup-cli/common.rs |  3 ++-
+ src/rustup/toolchain.rs  | 22 ++++++++++++++++++++--
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs
+index 1abf345..21096e7 100644
+--- a/src/rustup-cli/common.rs
++++ b/src/rustup-cli/common.rs
+@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String {
+     if toolchain.exists() {
+         let rustc_path = toolchain.binary_file("rustc");
+         if utils::is_file(&rustc_path) {
+-            let mut cmd = Command::new(&rustc_path);
++            let mut cmd = Command::new("@dynamicLinker@");
++            cmd.arg(&rustc_path);
+             cmd.arg("--version");
+             toolchain.set_ldpath(&mut cmd);
+ 
+diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs
+index dc29c32..212a4ab 100644
+--- a/src/rustup/toolchain.rs
++++ b/src/rustup/toolchain.rs
+@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> {
+             }
+             Path::new(&binary)
+         };
+-        let mut cmd = Command::new(&path);
++        let mut cmd = wrap_elf_interpreter(&path);
+         self.set_env(&mut cmd);
+         Ok(cmd)
+     }
+@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> {
+         } else {
+             src_file
+         };
+-        let mut cmd = Command::new(exe_path);
++        let mut cmd = wrap_elf_interpreter(exe_path);
+         self.set_env(&mut cmd);
+         cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name);
+         Ok(cmd)
+@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> {
+         path
+     }
+ }
++
++fn wrap_elf_interpreter<S: AsRef<OsStr>>(p: S) -> Command {
++    use std::fs::File;
++    use std::io::Read;
++    let path = Path::new(&p);
++    let is_elf = File::open(path).map(|mut f| {
++        let mut buf = [0; 4];
++        let _ = f.read(&mut buf);
++        buf == b"\x7fELF"[..]
++    }).unwrap_or(false);
++    if is_elf {
++        let mut cmd = Command::new("@dynamicLinker@");
++        cmd.arg(&path);
++        cmd
++    } else {
++        Command::new(&path)
++    }
++}
+-- 
+2.12.2
+
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
new file mode 100644
index 00000000000..b9e6a0e2d81
--- /dev/null
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, lib, runCommand
+, fetchFromGitHub, rustPlatform
+, pkgconfig, curl, Security }:
+
+rustPlatform.buildRustPackage rec {
+  name = "rustup-${version}";
+  version = "1.2.0";
+
+  depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2";
+
+  src = fetchFromGitHub {
+    owner = "rust-lang-nursery";
+    repo = "rustup.rs";
+    rev = version;
+    sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    curl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  cargoBuildFlags = [ "--features no-self-update" ];
+
+  patches = lib.optionals stdenv.isLinux [
+    (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } ''
+       export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
+       substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out
+    '')
+  ];
+
+  postInstall = ''
+    pushd $out/bin
+    mv rustup-init rustup
+    for link in cargo rustc rustdoc rust-gdb rust-lldb; do
+      ln -s rustup $link
+    done
+    popd
+
+    # tries to create .rustup
+    export HOME=$(mktemp -d)
+    mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions}
+    $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup"
+    $out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish"
+    $out/bin/rustup completions zsh >  "$out/share/zsh/site-functions/_rustup"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Rust toolchain installer";
+    homepage = https://www.rustup.rs/;
+    license = licenses.mit;
+    maintainer = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d114f5db15..f4c154c4ada 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -771,7 +771,7 @@ with pkgs;
   cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
 
   ckbcomp = callPackage ../tools/X11/ckbcomp { };
-  
+
   clac = callPackage ../tools/misc/clac {};
 
   clasp = callPackage ../tools/misc/clasp { };
@@ -5610,6 +5610,9 @@ with pkgs;
   rustracer = callPackage ../development/tools/rust/racer { };
   rustracerd = callPackage ../development/tools/rust/racerd { };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };
+  rustup = callPackage ../development/tools/rust/rustup {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};

From 9747994a7b0be071c5f242cb8424abb190279c68 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 17 Apr 2017 11:41:22 -0300
Subject: [PATCH 1154/1744] vivaldi: 1.6.689.34-1 -> 1.8.770.56-1

Add $out/opt/vivaldi/lib to RPATH so that libffmpeg.so distributed
with Vivaldi can be found. Otherwise launching Vivaldi fails.
---
 .../networking/browsers/vivaldi/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index ab010653c64..ed07225dd8d 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,16 +10,16 @@
 }:
 
 let
-  version = "1.6";
-  build = "689.34-1";
+  version = "1.8";
+  build = "770.56-1";
   fullVersion = "stable_${version}.${build}";
 
   info = if stdenv.is64bit then {
       arch = "amd64";
-      sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm";
+      sha256 = "1f9cwr41rl0mqwg3xn2nfb5xnr0h0vc4wiz8367bd67zf4an61d2";
     } else {
       arch = "i386";
-      sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0";
+      sha256 = "1240w3gqn5rbvkb0v1g66syrc92r1vzk82fkmvy92qsnx0d5z7nn ";
     };
 
 in stdenv.mkDerivation rec {
@@ -47,7 +47,8 @@ in stdenv.mkDerivation rec {
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.is64bit)
-      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs)
+    + ":$out/opt/vivaldi/lib";
 
   buildPhase = ''
     echo "Patching Vivaldi binaries"

From 5a5db609e5bd83bc589f36eef394f3ad172d6648 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 17 Apr 2017 01:49:57 +0200
Subject: [PATCH 1155/1744] command-not-found: add options

add option to disable command-not-found as well as option to define dbPath.
Disabling this may remove the perl dependency for bash/zsh prompts
---
 .../command-not-found/command-not-found.nix   | 93 +++++++++++--------
 .../command-not-found/command-not-found.pl    |  2 +-
 2 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 9741aa7ca53..6fb926fe1d5 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -8,13 +8,14 @@
 with lib;
 
 let
-
+  cfg = config.programs.command-not-found;
   commandNotFound = pkgs.substituteAll {
     name = "command-not-found";
     dir = "bin";
     src = ./command-not-found.pl;
     isExecutable = true;
     inherit (pkgs) perl;
+    inherit (cfg) dbPath;
     perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")
       [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);
   };
@@ -22,50 +23,66 @@ let
 in
 
 {
+  options.programs.command-not-found = {
 
-  programs.bash.interactiveShellInit =
-    ''
-      # This function is called whenever a command is not found.
-      command_not_found_handle() {
-        local p=/run/current-system/sw/bin/command-not-found
-        if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then
-          # Run the helper program.
-          $p "$@"
-          # Retry the command if we just installed it.
-          if [ $? = 126 ]; then
-            "$@"
+    enable = mkEnableOption "command-not-found hook for interactive shell";
+
+    dbPath = mkOption {
+      default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ;
+      description = ''
+        Absolute path to programs.sqlite.
+
+        By default this file will be provided by your channel
+        (nixexprs.tar.xz).
+      '';
+      type = types.path;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.bash.interactiveShellInit =
+      ''
+        # This function is called whenever a command is not found.
+        command_not_found_handle() {
+          local p=${commandNotFound}
+          if [ -x $p -a -f ${cfg.dbPath} ]; then
+            # Run the helper program.
+            $p "$@"
+            # Retry the command if we just installed it.
+            if [ $? = 126 ]; then
+              "$@"
+            else
+              return 127
+            fi
           else
+            echo "$1: command not found" >&2
             return 127
           fi
-        else
-          echo "$1: command not found" >&2
-          return 127
-        fi
-      }
-    '';
+        }
+      '';
 
-  programs.zsh.interactiveShellInit =
-    ''
-      # This function is called whenever a command is not found.
-      command_not_found_handler() {
-        local p=/run/current-system/sw/bin/command-not-found
-        if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then
-          # Run the helper program.
-          $p "$@"
+    programs.zsh.interactiveShellInit =
+      ''
+        # This function is called whenever a command is not found.
+        command_not_found_handler() {
+          local p=${commandNotFound}
+          if [ -x $p -a -f ${cfg.dbPath} ]; then
+            # Run the helper program.
+            $p "$@"
 
-          # Retry the command if we just installed it.
-          if [ $? = 126 ]; then
-            "$@"
+            # Retry the command if we just installed it.
+            if [ $? = 126 ]; then
+              "$@"
+            fi
+          else
+            # Indicate than there was an error so ZSH falls back to its default handler
+            echo "$1: command not found" >&2
+            return 127
           fi
-        else
-          # Indicate than there was an error so ZSH falls back to its default handler
-          return 127
-        fi
-      }
-    '';
+        }
+      '';
 
-  environment.systemPackages = [ commandNotFound ];
-
-  # TODO: tab completion for uninstalled commands! :-)
+    environment.systemPackages = [ commandNotFound ];
+  };
 
 }
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl
index 5bdda26592e..ab7aa204653 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixos/modules/programs/command-not-found/command-not-found.pl
@@ -8,7 +8,7 @@ use Config;
 
 my $program = $ARGV[0];
 
-my $dbPath = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite";
+my $dbPath = "@dbPath@";
 
 my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
     or die "cannot open database `$dbPath'";

From d857b2d2fa2fb35969e3be087d776dfb3287ec55 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Mon, 17 Apr 2017 16:12:20 +0200
Subject: [PATCH 1156/1744] broadcom-sta: fix linux-4.8 patch sha

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

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index c548b55105d..cb65b9d8403 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
     ./gcc.patch
     (fetchpatch {
       name = "linux-4.8.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
-      sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f";
+      sha256 = "0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a";
     })
   ];
 

From 4f5391e8c4c063ca5bb3df7ad0c4dd28cb393001 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 17 Apr 2017 10:13:16 -0500
Subject: [PATCH 1157/1744] dropbox: 23.4.18 -> 23.4.19

Dropbox is again updated without a release announcement. I noticed on Friday
that the client was malfunctioning. I was waiting for a release announcement
with the new version number, but as one was not forthcoming, I simply guessed at it.
---
 pkgs/applications/networking/dropbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e6b5b8ca067..93d2ec93aca 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "23.4.18";
+  version = "23.4.19";
   sha256 =
     {
-      "x86_64-linux" = "0hil9dnhmq4d4yq277w48ql3nw8yfzjqgafb0waw6zbc6a18l7bz";
-      "i686-linux"   = "15hcmqyfyx8z7qx3val5r7b9plckh50iy0mxxh2z1wbh96l03l3a";
+      "x86_64-linux" = "09vjic4yi6g6rbliz4b56swqdpjgw0m7gs2n40xhvbqfd35prafs";
+      "i686-linux"   = "0i2x2s7p1lq315z8198wjlfqr5lqj3mxdcqxz44skrbkmqfd9hab";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From b47e0227bcf33fc8900c7513b7785210dd859cee Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Mon, 17 Apr 2017 09:41:29 -0700
Subject: [PATCH 1158/1744] elm-format: symlink latest version to
 `bin/elm-format` (#24971)

* elm-format: symlink latest version to `bin/elm-format`

* elm-format: nitpick: indentation
---
 pkgs/development/compilers/elm/packages/elm-format.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 48eafff6f72..6fb36d7cbfb 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -29,6 +29,9 @@ mkDerivation {
     tasty-hunit tasty-quickcheck text union-find wl-pprint
   ];
   jailbreak = true;
+  postInstall = ''
+    ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
+  '';
   homepage = "http://elm-lang.org";
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;

From aeaa79dc82980869a88a5955ea3cd3e1944b7d80 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 17 Apr 2017 21:32:55 +0200
Subject: [PATCH 1159/1744] ratpoison: 1.4.8 -> 1.4.9

Contains changes that require updating user configs:

- command `compat' and the various def* compat commands were removed
- `msgwait', `rudeness', `startupmessage', `warp' are now variables

See http://git.savannah.nongnu.org/cgit/ratpoison.git/tree/NEWS
---
 .../window-managers/ratpoison/default.nix       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 81080386689..fec3ae63132 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -1,22 +1,29 @@
 { stdenv, fetchurl, pkgconfig, perl, autoconf, automake
 , libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi
-, fontconfig, freetype, readline
+, libXrandr, fontconfig, freetype, readline
 }:
 
 stdenv.mkDerivation rec {
   name = "ratpoison-${version}";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchurl {
     url = "mirror://savannah/ratpoison/${name}.tar.xz";
-    sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains";
+    sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
   };
 
   outputs = [ "out" "contrib" "doc" "info" ];
 
+  configureFlags = [
+    # >=1.4.9 requires this even with readline in inputs
+    "--enable-history"
+  ];
+
+  nativeBuildInputs = [ pkgconfig autoconf automake ];
+
   buildInputs =
-    [ pkgconfig perl autoconf automake
-      libX11 inputproto libXt libXpm libXft libXtst xextproto libXi
+    [ perl
+      libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr
       fontconfig freetype readline ];
 
   postInstall = ''

From eb8f604456516b22045f1f49707da98fd7c3e3fd Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 16 Apr 2017 09:57:02 +0200
Subject: [PATCH 1160/1744] thunderbird: fix default mail client detection

---
 .../mailreaders/thunderbird/default.nix       | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 54d7723026a..cd4b93189fa 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -6,7 +6,7 @@
 , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
 , autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, enableGTK3 ? false, gtk3, wrapGAppsHook
+, enableGTK3 ? false, gtk3, wrapGAppsHook, makeWrapper
 , enableCalendar ? true
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird" instead
@@ -18,7 +18,9 @@
 , makeDesktopItem
 }:
 
-stdenv.mkDerivation rec {
+let
+  wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
+in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
   version = "52.0";
 
@@ -47,8 +49,8 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optional enableGTK3 gtk3;
 
-  # from firefox + m4
-  nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python ] ++ lib.optional enableGTK3 wrapGAppsHook;
+  # from firefox + m4 + wrapperTool
+  nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ];
 
   configureFlags =
     [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
@@ -101,20 +103,42 @@ stdenv.mkDerivation rec {
       paxmark m ../objdir/dist/bin/xpcshell
     '';
 
+  dontWrapGApps = true; # we do it ourselves
   postInstall =
     ''
       # For grsecurity kernels
       paxmark m $out/lib/thunderbird-[0-9]*/thunderbird
 
-      # Needed to find Mozilla runtime
-      gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
-
       # TODO: Move to a dev output?
       rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
 
+      # $binary is a symlink to $target.
+      # We wrap $target by replacing the $binary symlink.
+      local target="$out/lib/thunderbird-${version}/thunderbird"
+      local binary="$out/bin/thunderbird"
+
+      # Wrap correctly, this is needed to
+      # 1) find Mozilla runtime, because argv0 must be the real thing,
+      #    or a symlink thereto. It cannot be the wrapper itself
+      # 2) detect itself as the default mailreader across builds
+      gappsWrapperArgs+=(
+        --argv0 "$target"
+        --set MOZ_APP_LAUNCHER thunderbird
+      )
+      ${
+        # We wrap manually because wrapGAppsHook does not detect the symlink
+        # To mimic wrapGAppsHook, we run it with dontWrapGApps, so
+        # gappsWrapperArgs gets defined correctly
+        lib.optionalString enableGTK3 "wrapGAppsHook"
+      }
+
+      # "$binary" is a symlink, replace it by the wrapper
+      rm "$binary"
+      makeWrapper "$target" "$binary" "''${gappsWrapperArgs[@]}"
+
       ${ let desktopItem = makeDesktopItem {
           name = "thunderbird";
-          exec = "$out/bin/thunderbird %U";
+          exec = "thunderbird %U";
           desktopName = "Thunderbird";
           icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png";
           genericName = "Main Reader";

From 228f33b21d21860566825331f7dc455f3b624ca8 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Mon, 17 Apr 2017 16:19:41 -0400
Subject: [PATCH 1161/1744] osm2pgsql: init at 0.92.1-unstable

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

diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
new file mode 100644
index 00000000000..98489358738
--- /dev/null
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
+
+let
+  version = "0.92.1-unstable";
+in
+stdenv.mkDerivation rec {
+  name = "osm2pgsql-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/openstreetmap/osm2pgsql.git";
+    rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66";
+    # Still waiting on release after:
+    # https://github.com/openstreetmap/osm2pgsql/pull/684
+    # https://github.com/openstreetmap/osm2pgsql/issues/634
+    #rev = "refs/tags/${version}";
+    sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy";
+  };
+  nativeBuildInputs = [cmake];
+  buildInputs = [expat proj bzip2 zlib boost postgresql lua];
+
+  meta = {
+    description = "OpenStreetMap data to PostgreSQL converter";
+    version = "0.92.1-unstable";
+    homepage = https://github.com/openstreetmap/osm2pgsql;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fef823a30b6..62908b58d7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14806,6 +14806,8 @@ with pkgs;
 
   oroborus = callPackage ../applications/window-managers/oroborus {};
 
+  osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
+
   ostinato = callPackage ../applications/networking/ostinato { };
 
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {

From 383706f36db17307b7c2650ad35773f6c5b410d1 Mon Sep 17 00:00:00 2001
From: jraygauthier <jraygauthier@users.noreply.github.com>
Date: Mon, 17 Apr 2017 16:28:20 -0400
Subject: [PATCH 1162/1744] digikam: add video support through libqtav (#24866)

* libqtav: init at unstable-2017-03-30

* digikam: add video support through `libqtav` dependency

Issue #24426.
---
 .../applications/graphics/digikam/default.nix |  3 +
 .../development/libraries/libqtav/default.nix | 63 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/libraries/libqtav/default.nix

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 00c0da7a78e..f1179101692 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -29,6 +29,7 @@
 , libgphoto2
 , libkipi
 , liblqr1
+, libqtav
 , libusb1
 , marble
 , mysql
@@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
     libgphoto2
     libkipi
     liblqr1
+    libqtav
     libusb1
     marble.unwrapped
     mysql
@@ -99,6 +101,7 @@ stdenv.mkDerivation rec {
     "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
     "-DENABLE_MYSQLSUPPORT=1"
     "-DENABLE_INTERNALMYSQL=1"
+    "-DENABLE_MEDIAPLAYER=1"
   ];
 
   fixupPhase = ''
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
new file mode 100644
index 00000000000..7b421f4ca36
--- /dev/null
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper
+, qtbase, qtmultimedia, qtquick1, qttools
+, mesa, libX11
+, libass, openal, ffmpeg, libuchardet
+, alsaLib, libpulseaudio, libva
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "libqtav-${version}";
+
+  # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the
+  # the reason behind taking an unstable git rev. 
+  version = "unstable-2017-03-30";
+
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ];
+  buildInputs = [ 
+    qtbase qtmultimedia qtquick1
+    mesa libX11
+    libass openal ffmpeg libuchardet
+    alsaLib libpulseaudio libva
+  ];
+
+  src = fetchFromGitHub {
+    sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v";
+    rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa";
+    repo = "QtAV";
+    owner = "wang-bin";
+    fetchSubmodules = true;
+  };
+
+  patchPhase = ''
+    sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt
+    sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt
+  '';
+
+  # Make sure libqtav finds its libGL dependancy at both link and run time
+  # by adding mesa to rpath. Not sure why it wasn't done automatically like
+  # the other libraries as `mesa` is part of our `buildInputs`.
+  NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"];
+
+  preFixup = ''
+    mkdir -p "$out/bin"
+    cp -a "./bin/"* "$out/bin"
+  '';
+
+  postFixup = ''
+    for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do
+      wrapQtProgram "$i"
+    done
+  '';
+
+  meta = {
+    description = "A multimedia playback framework based on Qt + FFmpeg.";
+    #license = licenses.lgpl21; # For the libraries / headers only.
+    license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used.
+    homepage = http://www.qtav.org/;
+    maintainers = [ maintainers.jraygauthier ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62908b58d7f..22653096e52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9592,6 +9592,10 @@ with pkgs;
 
     libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
 
+    libqtav = callPackage ../development/libraries/libqtav { 
+      libva = libva-full; # also wants libva-x11 
+    };
+
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
     };

From 85aa5005af530fef199cc41148e374e54d70e01e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 17 Apr 2017 16:48:10 -0400
Subject: [PATCH 1163/1744] Introduce `mapNullable` into lib and use it in a
 few places

Also simply some configure flag logic my grep also alerted me too.
---
 lib/trivial.nix                                          | 3 +++
 nixos/modules/services/monitoring/graphite.nix           | 2 +-
 nixos/modules/services/monitoring/prometheus/default.nix | 2 +-
 pkgs/development/libraries/wiredtiger/default.nix        | 7 ++++---
 pkgs/os-specific/linux/nvidia-x11/generic.nix            | 2 +-
 pkgs/servers/shishi/default.nix                          | 7 ++++---
 pkgs/tools/filesystems/ceph/generic.nix                  | 9 ++++-----
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 40499b2b509..b7b9d25922a 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -108,6 +108,9 @@ rec {
   # Flip the order of the arguments of a binary function.
   flip = f: a: b: f b a;
 
+  # Apply function if argument is non-null
+  mapNullable = f: a: if isNull a then a else f a;
+
   # Pull in some builtins not included elsewhere.
   inherit (builtins)
     pathExists readFile isBool isFunction
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index c5352e5887d..98931e65bb5 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.graphite;
-  writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t;
+  writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t;
 
   dataDir = cfg.dataDir;
 
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index cf9deccbffe..5c4a48a7db4 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -134,7 +134,7 @@ let
           };
         });
         default = null;
-        apply = x: if x == null then null else _filter x;
+        apply = x: mapNullable _filter x;
         description = ''
           Optional http login credentials for metrics scraping.
         '';
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 347686014d1..e4b95fc1cb9 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -7,9 +7,10 @@
 
 with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkFlag = trueStr: falseStr: cond: name: val: "--"
+    + (if cond then trueStr else falseStr)
+    + name
+    + optionalString (val != null && cond != false) "=${val}";
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4573766b78b..d6d1daaf3ce 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -73,7 +73,7 @@ let
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };
-      persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { };
+      persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 3e340ba7df4..535571f46e2 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -6,9 +6,10 @@
 }:
 
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkFlag = trueStr: falseStr: cond: name: val: "--"
+    + (if cond then trueStr else falseStr)
+    + name
+    + stdenv.lib.optionalString (val != null && cond != false) "=${val}";
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index d21d790dac8..e4c8b0f33bc 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -31,11 +31,10 @@ with stdenv;
 with stdenv.lib;
 let
   inherit (python2Packages) python;
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}"
-      + "${if val != null && cond != false then "=${val}" else ""}";
-
+  mkFlag = trueStr: falseStr: cond: name: val: "--"
+    + (if cond then trueStr else falseStr)
+    + name
+    + optionalString (val != null && cond != false) "=${val}";
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;

From 457bc9bdc4b187c384b75ba61e38cdd6ebca5c7a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 17 Apr 2017 22:09:30 +0100
Subject: [PATCH 1164/1744] inkscape: add potrace

This allows vectorising bitmap images in inkscape.
---
 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 bee1f71a061..fdcd7636c02 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,7 +2,7 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, automake114x, cmake
+, libvisio, libcdr, libexif, automake114x, potrace, cmake
 }:
 
 let
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper intltool gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif automake114x cmake
+    libvisio libcdr libexif automake114x potrace cmake
   ];
 
   enableParallelBuilding = true;

From 213d29f6b7c44cdc5182dacad78de047063845fa Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 23 Mar 2017 19:20:00 -0400
Subject: [PATCH 1165/1744] release-cross: For fuloong, just use the predefined
 platform

This is a semantic change, but probably a safe one. In any event, this is
very old hardware that probably no one uses anymore anyways.
---
 pkgs/top-level/release-cross.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f9382985fcd..f97681a8801 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -139,16 +139,7 @@ in
       float = "hard";
       withTLS = true;
       libc = "glibc";
-      platform = {
-        name = "fuloong-minipc";
-        kernelMajor = "2.6";
-        kernelBaseConfig = "lemote2f_defconfig";
-        kernelHeadersBaseConfig = "fuloong2e_defconfig";
-        uboot = null;
-        kernelArch = "mips";
-        kernelAutoModules = false;
-        kernelTarget = "vmlinux";
-      };
+      platform = pkgs.platforms.fuloong2f_n32;
       openssl.system = "linux-generic32";
       gcc = {
         arch = "loongson2f";

From b477851f3427e3353d530ab0d47b63fe2686dd4b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 23 Mar 2017 19:18:43 -0400
Subject: [PATCH 1166/1744] top-level: Less indirection for lib in release*.nix

---
 pkgs/top-level/release-cross.nix  | 3 ---
 pkgs/top-level/release-lib.nix    | 5 ++++-
 pkgs/top-level/release-python.nix | 4 ++--
 pkgs/top-level/release-small.nix  | 2 +-
 pkgs/top-level/release.nix        | 5 +----
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f97681a8801..2b6cdd04974 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,4 +1,3 @@
-
 { # The platforms for which we build Nixpkgs.
   supportedSystems ? [ builtins.currentSystem ]
 , # Strip most of attributes when evaluating to spare memory usage
@@ -8,8 +7,6 @@
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 
 let
-  inherit (pkgs) lib;
-
   nativePlatforms = linux;
 
   /* Basic list of packages to cross-build */
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index a6e574a7d11..a5fdb952206 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -3,7 +3,9 @@
 , scrubJobs ? true
 }:
 
-with import ../../lib;
+let
+  lib = import ../../lib;
+in with lib;
 
 rec {
 
@@ -14,6 +16,7 @@ rec {
   });
 
   pkgs = pkgsFor "x86_64-linux";
+  inherit lib;
 
 
   hydraJob' = if scrubJobs then hydraJob else id;
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 0fbd5e50d12..3bc252e440f 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -3,14 +3,14 @@
    $ hydra-eval-jobs pkgs/top-level/release-python.nix
 */
 
-{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
   supportedSystems ? [ "x86_64-linux" ]
 }:
 
-with import ../../lib;
 with import ./release-lib.nix {inherit supportedSystems; };
+with lib;
 
 let
   packagePython = mapAttrs (name: value:
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index b12eda6f150..f329f2460d7 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -1,7 +1,7 @@
 /* A small release file, with few packages to be built.  The aim is to reduce
    the load on Hydra when testing the `stdenv-updates' branch. */
 
-{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b5207879a5e..f2feb29f0cd 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -9,7 +9,7 @@
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
 
-{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
   supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
@@ -20,9 +20,6 @@
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 
 let
-
-  lib = pkgs.lib;
-
   jobs =
     { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
 

From 22277893923cdf26004d83b608b7e1c3ca7030fb Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 8 Feb 2017 21:27:22 -0500
Subject: [PATCH 1167/1744] lib: Collect system/platform related files

Previously, platforms was a random thing in top-level
---
 lib/default.nix                               | 9 +++++----
 lib/systems/default.nix                       | 5 +++++
 lib/{platforms.nix => systems/doubles.nix}    | 2 +-
 lib/{systems.nix => systems/parse.nix}        | 6 +++---
 {pkgs/top-level => lib/systems}/platforms.nix | 0
 pkgs/top-level/all-packages.nix               | 2 +-
 pkgs/top-level/default.nix                    | 2 +-
 pkgs/top-level/release-cross.nix              | 4 ++--
 8 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 lib/systems/default.nix
 rename lib/{platforms.nix => systems/doubles.nix} (96%)
 rename lib/{systems.nix => systems/parse.nix} (97%)
 rename {pkgs/top-level => lib/systems}/platforms.nix (100%)

diff --git a/lib/default.nix b/lib/default.nix
index 09a64f754d8..9dfaa46ec3b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -22,8 +22,7 @@ let
 
   # constants
   licenses = import ./licenses.nix;
-  platforms = import ./platforms.nix;
-  systems = import ./systems.nix;
+  systems = import ./systems;
 
   # misc
   debug = import ./debug.nix;
@@ -42,13 +41,15 @@ in
             attrsets lists strings stringsWithDeps
             customisation maintainers meta sources
             modules options types
-            licenses platforms systems
+            licenses systems
             debug generators misc
             sandbox fetchers filesystem;
+
+    # back-compat aliases
+    platforms = systems.doubles;
   }
   # !!! don't include everything at top-level; perhaps only the most
   # commonly used functions.
   // trivial // lists // strings // stringsWithDeps // attrsets // sources
   // options // types // meta // debug // misc // modules
-  // systems
   // customisation
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
new file mode 100644
index 00000000000..70d431837da
--- /dev/null
+++ b/lib/systems/default.nix
@@ -0,0 +1,5 @@
+rec {
+  doubles = import ./doubles.nix;
+  parse = import ./parse.nix;
+  platforms = import ./platforms.nix;
+}
diff --git a/lib/platforms.nix b/lib/systems/doubles.nix
similarity index 96%
rename from lib/platforms.nix
rename to lib/systems/doubles.nix
index 6b56e1734ad..945147fe7cf 100644
--- a/lib/platforms.nix
+++ b/lib/systems/doubles.nix
@@ -1,4 +1,4 @@
-let lists = import ./lists.nix; in
+let lists = import ../lists.nix; in
 
 rec {
   all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
diff --git a/lib/systems.nix b/lib/systems/parse.nix
similarity index 97%
rename from lib/systems.nix
rename to lib/systems/parse.nix
index 92d8bdf892b..410995f8a5d 100644
--- a/lib/systems.nix
+++ b/lib/systems/parse.nix
@@ -1,9 +1,9 @@
 # Define the list of system with their properties.  Only systems tested for
 # Nixpkgs are listed below
 
-with import ./lists.nix;
-with import ./types.nix;
-with import ./attrsets.nix;
+with import ../lists.nix;
+with import ../types.nix;
+with import ../attrsets.nix;
 
 let
   lib = import ./default.nix;
diff --git a/pkgs/top-level/platforms.nix b/lib/systems/platforms.nix
similarity index 100%
rename from pkgs/top-level/platforms.nix
rename to lib/systems/platforms.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 802081cd7f9..11816f580da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -303,7 +303,7 @@ with pkgs;
 
   composableDerivation = callPackage ../../lib/composable-derivation.nix { };
 
-  platforms = import ./platforms.nix;
+  inherit (lib.systems) platforms;
 
   setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;
 
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 3e3ecdeea6c..48dbe7118bc 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -55,7 +55,7 @@ in let
   # Allow setting the platform in the config file. Otherwise, let's use a
   # reasonable default.
   localSystem =
-    { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; }
+    { platform = lib.systems.platforms.selectPlatformBySystem args.localSystem.system; }
     // builtins.intersectAttrs { platform = null; } config
     // args.localSystem;
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 2b6cdd04974..c68c7d3721e 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -136,7 +136,7 @@ in
       float = "hard";
       withTLS = true;
       libc = "glibc";
-      platform = pkgs.platforms.fuloong2f_n32;
+      platform = lib.platforms.fuloong2f_n32;
       openssl.system = "linux-generic32";
       gcc = {
         arch = "loongson2f";
@@ -160,7 +160,7 @@ in
       fpu = "vfp";
       withTLS = true;
       libc = "glibc";
-      platform = pkgs.platforms.raspberrypi;
+      platform = lib.platforms.raspberrypi;
       openssl.system = "linux-generic32";
       gcc = {
         arch = "armv6";

From fffcee35f9b2042d4edc5dccb3379972e03ffd84 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 1 Apr 2017 15:34:38 -0400
Subject: [PATCH 1168/1744] lib: Fix `matchAttrs`

---
 lib/attrsets.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index f9e6b7495fc..c686e1d20eb 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (builtins) head tail length;
-  inherit (import ./trivial.nix) or;
+  inherit (import ./trivial.nix) and or;
   inherit (import ./default.nix) fold;
   inherit (import ./strings.nix) concatStringsSep;
   inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
@@ -417,18 +417,15 @@ rec {
 
   /* Returns true if the pattern is contained in the set. False otherwise.
 
-     FIXME(zimbatm): this example doesn't work !!!
-
      Example:
-       sys = mkSystem { }
-       matchAttrs { cpu = { bits = 64; }; } sys
+       matchAttrs { cpu = {}; } { cpu = { bits = 64; }; }
        => true
    */
-  matchAttrs = pattern: attrs:
-    fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
+  matchAttrs = pattern: attrs: assert isAttrs pattern;
+    fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
       let pat = head values; val = head (tail values); in
       if length values == 1 then false
-      else if isAttrs pat then isAttrs val && matchAttrs head values
+      else if isAttrs pat then isAttrs val && matchAttrs pat val
       else pat == val
     ) [pattern attrs]));
 

From 8c99aab3ea4a9ddbd3918282da7861e674b4e7c4 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 9 Feb 2017 16:09:47 -0500
Subject: [PATCH 1169/1744] lib: Fix system parsing, and use for doubles lists

The old hard-coded lists are now used to test system parsing.

In the process, make an `assertTrue` in release lib for eval tests; also
use it in release-cross
---
 lib/systems/doubles.nix          |  50 +++++---
 lib/systems/parse.nix            | 211 +++++++++++++++++++------------
 lib/tests/release.nix            |  57 +++++----
 lib/tests/systems.nix            |  31 +++++
 pkgs/top-level/release-cross.nix |   4 +-
 pkgs/top-level/release-lib.nix   |   5 +
 pkgs/top-level/release.nix       |   6 +-
 7 files changed, 238 insertions(+), 126 deletions(-)
 create mode 100644 lib/tests/systems.nix

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 945147fe7cf..2622ddf4be1 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -1,24 +1,44 @@
 let lists = import ../lists.nix; in
+let parse = import ./parse.nix; in
+let inherit (import ../attrsets.nix) matchAttrs; in
+
+let
+  all = [
+    "aarch64-linux"
+    "armv5tel-linux" "armv6l-linux" "armv7l-linux"
+
+    "mips64el-linux"
+
+    "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
+
+    "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
+    "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+  ];
+
+  allParsed = map parse.mkSystemFromString all;
+
+  filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
+
+in rec {
+  inherit all;
 
-rec {
-  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
   allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   none = [];
 
-  arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
-  i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
-  mips = [ "mips64el-linux" ];
-  x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
+  arm = filterDoubles (matchAttrs { cpu = { family = "arm"; bits = 32; }; });
+  i686 = filterDoubles parse.isi686;
+  mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; });
+  x86_64 = filterDoubles parse.isx86_64;
 
-  cygwin = ["i686-cygwin" "x86_64-cygwin"];
-  darwin = ["x86_64-darwin"];
-  freebsd = ["i686-freebsd" "x86_64-freebsd"];
-  gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
-  illumos = ["x86_64-solaris"];
-  linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"];
-  netbsd = ["i686-netbsd" "x86_64-netbsd"];
-  openbsd = ["i686-openbsd" "x86_64-openbsd"];
-  unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
+  cygwin = filterDoubles (matchAttrs { kernel = parse.kernels.cygwin; });
+  darwin = filterDoubles parse.isDarwin;
+  freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; });
+  gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better
+  illumos = filterDoubles (matchAttrs { kernel = parse.kernels.solaris; });
+  linux = filterDoubles parse.isLinux;
+  netbsd = filterDoubles (matchAttrs { kernel = parse.kernels.netbsd; });
+  openbsd = filterDoubles (matchAttrs { kernel = parse.kernels.openbsd; });
+  unix = filterDoubles parse.isUnix;
 
   mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"];
 }
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 410995f8a5d..f6315b8ad2a 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -6,11 +6,13 @@ with import ../types.nix;
 with import ../attrsets.nix;
 
 let
-  lib = import ./default.nix;
-  setTypes = type:
+  lib = import ../default.nix;
+  setTypesAssert = type: pred:
     mapAttrs (name: value:
-      setType type ({inherit name;} // value)
-    );
+      #assert pred value;
+      setType type ({ inherit name; } // value));
+  setTypes = type: setTypesAssert type (_: true);
+
 in
 
 rec {
@@ -22,20 +24,31 @@ rec {
   };
 
 
-  isCpuType = x: isType "cpu-type" x
-    && elem x.bits [8 16 32 64 128]
-    && (8 < x.bits -> isSignificantByte x.significantByte);
-
-  cpuTypes = with significantBytes;
-    setTypes "cpu-type" {
-      arm =      { bits = 32; significantByte = littleEndian; };
-      armv5tel = { bits = 32; significantByte = littleEndian; };
-      armv7l   = { bits = 32; significantByte = littleEndian; };
-      i686 =     { bits = 32; significantByte = littleEndian; };
-      powerpc =  { bits = 32; significantByte = bigEndian; };
-      x86_64 =   { bits = 64; significantByte = littleEndian; };
-    };
+  isCpuType = isType "cpu-type";
+  cpuTypes = with significantBytes; setTypesAssert "cpu-type"
+    (x: elem x.bits [8 16 32 64 128]
+        && (if 8 < x.bits
+            then isSignificantByte x.significantByte
+            else !(x ? significantByte)))
+  {
+    arm      = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+    i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
+    x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
+    mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
+    powerpc  = { bits = 32; significantByte = bigEndian;    family = "powerpc"; };
+  };
 
+  isVendor = isType "vendor";
+  vendors = setTypes "vendor" {
+    apple = {};
+    pc = {};
+    unknown = {};
+  };
 
   isExecFormat = isType "exec-format";
   execFormats = setTypes "exec-format" {
@@ -43,84 +56,118 @@ rec {
     elf = {};
     macho = {};
     pe = {};
-    unknow = {};
+    unknown = {};
+  };
+
+  isKernelFamily = isType "kernel-family";
+  kernelFamilies = setTypes "kernel-family" {
+    bsd = {};
+    unix = {};
+    windows-nt = {};
+    dos = {};
+  };
+
+  isKernel = x: isType "kernel" x;
+  kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
+    (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
+  {
+    cygwin  = { execFormat = pe;      families = { inherit /*unix*/ windows-nt; }; };
+    darwin  = { execFormat = macho;   families = { inherit unix; }; };
+    freebsd = { execFormat = elf;     families = { inherit unix bsd; }; };
+    linux   = { execFormat = elf;     families = { inherit unix; }; };
+    netbsd  = { execFormat = elf;     families = { inherit unix bsd; }; };
+    none    = { execFormat = unknown; families = { inherit unix; }; };
+    openbsd = { execFormat = elf;     families = { inherit unix bsd; }; };
+    solaris = { execFormat = elf;     families = { inherit unix; }; };
+    win32   = { execFormat = pe;      families = { inherit dos; }; };
   };
 
 
-  isKernel = isType "kernel";
-  kernels = with execFormats;
-    setTypes "kernel" {
-      cygwin =  { execFormat = pe; };
-      darwin =  { execFormat = macho; };
-      freebsd = { execFormat = elf; };
-      linux =   { execFormat = elf; };
-      netbsd =  { execFormat = elf; };
-      none =    { execFormat = unknow; };
-      openbsd = { execFormat = elf; };
-      win32 =   { execFormat = pe; };
+  isAbi = isType "abi";
+  abis = setTypes "abi" {
+    gnu = {};
+    msvc = {};
+    eabi = {};
+    androideabi = {};
+    unknown = {};
+  };
+
+  isSystem = isType "system";
+  mkSystem = { cpu, vendor, kernel, abi }:
+    assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi;
+    setType "system" {
+      inherit cpu vendor kernel abi;
     };
 
-
-  isArchitecture = isType "architecture";
-  architectures = setTypes "architecture" {
-    apple = {};
-    pc = {};
-    unknow = {};
-  };
-
-
-  isSystem = x: isType "system" x
-    && isCpuType x.cpu
-    && isArchitecture x.arch
-    && isKernel x.kernel;
-
-  mkSystem = {
-    cpu ? cpuTypes.i686,
-    arch ? architectures.pc,
-    kernel ? kernels.linux,
-    name ? "${cpu.name}-${arch.name}-${kernel.name}"
-  }: setType "system" {
-    inherit name cpu arch kernel;
-  };
-
-
   is64Bit = matchAttrs { cpu = { bits = 64; }; };
-  isDarwin = matchAttrs { kernel = kernels.darwin; };
+  is32Bit = matchAttrs { cpu = { bits = 32; }; };
   isi686 = matchAttrs { cpu = cpuTypes.i686; };
-  isLinux = matchAttrs { kernel = kernels.linux; };
+  isx86_64 = matchAttrs { cpu = cpuTypes.x86_64; };
 
+  isDarwin = matchAttrs { kernel = kernels.darwin; };
+  isLinux = matchAttrs { kernel = kernels.linux; };
+  isUnix = matchAttrs { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
+  isWindows = s: matchAttrs { kernel = { families = { inherit (kernelFamilies) windows-nt; }; }; } s
+              || matchAttrs { kernel = { families = { inherit (kernelFamilies) dos; }; }; } s;
+
+
+  mkSkeletonFromList = l: {
+    "2" =    { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
+    "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
+    "3" = # Awkwards hacks, beware!
+      if elemAt l 1 == "apple"
+        then { cpu = elemAt l 0; vendor = "apple";    kernel = elemAt l 2;                   }
+      else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
+        then { cpu = elemAt l 0;                      kernel = elemAt l 1; abi = elemAt l 2; }
+      else throw "Target specification with 3 components is ambiguous";
+  }.${toString (length l)}
+    or (throw "system string has invalid number of hyphen-separated components");
 
   # This should revert the job done by config.guess from the gcc compiler.
-  mkSystemFromString = s: let
-    l = lib.splitString "-" s;
-
+  mkSystemFromSkeleton = { cpu
+                         , # Optional, but fallback too complex for here.
+                           # Inferred below instead.
+                           vendor ? assert false; null
+                         , kernel
+                         , # Also inferred below
+                           abi    ? assert false; null
+                         } @ args: let
     getCpu = name:
-      attrByPath [name] (throw "Unknow cpuType `${name}'.")
+      attrByPath [name] (throw "Unknown CPU type: ${name}")
         cpuTypes;
-    getArch = name:
-      attrByPath [name] (throw "Unknow architecture `${name}'.")
-        architectures;
+    getVendor = name:
+      attrByPath [name] (throw "Unknown vendor: ${name}")
+        vendors;
     getKernel = name:
-      attrByPath [name] (throw "Unknow kernel `${name}'.")
+      attrByPath [name] (throw "Unknown kernel: ${name}")
         kernels;
+    getAbi = name:
+      attrByPath [name] (throw "Unknown ABI: ${name}")
+        abis;
+
+    system = rec {
+      cpu = getCpu args.cpu;
+      vendor =
+        /**/ if args ? vendor    then getVendor args.vendor
+        else if isDarwin  system then vendors.apple
+        else if isWindows system then vendors.pc
+        else                     vendors.unknown;
+      kernel = getKernel args.kernel;
+      abi =
+        /**/ if args ? abi       then getAbi args.abi
+        else if isLinux   system then abis.gnu
+        else if isWindows system then abis.gnu
+        else                     abis.unknown;
+    };
+
+  in mkSystem system;
+
+  mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
+
+  doubleFromSystem = { cpu, vendor, kernel, abi, ... }: "${cpu.name}-${kernel.name}";
+
+  tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
+    optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
+  in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}";
 
-    system =
-      if builtins.length l == 2 then
-        mkSystem rec {
-          name = s;
-          cpu = getCpu (head l);
-          arch =
-            if isDarwin system
-            then architectures.apple
-            else architectures.pc;
-          kernel = getKernel (head (tail l));
-        }
-      else
-        mkSystem {
-          name = s;
-          cpu = getCpu (head l);
-          arch = getArch (head (tail l));
-          kernel = getKernel (head (tail (tail l)));
-        };
-  in assert isSystem system; system;
 }
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index f9f57424f7d..dfa4ca2676d 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -1,31 +1,40 @@
-{ nixpkgs }:
+{ nixpkgs ? { outPath = (import ../.).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ builtins.currentSystem ]
+, # Strip most of attributes when evaluating to spare memory usage
+  scrubJobs ? true
+}:
 
-with import ../.. { };
+with import ../../pkgs/top-level/release-lib.nix { inherit supportedSystems scrubJobs; };
 with lib;
 
-stdenv.mkDerivation {
-  name = "nixpkgs-lib-tests";
-  buildInputs = [ nix ];
-  NIX_PATH="nixpkgs=${nixpkgs}";
+{
+  systems = import ./systems.nix { inherit lib assertTrue; };
 
-  buildCommand = ''
-    datadir="${nix}/share"
-    export TEST_ROOT=$(pwd)/test-tmp
-    export NIX_BUILD_HOOK=
-    export NIX_CONF_DIR=$TEST_ROOT/etc
-    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
-    cacheDir=$TEST_ROOT/binary-cache
-    nix-store --init
+  moduleSystem = pkgs.stdenv.mkDerivation {
+    name = "nixpkgs-lib-tests";
+    buildInputs = [ pkgs.nix ];
+    NIX_PATH="nixpkgs=${nixpkgs}";
 
-    cd ${nixpkgs}/lib/tests
-    ./modules.sh
+    buildCommand = ''
+      datadir="${pkgs.nix}/share"
+      export TEST_ROOT=$(pwd)/test-tmp
+      export NIX_BUILD_HOOK=
+      export NIX_CONF_DIR=$TEST_ROOT/etc
+      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
+      cacheDir=$TEST_ROOT/binary-cache
+      nix-store --init
 
-    touch $out
-  '';
+      cd ${nixpkgs}/lib/tests
+      ./modules.sh
+
+      touch $out
+    '';
+  };
 }
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
new file mode 100644
index 00000000000..02e316c19fe
--- /dev/null
+++ b/lib/tests/systems.nix
@@ -0,0 +1,31 @@
+# We assert that the new algorithmic way of generating these lists matches the
+# way they were hard-coded before.
+#
+# One might think "if we exhaustively test, what's the point of procedurally
+# calculating the lists anyway?". The answer is one can mindlessly update these
+# tests as new platforms become supported, and then just give the diff a quick
+# sanity check before committing :).
+{ lib, assertTrue }:
+
+with lib.systems.doubles;
+
+let mseteq = x: y: lib.sort lib.lessThan x == lib.sort lib.lessThan y; in
+
+{
+  all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
+
+  arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
+  i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin" ]);
+  mips = assertTrue (mseteq mips [ "mips64el-linux" ]);
+  x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" ]);
+
+  cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
+  darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]);
+  freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
+  gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */));
+  illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
+  linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]);
+  netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
+  openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
+  unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
+}
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index c68c7d3721e..67f3d55fa16 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -47,11 +47,11 @@ in
     # cause false negatives.
     testEqualOne = path: system: let
       f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs));
-    in assert
+    in assertTrue (
         f path { inherit system; }
         ==
         f (["buildPackages"] ++ path) { inherit system crossSystem; };
-      true;
+      );
 
     testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index a5fdb952206..edb760939cb 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -46,6 +46,11 @@ rec {
   pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; };
 
 
+  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. */
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f2feb29f0cd..2eae99eaef1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -26,7 +26,7 @@ let
       metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
 
       manual = import ../../doc;
-      lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
+      lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; };
 
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
@@ -35,7 +35,6 @@ let
             [ jobs.tarball
               jobs.metrics
               jobs.manual
-              jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin
@@ -62,7 +61,8 @@ let
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
               jobs.vim.x86_64-darwin
-            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
+            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
+              ++ lib.collect lib.isDerivation jobs.lib-tests;
         };
     } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) {
       stdenvBootstrapTools.i686-linux =

From d86caa3216dce17f54c1505a751cf5b403fd8bcf Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 3 Apr 2017 16:53:22 -0400
Subject: [PATCH 1170/1744] lib: Fix preexisting bugs in old platforms code
 (now bugs in tests)

Warning, this changes the compatibility claims of existing packages!
---
 lib/tests/systems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 02e316c19fe..5eacc0defaf 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -15,9 +15,9 @@ let mseteq = x: y: lib.sort lib.lessThan x == lib.sort lib.lessThan y; in
   all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
 
   arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
-  i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin" ]);
+  i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
   mips = assertTrue (mseteq mips [ "mips64el-linux" ]);
-  x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" ]);
+  x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
 
   cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
   darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]);

From 3efc661a1de6a2ce9b98aa39283e68914297b8d7 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 23 Mar 2017 20:49:28 -0400
Subject: [PATCH 1171/1744] Elaborate `localSystem` and `crossSystem` in a
 consistent manner

---
 lib/systems/default.nix    | 18 ++++++++++++++++++
 lib/systems/platforms.nix  |  2 +-
 pkgs/top-level/default.nix | 16 ++++++++++------
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 70d431837da..d956969a18f 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -2,4 +2,22 @@ rec {
   doubles = import ./doubles.nix;
   parse = import ./parse.nix;
   platforms = import ./platforms.nix;
+
+  # Elaborate a `localSystem` or `crossSystem` so that it contains everything
+  # necessary.
+  #
+  # `parsed` is inferred from args, both because there are two options with one
+  # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS
+  # always just used `final.*` would fail on both counts.
+  elaborate = args: let
+    final = {
+      # Prefer to parse `config` as it is strictly more informative.
+      parsed = parse.mkSystemFromString (if args ? config then args.config else args.system);
+      # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds.
+      system = parse.doubleFromSystem final.parsed;
+      config = parse.tripleFromSystem final.parsed;
+      # Just a guess, based on `system`
+      platform = platforms.selectBySystem final.system;
+    } // args;
+  in final;
 }
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 665950766f7..4322c8e2ff6 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -474,7 +474,7 @@ rec {
     };
   };
 
-  selectPlatformBySystem = system: {
+  selectBySystem = system: {
       "i686-linux" = pc32;
       "x86_64-linux" = pc64;
       "armv5tel-linux" = sheevaplug;
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 48dbe7118bc..5d3da35c54f 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -40,6 +40,7 @@
 
 let # Rename the function arguments
   configExpr = config;
+  crossSystem0 = crossSystem;
 
 in let
   lib = import ../../lib;
@@ -52,12 +53,15 @@ in let
     then configExpr { inherit pkgs; }
     else configExpr;
 
-  # Allow setting the platform in the config file. Otherwise, let's use a
-  # reasonable default.
-  localSystem =
-    { platform = lib.systems.platforms.selectPlatformBySystem args.localSystem.system; }
-    // builtins.intersectAttrs { platform = null; } config
-    // args.localSystem;
+  # From a minimum of `system` or `config` (actually a target triple, *not*
+  # nixpkgs configuration), infer the other one and platform as needed.
+  localSystem = lib.systems.elaborate (
+    # Allow setting the platform in the config file. This take precedence over
+    # the inferred platform, but not over an explicitly passed-in onw.
+    builtins.intersectAttrs { platform = null; } config
+    // args.localSystem);
+
+  crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0;
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than

From 89b89d1071b6a822a05c8d7dfaa160ba015b021b Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Tue, 18 Apr 2017 09:43:03 +1200
Subject: [PATCH 1172/1744] defaultIconTheme: Enable darwin support

---
 pkgs/data/icons/hicolor-icon-theme/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix | 2 +-
 pkgs/development/tools/misc/icon-naming-utils/default.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 5d089315448..083ea80a69d 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Default fallback theme used by implementations of the icon theme specification";
     homepage = http://icon-theme.freedesktop.org/releases/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
index 3c3a05dc3af..62cc4da6ba1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   postInstall = '' rm -rf "$out/locale" '';
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
index 7f8dafad4af..37bc73172da 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From efe2057ba0d214893a5ffa79a5c58af3489b7d89 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 17 Apr 2017 16:48:13 -0400
Subject: [PATCH 1173/1744] elpa-packages: 2017-04-17

---
 .../editors/emacs-modes/elpa-generated.nix    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 852967fecd5..34472bf8637 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.90.0";
+        version = "11.90.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.90.0.tar";
-          sha256 = "04nsndwcf0dimgc2p1yzzrymc36amzdnjg0158nxplmjkzdp28gy";
+          url = "https://elpa.gnu.org/packages/auctex-11.90.1.tar";
+          sha256 = "0bn5pg6v7zgqxs080bzrsx6789nzdx4622m3020ymzl66017nf0r";
         };
         packageRequires = [];
         meta = {
@@ -644,10 +644,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.3";
+        version = "1.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.3.tar";
-          sha256 = "0hg7jppdsaxy285bdaban1i096bjx21pqmczz7w9f3nr34n28pyn";
+          url = "https://elpa.gnu.org/packages/el-search-1.3.1.tar";
+          sha256 = "01f5pyalw60dr36w007mvvxry548zrhixzmba1sad19531bry7fc";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -681,14 +681,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    enwc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "enwc";
-        version = "1.0";
+        version = "2.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/enwc-1.0.tar";
-          sha256 = "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y";
+          url = "https://elpa.gnu.org/packages/enwc-2.0.tar";
+          sha256 = "17w35b06am5n19nlq00ni5w3jvys9i7swyw4glb7081d2jbij2mn";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/enwc.html";
           license = lib.licenses.free;
@@ -940,10 +940,10 @@
       }) {};
     ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "ivy";
-        version = "0.9.0";
+        version = "0.9.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar";
-          sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s";
+          url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar";
+          sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887";
         };
         packageRequires = [ emacs ];
         meta = {

From 607a72a2f12acc432bdbb9719b3046c48eadf2c9 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 17 Apr 2017 17:17:44 -0400
Subject: [PATCH 1174/1744] melpa-stable-packages: 2017-04-17

Removals:
 - fuel: git repo not accessible
 - jade: renamed to indium
---
 .../emacs-modes/melpa-stable-generated.nix    | 1039 ++++++++++-------
 1 file changed, 636 insertions(+), 403 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index abb00d1ce33..818d1058ec8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -619,8 +619,8 @@
           sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell";
-          sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell";
+          sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y";
           name = "ace-flyspell";
         };
         packageRequires = [ avy ];
@@ -766,8 +766,8 @@
           sha256 = "1d2g873zwq78ggs47954lccmaky20746wg0gafyj93d1qyc3m8rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/10bb2de9c6b938fa12deff1e2748bfd0a345891a/recipes/ace-pinyin";
-          sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin";
+          sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd";
           name = "ace-pinyin";
         };
         packageRequires = [ ace-jump-mode avy pinyinlib ];
@@ -860,6 +860,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "add-hooks";
+        version = "2.2.0";
+        src = fetchFromGitHub {
+          owner = "nickmccurdy";
+          repo = "add-hooks";
+          rev = "fa88bfc17c01f526a156a45ad00fa66cc0909805";
+          sha256 = "0jq9gywg6zvlv8rmvw5vv3228y0k4pk1bczygiwfmav13g0dnb1k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
+          sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p";
+          name = "add-hooks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/add-hooks";
+          license = lib.licenses.free;
+        };
+      }) {};
     add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "add-node-modules-path";
@@ -881,6 +902,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "addressbook-bookmark";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "addressbook-bookmark";
+          rev = "ad3c73369b804a48803fdfdf2ab613e6220260de";
+          sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
+          sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
+          name = "addressbook-bookmark";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/addressbook-bookmark";
+          license = lib.licenses.free;
+        };
+      }) {};
     adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
     melpaBuild {
         pname = "adoc-mode";
@@ -892,8 +934,8 @@
           sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/adoc-mode";
-          sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode";
+          sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c";
           name = "adoc-mode";
         };
         packageRequires = [ markup-faces ];
@@ -1300,8 +1342,8 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/annoying-arrows-mode";
-          sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode";
+          sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh";
           name = "annoying-arrows-mode";
         };
         packageRequires = [];
@@ -1522,16 +1564,16 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "0.3.2";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "ca9d94c2a55c3cbbcc77b6818cc386dbd2f36d39";
-          sha256 = "0j1fm1ngd9vg3qrv9ks53ha9aijnl6mvx2sxsvlvn1libg7ym3zz";
+          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
+          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
-          sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
+          sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh";
           name = "anything-tramp";
         };
         packageRequires = [ anything emacs ];
@@ -1551,8 +1593,8 @@
           sha256 = "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu";
-          sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu";
+          sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1";
           name = "anzu";
         };
         packageRequires = [ cl-lib emacs ];
@@ -1708,22 +1750,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "0.3.2";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "4a5eee8ba9db3e61b860b8b70236e385d3cf344a";
-          sha256 = "0255sa5fzg069n1pf09sn5nypqw0ll5rmxfigw30xhh95w40nx8y";
+          rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa";
+          sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
           name = "assess";
         };
-        packageRequires = [ dash emacs m-buffer ];
+        packageRequires = [ emacs m-buffer ];
         meta = {
           homepage = "https://melpa.org/#/assess";
           license = lib.licenses.free;
@@ -1732,16 +1774,16 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "1.9";
+        version = "1.9.1";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "14170a45c8cf91a0133960442509197e683c256d";
-          sha256 = "1dgw075pdzfrb5wjba7iwal8crxpxm642fkfwj8389a5hpsj7v2n";
+          rev = "666066d30a420d86801d8380f5991f2b82471107";
+          sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
-          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
+          sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4";
           name = "async";
         };
         packageRequires = [];
@@ -2355,8 +2397,8 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
-          sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme";
+          sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v";
           name = "badwolf-theme";
         };
         packageRequires = [ emacs ];
@@ -2586,8 +2628,8 @@
           sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
-          sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
+          sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6";
           name = "better-shell";
         };
         packageRequires = [ emacs ];
@@ -2691,8 +2733,8 @@
           sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict";
-          sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
+          sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli";
           name = "bing-dict";
         };
         packageRequires = [];
@@ -3489,8 +3531,8 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/193956c26050e15ddd7fb6579a053262d1de1e30/recipes/cdlatex";
-          sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex";
+          sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9";
           name = "cdlatex";
         };
         packageRequires = [];
@@ -3909,8 +3951,8 @@
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a12bd6769ce7a5745c2da06dcd57ed3ba2ed891/recipes/cl-format";
-          sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format";
+          sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy";
           name = "cl-format";
         };
         packageRequires = [];
@@ -4269,12 +4311,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0pre4";
+        version = "3.8.0";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "9e32b88784e5e0f14258597fde162fcaf6290fea";
-          sha256 = "1pg5gc7fbj5fjwz5za2162yrnrvrnd5dp6jd2mm9zjkipwwf2z80";
+          rev = "da7833c5bb1f331162d46a2c664a443c1c641089";
+          sha256 = "0ca99p3i0q0f313yzfzd62pc4gl385lr1rfsx4z5vlr24ap7ipzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4920,12 +4962,12 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
-          sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
+          rev = "b2953c725654650677e3d66eaeec666826d5f65f";
+          sha256 = "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -5060,8 +5102,8 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cda69dc7d45087fa9a3e0460d2b12a1dce1a7b3/recipes/company-web";
-          sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
+          sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b";
           name = "company-web";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
@@ -5081,8 +5123,8 @@
           sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
-          sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
+          sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d";
           name = "company-ycmd";
         };
         packageRequires = [ company dash deferred f let-alist s ycmd ];
@@ -5438,8 +5480,8 @@
           sha256 = "0ji8n4sv0zqmfn4g7ay927d8ya6wrvqdzvd5sc6vicma9gn27lvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b2f92804e67fac780a0be850fcd0d0e93992ea7a/recipes/coverlay";
-          sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
+          sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j";
           name = "coverlay";
         };
         packageRequires = [];
@@ -5522,8 +5564,8 @@
           sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz";
-          sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
+          sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
           name = "cricbuzz";
         };
         packageRequires = [ dash enlive s ];
@@ -5879,8 +5921,8 @@
           sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
-          sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
+          sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
           name = "dart-mode";
         };
         packageRequires = [ cl-lib dash flycheck ];
@@ -6026,8 +6068,8 @@
           sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
-          sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste";
+          sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v";
           name = "debpaste";
         };
         packageRequires = [ xml-rpc ];
@@ -6110,8 +6152,8 @@
           sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
-          sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
+          sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm";
           name = "deferred";
         };
         packageRequires = [ emacs ];
@@ -6276,8 +6318,8 @@
           sha256 = "03pvh213w0sgyvv0xrkj43bs53p2xfr7162yhzdh24qwa8dd23qv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl";
-          sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
+          sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2";
           name = "diff-hl";
         };
         packageRequires = [ cl-lib ];
@@ -6780,8 +6822,8 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/84d19999b8387e8b71215675cf1c15873314d90e/recipes/dispass";
-          sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass";
+          sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n";
           name = "dispass";
         };
         packageRequires = [];
@@ -7165,8 +7207,8 @@
           sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
-          sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
+          sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w";
           name = "dumb-jump";
         };
         packageRequires = [ dash emacs f popup s ];
@@ -7175,21 +7217,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
         version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "6f4b44fb1966";
-          sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
+          rev = "6cc0b8488a17";
+          sha256 = "03x94q315yq5kg2wvsp508a9hxl625iji3b84kywmg5hb3w5r9qn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/dyalog-mode";
           license = lib.licenses.free;
@@ -7374,8 +7416,8 @@
           sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
-          sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
+          sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
           name = "easy-hugo";
         };
         packageRequires = [ emacs ];
@@ -7855,8 +7897,8 @@
           sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
-          sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
+          sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv";
           name = "eide";
         };
         packageRequires = [];
@@ -8317,8 +8359,8 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/29c24259817bf4b7caf51f1cfc163e6b7c63504b/recipes/elmine";
-          sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine";
+          sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn";
           name = "elmine";
         };
         packageRequires = [];
@@ -8338,8 +8380,8 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit";
-          sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit";
+          sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi";
           name = "elpa-audit";
         };
         packageRequires = [];
@@ -8715,12 +8757,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "b447a2d0b311bc3c27b9ba51f27ec52ead58e258";
-          sha256 = "1sagmgcarg7d7b7hv3bqgkxg39fzgxaaq7wz9cf7fpwz0pv8vfy6";
+          rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
+          sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -8756,11 +8798,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "4.1";
+        version = "4.2";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "c1e1a843c3389fc585908de367ff00fdd6470965";
-          sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3";
+          rev = "6736d2e86d2909ef44759b1162e006bd5cc07547";
+          sha256 = "1qxdxy2grh0fdx50w1m9rmpvygxcywis4qjzi0mrpv2i7rwn8qal";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -8826,8 +8868,8 @@
           sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv";
-          sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
+          sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316";
           name = "emms-player-simple-mpv";
         };
         packageRequires = [ cl-lib emacs emms ];
@@ -9221,8 +9263,8 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/321ae5999351637a2cd97ec1bf4668d68f569ee4/recipes/erc-hl-nicks";
-          sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks";
+          sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq";
           name = "erc-hl-nicks";
         };
         packageRequires = [];
@@ -9493,8 +9535,8 @@
           sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f40e277af4001d367099360d4342d9c1ab925f59/recipes/esa";
-          sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
+          sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb";
           name = "esa";
         };
         packageRequires = [ cl-lib ];
@@ -9577,8 +9619,8 @@
           sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
-          sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
+          sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy";
           name = "eshell-up";
         };
         packageRequires = [ emacs ];
@@ -9766,8 +9808,8 @@
           sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml";
-          sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
+          sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh";
           name = "esxml";
         };
         packageRequires = [];
@@ -9947,12 +9989,12 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "2.1.0";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
-          sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
+          rev = "395f91014b69844b81660c155f42eb9b1b3d199d";
+          sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -9997,8 +10039,8 @@
           sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape";
-          sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
+          sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l";
           name = "evil-escape";
         };
         packageRequires = [ cl-lib emacs evil ];
@@ -10060,8 +10102,8 @@
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ef683cb1707a481e26dc89b5491ec18e5b20ad1/recipes/evil-lisp-state";
-          sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state";
+          sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz";
           name = "evil-lisp-state";
         };
         packageRequires = [ bind-map evil smartparens ];
@@ -10228,8 +10270,8 @@
           sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
-          sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener";
+          sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g";
           name = "evil-opener";
         };
         packageRequires = [ evil opener ];
@@ -10249,8 +10291,8 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5ec54af16e3dadce43ece7da3acb1cf2eab5d14b/recipes/evil-org";
-          sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-org";
+          sha256 = "1306pf5ws7acdanypn3c0r4yh5wxdf0knl6j3hhs4ys9zszd79bw";
           name = "evil-org";
         };
         packageRequires = [ evil org ];
@@ -10490,6 +10532,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-visual-replace";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "troyp";
+          repo = "evil-visual-replace";
+          rev = "9bfbaf71898294e25d588a887fb4753641edfbe9";
+          sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
+          sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01";
+          name = "evil-visual-replace";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-visual-replace";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-visualstar";
@@ -10543,8 +10606,8 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/62ffcf48bdb2df2bc9e6dd767c4ed9d605a5c839/recipes/eww-lnum";
-          sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum";
+          sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c";
           name = "eww-lnum";
         };
         packageRequires = [];
@@ -10564,8 +10627,8 @@
           sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
-          sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
+          sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5";
           name = "exec-path-from-shell";
         };
         packageRequires = [];
@@ -10710,8 +10773,8 @@
           sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
-          sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
+          sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s";
           name = "f";
         };
         packageRequires = [ dash s ];
@@ -11213,12 +11276,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.8.1";
+        version = "1.9.0";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f";
-          sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna";
+          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
+          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -11347,8 +11410,8 @@
           sha256 = "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask";
-          sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask";
+          sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f";
           name = "flycheck-cask";
         };
         packageRequires = [ dash emacs flycheck ];
@@ -11546,6 +11609,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-joker";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "candid82";
+          repo = "flycheck-joker";
+          rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76";
+          sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
+          sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3";
+          name = "flycheck-joker";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-joker";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-kotlin";
@@ -11893,8 +11977,8 @@
           sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
-          sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
+          sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr";
           name = "flycheck-ycmd";
         };
         packageRequires = [ dash emacs flycheck let-alist ycmd ];
@@ -11977,8 +12061,8 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bd115612b61895f98b0659e9edc1e590967b6337/recipes/flymake-easy";
-          sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy";
+          sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v";
           name = "flymake-easy";
         };
         packageRequires = [];
@@ -12407,6 +12491,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fn";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "troyp";
+          repo = "fn.el";
+          rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6";
+          sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
+          sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn";
+          name = "fn";
+        };
+        packageRequires = [ cl-lib dash dash-functional emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fn";
+          license = lib.licenses.free;
+        };
+      }) {};
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
@@ -12439,8 +12544,8 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebbbc23a29b2040c587e2f60dbfb7a9b45058751/recipes/fold-dwim";
-          sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim";
+          sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d";
           name = "fold-dwim";
         };
         packageRequires = [];
@@ -12649,8 +12754,8 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22a334294660e8625cfeeeb7108517e163d8e443/recipes/fringe-helper";
-          sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper";
+          sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m";
           name = "fringe-helper";
         };
         packageRequires = [];
@@ -12683,12 +12788,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.9.3";
+        version = "1.9.6";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "d5b9fde6dec186972f6ea457582504ca813b8778";
-          sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879";
+          rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd";
+          sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -12720,8 +12825,8 @@
           sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
-          sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
+          sha256 = "1cjwai0qf48m18dsa0r9sh4qlgvdzg5ajfbmxxc2vqzcl5ygrxjx";
           name = "fstar-mode";
         };
         packageRequires = [ dash emacs ];
@@ -12730,25 +12835,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "fuel";
-        version = "0.96";
-        src = fetchgit {
-          url = "git://factorcode.org/git/factor.git";
-          rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
-          sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
-          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
-          name = "fuel";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/fuel";
-          license = lib.licenses.free;
-        };
-      }) {};
     full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "full-ack";
@@ -13159,8 +13245,8 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfbd335054aff49d4a46f73bee881b7a00714d3c/recipes/ghc-imported-from";
-          sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from";
+          sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc";
           name = "ghc-imported-from";
         };
         packageRequires = [ emacs ];
@@ -13579,8 +13665,8 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/318989b10a5bf5b961b3c607730377923c8fb05b/recipes/gitconfig";
-          sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig";
+          sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf";
           name = "gitconfig";
         };
         packageRequires = [];
@@ -14659,8 +14745,8 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grin";
-          sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin";
+          sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378";
           name = "grin";
         };
         packageRequires = [];
@@ -15246,8 +15332,8 @@
           sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cd0352cac399eb2072dfb788deea9cc22d902964/recipes/haxor-mode";
-          sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode";
+          sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s";
           name = "haxor-mode";
         };
         packageRequires = [ emacs ];
@@ -15280,12 +15366,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.6.0";
+        version = "2.6.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
-          sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15385,12 +15471,12 @@
     helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bbdb";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-bbdb";
-          rev = "7be6ce17303422e9bc3ff1a7cb54361fcbcafc84";
-          sha256 = "1ccj9gqr407mfrvp71571w3l82v96zdr956qsdbxfdda7bm3s0j7";
+          rev = "20513422102fea4c08a0433d728a7783bb4968c8";
+          sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -15519,8 +15605,8 @@
           sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
-          sha256 = "1fvpq1xi3xhd8w1yasac87incv1w4av5a8vn0birw8pc7a6bxv4w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
+          sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
           name = "helm-cider";
         };
         packageRequires = [ cider emacs helm-core seq ];
@@ -15540,8 +15626,8 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a21483682eee0950bdba3a93d178db2118e95/recipes/helm-circe";
-          sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe";
+          sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw";
           name = "helm-circe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
@@ -15595,12 +15681,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.6.0";
+        version = "2.6.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
-          sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -15645,8 +15731,8 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash";
-          sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
+          sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb";
           name = "helm-dash";
         };
         packageRequires = [ cl-lib helm ];
@@ -15658,12 +15744,12 @@
     helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-descbinds";
-        version = "1.12";
+        version = "1.13";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-descbinds";
-          rev = "b4ad76372a1b9f4415322d210b3888423247693d";
-          sha256 = "1qjhk1aag3arks0pgj3k2plr6k3cvb7i45apyczka6dvz8fmwj47";
+          rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c";
+          sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds";
@@ -15687,8 +15773,8 @@
           sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
-          sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
+          sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8";
           name = "helm-dired-history";
         };
         packageRequires = [ cl-lib helm ];
@@ -15697,6 +15783,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-emms";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-emms";
+          rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d";
+          sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
+          sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
+          name = "helm-emms";
+        };
+        packageRequires = [ cl-lib emacs emms helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-emms";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-etags-plus";
@@ -15742,12 +15849,12 @@
     helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-firefox";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-firefox";
-          rev = "eed223c2b0ce7dc2af3649d27eaef1603ad01f31";
-          sha256 = "1v4kmw4hflvmy5v8mlp2mm284809alxybqszvv4j6dhjxyg4xz6a";
+          rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085";
+          sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox";
@@ -15792,8 +15899,8 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/299ebd9b72b5db061d31d7ae4f00b1ce6bb9db34/recipes/helm-ghc";
-          sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc";
+          sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d";
           name = "helm-ghc";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
@@ -15960,8 +16067,8 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1e1f2efa82d5097c1f5e85fba3f67b38a5b37c2/recipes/helm-hayoo";
-          sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo";
+          sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb";
           name = "helm-hayoo";
         };
         packageRequires = [ haskell-mode helm json ];
@@ -16015,12 +16122,12 @@
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "1.9.0";
+        version = "1.9.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "742eeb6c33253b2be581e30b5d70113cd87a581d";
-          sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5";
+          rev = "7b7b6dc2554603ad98412927f84a803625069ab3";
+          sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -16036,12 +16143,12 @@
     helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-hg";
-        version = "1.7.8";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-hg";
-          rev = "fa709b6354d84e1c88ccef096d29410fa16f7f5f";
-          sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
+          rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165";
+          sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg";
@@ -16107,8 +16214,8 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/903a2b64d9a704105100d61f28cdfa8f497abd7d/recipes/helm-mode-manager";
-          sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager";
+          sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl";
           name = "helm-mode-manager";
         };
         packageRequires = [ helm ];
@@ -16338,8 +16445,8 @@
           sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc";
-          sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc";
+          sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz";
           name = "helm-proc";
         };
         packageRequires = [ helm ];
@@ -16422,8 +16529,8 @@
           sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose";
-          sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose";
+          sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79";
           name = "helm-purpose";
         };
         packageRequires = [ emacs helm window-purpose ];
@@ -16632,8 +16739,8 @@
           sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6fe2ffb46ea763bc6fb6fb6c899be6d3a67440/recipes/helm-swoop";
-          sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
+          sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx";
           name = "helm-swoop";
         };
         packageRequires = [ emacs helm ];
@@ -16666,16 +16773,16 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.3.2";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "604e4630070ce2e345cbd21c2fbd8414eb064ef2";
-          sha256 = "09nbg890ppjvz1v2a3zcb198k1zq9gaa04ai4v3xynz6c3kvzyr9";
+          rev = "68d4c614830970e9eaf929882e1d395a61872bea";
+          sha256 = "0zfhdlzpy6w7prdh60nd98cwgzfqfsn87xh2kb5hi40dh8gsccfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
-          sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
+          sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517";
           name = "helm-tramp";
         };
         packageRequires = [ emacs helm ];
@@ -16726,6 +16833,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
+    melpaBuild {
+        pname = "helm-w3m";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-w3m";
+          rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a";
+          sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
+          sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
+          name = "helm-w3m";
+        };
+        packageRequires = [ cl-lib emacs helm w3m ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-zhihu-daily";
@@ -16810,6 +16938,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hierarchy";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "hierarchy";
+          rev = "d44d60d85cbeaf81d5e02ba154f4fcdca9faf7fd";
+          sha256 = "14zww0174vwf08fl9fv23faqn2byapb80rn72z4iv54p6pqykc2f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
+          sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp";
+          name = "hierarchy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hierarchy";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-blocks";
@@ -16947,8 +17096,8 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/highlight-symbol";
-          sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol";
+          sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r";
           name = "highlight-symbol";
         };
         packageRequires = [];
@@ -17115,8 +17264,8 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/48b99dd60dda3039a0e1e71bb4b796d62340279e/recipes/hl-sexp";
-          sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp";
+          sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm";
           name = "hl-sexp";
         };
         packageRequires = [];
@@ -17619,8 +17768,8 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ccca92fee3d39966df135a5c79e42d2ab621848/recipes/ido-grid-mode";
-          sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode";
+          sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3";
           name = "ido-grid-mode";
         };
         packageRequires = [ emacs ];
@@ -17787,8 +17936,8 @@
           sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit";
-          sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
+          sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh";
           name = "iedit";
         };
         packageRequires = [];
@@ -17997,8 +18146,8 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/eddb7acecc4948ade16ff02415484c9a16529c9c/recipes/imgix";
-          sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
+          sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
           name = "imgix";
         };
         packageRequires = [ cl-lib dash ht json s ];
@@ -18112,6 +18261,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "indium";
+        version = "0.28";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "Indium";
+          rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
+          sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
+          sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
+          name = "indium";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/indium";
+          license = lib.licenses.free;
+        };
+      }) {};
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
@@ -18366,12 +18536,12 @@
     intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "intellij-theme";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-intellij-theme";
-          rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
-          sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
+          rev = "ad207c8c3d266d566fb1e4862df154096c059171";
+          sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -18555,12 +18725,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
-          sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
+          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
+          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -18668,8 +18838,8 @@
           sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
-          sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
+          sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4";
           name = "ivy-youtube";
         };
         packageRequires = [ cl-lib ivy request ];
@@ -18760,27 +18930,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
-    melpaBuild {
-        pname = "jade";
-        version = "0.28";
-        src = fetchFromGitHub {
-          owner = "NicolasPetton";
-          repo = "jade";
-          rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
-          sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
-          sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y";
-          name = "jade";
-        };
-        packageRequires = [ company emacs js2-mode seq websocket ];
-        meta = {
-          homepage = "https://melpa.org/#/jade";
-          license = lib.licenses.free;
-        };
-      }) {};
     jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jade-mode";
@@ -18897,8 +19046,8 @@
           sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp";
-          sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp";
+          sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5";
           name = "jdecomp";
         };
         packageRequires = [ emacs ];
@@ -19632,8 +19781,8 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c3aa60be932d65929f453f1ce576abcd00252ed/recipes/kill-ring-search";
-          sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search";
+          sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl";
           name = "kill-ring-search";
         };
         packageRequires = [];
@@ -19695,8 +19844,8 @@
           sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
-          sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
+          sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07";
           name = "kiwix";
         };
         packageRequires = [ cl-lib emacs ];
@@ -19750,16 +19899,16 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "0.2.3";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "795ba140104aef6f905aab61bc843596958d97db";
-          sha256 = "0l847g5pm8r7y2p0nrryhfdmrqj6h8qp9fmk6bm0xx0xnxpx01xg";
+          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
+          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
-          sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
+          sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9";
           name = "kubernetes";
         };
         packageRequires = [ dash emacs magit ];
@@ -19768,6 +19917,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kubernetes-evil";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "kubernetes-el";
+          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
+          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
+          sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8";
+          name = "kubernetes-evil";
+        };
+        packageRequires = [ evil kubernetes ];
+        meta = {
+          homepage = "https://melpa.org/#/kubernetes-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
@@ -20290,8 +20460,8 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode";
-          sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode";
+          sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64";
           name = "literate-coffee-mode";
         };
         packageRequires = [ coffee-mode ];
@@ -20311,8 +20481,8 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/833e549ba618e58d9cb0b6768a08c651ad8c9e0a/recipes/live-code-talks";
-          sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks";
+          sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm";
           name = "live-code-talks";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
@@ -20437,8 +20607,8 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/logito";
-          sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito";
+          sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl";
           name = "logito";
         };
         packageRequires = [ eieio ];
@@ -20563,8 +20733,8 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17df4dccdffff6ef7b4900565ae64c1cf84c1fda/recipes/macro-math";
-          sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math";
+          sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn";
           name = "macro-math";
         };
         packageRequires = [];
@@ -20584,8 +20754,8 @@
           sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep";
-          sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep";
+          sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2";
           name = "macrostep";
         };
         packageRequires = [ cl-lib ];
@@ -20885,8 +21055,8 @@
           sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
-          sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
+          sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
           name = "magithub";
         };
         packageRequires = [ emacs git-commit magit s with-editor ];
@@ -20948,8 +21118,8 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka";
-          sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
+          sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y";
           name = "malinka";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
@@ -21165,8 +21335,8 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/markup-faces";
-          sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces";
+          sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9";
           name = "markup-faces";
         };
         packageRequires = [];
@@ -21270,8 +21440,8 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe";
-          sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe";
+          sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8";
           name = "maxframe";
         };
         packageRequires = [];
@@ -21367,12 +21537,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.3";
+        version = "0.7.4";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
-          sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
+          rev = "9c97a5c23b016cd9dec3c22f626f2ec22c5035c1";
+          sha256 = "1nx84c7akgjrbql9jjb4gj3j09iai8k3g3wrwam61fblqm5ckhny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22101,12 +22271,12 @@
     mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mowedline";
-        version = "3.0.0";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "9645c431e921317721ba8dea9ce713d235f94726";
-          sha256 = "14kpj1fh3p8asnxwb0jl3b6r32b7zplxyl5hvbgkal687b1gx50w";
+          rev = "67ca629b4bc3063ea19a7fccc693432a4eb10021";
+          sha256 = "0i06ms5m7qhv2m1mmgzqh73j9wz3nxygz65p6vsnicxas09w70rd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -22224,6 +22394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mtg-deck-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "mattiasb";
+          repo = "mtg-deck-mode";
+          rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244";
+          sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
+          sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih";
+          name = "mtg-deck-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mtg-deck-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
@@ -22235,8 +22426,8 @@
           sha256 = "09sywhf1g8yqadzp19djar2gm3fmilqi3pbdm0hvm9b7xpq1gg44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
-          sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
+          sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r";
           name = "mu4e-alert";
         };
         packageRequires = [ alert emacs ht s ];
@@ -22256,8 +22447,8 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
-          sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension";
+          sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc";
           name = "mu4e-maildirs-extension";
         };
         packageRequires = [];
@@ -22382,8 +22573,8 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f7e5f7e9c551a149e9d433173bd8c8613487ed/recipes/mustache-mode";
-          sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode";
+          sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36";
           name = "mustache-mode";
         };
         packageRequires = [];
@@ -22445,8 +22636,8 @@
           sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org";
-          sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org";
+          sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj";
           name = "mysql-to-org";
         };
         packageRequires = [ emacs s ];
@@ -22466,8 +22657,8 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/806273d9898331b9b0189a72d9fdd43c86e1224c/recipes/name-this-color";
-          sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color";
+          sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8";
           name = "name-this-color";
         };
         packageRequires = [ cl-lib dash emacs ];
@@ -22676,8 +22867,8 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
-          sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
+          sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny";
           name = "nemerle";
         };
         packageRequires = [];
@@ -22920,12 +23111,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "0.1.2";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "5327be91c155eb9fed19061a0f02619dd4284c64";
-          sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+          rev = "a49113a0808ef53d066068e227d3d5a4d7f0ad44";
+          sha256 = "04jj25h1infivqdvcgq0cbc96y2rj2c23y6vw6yh73x4kyynzvcc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -22947,8 +23138,8 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nose";
-          sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose";
+          sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682";
           name = "nose";
         };
         packageRequires = [];
@@ -23113,8 +23304,8 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1943a1986775952bedd78430ee41b67af130c439/recipes/nvm";
-          sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
+          sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w";
           name = "nvm";
         };
         packageRequires = [ dash dash-functional f s ];
@@ -23281,8 +23472,8 @@
           sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice";
-          sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
+          sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2";
           name = "ob-spice";
         };
         packageRequires = [ org spice-mode ];
@@ -23480,15 +23671,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
+    melpaBuild {
+        pname = "omni-quotes";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-quotes.el";
+          rev = "be1e719c046ca468275ed844989320f48358f2cd";
+          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
+          sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
+          name = "omni-quotes";
+        };
+        packageRequires = [ dash f ht omni-log s ];
+        meta = {
+          homepage = "https://melpa.org/#/omni-quotes";
+          license = lib.licenses.free;
+        };
+      }) {};
     omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "omni-scratch";
-        version = "0.1.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-scratch.el";
-          rev = "517b340427d5906002234832a01d0bc1ad27bac5";
-          sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
+          rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
+          sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -23753,8 +23965,8 @@
           sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl";
-          sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
+          sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
           name = "org-babel-eval-in-repl";
         };
         packageRequires = [ emacs eval-in-repl ];
@@ -23997,12 +24209,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.6.3";
+        version = "2.7.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da";
-          sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr";
+          rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
+          sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -24213,8 +24425,8 @@
           sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
-          sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
+          sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah";
           name = "org-pdfview";
         };
         packageRequires = [ org pdf-tools ];
@@ -24255,8 +24467,8 @@
           sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
-          sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
+          sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
           name = "org-projectile";
         };
         packageRequires = [ dash emacs projectile ];
@@ -24643,8 +24855,8 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b57b6d755b3855ccfe0a90eada939fb7a852b40/recipes/org2blog";
-          sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
+          sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
           name = "org2blog";
         };
         packageRequires = [ metaweblog org xml-rpc ];
@@ -24958,8 +25170,8 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer";
-          sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
+          sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8";
           name = "overseer";
         };
         packageRequires = [ dash emacs pkg-info ];
@@ -24992,12 +25204,12 @@
     ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-epub";
-        version = "0.2";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
-          sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
+          rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
+          sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -25063,8 +25275,8 @@
           sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs";
-          sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs";
+          sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73";
           name = "ox-twbs";
         };
         packageRequires = [];
@@ -25231,8 +25443,8 @@
           sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
-          sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
+          sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
           name = "page-break-lines";
         };
         packageRequires = [];
@@ -25578,11 +25790,11 @@
     password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "password-store";
-        version = "1.7";
+        version = "1.7.1";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "20081b546f371dcaee9ea2769f46e513bb39c275";
-          sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs";
+          rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
+          sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -25711,8 +25923,8 @@
           sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache";
-          sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache";
+          sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva";
           name = "pcache";
         };
         packageRequires = [ eieio ];
@@ -25941,8 +26153,8 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf5d4356424b492579a029f58dd4685ff5aaf39/recipes/perspective";
-          sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
+          sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7";
           name = "perspective";
         };
         packageRequires = [ cl-lib ];
@@ -25962,8 +26174,8 @@
           sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
-          sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
+          sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04";
           name = "perspeen";
         };
         packageRequires = [];
@@ -26256,8 +26468,8 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info";
-          sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info";
+          sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n";
           name = "pkg-info";
         };
         packageRequires = [ epl ];
@@ -26800,8 +27012,8 @@
           sha256 = "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy";
-          sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
+          sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p";
           name = "prodigy";
         };
         packageRequires = [ dash emacs f s ];
@@ -27148,12 +27360,12 @@
     psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psession";
-        version = "1.1";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "138b27f57bdc3ff53ec5896439e8ed00294a5ea2";
-          sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
+          rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc";
+          sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -27744,8 +27956,8 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/de07b317e46475776d6d237908a0495866a7a851/recipes/rainbow-blocks";
-          sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
+          sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs";
           name = "rainbow-blocks";
         };
         packageRequires = [];
@@ -27891,8 +28103,8 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/56d330fdd9e3b2cf3afc808190efebcc4cb1456d/recipes/rbenv";
-          sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv";
+          sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q";
           name = "rbenv";
         };
         packageRequires = [];
@@ -28072,12 +28284,12 @@
     rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rectangle-utils";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "rectangle-utils";
-          rev = "9328291ad043fdf617cd2191692f13fba5f9a9bb";
-          sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
+          rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a";
+          sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils";
@@ -28269,8 +28481,8 @@
           sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle";
-          sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
+          sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b";
           name = "repl-toggle";
         };
         packageRequires = [ fullframe ];
@@ -28878,8 +29090,8 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode";
-          sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
+          sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk";
           name = "ruby-test-mode";
         };
         packageRequires = [];
@@ -28983,8 +29195,8 @@
           sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
-          sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
+          sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
           name = "rust-playground";
         };
         packageRequires = [ emacs rust-mode ];
@@ -29025,8 +29237,8 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s";
-          sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
+          sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa";
           name = "s";
         };
         packageRequires = [];
@@ -29401,8 +29613,8 @@
           sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
-          sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight";
+          sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm";
           name = "sentence-highlight";
         };
         packageRequires = [];
@@ -29506,8 +29718,8 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/69270c79b47b7d9348bd2ca9fec3aabfd7e694b3/recipes/sexp-move";
-          sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move";
+          sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9";
           name = "sexp-move";
         };
         packageRequires = [];
@@ -29569,8 +29781,8 @@
           sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode";
-          sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode";
+          sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x";
           name = "shakespeare-mode";
         };
         packageRequires = [];
@@ -29821,8 +30033,8 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97fe5a411be1a7d80d50f5a8af44b74c6c7cf9e6/recipes/shrink-whitespace";
-          sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace";
+          sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw";
           name = "shrink-whitespace";
         };
         packageRequires = [];
@@ -29863,8 +30075,8 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/sift";
-          sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
+          sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj";
           name = "sift";
         };
         packageRequires = [];
@@ -30367,8 +30579,8 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan";
-          sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan";
+          sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w";
           name = "smartscan";
         };
         packageRequires = [];
@@ -30871,8 +31083,8 @@
           sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode";
-          sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
+          sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys";
           name = "sphinx-mode";
         };
         packageRequires = [];
@@ -30913,8 +31125,8 @@
           sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify";
-          sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify";
+          sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x";
           name = "spotify";
         };
         packageRequires = [ cl-lib ];
@@ -30976,8 +31188,8 @@
           sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/147b6d7a58cab128509589a84fb7938e56aa0604/recipes/sql-impala";
-          sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala";
+          sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh";
           name = "sql-impala";
         };
         packageRequires = [];
@@ -31081,8 +31293,8 @@
           sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
-          sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
+          sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
           name = "ssh-deploy";
         };
         packageRequires = [];
@@ -31268,8 +31480,8 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fa948128841a1cd3c5fd4c30da3841629b17d3c7/recipes/stripe-buffer";
-          sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer";
+          sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b";
           name = "stripe-buffer";
         };
         packageRequires = [ cl-lib ];
@@ -31393,8 +31605,8 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb904557529c5d9658039a10456812810541bfed/recipes/subshell-proc";
-          sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
+          sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
           name = "subshell-proc";
         };
         packageRequires = [];
@@ -32179,6 +32391,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "terminal-here";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "terminal-here";
+          rev = "e176d1675dc5c41b6aebd05122fb2efc44b6cff0";
+          sha256 = "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
+          sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj";
+          name = "terminal-here";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/terminal-here";
+          license = lib.licenses.free;
+        };
+      }) {};
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
@@ -32819,8 +33052,8 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfafdd43a22320c619f481e2bbe162459b48990/recipes/twilight-anti-bright-theme";
-          sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme";
+          sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k";
           name = "twilight-anti-bright-theme";
         };
         packageRequires = [];
@@ -32924,8 +33157,8 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8cf02f5c8cb29265e9c83be9c959b8a9012a369d/recipes/typo";
-          sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
+          sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h";
           name = "typo";
         };
         packageRequires = [];
@@ -33237,12 +33470,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "1.20";
+        version = "1.19.3";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "46355e96f35fc6c3373cf8268e5e531cc3748644";
-          sha256 = "1jc16vki0d20vwgkf4ns6hn5s1dzfa4x5kf2925s1489f223ski3";
+          rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb";
+          sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -33875,8 +34108,8 @@
           sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element";
-          sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
+          sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l";
           name = "web-mode-edit-element";
         };
         packageRequires = [ emacs web-mode ];
@@ -34127,8 +34360,8 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/71addc88ce814ed4f413bcd8632402ac750009a1/recipes/whole-line-or-region";
-          sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
+          sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y";
           name = "whole-line-or-region";
         };
         packageRequires = [];
@@ -34232,8 +34465,8 @@
           sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout";
-          sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout";
+          sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639";
           name = "window-layout";
         };
         packageRequires = [];
@@ -34295,8 +34528,8 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/37924b239c1e883103c0cdfd429ddb6c2d40d3d7/recipes/windsize";
-          sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize";
+          sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv";
           name = "windsize";
         };
         packageRequires = [];
@@ -34332,8 +34565,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "e85aef10521f";
-          sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
+          rev = "626eaec86a97";
+          sha256 = "13hcp52krlb0vw3wxvw9mdcm7qxr80p2rs52zkkzrc73qvzxvwn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -34567,8 +34800,8 @@
           sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
-          sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
+          sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3";
           name = "ws-butler";
         };
         packageRequires = [];
@@ -34693,8 +34926,8 @@
           sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd";
-          sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd";
+          sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5";
           name = "xkcd";
         };
         packageRequires = [ json ];
@@ -34727,16 +34960,16 @@
     xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlgen";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "xmlgen";
-          rev = "d27294a4174888fe452015cb98dedd2a4bdc1e92";
-          sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
+          rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4";
+          sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen";
-          sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen";
+          sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh";
           name = "xmlgen";
         };
         packageRequires = [];
@@ -34840,8 +35073,8 @@
           sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
-          sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding";
+          sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl";
           name = "yafolding";
         };
         packageRequires = [];
@@ -35226,8 +35459,8 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan";
-          sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
+          sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94";
           name = "zone-nyan";
         };
         packageRequires = [ esxml ];
@@ -35260,12 +35493,12 @@
     zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zop-to-char";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "zop-to-char";
-          rev = "7888bb6f09ae24e8e10bd3095edd31940e6a1c46";
-          sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
+          rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d";
+          sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char";

From 0e5d43d8f10b449b55a13062c7089773b59948cd Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 17 Apr 2017 17:21:52 -0400
Subject: [PATCH 1175/1744] melpa-packages: 2017-04-17

Removals:
 - coati: renamed to sourcetrail
 - fuel: git repo not accessible
 - jade: renamed to indium
 - matrix-client: package removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 2905 +++++++++--------
 1 file changed, 1590 insertions(+), 1315 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 9ee0fb281e8..082301e254b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -800,8 +800,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -888,8 +888,8 @@
           sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell";
-          sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell";
+          sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y";
           name = "ace-flyspell";
         };
         packageRequires = [ avy ];
@@ -1056,8 +1056,8 @@
           sha256 = "06bsrnhhpncmk6jpcnvmjdb0ccz6z34ksf2ywp00l1c343p90v38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/10bb2de9c6b938fa12deff1e2748bfd0a345891a/recipes/ace-pinyin";
-          sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin";
+          sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd";
           name = "ace-pinyin";
         };
         packageRequires = [ ace-jump-mode avy pinyinlib ];
@@ -1170,6 +1170,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "add-hooks";
+        version = "20170410.2133";
+        src = fetchFromGitHub {
+          owner = "nickmccurdy";
+          repo = "add-hooks";
+          rev = "73f2ac34529f4ea0c9fc9f333531d082032d4025";
+          sha256 = "1gnnnydvmkgqzbfnc0wx386il5kcgfxdba3vq7c9p6cqxslpd8k5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
+          sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p";
+          name = "add-hooks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/add-hooks";
+          license = lib.licenses.free;
+        };
+      }) {};
     add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "add-node-modules-path";
@@ -1223,8 +1244,8 @@
           sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/adoc-mode";
-          sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode";
+          sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c";
           name = "adoc-mode";
         };
         packageRequires = [ markup-faces ];
@@ -1282,8 +1303,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "754d0fea35059c583b9613c7924cebba74fe1319";
-          sha256 = "0s9idrnzvd8sdx266s3p4jgpx0zd7s0cb7f48wp319xmqh448p84";
+          rev = "b390f212947546498a098f2ceb16033709ff32fd";
+          sha256 = "0x6p79bcn8g4r8736j977hz3qwyd9c2p4qkaq88jbfhvxyzkpdaa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1570,12 +1591,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170410.114";
+        version = "20170417.201";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "16a0bc57107562e69cb97701d9275b446b411a8c";
-          sha256 = "0i2hrfjgxpg9n7k2n4gsl1wp93g0cv1wrcwwaw3fz0vf250f5avf";
+          rev = "9c6a36842aedf9960c5fa81ffe8ba9745dd9cb86";
+          sha256 = "0kam8p4nid1rmmr5jw3l8728fd5c9s67gabyacky7qnfa0klja5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1599,8 +1620,8 @@
           sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired";
-          sha256 = "0fbl3i3wi2ka43xri0i30x561115hmv3j75vpkyzz3g1m9w006br";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired";
+          sha256 = "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9";
           name = "all-the-icons-dired";
         };
         packageRequires = [ all-the-icons emacs ];
@@ -1646,8 +1667,8 @@
         src = fetchFromGitHub {
           owner = "immerrr";
           repo = "ample-regexps.el";
-          rev = "c806766693827a9ca12a6a07f6294260d6ef776e";
-          sha256 = "17kdv4447dyjaz2chi1f8hlrry8pgvjgxivvk48r9yzi1crjd1zj";
+          rev = "cbe91e148cac1ee8e223874dc956ed4cf607f046";
+          sha256 = "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a5c72dfb52d55b2b22c91f115b32fff14f2f61e/recipes/ample-regexps";
@@ -1900,8 +1921,8 @@
           sha256 = "06gs5ln3w1xvq8f8k9225rwiipbh9cs0dzyyb7z05717rmqixcc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/annoying-arrows-mode";
-          sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode";
+          sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh";
           name = "annoying-arrows-mode";
         };
         packageRequires = [ cl-lib ];
@@ -2290,16 +2311,16 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170325.1036";
+        version = "20170412.445";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "dc5e218372293ade9bf42bd6782da6b127629d67";
-          sha256 = "0jyh4gi8dz5ifpl1p338rarf9h53z97xfck516fcjdbkm91rwamg";
+          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
+          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
-          sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
+          sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh";
           name = "anything-tramp";
         };
         packageRequires = [ anything emacs ];
@@ -2319,8 +2340,8 @@
           sha256 = "1y6s45k3f2x30fc9d5dv1v3cypj9wylx56khs5zxczgk5ky1ffp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu";
-          sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu";
+          sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1";
           name = "anzu";
         };
         packageRequires = [ emacs ];
@@ -2537,12 +2558,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170321.907";
+        version = "20170414.1333";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "09f2f184445f179c3c888a4a9b6cafea82a0ca99";
-          sha256 = "000bihb4i07d5djf2b1hdyxm2yynnq5sirry1qgvn5wmrvny586l";
+          rev = "8d79047d58bf30e01cc9851431e7ee093c6bc60a";
+          sha256 = "1ijdyd3a5hxanz1wm4fxzsnnr00dwlwivj12533n9wrx029bkg4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2573,6 +2594,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    arch-packer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "arch-packer";
+        version = "20170417.346";
+        src = fetchFromGitHub {
+          owner = "brotzeitmacher";
+          repo = "arch-packer";
+          rev = "4a37e8fb9fadfb9f4e75a042231192b0a582b40d";
+          sha256 = "0l36f5hnz4k556hkx42qsp2df9g319znnqq5mqgabykqbdd604hs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
+          sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
+          name = "arch-packer";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/arch-packer";
+          license = lib.licenses.free;
+        };
+      }) {};
     archive-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "archive-region";
@@ -2728,8 +2770,8 @@
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/ascii";
-          sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii";
+          sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd";
           name = "ascii";
         };
         packageRequires = [];
@@ -2783,12 +2825,12 @@
     assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20170408.1451";
+        version = "20170413.409";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "0a3e94477a08c3cda7c1dd4ea05ef87208901ac0";
-          sha256 = "03fpfyamcfhc1amfnmq5r2qrzc9iws3mzwihr4nc0k5xjp7z0rhb";
+          rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa";
+          sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -2812,8 +2854,8 @@
           sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
-          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
+          sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4";
           name = "async";
         };
         packageRequires = [];
@@ -2854,8 +2896,8 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f6ab31b9371236fe1f3bf8e68c93d0bad8e14d24/recipes/@";
-          sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/@";
+          sha256 = "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z";
           name = "at";
         };
         packageRequires = [ emacs queue ];
@@ -3930,12 +3972,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170407.111";
+        version = "20170411.608";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "105efc84827cb764cac1e1e3a793abf106837021";
-          sha256 = "1kb5l50m8hqmdc5yjw43l53nimsbc3g9jnlkkrdywqm0kbzc5znp";
+          rev = "f2bedeeb5804a4863bb53aca6f77195f7d530c38";
+          sha256 = "1p2l6zqls2c8v1ahn9rkfj6vvcsx1ymd0rd590scj8kqhjjyq3n7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3993,12 +4035,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20170404.904";
+        version = "20170411.858";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "6dd5dde4d4bc0bc7758977b64e1ad1173f5f1602";
-          sha256 = "0lscjwbksdqkjzfzvdz0llpxbmwk94byyxz0fljcncxzdzwvsz6v";
+          rev = "97020c34176538480cfd28004f16f9b5494315e6";
+          sha256 = "1dgjkhcsb1iyjcwbjyccr7550lczg74jl7w1g7kif8g0df0mc5g6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4040,8 +4082,8 @@
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04101ec2a234a0f95faab6fa664e54413365ba9a/recipes/awk-it";
-          sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it";
+          sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3";
           name = "awk-it";
         };
         packageRequires = [];
@@ -4253,8 +4295,8 @@
           sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
-          sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme";
+          sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v";
           name = "badwolf-theme";
         };
         packageRequires = [ emacs ];
@@ -4308,12 +4350,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170326.1839";
+        version = "20170415.1600";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "87b91379661f627cb1cecabfd648d6a3838cd448";
-          sha256 = "1fb4mhz17x235lasqqwzb0jacvl96h3lsjf7mkhdwzxp3p26l4gf";
+          rev = "51d952579b5f91d92c386394d9ea8cd6535284f5";
+          sha256 = "08i7zl8b1y3xn60imjvwri8zr7695f72rcdj7a9m1x8bwzipzrb0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4358,8 +4400,8 @@
           sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile";
-          sha256 = "07p35wg426ap0awgk4vg5n36s5jbfs3fi5djl8jq93jr6xs9imbc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile";
+          sha256 = "0g595d1vd97b5qqydpb6cr3ibgcm08cw8c154h35vz3cl4w86mwd";
           name = "basic-c-compile";
         };
         packageRequires = [ cl-lib f ];
@@ -4521,8 +4563,8 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0e8f0aadc5a46df9d4c1bfdf77d69e839914124/recipes/bbdb-china";
-          sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china";
+          sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py";
           name = "bbdb-china";
         };
         packageRequires = [ bbdb-vcard chinese-pyim ];
@@ -4584,8 +4626,8 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0e8f0aadc5a46df9d4c1bfdf77d69e839914124/recipes/bbdb-handy";
-          sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy";
+          sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8";
           name = "bbdb-handy";
         };
         packageRequires = [ bbdb ];
@@ -4668,8 +4710,8 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc1d68a1d232016db004d145b9a40bcfbf400aa6/recipes/bdo";
-          sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bdo";
+          sha256 = "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j";
           name = "bdo";
         };
         packageRequires = [];
@@ -4833,8 +4875,8 @@
           sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
-          sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
+          sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6";
           name = "better-shell";
         };
         packageRequires = [ emacs ];
@@ -4930,12 +4972,12 @@
     bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bibretrieve";
-        version = "20131013.1132";
+        version = "20170417.620";
         src = fetchFromGitHub {
           owner = "pzorin";
           repo = "bibretrieve";
-          rev = "aff34c6e1a074ac4fd574d8e66fd9e0760585419";
-          sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
+          rev = "813730a8967e003ca67342cc45b62c17cda77a7c";
+          sha256 = "0wy2013azglz095w4w3g693hr6f68z2fbwpc6gixr85rd0pk9hh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
@@ -5018,8 +5060,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "103b6518e66d9acb990832f02dca093a7425ca84";
-          sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
+          rev = "0139f85595a10b9e50e38f3d8d59f70cf4f3a2a2";
+          sha256 = "1zv2an1mzks51j46j2gvizjmh7k5frzw7qja9kh9lvighl2qrg2v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5064,8 +5106,8 @@
           sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict";
-          sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
+          sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli";
           name = "bing-dict";
         };
         packageRequires = [];
@@ -5137,6 +5179,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bitbucket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "bitbucket";
+        version = "20170404.2146";
+        src = fetchFromGitHub {
+          owner = "tjaartvdwalt";
+          repo = "bitbucket.el";
+          rev = "5e663da1bd38a14c1ecf4d66a79d4321ac833bcf";
+          sha256 = "1sikayb6i1k40zdl4j9n04xcmsf74py5vmcjbvli7k8b3ar7l5l5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf87389e6a5d868850d27e077202e1e52eaf4aa/recipes/bitbucket";
+          sha256 = "1d0v6hvmxky3k2m89b7xm1igx9fmzvhdpn1bi8zln61m4zgr3yz0";
+          name = "bitbucket";
+        };
+        packageRequires = [ emacs request s ];
+        meta = {
+          homepage = "https://melpa.org/#/bitbucket";
+          license = lib.licenses.free;
+        };
+      }) {};
     bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bitlbee";
@@ -5169,8 +5232,8 @@
           sha256 = "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e62944dfef1c0c259524bacf1c82e68571acaf30/recipes/blackboard-bold-mode";
-          sha256 = "0zip1v96mdmz2z9hakn9asg5c1gm68i4mdmrsccqig3s60zrxvhz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/blackboard-bold-mode";
+          sha256 = "08fmzm5lblkk503zr4d6hkp45075pwwd8zinngasrsf1r01isksj";
           name = "blackboard-bold-mode";
         };
         packageRequires = [ cl-lib ];
@@ -5709,8 +5772,8 @@
           sha256 = "1ybb9gyw1b4fjbh02lj632vc89m9yq91dvshnbnzg0wbr77d33xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
-          sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
+          sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4";
           name = "browse-at-remote";
         };
         packageRequires = [ cl-lib f s ];
@@ -6015,8 +6078,8 @@
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b1245af5b838e4e782cf323813ba143a7666ac4/recipes/buffer-stack";
-          sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack";
+          sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln";
           name = "buffer-stack";
         };
         packageRequires = [];
@@ -6204,8 +6267,8 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/buster-mode";
-          sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buster-mode";
+          sha256 = "0nylkxy9qlj1h5v0pja4g315xcj5qzvkys4dsnzbh3xq4xzyj6xj";
           name = "buster-mode";
         };
         packageRequires = [];
@@ -6414,8 +6477,8 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/096d45e6fee9ec514b853d946bf0ce77a5c33ebc/recipes/cache";
-          sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cache";
+          sha256 = "15pj7f4n0lk8qqsfafdj19iy0hz4xpfcf2fnby7ziq2dldyqrax9";
           name = "cache";
         };
         packageRequires = [];
@@ -6553,12 +6616,12 @@
     calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "20170320.506";
+        version = "20170410.1920";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "136dce009a26e7d8a8064af422c2cf8170e852c5";
-          sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
@@ -6582,8 +6645,8 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9791feacdf46836d22ee907394b7242387804b9/recipes/calfw-gcal";
-          sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/calfw-gcal";
+          sha256 = "0pzjs8kvf9vxdzziq7zd59vniq21k4a6yygpv4fz2by3s3bvnrid";
           name = "calfw-gcal";
         };
         packageRequires = [];
@@ -6643,8 +6706,8 @@
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/caml";
-          sha256 = "1z5wm2h930fhl4v01i6ki8ms58n4dn4h085iac075sijp8dpih92";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml";
+          sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf";
           name = "caml";
         };
         packageRequires = [];
@@ -6706,8 +6769,8 @@
           sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1a6003eae15ed12e8d6e5e74316f03201cf8373/recipes/caroline-theme";
-          sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caroline-theme";
+          sha256 = "178nxcz73lmvnjcr6x6as25d8m5knc21jpr66b4rg0rmlmhchkal";
           name = "caroline-theme";
         };
         packageRequires = [ emacs ];
@@ -6782,12 +6845,12 @@
     cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "cask-package-toolset";
-        version = "20160102.137";
+        version = "20170411.1430";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "cask-package-toolset.el";
-          rev = "bf5ae2fec2c84816d9e2b45a0799240401de9fc3";
-          sha256 = "1cy4bsrmz4x0c9hfsm789kfw1fb71h25dw8m9yjm795a0vdgskah";
+          rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425";
+          sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -6916,8 +6979,8 @@
           sha256 = "1pvlq98qll44g1ag8w5rkbppk1b8l8inkwn5qzrlsjr8pngyhljz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/193956c26050e15ddd7fb6579a053262d1de1e30/recipes/cdlatex";
-          sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex";
+          sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9";
           name = "cdlatex";
         };
         packageRequires = [];
@@ -6998,8 +7061,8 @@
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dcb9f72c7ecc30f5391e4f83c7bb173af04978e5/recipes/centered-cursor-mode";
-          sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode";
+          sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0";
           name = "centered-cursor-mode";
         };
         packageRequires = [];
@@ -7057,8 +7120,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "cerbere";
-          rev = "ef573b05f4c2a067b8234003aaa4b2a76fffea5c";
-          sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
+          rev = "dd2105c372b469954e665a5aa0c3766b4922ce6a";
+          sha256 = "0i8939rycyq7baa043ksdv90mg3ik2amgkjf6iv4cx9r6c1xkzwx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere";
@@ -7078,8 +7141,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "37e40b61521efb63e1b5c8efb441e20805974fbf";
-          sha256 = "0l3455j6is72vfxlv63bsrwqiykqn4a1nys08l2vx6yxxxy7m0z4";
+          rev = "1fcf27f62b30e839020ac31145951f9abbd1c148";
+          sha256 = "0nm3mjbynqfg0vr2b5x10vak859pjxq2kgmgkv4i1y1y2cfhp3fc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7118,7 +7181,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12127";
+          rev = "12128";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7164,8 +7227,8 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cbe7e12067af7e5287c714df6677d438f7f30c36/recipes/change-inner";
-          sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/change-inner";
+          sha256 = "09y076vhhvp21jsvw9f5z4yk6cnmmjavg7600flxg5g27ydgix57";
           name = "change-inner";
         };
         packageRequires = [ expand-region ];
@@ -7458,8 +7521,8 @@
           sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c2e447028dbae2dfefc47859c185af254210fe8/recipes/chinese-number";
-          sha256 = "0qj7lh7asic77dsdlsv4pg2jzickqa0m5lvn8f184qq98yfmj6d6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/chinese-number";
+          sha256 = "01ia2l5vrg8fhaxcvk8pv9qfm08xs0fbyc9j57nbdk9wxnd9i45s";
           name = "chinese-number";
         };
         packageRequires = [];
@@ -7833,8 +7896,8 @@
           sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a4a31dfc9cfe8ca4e72b7060e1db8c3864299e5b/recipes/cider-spy";
-          sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cider-spy";
+          sha256 = "086yxz90mgc5si9k4j15nkc51k0lfk1dx1kq3r3swhyw3cwn7vh3";
           name = "cider-spy";
         };
         packageRequires = [ cider cl-lib dash emacs noflet ];
@@ -7959,8 +8022,8 @@
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a12bd6769ce7a5745c2da06dcd57ed3ba2ed891/recipes/cl-format";
-          sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format";
+          sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy";
           name = "cl-format";
         };
         packageRequires = [];
@@ -7996,7 +8059,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "299842";
+          rev = "300461";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8516,8 +8579,8 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/closure-lint-mode";
-          sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/closure-lint-mode";
+          sha256 = "11kxgvfwngdjryrrihlpn0509axwv4zwkxzs4h1pw5vi7sv1n6xd";
           name = "closure-lint-mode";
         };
         packageRequires = [];
@@ -8638,8 +8701,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "333c565acefef652d2593d6eadc97551865a67e6";
-          sha256 = "14dlvyxvakj1ykm27apv9iv3gxjaa5m4zs7562vih14d7bqywsc3";
+          rev = "be2c45f2a98d69cc9952b592777bb506f69149a2";
+          sha256 = "1nq63k8baym6dm8s05ac81iqvy9gi60a10c962x7zlxkk5r0klbp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8684,8 +8747,8 @@
           sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo";
-          sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cmd-to-echo";
+          sha256 = "1b4mw1ips4695ixgw2hyinq9ry3bx4d1842kr7k6155a1v34s4zh";
           name = "cmd-to-echo";
         };
         packageRequires = [ emacs s shell-split-string ];
@@ -8754,27 +8817,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    coati = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "coati";
-        version = "20170228.705";
-        src = fetchFromGitHub {
-          owner = "CoatiSoftware";
-          repo = "emacs-coati";
-          rev = "f06eee92cb43b0dfd6dcf758ae05ac021a184f1c";
-          sha256 = "1l36pjapcsgc6sph6scgpc4zl5qfwf17ppyjznchkh4ykj13ghj3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati";
-          sha256 = "0f6vhypv8b8maq72pc1xp1yqv760za508kff2dqv0crwyd7iv32h";
-          name = "coati";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/coati";
-          license = lib.licenses.free;
-        };
-      }) {};
     cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cobra-mode";
@@ -9402,12 +9444,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170328.1748";
+        version = "20170415.1248";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
-          sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
+          rev = "b753952d5a0ee288b6c49b2d8dfa9a223ff59715";
+          sha256 = "11725dhdyy67qynp9vld691ljfz2yb9v3ql4j75l7y5jl3gjklwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9523,8 +9565,8 @@
           sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
-          sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-bibtex";
+          sha256 = "1b96p5qyxl6jlq0kz0dbma5pwvgqcy4x4gmpknjqrjabafbq1ynn";
           name = "company-bibtex";
         };
         packageRequires = [ cl-lib company parsebib ];
@@ -9824,8 +9866,8 @@
           sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f04b009780ebdf106534916869610d6f7264/recipes/company-ghci";
-          sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ghci";
+          sha256 = "0q71qil4sndg72s2g5yg17w3n102wlba37y9jbx0l7hisa5l11gi";
           name = "company-ghci";
         };
         packageRequires = [ company haskell-mode ];
@@ -10110,12 +10152,12 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20170402.35";
+        version = "20170416.526";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
-          sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
+          rev = "81d9081fa68ef16ccd11ecc6296bf870d47d11f0";
+          sha256 = "1fp7niq3xyp3xdqmbf6hzdz0g6p4rpk9lf4vhg2619qmkzh3k1d7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10183,8 +10225,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10313,8 +10355,8 @@
           sha256 = "0pjxahrhvz7l45whqlgm6n4mvqqxc8zs1dv33p3b498hyb83f52j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cda69dc7d45087fa9a3e0460d2b12a1dce1a7b3/recipes/company-web";
-          sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
+          sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b";
           name = "company-web";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
@@ -10351,12 +10393,12 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
-          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
+          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
+          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
-          sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
+          sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d";
           name = "company-ycmd";
         };
         packageRequires = [ company dash deferred f let-alist s ycmd ];
@@ -10669,8 +10711,8 @@
           sha256 = "03wwdd9n7fijrczrrdhn9xisrj7mqhc2q7z4da6fm3q45sy2npqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/522d8ae8abbc672f09b8893acb77695756746321/recipes/coq-commenter";
-          sha256 = "18whbdsdzyjl9gmbzh49gdv5w3d7fpp8c8g1539adzdxarps36s8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter";
+          sha256 = "07svxfh6wx78lg2r7jssdlipmcwzk8w14vry9fr5wxxi24y37nvg";
           name = "coq-commenter";
         };
         packageRequires = [ cl-lib dash s ];
@@ -10703,12 +10745,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170410.24";
+        version = "20170416.1036";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
-          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
+          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
+          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10879,8 +10921,8 @@
           sha256 = "1q6cx6kq68xxqcx7zd9l4szy038i5ifjb82fxs3sn5fv00q0j9vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b2f92804e67fac780a0be850fcd0d0e93992ea7a/recipes/coverlay";
-          sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
+          sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j";
           name = "coverlay";
         };
         packageRequires = [ cl-lib emacs ];
@@ -11005,8 +11047,8 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/crappy-jsp-mode";
-          sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crappy-jsp-mode";
+          sha256 = "17m404kdz9avihz52xd7hn5qx06a6k74gmn0gbhly4gl84w3zc6y";
           name = "crappy-jsp-mode";
         };
         packageRequires = [];
@@ -11068,8 +11110,8 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c97649d365b8e206fb6b88a47e8f1eb8e0bd2450/recipes/creole";
-          sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/creole";
+          sha256 = "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n";
           name = "creole";
         };
         packageRequires = [ kv noflet ];
@@ -11110,8 +11152,8 @@
           sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz";
-          sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
+          sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
           name = "cricbuzz";
         };
         packageRequires = [ dash enlive s ];
@@ -11171,8 +11213,8 @@
           sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b4144c2fd45877effd8005abf64019aed651148a/recipes/crosshairs";
-          sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs";
+          sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019";
           name = "crosshairs";
         };
         packageRequires = [ col-highlight hl-line-plus vline ];
@@ -11318,8 +11360,8 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3b5d83fcfb9d03301b95cf13e67549ce0f46e3/recipes/css-eldoc";
-          sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/css-eldoc";
+          sha256 = "0k0yzpqwfh5rg8sbv60simdslag514768i0naimm8vyrvv87fzny";
           name = "css-eldoc";
         };
         packageRequires = [];
@@ -11543,8 +11585,8 @@
           sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg";
-          sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg";
+          sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x";
           name = "cursor-chg";
         };
         packageRequires = [];
@@ -11865,12 +11907,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170410.55";
+        version = "20170410.700";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "9c29ac5cca30b02c227518c472af3a645a7c3d1a";
-          sha256 = "1pk6lmzq64fzbhqvxxvymspknq96zakjb65v52a45jgl4y9c1dlr";
+          rev = "d93001794bb505b32708d7d7b1755ef0bbe13c82";
+          sha256 = "11dpdvn3lkd2yrzbibd7xqx1pznhn6i8wrp9bzg1yagn27jsyry8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12083,8 +12125,8 @@
           sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
-          sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
+          sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
           name = "dart-mode";
         };
         packageRequires = [ cl-lib dash flycheck ];
@@ -12417,8 +12459,8 @@
           sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
-          sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste";
+          sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v";
           name = "debpaste";
         };
         packageRequires = [ xml-rpc ];
@@ -12564,8 +12606,8 @@
           sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
-          sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
+          sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm";
           name = "deferred";
         };
         packageRequires = [ emacs ];
@@ -12876,8 +12918,8 @@
           sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl";
-          sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
+          sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2";
           name = "diff-hl";
         };
         packageRequires = [ cl-lib emacs ];
@@ -13039,8 +13081,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "dionysos";
-          rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2";
-          sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208";
+          rev = "0aac21caadabc5a7f09e18a9dcb02f3dec26588b";
+          sha256 = "1g6p9cr3p85i7ay3jmvn7f8c5k8d49fcynb3ymns7rgsf3ypvpyc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos";
@@ -13102,8 +13144,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13124,8 +13166,8 @@
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8ed2327efe099420e53e7275eefeef74842068e8/recipes/dired-details";
-          sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details";
+          sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7";
           name = "dired-details";
         };
         packageRequires = [];
@@ -13143,8 +13185,8 @@
           sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+";
-          sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+";
+          sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9";
           name = "dired-details-plus";
         };
         packageRequires = [ dired-details ];
@@ -13219,12 +13261,12 @@
     dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-fdclone";
-        version = "20150417.132";
+        version = "20170413.747";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "dired-fdclone.el";
-          rev = "e9bf4f16248cb5d187a323b7887d236a4a203c59";
-          sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
+          rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6";
+          sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone";
@@ -13265,8 +13307,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13286,8 +13328,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13412,8 +13454,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13433,8 +13475,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13449,10 +13491,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170409.1441";
+        version = "20170409.1822";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "0bjpz9zaq6b158964b37llrn6jakfhzai8ahwyi8d6jsf392hljp";
+          sha256 = "0anrf0cax9ah5mlxxbav7f2vvv50l7psi32rgn3z3hv4z34fmkrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13493,8 +13535,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13514,8 +13556,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13611,8 +13653,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
-          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
+          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
+          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13969,8 +14011,8 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/84d19999b8387e8b71215675cf1c15873314d90e/recipes/dispass";
-          sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass";
+          sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n";
           name = "dispass";
         };
         packageRequires = [ dash ];
@@ -14115,8 +14157,8 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3f56de1465d1b19dbefff62d3a1f2c4ee86ac0c4/recipes/dizzee";
-          sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee";
+          sha256 = "14y10k8s65cyn86m1z77817436m89l0xpwd1wr4d7qp3x2mmn215";
           name = "dizzee";
         };
         packageRequires = [];
@@ -14325,8 +14367,8 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d32848d2de20cc71669b88699acaa0d306f009f5/recipes/dna-mode";
-          sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode";
+          sha256 = "06vprwv1v4jzqzi2nj9hbhnypnvqxmixls8yf91hzwlk3fdkdywf";
           name = "dna-mode";
         };
         packageRequires = [];
@@ -14480,8 +14522,8 @@
           sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e46cf6a57b93ddfda8e2d6e74cee8d0df2cb1ec7/recipes/dokuwiki";
-          sha256 = "1vi6crl5y3g1p6xcpqzybmidn09cdf4gplmrvb2nkc94pyd9qxnw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki";
+          sha256 = "0wfzzxx3n75zgxk06rlq7053hla84k79mk911by4jwk6km5adk55";
           name = "dokuwiki";
         };
         packageRequires = [ emacs xml-rpc ];
@@ -14556,12 +14598,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170316.1237";
+        version = "20170411.1533";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "2266ef462d3c0a4b79887d71447a45cf57b6a1d7";
-          sha256 = "0p3f364f5p5wgma5c5iyknm73bvqvkfakndrn2r0k7phn29vw9fb";
+          rev = "1618b28f188b2ca547c2cceb16ad8e6ac9ec5a83";
+          sha256 = "1bxfx7i9gdp870x4qkqkmqqb9jszi1hn345h5xwqajik6ys7d2cj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14659,8 +14701,8 @@
           sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode";
-          sha256 = "18dj3bvnm28j7mllv4f575ahnhzziinycg48wbr73qi70vq059z8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode";
+          sha256 = "039ylmbvw0wb3i2w4qn3dhckz7y3swbid4hwjcxljy4szc709p6k";
           name = "dot-mode";
         };
         packageRequires = [ emacs ];
@@ -14722,8 +14764,8 @@
           sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/21061b3a61a0e5e3f99b2fa2a52e620d639dcc82/recipes/dpaste";
-          sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste";
+          sha256 = "0wrfy9w0yf5m15vmhg4l880v92cy557g332xniqs77ab0sga4vgc";
           name = "dpaste";
         };
         packageRequires = [];
@@ -14743,8 +14785,8 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c7b89dc6ab23e4a6e70765b7fcb4885387ce65f/recipes/dpaste_de";
-          sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste_de";
+          sha256 = "0022dd8l7jsyl0lv9x6iz882ln71js8brqcbiqz001zv45yrgvy0";
           name = "dpaste_de";
         };
         packageRequires = [ web ];
@@ -14777,12 +14819,12 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20170308.2107";
+        version = "20170412.845";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "3ba76624318944cbadd95865dc3f50af01cb6241";
-          sha256 = "1x74nxxdv87sw0prd20nz2i0mxna29spy9dwm5qp6skl09bjwrfn";
+          rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24";
+          sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14911,8 +14953,8 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/afc3754da223a33f3f06c199951b098acd18e5f5/recipes/dropbox";
-          sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropbox";
+          sha256 = "1dqjsn7wkjjvbwq3kgdd7bvwrirappwnhcwkj2ai19dpx6jd8wym";
           name = "dropbox";
         };
         packageRequires = [ json oauth ];
@@ -14929,8 +14971,8 @@
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/364c9db68f34fc617a706eb1d7b4304ef4a88714/recipes/dropdown-list";
-          sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list";
+          sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj";
           name = "dropdown-list";
         };
         packageRequires = [];
@@ -14986,12 +15028,12 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1790830";
+          rev = "1791699";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dsvn";
-          sha256 = "0fl23fcnf4x9gm51761551cyr3i9954k0d5nq2c99nxzrajbnyk6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn";
+          sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5";
           name = "dsvn";
         };
         packageRequires = [];
@@ -15011,8 +15053,8 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5af0cec2b49ccc6807939162184cc40558a8716/recipes/dtrace-script-mode";
-          sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dtrace-script-mode";
+          sha256 = "00ar2qahgqpf4an6v9lbzgj73ylbavvigsm8kqdq94ghm4awxi4z";
           name = "dtrace-script-mode";
         };
         packageRequires = [];
@@ -15087,16 +15129,16 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170330.1409";
+        version = "20170412.1246";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "1c8d705178607e7175341816f4a20ebd36480329";
-          sha256 = "1lav31cmnyzxpqwv74nwhld9rpjz7wl197cslzjl171ca5n322vm";
+          rev = "877fe466c8c60edbd9ea5602185690b1fa599a6b";
+          sha256 = "1wm9kl4sximr75pfw18wxsd3c59qp0i1vn1565f4srfgq71r23yg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
-          sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
+          sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w";
           name = "dumb-jump";
         };
         packageRequires = [ dash emacs f popup s ];
@@ -15147,21 +15189,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20170324.419";
+        version = "20170415.628";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "6f4b44fb1966";
-          sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
+          rev = "6cc0b8488a17";
+          sha256 = "03x94q315yq5kg2wvsp508a9hxl625iji3b84kywmg5hb3w5r9qn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/dyalog-mode";
           license = lib.licenses.free;
@@ -15468,12 +15510,12 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28";
-          sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
+          rev = "b994c79a739fad4999ddc0d2b5a152bf0a4dbc7a";
+          sha256 = "1j2b2nwa4h95s2dr879iaa6zxy9gvvljvx5ksjirgmy6vf36lb0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
-          sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
+          sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
           name = "easy-hugo";
         };
         packageRequires = [ emacs ];
@@ -15717,8 +15759,8 @@
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "ecukes";
-          rev = "36db74ef44edfc654618d681f3452b9904740f9a";
-          sha256 = "1hc1hb0lnkjanjddcwax783n2fcv5lvi1xl1kszbdzlck4sz1i1r";
+          rev = "277d25cf8fc9548239599244ab15a2268a55b31b";
+          sha256 = "0jh7l4lhbjd7qxqdi8d8mk5j3qxx70x3jdzpw2xw6szcx67lvd3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16015,8 +16057,8 @@
           sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/688f0b6802d04d133afc3de7371f65b8d5d2bad4/recipes/edit-indirect-region-latex";
-          sha256 = "0lsqz09c4p2gl1xd673783hmmh7y5iq4kw521q7hiza4xbaiwpr3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/edit-indirect-region-latex";
+          sha256 = "0ys0fpfk259g14wvg0nnkc3wk1dbjjd2n4a636jblgq63w6g3h79";
           name = "edit-indirect-region-latex";
         };
         packageRequires = [ edit-indirect emacs ht ];
@@ -16276,8 +16318,8 @@
           sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
-          sha256 = "02s840chz3v4gdyq01b5i5w2vxl94001jk9j1nsp5b8xm10w985j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
+          sha256 = "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj";
           name = "ego";
         };
         packageRequires = [ dash emacs ht htmlize mustache org simple-httpd ];
@@ -16295,8 +16337,8 @@
           sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
-          sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
+          sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv";
           name = "eide";
         };
         packageRequires = [];
@@ -16329,12 +16371,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170407.618";
+        version = "20170411.1509";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "39f5d329f188759662f703cc587a9973bda0aa5a";
-          sha256 = "0lais4n817lizqpjv90ajijh8dwa9znc4ib57v8y20g76yffq1gi";
+          rev = "f0f0c0d2069972f71cdfb5e520f42c688465be8c";
+          sha256 = "0w6xjvpkm6cfpvbxjkjd580znjyh44mkldj1p330rda0ykarshdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16699,8 +16741,8 @@
           sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/914e845a0869680f84611a415373c9a166c93794/recipes/el2markdown";
-          sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown";
+          sha256 = "1bpfddcvg9wgc5g14clj6wyiw8rsh45rgibvlmyan2m0gmwvmqx6";
           name = "el2markdown";
         };
         packageRequires = [];
@@ -16720,8 +16762,8 @@
           sha256 = "0jinjrl2fgxixdkkayvajd7pzqz8vmqdkni8pm4shn781n660b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dcbeff073f03d03b306f1d96ba2dcf140b57a634/recipes/el2org";
-          sha256 = "1fshlq06psmfnp1gcmkqiw0hrm25dgl67ijb9sb3m6q1z9wml674";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
+          sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh";
           name = "el2org";
         };
         packageRequires = [ emacs ];
@@ -16780,8 +16822,8 @@
           sha256 = "065sihf0dvi7g37zvf5drigkakydapyvpxdibcdzhcxx2p9bqszi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode";
-          sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode";
+          sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954";
           name = "eldoc-overlay-mode";
         };
         packageRequires = [ emacs inline-docs ];
@@ -16801,8 +16843,8 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d2561bee760f11fd95ae6b1c97708d38e9203b1/recipes/electric-case";
-          sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/electric-case";
+          sha256 = "1ch108ljzg5xkk4pkfpfxm8v2yzqk79q3h2zhzzqhsydq7r07bdn";
           name = "electric-case";
         };
         packageRequires = [];
@@ -16864,8 +16906,8 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/elein";
-          sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elein";
+          sha256 = "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2";
           name = "elein";
         };
         packageRequires = [];
@@ -16898,12 +16940,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170402.1842";
+        version = "20170416.556";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
-          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
+          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
+          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16955,8 +16997,8 @@
           sha256 = "15wcwp8gfv1zsykyc59ml07g43p1w305q3mgahis37rl9bpyaadn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5874b83e31cb760698032106fff75c8ded1d8e82/recipes/elfeed-org";
-          sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org";
+          sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8";
           name = "elfeed-org";
         };
         packageRequires = [ dash elfeed org s ];
@@ -16972,8 +17014,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
-          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
+          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
+          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17039,8 +17081,8 @@
           sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5bf5c03ec4c26eb43703a49606450cbdb826996/recipes/elisp-docstring-mode";
-          sha256 = "0mrg4vszf3p09qz3dvj38dv00f3ca8hrm3vmnjsfq0cji0yipyy1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elisp-docstring-mode";
+          sha256 = "0mdh3ikn6zfd3fbmifvivqih2fsijvlzalljdvm32crs9cy6fa96";
           name = "elisp-docstring-mode";
         };
         packageRequires = [];
@@ -17270,8 +17312,8 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/29c24259817bf4b7caf51f1cfc163e6b7c63504b/recipes/elmine";
-          sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine";
+          sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn";
           name = "elmine";
         };
         packageRequires = [ s ];
@@ -17375,8 +17417,8 @@
           sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit";
-          sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit";
+          sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi";
           name = "elpa-audit";
         };
         packageRequires = [];
@@ -17430,12 +17472,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170401.1152";
+        version = "20170414.319";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "9d143d1e85d6d05792e4557393edeeb155fc950e";
-          sha256 = "0wbvym7jal2n45pqd1nf10009cxlfffdsyip7yv1fixbb6b39y5c";
+          rev = "e4982452a3be29df4ab71f2463485c3e697c6f1a";
+          sha256 = "18g65sy70p8s5v5r150b6b1wqmi11q6n213l8ign038iqjmbar8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17749,85 +17791,85 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+    emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
-        version = "20170110.1853";
+        version = "20170410.1218";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
-          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
+          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
+          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
-        packageRequires = [ cl-lib emacs finalize ];
+        packageRequires = [ cl-generic cl-lib emacs finalize ];
         meta = {
           homepage = "https://melpa.org/#/emacsql";
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-mysql";
-        version = "20151004.715";
+        version = "20170410.1008";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
-          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
+          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
+          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
-        packageRequires = [ cl-lib emacs emacsql ];
+        packageRequires = [ cl-generic cl-lib emacs emacsql ];
         meta = {
           homepage = "https://melpa.org/#/emacsql-mysql";
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+    emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
     melpaBuild {
         pname = "emacsql-psql";
-        version = "20151004.715";
+        version = "20170410.1008";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
-          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
+          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
+          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
-        packageRequires = [ cl-lib emacs emacsql pg ];
+        packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
         meta = {
           homepage = "https://melpa.org/#/emacsql-psql";
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-sqlite";
-        version = "20160311.1238";
+        version = "20170410.1218";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
-          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
+          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
+          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
-        packageRequires = [ cl-lib emacs emacsql ];
+        packageRequires = [ cl-generic cl-lib emacs emacsql ];
         meta = {
           homepage = "https://melpa.org/#/emacsql-sqlite";
           license = lib.licenses.free;
@@ -17962,12 +18004,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "20161228.1948";
+        version = "20170413.1110";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "7e0cc702bc15915f4e4be4c334faa37dca94e749";
-          sha256 = "0w746jbyfjd8z8ga5nlsipw02pcbi98wxfdw51zv088ml0647v6j";
+          rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
+          sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18027,8 +18069,8 @@
         version = "20170301.1406";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a";
-          sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i";
+          rev = "0cd9ea411391c9049f4fbcd5d9164ba11b73fe56";
+          sha256 = "1g9jrv23bzwlafrsywdzzc4g79v2a7lm37644cfnmdma8a8ywrh5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18157,8 +18199,8 @@
           sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv";
-          sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
+          sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316";
           name = "emms-player-simple-mpv";
         };
         packageRequires = [ cl-lib emacs emms ];
@@ -18342,8 +18384,8 @@
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "c671b08facf37be6fc6783260cee686866cfed14";
-          sha256 = "05v90g6ybdp2fmnnklnbdxygnw8xw0whmxbdw45qdww8idf2swfs";
+          rev = "07e0b41fe080536e8a69301ff1c692f2871bee2f";
+          sha256 = "1ckbc2ziw31cqal9hmc6n6gmncwficzw5rwwdcy4wj7f7w3xkr5z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -18827,8 +18869,8 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/321ae5999351637a2cd97ec1bf4668d68f569ee4/recipes/erc-hl-nicks";
-          sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks";
+          sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq";
           name = "erc-hl-nicks";
         };
         packageRequires = [];
@@ -18848,8 +18890,8 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/69c923ab029eb0c638104f38d2c9766992ca101c/recipes/erc-image";
-          sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image";
+          sha256 = "1k5llh2jg2wxy9v03qrhwqa6g7apkqiqa47jm24z0ydqinm6zl83";
           name = "erc-image";
         };
         packageRequires = [];
@@ -18932,8 +18974,8 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c846b4bad6836f53261d64ceac910b6cbd9021a1/recipes/erc-tweet";
-          sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-tweet";
+          sha256 = "0nmh3r8s69hfmkz0jycn7w2icb5gnw2qbf8xjd52kigkdb2s646c";
           name = "erc-tweet";
         };
         packageRequires = [];
@@ -19050,16 +19092,16 @@
     ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
     melpaBuild {
         pname = "ereader";
-        version = "20161119.652";
+        version = "20170417.603";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "emacs-ereader";
-          rev = "57fc9c3f1ab9cfb2d6b5f20731ff7f63ee3daaa4";
-          sha256 = "0hd949g9al3lifbpy36z4v9ia61zbjvj05kpb3min642m1a5361i";
+          rev = "141a50f2fbac5b7edd59ad5e899aa14c719e9ed5";
+          sha256 = "08kcwldjwk7jksbhzzdyq96jchhniw56rg8hvahc6az2vra3qcb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader";
-          sha256 = "10dhy4d8kwi983fx0klvpvwlwrwrnx1h4x32j2zzlg5rvig016li";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
+          sha256 = "1ai27lyb9xcmjjcnppzzhb6ilsvq9d9g9z7h79lp7axq761vind4";
           name = "ereader";
         };
         packageRequires = [ dash emacs s xml-plus ];
@@ -19159,8 +19201,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a7307600a2b8dbcf628ae8ccf26137bc32f060cc";
-          sha256 = "0q07c7h6pzfl72i8vfb9j9l069zjblfclcxl9bnmci9kzj7ghmrr";
+          rev = "a5b52a94e67ec18f9f5c276f8387d27ab6c32c3b";
+          sha256 = "157jfq86xlq7kcbkrsvg9ybb3z3i0dh9lgif4z5kglxwr43vgrc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19184,8 +19226,8 @@
           sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee5807cfb3973348b901142b317e1c7edc3b38db/recipes/eros";
-          sha256 = "0xry221mj1achsyc8mkmipza2zn2xmsx96fqznf6mqvx4s271nvs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros";
+          sha256 = "0l79bn72x5m2lzglrwwngz3hax9pf8wv7ci86y5pkwaa8frxycww";
           name = "eros";
         };
         packageRequires = [ emacs ];
@@ -19372,8 +19414,8 @@
           sha256 = "1rxfqj46zg3xgg7miflgsb187xa9fpwcvrbkqj41g8lvmycdnm0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f40e277af4001d367099360d4342d9c1ab925f59/recipes/esa";
-          sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
+          sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb";
           name = "esa";
         };
         packageRequires = [ cl-lib ];
@@ -19498,8 +19540,8 @@
           sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0bc9259d7ee9eaf015f6583f82f1313d69e6f29/recipes/eshell-fixed-prompt";
-          sha256 = "0r0dbqmxzlh1sqadivwq762qw7p6hbrqprykd6b1m9m9gbb2qnkg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt";
+          sha256 = "0mhrfxf19p4qqnlnnfc0z70324c7qiiv63riaz4cn5jj1ps3v0iy";
           name = "eshell-fixed-prompt";
         };
         packageRequires = [ emacs s ];
@@ -19582,8 +19624,8 @@
           sha256 = "1xq1y6ddq9hxcc13wzj55snc7dg75y1z78f5bhnm9ps3ww7nmc9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
-          sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
+          sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy";
           name = "eshell-up";
         };
         packageRequires = [ emacs ];
@@ -19624,8 +19666,8 @@
           sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d4417bb564a942ef031cfb319cff3b93645e5d8/recipes/eslint-fix";
-          sha256 = "06qzzx1bab1169jdaljm7zh5nzm9p0wzdvqcxfrsw8s2mw5q5wi8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix";
+          sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da";
           name = "eslint-fix";
         };
         packageRequires = [];
@@ -19683,8 +19725,8 @@
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "espuds";
-          rev = "67a77b92f23f9016d133543de93bfbe1b2f9a818";
-          sha256 = "0xmcdw5hw6dmcmwjp1jvdvh2ijymlkcksjscm28cj442s4sarqgs";
+          rev = "7fc312184348df55d19d06914605356885674354";
+          sha256 = "1vx1b1pyi2xpfl822mskzvh943rxp9pyr915fnx5pjp58hjwwf3h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -19897,8 +19939,8 @@
           sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml";
-          sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
+          sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh";
           name = "esxml";
         };
         packageRequires = [];
@@ -20261,12 +20303,12 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "20170410.227";
+        version = "20170413.751";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
-          sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
+          rev = "395f91014b69844b81660c155f42eb9b1b3d199d";
+          sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -20374,8 +20416,8 @@
           sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape";
-          sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
+          sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l";
           name = "evil-escape";
         };
         packageRequires = [ cl-lib emacs evil ];
@@ -20555,12 +20597,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170328.21";
+        version = "20170417.550";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "da324d54e539f042a85344d1c168b69106896b8b";
-          sha256 = "0sfs09bm6p55xz5f71370zika0qcmlph6mgcc9mzyvpx31vsyfg0";
+          rev = "6885d51d8124ce2f6d2a0137659911b3c7d27c8b";
+          sha256 = "0qwz9k5zcf8h3iq2ak1pqbdk4zhpr7a911a00sg2xyk83z4zdj24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -20584,8 +20626,8 @@
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ef683cb1707a481e26dc89b5491ec18e5b20ad1/recipes/evil-lisp-state";
-          sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state";
+          sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz";
           name = "evil-lisp-state";
         };
         packageRequires = [ bind-map evil smartparens ];
@@ -20681,12 +20723,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170405.1418";
+        version = "20170413.2213";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "79f5755a65018d8e9798f52e595771e7abbbed2d";
-          sha256 = "17xx4m6j5dcgd33pjqlra5xfqwx1hdhrwqy2mqbykzxpbmadlmph";
+          rev = "5703e38417071f757f9c71312d99920691135d63";
+          sha256 = "1bg7w4ci9vdkdhgn53vijxh4xzqnjbv2317l77z83xx0fm2j12w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20815,8 +20857,8 @@
           sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
-          sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener";
+          sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g";
           name = "evil-opener";
         };
         packageRequires = [ evil opener ];
@@ -20836,8 +20878,8 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5ec54af16e3dadce43ece7da3acb1cf2eab5d14b/recipes/evil-org";
-          sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-org";
+          sha256 = "1306pf5ws7acdanypn3c0r4yh5wxdf0knl6j3hhs4ys9zszd79bw";
           name = "evil-org";
         };
         packageRequires = [ evil evil-leader org ];
@@ -21109,8 +21151,8 @@
           sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer";
-          sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-terminal-cursor-changer";
+          sha256 = "16p9a1dybbqr8r717c5ssfd3p5392bqxxzqs4n0xc7v7g8v1m0cd";
           name = "evil-terminal-cursor-changer";
         };
         packageRequires = [ evil ];
@@ -21277,8 +21319,8 @@
           sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace";
-          sha256 = "1pw2s228q78cbjpd6yx5jca3xhj8lwrb8kj86i6afn4l1m88azzv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
+          sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01";
           name = "evil-visual-replace";
         };
         packageRequires = [ evil ];
@@ -21361,8 +21403,8 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/62ffcf48bdb2df2bc9e6dd767c4ed9d605a5c839/recipes/eww-lnum";
-          sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum";
+          sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c";
           name = "eww-lnum";
         };
         packageRequires = [];
@@ -21378,12 +21420,12 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "c6eedaf916f763a68cbb7fdaf9c7af568546d4b9";
-          sha256 = "1r8053w782054dygpjpahjns5v0qf4drjisg5131qjkd9nvwyc0k";
+          rev = "15d07666fb356008e612278f181292e2d2afc5fc";
+          sha256 = "0kjsxwadxysx3ccgdwd12k4vj43qjs3zd6z4f8sycbk732x0893d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
-          sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
+          sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5";
           name = "exec-path-from-shell";
         };
         packageRequires = [];
@@ -21585,8 +21627,8 @@
         src = fetchFromGitHub {
           owner = "antham";
           repo = "eyuml";
-          rev = "2f259c201c6cc63ee608f75cd85c1ae27f9d2532";
-          sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
+          rev = "eb29c37316e44a14741f16e894fbcfcb7537dc80";
+          sha256 = "19n2dzr3m56g76igh57cvvhqwpbcicwr7r6r4i3l8vsjch99kp6m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a8d723e357da67441e65047759ccfa9cb7ef6/recipes/eyuml";
@@ -21652,8 +21694,8 @@
           sha256 = "1983ymny8329d826kfm5f88na1lym991xnz8wjz4nd1ah52c323x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
-          sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
+          sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s";
           name = "f";
         };
         packageRequires = [ dash s ];
@@ -21690,8 +21732,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "fabric.el";
-          rev = "8402f2f71c8975d2d9611e2a30845d62d58c9e28";
-          sha256 = "116qwncyxaj9a0p5qk5ragi2wshbcv6ncgkmf9nhha7i45hdfa7f";
+          rev = "2d436122243bcdd64ec5700e42d88ea9d363aefc";
+          sha256 = "0g083jbxqzzg0pja1fhqshg6dv7p22ymnlsg02l073059sfy4c94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric";
@@ -22283,8 +22325,8 @@
           sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
-          sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+";
+          sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr";
           name = "find-dired-plus";
         };
         packageRequires = [];
@@ -22528,8 +22570,8 @@
         src = fetchFromGitHub {
           owner = "johanvts";
           repo = "emacs-fireplace";
-          rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed";
-          sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8";
+          rev = "23a444f749bcb2b804593e3b2cb9c73cc59231fb";
+          sha256 = "1ijsa9k0cqy8w0ix2axw2j5996xab77x5s5vd5850jx0my6m7wyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace";
@@ -22704,8 +22746,8 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ebba36b9acf27e515a71b6b2bf92aeecc78cee/recipes/flappymacs";
-          sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flappymacs";
+          sha256 = "0id3bz4h9wi4943kp2sab7240fw8hsnkpng02gij9ssyvjiii5cg";
           name = "flappymacs";
         };
         packageRequires = [];
@@ -22809,8 +22851,8 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8ffa6a578b4bc22b7146ab80769ce7ddee5eac/recipes/flex-autopair";
-          sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flex-autopair";
+          sha256 = "0w3l236psqxl7wqdi2aisz8wcv279kw6gdja72viiscrbcm78xh0";
           name = "flex-autopair";
         };
         packageRequires = [];
@@ -22902,12 +22944,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20170204.226";
+        version = "20170416.1718";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f";
-          sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna";
+          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
+          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -23028,12 +23070,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170324.340";
+        version = "20170415.1006";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "794e339ab3bae5fa033b3c4913ab24ddad49dc2e";
-          sha256 = "099ffl46z046vzk1qhgcsn5b54zw6yjp9hnp6w7v4rr8pn4r1jlk";
+          rev = "2d40aadedde2b4a5d0bc9094f19020128d242801";
+          sha256 = "0pwlhzfl7av9vkkbdaiky1m2djjxsl93kprigklmjz1vkg7wsza0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23120,8 +23162,8 @@
           sha256 = "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask";
-          sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask";
+          sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f";
           name = "flycheck-cask";
         };
         packageRequires = [ dash emacs flycheck ];
@@ -23288,8 +23330,8 @@
           sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard";
-          sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-css-colorguard";
+          sha256 = "16qgn12jdps61mlbvhji5l8qrqigv382wyiv79rj2bwvdzbl653f";
           name = "flycheck-css-colorguard";
         };
         packageRequires = [ emacs flycheck ];
@@ -23676,6 +23718,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-joker";
+        version = "20170415.2009";
+        src = fetchFromGitHub {
+          owner = "candid82";
+          repo = "flycheck-joker";
+          rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419";
+          sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
+          sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3";
+          name = "flycheck-joker";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-joker";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-kotlin";
@@ -24061,8 +24124,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24250,12 +24313,12 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
-          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
+          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
+          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
-          sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
+          sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr";
           name = "flycheck-ycmd";
         };
         packageRequires = [ dash emacs flycheck let-alist ycmd ];
@@ -24359,8 +24422,8 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bd115612b61895f98b0659e9edc1e590967b6337/recipes/flymake-easy";
-          sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy";
+          sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v";
           name = "flymake-easy";
         };
         packageRequires = [];
@@ -24842,8 +24905,8 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f711074c4b1be9f123f63a366108bbe147df0ad5/recipes/flymake-vala";
-          sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-vala";
+          sha256 = "1fs4alyf3dckdf1pm6vgh4wjpl22wrlhfx9nv072l0dg48zgyw16";
           name = "flymake-vala";
         };
         packageRequires = [ flymake-easy ];
@@ -25178,8 +25241,8 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebbbc23a29b2040c587e2f60dbfb7a9b45058751/recipes/fold-dwim";
-          sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim";
+          sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d";
           name = "fold-dwim";
         };
         packageRequires = [];
@@ -25549,8 +25612,8 @@
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "cd164b75fdad957a8ac2548d0ddff84ae3359488";
-          sha256 = "01dlnkzm2rl6lli2r9rz8kd9w4xp236ag6i3gdr5raflylf2yxp4";
+          rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
+          sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -25574,8 +25637,8 @@
           sha256 = "169d9j7jk3li96fkn2sr257835flkcpml24l4bmzp8j3q57a7wxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/42acad345b25ee60fba6bd90e503f5437c6241f5/recipes/fraktur-mode";
-          sha256 = "05d7xff4vjy1qzw923xsd0kdm1q2cibgxxc4g83mr0hiwlcx91fl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fraktur-mode";
+          sha256 = "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k";
           name = "fraktur-mode";
         };
         packageRequires = [ cl-lib ];
@@ -25755,8 +25818,8 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22a334294660e8625cfeeeb7108517e163d8e443/recipes/fringe-helper";
-          sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper";
+          sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m";
           name = "fringe-helper";
         };
         packageRequires = [];
@@ -25789,12 +25852,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20161130.653";
+        version = "20170416.335";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "22cf1815574c2d463c6a790afc7378db9d701fc2";
-          sha256 = "1jqh518kn5c7gk8dqbx28inq71a1i95qafixa5kbh8my6kka7yr1";
+          rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd";
+          sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -25818,16 +25881,16 @@
     fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170408.1115";
+        version = "20170415.1236";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "88ac69fbe056972ac92f8f941aade79147df2124";
-          sha256 = "1pm8zjvfdi2qgm0313flmgwjkc7yb1k4h85kw3m0d6g02g5s9rfk";
+          rev = "f40c9358b1749bf413a8b30c94d14284890d16c5";
+          sha256 = "130k0aii2b5k5r54axcy9n3jsn9y8avdwdnbnl0saw7hc9ykwcpa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
-          sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
+          sha256 = "1cjwai0qf48m18dsa0r9sh4qlgvdzg5ajfbmxxc2vqzcl5ygrxjx";
           name = "fstar-mode";
         };
         packageRequires = [ company dash emacs flycheck quick-peek yasnippet ];
@@ -25836,26 +25899,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fuel";
-        version = "20170107.626";
-        src = fetchgit {
-          url = "git://factorcode.org/git/factor.git";
-          rev = "30f73d63f4031b35b52ecb28652aebf1a8e430f1";
-          sha256 = "0yn1sk2fp3bvw79r9lalpcxkcnj70prn56gr82hmkd2n0lq5lzi1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
-          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
-          name = "fuel";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/fuel";
-          license = lib.licenses.free;
-        };
-      }) {};
     fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "fuff";
@@ -25968,8 +26011,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "dfc095d0cbb77cbdee5005bbfaea10257eea059b";
-          sha256 = "090j76qfj32i9r96cqv8kp57g9mfj3w50a125gx8h1xknqb7831a";
+          rev = "dbebfec3bf64a3d74adf978d2f6a059739ac2472";
+          sha256 = "1l722z28hbqma1qgsydfjkxb0p24c80splpxx752x74qi2cid71z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26029,8 +26072,8 @@
           sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match";
-          sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match";
+          sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj";
           name = "fuzzy-match";
         };
         packageRequires = [];
@@ -26279,8 +26322,8 @@
           sha256 = "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/65c120f52e900b393b5ceefeca21b0670ca4a4cc/recipes/geeknote";
-          sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/geeknote";
+          sha256 = "03q0ca8m110qw8wczyyx94gwqymwnmamahw30j7fqkq6ry19yqsm";
           name = "geeknote";
         };
         packageRequires = [ emacs ];
@@ -26292,12 +26335,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20170325.1956";
+        version = "20170411.1021";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "b75e0376942c1ee54f7d173362d4a38e665342f9";
-          sha256 = "1mbip1w35mjcl4048a1aglvpqwkkf0h990i9yjr6w9p7wlxb8car";
+          rev = "41059d6295dbaa207b2203fb6b78003de4888714";
+          sha256 = "19ri8q3wbpw3vsw2iq1ym60gk0j4f9bniipiddrjqqirhcns8zzq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26485,8 +26528,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "472db909d1b11288885de6fe36c3691be7f175ec";
-          sha256 = "16ywm37y35rpvlzywyqyc2ga4l1h0fz4xy38j18a0z04w7xigkwz";
+          rev = "50617fe41d382132472c3beec50749b21e21325c";
+          sha256 = "1l2a7nab0d3w75qv30597ib5s4gfj0jghdjqfcjcr9267jz1yhs4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26510,8 +26553,8 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfbd335054aff49d4a46f73bee881b7a00714d3c/recipes/ghc-imported-from";
-          sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from";
+          sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc";
           name = "ghc-imported-from";
         };
         packageRequires = [ emacs ];
@@ -26573,8 +26616,8 @@
           sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b589edfacb807fb17936e139499bdd9673dad94/recipes/ghost-blog";
-          sha256 = "1wqi7r5jr3n0mgax7lddq5h3jfkcq69vvj02a6078vzd2bfxg9ia";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog";
+          sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj";
           name = "ghost-blog";
         };
         packageRequires = [ markdown-mode ];
@@ -26779,8 +26822,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
-          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
+          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
+          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26804,8 +26847,8 @@
           sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue";
-          sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
+          sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
           name = "git-commit-insert-issue";
         };
         packageRequires = [ github-issues gitlab helm projectile s ];
@@ -27077,8 +27120,8 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/318989b10a5bf5b961b3c607730377923c8fb05b/recipes/gitconfig";
-          sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig";
+          sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf";
           name = "gitconfig";
         };
         packageRequires = [];
@@ -27224,8 +27267,8 @@
           sha256 = "1yr7v2wdrvwb1slks83bbh857qq1n207rdk48y8qwlcxbk4ygdr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest";
-          sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/github-pullrequest";
+          sha256 = "1p5mwpl59iwd1aqczf1b5shcpzhlqwrcy2vp46c276mhqx15r8fr";
           name = "github-pullrequest";
         };
         packageRequires = [ dash emacs magit request ];
@@ -27258,12 +27301,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170221.804";
+        version = "20170413.2100";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "a7bce12f914c09c6c58db2d33390e890cb685537";
-          sha256 = "1isskh364klkvx7krxngx9fapf0qr41mzfl581admcl64b70x315";
+          rev = "cf3c1325eb33d3593ba1cc4ad692eff287c33779";
+          sha256 = "0abrbhhllkimidv4mi95nlzzigbr3qvjnd683rpv6f3sdqwcyw5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -27304,8 +27347,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1";
-          sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8";
+          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
+          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -27329,8 +27372,8 @@
           sha256 = "11i9hxj76869w1z9xn7wq370v56hx5hm4d7msn4zgp64glpa66j9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/888b0cc58375c3eefac94a34e67130ff95822aad/recipes/gitolite-clone";
-          sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitolite-clone";
+          sha256 = "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q";
           name = "gitolite-clone";
         };
         packageRequires = [ dash emacs pcache s ];
@@ -27809,8 +27852,8 @@
           sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34756daa47548da1aaf58b324014829d041cddf6/recipes/go-dlv";
-          sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
+          sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
           name = "go-dlv";
         };
         packageRequires = [ go-mode ];
@@ -28418,8 +28461,8 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2ccb56a2aaabb1169cafc530c63e33d301e04c7a/recipes/gorepl-mode";
-          sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
+          sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
           name = "gorepl-mode";
         };
         packageRequires = [ emacs ];
@@ -28435,8 +28478,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "a057deb08b41e37d767805ffeb024eee30f9faca";
-          sha256 = "07s75y01mrs7m2xmvg764yhivczycynaa31paz8h2pz65sb0qdhd";
+          rev = "30a31c14e5c83019ec4b31fd9913efaf9220b4b9";
+          sha256 = "09pplr231ga3ic8i8jqxqi19ydjp6245spwraqymxqq5h1x94bfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -28452,12 +28495,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170320.1245";
+        version = "20170414.1046";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "7baaee3002bf0be8848e87271b988e39cbd08588";
-          sha256 = "13afqqkzlfww0w0ixckgbqyf68d2268s3cpfvc46j1cm8lzchya9";
+          rev = "2d1a302500cf82155c0f9ca61200b7bf02717e43";
+          sha256 = "183djv4p540m641hcp5nlbk8isr8fq6f109xj4kkfd6mbrs13pig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28726,8 +28769,8 @@
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
-          sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
+          rev = "bf77248e49b116a241bd5856df918ed63f89e195";
+          sha256 = "1rn498l25vjy1wg45iskry8hh2afvd09cmg8dxppphjislw9pwch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -28930,8 +28973,8 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/655332f33f308e4da09dfd27625cb30af29b95a7/recipes/grep-a-lot";
-          sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grep-a-lot";
+          sha256 = "1cbl4gl91dx73q3i2glsivfxd8jkanrcrzy35zf6rb7raj7rc1bw";
           name = "grep-a-lot";
         };
         packageRequires = [];
@@ -28988,8 +29031,8 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grin";
-          sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin";
+          sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378";
           name = "grin";
         };
         packageRequires = [];
@@ -29190,12 +29233,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170216.909";
+        version = "20170415.544";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "52e7623953dc1a76a24d1b8d261a7a1143fca903";
-          sha256 = "00bkpxfn60sq0vz3xh60fylhvx4ijj9l34qmy55z024f1plzmvwp";
+          rev = "8c8a1616b6a7bc4c10942ee0a1b2591b98fcd493";
+          sha256 = "00hbawijr9c6hpmp7y4yh8xla7nmsi9nq071zkxwyl8yzj34s678";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29253,12 +29296,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170322.704";
+        version = "20170413.1236";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "e1dfd9655b69e5e27a040cae5aeff25afec383f1";
-          sha256 = "19z6hapaj9nw238lyd7ivnhfhpxy6wnjkcn93jgdhdx4k3q9aq73";
+          rev = "51405f409508cd95f6e84d2e0fc08c4c380b1791";
+          sha256 = "0ffh6ksd21g896fn4av8nh82cd3qfrczbjkp5ndhhbr16nqgkr56";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29337,12 +29380,12 @@
     gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gxref";
-        version = "20161215.2352";
+        version = "20170411.1053";
         src = fetchFromGitHub {
           owner = "dedi";
           repo = "gxref";
-          rev = "ffb2139cb9a8299ce965c28cb5d3a617405fb1b4";
-          sha256 = "052j24k1svdnryss983dxjpnz4d51wx1vzqqpgckc86bkc4vfjzf";
+          rev = "380b02c3c3c2586c828456716eef6a6392bb043b";
+          sha256 = "1c5j28rwqx53qdsqglif8yblhm2bwm4qzpl2dg0l0g3pr8pk8zjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
@@ -29379,12 +29422,12 @@
     hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hack-time-mode";
-        version = "20170322.844";
+        version = "20170413.630";
         src = fetchFromGitLab {
           owner = "marcowahl";
           repo = "hack-time-mode";
-          rev = "02ee6c5c1f691564399a0c76b9c606d7d7dbfe05";
-          sha256 = "0gxlmdf9gy2z3c0nswyac7g4j6cswgf7hd3ccb2bn25v67jb3y6c";
+          rev = "79abe7652690186224ba22d1346d24e7603448f7";
+          sha256 = "176zpdxsjydl7vvh2jhpbwsndzwzzyfhw6hpak16wj5b7rv9jj19";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -29555,8 +29598,8 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/40ad05c824c7f2ef8d8a6f5dfad6e7685dc70803/recipes/hamlet-mode";
-          sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hamlet-mode";
+          sha256 = "16cyfzv2yrf249jklxdahfmsy8rg6hargjpafy4fz4a532fcbw81";
           name = "hamlet-mode";
         };
         packageRequires = [ cl-lib dash s ];
@@ -29576,8 +29619,8 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c4f1e610cce403e86346b12b03892560dee3ccb/recipes/handlebars-mode";
-          sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/handlebars-mode";
+          sha256 = "0wizasjihnabnqzn1226vh4gb571rs7s86bffhvkfvbk95zkiafq";
           name = "handlebars-mode";
         };
         packageRequires = [];
@@ -29848,8 +29891,8 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d9aa97450fdbd138f8293cfb31212a7c7f9eee8/recipes/haste";
-          sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haste";
+          sha256 = "175kprxqbpmssjxavcm7lyzg1cwsxkrfg9pc72vgqyfmcmjyk34c";
           name = "haste";
         };
         packageRequires = [ json ];
@@ -29865,8 +29908,8 @@
         src = fetchFromGitHub {
           owner = "accidentalrebel";
           repo = "emacs-haxe-imports";
-          rev = "164e9d2b6ce420dda543d8dade27d2f28d347132";
-          sha256 = "1ymg128qpr325hakjw3b9jckq87k8nhk8jlx8hdqa1yx6rv0lfda";
+          rev = "f104a641f3dfe698359d9aca1f28d9383cf43e04";
+          sha256 = "09crkm4ibi4m23qw4saqm0nm2i4cv40md3p768j2vniamby2q78f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports";
@@ -29889,8 +29932,8 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/haxe-mode";
-          sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxe-mode";
+          sha256 = "07krrpi636dadgyxxhh5037kq527wpnszbl22lk6i5fcxqidcnw9";
           name = "haxe-mode";
         };
         packageRequires = [];
@@ -29910,8 +29953,8 @@
           sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cd0352cac399eb2072dfb788deea9cc22d902964/recipes/haxor-mode";
-          sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode";
+          sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s";
           name = "haxor-mode";
         };
         packageRequires = [ emacs ];
@@ -29991,8 +30034,8 @@
           sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2";
-          sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2";
+          sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx";
           name = "header2";
         };
         packageRequires = [];
@@ -30025,12 +30068,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170409.1155";
+        version = "20170416.945";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
-          sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30197,8 +30240,8 @@
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "9f7075e81c4996c22bc9dd4fe48ad8e8acc55efb";
-          sha256 = "1zmv80iw1y6pj2c78227pc1hi85a986pkglzvjz8cb3c4rvd81ck";
+          rev = "6f2c7648437be2a74380de8573e39b6258b3085a";
+          sha256 = "16350vdjmcv8n9dmvqik1mdcc927a2wgv3b72pzfpcjj1kx72fvk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -30453,8 +30496,8 @@
           sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
-          sha256 = "1fvpq1xi3xhd8w1yasac87incv1w4av5a8vn0birw8pc7a6bxv4w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
+          sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
           name = "helm-cider";
         };
         packageRequires = [ cider emacs helm-core seq ];
@@ -30495,8 +30538,8 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a21483682eee0950bdba3a93d178db2118e95/recipes/helm-circe";
-          sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe";
+          sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw";
           name = "helm-circe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
@@ -30596,8 +30639,8 @@
         src = fetchFromGitHub {
           owner = "manuel-uberti";
           repo = "helm-company";
-          rev = "df67d41adb08488957804e1f3f0105186bcab26a";
-          sha256 = "0n5a4h62b1z7v1lf43p3x10vqscra75ri023gi9z7nc27qai27fh";
+          rev = "f00df346098636650c4047394aa593d67b007859";
+          sha256 = "03rcn9a3fbhcbh739xykjk94jg2sl4mj6y22knfwbh1hm1wymii3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -30613,12 +30656,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170410.557";
+        version = "20170416.945";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
-          sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30705,8 +30748,8 @@
           sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash";
-          sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
+          sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb";
           name = "helm-dash";
         };
         packageRequires = [ cl-lib helm ];
@@ -30789,8 +30832,8 @@
           sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
-          sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
+          sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8";
           name = "helm-dired-history";
         };
         packageRequires = [ cl-lib helm ];
@@ -30831,8 +30874,8 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/527a46536f7cdc235c779d2a69cea4a5d5e06ce9/recipes/helm-dirset";
-          sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dirset";
+          sha256 = "1bwgv1pm047xafidq23mdqj3sdc5bvqlw74s80dj88ybp3vrpvlk";
           name = "helm-dirset";
         };
         packageRequires = [ cl-lib f helm s ];
@@ -30907,12 +30950,12 @@
     helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ext";
-        version = "20170304.910";
+        version = "20170411.1049";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "helm-ext";
-          rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
-          sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
+          rev = "fe50af14eebc9be72b026e823facfd0a80593248";
+          sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -31104,8 +31147,8 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/299ebd9b72b5db061d31d7ae4f00b1ce6bb9db34/recipes/helm-ghc";
-          sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc";
+          sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d";
           name = "helm-ghc";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
@@ -31247,8 +31290,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1";
-          sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8";
+          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
+          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -31398,8 +31441,8 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1e1f2efa82d5097c1f5e85fba3f67b38a5b37c2/recipes/helm-hayoo";
-          sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo";
+          sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb";
           name = "helm-hayoo";
         };
         packageRequires = [ haskell-mode helm json ];
@@ -31482,8 +31525,8 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/95f1c437d5312e1c8ead63d6f834de86f38d6f58/recipes/helm-idris";
-          sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-idris";
+          sha256 = "04f1963ksbjdza1syajb5vkwwsc9gzk0az6c1m1zgvsianrq4rd9";
           name = "helm-idris";
         };
         packageRequires = [ helm idris-mode ];
@@ -31704,12 +31747,12 @@
     helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-make";
-        version = "20170409.44";
+        version = "20170412.1229";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "3a5da626247095d8c1350e50a39736e3bf0db771";
-          sha256 = "1aaw6c3mw064g0ym5vz2fibq7csabqvgc8lx7wwsl35jbcx3y29c";
+          rev = "77f6f47277cfca5df9019165037277cafd0aac76";
+          sha256 = "1cbiqvgynnbj7cc30da2yyakik52bh9aqpr4b55pzly6mcq32qfl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31754,8 +31797,8 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/903a2b64d9a704105100d61f28cdfa8f497abd7d/recipes/helm-mode-manager";
-          sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager";
+          sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl";
           name = "helm-mode-manager";
         };
         packageRequires = [ helm ];
@@ -31897,8 +31940,8 @@
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "07313ddf77cd38355b77a3fa0b46be998de38732";
-          sha256 = "0rscnb9lws9y6x0ggg03ran2vjpn7a61rywz3y1vvr5skf2nhs9n";
+          rev = "540d095b769980dbe5e12968a1fd7688d6bc6526";
+          sha256 = "1aqp82njc06zap4iv6jbf7iznw6knwfqi5a7m3cd4ngdcg4gl7s8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -31974,22 +32017,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pass = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
+    helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "helm-pass";
-        version = "20160825.1410";
+        version = "20170417.1033";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "helm-pass";
-          rev = "36025e7e435c4ee516bab554fa097d958b8b4ba6";
-          sha256 = "0v99cz44bdwajvzf882qp76p85g9mbd1a24b8156wpbsys0dkbg0";
+          rev = "8c4b330dad4be9df74eb44e312d72aedcbf628d4";
+          sha256 = "0q2vjnfiivb778cfnbg777y4srqk117k1kc5az4qk7n3hq0rg12l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
           sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia";
           name = "helm-pass";
         };
-        packageRequires = [ helm password-store ];
+        packageRequires = [ auth-password-store helm password-store ];
         meta = {
           homepage = "https://melpa.org/#/helm-pass";
           license = lib.licenses.free;
@@ -32069,8 +32112,8 @@
           sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc";
-          sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc";
+          sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz";
           name = "helm-proc";
         };
         packageRequires = [ helm ];
@@ -32174,8 +32217,8 @@
           sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose";
-          sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose";
+          sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79";
           name = "helm-purpose";
         };
         packageRequires = [ emacs helm window-purpose ];
@@ -32401,8 +32444,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -32636,8 +32679,8 @@
           sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6fe2ffb46ea763bc6fb6fb6c899be6d3a67440/recipes/helm-swoop";
-          sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
+          sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx";
           name = "helm-swoop";
         };
         packageRequires = [ emacs helm ];
@@ -32657,8 +32700,8 @@
           sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/047e5a8cacd8432adc86812e4c014808b99586bc/recipes/helm-systemd";
-          sha256 = "1kcf9218l8aygrcj1h3czyklk1cxc5c73qmv4d3r3bzpxbxgf6ib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd";
+          sha256 = "0k2yqmvwswihcn75wzn5923z5y4njarmvdlx3j7w3hwsxh6k1mcw";
           name = "helm-systemd";
         };
         packageRequires = [ emacs helm with-editor ];
@@ -32691,16 +32734,16 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170325.1029";
+        version = "20170412.437";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "6c0a61fc31c88577dc701d9d9010367a2873439c";
-          sha256 = "1xahmb3a44iiip2fls4wfkxns08b4y2bq6jwd20ylpccj48qxmjl";
+          rev = "e0fc2b0f9c3763e9c1e35cc515a29ebbbcd322e0";
+          sha256 = "06mxff0dx5l2q1ayy574gyhlslngv7ha7jc6yazw8wkhqnldp79h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
-          sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
+          sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517";
           name = "helm-tramp";
         };
         packageRequires = [ emacs helm ];
@@ -32963,8 +33006,8 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/652b78013a7a6fa321490413fe98a7de5829b0dc/recipes/heroku";
-          sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/heroku";
+          sha256 = "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp";
           name = "heroku";
         };
         packageRequires = [];
@@ -33023,8 +33066,8 @@
           sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
-          sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb";
+          sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk";
           name = "hexrgb";
         };
         packageRequires = [];
@@ -33125,8 +33168,8 @@
           sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt";
-          sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt";
+          sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80";
           name = "hide-comnt";
         };
         packageRequires = [];
@@ -33213,6 +33256,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hierarchy";
+        version = "20170417.231";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "hierarchy";
+          rev = "b2ce428d199967ddfb6face22ec7ec0593bd06fe";
+          sha256 = "11zzm10xivqs16msdw2p2w12zjzwy2qk8mpan08y8zm982dx2mnc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
+          sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp";
+          name = "hierarchy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hierarchy";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight";
         version = "20170223.743";
@@ -33394,12 +33458,12 @@
     highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indentation";
-        version = "20161012.209";
+        version = "20170411.40";
         src = fetchFromGitHub {
           owner = "antonj";
           repo = "Highlight-Indentation-for-Emacs";
-          rev = "731fe2058b68b2eee8c6bc99d914d30f3de233c5";
-          sha256 = "093cvm4sabpchay49xm40mr65q6fk4df2i8kmlqiy2c5dvs5vsgf";
+          rev = "2e1891aef4a763560a2f51c8fa81e5cb16ae3165";
+          sha256 = "03bhig71lb9z2fg3wz0y9cxmdnd7n8m4f6hpnqlsc6x5c8xrjlv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
@@ -33569,8 +33633,8 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/highlight-symbol";
-          sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol";
+          sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r";
           name = "highlight-symbol";
         };
         packageRequires = [];
@@ -33747,12 +33811,12 @@
     historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "historian";
-        version = "20170310.1001";
+        version = "20170416.2154";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec";
-          sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2";
+          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
+          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -33917,8 +33981,8 @@
           sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+";
-          sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+";
+          sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv";
           name = "hl-line-plus";
         };
         packageRequires = [];
@@ -33959,8 +34023,8 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/48b99dd60dda3039a0e1e71bb4b796d62340279e/recipes/hl-sexp";
-          sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp";
+          sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm";
           name = "hl-sexp";
         };
         packageRequires = [];
@@ -34011,16 +34075,16 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170405.1248";
+        version = "20170416.111";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "ff2b2f4afa7a449c7f01defc4227897cd9e6ae8b";
-          sha256 = "0ry8cxki1vhc9h4fkbjdglnx6rcm1wi3ws5bw6pvz20g4jvsz0iw";
+          rev = "f4244cbd773a20b887b937a2eafd1933d91a4d4d";
+          sha256 = "1qv3v6x2ld518kg1f9ic3bz5y61jpqqzrlwlisd8jwx7cc8jvzic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
-          sha256 = "1xpar3nx1axc6yb0bph8xwvx0jcl79da9bz40an2fpr4l1pp4fw3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
+          sha256 = "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52";
           name = "hledger-mode";
         };
         packageRequires = [ async emacs htmlize popup ];
@@ -34332,8 +34396,8 @@
           sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55a0355077a16f82b45113d37a10b26676f5f507/recipes/html-to-hiccup";
-          sha256 = "10d0fafqn6f1mwjbx8zizkc5ql9njs4f3ghplirqy82cx4w8rgbq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/html-to-hiccup";
+          sha256 = "0gyghgdil14i4p0yv5mb6la1ajzf8xcgdm1si5i5w7cn72vfapmz";
           name = "html-to-hiccup";
         };
         packageRequires = [ dash emacs s ];
@@ -34363,6 +34427,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "html2org";
+        version = "20170416.624";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "html2org.el";
+          rev = "89d35daea5e00bb597798800354ddd9fddcc2887";
+          sha256 = "1il0h1plwn6472r8xa312dg0zvxxwdmj7yh6zh94l9p3y4iiwy4d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org";
+          sha256 = "1lj4dwmjkc43dfmsc7z4nvydmmf6wrk5v9ms23zf0llnk9h3hvnk";
+          name = "html2org";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/html2org";
+          license = lib.licenses.free;
+        };
+      }) {};
     htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "htmlize";
@@ -34437,8 +34522,8 @@
           sha256 = "0fxmk5b4ggi92n5gi2nim08a2gx1yg7jlp4hj4m0qazxqdcy38i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/56e6078d42cfefbe3f0731952f67afd7f6e9a92e/recipes/http-twiddle";
-          sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/http-twiddle";
+          sha256 = "1d8xnwhb8lp4p4xnnkryx5c6isd8ckalp0smx66lbi1pa4g6iqsh";
           name = "http-twiddle";
         };
         packageRequires = [];
@@ -34513,12 +34598,12 @@
     hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hungry-delete";
-        version = "20161128.2238";
+        version = "20170411.1802";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "hungry-delete";
-          rev = "2cedcdd113032414ea6d3bfa2504c8820b1a841a";
-          sha256 = "1fg2his564qiqk7b47nswxcq4pd17ip164v4zva9715cjzgyzn66";
+          rev = "0434458d3f6b2b585f332271feaa054bf4ec96d7";
+          sha256 = "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
@@ -34647,8 +34732,8 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f050a5b4bc18839a8d945c0799d0c0e239fa6864/recipes/i2b2-mode";
-          sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/i2b2-mode";
+          sha256 = "1jnlisdnp9sz54p444vlq00y3080i4ljcvclri9fy382g1s5ags5";
           name = "i2b2-mode";
         };
         packageRequires = [];
@@ -34721,12 +34806,12 @@
     ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "ibuffer-projectile";
-        version = "20150121.837";
+        version = "20170410.1452";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ibuffer-projectile";
-          rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e";
-          sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
+          rev = "a004cd0121ab15a00311631289fc6a8c7a86a897";
+          sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -34933,8 +35018,8 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7bdccd978644a6de9de1da0cf42304f748622885/recipes/idle-require";
-          sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/idle-require";
+          sha256 = "03z8d06ifzaf81h8b3h16ab69cp3ssky3my07spy81rbhbjl5nn3";
           name = "idle-require";
         };
         packageRequires = [];
@@ -35122,8 +35207,8 @@
           sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ccca92fee3d39966df135a5c79e42d2ab621848/recipes/ido-grid-mode";
-          sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode";
+          sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3";
           name = "ido-grid-mode";
         };
         packageRequires = [ emacs ];
@@ -35458,8 +35543,8 @@
           sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit";
-          sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
+          sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh";
           name = "iedit";
         };
         packageRequires = [];
@@ -35558,8 +35643,8 @@
           sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1d94609f2ef349c8b877791a996de3b6b60da9/recipes/igv";
-          sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/igv";
+          sha256 = "0vjqdyj9j26y0hhzmip6lpwc8g1c9vnmgya1p7v77bkgdicgl659";
           name = "igv";
         };
         packageRequires = [];
@@ -35765,8 +35850,8 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/eddb7acecc4948ade16ff02415484c9a16529c9c/recipes/imgix";
-          sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
+          sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
           name = "imgix";
         };
         packageRequires = [ cl-lib dash ht json s ];
@@ -35911,8 +35996,8 @@
           sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic";
-          sha256 = "1d85sg8wsm03v8zmv5w0znkgnr4q33x0d3frkr16dcmgqh2z9lgp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
+          sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv";
           name = "importmagic";
         };
         packageRequires = [ emacs epc f ];
@@ -35953,8 +36038,8 @@
           sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools";
-          sha256 = "1i81pk62lnjww80dpi5b55fz7p0z2qxm19z6v3225x2jpylwcab3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
+          sha256 = "12rawl9qaihgyascy53yxpkknp95wh8fiqygb5cgl7d761qizvp6";
           name = "indent-tools";
         };
         packageRequires = [ hydra s yafolding ];
@@ -35984,6 +36069,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+    melpaBuild {
+        pname = "indium";
+        version = "20170414.156";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "Indium";
+          rev = "0da2825dc21d3ba14b5dea6965f79330eb7ba13e";
+          sha256 = "1hf9ls1wh5iykai454rc96gkcl4959h71akf7i5gm9kk4hsjcf5q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
+          sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
+          name = "indium";
+        };
+        packageRequires = [ company emacs js2-mode seq websocket ];
+        meta = {
+          homepage = "https://melpa.org/#/indium";
+          license = lib.licenses.free;
+        };
+      }) {};
     indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indy";
@@ -36008,12 +36114,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170330.2134";
+        version = "20170414.1424";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "431c06844bfb1c99b49f494aa73df3e699b48f30";
-          sha256 = "0aza4r44lxzs4fjiqc6y23b7s6r1jyvr39dkmw5570gs4lhlij1s";
+          rev = "e10ac489e015515aaa7f49d397c08a26063cf777";
+          sha256 = "0085mjlbw6sppgps3g6zlmkr1ih8ffnfjmaak05vsfiq5sivxldl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36117,8 +36223,8 @@
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
-          sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
+          rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69";
+          sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
@@ -36286,8 +36392,8 @@
           sha256 = "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e3276b823cf03455083929599e1d47aea894ad5c/recipes/ink-mode";
-          sha256 = "1fi1g7sim5qyildzz84iwywwq94qxym972ac15sj7yd7x0i8smax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ink-mode";
+          sha256 = "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf";
           name = "ink-mode";
         };
         packageRequires = [ emacs ];
@@ -36299,12 +36405,12 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20170325.221";
+        version = "20170413.120";
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "cbe5ead0b5993e290ee88d7a07a6ead46f2d0697";
-          sha256 = "07qdg72i5na466gka1x50swlipy4d0k1pkhw1d1p6s3xwq7cfm2p";
+          rev = "372ad654293cd0b8cf7db6129674c5a84d54ca53";
+          sha256 = "0642rcjj1z5c86ry97b6kmf7kivhajvz5f9fz9kqfw0f98srzhrs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -36349,8 +36455,8 @@
           sha256 = "0851jgh5v36d7lq9pwlmigqpqrfbrqqssib4id7s4c8j4sh4c03g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/48f0262ec568a3dd53dcc48f11e473b30c7e6ab1/recipes/inline-docs";
-          sha256 = "1a45a5bxm719fr4xvn26mraph3a19d53c2l74y1jrxhaksgl3n1j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/inline-docs";
+          sha256 = "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p";
           name = "inline-docs";
         };
         packageRequires = [ emacs ];
@@ -36445,12 +36551,12 @@
     intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "intellij-theme";
-        version = "20161004.2215";
+        version = "20170416.359";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-intellij-theme";
-          rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
-          sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
+          rev = "ad207c8c3d266d566fb1e4862df154096c059171";
+          sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -36508,12 +36614,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170408.1939";
+        version = "20170410.1625";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "b501c022f5bc40518db726ff08e544308b6bdc55";
-          sha256 = "1wacvnzg07di939782bg0nbgn81rrfqx5psxq1f9k6clzvn7f26i";
+          rev = "e546ea086d72b5bf8556727e2983930621c3cb3c";
+          sha256 = "1qv7l5ri3nysrpmnzfssw8wvdvz0f6bmymnz1agr66fplazid4pn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36663,8 +36769,8 @@
           sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3f80bcdf411de128139a6bf1f507d7ec87076c25/recipes/ipcalc";
-          sha256 = "0rd9p4yvzabw437qf7lgiyzxnvv6cjai8b22ywsdryxar9fd8pb2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc";
+          sha256 = "0hw5g30pnqwzvbhf6kggyj6wij5iw7d8jgmr88pyw63kxach8vkv";
           name = "ipcalc";
         };
         packageRequires = [ cl-lib ];
@@ -36782,8 +36888,8 @@
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "6b9b0aa40614580b007b55f2096f3f12c46d4288";
-          sha256 = "1055rri447fwlqi7dp7dr6h4r48q9ahx76pyv1grxqf30kzv3wc5";
+          rev = "3a903459d0c368b318a00ad94a18484dafde67a5";
+          sha256 = "1mjwhx9cj8ilv4xf0phpg3xx5h14z4gz4d0ghi7gzakkk5bl31yk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36846,8 +36952,8 @@
           sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
-          sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+";
+          sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw";
           name = "isearch-plus";
         };
         packageRequires = [];
@@ -36990,8 +37096,8 @@
           sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/afcd7ab6f3c9ac51a9cd84b30b5f12b7d259386a/recipes/itasca";
-          sha256 = "01075ad0sb5q7aql6j5wmjdk2qhdgbbm5xb0ikrnl7rzc1afvv6j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca";
+          sha256 = "0j0lvs9x2j3z5yyhbgmymccswi40vv1gz3sl56bl857m1hlxzshz";
           name = "itasca";
         };
         packageRequires = [ emacs ];
@@ -37066,12 +37172,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170410.47";
+        version = "20170416.1021";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
-          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
+          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
+          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37108,12 +37214,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170406.107";
+        version = "20170411.451";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
-          sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
+          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
+          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37133,8 +37239,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1";
-          sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8";
+          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
+          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -37150,12 +37256,12 @@
     ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-historian";
-        version = "20170310.1006";
+        version = "20170416.2154";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec";
-          sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2";
+          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
+          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37171,12 +37277,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20170410.24";
+        version = "20170412.30";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
-          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
+          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
+          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37255,12 +37361,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "20170402.653";
+        version = "20170415.1027";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -37326,8 +37432,8 @@
           sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
-          sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
+          sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4";
           name = "ivy-youtube";
         };
         packageRequires = [ cl-lib ivy request ];
@@ -37460,27 +37566,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
-    melpaBuild {
-        pname = "jade";
-        version = "20170410.558";
-        src = fetchFromGitHub {
-          owner = "NicolasPetton";
-          repo = "jade";
-          rev = "9f473f019963e1abae04f958a6c7ec221aa0aacf";
-          sha256 = "19aydkph56bd1gwqcz04viya8cr4wj98yh8kqgn9kfqxrrkkb2ic";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
-          sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y";
-          name = "jade";
-        };
-        packageRequires = [ company emacs js2-mode seq websocket ];
-        meta = {
-          homepage = "https://melpa.org/#/jade";
-          license = lib.licenses.free;
-        };
-      }) {};
     jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jade-mode";
@@ -37778,12 +37863,12 @@
     jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jazz-theme";
-        version = "20170115.723";
+        version = "20170411.711";
         src = fetchFromGitHub {
           owner = "donderom";
           repo = "jazz-theme";
-          rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e";
-          sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj";
+          rev = "b1cb78a97cc4050f19d88a89e455c3e52d98240e";
+          sha256 = "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme";
@@ -37799,12 +37884,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20170303.1035";
+        version = "20170413.901";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "6eb6132f44bf87e52d5ed74c4bb3869c0d5f66a8";
-          sha256 = "023yhdp4pdfm1fi4y09v925l8f1d8206z41kk1hv90zy034b94hk";
+          rev = "ee3c3b95e4a8697438d48757c604f9491b395417";
+          sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -37828,8 +37913,8 @@
           sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp";
-          sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp";
+          sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5";
           name = "jdecomp";
         };
         packageRequires = [ emacs ];
@@ -37845,8 +37930,8 @@
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "70ee33d1cb151cff821d31540a6629d21013be04";
-          sha256 = "07hgdp5vl0blgzcs2393lzn285l2s2bf5lvngz6k1xb7zx2zwn93";
+          rev = "551276220abab21106112c6100a1078313189243";
+          sha256 = "0myln9igbw628lm14l44w3hh2fm6lpbys6iv1b05cfzwpkiszsnh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -37975,8 +38060,8 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ddf4de8f3f4c3c1e3682225f3c46c5928e0e75d/recipes/jenkins-watch";
-          sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jenkins-watch";
+          sha256 = "1mdmh62rq3b8p23xgaf4i0kzpgq3ldljdxsnk07wa8bp3p7jxvgs";
           name = "jenkins-watch";
         };
         packageRequires = [];
@@ -38035,8 +38120,8 @@
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9bc672a3553ea7996b72b11c9e979811150b59/recipes/jira";
-          sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira";
+          sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx";
           name = "jira";
         };
         packageRequires = [];
@@ -38203,8 +38288,8 @@
           sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify";
-          sha256 = "1as6xkmm295swyc2r6hac2lpf7r36mkq5ib5rxc11f30nnzyya9r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-auto-beautify";
+          sha256 = "0hpp6im24xy4g5l1n9kvpmpj26rnxxnf4snf7xgh5gxx6wsiicy1";
           name = "js-auto-beautify";
         };
         packageRequires = [ web-beautify web-mode ];
@@ -38287,8 +38372,8 @@
           sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import";
-          sha256 = "0hbs84sp50f7w0sn8qrskkwdi53076mv00xz3gpvf3a4nfdr7fci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import";
+          sha256 = "0r653ls1a4kr7i7249afgfj7vz365gadfm8bc1vmqfabxn8mysd4";
           name = "js-import";
         };
         packageRequires = [ dash emacs f projectile ];
@@ -38680,8 +38765,8 @@
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
-          sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
+          rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69";
+          sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -38705,8 +38790,8 @@
           sha256 = "1dgghswf6s7h6h04mhfnsh2m0ld8qqk70l0dq3cxhdjzqx16vnms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4155696ed09968f432c6205cb3e677beaea42ea0/recipes/jump-char";
-          sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jump-char";
+          sha256 = "1r6d1vhm87zafi7rr7z8jwyz3yy7i7s4774n84jsql24j1rzzwd4";
           name = "jump-char";
         };
         packageRequires = [];
@@ -38871,8 +38956,8 @@
           sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban";
-          sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban";
+          sha256 = "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz";
           name = "kanban";
         };
         packageRequires = [];
@@ -38905,12 +38990,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170407.1037";
+        version = "20170416.1713";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "26f631dd8bfbfe7d2bf1006c477a7f29ae9fb365";
-          sha256 = "0sr86hw311j1pwcldg00mwwfq6c2qpqimnfnwhr24nx3q8z0c7ym";
+          rev = "1e3a03e0b3c408913c8487cac291d163c53217e8";
+          sha256 = "0zr187f1pc4lj9kglzsh0h71k6vf8j1pkk3p02pacxs4ixs473vy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39333,8 +39418,8 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c3aa60be932d65929f453f1ce576abcd00252ed/recipes/kill-ring-search";
-          sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search";
+          sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl";
           name = "kill-ring-search";
         };
         packageRequires = [];
@@ -39375,8 +39460,8 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/12e48ea4327188da607cc6f1d25a9cba7991c2f3/recipes/kite";
-          sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kite";
+          sha256 = "17bpk9ycx2xkwm3j1dxi5216lbzf5lgnscs8i4y0pkpicdn0wyr6";
           name = "kite";
         };
         packageRequires = [ json websocket ];
@@ -39413,8 +39498,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "46a687a4d5965290c2907cfc9e99812b358ac3bf";
-          sha256 = "0s0d097k4l6hqqs8mq1syf1529gm62qiwd4lgib7qkkabf4miq24";
+          rev = "fd01c099e9bb5a65bcd58e3a67b090bd39b1e764";
+          sha256 = "060lw75dk8ibgswq2f0yysvkkgpw5q0jmdwqpicdj6n1nc4zn99r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39438,8 +39523,8 @@
           sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
-          sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
+          sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07";
           name = "kiwix";
         };
         packageRequires = [ cl-lib emacs ];
@@ -39493,12 +39578,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170409.1909";
+        version = "20170410.958";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "9af03ee3e772458061b893b9362259f6f8ad0f3a";
-          sha256 = "1185693h5zfzcfzs1n5xjzh3jxmhlsjr7q7knc19dzmkdf1vxal4";
+          rev = "76603f29cbaf316d72c858afeb3d7ce17e195dba";
+          sha256 = "1j9y678ddpbi6jcnn9yb3bw97kwqgx1k9d172fa324m2iqylrfiq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -39543,8 +39628,8 @@
           sha256 = "1vc97d3i7jh4fbpan7lfnmsm32c4gwgrg11j2vq7z3rwm42wkkyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/692d268189740e8b540ba14ed92b07bb8b7fb399/recipes/kooten-theme";
-          sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kooten-theme";
+          sha256 = "1zhrjli65pn5nshz8pqn5vbsndzk2h8mhbcldq9k0mc7ki2rrdlv";
           name = "kooten-theme";
         };
         packageRequires = [ emacs ];
@@ -39564,8 +39649,8 @@
           sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays";
-          sha256 = "1w8mhhc05i1b6s9vvpk73zkk5x2kxxh3aax61p54mbkhn0a5zb8r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/korean-holidays";
+          sha256 = "1yf0z9vpiwhlsnyb0fy9wf5rz6f2fzzign96zgj0zd5hwmznbmyr";
           name = "korean-holidays";
         };
         packageRequires = [];
@@ -39585,8 +39670,8 @@
           sha256 = "18n0lw6cfc56np4s3mvpdp13pnsmqhjn1izipjv1s1sgyjj04qj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/617eb74a7a2416d244acc6feaba50eeeb425bda5/recipes/kosmos-theme";
-          sha256 = "0d8h64f3vsrbqw7bzsslhzvwmnfk0kid21gfch817jw7v4gp5zii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kosmos-theme";
+          sha256 = "0vj1z69hz0j7kxnzj13c4vck1qj5j1glr9lymk5ns2v8l56gakwb";
           name = "kosmos-theme";
         };
         packageRequires = [ emacs ];
@@ -39682,16 +39767,16 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "20170410.353";
+        version = "20170416.2333";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "53f83a2e553647292191738ac65b1b930da748bd";
-          sha256 = "0zv17x2srqflpqf6xqi4qwz81ajghq6xv0fxprb35b4v7j5x3zzw";
+          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
+          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
-          sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
+          sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9";
           name = "kubernetes";
         };
         packageRequires = [ dash emacs magit ];
@@ -39700,6 +39785,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kubernetes-evil";
+        version = "20170416.1959";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "kubernetes-el";
+          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
+          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
+          sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8";
+          name = "kubernetes-evil";
+        };
+        packageRequires = [ evil kubernetes ];
+        meta = {
+          homepage = "https://melpa.org/#/kubernetes-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
@@ -39732,8 +39838,8 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc1cbbdd9e3291207150af7953c3d63ef8cca1c1/recipes/kv";
-          sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kv";
+          sha256 = "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp";
           name = "kv";
         };
         packageRequires = [];
@@ -39792,8 +39898,8 @@
           sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte";
-          sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte";
+          sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi";
           name = "lacarte";
         };
         packageRequires = [];
@@ -39889,12 +39995,12 @@
     lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170405.417";
+        version = "20170415.1008";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "69e1ab9fec515c3fedc9230d7c2ef6d0b3d2ff36";
-          sha256 = "1dpl52plihsy8m4qgrj1fzms7q1fny8dr2qi9llg9j9m5apg3i0l";
+          rev = "5407aefb0135b400cd73203b92ac23b8b74050f8";
+          sha256 = "1amqs8v27037qljjrz5r5fn6fscknm3r0hwap1ia5fivg9j8fnzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40161,12 +40267,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170310.1705";
+        version = "20170413.2120";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "a1b17719db89af5f865bbe72866ecb65210a6b52";
-          sha256 = "1v4jkmmxy27090bcjjvxmqr64izql5zx951vzh5r3f4c48dn0ig6";
+          rev = "61670fb0ee5ced369fb2265e096ca0b476789c8c";
+          sha256 = "0jvm0j1m5p5hkag61swgmn5zjs6wbgx5ayxs1wf0b9v6cvmjm7vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -40439,8 +40545,8 @@
           sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires";
-          sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires";
+          sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c";
           name = "lib-requires";
         };
         packageRequires = [];
@@ -40730,12 +40836,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170409.48";
+        version = "20170415.842";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "b5f6777fde363723fd82387cf5eaa5182a8b781d";
-          sha256 = "1c1azl4q1frh3d5i58h9ar4lj8nfy920xsvvwbmjlpb4d54di9f7";
+          rev = "10a7297d6772367a9cf9cd39ee44e2ff4a04e6c3";
+          sha256 = "1bc6x4bxqlb3dpaia4cm7gvys1nlnq22nn1vqpmfy4scmlrngxc7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41009,8 +41115,8 @@
           sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode";
-          sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode";
+          sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64";
           name = "literate-coffee-mode";
         };
         packageRequires = [ coffee-mode ];
@@ -41051,8 +41157,8 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/833e549ba618e58d9cb0b6768a08c651ad8c9e0a/recipes/live-code-talks";
-          sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks";
+          sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm";
           name = "live-code-talks";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
@@ -41064,12 +41170,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170326.934";
+        version = "20170413.2124";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "b2ff3b041697d56dbc7bfd70d94f708e551a970a";
-          sha256 = "1xpwsajfr2ddn68w2d6j206m4g6h05b6n3xig5flk845899954a4";
+          rev = "58ccb38fdbfbc2e227c8515fea40325fba164f92";
+          sha256 = "14fkwdizn085avhjmd89z6ld8l3aanzj6sx06z3fxy407arfd01v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41151,8 +41257,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "af6290684b9dc470d885ed1d6c04185034130e04";
-          sha256 = "1wafp2iv6qvsmh37jpmrsjw0dkm3axraz2my7cr37vcalwc5ib04";
+          rev = "82b3362feae87748cb6e5bbd997d9ce182d65329";
+          sha256 = "0g6rdfcm7wz7dq13vlrz12ldvc6xspgqlxwwwcfayb7nh9czdqbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41343,8 +41449,8 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/logito";
-          sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito";
+          sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl";
           name = "logito";
         };
         packageRequires = [ eieio ];
@@ -41364,8 +41470,8 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/eba82cc626f52e18c7ba9062d7ac648085e79914/recipes/logstash-conf";
-          sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logstash-conf";
+          sha256 = "0djf2kl6jypxlfss4x8ij670v733vid1vbyg6yd96pc9781v3zrm";
           name = "logstash-conf";
         };
         packageRequires = [];
@@ -41377,12 +41483,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170331.1156";
+        version = "20170414.1223";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
-          sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
+          rev = "aa996ca1df79701e59a6ab0b324adc8b11531563";
+          sha256 = "0mjb2806hkvy8xqkwabfwp29q4gnc719zdc0gjq74xblbrx5f90x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -41465,8 +41571,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "loop.el";
-          rev = "30c43568fca7688a70dc0e2e6f72738ee2d4f1fc";
-          sha256 = "1vdfvndc967kagqzswxydcjp14hmfh8gfbm7i9000wb0pi8rpbdg";
+          rev = "e22807f83a0890dc8a904c51ee0742c34efccc6c";
+          sha256 = "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop";
@@ -41524,12 +41630,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170409.2355";
+        version = "20170415.848";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "69d041662e1b20c1c2e79f6d4be12fc546c733ac";
-          sha256 = "0s335djpfvb05v8gf44ipxikn79b7h6aw1bsvsrhscy9xcf57fml";
+          rev = "84c2ca12cd5934322393d764584907d664776bd9";
+          sha256 = "09xvm70np4yz0bmb3hahfrfnajh4lflx2gf27ffn8lviwwxkfkbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -41700,8 +41806,8 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17df4dccdffff6ef7b4900565ae64c1cf84c1fda/recipes/macro-math";
-          sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math";
+          sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn";
           name = "macro-math";
         };
         packageRequires = [];
@@ -41739,8 +41845,8 @@
           sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep";
-          sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep";
+          sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2";
           name = "macrostep";
         };
         packageRequires = [ cl-lib ];
@@ -41836,12 +41942,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170410.414";
+        version = "20170416.1549";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
-          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
+          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
+          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42011,12 +42117,12 @@
     magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }:
     melpaBuild {
         pname = "magit-p4";
-        version = "20160627.447";
+        version = "20170414.546";
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "magit-p4";
-          rev = "9c5ef8bbe70c916bc3742025ce0098e3bdf7be6e";
-          sha256 = "12avgqcm7za16m84sx2gnrf6y87gj8g4lxk4hld98myxkvfp04zc";
+          rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee";
+          sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -42036,8 +42142,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
-          sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
+          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
+          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42145,8 +42251,8 @@
           sha256 = "143iwmga1ypa6v9086pcfr3n5jvaf1dl9czlld5y7npm4r0pxnbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
-          sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
+          sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
           name = "magithub";
         };
         packageRequires = [ emacs git-commit magit s with-editor ];
@@ -42355,8 +42461,8 @@
           sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka";
-          sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
+          sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y";
           name = "malinka";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
@@ -42460,8 +42566,8 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/67fe789d7d3ccf3eb0bbd1982f7d2c506a47bbdb/recipes/manage-minor-mode";
-          sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/manage-minor-mode";
+          sha256 = "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j";
           name = "manage-minor-mode";
         };
         packageRequires = [ emacs ];
@@ -42481,8 +42587,8 @@
           sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/216a33a3acecb226c6b638a9e30ec4c741779a29/recipes/mandm-theme";
-          sha256 = "1qhxzhv63hk81dff6w06cghir856ck6wn1zba6736qn4phbka7ja";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
+          sha256 = "0mvzn29ljd3az6axyqq88vkkf1vpcvslc1svlnbyrpdfinphd0mx";
           name = "mandm-theme";
         };
         packageRequires = [];
@@ -42561,8 +42667,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "marcopolo";
-          rev = "e53ee8a0822d092d8669d75138f6d73f46d076f9";
-          sha256 = "1hhqgwx65489rdq9qd8v0dpcnwicfr772j3i4k8cmnn2lkr3fmm8";
+          rev = "9193aabdf12223087b5ed58f1507d5d8a24a4381";
+          sha256 = "1yc0sgzh1qprhdrzjqc88d6g4xvw80fblcvjl6yn6kihv1ymz091";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo";
@@ -42757,8 +42863,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-markdownfmt";
-          rev = "af83cd00fafcaa837ffdb50d1fa2b0ac952f16c0";
-          sha256 = "1alkjvs21wlai742qgcm0bgf3z3c0f10xgalz48gi4vmwn6in7r7";
+          rev = "187a74eb4fd9e8520ce08da42d1d292b9af7f2b7";
+          sha256 = "01rxl997rb7f71mbvygavsxaq2vr17f2nnpbg7i551lg82xrsbb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16cee5fe003e3afc7daf6858ed83843b52e44901/recipes/markdownfmt";
@@ -42803,8 +42909,8 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/markup-faces";
-          sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces";
+          sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9";
           name = "markup-faces";
         };
         packageRequires = [];
@@ -42959,26 +43065,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
-    melpaBuild {
-        pname = "matrix-client";
-        version = "20161004.1933";
-        src = fetchgit {
-          url = "https://fort.kickass.systems/git/rrix/matrix-client.git";
-          rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d";
-          sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/adeaf97d285120d7b20f1f7a21cb89eb3c40b3b6/recipes/matrix-client";
-          sha256 = "05q1ggiq4nldcklpv2hndg1nx8jxl6qgi5jjc3kz736x7syb0j34";
-          name = "matrix-client";
-        };
-        packageRequires = [ json request ];
-        meta = {
-          homepage = "https://melpa.org/#/matrix-client";
-          license = lib.licenses.free;
-        };
-      }) {};
     maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "maude-mode";
@@ -43032,8 +43118,8 @@
           sha256 = "0kh8yk1py9zg62zfl289hszhq3kl3mqmjk6z5vqkw3mcik4lm69g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe";
-          sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe";
+          sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8";
           name = "maxframe";
         };
         packageRequires = [];
@@ -43189,12 +43275,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20170402.244";
+        version = "20170411.1921";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "245cb51fc4b67ccfcc3296f82e8e3a74c1a1602e";
-          sha256 = "1kjpl45y3mnksvd938s1hviyxmrq9ayk9rdna8hhgmirk01fhqyf";
+          rev = "d4a00fa6873d09920d94b7c35eabe08c715b906d";
+          sha256 = "1l0pfgjv6f5rlqgn8bnc81pzzf743z7ij5qharhxh860248gy41k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -43210,12 +43296,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170402.2049";
+        version = "20170412.2054";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
-          sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
+          rev = "fa20a6ae2e0f0ed3437181f2dc233b8c2a9dca6e";
+          sha256 = "1awi879ch0ms2js1v1kb0c0jv7iicgj8qrfj9xlb3j4wzmxi3vcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -43344,8 +43430,8 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b47649b529080e114f34a83dfb2e177c8b815a5/recipes/memolist";
-          sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/memolist";
+          sha256 = "0nvp38qbzcl6dcayjndw32d3r9h8vf2n29i678s1yr280ll8xw6w";
           name = "memolist";
         };
         packageRequires = [ ag markdown-mode ];
@@ -43377,10 +43463,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20170307.845";
+        version = "20170412.1036";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "1lvnsh45fh23pc49xfz8p5m7z82zzxsrdikmx6pbylzhlr0m3nc4";
+          sha256 = "1rxy2yp1f5fi5wk8lg04dmg943131rvvqiif1k18n0gajg1x8hxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -43417,12 +43503,12 @@
     meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "meson-mode";
-        version = "20170409.522";
+        version = "20170416.247";
         src = fetchFromGitHub {
           owner = "wentasah";
           repo = "meson-mode";
-          rev = "7aae0da7523833d85a229ce7875185c90fa39620";
-          sha256 = "167wdmzcxs1i56hlv3daw0dlhc0mya0fz86m6db2cn8gvi0wnpvj";
+          rev = "61d8177c3e3c195b32f7420d769a0860a873b7d9";
+          sha256 = "0qqwp5mn11fm8f13nfn72c7bmrxa49jqmacga8ipcla3gx59vhs2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
@@ -43464,8 +43550,8 @@
           sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/275d537d9dab56e21d0d6d25a287ae9cbcc26d98/recipes/messages-are-flowing";
-          sha256 = "0shqldzd2421ii42briqfbgf7nws54d1ajx6xw8iax8q1yqv4g8q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing";
+          sha256 = "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m";
           name = "messages-are-flowing";
         };
         packageRequires = [];
@@ -43695,8 +43781,8 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5e2bcc637cea31166fbd98a2ca42591a6e3c57/recipes/midje-mode";
-          sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode";
+          sha256 = "16g57mwkm3ypnyqniy1lj9nfn5wj7cyndb5fhl3fym773ywn6hip";
           name = "midje-mode";
         };
         packageRequires = [ cider clojure-mode ];
@@ -44084,8 +44170,8 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/537bf6c5d5eedaea84806aadccbcec92387fec7a/recipes/mkdown";
-          sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mkdown";
+          sha256 = "034bwwgh0w1dwawdx2nwn4d6wj65i58aqlvi60kflijfn8l3inr3";
           name = "mkdown";
         };
         packageRequires = [ markdown-mode ];
@@ -44374,8 +44460,8 @@
           sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char";
-          sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char";
+          sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9";
           name = "modeline-char";
         };
         packageRequires = [];
@@ -44497,8 +44583,8 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/886da7cd20f8fe5a4dc6a49390f54145f6023d77/recipes/mongo";
-          sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mongo";
+          sha256 = "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc";
           name = "mongo";
         };
         packageRequires = [];
@@ -44665,8 +44751,8 @@
           sha256 = "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d6e3fdf5ab0b51605bbeb203b9fccb6db6ef6e9/recipes/morganey-mode";
-          sha256 = "10lmbf21kh0jy567jzx1lam2hqyqygdvnngvxd97nk6pd32hy8s8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/morganey-mode";
+          sha256 = "18cbmx8lnypgxkisxa3lrh88v8l9k0q8fnai5ps8ngvfgz42rlqp";
           name = "morganey-mode";
         };
         packageRequires = [ emacs ];
@@ -44728,8 +44814,8 @@
           sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b14e088b7b8f35321b720a1b3fdb75203aa66444/recipes/mote-mode";
-          sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mote-mode";
+          sha256 = "0ccsyl0wvf0nbsw57sxad7w0c0i5al5s5mjrjjq8bnfh4dyj2x0y";
           name = "mote-mode";
         };
         packageRequires = [ ruby-mode ];
@@ -45092,12 +45178,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170121.1322";
+        version = "20170416.1618";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "80c2a0b61c4fc2d7a5f7e6d1ecbe882b2033a879";
-          sha256 = "02x6pmzsg4rczc146d2lvh6jwr857hqq0m44f7017h2wmvhhb9xr";
+          rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244";
+          sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -45142,8 +45228,8 @@
           sha256 = "0mgxldxb07ixp8jli7j5jgv2b5vfzhvdv9nszqap4hp4iz7hm50f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
-          sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
+          sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r";
           name = "mu4e-alert";
         };
         packageRequires = [ alert emacs ht s ];
@@ -45163,8 +45249,8 @@
           sha256 = "1rj5vcb5f2xs5wvb3z5wd4866cjdzn8lmkbk6xflqq9wrakzl1kh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
-          sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension";
+          sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc";
           name = "mu4e-maildirs-extension";
         };
         packageRequires = [ dash ];
@@ -45432,8 +45518,8 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f7e5f7e9c551a149e9d433173bd8c8613487ed/recipes/mustache-mode";
-          sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode";
+          sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36";
           name = "mustache-mode";
         };
         packageRequires = [];
@@ -45555,8 +45641,8 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38ad25fc6d80148c12e235bccf7732afa20ff3a4/recipes/mwe-log-commands";
-          sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands";
+          sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx";
           name = "mwe-log-commands";
         };
         packageRequires = [];
@@ -45660,8 +45746,8 @@
           sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org";
-          sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org";
+          sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj";
           name = "mysql-to-org";
         };
         packageRequires = [ emacs s ];
@@ -45783,8 +45869,8 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/806273d9898331b9b0189a72d9fdd43c86e1224c/recipes/name-this-color";
-          sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color";
+          sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8";
           name = "name-this-color";
         };
         packageRequires = [ cl-lib dash emacs ];
@@ -46149,12 +46235,12 @@
     navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
     melpaBuild {
         pname = "navi-mode";
-        version = "20170402.1210";
+        version = "20170414.1228";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "navi";
-          rev = "ef9b5dd15ef96ed3192774e96cd74ee6cccf8b10";
-          sha256 = "1v0h7chq746x5vwb3fzk4djwgnkl2vg3m7pmnhxsq1nj5kfvw2vx";
+          rev = "c1d38e8237f4e14af020a0b7d4f118ea198ab674";
+          sha256 = "0jj5spk14hgb7zb1cd2n8whcw4k1kd5zb6llwj96v178yaws7l8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
@@ -46262,8 +46348,8 @@
           sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
-          sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
+          sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny";
           name = "nemerle";
         };
         packageRequires = [];
@@ -46568,12 +46654,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170408.1048";
+        version = "20170412.758";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "b54285e69c1c27833dda2b50f61985240ae0d4c5";
-          sha256 = "0xir10im940vlj84xi54r0lf1w18pb4dvvqldy1sprgx62iq66z7";
+          rev = "ce999b8d152b9b15d75f66fe22b84827167c8311";
+          sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46593,8 +46679,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "0b0374e831d9c050c6c9eb2ef48b73bc62a0f084";
-          sha256 = "0vyra2kr95msd103h3p8ya66l04wgn5c95vmz5g3l71jvmm9wx8k";
+          rev = "586bb6daef38b3657ba917eb3d7f07ba80c72cd7";
+          sha256 = "0qs73q4d83f6xiz1zdpmln8lzgi78h4indha7r783rx07crvvxw6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -46635,8 +46721,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "1fe1976e0d68b520f04f8ad4f619bb52c40cef78";
-          sha256 = "02mlf4gmfwwc0fclfx2h4pqs9ahcm7jd4zvr39f0w99b1xrybgf7";
+          rev = "f8a2e8a55203f2cc16d70ad43afcc186adaab6b3";
+          sha256 = "19m36vw8j9b4ll6llhaisa4w6w9iilj8af8vvw4bglcmd3jbn8mg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46904,12 +46990,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "20170406.700";
+        version = "20170417.209";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "f7a2f6e6e4757ae6094003b139be9a335eadfef7";
-          sha256 = "11970wjzd8hf3j66fcpyvba7ij7gf9931i584014a72p2y0l7qkg";
+          rev = "43b34f6c6d613a340cbc3e629916156bcc3d89fd";
+          sha256 = "04jj25h1infivqdvcgq0cbc96y2rj2c23y6vw6yh73x4kyynzvcc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -46931,8 +47017,8 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nose";
-          sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose";
+          sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682";
           name = "nose";
         };
         packageRequires = [];
@@ -46946,8 +47032,8 @@
         version = "20170313.1712";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "ce8c88824ab91882ea50c761b930390953cf2c34";
-          sha256 = "0c6f4qyvwwjp9d6x4v26fdp0kcrz6v42ix7ah0g14h0wa17yf9vi";
+          rev = "e08f5f76e406de2c6bdcf85952aaeb66ec0d37de";
+          sha256 = "0g9wryjv56xvgvflii0wilvj17hrf4ddk7vjl2bj9lg4glhyyvl0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47052,8 +47138,8 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d1d7144bb40a77c545ae1a3d12549080f30e5327/recipes/nrepl-eval-sexp-fu";
-          sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nrepl-eval-sexp-fu";
+          sha256 = "1mz7a6aa4x23khlfqhhn9ycs3yxg44h5cckg4v4rc6lbif1jzzf8";
           name = "nrepl-eval-sexp-fu";
         };
         packageRequires = [ highlight smartparens thingatpt ];
@@ -47178,8 +47264,8 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/138bdf35caf18dca8e9cc02035a983decb81dfd8/recipes/nummm-mode";
-          sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nummm-mode";
+          sha256 = "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4";
           name = "nummm-mode";
         };
         packageRequires = [];
@@ -47220,8 +47306,8 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1943a1986775952bedd78430ee41b67af130c439/recipes/nvm";
-          sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
+          sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w";
           name = "nvm";
         };
         packageRequires = [ dash dash-functional f s ];
@@ -47304,8 +47390,8 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a6554cc9a5f667b62623c753cf84e2c9a1cb1c90/recipes/oauth";
-          sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/oauth";
+          sha256 = "0vgxvscb9cr07g3lzpi269kamgzhpac6dir1rlr4qd2wdv0nifl9";
           name = "oauth";
         };
         packageRequires = [];
@@ -47346,8 +47432,8 @@
           sha256 = "1n4zc4nfv7hzilnb0qng6vh19dj4kq12gwsillj6c3i89gjz73wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1b0ca3a2da727e2f521dacd2fa9fa79ca03f7e2/recipes/ob-async";
-          sha256 = "0pra4lvvkdyn7agcgdjsk5dhis78pnvdfk3s5ivbaki70yi71aia";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
+          sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8";
           name = "ob-async";
         };
         packageRequires = [ async org ];
@@ -47526,12 +47612,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20170304.2215";
+        version = "20170411.1842";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
-          sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
+          rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2";
+          sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -47828,8 +47914,8 @@
           sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice";
-          sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
+          sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2";
           name = "ob-spice";
         };
         packageRequires = [ org spice-mode ];
@@ -47849,8 +47935,8 @@
           sha256 = "04npsn7awdp1n7fgwidaza58mjbmm3jsv2d992h2vzslfcyx2hnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/892f629420f5e9e312e46b2022f45244ead39156/recipes/ob-sql-mode";
-          sha256 = "1yrm0v0msy9d51w0b08bg3042cdrp4s78x41iwni4czmf6w3hpih";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode";
+          sha256 = "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk";
           name = "ob-sql-mode";
         };
         packageRequires = [ emacs ];
@@ -48059,8 +48145,8 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8126d5c1f69a2fb0ee6784c6d417ab9ee145af2/recipes/occur-x";
-          sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/occur-x";
+          sha256 = "04nydxp4syd0chfnfrz8v1vkx2qasfh86b98qv8719cily1jw76p";
           name = "occur-x";
         };
         packageRequires = [];
@@ -48114,12 +48200,12 @@
     ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ocp-indent";
-        version = "20160613.938";
+        version = "20170412.12";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "032599b162624a4b65c82c20be06433f24b00e8f";
-          sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
+          rev = "ef97b02aad386203da7066d159cc7d847dc3f55f";
+          sha256 = "1sx3bbp75v4xkd4aikrap735rp00klzxz22qsij76v0r7dhrdlr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -48269,8 +48355,8 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/265c2a9c1880ade0248908ab696d737007e9bfd0/recipes/om-mode";
-          sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/om-mode";
+          sha256 = "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb";
           name = "om-mode";
         };
         packageRequires = [];
@@ -48321,22 +48407,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-quotes = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, omni-log }:
+    omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
     melpaBuild {
         pname = "omni-quotes";
-        version = "20150604.1057";
+        version = "20170416.1416";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "3818c60190eea3c8dc119d6a07531f6b68e7b673";
-          sha256 = "0ha4rxkyahcvpaydk3bi06y519sd9glqjs3a3s87i962h9a20caz";
+          rev = "be1e719c046ca468275ed844989320f48358f2cd";
+          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
-        packageRequires = [ dash omni-log ];
+        packageRequires = [ dash f ht omni-log s ];
         meta = {
           homepage = "https://melpa.org/#/omni-quotes";
           license = lib.licenses.free;
@@ -48345,12 +48431,12 @@
     omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "omni-scratch";
-        version = "20151211.859";
+        version = "20170416.329";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-scratch.el";
-          rev = "b0f7c39c7e378694191351b234a78abae762fb85";
-          sha256 = "123qxl56d0ikwpjv5i3zh3q7xzd2i34sjgcfb732cg4xfxrpd3bs";
+          rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
+          sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -48510,8 +48596,8 @@
           sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7e31ad4e6f5ae3084ef4b4c910dc6d90935d72/recipes/one-time-pad-encrypt";
-          sha256 = "0aa7qcii7yf4527nhlwwp0hbhamhyp2xg0fsscnq2m28l5d5kmn6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/one-time-pad-encrypt";
+          sha256 = "0xl74vxq9dzl84b6wsw8flykxcsxggpd4s47a2ph3irr64mbbgq5";
           name = "one-time-pad-encrypt";
         };
         packageRequires = [];
@@ -48522,10 +48608,10 @@
       }) {};
     oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "oneonone";
-        version = "20170307.932";
+        version = "20170416.858";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/oneonone.el";
-          sha256 = "1fi006v0j5w993jf7hr2ywk9zhsy2v0hiscxlmjws2ihgcfmcslg";
+          sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
@@ -48650,8 +48736,8 @@
         src = fetchFromGitHub {
           owner = "OpenSourceOrg";
           repo = "el-opensourceorg";
-          rev = "42742d5f1b9590acff7f05ee0094e3a80f4f7171";
-          sha256 = "0z92l9d3q12qlf18v7w8qjiw0ciha9l1nvxr0zmik5ck87qk4vmn";
+          rev = "13499b7ae602c735e40c1c494bda6252a2f1c98f";
+          sha256 = "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource";
@@ -48694,8 +48780,8 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/openwith";
-          sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/openwith";
+          sha256 = "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx";
           name = "openwith";
         };
         packageRequires = [];
@@ -48841,8 +48927,8 @@
           sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl";
-          sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
+          sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
           name = "org-babel-eval-in-repl";
         };
         packageRequires = [ emacs eval-in-repl ];
@@ -48967,8 +49053,8 @@
           sha256 = "0vjw8fn6ipi2fg5wkj4jq8cs3m7694xgccy1h1n774w12bby3xhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b3f04ae3592496aa4148d1035599dd6f63ad14b/recipes/org-caldav";
-          sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
+          sha256 = "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc";
           name = "org-caldav";
         };
         packageRequires = [ org ];
@@ -49009,8 +49095,8 @@
           sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils";
-          sha256 = "1dycsv0p2xzm2dg6fi5f5dkb48qnqq0qhrmvi0cdjq34j67s27ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils";
+          sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4";
           name = "org-chinese-utils";
         };
         packageRequires = [];
@@ -49093,8 +49179,8 @@
           sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ddf5992be3677ef94ceac1ec6d3f90f520c7be9/recipes/org-clock-today";
-          sha256 = "0vnpkxlag5h793vw74l1ys6i2v87f5khvjrqbm3wzwmyc08vdz1q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-clock-today";
+          sha256 = "1x9hplz9w2kpa239rz6y02hsl4fgzxlkwr9hhwjy12x1f88x0k73";
           name = "org-clock-today";
         };
         packageRequires = [ emacs ];
@@ -49345,8 +49431,8 @@
           sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex";
-          sha256 = "0bnpr6plndz3q8515lni0mjwlpxy05jkg4bqifmrd52qh91x7j17";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
+          sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
           name = "org-edit-latex";
         };
         packageRequires = [ emacs ];
@@ -49567,12 +49653,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20170224.1951";
+        version = "20170416.2152";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da";
-          sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr";
+          rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
+          sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -49654,8 +49740,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "133634706541cc22385e79ca08793cc5593f9e21";
-          sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
+          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
+          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49674,8 +49760,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "133634706541cc22385e79ca08793cc5593f9e21";
-          sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
+          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
+          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49838,12 +49924,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170310.240";
+        version = "20170416.2327";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "18c94764b6240344d4e147d881071876e9004e30";
-          sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi";
+          rev = "58f51112d557d328d818c8b9cada5e3dab539de3";
+          sha256 = "12kk2yn5sm4jq19kiln3giq1nnljcjyd617p0ff3r9qn5dh1qnxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -49916,8 +50002,8 @@
           sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
-          sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
+          sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah";
           name = "org-pdfview";
         };
         packageRequires = [ org pdf-tools ];
@@ -49979,8 +50065,8 @@
           sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html";
-          sha256 = "0nf8xbqc9q2ppkjplynhfqvsms97w68afxq4rarspzddn881z7nj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-preview-html";
+          sha256 = "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9";
           name = "org-preview-html";
         };
         packageRequires = [ emacs org ];
@@ -50000,8 +50086,8 @@
           sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
-          sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
+          sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
           name = "org-projectile";
         };
         packageRequires = [ dash emacs projectile ];
@@ -50079,6 +50165,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-recent-headings";
+        version = "20170417.17";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-recent-headings";
+          rev = "d53f97bd8c640a06eb606b35c1c269bd3089cb54";
+          sha256 = "0697nwfvkhik8i87apq2xyb4qkk10xa4s03gz6ijybxn98576hli";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
+          sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa";
+          name = "org-recent-headings";
+        };
+        packageRequires = [ dash emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-recent-headings";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-redmine";
@@ -50103,12 +50210,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170410.635";
+        version = "20170413.1111";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "eed76b5e0ae41668349a4d4d756a478e753817f8";
-          sha256 = "1hbsj594plzwn6aym8zchigc4y98bnf9i3izij5rxv9jpiw4bcc0";
+          rev = "81204eaa39d556b6628b35627e0ccbe2799a8e68";
+          sha256 = "0ppr3d7l15xwxjdhpdkczjpwhsvxm3y2jfz2ddxqpydqywhgypn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50163,8 +50270,8 @@
           sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review";
-          sha256 = "1xzhbnd1p2fab2f5xhg4zp06gwk63x8sjlxrfji6hh2p5a6gf6nx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-review";
+          sha256 = "1v7p7pmrjjyj0my9xw55gsn9vvr9aq5x53x13nmspvqg47z6bd98";
           name = "org-review";
         };
         packageRequires = [];
@@ -50184,8 +50291,8 @@
           sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0acb202acc25420274a1b9e639f34f9878a61e83/recipes/org-rtm";
-          sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-rtm";
+          sha256 = "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6";
           name = "org-rtm";
         };
         packageRequires = [ rtm ];
@@ -50205,8 +50312,8 @@
           sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/05a83750e745f16b15cbdf123165a3192363bfd1/recipes/org-seek";
-          sha256 = "08l5zl3wk2f632hslcl5fi9ylaml5my6qx481yvdrbi6m8bchkpp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-seek";
+          sha256 = "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7";
           name = "org-seek";
         };
         packageRequires = [ ag emacs ];
@@ -50215,6 +50322,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-sticky-header";
+        version = "20170413.1844";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-sticky-header";
+          rev = "f2dbfc443e7504e0468b417ef89a68b152ec1f2d";
+          sha256 = "134ss1rrf1q73afvhj4k5ymlwhyagfab18y11v51j5xyx77ydaw6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header";
+          sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj";
+          name = "org-sticky-header";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-sticky-header";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync";
@@ -50562,8 +50690,8 @@
           sha256 = "1bqiq27ln1pl40b9dms05nla4kf72s80g9ilvrgqflxgl36gxws7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b57b6d755b3855ccfe0a90eada939fb7a852b40/recipes/org2blog";
-          sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
+          sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
           name = "org2blog";
         };
         packageRequires = [ metaweblog org xml-rpc ];
@@ -50730,8 +50858,8 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f022fd455e69f1bffdb9ef3273a91cc7d7a3ab9/recipes/orglue";
-          sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
+          sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j";
           name = "orglue";
         };
         packageRequires = [ epic org org-mac-link ];
@@ -51100,12 +51228,12 @@
     outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "outorg";
-        version = "20170402.1415";
+        version = "20170414.1215";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outorg";
-          rev = "c279ad21517b3c0e07950b0c175d9a69f77cfaf3";
-          sha256 = "1l6w6kfwk1519alksxx1d9cgn04ndwldqkmh98df0z1dgc801b2m";
+          rev = "78b0695121fb974bc4e971eb4ef7f8afd6d89d64";
+          sha256 = "03aclh4m3f7rb821gr9pwvnqkkl91px3qxdcarpf3ypa1x4fxvlj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
@@ -51121,12 +51249,12 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20170402.1158";
+        version = "20170414.1217";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "87d7ed5e34d9ed515e526a9e8470e62da7300949";
-          sha256 = "1mm22qs0j1cyr95daj1wv961g9y0pcalr21cnryyilyb3g5dgq29";
+          rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279";
+          sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -51171,8 +51299,8 @@
           sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer";
-          sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
+          sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8";
           name = "overseer";
         };
         packageRequires = [ dash emacs f pkg-info ];
@@ -51251,8 +51379,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "c3ac9201777a0a7a5fa572b3504543138f7039eb";
-          sha256 = "1l2v4sh0jhzwngcgx93w85wr5f1d67pbi4sc9ks2csfj9awcw63b";
+          rev = "f686459c02b27e6f22128c2ff4e26818fb7f4ee7";
+          sha256 = "0i8fd8jjimzp3p9l10ixdxv7ghlc3x191914wlq1znqzra09xb0p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51268,12 +51396,12 @@
     ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-epub";
-        version = "20170331.114";
+        version = "20170414.0";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
-          sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
+          rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
+          sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -51612,8 +51740,8 @@
           sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-tiddly";
-          sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly";
+          sha256 = "1rpbnz152af588r8kafqpg9aq3ngwjfkrsjqk6w90l5rh280yi39";
           name = "ox-tiddly";
         };
         packageRequires = [ cl-lib org ];
@@ -51675,8 +51803,8 @@
           sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs";
-          sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs";
+          sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73";
           name = "ox-twbs";
         };
         packageRequires = [];
@@ -51751,12 +51879,12 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20170409.2149";
+        version = "20170412.1620";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "5ed001d66463ecc8906f773452702e848e09f2d8";
-          sha256 = "1rkbyqabikbgv3zzr0g7f9qqgr4jpf8qh6qvjlivk9wb594dr0qd";
+          rev = "2346b0eec188cce4106ac605a396ded0d380f610";
+          sha256 = "053zzllffpa17nq488zgc7xhn27p1b42jrg28k5vpzvmin64bda3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -51793,12 +51921,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170404.751";
+        version = "20170417.54";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "a8358b3f8fd8dba1d3a883012e2f8e3614f42af2";
-          sha256 = "1bcx152wkgwvh4w86rgh2hhy07klzjfs97sfr3vc7j00si7ps65i";
+          rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
+          sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51948,8 +52076,8 @@
           sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
-          sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
+          sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
           name = "page-break-lines";
         };
         packageRequires = [];
@@ -52046,8 +52174,8 @@
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "pallet";
-          rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501";
-          sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
+          rev = "b8d0df1883224a371ac0a3bc9b9c1c4dc61e6ac0";
+          sha256 = "0j87yq8rycklk8df4rlwx0bp2n94pyhaz4yv8vacbqrzchpa1bb0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet";
@@ -52172,8 +52300,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
-          sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
+          rev = "71a8eb68cd618094244110c5d2d5ae9632605204";
+          sha256 = "1zkhmpd20vm95l9bfgzlpc2hl8qvig3rm9kxhyrhwn2iybna05rw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -52258,8 +52386,8 @@
           sha256 = "1il0gbyjnlxhk04z3lgxmvlmlhgc94rmxdf8nl5sk3gblqmr8v3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0cbe675482a72417cb3ff770ca3b85710e479ac1/recipes/paren-completer";
-          sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/paren-completer";
+          sha256 = "1k71nmsf155b4pvzcsymsc1bn42h9apypapkvc1kxyr6zm29zcr4";
           name = "paren-completer";
         };
         packageRequires = [ emacs ];
@@ -52468,8 +52596,8 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4af274e0e59aec44ede6f6ed0a34f4bcec6387f2/recipes/password-generator";
-          sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/password-generator";
+          sha256 = "1ziiz4x4slfadlm7fjpmwvq4a9fi3ird74b6v5na499ylqnzrl59";
           name = "password-generator";
         };
         packageRequires = [];
@@ -52478,14 +52606,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    password-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "password-mode";
+        version = "20170411.2329";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "password-mode";
+          rev = "ed764a4ec1011526457c71b7c37fa9a659a866ab";
+          sha256 = "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28dafa392a378e7de2c6992fe17b33f6379dc6b8/recipes/password-mode";
+          sha256 = "1rxh6jg99qxagc6i2xgvswvw93h4ma7j8lhjr4ln44vbgyhzph11";
+          name = "password-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/password-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "password-store";
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "caaa5f0f85fd93c1651d4c74c8bb8287a18c4e88";
-          sha256 = "10nqf5l320p61pajx7pj5yh7hxf666zsj1kcdb91ddb367kcwzzv";
+          rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
+          sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -52634,8 +52783,8 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc926d83b0376e84b8a88ce794dcdac17603860c/recipes/path-headerline-mode";
-          sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/path-headerline-mode";
+          sha256 = "0yw2i3cp20v8nd2wj1rs1qad8abghzzasf2sjyla90q06wlna98w";
           name = "path-headerline-mode";
         };
         packageRequires = [];
@@ -52739,8 +52888,8 @@
           sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache";
-          sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache";
+          sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva";
           name = "pcache";
         };
         packageRequires = [ eieio ];
@@ -52781,8 +52930,8 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3130ab6bf500f68fb9af77d4c33b8ec76c36be6c/recipes/pcmpl-args";
-          sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcmpl-args";
+          sha256 = "10mgci1rk6sr7wk46mnp5l37v3qxdc6yy5zfvy9mzwzh3va1pw31";
           name = "pcmpl-args";
         };
         packageRequires = [];
@@ -52941,12 +53090,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170317.810";
+        version = "20170417.150";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "c01c8673338c73e92a88d2aa7e3a26ca8417fbfa";
-          sha256 = "05lyzvxcghyv3jd4vcxk6jm88bq10sss0nvbhk4arbjf4wlmmf1z";
+          rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9";
+          sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -53284,8 +53433,8 @@
           sha256 = "1bdywz241kyvlxn107l2jg6vyhvvw5j4pywrarzx3pdymh9qk645";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf5d4356424b492579a029f58dd4685ff5aaf39/recipes/perspective";
-          sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
+          sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7";
           name = "perspective";
         };
         packageRequires = [ cl-lib ];
@@ -53305,8 +53454,8 @@
           sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
-          sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
+          sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04";
           name = "perspeen";
         };
         packageRequires = [ emacs powerline ];
@@ -53364,8 +53513,8 @@
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "ph";
-          rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f";
-          sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw";
+          rev = "ed80dad9211583ed0db633448b3624c99b7fac23";
+          sha256 = "1pgz64zv9a0r16i958x53g7wnk0q7ngcd6z1maf7lxhlp57v015d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph";
@@ -53473,8 +53622,8 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b6d362a12828dfef5f0e2216f5ef21c6cb7eed/recipes/phi-rectangle";
-          sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/phi-rectangle";
+          sha256 = "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw";
           name = "phi-rectangle";
         };
         packageRequires = [];
@@ -53641,8 +53790,8 @@
           sha256 = "07lcibr55pk3sab9bbq2r4phadl5p28n63wkq5rkhkkjc7s9rayc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38dc0469a114da121de5b7bdfb75a395f2bcf777/recipes/php-boris";
-          sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-boris";
+          sha256 = "0kklwk8b98czsg567vgzzdfnv76yn1id3ah2q2qqdhaky1yzw7ak";
           name = "php-boris";
         };
         packageRequires = [];
@@ -53696,12 +53845,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170405.844";
+        version = "20170412.514";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "11674976ee981bb05fb79c5b6de6973b53d51e98";
-          sha256 = "0d1vz95kplyrymv3i9c5k2p2pg2smrv0bkp3kyrjx73nsq2n981k";
+          rev = "56a7e7c67b70c4aba5919317a8898157ba0b08e4";
+          sha256 = "1jdpb4f6msw4g9amp1wmbgngldy033x7lhf8y8r34n6q2c7sb68r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -53767,8 +53916,8 @@
           sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch";
-          sha256 = "1qlfrmva58jf6c04whn9dshz15wv53pyq60wxv9f3c9bl88ws0nv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-scratch";
+          sha256 = "0sl9cccp4xjsidiyjf3sca8wlch3zd23zyac21xys11xm3rjxh9r";
           name = "php-scratch";
         };
         packageRequires = [ emacs php-mode s ];
@@ -54061,8 +54210,8 @@
           sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8dbdb25c8344c96048a7863333ace6dc07d8154c/recipes/pippel";
-          sha256 = "1yxy0z5377xmb9gjpm16rybi8wr8x95k5hcf8g23690vr9ndjw67";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel";
+          sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw";
           name = "pippel";
         };
         packageRequires = [ emacs s ];
@@ -54082,8 +54231,8 @@
           sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker";
-          sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker";
+          sha256 = "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj";
           name = "pivotal-tracker";
         };
         packageRequires = [];
@@ -54145,8 +54294,8 @@
           sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info";
-          sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info";
+          sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n";
           name = "pkg-info";
         };
         packageRequires = [ epl ];
@@ -54229,8 +54378,8 @@
           sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme";
-          sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/planet-theme";
+          sha256 = "1hr5m08qn51r9804jd0k95ryz3frzkk1dp6wpybil6bf67a2l5lr";
           name = "planet-theme";
         };
         packageRequires = [ emacs ];
@@ -54302,6 +54451,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "playerctl";
+        version = "20170414.156";
+        src = fetchFromGitHub {
+          owner = "thomasluquet";
+          repo = "playerctl.el";
+          rev = "fa79b3c1223738ed89ded01fb1f4fb5fdd3aa92d";
+          sha256 = "1c5bdkr7wr803pz889dmhhlcar0jmmwg1yy2b04zwc58cqw9g1i9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
+          sha256 = "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x";
+          name = "playerctl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/playerctl";
+          license = lib.licenses.free;
+        };
+      }) {};
     plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plenv";
@@ -54334,8 +54504,8 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a2fef4f90002193bf9758afbe88f2798c44cc294/recipes/plim-mode";
-          sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/plim-mode";
+          sha256 = "1nrqw5dvb3j5x3wkpsjbpv1d2s367icq9j4h1xv1cahfsn8nn4m9";
           name = "plim-mode";
         };
         packageRequires = [];
@@ -54996,8 +55166,8 @@
           sha256 = "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/795b8723e105a22c729ef77377a85c63ee0a2a1f/recipes/pow";
-          sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pow";
+          sha256 = "13f3pk52f9lkkl3zi6448j9b39kn6ny9vmnlsvhwa6s0vaz8f220";
           name = "pow";
         };
         packageRequires = [ cl-lib emacs ];
@@ -55407,8 +55577,8 @@
           sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy";
-          sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
+          sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p";
           name = "prodigy";
         };
         packageRequires = [ dash emacs f s ];
@@ -55510,8 +55680,8 @@
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9a509f93bb65cc9bd268ee8c7b13046eac7385/recipes/project-local-variables";
-          sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables";
+          sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9";
           name = "project-local-variables";
         };
         packageRequires = [];
@@ -55606,12 +55776,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170407.319";
+        version = "20170416.148";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "323fb845f2da0fc95ac27efd11f4d696f5fe647d";
-          sha256 = "1c0iv9k9sapv4f49qsarivg46xkpw1ckdyh7qizv1ailb3q9faax";
+          rev = "da581cdfe4f4f63137f3320ed3dbda9cf6c20e14";
+          sha256 = "1bgkx3vwn3vy796a1aq2hd7817qaznf4laqni417gzi43jqf8414";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -55711,12 +55881,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170323.210";
+        version = "20170411.152";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "6f866e1e7cd50db563a16ae9237ad10f3be97fef";
-          sha256 = "1fs5pcqk1zfhgbh2k9kdyi7sm089iy2mwaqipa1k91lvmqawz5i6";
+          rev = "9647dc1368df6a3b6de17314332d024cceb90052";
+          sha256 = "1v8hipd7i63dv9lvq0ff5v9awg017kr0xfjk5hysamb346r1rsrn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -55757,8 +55927,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "sift.el";
-          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
-          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+          rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
+          sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift";
@@ -55816,12 +55986,12 @@
     projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "projector";
-        version = "20160929.2052";
+        version = "20170410.905";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "projector.el";
-          rev = "e86b89e836ce2d0544b96235ef158d1252fd790f";
-          sha256 = "1484gb3lxj8inh7q1z05mqiv5ddq2yymdlmhjxrl1l7c3lqbapn9";
+          rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131";
+          sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -56009,8 +56179,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "efec7571047c680e11354bd30bf8bd3dfda15ff0";
-          sha256 = "1rika22vx05f6jd5a89n31gv62k5r2y31qi9hb5y2ycdghfyd6nz";
+          rev = "8aa927f08f6b92808976b0c22fa4a45850279987";
+          sha256 = "12n6i25mvb4a4yqpiyrfd9firfz2frv0zh0akpjd03qv93fmw30j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56267,12 +56437,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170323.331";
+        version = "20170415.2259";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "ce098468af9e7dc50a3979b0f4b7de54abe0aa78";
-          sha256 = "1vap7vk6fsslpijy2iq3y0fb94naxjm60mcyf3xlz1gym3hfrwl5";
+          rev = "1f74263f42c56c0b88e8fded540231a2d4fd9e36";
+          sha256 = "1mc6msf6hzy0fdm1gwq4f9gadspk68d1mdwbhl1j1ngx2gqbrhik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -56773,8 +56943,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "79f45263a8904533160d3fa0d4e69b11d3d7d315";
-          sha256 = "0fcf8yw40nslc5zhl525np6w0y6sghjhsf0bf5vg2p7l2jwf205r";
+          rev = "7cb3ffddfd96f5e099ca697f6b1e30e727544627";
+          sha256 = "19f1bjhyizhsb2xva8f5n2x20nmja34j5ps278phqmg46qffbw5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -56958,12 +57128,12 @@
     python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-test";
-        version = "20161107.1048";
+        version = "20170415.1556";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "python-test.el";
-          rev = "f1d24e53c2a9a77812aa10f8cc6d5a5b49b57615";
-          sha256 = "0al1s7fh2l0vhcsz261aaxsn3xkrp451zynym11ifhppf1wwlp04";
+          rev = "2005e6f6797e875ba0946a3f50c2320c28614e7c";
+          sha256 = "1wvyi4mdzasnby3z57xax6w6wkag3zpk23y99n9mhmfmf0fvyvix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
@@ -57470,8 +57640,8 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/de07b317e46475776d6d237908a0495866a7a851/recipes/rainbow-blocks";
-          sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
+          sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs";
           name = "rainbow-blocks";
         };
         packageRequires = [];
@@ -57575,8 +57745,8 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/246b7fbef1fecc261f4417d7519f26662be3b30f/recipes/rand-theme";
-          sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rand-theme";
+          sha256 = "0c2xs99jgrhk6f1s6pls8pigg6qwcr4imnwdlngwzr0jz8jhqvxa";
           name = "rand-theme";
         };
         packageRequires = [ cl-lib ];
@@ -57680,8 +57850,8 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/56d330fdd9e3b2cf3afc808190efebcc4cb1456d/recipes/rbenv";
-          sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv";
+          sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q";
           name = "rbenv";
         };
         packageRequires = [];
@@ -58081,8 +58251,8 @@
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-pry";
-          rev = "4c903439b6292f51037d4a12ea54897e3a23541f";
-          sha256 = "0nm9w3w2k7v2nbdp8q6k37ysahr34iprnqjfag631xhlswshiwrl";
+          rev = "9b3834048fcbc16827c55af38f8cfef0cf6533da";
+          sha256 = "1kpy2ym29mnr89c7im27hhbpww7dgblw6w731ayrlg8rlvqzh7ln";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry";
@@ -58271,8 +58441,8 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8704384ec36a782ba1d08bce33cd47d0a46ee704/recipes/recursive-narrow";
-          sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/recursive-narrow";
+          sha256 = "15pzwxzyc3dl81v27gk7a4866cxbhzpmmcmfi9n4vrrxmf61h905";
           name = "recursive-narrow";
         };
         packageRequires = [];
@@ -58310,8 +58480,8 @@
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b23e5c692b307ffe1c44216c5865243973ad7ad8/recipes/redo+";
-          sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+";
+          sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r";
           name = "redo-plus";
         };
         packageRequires = [];
@@ -58348,8 +58518,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "b1167e3a65694f3c40966f73a3e15ae78f48585d";
-          sha256 = "0f7yzyyqa1mpw15wr56p92kmcx2h2m46x6932qk5fhn7zihik97p";
+          rev = "608b896b58c6e1c7fec8c6e97202fc303a731a8b";
+          sha256 = "1x1d4gq2j8lanzpnqhx8aarwzd2mpprhkrz6j9w1s94g2p210ssg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -58414,8 +58584,8 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24fcd00ee6509df7cda7d873c9ea82beefdc6944/recipes/refheap";
-          sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/refheap";
+          sha256 = "11w2pmkz56141gvyzyims9rd42djizni3g6dw4qa48bvlqc56klh";
           name = "refheap";
         };
         packageRequires = [ json ];
@@ -58456,8 +58626,8 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfdf111ecf33236f7b922a2b8e5d0f86e669cd8f/recipes/regex-dsl";
-          sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-dsl";
+          sha256 = "0c9mxsvmx6mgpq838qnjjr7ra4hafikv7hq4nfab7zw9mxrcr2f9";
           name = "regex-dsl";
         };
         packageRequires = [];
@@ -58477,8 +58647,8 @@
           sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool";
-          sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-tool";
+          sha256 = "1s4clmy5r7w6aj2bh2vf2fmbcwnainzidj28mf3kc34x3qhybngq";
           name = "regex-tool";
         };
         packageRequires = [];
@@ -58728,8 +58898,8 @@
           sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle";
-          sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
+          sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b";
           name = "repl-toggle";
         };
         packageRequires = [ fullframe ];
@@ -58969,12 +59139,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20170403.1125";
+        version = "20170413.2305";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "67bbbf0635b252a0c76854036c5d7ad864938a6c";
-          sha256 = "0dyfgwnrxc8yyw743ijpgn2hnmxsfvblw80hj8x66ajb0k3j8lnw";
+          rev = "dc25f00c3cab1c97db2ca4733e7e7e7805ae68f2";
+          sha256 = "1rx5mj7lpxpmkbpbwb78garhl118d0kpbwvdwfh3f3j1rmzyiblx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -59202,8 +59372,8 @@
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/88fe56cbb3deab4d5f24c66ba166d204b6751bba/recipes/rfringe";
-          sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe";
+          sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967";
           name = "rfringe";
         };
         packageRequires = [];
@@ -59215,12 +59385,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170322.1049";
+        version = "20170415.938";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
-          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
+          rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
+          sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -59303,8 +59473,8 @@
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "rinari";
-          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
-          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
+          rev = "134438af8fbdfa9c8077267c768d273a9792b484";
+          sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari";
@@ -59517,8 +59687,8 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9bc02257f07ad72904905993a2a3eeda2917d8cb/recipes/roy-mode";
-          sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/roy-mode";
+          sha256 = "1r49c1v0xjkrpxmq0k2l2nrx95n06b7hbpmr1n7nkil2bxdq275i";
           name = "roy-mode";
         };
         packageRequires = [];
@@ -59614,12 +59784,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170408.1642";
+        version = "20170416.1111";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
-          sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
+          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -59643,8 +59813,8 @@
           sha256 = "1ajks5dmsb5cyj0hzxbp3r305liwaayb8jds0wdnw4nk5anlsbnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0acb202acc25420274a1b9e639f34f9878a61e83/recipes/rtm";
-          sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm";
+          sha256 = "1bwbaps76pawz73fs7nzkvbii9d57zmfdccpm18dwn6phaqxbhyc";
           name = "rtm";
         };
         packageRequires = [ cl-lib ];
@@ -59680,12 +59850,12 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58302";
+          rev = "58383";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-additional";
-          sha256 = "0w88hijkr7rjm8ig65n20bqkb1ymqmb3wdwc6bskp26d49w85xjg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
+          sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i";
           name = "ruby-additional";
         };
         packageRequires = [ emacs ruby-mode ];
@@ -59719,8 +59889,8 @@
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "rinari";
-          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
-          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
+          rev = "134438af8fbdfa9c8077267c768d273a9792b484";
+          sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation";
@@ -59760,7 +59930,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58302";
+          rev = "58383";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59911,8 +60081,8 @@
           sha256 = "0hlzkwll6di13hja3hm3nzmcjkwgciq9bziz837cr49agagz3b55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode";
-          sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
+          sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk";
           name = "ruby-test-mode";
         };
         packageRequires = [ pcre2el ruby-mode ];
@@ -60008,12 +60178,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170405.707";
+        version = "20170411.2043";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "19e6f604a0c9d838a1426604d70ce3af0960621d";
-          sha256 = "0phggsdcnjcc8zxw66ida1a6hq8ccqh66islhm6ix1yaycrwvhms";
+          rev = "dae5af71ebf4b5c6797ef057e8a0ebf655bcdbfb";
+          sha256 = "0s01pzlq0lqzbxqj0x2x4lr3l1rsvnd8h2kskgli6y2m8nv97qc6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -60037,8 +60207,8 @@
           sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
-          sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
+          sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
           name = "rust-playground";
         };
         packageRequires = [ emacs rust-mode ];
@@ -60079,8 +60249,8 @@
           sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a4d9f86140b0ee95742c3a66dfbc063b5f87fb3a/recipes/ryo-modal";
-          sha256 = "019r1k14mhdv1x06fd5q4l0l4jnjy330b078qvpxrqv1fnwh1q51";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal";
+          sha256 = "06pm6grsdcldi1khbjfjp7lpi6f6x3pa5ikspp0xdwijnmi0xrrf";
           name = "ryo-modal";
         };
         packageRequires = [ emacs ];
@@ -60100,8 +60270,8 @@
           sha256 = "07db8jfi1m19x760grkznaiwbap5dp00cicd88cbam16a0qfhbjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s";
-          sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
+          sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa";
           name = "s";
         };
         packageRequires = [];
@@ -60184,8 +60354,8 @@
           sha256 = "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/455cfeb623057c2bb03a5a78380b3247e2bdd0d4/recipes/salesforce-utils";
-          sha256 = "0fyz710saqfi44sf3zqm9n3m4w09zsip015ij0pqs75nanhcnmvy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/salesforce-utils";
+          sha256 = "0b70w92zghid6n0ba28dh5r3pckr8jsd1743qyi8vj04ih1dns5i";
           name = "salesforce-utils";
         };
         packageRequires = [ cl-lib ];
@@ -60226,8 +60396,8 @@
           sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5df85d24ee7ed41aab983626df72641bb04dadd5/recipes/sane-term";
-          sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sane-term";
+          sha256 = "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7";
           name = "sane-term";
         };
         packageRequires = [ emacs ];
@@ -60411,8 +60581,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "e34e519c1276e7f1b299fea40fea2f114c7ef455";
-          sha256 = "09rfxip87iad670xxw0www8ig12qavpjs1ys7x5nzga7aw3apij2";
+          rev = "ac72fb1103c506ce8c00f1b2be37b5c5ab771a61";
+          sha256 = "19z8dwybj4bmmqlxa8g6jc87kkj2bdnlgv0k31d0kqxwswng309w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60645,8 +60815,8 @@
           sha256 = "1nr6yqmxz6jqjkfj249yz88480shlsnmri0d322pkz88d4nkr0hq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e794c1fa9bd93e25a65c2b71a5ccf5662fe179bf/recipes/scratch";
-          sha256 = "1hhwyvg05cnzfnn4bgygvjfqyayxl65f5zn7h05h9axvcab6s7kj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/scratch";
+          sha256 = "1g4jm54n5k0pkspbd9636hcmxi1p3lkgayiwavlgs0sg2s6vc9l9";
           name = "scratch";
         };
         packageRequires = [];
@@ -61100,8 +61270,8 @@
           sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/selected";
-          sha256 = "0nvrfymb7wd5lcyfpxzh0rc0l3qcwrvh0l32ag7mgs7jzgvnphnx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/selected";
+          sha256 = "1zk9jvsiw30zqh68xjx2zcc71php68ryiwqmws52ghqiaifj50gf";
           name = "selected";
         };
         packageRequires = [];
@@ -61205,8 +61375,8 @@
           sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
-          sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight";
+          sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm";
           name = "sentence-highlight";
         };
         packageRequires = [];
@@ -61247,8 +61417,8 @@
           sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme";
-          sha256 = "058fadcqz21c22lzf33badibb7hn3w695akh560v10n8750h5wca";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme";
+          sha256 = "1nvhnyfvmpqg0a54nq73lhz3h9g94zkbix13bbzv9bp1lg8v6w1x";
           name = "seoul256-theme";
         };
         packageRequires = [ emacs ];
@@ -61413,8 +61583,8 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/69270c79b47b7d9348bd2ca9fec3aabfd7e694b3/recipes/sexp-move";
-          sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move";
+          sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9";
           name = "sexp-move";
         };
         packageRequires = [];
@@ -61518,8 +61688,8 @@
           sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode";
-          sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode";
+          sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x";
           name = "shakespeare-mode";
         };
         packageRequires = [];
@@ -61770,8 +61940,8 @@
           sha256 = "1acml0p04wxnm0di9iy5kwml6myr7gcj09ky6dw35f0k0m1w51ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp";
-          sha256 = "0i6z2icpndv5g5ydmwqskl7vrmdz9qp30l5bw1l7gqr3dippjiyz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp";
+          sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq";
           name = "shen-elisp";
         };
         packageRequires = [ emacs ];
@@ -61933,8 +62103,8 @@
           sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey";
-          sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey";
+          sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1";
           name = "showkey";
         };
         packageRequires = [];
@@ -61996,8 +62166,8 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97fe5a411be1a7d80d50f5a8af44b74c6c7cf9e6/recipes/shrink-whitespace";
-          sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace";
+          sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw";
           name = "shrink-whitespace";
         };
         packageRequires = [];
@@ -62076,12 +62246,12 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "sift.el";
-          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
-          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+          rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
+          sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/sift";
-          sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
+          sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj";
           name = "sift";
         };
         packageRequires = [];
@@ -62101,8 +62271,8 @@
           sha256 = "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5bad0b4c9a7cd28de44ce60de056330a376b3e6/recipes/signal";
-          sha256 = "0pvl5qxi0rjbxkpa8kk1q9vz11i9yjmph42si3n7gmm9kc28pk61";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/signal";
+          sha256 = "0y4crwpnmwm8bi9jazrph4yj0nnva2i1js8h3bw3sizy20a4yf00";
           name = "signal";
         };
         packageRequires = [ cl-lib emacs ];
@@ -62406,12 +62576,12 @@
     skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "skeletor";
-        version = "20170327.1529";
+        version = "20170413.2030";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "skeletor.el";
-          rev = "cf643ea320e172b3727f897f05e87a8e5a02c589";
-          sha256 = "1l3gjzzvrbkiapk41jxp1hwx2z2wc69m8bsy179nwvv9gsnxvwv1";
+          rev = "376958e6e39dcf32df945c617c230dba3bcc076d";
+          sha256 = "152kqsbhn1z3nf55vrrz6iv96c4jkzp2bglgp2bqb37nfh722frz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
@@ -62784,12 +62954,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20170317.1656";
+        version = "20170413.557";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "d3f586a99e1d3ecb225b2a7c56435eaac2e5527c";
-          sha256 = "00wyvc34mcdqrb7cnayc0biw4rz92jad9vpv4w38zbs8331lkh5k";
+          rev = "35ccf713384477b9e314ffef69f762ce2a6a94e9";
+          sha256 = "0j1z536ydcdmg16xx0nzd2cj9cpi8l8lhwb8ig0b9nl3lv12cb4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -62999,8 +63169,8 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1da4d66a6cae13464343e35f0aed2cb232ac5fe5/recipes/smart-cursor-color";
-          sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-cursor-color";
+          sha256 = "19ah55514ashkm4f49nlbnrpwxpwlfn6x3fbi4dv0x2b8v1828ss";
           name = "smart-cursor-color";
         };
         packageRequires = [];
@@ -63050,6 +63220,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    smart-hungry-delete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-hungry-delete";
+        version = "20170412.643";
+        src = fetchFromGitHub {
+          owner = "hrehfeld";
+          repo = "emacs-smart-hungry-delete";
+          rev = "7c1d56a92481594e14d40b5fdf6c48657a0108a0";
+          sha256 = "0mxaslx5823s68a8ggbbnmfk1jiswjvip5s4sg7ihfagnci72wni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/abbf52a856b95ab88cde1fdeeebebb81f7c61fa9/recipes/smart-hungry-delete";
+          sha256 = "03hw5p055dbayw5z43c1ippf2lnjgs77l7q969ng3fffqkazjq9b";
+          name = "smart-hungry-delete";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/smart-hungry-delete";
+          license = lib.licenses.free;
+        };
+      }) {};
     smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smart-indent-rigidly";
@@ -63250,8 +63441,8 @@
           sha256 = "0p1cqpdsp2vdx85i22shyzfhz22zwf1k1dxkqcmlgh3y7f4qq8ir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/627e46a75bb25cf6e71785b5dda6b037f2adbb71/recipes/smart-window";
-          sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-window";
+          sha256 = "0w24v7v0477yl5zchyk6713yqp8lyfz600myvv4dp3kgppxpgd3f";
           name = "smart-window";
         };
         packageRequires = [ cl-lib ];
@@ -63263,12 +63454,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170401.315";
+        version = "20170417.1126";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "a5f39550d419ca10eb0075f799c0864ade7c88d7";
-          sha256 = "07j9cr06v78xnsfnd9ixpddiap7il3xrd0fpsyxyl9xsb2gp3jgh";
+          rev = "72f3d2846a7fe324136b7b58d6bf3f8939551c99";
+          sha256 = "181sb5rv0li00gp67sg16g9clhcs9gbmp1cs8f29ww3m753k1nvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63313,8 +63504,8 @@
           sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan";
-          sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan";
+          sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w";
           name = "smartscan";
         };
         packageRequires = [];
@@ -63460,8 +63651,8 @@
           sha256 = "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/smiles-mode";
-          sha256 = "0bg2kw7hfb8iqzbf3pgyyj384xmnfz4fj31ijlcrgl71fwb3gc9z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smiles-mode";
+          sha256 = "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k";
           name = "smiles-mode";
         };
         packageRequires = [];
@@ -63690,8 +63881,8 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38043250c1696f61fed04c5feb6a859c36009a5e/recipes/snippet";
-          sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/snippet";
+          sha256 = "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68";
           name = "snippet";
         };
         packageRequires = [];
@@ -63732,8 +63923,8 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0945169fa83a185869b905c9f7e4d37f0a5a8099/recipes/soft-charcoal-theme";
-          sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/soft-charcoal-theme";
+          sha256 = "1j9yd4kfh7ih5ipmwvxh9qqq6wxv6qk8a9vb5jiyk90dn8a2d7g5";
           name = "soft-charcoal-theme";
         };
         packageRequires = [];
@@ -63837,8 +64028,8 @@
           sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
-          sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
+          sha256 = "0j6n1qgdrma6vvi6f7xiy66qwsl8710pca4ga9i7srhxv0r47x68";
           name = "sonic-pi";
         };
         packageRequires = [ cl-lib dash emacs highlight osc ];
@@ -64106,6 +64297,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcetrail";
+        version = "20170410.1437";
+        src = fetchFromGitHub {
+          owner = "CoatiSoftware";
+          repo = "emacs-sourcetrail";
+          rev = "b8d5557aa565ae979622312576db20515f65f977";
+          sha256 = "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9713bd8030657c8e867409a6aa8173219809173a/recipes/sourcetrail";
+          sha256 = "0qa3iw82dbfc1b45505s39m99r0m2473312prws6hch0qhjyji7h";
+          name = "sourcetrail";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/sourcetrail";
+          license = lib.licenses.free;
+        };
+      }) {};
     spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacegray-theme";
@@ -64148,6 +64360,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
+    melpaBuild {
+        pname = "spaceline-all-the-icons";
+        version = "20170417.105";
+        src = fetchFromGitHub {
+          owner = "domtronn";
+          repo = "spaceline-all-the-icons.el";
+          rev = "26a9e571122aed17318948f677827068e13cb216";
+          sha256 = "0bpy812hlnmjracnz66xb9v4xd8m1sxizls7nhhpi68i870q2449";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
+          sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
+          name = "spaceline-all-the-icons";
+        };
+        packageRequires = [ all-the-icons emacs spaceline ];
+        meta = {
+          homepage = "https://melpa.org/#/spaceline-all-the-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
@@ -64261,8 +64494,8 @@
           sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9cac36b71f3690f65bd0ff78bf4a2fecf2dd5ea2/recipes/speck";
-          sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck";
+          sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6";
           name = "speck";
         };
         packageRequires = [];
@@ -64386,8 +64619,8 @@
           sha256 = "0a3vgkp65hpc1a5h79yl0pc02lr6w299wd2fs9cgn8nvbdrip5ij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode";
-          sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
+          sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys";
           name = "sphinx-mode";
         };
         packageRequires = [];
@@ -64407,8 +64640,8 @@
           sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/spice-mode";
-          sha256 = "0r9dp5g3rp8fycd6nmm4m1vwsqahc47h3dsk6whw9a7adxh5i2bv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode";
+          sha256 = "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg";
           name = "spice-mode";
         };
         packageRequires = [ emacs ];
@@ -64491,8 +64724,8 @@
           sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify";
-          sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify";
+          sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x";
           name = "spotify";
         };
         packageRequires = [ cl-lib ];
@@ -64659,8 +64892,8 @@
           sha256 = "0d1ksh1rslzn93b8g6p48ca27f3d0ls4kxjcadjmd700x4vzv88i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/147b6d7a58cab128509589a84fb7938e56aa0604/recipes/sql-impala";
-          sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala";
+          sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh";
           name = "sql-impala";
         };
         packageRequires = [];
@@ -64845,8 +65078,8 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9700178edf36c4bbaf2b91f7138fbd6fb5f9ea3/recipes/ssh";
-          sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh";
+          sha256 = "1wlzagcg2fxqcbpd3z02wsil2n224kzmhcd54df80jypgq5fa6k3";
           name = "ssh";
         };
         packageRequires = [];
@@ -64879,12 +65112,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170406.2158";
+        version = "20170413.918";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "99d14509289943b29c702232076704c11f19a82b";
-          sha256 = "1khgabsmg8vwpvpligvxwgqq275sh33w4704dpwyq1h25jq317bj";
+          rev = "082219f18f34d146e3b6ced175c912f2da31220d";
+          sha256 = "1035r0msl7av5g0hkn69784zdqvpamplvzgn06yzjsnf0bfbsdl5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
@@ -64908,8 +65141,8 @@
           sha256 = "1zkxiy66d34v09krfajx6y8i2s5jdp99sxfzbvzi854s9hldl58x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
-          sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
+          sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
           name = "ssh-deploy";
         };
         packageRequires = [];
@@ -65383,8 +65616,8 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fa948128841a1cd3c5fd4c30da3841629b17d3c7/recipes/stripe-buffer";
-          sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer";
+          sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b";
           name = "stripe-buffer";
         };
         packageRequires = [ cl-lib ];
@@ -65444,8 +65677,8 @@
           sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/63af0555576b0430f46d7383d7ea56e1789f43e9/recipes/stylefmt";
-          sha256 = "17jj8n8x4ib51a6jdsywcssi6cvxmql9sk7f5clmbi94qxlh48lr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stylefmt";
+          sha256 = "14ap3xklmxyqz61p7z3fwgxbwjqrcbijcmvsmhfbm102x1spgbhz";
           name = "stylefmt";
         };
         packageRequires = [];
@@ -65588,8 +65821,8 @@
           sha256 = "191yqzkvvfnx8hx19ak20dvm9qjcm5r5yqcmnzw6nsc53m2pdwbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+";
-          sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+";
+          sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1";
           name = "subr-plus";
         };
         packageRequires = [];
@@ -65609,8 +65842,8 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb904557529c5d9658039a10456812810541bfed/recipes/subshell-proc";
-          sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
+          sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
           name = "subshell-proc";
         };
         packageRequires = [];
@@ -65710,8 +65943,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "d23e9e86c413561177f7f0704056627ee3c0eb15";
-          sha256 = "0p02sjrhlcjbprw4s2gy8rccgm0k9ds4haj6hmg48gsbahxiz59v";
+          rev = "2f8e52d9d34535899292799778fc1242342b64d9";
+          sha256 = "18vpr0k3pd4cvmxaxhvl8abz78fpni8vk3mws89grjbb3fc4b17i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -66082,8 +66315,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
-          sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
+          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
+          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66170,8 +66403,8 @@
           sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a0a1f6e4ce4b06d4282f1cbb33d45f507a12c30/recipes/swoop";
-          sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/swoop";
+          sha256 = "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs";
           name = "swoop";
         };
         packageRequires = [ async emacs ht pcre2el ];
@@ -66225,12 +66458,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170408.449";
+        version = "20170417.116";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "06c5a46ef7f105ac0281a881b5b4f914e2de314b";
-          sha256 = "1nr564zmi9wsxnpdk3i7hsrpy3dnj9gk153ki2kz3v0fdbkqwy62";
+          rev = "3fd1607725ac8163b38f9f60142af7764afbd1e1";
+          sha256 = "02pq1gnmg87brdbhzjvb0dx4mm0m28rrnf07p11d0k9hscpg6ln4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -66356,8 +66589,8 @@
           sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms";
-          sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms";
+          sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm";
           name = "synonyms";
         };
         packageRequires = [];
@@ -66795,8 +67028,8 @@
           sha256 = "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b069fa60d3bbf41168b938f71f4903e313b2c6ac/recipes/tango-plus-theme";
-          sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tango-plus-theme";
+          sha256 = "1p1b48fvmk7a8m3bnddkx2pp7kz5agac0v1ii2r6iqapdqsl22ng";
           name = "tango-plus-theme";
         };
         packageRequires = [];
@@ -66829,12 +67062,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170327.1017";
+        version = "20170412.1916";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "0b89755a5d985c27378795ec017c00b8bdd78f55";
-          sha256 = "04v6lb4mz802g72565ar8h2vx4fxfvs5y8hkiimr7r04y3b73d5p";
+          rev = "2ca07996e91636314aaf921edcba8191c03aabec";
+          sha256 = "1ljif6cpygphl5y3cra9kxq0yahv445hsi388q4zp0qgq8pqslpx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -67270,12 +67503,12 @@
     terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "terminal-here";
-        version = "20170403.547";
+        version = "20170413.521";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "terminal-here";
-          rev = "5f98902c65f0d8130e1ae11b9d1c95bff276962e";
-          sha256 = "0mmjch5jl19dv5y6057vk1wpnialz0ax8wghjmy1xx4yjd1n8rgx";
+          rev = "722213c91d1cd123649629908d7c872b28c49490";
+          sha256 = "1511ja1184231py38gi64a4xcxpsp98fh60m63j62kav9wlzbkkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -67590,8 +67823,8 @@
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/800aa22df0142a7e39b2d2c3c01321f880878655/recipes/tfs";
-          sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs";
+          sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6";
           name = "tfs";
         };
         packageRequires = [];
@@ -67632,8 +67865,8 @@
           sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper";
-          sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
+          sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
           name = "theme-looper";
         };
         packageRequires = [ cl-lib ];
@@ -67671,8 +67904,8 @@
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9734291106ca0bcf018175af8051fe9d2b1cbfa9/recipes/thesaurus";
-          sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus";
+          sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7";
           name = "thesaurus";
         };
         packageRequires = [];
@@ -67866,12 +68099,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170406.2103";
+        version = "20170412.541";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
-          sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
+          rev = "9b6599246679d7d09c97b44d3d4375d4e895f061";
+          sha256 = "0j5n9wn596ayqyzymr0p20mx8cxp5pzz6362nicr13s0rn7bz4rv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -68010,12 +68243,12 @@
     timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "timonier";
-        version = "20170328.116";
+        version = "20170411.100";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "timonier";
-          rev = "f5d42f0a234b906f72da759240b9fc2067de1e80";
-          sha256 = "1dl99zwcps8n22pf60mp47r8px98a9ihyf95j1y6dfivnzm7kjy2";
+          rev = "0a150ea87bf695b43cf1740dfd7e553e0ae7601c";
+          sha256 = "18yls8zc8d5nhx8j3l5av5xvmxmjrrmbzzab59kc6zib0isgxlcz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
@@ -68255,8 +68488,8 @@
           sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f934da448463e672de3c87b2ee514a370f67107d/recipes/todotxt";
-          sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt";
+          sha256 = "1ravnkj6y2p027yhba2lan10079xzd2q7l8gyb8n6bwq14jif127";
           name = "todotxt";
         };
         packageRequires = [];
@@ -68817,8 +69050,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-travis";
-          rev = "c8769d3db10ed4604969049e3bd276afa0a0138e";
-          sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
+          rev = "754ef07c17fed17ab03664ad11e2b0b2ef5e78ed";
+          sha256 = "1ciwf40ghlm4w9g4ynbc3d1a93gf6f3imm3m8z9kqfa7cnlsypb6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis";
@@ -69092,8 +69325,8 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5561a3284d861048251dc58182c95d16367e4744/recipes/tumblesocks";
-          sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tumblesocks";
+          sha256 = "005w7vfzi4qpm59pxhq9nhp8hlwh4m1i7zj6l4knizcwm5xrm4ab";
           name = "tumblesocks";
         };
         packageRequires = [ htmlize markdown-mode oauth ];
@@ -69197,8 +69430,8 @@
           sha256 = "0g6qqfgbg507r8lgq99zj2b5n3r9m23hpx19m36c3i55mh94dl2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfafdd43a22320c619f481e2bbe162459b48990/recipes/twilight-anti-bright-theme";
-          sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme";
+          sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k";
           name = "twilight-anti-bright-theme";
         };
         packageRequires = [];
@@ -69218,8 +69451,8 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/03c59c8fcf706fcdb34762e74ad1449540c357e2/recipes/twilight-bright-theme";
-          sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-bright-theme";
+          sha256 = "039mg147cvb0pk59q3c1bpx7562bajgrs74xymylr89hvrxivxqh";
           name = "twilight-bright-theme";
         };
         packageRequires = [];
@@ -69239,8 +69472,8 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/40e5497d05a7c83dc659cd1213dc9e8ea5d90f65/recipes/twilight-theme";
-          sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-theme";
+          sha256 = "0g9bbb6m7q8x4zcw5gfmg7ljsfdmjh0335sq53b0lva0h3ra6kzx";
           name = "twilight-theme";
         };
         packageRequires = [];
@@ -69383,8 +69616,8 @@
           sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8cf02f5c8cb29265e9c83be9c959b8a9012a369d/recipes/typo";
-          sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
+          sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h";
           name = "typo";
         };
         packageRequires = [];
@@ -69498,12 +69731,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170321.1016";
+        version = "20170413.358";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "2db6f0ab6054e9d6893d65bb239cdae5c2decf5f";
-          sha256 = "10m4bic1n8vmz1gr81cpr1cwyamyvp6iw3wdc0vwfma2fskd1pq2";
+          rev = "304f9470fc3b4fa29e0e9a030c5a10363c55a729";
+          sha256 = "0igw5p2idf5c07qzhc0m2i2mhn3yhvjy3yrk4dbw1vbzx1b1afdh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -69691,8 +69924,8 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5847a8ec892a1d00627a90a509bdde5a8a558df3/recipes/unicode-emoticons";
-          sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/unicode-emoticons";
+          sha256 = "0sp4sb2yw9msyqxgp4q5z9pzfvqwhizd1sx8w63g1vis6n2h254r";
           name = "unicode-emoticons";
         };
         packageRequires = [];
@@ -70038,8 +70271,8 @@
           sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac2d564ebebda3c7c5b5da278355dd242199427a/recipes/url-shortener";
-          sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener";
+          sha256 = "08zsirsndhr8xny2vkzznkvjs0b6490lzd915ws6crdwxp6mx5si";
           name = "url-shortener";
         };
         packageRequires = [];
@@ -70094,8 +70327,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "103b6518e66d9acb990832f02dca093a7425ca84";
-          sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
+          rev = "0139f85595a10b9e50e38f3d8d59f70cf4f3a2a2";
+          sha256 = "1zv2an1mzks51j46j2gvizjmh7k5frzw7qja9kh9lvighl2qrg2v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -70136,8 +70369,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "f64e9d2e78ed626216ad29098b23ef200ecdc770";
-          sha256 = "0g01p5qrwiah4z4hahv7a4a4nzrznqcwjnljns1zyk49n63rfrmh";
+          rev = "a9696b7ea30ffe709fb11f865570595103516e91";
+          sha256 = "0wnhfhdac3qfcrim5q4cp2i2k3ich5hkkljinsbmg14qncqxcmrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70161,8 +70394,8 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a717d05d3158658c8e57670ee630a9cc16a4aea0/recipes/uuid";
-          sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/uuid";
+          sha256 = "0d69z9686gnd1bb17wa44v1rbbgccacn4kicwf9niwwp05nccfw6";
           name = "uuid";
         };
         packageRequires = [];
@@ -70812,8 +71045,8 @@
           sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/81521d8020d55d75014302b1e5cf0d7126a34bc6/recipes/vimrc-mode";
-          sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode";
+          sha256 = "05zmr624qwsj9wqsmjlhjvjl1fc1qxz4vvbb3ljr5fbpxdjrbnpn";
           name = "vimrc-mode";
         };
         packageRequires = [];
@@ -71040,8 +71273,8 @@
           sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode";
-          sha256 = "1hd4bqgmrrznixmig5p9c3rl09r8z5d1jmmia2001i0r59wi61wb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode";
+          sha256 = "1xjyl2xh3vig2rzjqm1a4h2ridygbanmal78s4yc32hacy0lfyrx";
           name = "vmd-mode";
         };
         packageRequires = [ emacs ];
@@ -71300,12 +71533,12 @@
     wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "wand";
-        version = "20170116.223";
+        version = "20170412.1315";
         src = fetchFromGitHub {
           owner = "cmpitg";
           repo = "wand";
-          rev = "08c9511cd0f07ba65ef5a07ad93851549391333f";
-          sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3";
+          rev = "3674f2edaa6ac30c314a885b229204f978ddce14";
+          sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -71392,8 +71625,8 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/577ff702b17f93e0db383a92e9bb3221e08de31c/recipes/watch-buffer";
-          sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/watch-buffer";
+          sha256 = "05f58kg05kfl4srwwjaf7w9jml50yx6bn4x8m1npswp882dsjyh9";
           name = "watch-buffer";
         };
         packageRequires = [];
@@ -71518,8 +71751,8 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/32b7ca528c0038909cee4271eb40bd92d97bfb56/recipes/web";
-          sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web";
+          sha256 = "141idn49b7x7llz249zbg2yq8snjxpmlpchsd3n1axlrbmx6pfpz";
           name = "web";
         };
         packageRequires = [ dash s ];
@@ -71573,12 +71806,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170408.1147";
+        version = "20170410.1335";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "f6b8fe78d053a4aba180c4d8037c303f0e4ae453";
-          sha256 = "0wrb88yh26fpl8fg4w9wbvg7xmd6kpsrv3lh79f8q4xzfpl2g56h";
+          rev = "841f253e11e3c5880b357204190996c4ad98d9dc";
+          sha256 = "009s886spm45jjk7valdk3kjb4dchc60wzqlswgylbvcmx6b3mxn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -71602,8 +71835,8 @@
           sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element";
-          sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
+          sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l";
           name = "web-mode-edit-element";
         };
         packageRequires = [ emacs web-mode ];
@@ -71612,6 +71845,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    web-narrow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    melpaBuild {
+        pname = "web-narrow-mode";
+        version = "20170406.1910";
+        src = fetchFromGitHub {
+          owner = "Qquanwei";
+          repo = "web-narrow-mode";
+          rev = "73bdcb7d0701abe65dab4fc295d944885e05ae33";
+          sha256 = "1wg54vyfbacmyh8lyd5fgh88lfby17v24l98jjgxscaqgms86bch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a910da9e0566344d4b195423b5f270cb2bdcc1e5/recipes/web-narrow-mode";
+          sha256 = "09k3xp4l235wrffl7a4026wpikxhp10fh3182dlp4pa4wr2vzipi";
+          name = "web-narrow-mode";
+        };
+        packageRequires = [ web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/web-narrow-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-server";
@@ -71980,8 +72234,8 @@
           sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/621e32e54be9e1ac7936bf6f4b9d74e2dd27df6e/recipes/white-theme";
-          sha256 = "0nmxn35x6pngns1xqnsq8nm69f549c1gmvisd01in3qfvnpr0mic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/white-theme";
+          sha256 = "04l5hjhd465w9clrqc4dr8bx8hj4i9dx4nfr9hympgv101bpgy4x";
           name = "white-theme";
         };
         packageRequires = [ emacs ];
@@ -72043,8 +72297,8 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/71addc88ce814ed4f413bcd8632402ac750009a1/recipes/whole-line-or-region";
-          sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
+          sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y";
           name = "whole-line-or-region";
         };
         packageRequires = [];
@@ -72120,8 +72374,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "8e56c97e19b838a63a79e0a8f69c9c448f04b1ed";
-          sha256 = "0s7y2py0hx0nixqiqz63mj8qb3h8jfpkwrkz6nl093zrxpmby3wa";
+          rev = "77d18cf8fcd5a87139650a645d50e71db0ab5712";
+          sha256 = "0l6qr5dy6h7p5kdyyygrc4ss50sw7h6fi442dig6la8978jqsli8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -72310,8 +72564,8 @@
           sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout";
-          sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout";
+          sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639";
           name = "window-layout";
         };
         packageRequires = [];
@@ -72387,8 +72641,8 @@
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "3ccfb8dfbd5970d6b0d64142e586459f38f21d79";
-          sha256 = "0waf5imivhgzqp38rwhjqhy2y13dar7gqm52kbh71bvfwakgnkfd";
+          rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318";
+          sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -72412,8 +72666,8 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/37924b239c1e883103c0cdfd429ddb6c2d40d3d7/recipes/windsize";
-          sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize";
+          sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv";
           name = "windsize";
         };
         packageRequires = [];
@@ -72491,8 +72745,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "e85aef10521f";
-          sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
+          rev = "626eaec86a97";
+          sha256 = "13hcp52krlb0vw3wxvw9mdcm7qxr80p2rs52zkkzrc73qvzxvwn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72680,8 +72934,8 @@
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "wordnut";
-          rev = "3e0184a8a1cc118a985f1cbd0b6d5b7417987169";
-          sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
+          rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc";
+          sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -72894,8 +73148,8 @@
           sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
-          sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
+          sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3";
           name = "ws-butler";
         };
         packageRequires = [];
@@ -73117,12 +73371,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170317.2237";
+        version = "20170415.740";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "4d61f0b6d9209c17e6834aaced28cd7d8aabaad1";
-          sha256 = "1i1f30yy6hzhlpsn2836zk2cv6rbcvapwzp310l28ngr4wd6k4x7";
+          rev = "96f697741eb4dc48afa1ab45f33cb21695c4fbb5";
+          sha256 = "1dqh6dkxw3h1z72snbpn2a8fgyr9a70n3p267pjiblg7wzxvrdiz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -73335,8 +73589,8 @@
           sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd";
-          sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd";
+          sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5";
           name = "xkcd";
         };
         packageRequires = [ json ];
@@ -73411,16 +73665,16 @@
     xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlgen";
-        version = "20170116.833";
+        version = "20170411.617";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "xmlgen";
-          rev = "331dbe01037873c209fbca2aeeaf42da446f1d79";
-          sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll";
+          rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4";
+          sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen";
-          sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen";
+          sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh";
           name = "xmlgen";
         };
         packageRequires = [];
@@ -73671,8 +73925,8 @@
           sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete";
-          sha256 = "124gb5h3w4xydvx9zyvy60m038hjpz72yis1yv1vdb56lixndh9m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete";
+          sha256 = "1v1dfykkb6nwjwz2623i6x1rl53z4457l6fpa4nv4krdqq79gl5d";
           name = "xwidgete";
         };
         packageRequires = [ emacs ];
@@ -73713,8 +73967,8 @@
           sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
-          sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding";
+          sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl";
           name = "yafolding";
         };
         packageRequires = [];
@@ -73818,8 +74072,8 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bfbef31df9d75964378448ac3c0d35bd36a6a3a/recipes/yaml-tomato";
-          sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaml-tomato";
+          sha256 = "1asy4nf759lcgksah2g7jvzwwlq9lxfkiji460csk5ycsv8aa99s";
           name = "yaml-tomato";
         };
         packageRequires = [ s ];
@@ -73899,8 +74153,8 @@
           sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse";
-          sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse";
+          sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf";
           name = "yaoddmuse";
         };
         packageRequires = [];
@@ -74120,12 +74374,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170404.2353";
+        version = "20170416.312";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
-          sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
+          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
+          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -74398,6 +74652,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zig-mode";
+        version = "20170413.130";
+        src = fetchFromGitHub {
+          owner = "AndreaOrru";
+          repo = "zig-mode";
+          rev = "1d2639072736283b6112a7f7cf30da7897b27c3e";
+          sha256 = "04s529jsjjb5bann99asspb3wcip7ww2d7niylkza9z6rfcyaj2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode";
+          sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
+          name = "zig-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/zig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zlc";
@@ -74430,8 +74705,8 @@
           sha256 = "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/933bfffbfa6a5b777e7820684e4c115e7798941a/recipes/znc";
-          sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/znc";
+          sha256 = "1017dlzbpb3ww0zb370bgsdrzr4kcc72ddby9j63d95chz2jg0hb";
           name = "znc";
         };
         packageRequires = [ cl-lib ];
@@ -74493,8 +74768,8 @@
           sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan";
-          sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
+          sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94";
           name = "zone-nyan";
         };
         packageRequires = [ esxml ];
@@ -74574,8 +74849,8 @@
           sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones";
-          sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones";
+          sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2";
           name = "zones";
         };
         packageRequires = [];
@@ -74648,12 +74923,12 @@
     zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zop-to-char";
-        version = "20160212.108";
+        version = "20160212.754";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "zop-to-char";
-          rev = "883cb9dbd12a08fba4164f16d7badf7f846c3eff";
-          sha256 = "1hq5ycnj0kwqs25z5rm095d55r768458vc5h5dpjhka5n6c099p1";
+          rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d";
+          sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char";
@@ -74753,11 +75028,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170409.2251";
+        version = "20170413.2126";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "7b93cb98f370";
-          sha256 = "020rp458a3xgxxd2gb091w1xgd78rl10z9f68y81cxi2gnfv91qb";
+          rev = "08ae558834c2";
+          sha256 = "1bwjn1shnirmrqf7xcvzhnyg87jpwbcv231r28hlnyb5f2sqvr2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From c2b56626f1a872d06642777193b72d6473c8b97c Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Mon, 17 Apr 2017 14:36:42 -0800
Subject: [PATCH 1176/1744] grub module: fix efiInstallAsRemovable description

---
 nixos/modules/system/boot/loader/grub/grub.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2d6bf2d58a9..c02956bf8c8 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -383,7 +383,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether to invoke <literal>grub-install</literal> with
+          <para>Whether to invoke <literal>grub-install</literal> with
           <literal>--removable</literal>.</para>
 
           <para>Unless you turn this on, GRUB will install itself somewhere in
@@ -412,7 +412,7 @@ in
             the NVRAM state of the computer (like a USB "removable" drive)</para></listitem>
             <listitem><para>You simply dislike the idea of depending on NVRAM
             state to make your drive bootable</para></listitem>
-          </itemizedlist>
+          </itemizedlist></para>
         '';
       };
 

From d6b42b4008b64eac3a99c4ed5a6c2b197fc1abdc Mon Sep 17 00:00:00 2001
From: Maksim Bronsky <maks.bronsky@web.de>
Date: Tue, 11 Apr 2017 15:06:30 +0200
Subject: [PATCH 1177/1744] perl: 5.22.2 -> 5.22.3

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f013f6ec372..6ff6dc20eb5 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -130,8 +130,8 @@ in rec {
   };
 
   perl522 = common {
-    version = "5.22.2";
-    sha256 = "1hl3v85ggm027v9h2ycas4z5i3401s2k2l3qpnw8q5mahmiikbc1";
+    version = "5.22.3";
+    sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
   };
 
 }

From f78c0329340172aa0819d7a2fdc36b0a8fbb6d2a Mon Sep 17 00:00:00 2001
From: Maksim Bronsky <maks.bronsky@web.de>
Date: Tue, 11 Apr 2017 15:58:09 +0200
Subject: [PATCH 1178/1744] perl: init 5.24.1 and set as default perl

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 6ff6dc20eb5..bbe59f99eef 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -121,17 +121,16 @@ let
 
 in rec {
 
-  perl = perl522;
-
-  perl520 = common {
-    version = "5.20.3";
-    sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m";
-
-  };
+  perl = perl524;
 
   perl522 = common {
     version = "5.22.3";
     sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
   };
 
+  perl524 = common {
+    version = "5.24.1";
+    sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
+  };
+
 }

From 6b7c5ba5353e2a81255879173de758fc5f08be62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Feb 2017 11:05:55 +0100
Subject: [PATCH 1179/1744] display-manager: fix argument handling of sddm

previously session type was not correctly set.

fixes #23264
---
 .../modules/services/x11/display-managers/default.nix  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 4e2c0e01ca0..543fd939914 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -32,8 +32,14 @@ let
     ''
       #! ${pkgs.bash}/bin/bash
 
-      # Handle being called by SDDM.
-      if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
+      # SDDM splits "Exec" line in .desktop file by whitespace and pass script path as $1
+      if [[ "$0" = "$1" ]]; then
+        # remove superfluous $1 again
+        shift
+        # join arguments again and evaluate them in a shell context
+        # to interpret shell quoting
+        eval exec "$0" "$@"
+      fi
 
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then

From 9169f3c92471702b48a9553f7438a1b3018339de Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 17 Apr 2017 20:22:37 -0400
Subject: [PATCH 1180/1744] release-cross: Fix typo preventing evaluation

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 67f3d55fa16..a7adb3ffedc 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -50,7 +50,7 @@ in
     in assertTrue (
         f path { inherit system; }
         ==
-        f (["buildPackages"] ++ path) { inherit system crossSystem; };
+        f (["buildPackages"] ++ path) { inherit system crossSystem; }
       );
 
     testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);

From 5c91dc9bcf654fc7f476cf3d56bd257b4fd13668 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 17 Apr 2017 21:02:56 -0400
Subject: [PATCH 1181/1744] release-cross: Fix more typos---this is embarrising

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index a7adb3ffedc..82428972699 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -77,7 +77,7 @@ in
       arch = "arm";
       float = "soft";
       withTLS = true;
-      platform = pkgs.platforms.sheevaplug;
+      platform = lib.systems.platforms.sheevaplug;
       libc = "glibc";
       openssl.system = "linux-generic32";
     };
@@ -136,7 +136,7 @@ in
       float = "hard";
       withTLS = true;
       libc = "glibc";
-      platform = lib.platforms.fuloong2f_n32;
+      platform = lib.systems.platforms.fuloong2f_n32;
       openssl.system = "linux-generic32";
       gcc = {
         arch = "loongson2f";
@@ -160,7 +160,7 @@ in
       fpu = "vfp";
       withTLS = true;
       libc = "glibc";
-      platform = lib.platforms.raspberrypi;
+      platform = lib.systems.platforms.raspberrypi;
       openssl.system = "linux-generic32";
       gcc = {
         arch = "armv6";

From 8d491ec6c69b8649a7f4824f304e5e29ebdf6e00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:05:00 +0200
Subject: [PATCH 1182/1744] Python docs: Python 2.x namespace packages may
 collide when using .withPackages

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

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index da7706726b4..b127ba2faae 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -628,6 +628,9 @@ with import <nixpkgs> {};
 In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
 such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.
 
+Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` 
+should be used with `ignoreCollisions = true`.
+
 ### Development mode
 
 Development or editable mode is supported. To develop Python packages

From 7b20341727f24d017a9fffeb0c8ded54689f46b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sun, 16 Apr 2017 17:12:53 +0200
Subject: [PATCH 1183/1744] git-recent: init at 1.0.3

---
 .../git-and-tools/default.nix                 |  4 ++
 .../git-and-tools/git-recent/default.nix      | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-recent/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 6e0338da919..081bfd5918b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -74,6 +74,10 @@ rec {
 
   git-radar = callPackage ./git-radar { };
 
+  git-recent = callPackage ./git-recent {
+    utillinux = if stdenv.isLinux then utillinuxMinimal else null;
+  };
+
   git-remote-hg = callPackage ./git-remote-hg { };
 
   git-stree = callPackage ./git-stree { };
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
new file mode 100644
index 00000000000..ae1139e9993
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -0,0 +1,41 @@
+{stdenv, git, less, fetchFromGitHub, makeWrapper
+# utillinuxMinimal is included because we need the column command
+, utillinux ? null
+}:
+
+assert stdenv.isLinux -> utillinux != null;
+
+let
+  binpath = stdenv.lib.makeBinPath
+    ([ git less ]
+    ++ stdenv.lib.optional (utillinux != null) utillinux);
+in stdenv.mkDerivation rec {
+  name = "git-recent-${version}";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "paulirish";
+    repo = "git-recent";
+    rev = "v${version}";
+    sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp git-recent $out/bin
+    wrapProgram $out/bin/git-recent \
+      --prefix PATH : "${binpath}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/paulirish/git-recent;
+    description = "See your latest local git branches, formatted real fancy";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.jlesquembre ];
+  };
+}

From 8cc5530a73339a6b5044243895f9886da512154d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 11:21:04 +0200
Subject: [PATCH 1184/1744] pythonPackages.qtconsole: use pyqt5 backend

instead of pyqt4 which required building qt4.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3e0b3feaa9..5bde08d5c12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22339,7 +22339,7 @@ in {
     };
 
     buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
+    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
 
     # : cannot connect to X server
     doCheck = false;

From f225ffa397adb63626b198b4321a0ca52057e11d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Apr 2017 11:40:20 +0200
Subject: [PATCH 1185/1744] pythonPackages.magic: fix package, closes #16361

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5bde08d5c12..cf8cdfd4f15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14209,17 +14209,19 @@ in {
     src = pkgs.file.src;
 
     patchPhase = ''
-      substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.so'"
+      substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'"
     '';
 
-    buildInputs = with self; [ python pkgs.file ];
+    buildInputs = with self; [ pkgs.file ];
 
     preConfigure = "cd python";
 
+    # No test suite
+    doCheck = false;
+
     meta = {
       description = "A Python wrapper around libmagic";
       homepage = http://www.darwinsys.com/file/;
-      broken = true;
     };
   };
 

From a697985e37b8a8d7c0c1db2f59b0e744ec9c0941 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:15:53 +0200
Subject: [PATCH 1186/1744] pythonPackages.pytest: 3.0.6 -> 3.0.7

---
 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 d3fea5a3b43..90b67022c5b 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
 buildPythonPackage rec {
   name = "pytest-${version}";
-  version = "3.0.6";
+  version = "3.0.7";
 
   preCheck = ''
     # don't test bash builtins
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34";
+    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
   };
 
   buildInputs = [ hypothesis ];

From a9cbac6322e0b7c0795dc9633b861ee68761ebe8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:16:05 +0200
Subject: [PATCH 1187/1744] pythonPackages.hypothesis: 3.6.1 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index 271251b830e..d5251f1fa55 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -10,14 +10,14 @@ buildPythonPackage rec {
   # If you need these, you can just add them to your environment.
 
   name = "hypothesis-${version}";
-  version = "3.6.1";
+  version = "3.7.0";
 
   # Upstream prefers github tarballs
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "${version}";
-    sha256 = "1zwr9g4h4jizbvm2d7fywdpcxmw8i1m85h8g72kizah07gk12aq1";
+    sha256 = "1zsv1ggf3g9rrigxl3zd1z8qc6fcj8lmszm8ib1ya4ar6r64x0yz";
   };
 
   buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];

From 7fa72a7602a498ffe01a8af28e2fa38cfb4c99ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:44:33 +0200
Subject: [PATCH 1188/1744] pythonPackages.pandas: minor fixes tests

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 21a7755c409..212a382a4b0 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -56,7 +56,7 @@ in buildPythonPackage rec {
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  patchPhase = optionalString isDarwin ''
+  postPatch = optionalString isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -71,12 +71,11 @@ in buildPythonPackage rec {
 
   # The flag `-A 'not network'` will disable tests that use internet.
   # The `-e` flag disables a few problematic tests.
-
   checkPhase = ''
     runHook preCheck
     # The flag `-w` provides the initial directory to search for tests.
     # The flag `-A 'not network'` will disable tests that use internet.
-    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' --stop \
+    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' \
       --verbosity=3
      runHook postCheck
   '';

From ad95a04fa5037920aea2bb987557a36d4d1236fb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 18 Apr 2017 06:42:01 -0300
Subject: [PATCH 1189/1744] mate-icon-theme: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index e41a1c21710..ce0366b3669 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i";
+    sha256 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

From 245cf6fa0e65adceef42ecc7af848837113616c3 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 18 Apr 2017 06:43:13 -0300
Subject: [PATCH 1190/1744] mate-themes: 3.22.7 -> 3.22.10

---
 pkgs/desktops/mate/mate-themes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index cf78009708b..0a8b37b4e01 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,15 +6,15 @@ stdenv.mkDerivation rec {
   version = "${major-ver}.${minor-ver}";
   major-ver = gnome3.version;
   minor-ver = {
-    "3.20" = "16";
-    "3.22" = "7";
+    "3.20" = "19";
+    "3.22" = "10";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v";
-      "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0";
+      "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g";
+      "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb";
     }."${major-ver}";
   };
 

From 71af44cae96ce370414e8c14e6079412609ebe53 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 18 Apr 2017 06:49:25 -0300
Subject: [PATCH 1191/1744] elementary-icon-theme: 4.0.1.1 -> 4.0.3

---
 pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 008a4112531..76460bd7acf 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.1.1";
+  version = "4.0.3";
 
   package-name = "elementary-icon-theme";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
-    sha256 = "1p20569lxgkif4gzvgpisd8vg93zxd6447y634lv7ay85nq4lx76";
+    sha256 = "0i3cp0wiy4g6d6symyfv3hvmw97109lfakd4qyphabbqllc9xlxb";
   };
 
   dontBuild = true;

From a7f6911b373b2ff231b57997f32ce8a28a20115d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:15:13 +0200
Subject: [PATCH 1192/1744] pythonPackages.dask: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf8cdfd4f15..bbe8cfd8721 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5637,12 +5637,13 @@ in {
   });
 
   dask = buildPythonPackage rec {
-    name = "dask-${version}";
-    version = "0.13.0";
+    pname = "dask";
+    name = "${pname}-${version}";
+    version = "0.14.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dask/${name}.tar.gz";
-      sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e";
     };
 
     buildInputs = with self; [ pytest ];

From 5cc79b96243a3d6443e0a2ce48528c7fc616c325 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:15:31 +0200
Subject: [PATCH 1193/1744] pythonPackages.idna: 2.0 -> 2.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bbe8cfd8721..e9975dfcab1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4788,11 +4788,13 @@ in {
 
 
   idna = buildPythonPackage rec {
-    name = "idna-2.0";
+    pname = "idna";
+    version = "2.5";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/idna/${name}.tar.gz";
-      sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab";
     };
 
     meta = {

From 632a62a8c0089604e4fb6f676025792631c68918 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:15:50 +0200
Subject: [PATCH 1194/1744] pythonPackages.asn1crypto: init at 0.22.0

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

diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix
new file mode 100644
index 00000000000..a34879e5596
--- /dev/null
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "asn1crypto";
+  version = "0.22.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a";
+  };
+
+  # No tests included
+  doCheck = false;
+
+  meta = {
+    description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP";
+    license = lib.licenses.mit;
+    homepage = https://github.com/wbond/asn1crypto;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9975dfcab1..8df7f0b9e26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -175,6 +175,8 @@ in {
     };
   };
 
+  asn1crypto = callPackage ../development/python-modules/asn1crypto { };
+
   # packages defined elsewhere
 
   bap = callPackage ../development/python-modules/bap {

From 8227e665f8c32c97f73fd7037cc3fcdac528acd7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:16:20 +0200
Subject: [PATCH 1195/1744] pythonPackages.packaging: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8df7f0b9e26..d7ef17bf431 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32006,6 +32006,10 @@ EOF
       license = [ licenses.bsd2 licenses.asl20 ];
       maintainers = with maintainers; [ bennofs ];
     };
+
+    checkPhase = ''
+      py.test
+    '';
   };
 
   pypandoc = buildPythonPackage rec {

From 51b082093542eec3d15e6fcc87a216aa00339b70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:16:46 +0200
Subject: [PATCH 1196/1744] pythonPackages.cryptography_vectors: 1.7.2 -> 1.8.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7ef17bf431..c7bc1115bd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4573,13 +4573,17 @@ in {
 
   cryptography_vectors = buildPythonPackage rec {
       # also bump cryptography
-    name = "cryptography_vectors-${version}";
-    version = "1.7.2";
+    pname = "cryptography_vectors";
+    name = "${pname}${version}";
+    version = "1.8.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
-      sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6";
     };
+
+    # No tests included
+    doCheck = false;
   };
 
   oslo-vmware = buildPythonPackage rec {

From 36b8746594e498700355b1f4f9e0ac2dc001efc2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:17:40 +0200
Subject: [PATCH 1197/1744] pythonPackages.cryptography: 1.7.2 -> 1.8.1

---
 pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7bc1115bd2..6e7207e3a49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4544,25 +4544,39 @@ in {
 
   cryptography = buildPythonPackage rec {
     # also bump cryptography_vectors
-    name = "cryptography-${version}";
-    version = "1.7.2";
+    pname = "cryptography";
+    name = "${pname}${version}";
+    version = "1.8.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/cryptography/${name}.tar.gz";
-      sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190";
     };
 
-    buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
-                    self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ]
+    buildInputs = [ pkgs.openssl self.cryptography_vectors ]
                ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
-    propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ]
-     ++ optional (pythonOlder "3.4") self.enum34;
+    propagatedBuildInputs = with self; [
+      idna
+      asn1crypto
+      packaging
+      six
+    ] ++ optional (pythonOlder "3.4") enum34
+    ++ optional (pythonOlder "3.3") ipaddress
+    ++ optional (!isPyPy) cffi;
+
+    checkInputs = with self; [
+      pytest
+      pretend
+      iso8601
+      pytz
+      hypothesis
+    ];
 
     # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
     # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
     # use it. This boils down to them checking compatibility with `getentropy` in two different places,
     # so let's neuter the second test.
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
     '';
 

From 8806414310b774fe8c02c93ea302fed62c3a38c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:33:59 +0200
Subject: [PATCH 1198/1744] pythonPackages.ipyparallel: 6.0.0 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
new file mode 100644
index 00000000000..3e8ea048920
--- /dev/null
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, dateutil
+, ipython_genutils
+, decorator
+, pyzmq
+, ipython
+, jupyter_client
+, ipykernel
+, tornado
+, isPy3k
+, futures
+}:
+
+buildPythonPackage rec {
+  pname = "ipyparallel";
+  version = "6.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d";
+  };
+
+  buildInputs = [ nose ];
+
+  propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+  ] ++ lib.optionals (!isPy3k) [ futures ];
+
+  # Requires access to cluster
+  doCheck = false;
+
+  meta = {
+    description = "Interactive Parallel Computing with IPython";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e7207e3a49..7274913a817 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13110,31 +13110,7 @@ in {
     };
   };
 
-  ipyparallel = buildPythonPackage rec {
-    version = "6.0.0";
-    name = "ipyparallel-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipyparallel/${name}.tar.gz";
-      sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
-    ] ++ optionals (!isPy3k) [ futures ];
-
-    # Requires access to cluster
-    doCheck = false;
-
-    meta = {
-      description = "Interactive Parallel Computing with IPython";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-  };
+  ipyparallel = callPackage ../development/python-modules/ipyparallel { };
 
   ipython = buildPythonPackage rec {
     version = "5.3.0";

From 9a106b1c528b3400be0c9c3fe00bf8ff9d053c82 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:36:37 +0200
Subject: [PATCH 1199/1744] pythonPackages.ipykernel: 4.5.2 -> 4.6.1

---
 .../python-modules/ipykernel/default.nix      | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +------------
 2 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/ipykernel/default.nix

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
new file mode 100644
index 00000000000..a77f6ac9c2f
--- /dev/null
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, isPy27
+, mock
+, ipython
+, jupyter_client
+, pexpect
+, traitlets
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "ipykernel";
+  version = "4.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db";
+  };
+
+  buildInputs = [ nose ] ++ lib.optional isPy27 mock;
+  propagatedBuildInputs = [
+    ipython
+    jupyter_client
+    pexpect
+    traitlets
+    tornado
+  ];
+
+  # Tests require backends.
+  # I don't want to add all supported backends as propagatedBuildInputs
+  doCheck = false;
+
+  meta = {
+    description = "IPython Kernel for Jupyter";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7274913a817..d208c1e2a2b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13080,35 +13080,7 @@ in {
     };
   };
 
-  ipykernel = buildPythonPackage rec {
-    version = "4.5.2";
-    name = "ipykernel-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipykernel/${name}.tar.gz";
-      sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462";
-    };
-
-    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [
-      ipython
-      jupyter_client
-      pexpect
-      traitlets
-      tornado
-    ];
-
-    # Tests require backends.
-    # I don't want to add all supported backends as propagatedBuildInputs
-    doCheck = false;
-
-    meta = {
-      description = "IPython Kernel for Jupyter";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  ipykernel = callPackage ../development/python-modules/ipykernel { };
 
   ipyparallel = callPackage ../development/python-modules/ipyparallel { };
 

From 2c00cd3bae13487a88cff3f68ac12835d8552193 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:43:30 +0200
Subject: [PATCH 1200/1744] pythonPackages.ipywidgets: 5.2.2 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
new file mode 100644
index 00000000000..dcd5b89b6b8
--- /dev/null
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, nose
+, pytest
+, mock
+, ipython
+, ipykernel
+, traitlets
+, notebook
+, widgetsnbextension
+}:
+
+buildPythonPackage rec {
+  pname = "ipywidgets";
+  version = "6.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+  };
+
+  # Tests are not distributed
+  # doCheck = false;
+
+  buildInputs = [ nose pytest mock ];
+  propagatedBuildInputs = [
+    ipython
+    ipykernel
+    traitlets
+    notebook
+    widgetsnbextension
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = {
+    description = "IPython HTML widgets for Jupyter";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d208c1e2a2b..bfbb64a2bf7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13144,28 +13144,7 @@ in {
   };
 
 
-  ipywidgets = buildPythonPackage rec {
-    version = "5.2.2";
-    name = "ipywidgets-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipywidgets/${name}.tar.gz";
-      sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2";
-    };
-
-    # Tests are not distributed
-    doCheck = false;
-
-    buildInputs = with self; [ nose pytest ];
-    propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ];
-
-    meta = {
-      description = "IPython HTML widgets for Jupyter";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
   ipaddr = buildPythonPackage rec {
     name = "ipaddr-2.1.10";

From 0cd978c615913ec4ac7c32a6067befb435fce309 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 10:53:02 +0200
Subject: [PATCH 1201/1744] pythonPackages.jupyter_client: 5.0.0 -> 5.0.1

---
 .../python-modules/jupyter_client/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +------------
 2 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/jupyter_client/default.nix

diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix
new file mode 100644
index 00000000000..a45a4a84a3a
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, traitlets
+, jupyter_core
+, pyzmq
+, dateutil
+, isPyPy
+, py
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter_client";
+  version = "5.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fe573880b5ca4469ed0bece098f4b910c373d349e12525e1ea3566f5a14536b";
+  };
+
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py;
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Circular dependency with ipykernel
+  doCheck = false;
+
+  meta = {
+    description = "Jupyter protocol implementation and client libraries";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfbb64a2bf7..035f22b7696 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13437,32 +13437,7 @@ in {
     inherit (pkgs.jsonnet) name src;
   };
 
-  jupyter_client = buildPythonPackage rec {
-    version = "5.0.0";
-    name = "jupyter_client-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
-      sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py;
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Circular dependency with ipykernel
-    doCheck = false;
-
-    meta = {
-      description = "Jupyter protocol implementation and client libraries";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  jupyter_client = callPackage ../development/python-modules/jupyter_client { };
 
   jupyter_core = buildPythonPackage rec {
     version = "4.3.0";

From d9ac6d4d5ebc57a083a5303f6b0a47f1179730db Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 11:50:18 +0200
Subject: [PATCH 1202/1744] pythonPackages.line_profiler: 1.0 -> 2.0

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

diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix
new file mode 100644
index 00000000000..e6d6f1e1d7e
--- /dev/null
+++ b/pkgs/development/python-modules/line_profiler/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cython
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "line_profiler";
+  version = "2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381";
+  };
+
+  buildInputs = [ cython ];
+
+  disabled = isPyPy;
+
+  meta = {
+    description = "Line-by-line profiler";
+    homepage = https://github.com/rkern/line_profiler;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 035f22b7696..681710d8588 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13853,26 +13853,7 @@ in {
     };
   };
 
-  line_profiler = buildPythonPackage rec{
-    version = "1.0";
-    name = "line_profiler-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/line_profiler/${name}.tar.gz";
-      sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900";
-    };
-
-    buildInputs = with self; [ cython ];
-
-    disabled = isPyPy;
-
-    meta = {
-      description = "Line-by-line profiler";
-      homepage = https://github.com/rkern/line_profiler;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  line_profiler = callPackage ../development/python-modules/line_profiler { };
 
   linode = buildPythonPackage rec {
     name = "linode-${version}";

From 1c0b74c50ae93fe0438cb30fd449bf94acfdd6bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 11:50:55 +0200
Subject: [PATCH 1203/1744] pythonPackages.xarray: 0.9.1 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
new file mode 100644
index 00000000000..fe0497bc0e8
--- /dev/null
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, numpy
+, pandas
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "xarray";
+  version = "0.9.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d23bfcc317829570daa1fe8306ad7ff62cd77847bbd68e3ffc53d847bff7c36d";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [numpy pandas];
+
+  checkPhase = ''
+    py.test $out/${python.sitePackages}
+  '';
+
+  meta = {
+    description = "N-D labeled arrays and datasets in Python";
+    homepage = https://github.com/pydata/xarray;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 681710d8588..38cab5cc0a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27250,29 +27250,7 @@ EOF
     };
   });
 
-  xarray = buildPythonPackage rec {
-    name = "xarray-${version}";
-    version = "0.9.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xarray/${name}.tar.gz";
-      sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [numpy pandas];
-
-    checkPhase = ''
-      py.test $out/${python.sitePackages}
-    '';
-
-    meta = {
-      description = "N-D labeled arrays and datasets in Python";
-      homepage = https://github.com/pydata/xarray;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  xarray = callPackage ../development/python-modules/xarray { };
 
   xlwt = callPackage ../development/python-modules/xlwt { };
 

From 92ef3413aca8e8155c8304db8c4c6dc1df826c14 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 11:54:43 +0200
Subject: [PATCH 1204/1744] pythonPackages.notebook: 4.4.1 -> 5.0.0

---
 .../python-modules/notebook/default.nix       | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +----------
 2 files changed, 53 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/notebook/default.nix

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
new file mode 100644
index 00000000000..0fa94854640
--- /dev/null
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, glibcLocales
+, isPy27
+, mock
+, jinja2
+, tornado
+, ipython_genutils
+, traitlets
+, jupyter_core
+, jupyter_client
+, nbformat
+, nbconvert
+, ipykernel
+, terminado
+, requests2
+, pexpect
+}:
+
+buildPythonPackage rec {
+  pname = "notebook";
+  version = "5.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  buildInputs = [nose glibcLocales]  ++ lib.optionals isPy27 [mock];
+
+  propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core
+    jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Certain tests fail due to being in a chroot.
+  # PermissionError
+  doCheck = false;
+  meta = {
+    description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38cab5cc0a2..acf5870eaf4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16007,35 +16007,7 @@ in {
     buildInputs = with self; [ nose ];
   };
 
-  notebook = buildPythonPackage rec {
-    version = "4.4.1";
-    name = "notebook-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    buildInputs = with self; [nose pkgs.glibcLocales]  ++ optionals isPy27 [mock];
-
-    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Certain tests fail due to being in a chroot.
-    # PermissionError
-    doCheck = false;
-    meta = {
-      description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  notebook = callPackage ../development/python-modules/notebook { };
 
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";

From b1952ff747a8c5dfe29908847a54f5d50fc80ef7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 11:57:10 +0200
Subject: [PATCH 1205/1744] pythonPackages.qtconsole: 4.2.1 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
new file mode 100644
index 00000000000..b09458de568
--- /dev/null
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, isPy27
+, mock
+, traitlets
+, jupyter_core
+, jupyter_client
+, pygments
+, ipykernel
+, pyqt5
+}:
+
+buildPythonPackage rec {
+  pname = "qtconsole";
+  version = "4.3.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+  };
+
+  buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
+  propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
+
+  # : cannot connect to X server
+  doCheck = false;
+
+  meta = {
+    description = "Jupyter Qt console";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acf5870eaf4..7e11ff182a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22209,28 +22209,7 @@ in {
     };
   };
 
-  qtconsole = buildPythonPackage rec {
-    version = "4.2.1";
-    name = "qtconsole-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/q/qtconsole/${name}.tar.gz";
-      sha256 = "1vqqx9hdvrg2d336wjyw0vr5b5v97kflkqqvr7ryicr8als7vv15";
-    };
-
-    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
-
-    # : cannot connect to X server
-    doCheck = false;
-
-    meta = {
-      description = "Jupyter Qt console";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  qtconsole = callPackage ../development/python-modules/qtconsole { };
 
   quantities = buildPythonPackage rec {
     name = "quantities-0.10.1";

From c339d6b122f2912febf172a1519420f1d3427ab4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 12:00:36 +0200
Subject: [PATCH 1206/1744] pythonPackages.widgetsnbextension: 1.2.6 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
new file mode 100644
index 00000000000..dda58c65f60
--- /dev/null
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, notebook
+, ipywidgets
+}:
+
+buildPythonPackage rec {
+  pname = "widgetsnbextension";
+  name = "${pname}-${version}";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f";
+  };
+
+  propagatedBuildInputs = [ notebook ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "IPython HTML widgets for Jupyter";
+    homepage = http://ipython.org/;
+    license = ipywidgets.meta.license; # Build from same repo
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e11ff182a7..01e561ee38d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27039,27 +27039,7 @@ EOF
     };
   };
 
-  widgetsnbextension = buildPythonPackage rec {
-    name = "widgetsnbextension-${version}";
-    version = "1.2.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz";
-      sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51";
-    };
-
-    propagatedBuildInputs = with self; [ notebook ];
-
-    # No tests in archive
-    doCheck = false;
-
-    meta = {
-      description = "IPython HTML widgets for Jupyter";
-      homepage = http://ipython.org/;
-      license = self.ipywidgets.meta.license; # Build from same repo
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
 
   willie = buildPythonPackage rec {
     name = "willie-${version}";

From 9435c9d6fc2ac1b1c933ac5a7c0ab71c29048154 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 12:03:00 +0200
Subject: [PATCH 1207/1744] pythonPackages.statsmodels: 0.6.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
new file mode 100644
index 00000000000..bdadac896ef
--- /dev/null
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+, scipy
+, pandas
+, patsy
+, cython
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "statsmodels";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048";
+  };
+
+  buildInputs = with self; [ nose ];
+  propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
+
+  meta = {
+    description = "Statistical computations and models for use with SciPy";
+    homepage = "https://www.github.com/statsmodels/statsmodels";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01e561ee38d..955af6aaad4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24986,29 +24986,7 @@ in {
     };
   };
 
-  statsmodels = buildPythonPackage rec {
-    name = "statsmodels-${version}";
-    version = "0.6.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/statsmodels/${name}.tar.gz";
-      sha256 = "be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
-
-    meta = {
-      description = "Statistical computations and models for use with SciPy";
-      homepage = "https://www.github.com/statsmodels/statsmodels";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-    # Many tests fail when using latest numpy and pandas.
-    # See also https://github.com/statsmodels/statsmodels/issues/2602
-    doCheck = false;
-  };
+  statsmodels = callPackage ../development/python-modules/statsmodels { };
 
   python_statsd = buildPythonPackage rec {
     name = "python-statsd-${version}";

From 7459dbb0991bb63a0c18a148d4f803d68118ff56 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 11:08:43 +0100
Subject: [PATCH 1208/1744] pythonPackages.multipledispatch: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 955af6aaad4..a849d5f56bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15062,6 +15062,9 @@ in {
       sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
     };
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       homepage = http://github.com/mrocklin/multipledispatch/;
       description = "A relatively sane approach to multiple dispatch in Python";

From 8d6fc33bbcee92913f8d4e317e2098c83fa0b3ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 11:07:00 +0100
Subject: [PATCH 1209/1744] pythonPackages.pretend: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a849d5f56bd..13bc351e8dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4950,6 +4950,9 @@ in {
       sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk";
     };
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/alex/pretend;
       license = licenses.bsd3;

From d4b72281e6c3abb818642f3b04f77180b7b1f851 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 11:06:45 +0100
Subject: [PATCH 1210/1744] pythonPackages.Nuitka: 0.5.21.3 -> 0.5.25

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13bc351e8dd..d3bccd10b38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16167,13 +16167,13 @@ in {
     # Therefore we create a separate env for it.
     scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
   in buildPythonPackage rec {
-    version = "0.5.21.3";
+    version = "0.5.25";
     name = "Nuitka-${version}";
 
     # Latest version is not yet on PyPi
     src = pkgs.fetchurl {
       url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
-      sha256 = "1i2069hxb94q9kkwcbky59fin8hk1vlj90lwgmrdhn1srvig1cq3";
+      sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa";
     };
 
     buildInputs = with self; stdenv.lib.optionals doCheck [ vmprof pyqt4 ];

From fdc36aaf6675cf4157dc0582eba356c235461f5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 11:06:28 +0100
Subject: [PATCH 1211/1744] pythonPackages.bottleneck: fix build

New setuptools seems to have broken bottleneck.
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3bccd10b38..6d8d7d8b758 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18092,6 +18092,9 @@ in {
     checkPhase = ''
       nosetests -v $out/${python.sitePackages}
     '';
+    postPatch = ''
+      substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
+    '';
   };
 
   paho-mqtt = buildPythonPackage rec {

From 7b542f6a7295a3b1ff2c2658a8c57ca85b2b98d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 11:05:46 +0100
Subject: [PATCH 1212/1744] pythonPackages.dill: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d8d7d8b758..37eeec02141 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6315,16 +6315,14 @@ in {
 
   dill = buildPythonPackage rec {
     name = "dill-${version}";
-    version = "0.2.5";
+    version = "0.2.6";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dill/${name}.tgz";
-      sha256 = "431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319";
+      url = "mirror://pypi/d/dill/${name}.zip";
+      sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd";
     };
 
-    propagatedBuildInputs = with self; [objgraph];
-
-    # failing tests
+    # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0}
     doCheck = false;
 
     meta = {

From fd87b9957c0ad25358e620c1b9e29ac842596e2c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 17 Mar 2017 11:21:04 +0100
Subject: [PATCH 1213/1744] pythonPackages.numba: 0.30.1 -> 0.31.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 422fee39641..3ce40f2618a 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.30.1";
+  version = "0.31.0";
   name = "numba-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd";
+    sha256 = "69f8ecacca687e89625abbc9f9ff2b64b3cc8649c284a3bc92f2df6dc82a7c80";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 5ad8e8722a6349797d516a6dc35820675ce9fa29 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 17 Mar 2017 11:20:54 +0100
Subject: [PATCH 1214/1744] pythonPackages.llvmlite: 0.15.0 -> 0.16.0

---
 pkgs/development/python-modules/llvmlite/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 1da50341750..6b6be639851 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.15.0";
+  version = "0.16.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4";
+    sha256 = "ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37eeec02141..2294ea8b62a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13966,7 +13966,7 @@ in {
     };
   };
 
-  llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;};
+  llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_39;};
 
   lockfile = buildPythonPackage rec {
     pname = "lockfile";

From ec115d47b8103e5f9fe2568dd32ed29408a3ad6d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 17 Mar 2017 09:54:12 +0100
Subject: [PATCH 1215/1744] pythonPackages.pycryptodome: remove namePrefix
 argument

---
 pkgs/development/python-modules/pycryptodome/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 04964ab03dd..d465c0befe1 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "3.4.3";
   name = "pycryptodome-${version}";
-  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";

From c275158f0617f006286bb6bb3aa941c27990e503 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 13:14:00 +0200
Subject: [PATCH 1216/1744] python36: 3.6.0 -> 3.6.1

---
 .../interpreters/python/cpython/3.6/default.nix      | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 2acca2b8a3c..78e57fef15f 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.6";
-  minorVersion = "0";
+  minorVersion = "1";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh";
+    sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
@@ -63,14 +63,6 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "glibc-2.25-failed-to-get-random-numbers.patch";
-      url = https://github.com/python/cpython/commit/ff558f5aba4.patch;
-      sha256 = "1k12gpn69np94cm942vaf40sv7gsxqf20rv1m3parzgi1gs4hqa3";
-    })
-  ];
-
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"

From 1173fe0b49a7bd1a9777a53edffcf208e8de8934 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Apr 2017 08:15:48 -0400
Subject: [PATCH 1217/1744] linux: 4.9.22 -> 4.9.23

---
 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 ff022201c8b..3bcee15a774 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.22";
+  version = "4.9.23";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv";
+    sha256 = "1i8n70d0nfxin88mhg404pvll8yvm8v6766j2sdzw7sk5waiq4hs";
   };
 
   kernelPatches = args.kernelPatches;

From dd662792b15e2e24dfb73b87975fe8517de2fe82 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 13:06:06 +0100
Subject: [PATCH 1218/1744] kdeApplications.kolourpaint: init at 16.12.3

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/kolourpaint.nix | 28 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  3 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kolourpaint.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 794ddd522d9..827cb34e22e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -75,6 +75,7 @@ let
       kio-extras = callPackage ./kio-extras.nix {};
       kmime = callPackage ./kmime.nix {};
       kmix = callPackage ./kmix.nix {};
+      kolourpaint = callPackage ./kolourpaint.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
       krfb = callPackage ./krfb.nix {};
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
new file mode 100644
index 00000000000..75d5b6fca65
--- /dev/null
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -0,0 +1,28 @@
+{ lib
+, kdeApp
+, kdeWrapper
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, libkexiv2
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "kolourpaint";
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+      propagatedBuildInputs = [
+        kdelibs4support
+        libkexiv2
+      ];
+
+      meta = {
+        maintainers = [ lib.maintainers.fridh ];
+        license = with lib.licenses; [ gpl2 ];
+      };
+    };
+in kdeWrapper {
+  inherit unwrapped;
+  targets = ["bin/kolourpaint"];
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39fef3a2f6b..353cbc4e375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14341,7 +14341,8 @@ with pkgs;
 
   inherit (kdeApplications)
     akonadi ark dolphin ffmpegthumbs filelight gwenview kate
-    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole krfb marble
+    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig
+    kolourpaint konsole krfb marble
     okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };

From 5283e644ce0feae45b70a1d5853fa3b58a0e8293 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Apr 2017 08:20:13 -0400
Subject: [PATCH 1219/1744] linux: 4.10.10 -> 4.10.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index e24cb7ae38b..b6ac16f5a40 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.10";
+  version = "4.10.11";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hbzbzykay1yyrqz06lx9rwhf1xzzjs21i561gi4fjkm1bazv8l4";
+    sha256 = "1zk24ddrnhr56zxyg4jgzbcacl6cx3lvh2lfr8gpnrqhybgyg48i";
   };
 
   kernelPatches = args.kernelPatches;

From 7643c7c8cc72e605ec2948c85ac3fee121f6997b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Apr 2017 08:22:23 -0400
Subject: [PATCH 1220/1744] linux: 4.4.61 -> 4.4.62

---
 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 c059a770818..4153fa1d09e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.61";
+  version = "4.4.62";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih";
+    sha256 = "1v0xrn9rfvnjqrnw5wffx1d2x1qb82xgrsygia3m640vawg70jyf";
   };
 
   kernelPatches = args.kernelPatches;

From 91ad6b35970b1378ac99de209b4ec48318704b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 14:21:48 +0200
Subject: [PATCH 1221/1744] Revert "grub module: fix efiInstallAsRemovable
 description"

This reverts commit c2b56626f1a872d06642777193b72d6473c8b97c.
It broke creating the manual.  I suspect the descriptions are
auto-wrapped by <para> and </para>.

We've been through this already in 3af715af90.
/cc #24978, @zraexy, @Mic92.
---
 nixos/modules/system/boot/loader/grub/grub.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c02956bf8c8..2d6bf2d58a9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -383,7 +383,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          <para>Whether to invoke <literal>grub-install</literal> with
+          Whether to invoke <literal>grub-install</literal> with
           <literal>--removable</literal>.</para>
 
           <para>Unless you turn this on, GRUB will install itself somewhere in
@@ -412,7 +412,7 @@ in
             the NVRAM state of the computer (like a USB "removable" drive)</para></listitem>
             <listitem><para>You simply dislike the idea of depending on NVRAM
             state to make your drive bootable</para></listitem>
-          </itemizedlist></para>
+          </itemizedlist>
         '';
       };
 

From 0479e68db923a92aa851a965239b9e9b4a2f6f80 Mon Sep 17 00:00:00 2001
From: Daan Sprenkels <hello@dsprenkels.com>
Date: Mon, 17 Apr 2017 23:24:02 +0200
Subject: [PATCH 1222/1744] mpDris2: 0.6 -> 0.7

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

diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 9378585d8b2..fd9cf2bacbf 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mpDris2";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchurl {
     url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz";
-    sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz";
+    sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21";
   };
 
   preConfigure = ''

From e0bf92950c4d8ec0af6491612eb800f6b5d20455 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Tue, 18 Apr 2017 17:09:54 +0100
Subject: [PATCH 1223/1744] fdr: fix Qt library dependency

---
 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 353cbc4e375..3c4a59aff37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13629,7 +13629,7 @@ with pkgs;
 
   fbreader = callPackage ../applications/misc/fbreader { };
 
-  fdr = libsForQt56.callPackage ../applications/science/programming/fdr { };
+  fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
 
   fehlstart = callPackage ../applications/misc/fehlstart { };
 

From 36bd9d2463d1e90eea888e8ad54e808a67934278 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Tue, 18 Apr 2017 09:24:55 -0700
Subject: [PATCH 1224/1744] pidgin-carbons: init at 0.1.3

Implements XMPP extension XEP-0280: Message Carbons for pidgin
---
 .../pidgin-plugins/carbons/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
new file mode 100644
index 00000000000..592ef325139
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } :
+
+stdenv.mkDerivation rec {
+  name = "pidgin-carbons-${version}";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "gkdr";
+    repo  = "carbons";
+    rev   = "v${version}";
+    sha256 = "05hcqvsirb7gnpfcszsrgal5q7dajl2wdi2dy7c41zgl377syavw";
+  };
+
+  makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ];
+
+  buildInputs = [ libxml2 pidgin pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/gkdr/carbons";
+    description = "XEP-0280: Message Carbons plugin for libpurple";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 353cbc4e375..62c8e44f113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15088,6 +15088,8 @@ with pkgs;
 
   pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { };
 
+  pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { };
+
   pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { };
 
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };

From 69c3f280a10ca8464954749629c81813a6d138fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:35:56 +0200
Subject: [PATCH 1225/1744] mesa: maintenance 17.0.3 -> 17.0.4

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b7a5f1a5c90..e9edda698f4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.0.3";
+  version = "17.0.4";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed";
+    sha256 = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346";
   };
 
   prePatch = "patchShebangs .";

From 09fd6173838ec058e0478ec06cf3d918e2f64fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:38:27 +0200
Subject: [PATCH 1226/1744] gtk3: maintenance 3.22.11 -> 3.22.12

---
 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 aa8957b2c7d..f27cccfa27a 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 = "11";
+  ver_min = "12";
   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 = "db440670cb6f3c098b076df3735fbc4e69359bd605385e87c90ee48344a804ca";
+    sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
   };
 
   outputs = [ "out" "dev" ];

From 977aa067ae5bb175805804e61d245586a10b5d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:39:58 +0200
Subject: [PATCH 1227/1744] pango: maintenance 1.40.4 -> 1.40.5

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 91f065fa0eb..d8420f69101 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 
 let
   ver_maj = "1.40";
-  ver_min = "4";
+  ver_min = "5";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e";
+    sha256 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];

From e7a3186d286fb603639e71db50675ae9cec52ed0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 18 Apr 2017 13:41:10 -0300
Subject: [PATCH 1228/1744] flat-plat: 2016-12-03 -> 20170323

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

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index 1b8f4f2d110..f231481f454 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "flat-plat-gtk-theme-${version}";
-  version = "2016-12-03";
+  version = "20170323";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "Flat-Plat";
-    rev = "49a5a51ec1a5835ff04ba2c62c9bccbd3f49bbe6";
-    sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb";
+    rev = "v${version}";
+    sha256 = "18s05x5qkl9cwywd01498xampyya1lnpjyyknj61qxxw5rsgay9y";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 ];
 
-  buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ];
+  buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ];
 
   dontBuild = true;
 
   installPhase = ''
+    patchShebangs install.sh
     sed -i install.sh \
       -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \
       -e "s|/usr||"

From 148f4996b56fecae1113f211b03caec8918393ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:41:53 +0200
Subject: [PATCH 1229/1744] harfbuzz: bugfix 1.4.4 -> 1.4.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 e8cd4f13ece..81b3c558f0b 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.4";
+  version = "1.4.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 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim";
+    sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
   };
 
   outputs = [ "out" "dev" ];

From 3efef09866e32e4e8112a2a312fc16ca8f173824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:44:22 +0200
Subject: [PATCH 1230/1744] dbus: maintenance 1.10.16 -> 1.10.18

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 6f7a845b809..f569f53861d 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.16";
-  sha256 = "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57";
+  version = "1.10.18";
+  sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From ec55f8dcaac9726e910caa31a558b89ce84706a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:47:43 +0200
Subject: [PATCH 1231/1744] libssh: maintenance 0.7.4 -> 0.7.5

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

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 1db053ef398..408436ca618 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.4";
+  name = "libssh-0.7.5";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz";
-    sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r";
+    url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
+    sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
   };
 
   postPatch = ''

From c13457fe58c354ac2437b4380f27fca4b771c034 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 17 Apr 2017 20:30:36 -0400
Subject: [PATCH 1232/1744] doc: Document the structure of
 `{build,host,target}Platforms`

Worthwhile to do now that #24610 makes it less abysmal.
---
 doc/cross-compilation.xml | 59 +++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 8e981a4318e..06a8919c2a1 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -37,16 +37,9 @@
     </para>
     <para>
       In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.
-      All are guaranteed to contain at least a <varname>platform</varname> field, which contains detailed information on the platform.
       All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
       <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...</programlisting>
     </para>
-    <warning><para>
-      These platforms should all have the same structure in all scenarios, but that is currently not the case.
-      When not cross-compiling, they will each contain a <literal>system</literal> field with a short 2-part, hyphen-separated summering string name for the platform.
-      But, when when cross compiling, <literal>hostPlatform</literal> and <literal>targetPlatform</literal> may instead contain <literal>config</literal> with a fuller 3- or 4-part string in the manner of LLVM.
-      We should have all 3 platforms always contain both, and maybe give <literal>config</literal> a better name while we are at it.
-    </para></warning>
     <variablelist>
       <varlistentry>
         <term><varname>buildPlatform</varname></term>
@@ -83,7 +76,7 @@
             Nixpkgs tries to avoid this where possible too, but still, because the concept of a target platform is so ingrained now in Autoconf and other tools, it is best to support it as is.
             Tools like LLVM that don't need up-front target platforms can safely ignore it like normal packages, and it will do no harm.
           </para>
-          </listitem>
+        </listitem>
       </varlistentry>
     </variablelist>
     <note><para>
@@ -91,6 +84,56 @@
       This field defined as <varname>hostPlatform</varname> when the host and build platforms differ, but otherwise not defined at all.
       This field is obsolete and will soon disappear—please do not use it.
     </para></note>
+    <para>
+      The exact scheme these fields is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
+      For now, here are few fields can count on them containing:
+    </para>
+    <variablelist>
+      <varlistentry>
+        <term><varname>system</varname></term>
+        <listitem>
+          <para>
+            This is a two-component shorthand for the platform.
+            Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more.
+            This format isn't very standard, but has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>config</varname></term>
+        <listitem>
+          <para>
+            This is a 3- or 4- component shorthand for the platform.
+            Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
+            This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the <varname>targetPlatform</varname>.
+            This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed.
+            This needs a better name than <varname>config</varname>!
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>parsed</varname></term>
+        <listitem>
+          <para>
+            This is a nix representation of a parsed LLVM target triple with white-listed components.
+            This can be specified directly, or actually parsed from the <varname>config</varname>.
+            [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.]
+            See <literal>lib.systems.parse</literal> for the exact representation, along with some <literal>is*</literal>predicates.
+            These predicates are superior to the ones in <varname>stdenv</varname> as they aren't tied to the build platform (host, as previously discussed, would be a saner default).
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>platform</varname></term>
+        <listitem>
+          <para>
+            This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set).
+            See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform one is working.
+            Please help us triage these flags and give them better homes!
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </section>
 
   <section>

From eb1e63505ac0fccfb99e381989e22455ea67550e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 5 Apr 2017 22:21:00 +0200
Subject: [PATCH 1233/1744] wai-app-file-cgi: remove outdated overrides

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 643940797bc..06e1078a305 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -758,13 +758,6 @@ self: super: {
   # https://github.com/roelvandijk/terminal-progress-bar/issues/13
   terminal-progress-bar = doJailbreak super.terminal-progress-bar;
 
-  # https://github.com/NixOS/nixpkgs/issues/19612
-  wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: {
-    http-client = self.http-client_0_5_5;
-    http-client-tls = self.http-client-tls_0_3_3_1;
-    http-conduit = self.http-conduit_2_2_3;
-  });
-
   # https://hydra.nixos.org/build/42769611/nixlog/1/raw
   # note: the library is unmaintained, no upstream issue
   dataenc = doJailbreak super.dataenc;

From ca3d37ffbe2cdc7761e25cf6aaeb35eeb379577b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 18 Apr 2017 13:54:31 -0300
Subject: [PATCH 1234/1744] greybird: 2017-02-26 -> 3.22.3

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

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 2a75ea590ee..515b8fc712a 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "2017-02-26";
+  version = "3.22.3";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
-    rev = "66c222c25c43603e73d3521e0e91ffb268214229";
-    sha256 = "1q0nc02d7kwaxjb8d2rvwc3yf3v46r44zsighwjnmczpw7y3j6h8";
+    rev = "v${version}";
+    sha256 = "0hz8q2sf2kcxixzw088rny6zmhfls5z49zlhm8m9013wph799a8c";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

From 5576ef9f1d8aed61e0d38945a24010179f5cdf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Apr 2017 18:50:40 +0200
Subject: [PATCH 1235/1744] libav-11: maintenance 11.8 -> 11.9

The patch doesn't apply anymore and changelog suggests it's not needed.
---
 pkgs/development/libraries/libav/default.nix  |  4 ++--
 .../libav/vpxenc-11.6-libvpx-1.5.patch        | 22 -------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index e0b4babc970..6aa88a524c0 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -27,7 +27,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
 let
   result = {
     libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
-    libav_11  = libavFun  "11.8"  "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
+    libav_11  = libavFun  "11.9"  "36ed1329099676ff3c970576e03c6a21f2da2e15";
     libav_12  = libavFun "12"     "4ecde7274621c82a6882b7614d907b28de25cc4e";
   };
 
@@ -41,7 +41,7 @@ let
 
     patches = []
       ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
-      ++ optional (vpxSupport && hasPrefix "11."  version) ./vpxenc-11.6-libvpx-1.5.patch;
+      ;
 
     preConfigure = "patchShebangs doc/texi2pod.pl";
 
diff --git a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
deleted file mode 100644
index f3c52582b44..00000000000
--- a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libavcodec/libvpxenc.c	2016-05-01 17:53:17.974517377 +0200
-+++ b/libavcodec/libvpxenc.c	2016-05-01 17:54:30.564923297 +0200
-@@ -70,19 +70,11 @@
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",

From ca47895d7f8c878f3bce29bf86c7b716c5887081 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Apr 2017 17:18:03 +0000
Subject: [PATCH 1236/1744] ocamlPackages.batteries: 2.5.3 -> 2.6.0

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

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index d24c6174510..b3e657842f8 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:
 
-let version = "2.5.3"; in
+let version = "2.6.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-batteries-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh";
+    sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];

From 2230009e7d5c00e9a4719b7ef74594e0615c5071 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Apr 2017 17:18:50 +0000
Subject: [PATCH 1237/1744] ocaml: 4.04.0 -> 4.04.1

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

diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix
index 1ded1aed232..a63034d700d 100644
--- a/pkgs/development/compilers/ocaml/4.04.nix
+++ b/pkgs/development/compilers/ocaml/4.04.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "04";
-  patch_version = "0";
-  sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4";
+  patch_version = "1";
+  sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12";
 
   # If the executable is stipped it does not work
   dontStrip = true;

From 0c8cf2809155b8a74df8feccbaa4b272a86b06ed Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Apr 2017 17:32:18 +0000
Subject: [PATCH 1238/1744] ocamlPackages.llvm: fix hash

---
 pkgs/development/ocaml-modules/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 3bced92cc3e..b06760a6e00 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   patches = [ (fetchpatch {
     url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
-    sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
+    sha256 = "0vjap0xifgm59rwhjc48wi7jpbbif4dllsy4xs45sg95qq5qanp6";
   })];
 
   cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];

From 733cc23a1b5f38982623aeb1ff35213d62aacab4 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Tue, 18 Apr 2017 19:19:52 +0900
Subject: [PATCH 1239/1744] slock: add configFile support

fixes #24994
---
 pkgs/misc/screensavers/slock/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 2f20943981a..2a2be06fde6 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,13 +1,27 @@
-{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }:
+{ stdenv, lib, fetchurl, writeText
+, xproto, libX11, libXext, libXrandr
+# default header can be obtained from
+# http://git.suckless.org/slock/tree/config.def.h
+, conf ? null }:
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "slock-1.4";
+
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
     sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
   };
+
   buildInputs = [ xproto libX11 libXext libXrandr ];
+
   installFlags = "DESTDIR=\${out} PREFIX=";
-  meta = with stdenv.lib; {
+
+  preBuild = optionalString (conf != null) ''
+    cp ${writeText "config.def.h" conf} config.def.h
+  '';
+
+  meta = {
     homepage = http://tools.suckless.org/slock;
     description = "Simple X display locker";
     longDescription = ''

From cba00cb44b6ff0178d4876c3c618d9adeb005922 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: Tue, 18 Apr 2017 18:53:51 +0100
Subject: [PATCH 1240/1744] git-lfs: 1.3.1 -> 2.0.2

fixes #25004
---
 .../version-management/git-lfs/default.nix    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index c33ffb5cefb..6543f40c4da 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  # NOTE: use versions after 1.2.1
-  version = "1.3.1";
-  rev = "9c9dffb1b5baddfa06f280ef1b5fbf68ecbc90b1";
-  
-  goPackagePath = "github.com/github/git-lfs";
+  version = "2.0.2";
+  rev = "85e2aec4d949517b4a7a53e4f745689331952b6c";
+
+  goPackagePath = "github.com/git-lfs/git-lfs";
 
   src = fetchFromGitHub {
     inherit rev;
-    owner = "github";
+    owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0fg48jxh0gmd0w5yy3avascaasxk85019qayaikzfkym8bdqplb2";
+    sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy";
   };
 
-  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
-  excludedPackages = [ "test" ];
-
   preBuild = ''
-    pushd go/src/github.com/github/git-lfs
-      go generate ./commands
+    pushd go/src/github.com/git-lfs/git-lfs
+    go generate ./commands
     popd
   '';
 
   postInstall = ''
-    rm -v $bin/bin/{man,script}
+    rm -v $bin/bin/{man,script,genmakefile}
   '';
+
+  meta = with stdenv.lib; {
+    description = "Git extension for versioning large files";
+    homepage    = https://git-lfs.github.com/;
+    license     = [ licenses.mit ];
+    maintainers = [ maintainers.twey ];
+  };
 }

From a8c8d5a58846451ff6980f10f8ff9452c100f0c3 Mon Sep 17 00:00:00 2001
From: armijnhemel <armijnhemel@users.noreply.github.com>
Date: Tue, 18 Apr 2017 21:49:54 +0200
Subject: [PATCH 1241/1744] upx: 3.91 -> 3.93

* moved from sourceforge to github
---
 pkgs/tools/compression/upx/default.nix | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index b5e7f6652de..c41553b562d 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,33 +1,36 @@
-{stdenv, fetchurl, ucl, zlib}:
+{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}:
 
-stdenv.mkDerivation {
-  name = "upx-3.91";
-  src = fetchurl {
-    url = mirror://sourceforge/upx/upx-3.91-src.tar.bz2;
-    sha256 = "0g3aiinlcb37z1xhs202h2qrgbf8dygiyarmflbgahcq89byfz2j";
+stdenv.mkDerivation rec {
+  name = "upx-${version}";
+  version = "3.93";
+  src = fetchFromGitHub {
+    owner = "upx";
+    repo = "upx";
+    rev = "v${version}";
+    sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i";
   };
 
-  buildInputs = [ ucl zlib ];
+  buildInputs = [ ucl zlib perl ];
 
-  lzmaSrc = fetchurl {
-    url = mirror://sourceforge/sevenzip/lzma443.tar.bz2;
-    sha256 = "1ck4z81y6xv1x9ky8abqn3mj9xj2dwg41bmd5j431xgi8crgd1ds";
+  lzmaSrc = fetchFromGitHub {
+    owner = "upx";
+    repo = "upx-lzma-sdk";
+    rev = "v${version}";
+    sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj";
   };
 
   preConfigure = "
     export UPX_UCLDIR=${ucl}
-    mkdir lzma443
-    pushd lzma443
-    tar xf $lzmaSrc
-    popd
-    export UPX_LZMADIR=`pwd`/lzma443
+    cp -a $lzmaSrc/* src/lzma-sdk
+    export UPX_LZMADIR=`pwd`/src/lzma-sdk
     cd src
   ";
 
+  buildPhase = "make CHECK_WHITESPACE=true";
   installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
 
   meta = {
-    homepage = http://upx.sourceforge.net/;
+    homepage = https://upx.github.io/;
     description = "The Ultimate Packer for eXecutables";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;

From 6cdec331418f7344973d0847d0f004c1a2dc4180 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Tue, 18 Apr 2017 22:43:50 +0200
Subject: [PATCH 1242/1744] nodejs: 7.7.3 -> 7.9.0

---
 pkgs/development/web/nodejs/v7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index b0b0869dce2..2fb61fca0ff 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "7.7.3";
+    version = "7.9.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1pqfrvz06nz88jdp1vsrxfy5z0v8yas1c6pkvl45afvl3zqxlhal";
+      sha256 = "0abaz5z0cv7amd6blm4cm91asj30ydf0lq3j0wdg6aa9i15pcsd5";
     };
 
   })

From cf1a925fae0974312a01b859b613d8a659dfcc13 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 19 Apr 2017 09:12:17 +0900
Subject: [PATCH 1243/1744] firefox-bin: 52.0.2 -> 53.0

---
 .../browsers/firefox-bin/sources.nix          | 748 +++++++++---------
 1 file changed, 379 insertions(+), 369 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 69b14db7047..f2ba1f6eeb8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,935 @@
 {
-  version = "52.0.2";
+  version = "53.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ach/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ach/firefox-53.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "5fbb048cce8addbbf8b985920a44fcd2580a31ebead7f1c9029287245bcdefffbe6c73d887da08dc7ffcbbd1f35ac235af59cc900519b49eb6d741a610b4d538";
+      sha512 = "b65f05e97a90cb0a39e414abd7f14715f24c03d6dce85877164e7223d53c83edc600351db5b380e548c33c55a48daae0739f505bb727254dd3fc9e54b892b124";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/af/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/af/firefox-53.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e48997da8e26a95c479804b4dbe75d5513574f9301b264f8f28bb8e2b2982b5d69792a454239ea6e8c384e2e5015bb1842dde450411f0019e5f11e0e19eedc33";
+      sha512 = "0db45b0339c6eeb13f28cd3e80577ee508cbddf69a3448848a54160e2fa8303d0d23baef107cb092eca4beab23b0ca0f9de550ad261090a49a2407d7023f2e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/an/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/an/firefox-53.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "18ad310dc853078f556af387afefb6a4adbfa9b3db1ac3a710963510ab0b40acceae50d79cd4d851b1c6d114bdf555f792fddeecb53e0e00bce3c9827dd2ebb0";
+      sha512 = "592e07b994a414c40a2a4185f9a073f5ac91339f94dca444889d0de8cb80be1949c6e0cdf1741f432e87c00616581050961e0e29ae4b7d3c5f75087fcc42f26b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ar/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ar/firefox-53.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "8cd1078dbba732b635dae123206b0c5c312fdc1cc9c77271f451670e45f54fc13cda66623d2d6bbf4d99b94c463fd35300ebf6372d0b7206c493966f5aaff7c1";
+      sha512 = "e74b0850624d282412dca5e5433a83858dd58e5192d0fa10008ad38da9511643115b952e39389709605b0edb1da99438f186e8677be7f5cf1ac6c8f30a6c96b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/as/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/as/firefox-53.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "e11476e2b9da554583fb2b5c8ce47b4e96a8de888a10191822fb8afa646da260df8517b3109853d08f2dad591e40c3bf20ab2bb101ec3bdac480d87a68cb9d03";
+      sha512 = "09f58d65bddc4b99edffed1a9e2a3e4ec89cad8d55f83d086f5e1a31d5e97ad384ad6ed3ec24fc8d1317af26ce9804f5411897c9c8ef8f6fe2cc47e3fb6a1490";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ast/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ast/firefox-53.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a476386d83f4b0ac51d9b21c5fa2a9c0a0241a17334f090528a9115c83fcd2aca302ae03ad3263b894ed4f1bef5fc3fd07f33d06ec2be493175fae0c155579b6";
+      sha512 = "070ec8a307379d028b955f2f46b29ee5bcf1a817ee5c45ed8221a035cd5945ecde31241275fb196b63bb482167b3b6c7180952e5e0242d986b1601facfc50f05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/az/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/az/firefox-53.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "da12bb98f708cc7c30005581e0c17c2af7231a61042e6a5b94b6b15c802dbb4d5cd34e8f6ccdd8f919a6f369b7bf76cefd637eda2529fe3cc29a33850174eba6";
+      sha512 = "a83074abbb40d6b90663878e90f957d82cc8c39084514302e5814ecd38bb6d9567916e4626221da72b831e062b5b3b58bbeb80b6f50a6c49fe9293f9cdc29e20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bg/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/bg/firefox-53.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "2beb76258e0addde9d4e5e478830e8ca04816fc4ae4964e1a74b7dc919144b5b811b075b6a8808032c9f343ab2d74dca00c2d73f9fd9e8ea5d72078225f43227";
+      sha512 = "690a4734fa424511f98dc8ce301136b3e40a69ec2a7549f732678b53489457580bf7071bc02d71aabb78d0bfef9034acabae1db199960658588e0f668a9e6b46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-BD/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/bn-BD/firefox-53.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "ec5133db8877cc50159fac7ecae02cc7c084ce1b8183f88e654355fcc0467b593d4a7099b100746bf26dfeece89a2764bb42a728b1dfde7e87a6140ca9674f5f";
+      sha512 = "b98001280c8d2dfcffc335594c83285c00bd1d30dd741cea0f39c905250d1e53cb0188ba3e52e5dc2591fb158225949ab4033d2e4061d68cd29fb5e1356211cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/bn-IN/firefox-53.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5333c97ec057f5fa5323a82bc81b93511fb5770df9937b679085f9ccb02ac02d35800427ddc9ef3d009e4042b95926796a5cdfd8cad7608d150248ca8677905f";
+      sha512 = "6fb25580683da2e4e6adea8dc222c9fa95f5acd9c123c9b1675528d42ea472b13117466d442eef0cd77e7e3bac1e3875401e46c30019bf03e08541f5d71881cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/br/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/br/firefox-53.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "d9259119132d42aa8eb8ac07378ec87e58b724173dcd0540ffedc116448dbf8f0abf51c438533ea6ec69b882a423c2fa8a65a448ffee05af5cefbe5b06837778";
+      sha512 = "6cc7825c3445c1a3d5e4551d4ea405f6de967f44be86dd75c129a14e5aba6184031a73b574c23ae4a7b1c86dac997a1effc6d33052fc973ffd8fad49d6a6c724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bs/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/bs/firefox-53.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "8afe61d4d2bdb40d21d0673569b6b0514c559e492c9a736e0ab56f5bf35f07dd727a5a11c049a0d3a1eed211584d511bbca2c5248a54ed43779183301c4b207d";
+      sha512 = "41f167418c4728668d4342e1c304b2e6c5215c8bb091b957abdb71835988b69b27c14897b2a6e1c416a3c83e624e2ce2f8e9019845d0c644625f89986717fea3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ca/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ca/firefox-53.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7ef55d89c32e45cb84aa2568d053d0950dd0e0f448056a7c6b9dff55484e0b2a0a81183bcb7708a8f85e2fdafd794b846ba4672b447cf987f903df04617cad99";
+      sha512 = "2fffd79f7df9dcaf8e8f450e829983caf92821b618c798ce3793ccb9f4d2353f60e8c1cabce98630b36bce0baf6fc72a71910f3fa935a797af24ff8d34e6cbda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cak/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/cak/firefox-53.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "341739dbddac50589949738376aafd039029b7e566d02d6beb71d00dcfb27eab8fc36129273eaae983bcfb0cfe0f266ea7e2b1613a95515b5ed129d0d13763c1";
+      sha512 = "c7811f7811b07e6708e56d4ba0cf2af4e45e7c29e4e83181b638b9929db4cf232a6245faf869c18d56a7f22ed2964acd5012c5344d345912bb0b307cb094e5e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cs/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/cs/firefox-53.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8a03c8f2487d853d3c662510d486a4349b5f1c94d8064f38291b231e7a4ee1b02ea58d22324cf6cbb2c02e490e49244d99a20f1cf432e2da0c882fdb5436e3a3";
+      sha512 = "2cd34dce9ff832b301ce1227a12ada8dec0f29322a8d46195477ee8e31a8d755af220f1420d488ac30a0328fcbe0cb80cb2b5cd3936e229abdd5b0ea04127362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cy/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/cy/firefox-53.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d22710f178f69efad411f8619a618264ab8b678f3156f1ba8ed4c1c15fb9598f8cda42840837e0bf62024cd160b1b4bbe3002072852c007d905486dd04eec617";
+      sha512 = "0c1ef9277ee172d67335f2b371ce3badd4202a2e53a8e3a3a248688fca31c419b2380b0c6020636472a3955f8b5a95ab6bb44cd28662e019385205e0ebf96e82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/da/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/da/firefox-53.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ed130939217b4a2fcffa91ad7112a5485752baac2834adb30a2ee5915a905a3383fdbe651b268d0c245920d608de80a37dca01ca6380cb6aede5bbfd8dd757f1";
+      sha512 = "098ba83fb7660c7e024e5a704f3a3969d241d5b65eef145fdb85cc2c1f4b54e590a52d564c67e738e4b87f7c9d62bb100be7c9dbd4eeb41f5fa903949e90576f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/de/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/de/firefox-53.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a16eda9c74517026092169ec9caa4e13876760e9e05774c70fd4148653e0198ed000f9ff3f6dd4224b8aca5fd5fcdb7dd3bb60043f9d4c32d93909f879f35e16";
+      sha512 = "ff55bfb25bf56c59bafd6c6c9393720889d1b7e45394eb1029ac4b6c12688e21ab3d8f2d07fc9d1eca55901713130a4099fda3745ed442445602032a15e852fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/dsb/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/dsb/firefox-53.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9e379f2d6ceacb223e4255c0ca89a6c1f13ed877168a06fc76b181d8b4476e9eb51a3f25a3be9853239363bcdad91f50cf8b2abe67ff937ec73fbedad1d03630";
+      sha512 = "d40c67382379383a4ff75bcffe8ad5f1048964b59049c912c67a6b87065eba96aaf161c7008562c789ac84b2dd98d07c90ed5074142910f179fc6b4f56c9311f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/el/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/el/firefox-53.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b62e72b5583b204d121ca8739f83c57aae4a39467d8d0f7b48f5bd894c69f3a9c8689d6840f5b0cf9bdff94b669fff520b2a3d4478fd6b35637eb2ff597e3fc5";
+      sha512 = "1295fd8ac49da1a272e8054ad373024adab27bad841b9e07a67264642b2f489f33494581ede0582bc14bdd05762c89c6e9bc51237c3805ae3dae586f33a10fdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-GB/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/en-GB/firefox-53.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "48bd9c2281d5f87b694b06354e35090ee940eb81a3c2fc05c0bd84a312b96952bc627995359eabc43fe12da6f7879c86f2e85efb0cddca5b4bb9a7a1eb7b6842";
+      sha512 = "8f5abee8721bb90beab7319cd7de957c00208a2281f2be7e64e7d2669a68ccbdd11501edfd214f3324c3b6b942f45c895b7190b1910634e4238e5e169b536057";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-US/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/en-US/firefox-53.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f84b186c83e7cc3cc2bcab136029e299cfb4cbf89891f07a7f0c79584df18c914c24c51615e6bdb677571e194e964cd6d49cdf10f76f68f3b7b9bcaae50ceb3e";
+      sha512 = "f8eeb74e6fc6485a851717b8dc42158e01225e9d1a39bbf5e46c48bcbd66586932077523865b131313d973667de89064eead121bcb2d8633e6ecfb669cc88198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-ZA/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/en-ZA/firefox-53.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "f7d93f3b87b7b544b8f9e216e44c1198664651e338cfca2ed80c0b1da58f5ebc4e3ddff846fc24817fc990bc0fc4e71dc9ccab7536fbf00038c89b74c9792ff4";
+      sha512 = "30212556c869807a5786dcfaa6bf77faa79eb4d3412e2b991dc04c4bbb101d0051a170fe7316f77260a4848782fdfdefa2436b92654db24422941c3e78cbd309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eo/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/eo/firefox-53.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "48a53a09475afb8a869d132b7d0eb9a4a95b51fa5b67660bad0ef2b85fb5fbeab8f1b87b1b11292be1449735abad8905aa5a35e23c3f9d04b23f8abc775309a2";
+      sha512 = "b58fbe2b6dca63b2750763c9a1d8c0f7bf8335bb91bd296d8d7b3014fea80987b3cadc01d2b31a14c92a8bbe30349fe9a2d726c0677dc8a265ce08fac3df55b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-AR/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/es-AR/firefox-53.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f95ab62d722f2c4417dae3d95e07bff50cd94db863988f6216234a2781711b5ad6479276b213abf470be174a8130ae5fb40cca79cffd67acbee6a6d583e5131a";
+      sha512 = "21670cef181f914354325bd4a6451a58ab98b2239ce32d1517b516c77d7279dbf46209fe7651e0022676398c7dd19b21ba09d5e7ff537eb9ba82d1492ed1036e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-CL/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/es-CL/firefox-53.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ec9ec0fd29ca215de08656582738d0f00206c38ae9d52516abe8499c107af8b85567b96bd71345deb9e8eda98ca16ea5a6e89fa87769e65aa43832011eb36abd";
+      sha512 = "4c6113e4279bd6c7817771c206d6d9b13ec704fc88afd953fb96b2e0f3386c049a07acf2d7192f75a608644ab8ea58877108917bd3f4f91dae755096755fc97b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-ES/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/es-ES/firefox-53.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "b84b43d975d5848355d10e88ee131ab85cf3bd4f2f48668d2d75752b7e5d517e9aaa32eb7a482d768f5bb9512dd79240f6ffa3947ce21c377f632ed2c6ad3bdc";
+      sha512 = "cd03793ef43224af5752bc3e94cac862fa88e571dbe0a8be84abe4824cbffb8f1dcc1b71bc2cf417786c358ada471fdefeaff41a213a7f85fa5a87582e839db1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-MX/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/es-MX/firefox-53.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dd6c3ea08ce626ce5ac6ea14bbbff373394da116d386714d9a5eb62a5ceb50975e2246ab30948569693b75fd5ae63adf7bd76e6b694601e7968ea8e5d5426b6d";
+      sha512 = "1da48966f914f44c60e450213ddad2ffaf91a4af890b4efa46a330245eceee2a230bdc0a9261c5c02b878b37a82e542d11a5f6143ba8f2f7bff67c9406b2571d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/et/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/et/firefox-53.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "0941ff6cceb4aa355933a4d631af009757c1be88d63568d3087685407d5162630012b1a3746ce23166cc31f56629d017efab1fb1c3fd7a9e7b62e61c01fb004a";
+      sha512 = "39d94458cf9484ae3ba22a473917702a3f4f27d7b54b9ab9aa56337ca0c63b1daa087f39e84677dcf1e19dbf7943804e533cd20a4b4aab98d8d9d3c39bb7240f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eu/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/eu/firefox-53.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "fa7d4950f1ff3414961ad2a0caf1d1beabe9522694baa212c7c58b91681c7971fe323b9b85296021635c805b853ae4de12428ea6ff83696c04c37a8442a03538";
+      sha512 = "030dd4e02727eeac58f23134ece06b9a5e2cdf479df8f3d9c5a5b18a664b4ff4120535bf875114c54dc3a8dfde730b3060c1750e84e89c756f2091865a1edb4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fa/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/fa/firefox-53.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c31fc76bb460b0a18a8b8acbccd0e09491da203a8c88d238026192d2ce0c0b0b744286ed84363b6b1199c3d6bb92a2ae69c4897b82c6d4c46864d1a03fe6502d";
+      sha512 = "4ea8e7a775b17855225a15fbe2b037fbf77320e7e62f4e94d98c56e0faac5295104971e44fc9163c41593a3699512fc0daf36449f6fe47f862fc7c40ffeb4fbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ff/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ff/firefox-53.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "0349ff6ae8df062abbcb7a98d5d832c30b7abb8a2c9e9bb87d1646612ce81b7932a4ad1cef77e853bbe644bbd1285fb8aa156417209fbb20020e9b92b5c30ccc";
+      sha512 = "34653c86c9dbac6c1e5070a644b7d7640c959d0e0b4c252fffb49523b2c1d85ec75c0849a0440e43b17a9c248e143ec6cfc22fe8bbf8f468ea580546e3b07bae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fi/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/fi/firefox-53.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b3ca267bb15fc2351164b2b561a399c7063d5e391a263f4a62bd7706de85e8720461a05b715fc3eb472ca3ff959464d0ceb20f86628553c6c39e74388c8b1722";
+      sha512 = "e6d7998c0b6c20d632e9137f7d920b780878ef51d0e03b85879de8b60ad37c5a69749a3b68db8e0ce54ee2ba09c2cb697315337bffd57d53e2a3eb0b45da3742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/fr/firefox-53.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "f66d0139e7ab051e06fe73c11b2d2cf88ec1587fdd6787a4eaf6cc53358e4dacda5dba41dac46aa0eee2362740ba37a0fc728445d4182eea53d69dc4dc24bedd";
+      sha512 = "fafde87a6b3b0a2be5399ecda389f3fd77dee909be47bc63237bec3519f7b5ab26748b6f589f408e893bf4869823ee1215798d08e84a99eff5e5ab42bdb1dc87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fy-NL/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/fy-NL/firefox-53.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e0dd7577c12a669259204157d2a65ec00eac52beb91a1fe3d69bcd92705c9b27ea0010bb4a50dbb7f9e87e1161eb089e966b60f4db304b24ba4929468d7d62a0";
+      sha512 = "9d458416e2ae6b2e943e95d4d6afd445b6ee7c76ff8ad9d0bb1ef9cca5fdbf4bba682fd88d56bfa122ccd9a704f21c523050214c62334f36635b2795400006c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ga-IE/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ga-IE/firefox-53.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "10c7729dc2a774f09e44a3dfdc6635892efc7d9ed3e57ae5e6455c9221201d47f9228311c11d7220eaa5d40bc1e6af81fd1933c1b93f2a29cc37b5913ccbd366";
+      sha512 = "fcdf49e95be44237e0408f417bf2f18397f23eaad761d58c5bf6feaeb90876e29d3c540a8f9436a3a46d853a441c65a2b0eae6a9434d3d679ca0a8a88565f94c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gd/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/gd/firefox-53.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1a957c457be0b85b5623e730513c006d6ac5d783e8d6ff714ef6a46e89b4e4779f32ba6705b35da9c65949de433ac261653515adcc8ba7ff68dc6b727687f71a";
+      sha512 = "a786ad90ba76780bf6883a0d0648c0b33b13fb9de5444cf53acb04dbab91f0303deeed9222d9e8ea853bdb935f5ac443c58e63d17a3730258ae18801c7710242";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/gl/firefox-53.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "75142b0a03d075938e1a221fb78b9d7833e70d55982f3b710ee6e9c664b44289c7b34d883e20cef27376c8836f26abfb15d8078bc6536f9fbdbbb085c101c04d";
+      sha512 = "84f1642323f65ecd4f05328083234ac827333aa410c40999491baed9b0e5394bf4e3b0140f48d93f0c2c50c53ff26d2448ffb4976afb7d53b766fa0f59ea63a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gn/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/gn/firefox-53.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "41809ce36cb357a0bb82ab5f22c747ce234ffb670fafc7dc695b75675f6192d5b251ca060d3f54c16ccfe9680939313c32a00cc2551d376420c2b7240654c7c0";
+      sha512 = "03b19d14de6bb3e1c9ac871803c3c77efce17892b4a79c1cb3df896fd134b922623bd30acb5de37504b6ec63a1c1037565d95966dc48968f9cbf1862653a0144";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gu-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/gu-IN/firefox-53.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "c6608688782cea5f8c96250590dd71659c80918b1219a6bd95c6825abe19fb2310e16a275018be1b828a2c49fc1b457ba922e504e9794d6ffde0a940d4569708";
+      sha512 = "14e53927add78da41fa74ab75eea084810c53298f8968e721a34e9436a924a05a7c68656296ba06b2622a518cec7d7e9378b0cd8d5654aa8fa900679396c17ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/he/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/he/firefox-53.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "bde85d84e3a52c2ff7345b5f1fafb9badc4ced0ab53cf46e2376d0fbd2a73deacdf48a2a874f09937761a9242c8a95836441332fbd2b8c26ce62835f0da621dd";
+      sha512 = "81e364da8ec69f0396bdb4daebd0e37dd6861cfa19ab81a7206786fe9ceb946201ef29b55b07329c761b6371b248b256902e4f6a38953af02750da0aeaf1944c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hi-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/hi-IN/firefox-53.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "3ab61abee1275844f906c09d17b986d0ec22345a0c49fd6ce262098495ad90a754cd671df65b2669193b24601eb037e3241d49ddaf29fc3b755c58ad9d6d7280";
+      sha512 = "531aa3b5fbe37a9368f3dff2a60815abe5e675495216af4777f6db6c88504c68b8d67b81ce15a703aaeb893050b265fdea6b6537eae87c8d5520d56003e6fbc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/hr/firefox-53.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "5036e514a41103bc880ae6d6ac16da37570230026f9301c6d831ac88461783072149a252d647b0d8bc6af9e22b5c8845e368cb3d986c8a9020af56f29bfc2094";
+      sha512 = "f0123d2dccd863d7e317c32ef319a0719c8ea1046b4e2649c43afc64ccf182de4ef9c4eb80f23f782ef06cde7cf6774f2a7fe5f876393e650af02a90b3d0293c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hsb/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/hsb/firefox-53.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "ae110953078579fcf38d3ed24b6ecdade9e4de270ad77d757a1a4a413766b50a9d1ee9faee3986d30f18b9702d25a097e491c5a9d4f33ffa195bb9a52c3ca77c";
+      sha512 = "fc3748e95262f337eb16b71560cecdfdf6d1b8571e17d1b2b94dc028af70154c9a8697688ba9f88a7dd99103da4e525a1b211543880e8bd9202f8f26bd622e70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hu/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/hu/firefox-53.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "e236dc28c60ce2958557bc76dd80fc8f5dad8aaa9a1fd89aba168d1f84ec15512fd5b5967b5d518b8d1ddaf7399ec1cbc775774cd46480c5ea345ca6f0e12476";
+      sha512 = "83a9d6508bb9c37ff1be569bfd2f3426806a985c265f8b1bd2690d78158b17a87148f57a9ac0050b89bc4205bac9b2271712b37945837d0bb17374693737553b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hy-AM/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/hy-AM/firefox-53.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "ae7a7ac1bc08280552efa232a83f571319c4a0a1ce54b8876100dfbc6c4e43d1b461d92ab98764c6ce7d450a6a84a13845a3e972fedf7fb32ba04ae36083951f";
+      sha512 = "223ccdb826c88f18dd5c8c4a788c301271a42620b3f999fe7500a3ddeea322de64c2913d620524157cd26b28d31a9f03673980ee3dbb20a27665f4c542ef562f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/id/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/id/firefox-53.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "96404c291b4bb1d3e57e811f3fe12bbb49f4d3c69a68c903f00c83f284da2c1843e2d045b1fe6f0de784850aeb1e828007a1baa7c7aeaac479611979ecb416ad";
+      sha512 = "b63b63eafbeef103912ca7278e231a64605e9a051a55681fb660ce6cab5bf98e744ac0d83d0d013bee88b9110a6cb111bbee35944cc1354b536f80f110fe2280";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/is/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/is/firefox-53.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "da23804164392edf96728a18e21e53a4951a5122f22c867fa61a72db16f3dd697f48a099c91c3609fd555a20dd3e6f2221e0379f8d2a4f9b312359d1630c3225";
+      sha512 = "07bbf3d63a17e8126daa00168e16d061f0de369335846205162b99819a3fbb4bf4c83ee07413b13dde8756bad23ccf5ce21c421be0086533a55a07ecff6e1b3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/it/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/it/firefox-53.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "74c4c4fe5ec6af0ccda964194e080657d294e237631ba90ea4378ee3f2eb1cab6338829c81b419994da181e696606617c1b617e0664f887e1cc45288b2854c1d";
+      sha512 = "fd6ba9365816bebf42a4748dbc9317727cefcf9c07abb0d3d4ef8613590f3a4bedf1b1852b0981dd42abe0fccb196718ca47631dabcfee66589d208aac955338";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ja/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ja/firefox-53.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "8cc5accbdd64fe2cf725af09a5a6677033eac513a831793347d1c8a9eb3b78236e3311aa330c1a4c23f17df2dcd9ec78218ab6b478a0d0baff08fe9d1d8bee2a";
+      sha512 = "f87895d40d3669c02b886be8f25c0f9173fd6c4273df1bca11d897feafaca1158a4430fde699b1a850c8490a06701d473f304dcdfc76c408df1262e38b36db1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ka/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ka/firefox-53.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "5b3023d30f70652409074a2507bdc998fccbfadf1d94b5ef3896fb18cd934eb4c0b21a8448042cc5950434cd1bdbf004207823b2416684f599cb5e9a7b425bce";
+      sha512 = "bb5b6bf736283eaa210229dc337819ba038ee45a2841984b6b711f92cf74a76cc02fcee9cc14ec25b33f3c98e63c34a3dd6801e9876cf2756f6695e790689b74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kab/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/kab/firefox-53.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "cc9bce1b5ae317fa4e6f6e33440f4c0aa7beec036d27f36e8cfd17df34d4c78ebfea9d7bacad2c0805e5808a311adb6d573ef81c3230de99d6a51efc51d07f26";
+      sha512 = "e3bf144d1bfbcb86213fea426cb4fdcb9e03e9b83bf55aeeeb0cbf705e841c9f28d920ef8ef1eb0d9a366f18deb96d3f6bfbe73b837f254e1ccf9bc0469eccb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/kk/firefox-53.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "d5ed3e9b0542076370df94fdcd2eb924d07dbaeb4763bca3452b156ef1d9d75e43a4c7d202e70cab018e9de5ce40f7e9702864c120fa6fd8f0833dc916d9d205";
+      sha512 = "11aa42a43482508d036ee4ee6f6f92e275a9e31381edcf557e7034d6a8677c7944402d9d95775adcfe3bb7adf7df88c5baf7807adb70a6028c5d29e5bddc0119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/km/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/km/firefox-53.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "bbd78525f8871f115e64bb225e8b62f89a446f1df19521b364ef8a3d8fce2c44c4cf4f36130fab12b60d9db8e127604c08491b91e34fd9cdb21b4eab56728e0b";
+      sha512 = "86ace6cb0ea2337be3dd30f0f0e3de3288959274d6d1af9c97af149545fd4de9bf99b4f1345ebca978969825bd3017823f220f3a630fa43b22a7c2c0e77f4a35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kn/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/kn/firefox-53.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "63b06655503229444c03170141962374ea469398b55a154965c3d3e062016ee6004203a22575c0f737bb21a8271d70c9a816cd8150f72cf03ecf6ddea2717c59";
+      sha512 = "a1be99f2bf2bd4f4d580a99d48b4021ec3c185a20b58b1e3e891317990c0791cb6519a1dc6dad076a9da4e3f3cacb5479fcb2e020d200c7e33131d0efd7df772";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ko/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ko/firefox-53.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c96616dfe9abd66d8b92ac3c6e80cf93733587ba9facdc397136504b3532b014b9d43393e623cc6a0f44a0a719172da09f807a08ce0b82f00d21e6dd9731f43c";
+      sha512 = "6f81fef1e8898ba1a6df7852c549bfa748399ce334e6a88bc67f835d47ed4e944b4609f394e465462d674816cecfb4efac55ecb4755bd2a16b6229469797aa0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lij/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/lij/firefox-53.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "615cb07855818b741c59fc7fee38f31052042e65962e809e46d75aae5dfd7ef13b77462c51c0956915631fb9979f4ecb093248825399cb6c3c6af98c112ccec8";
+      sha512 = "a1be50da719acdcd05800e47f4641324027ebccba8c760b14a962249be3e20994206854e7f392558171119eeb5008a71197f9e2cdd236f60f6e035e8b6b1e08e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lt/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/lt/firefox-53.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "bc8ae3fc1989e400ac6f8baf251e2c9f43c457668e474a25f7c57cb0e55469a3b7c2cba51fe17a29bd2e8bd9287bfc9a8f39c811a63104f4af017ad7998c0d31";
+      sha512 = "8066c9609c640524cfa3e70bf36346034d0ca8c062415118235ff9fd3c90ef3588102a6e65f541c94dcf1caaddd6bdf9944066df61a4a3081665db39b8211416";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lv/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/lv/firefox-53.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9bcffbc83770a25f2b44d4a89eea71de92a62fbe654abac762bda4db6075bca20f786b99b1942fce7b9a7a24b99ff129e3349938ee4ea9e06770d02326487cd1";
+      sha512 = "8a0251bd821ef4a0037ce06bbea0616816078d515ee5ebdbcf732bb52a773ae11f0137a479b2026f3c2ddc90f0af9ca030f3dad6732309e0cd7eb8aa93924390";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mai/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/mai/firefox-53.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "2d89a6b43bc9bc3096cd4e6c8537edf86fc9baca3e07e062bba03580c1c3321ac07024a904da27d6dbb246d0d9a691f2669f789f9a7b53332dd323bedfc23991";
+      sha512 = "90413054bcab9e6ed051109c29302df14e8cb56ca79cd58f3e5d51d34cf251e456a320bca50ed915df5582a03a047fd4032a09cd8501972754a9883f9564ef09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/mk/firefox-53.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "09c763ee3657545eaa095acc2cd3df82b5d4d61afec274dfd026b2fec670f75fe0948854ace5ecbecdb1c32bbc3916cbdb0073dce83e004e6d36b84b177df7da";
+      sha512 = "c91070c83cbd82e9e44f1ebea3106149013135ad1a27f8640ccb71ef17dcef5d40a0493587484e9ed23e8bbbcf9defdd26fdad2593b9b8ae8bfb075b990f1ded";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ml/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ml/firefox-53.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "db6b7d35faa8c0b37fc46b73e4af09ed3e297a70e21fe25496a36aabac41ae39f2ccc060c84ee6134855078f8ef3099f4a727ca8e6631960d72fee080646e2f2";
+      sha512 = "8fdd7fdf8ae65a85094cbcb256b98c8ad39d128a09353d746f181ebef2a9df29ab9ae03fdd25507e8e9fbd03fc15ff460f5675e4b5107affdb10b48db5a67be2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/mr/firefox-53.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "95690e4b71eb853d5482b28f0acddaad6bbdda466650b691836e07bf48ffc1005794f783dcf64620390936fcd77db352a0585abcaae796dcf9e60b93084d44be";
+      sha512 = "773cf2cab095afdefedc5c58628defd65b83a3f5f0ad4def2a07d0c0c264ef10210c14d7422354498accec5670d84e211f7250e5b747936716f5b4afba6d8e9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ms/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ms/firefox-53.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e98d53dcc9af968211a81a97bb749b308139d35403ab221c7f36e0b291e8b429b7db6c7531a2c261bf90b81373430fa1e54cff75f88546586f808c8784f868d2";
+      sha512 = "cc0306378df1d58ba86f756bad7d40ca363647a542da885c74378bddfcc3033f0fc88a2c19b028b40e74703ea7f8f1eb99aee8a9980b645cf323cdb334e99557";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nb-NO/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/nb-NO/firefox-53.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b7c34ba0d7fd0259637e650d2bc251dbf1b3ca2c365549f34928f7fe30c663b8b54c2cf7c587120df5586fbaa770c8b7482a53881339e2ce3b947b3866f4ef43";
+      sha512 = "11f7c77bf5f25606b86420953a67d5e18b5809c57ebc66285b390f74ae1cc9239c91ff4c2be5314e25ff17b7fefba29e4ec8c08a17a98354444e0d22874bef32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/nl/firefox-53.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "85c57bd3bb2e8b89fbef5f2ec59130ab16d723fb79fbd91e1a4f3c056ec9dbe8ca5dc293d34730603af60015aff94b43eac581f9bc2bf462512762232ff445b0";
+      sha512 = "b3724643f15119afa97b169491a0da44dbf8a89259f1a3c3ed54fb2b402fe47de8f586b54ec193007c67571bbb577646b819642569aeafc3f809cb47eac0e239";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nn-NO/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/nn-NO/firefox-53.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ddac997563c6cb2c2fb9096e85aade6645667b6c719b7743a405f4390c91222a9955432cc314a5fb2cabf2a80988dcdc491708dba7c507d658a4a8ca78eca688";
+      sha512 = "beef73e2ad013d0edeb5ef7808478a3ca80649c07e08badbe10807b7a395560dc09e1fe929c69d0989e755a4f687f7549b8c6d0d389df537698d678348bd734e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/or/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/or/firefox-53.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "ba0f16f2b3be5c76f8d84ab92b1297597ebb6a7f33a83c37568dd0107b653678309f1eb5e5c0e48ecbfc1dd2af01854c49261cb21f264a4fbaefd25f256187ab";
+      sha512 = "334b6b76cda1edf7c582c0d079cbc625568c2f6bbae4e7106e0b4439b7d6bf4a3128430f05088eeda1c5d095aed406053fb9fea5ed170823aa24b68f06efe089";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pa-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/pa-IN/firefox-53.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0bf04494a4515064cbe2a125d64c3caec94521744770337598685766266d0076316d786292e1ebda62450103d67ee13a0d99995b9eaa0d10532a71b2bf3c928b";
+      sha512 = "5b3bb828cbe0d82947190bbac9b512616e0a74c0887387ce60acba73024a113aa760b83f975ce57faa62430d77996633748daf9b1b2c9644ae770eb211c19d99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/pl/firefox-53.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d11d76ce3f088e56e882a9cf6c49997e01efc9f79635c75d1272fdb06f484ae9a634b3c52c9d15c938a657611552b54a26b67134e8c5396e6d74ad83fb3a9a69";
+      sha512 = "50523bc56cfa5d62b06096d15e4ca3cc6b8f3076bcaa599e21186f03aec04469a1d1f20ccfc1bd57136ad7460f10fce9fc84a40602093621ebea8184492b54fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-BR/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/pt-BR/firefox-53.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "1a4de780de9105009d4f9549ea1be3e389e9a01ea32db30b72aaec7d90d522edae3c6ccb1061edefd2ae95f3610b7839e115e3b53884819088c70387990cc77b";
+      sha512 = "79d963508c87052cef8dd28615d93b2cba74d9197c96a0463b507308e3e2838314f53e56b6cf4fad53bed749876ff904a9514b443a910605cc7129f46eb74447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-PT/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/pt-PT/firefox-53.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "29417545e0523bdcb980cb1be1a70bc3808360076f1e1a862ddecf10665a7a0e83e6f0ac29fc18a8d3b90ac9729aaae64236a091511ce930021808b4de3f6b65";
+      sha512 = "88d97e30f6d436195c34fb4c9ed86c26197158e181cdea001ef11b32f63f4ac6a24a31c46de6356e19e21e2cfaab716c9f336c0787eb17df4e7b4f9273af0c53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/rm/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/rm/firefox-53.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "99a1820c89ee96bc90404d732874be0a136441d97c5302e74d5dfb38a734bdb1373f48c7af0232ab66dcde528a1480c161c0a3b8aac4a016dbeeea3c744efdd4";
+      sha512 = "78347de9f2fd2eefe4c13b57475f9008bc415209f17448b043bb2847617cb7040c81fcd45dd767fafed613ff2a9c75115fa833c866e84e672dc9406634c0dac2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ro/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ro/firefox-53.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4ba5a9ba9fe3839ac8ca0d7428b2d1dcf05b1325d62c88ea833759f663a9cc45fd2c88e29bedb29a00e68d787e6fab6b1b5b9906acfd5b02c0cee9e18f701372";
+      sha512 = "7f110d65e315c77622fe1629e9b492df9d5f255c6b39821fc9cdfa01c8d2dcd0d8fcf7270414219b6f9609d480520fe5175ff049a16bf94defa20a4485eb109f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ru/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ru/firefox-53.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2e2db4238f73f8b27e8011ba528fb3d108da5a5d59de43b38f5aaa89740cf2b6ca655446ae28b31c6c22011777bb8c13ac43cd9a2ac234e3bba729daa426c3d5";
+      sha512 = "69988b3861eb7e098370b27aded6cec934e4940933541c88509c18db5039f4746035c969a699f2ffe0383243115814cb26be516bbe6875c8288c8634e33892af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/si/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/si/firefox-53.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "af65f79352fb6435b0e7b37f6d88988d08f5966b406d903eb03d9ef2c6b393e7516ea3fa3150059ff0c33437f68fa3cd28528e46144f8cd2c59721d5e0d593e7";
+      sha512 = "d9e4f0572972a979420e519847ec5f76769d14412a7b5dfecf09567c57195f1f14ba9f01caa3408c28d689d786b43fd054df3df2256111c7a9e17d5351204150";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/sk/firefox-53.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "cc0649946cd9cd2395fa399b2ee6aa9a469237cefed0db6dd65cb80ed12a18e572c33bd932985309a649b75665d4b8d65c241d0f5f9d92886315ca0cec6425cb";
+      sha512 = "09f841953ffc4881a003a0658ba8324c2fc5d6f90cdb691732c112e998ee3737c6814ec8363c4c36b82704ff4e991841270a218c09be10846b707603c13eb246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/sl/firefox-53.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c2f746ae453ff8c3160784eb853c20a3cc48ac4ae28fe231dbcccd24b41f003d38e8e13a1fdc269e7a4ce6d77c02f9a15c7e237b35c46d22256779844638c5ed";
+      sha512 = "1ae4a7f31587f6ebdd584d7851ee83fe29cd2b7693fcf1b24a795b28566e28b21b092bb3c5427a223f2d3305fddc045aeecc1a45b02e228b313f2df75f11e61c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/son/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/son/firefox-53.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "d0751c793f839cb6f334027217f164a0fca2861d62ab1d9c9c7a81fe1daf54b3fa6df03564b5d83fc3eb0bb3586f331ac7728d6dd6d2ebafeb614823088ec9b0";
+      sha512 = "a09fc1863457a659591557e8e93ad421240d8c408d788fe102594973e121039b2ed1ffd52262a68c145043a6886a1c11a85916f46f2143a663a835ccc94a2860";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sq/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/sq/firefox-53.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "31edb40d07ce79679b84ced2ec867873a73adb0439e74260934fd415789f8703b1cff717241657bebf5411592d2c12aaf0aae3fd58cc7a37112dec33b68e1d9b";
+      sha512 = "e43aee4f4c4e91373238b9788de0783232ffff48571a0cff859d17dbb1e9cb292a1a0e606e367b99f8051d1165c486362694edfc194c288d6f2168e5e8c6ebbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/sr/firefox-53.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f670f25b2a9fefa7b8667b3d2655a80283610da9aacfcff71c0ee133513f7f21e7521e1f767748896604fb9a69a84e1c6a56063e1db9b344b9e7cd7ea2a9fa26";
+      sha512 = "51def7580994687694dcd07b0dcab783e718717e2026d125c892e734db545e38cc9562d98a2e007ebe87f9337a1856f97d95470c03210ce6b306bad041a416a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sv-SE/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/sv-SE/firefox-53.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "72a2e2ccb76b6d8490d209c086c4748cc242dce4683a64d0ab30279dab09c608b9ec9d73f900f3816d00ad8d7543124624bffd51e8059a4175dfdc980a0e98e2";
+      sha512 = "8989e518757a05b6a1154f7c9b66cb8fc1e772bf8a26da6cecd25efea98a97cfb103c2cf2443b9ae2107819ed791938558d73f0536efc287de116b89f302bb36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ta/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ta/firefox-53.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "806d6a7f1094a84b6d9408dc9a4917291af9d1b42211d5562579200231ca77fc210aefdb93ac942aa28e16f089aec9cc6e8fadc4c410716dbf43287f5dd93ca3";
+      sha512 = "1050d71c592ee8dbb7adc3c7d76d8a0c697a3328519e24851e16234cdf416fe2bab19c68f9e784699376780ae890e9671f200e0bbb8a1ef9cc7763a26ac1cf0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/te/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/te/firefox-53.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3f2c06162eed155c1c75a4706ff4133791f7d39026936e67e320cd678e1fe843f620be8c01b822f16b4a6b51c3a42884d6015e98b1a43dcd328f01cb8cca7df5";
+      sha512 = "bdc7ef9a4eb424c3eda408e775242001d7d57c7a5c0c5fa41a455aa679d9cee3d1123303a0713fc6541ce149538e9390f82caac9fad10f19e38c6dd42afd8a18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/th/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/th/firefox-53.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "487d30a850048207015b880ad6762181a66121002820d88d1c5629c19abdb121af6b6ad703227c8ef143786a6f9d5a5f550388703e314368562de09de54fd9c0";
+      sha512 = "8c2d72fa2ff843cd2ecb65841be91b8fcc004e0f6994dd486d8b818a2c671bd4cbcdbdb9f07103d6c8c04f98609aff7c10be26f772cdd84154bf2f70810f3faf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/tr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/tr/firefox-53.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "07ea2cb754b6433d25820b5da3c388ac6d6441b15a1dbd12c442e4bb744ea94e51cd95d8147eafb57eeb6d1f689d9373425d25f3ffa67987017a98c6cc13dff7";
+      sha512 = "6fc1b514ead8bb59dbad21bedcdf608c2067c8f0fc90909aa49b1b92e5dcd0744a7f642b200fc688a14fcdcae2aa89b440baa53ea2fe008697bf01dbcb2ea144";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/uk/firefox-53.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "167993a0fdceec4630f6fd60f28f9f060e7449f7c514893e35ee4a6f406dfe9e330f738cd32a94c109e858a9f0a62952a4b4213774a2703e061a7dbd2c2d5f25";
+      sha512 = "d19eb5ebac2143807e1a0dd46666678dabb019bf05fcc24c927b4bc91f7a0e8f66f95d08bdfb8ce162f23f0602cc27b1a2c7b2cd6b22a5b4afd16dbc8ff19ce1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uz/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/ur/firefox-53.0.tar.bz2";
+      locale = "ur";
+      arch = "linux-x86_64";
+      sha512 = "fdea077923eb4dd43548e743132890c21647bdc4eed3211d59867730a423a723cb119ec95dd84cb61b3ba4a8cf0951cb2c84b1b16f9a82b77998f8894b57f99e";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/uz/firefox-53.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "86d34713424a1a610a4d6955fb606d672705d4cb770a73705819600665a06c58f305ceb6eecf4f93f813a3ac8372050799c6d0c67943f5e8458ce7afc9eaead3";
+      sha512 = "311aeb578a9c17e8115261e5fb86ed0c928137e4b6fa36e73f010194ea44461f9334ad0bbb5f7356451193ea8ed5f6e49ba6b051e055e2b77a25a7d83acbd2d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/vi/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/vi/firefox-53.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "b05f36dc75e5bb6621e430bba274a98e8d780f5491a77cb1279855582f09861f340457a2c03c69eab89f8a1b84ef0f9638434877e65bb5bf9dc101930cd73af5";
+      sha512 = "e6e8c7e2be8091e000afb2fad812df4ee7d88a591508929552e6c41adede4a4599e85010c037928f99d708d867a311eaa20f1e952d012e021816509148d71fba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/xh/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/xh/firefox-53.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "339310357c9fe6fdb0bee54975b3a870efd687f504f0e1ca9eb1cabef2ec410100b7b6a6ce1ea0fef245220b8c8eb4a255c605c54919782c45b9a4524edbae73";
+      sha512 = "c24a0b3cbf30f017f700e0f15124b901507fc2302c40ad4fb26ed3624a2a407764d981c56a584b5ea02128a085b4d9c79248f6d5b72f9258deb92dbbde5f4ce6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-CN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/zh-CN/firefox-53.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "74b84acff05c34ed24addfc038f5273416164f635516c188787b61e1cf44b929307d01412093a861a1ca73d8a26ae192e40e89a764e285fb332690ccc1451433";
+      sha512 = "c58e31571e718e027b7c2a57dc6da4162a406ed92525d5683d662aa1f5be6d5a8e155a92371a6188f389463478a85e06437d2647ddb7386f9a6c5a2aecb675f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-TW/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-x86_64/zh-TW/firefox-53.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4da030da94ca0d889ccfd8192d4812231be0c075f4de5e0f1cc1d1fef2ea2c960e447a73c7dbd141130315f886843cf66b463d8cfd0261ccea55b17b76dfc7ad";
+      sha512 = "5e7646bd447f2561e5afa7572e53abc20e3a957ffa13eeeb2181200241a9ce2b64895abdc66f0f759ebf80cbe098e8c629907000ba38a34b78dc4cc3e3b9138c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ach/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ach/firefox-53.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "ca8ffe68361681aed552bccc3141fe49fee7645865344afdac4b08aa8b8d950b5a36773495c827e0ab1095e8541cae406912dc4e539483001cfc7550b59e7194";
+      sha512 = "6987c003994a84b9c9917251dee8107e2f41f7f97a4f8fd4a64abf64ad8358e2a66486818e0808e07da4362c27da07e8f3fc5f3fa5b6b45de5a63d229efe48ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/af/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/af/firefox-53.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "1e08575a3727eecdfcd5a8e04a3b6667077bc7dfcf5d3b22a76dee6d09d54bf97100dcb478ff451999ad4d0fde1cbe12e2b248b7a3112b0a29d1b19a93e46228";
+      sha512 = "3544924171f5a4fb025a2023618eb29b191ce7d6d6894283b59fd1dd764b70ac7e703f794e2c4b6c1302a2b857aef14949bf2f39c7813d1bd84d02ef2257a467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/an/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/an/firefox-53.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "20d6a18d4e203b016d40162e67f2f438d20f18bb923395b63c1b5b1064900ea38ef21038b6765c34dda7afed6c3463fd16cdb4506fcaa13bc963d7d9c104598a";
+      sha512 = "77e7b36446ae78facee96b1ab067425be0b3a36139724015f4156510d4e73347161a797ec83906369bf14ddff41392771f80d31bbcd834728413b10be47691c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ar/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ar/firefox-53.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a3e6088eea7a569ba3520813667d858b4073a6b4d5d0fe725539139d6747ff30e1a053bc3af37ea72ad12438db9f842ce4cae8bbe08629cdc33600a795cc84ba";
+      sha512 = "11e9b45144f3a48febf34c2a4f55a23fc8130609e9e429a7ef87592ac58e8b898ea721c749ef8c3da5208583bfefcb3847961e2e0b9f327a633bb1bd078c98d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/as/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/as/firefox-53.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "9bde92cb7625e37ad287d54bdf3dc876105ab8b026d3dea2ce7121385c61d3c44c3cb7ea931e2805ecb8e345cab1d26db50075b31c19a09eb4e38a185db17c32";
+      sha512 = "132e728fbb4409ccf42967eea89c49088206164d3a0c4c43b6da0cf11a6955b0db6b2fd53288c297a41d90575ed92fbec1070da8a600a70267e3773ac96252a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ast/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ast/firefox-53.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "6c6ad98afd3ad8cc2ffba9bf19282efcaca160e51ad74f1c7121ca5ca44dd8cd661ed206837ad79d924c1cdb9d2e749f9edd6c9d2dff976439231568df00f785";
+      sha512 = "389a6a07fd27bc5f033533f11f919d04a9cad6f57391b7659aad53d86e614751e118e98295fc0764cce06073ef796e2a30e030b239338bcf4539fa2d2c672cb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/az/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/az/firefox-53.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "3591e35e7627d12f27ee03f98bc05adb88d048b742e386931ae8b01fa34b977b865cb6990cad41bcc336f94b9d40d0ccb1c493d2cd5b0e3d5f413568160c5318";
+      sha512 = "92d395734ab1f5399614b0ad5fe8e46d66fa34e1742cd6ad30ffd047106e58c39296fa0963a30e804f59541b2edf1ced1437e02a17aea709ea1ccede9dad716e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bg/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/bg/firefox-53.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "28a9646f6c135b4ad1b52a4b61fec8762d16f4f1ab9471226c88e0958cbde5a094d7a91bbd4e7385f57f45953de62b6efd943ef74899da7b7566402e1c5ef68c";
+      sha512 = "6c0dce21b96b075049febb122a7ab497cc5e629234cb6e3fa9a4faca137d9284865a4d749db9a9f2ec4429f28da610a2f55308d13b5711f1e4c0b52dccb5b52a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-BD/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/bn-BD/firefox-53.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a9d2e14f9218986603d4215e4b28534f60ec208898446bf5e798d921189b045bb8d9954a900545ab4c01a56d23bd21bf0075fc9eb0cacc913b7c66d4dbf20fae";
+      sha512 = "d388d2ea20ae36a61a78d1bc257058852354eb1cac08dc930405d3f9b0abf9ae2783be9bff89dd6de5d89e9f28ddd4c4bdd8200214046b634f326f9fbce01254";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/bn-IN/firefox-53.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1e3e883c9df8982809f699b176dba7176c63b9ccfc7ecd2552f1147a197f0c22671fd11be05a455c9619152f6783a95f4167547d556903b1756e458804de3483";
+      sha512 = "5df0f3e6ded3c19fdad7c932448d0afde5a1aff126d5ab5d8766b206b197165589469ead85b7ef73cb8e2d726ab9091c8555142b0085e559a071ae5e21291c46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/br/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/br/firefox-53.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "a0bec7977f03803b29bb1ef818c0efeaeb17d0c679ad35c00357dca1c29da6a294da352d2aae751763d1c5e20d385f51bb0841c61bdb8f7dcdddf92b3774f1b2";
+      sha512 = "9dd20801e01ac7b3095f10d51bca06354d1dec4ed069adb29bf0b8a308403c9903d7a0afca0e697cef1ea506203c10959938fb7299e3cf3a2ecebd591a65d415";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bs/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/bs/firefox-53.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c741b54422602932086e903fe8aa1fcfa91b705236ca223a24b23eedbe4034279111eb3a4a1fbf1a431cee7f6ce8333ac01efa3cc5e3a52768bdd93bc3099359";
+      sha512 = "5f1f5ea3e506fea86298292d715224adb829efff3011af102bf8ade3506ab935c1e2699f6d968a708804b141be3f8e25f30a404dce924ec897cbd61851661aa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ca/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ca/firefox-53.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f2f4ad205d9b256871a5252c488deb8b9dd2714d843eff0d815f3e9f5495da3269ed47cb2d1cc21aa67220ae06b4958f120be0a8bebcad296a8cb7612fd21ae0";
+      sha512 = "48a92182edaefec01067c7fd93bc17ae480290180e7662d5ba40583a215fdc2a650c48bda1b438e114b23701e2b491251b3ab70c19c4f62063068b4cad594eef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cak/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/cak/firefox-53.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "22a1d0d1010d93720123661599d2b259a72135637692a95ee6bcaafb32677bfda139f4265fb541f5cf571d31d23f6996594710c2d3e6c9fad7f744c443b851c8";
+      sha512 = "48d3683f089f08cfce1e4bf3c1d65f4d7f0b6716d1c025a05e697a9e16c39038f136a486871a7de2f26cd41baf01b35a7a6292537a4b0dfb5388abd8ff80f268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cs/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/cs/firefox-53.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "255ad178324900c33ba15721553ec145d6045115462424c58592c2fd4572bfcd5168f3a8035da068bebc0f81c7c9a9fad29739fb09d927a2258a1e7b77139b8b";
+      sha512 = "72f2c3dabc5056e5d4dc78d070b892c486d6ca979896173eaab34455d6e6a5656eb3e20dda9bf378bf1c38879dee3fe03d85e943e15ea37663c5a8d3645d211f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cy/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/cy/firefox-53.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4f5a3d8e2bf5bb88122b8593e3f97026878a5c70b9366cad2ed8f723770c583ce32b29177360ef7307bf6bde99caf1179c50fae60b2f817e84a9b4d0579ee94a";
+      sha512 = "6585a045734b35a51829b39e77efb3815d2e2bb25e85b8a01b02cf5151fa8af24da905b0fb8ce318f73a2879fc2f8049a3b3c6fae8152ebbc684097c1320b06a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/da/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/da/firefox-53.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "988080ba24f31c90ee293b48def58706e08598341f274bdb378aa1f7e8a437dc2deaf7c36394d4df2043cf07494a4c30d69573afa2c12c962207521cd13febf6";
+      sha512 = "dc9c99dfe1593b4c3da1ac8188e195561b8656295acb4b5e157f4c1ee12556f47c32b6e2a8dd10f018bdefafe8af77532db99c2de3f3e75c9bc08bc7bca165e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/de/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/de/firefox-53.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a144a9d9d3f7b6e4d57c73b7d3dfb558cae47aeee0bea8a445739a1ee610d44b99aef8d1a6eea4f49dafd03677dbae637902a8c225ea31b0189da392ed3b827a";
+      sha512 = "088ffefbd609cccbf4c5e316e3ac59008820639e934606626fdf9b571a2f9c101bdd2016e3e575d0731992c6614eb963d8a6504571d8e6f341048ebaeb6a756e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/dsb/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/dsb/firefox-53.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "4fa7bdf38c7c96b599243d653a0570882fc9ab704515d362fe96a56b44b863fa09b895f9be496bbbaffd10bd12dcd77839a906db81176509bcc1af05fe92b3ab";
+      sha512 = "5b969eb7facca2f4a7f272786531a4b671429d976574b64fc94fc04e477e85644f43ba781076de6d337e7217a71ce3e73bdd526ab0c23b2e9bef6aa09f70daaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/el/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/el/firefox-53.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "2ab698be0d304d66b29c52f37077fabb8d9a74a4819cefd51d09e217ee38959250f92c31a9966adbc8cbbf1217f25953cadc634a385e6d956447887df869e9ec";
+      sha512 = "b3a802bba105e10320c4e1ca092618de323075b5564b87e8248804ebdc263c93fce649ed27fe330a70a8ed74ac1e054134e6b84710c98599086a367cd35e98c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-GB/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/en-GB/firefox-53.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c97a29ff79db2ebf58370f0ae259c66dd1b275bb7bdc8dd60844bba658a4fd1f9d605f43fa9a3e3af44d1c7830b75e3a5bb18f2aa3e0b3920854fa3d455fa2af";
+      sha512 = "80475dca5d817a9f73ad745ee99b8c7f7c94dc15d44131ff5580c18d8858f320718cdc6563aae2c2c34d4413d934ef30105781e40c2dadadbe9ee1deacfeab5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-US/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/en-US/firefox-53.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "0b7a25e0df55a7607aa9e6478b5aa188fb545842a6a8ef2279f7997faa725555d966b276aa1201cc1be45b1428faee846d59e0af39cbadb8ae4dee92d9dbb2c9";
+      sha512 = "2b74620ab14cf60f8b23550b191d3110c3d82619d86cc4115e6220b78b3894c27beb68631ac05f9d2f79d48de8d6f1b4bbfa40bb057ac1cb9ae2bc295d8443b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-ZA/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/en-ZA/firefox-53.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0124f925185f4ff2a0517dfb3b2d41c66a808dce1d3ff3cf95d90ec99892cfd7db6ecf9f8812759a91ac9123d8e1b2a1184b22306e50e1cf42dddec5a36932fa";
+      sha512 = "2751b78a4cb4e350953a258f3b1b4adbef32191c1255f13a728f35c891950022006a9e1ea510210942c85fb391e54974a1f3e7d95a54c270d2f61413c2ca29bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eo/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/eo/firefox-53.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "76e0d3669243bc75abd77c0c9691291726a23346ef1facee97065e8d2dd8a99a2fd4c86d48e642877a90ae229ec5ffaee398fb8d67e77cb293ad8a4abfb12b06";
+      sha512 = "3694b0e44531a72e99b326d445847dc8a605afca22bdf9f179daa7e9124eb94511c77e3a4963cea666af938ab9e99cbd9654fc38428ff98b58ac00b4d86c3072";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-AR/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/es-AR/firefox-53.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "ceb1b2a454c9c53f159bfc3e04802ffea0c0a799ccbeaac15d792c382b92037c0d447c14e373c9601a1ae22ddf6a7cc47e84f34f27c6bf36ccd107048c003db0";
+      sha512 = "b44fe58f925a25dfe00f16a8c65c4938dd0a8e3930e50bc9a5607086e9d8d40c53e83156795a5a0181d5d9296e6d46f1feef0529b7180501f5b91931fe0add60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-CL/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/es-CL/firefox-53.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "5c62daf105158ab03823fc146ee58d5c0bd41f96cd2e725540992153cc8e2f0065bf0f38050f9125b4ac0fa17f5d0897fd4c9c3776eb8b7bc1dd107608a2b253";
+      sha512 = "81cca60f732e4bd6f6ca73166debe9bd603663cbbbe53a875fd1af1a7cb87dac121e2f463e0901b6162179db26e7fdebf2d3c47d232fc0e9e5ceb1bcfdcfcf01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-ES/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/es-ES/firefox-53.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0365d4fdb398fb75c6b3bfde89d47f24b09224d9f2325cdb1c587519e09299fc9838c5eef96a69b5511ef384e2abef1428e51b22e8404d65e13448ea0dcf4c9b";
+      sha512 = "0616d021717791ddf83552769e777eba7ecc79a789f929ee2a95acaf80564bba58bb7411f4335b2fc579939a51f65dc5d6793244aa7b4f23ba32e67d27004c10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-MX/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/es-MX/firefox-53.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b374f2437fa7319bf621a39d13c398e798e9f2e1d1bca8212bc8431d455e6b61f1f15d9ba3a853306952a8e489b37758cc68ee7e72bd7184d1b61866e4384b04";
+      sha512 = "624a62a601596b847d555ab7d36ff61625f9fe5dfa35766a2e0f09718a06d0a0723ef3678b955561b05a84cda67f7010ba4d54924bc7c95ffd623d49e9c132d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/et/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/et/firefox-53.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3372452da795fcc8bca30a370dc6c18c159e1ecc195857b6a6603f2187069ce692be96df7376136e68c92c3105795f559599a2c9d8e01ef0bb036a748ee86202";
+      sha512 = "824eadf159570d3570f612cd33779ea6d19ecdc0ac2debd20b8f4572e3ab42a3dd9bbac90e702f4fde9823a3d00054efe575d219b6f4432a2d37e3382cb70d94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eu/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/eu/firefox-53.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "66c02a00d2b17dcf158be576c937aa4c74a7a341f6ab0a108bb494dacffe09141a6060431c95e92d26ceea000fb97a103044df899759c549f4dc50808277454d";
+      sha512 = "011f07a645ef301272e955e31140ea58fb835f03a25ed5abbb8a4d51d6e560bae1b22e0d65db1ef8fb9bb9226ea2e75f4738731ff4fe5949a39474e424a47714";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fa/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/fa/firefox-53.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "850457906736be46b827ae4efe2db44235b485f86a4b0b749be9715182f1a964c3b06703b9a0a710011f74c86f6ce6f146320cd21077da1070d80d25d8bf073b";
+      sha512 = "0e0fc8a30e17203896c39a5d320c594233e7c6e2d65d0b00af04a66617a713abecf6211c624196c73f2f6e60676e8e0efb9bf268ace0950f1fe6991b2e49eb02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ff/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ff/firefox-53.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "3e81a45db8c20d46e511a94f4a59649b4949c160c4bcd4f1e9d1746c1a00bb870d5ac10d8659fa94cbca5d481ee9f589b625804276b2a29ff27cc57314391b84";
+      sha512 = "b68219d27044a4054c5134c807d5215891bc4f39ec2a28c94c90e45c679e9081f38ddf5ced4538dfe7b10a4872a7a7da58de85ae5c0dd4b2a6af6f9843d6eb28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fi/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/fi/firefox-53.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "976920e06a5417dccc81fe44df54ec159935452c4a364a8e59772732e7cafbd99602bf38c4020d9e6e24b80c58723255e532c4a96b1500b00438a7a80561d717";
+      sha512 = "013e00e90407d34c1e50b596e5a16676cbff20dd8450978820d2c7b533b5cb94d7a6eb77d3bcbb1059459953e2ecf4bf0c802a48a1274804e54b227dd9c6c591";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/fr/firefox-53.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ae997ed56e309ea4d084a05ec9be2548fedff29a4b91574326c04bb0f871aa84feaab64e1f9b9b1810288b4518aab45ed0823e3c3dc66ef19960dea1e31eaed5";
+      sha512 = "fb5c5b24fe656fa5713934b704a81f6a9ee071e00fb823a5e92f7a5856e7fb40c23c7a27833e6d66441c08a99a98bad4e98264e8b2c1839768fe7f9dec685af8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fy-NL/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/fy-NL/firefox-53.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cc6007ecb609d9ec48c45a7ffd51a5f86fa5615f281221cc709166c56262dfe702566773a84e196abef08d2168efaec46fb8531f9d65b053252506925f45d103";
+      sha512 = "add65cac6663f87fdb2562c09d84f88a712cede6bbe154993690a02c9e3e8c79051f8511f421ac401d36f22dda6d24fcd4ee9103eb37fa27752dca40b76067a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ga-IE/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ga-IE/firefox-53.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "26e3eaa12931d9df39f23c0b32cd75c3a4b59e7e72a35836f2182775a21dd59714acaf6a598046d59b4f9e89a78dd1bb52bbebb115f68fc2fc03c011c4b2176b";
+      sha512 = "62042fd545a9a7e9458ceb0f13c27c31f98a2c4b1ac53d8b511e3dcc0de75a291315b1314eb118e04d1fe7eca4a7cb8c579d3f8b8a621b30c6dbd5e9897b6d72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gd/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/gd/firefox-53.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "99684a6628291e8e4549ddd6ccbc8d53d450eeafe15d06d6aee97fa16ffe10d3c2acb3f39ec1e2f7821bef783e0551f8b4b225745ac1e015a0b504e05d300e98";
+      sha512 = "d20153e17d9d299f952b4f22b46caa86939cb9a07abc9160c3d65d0c15ea2e4d29ca1dbebaa1314c2a01c78552bba4390773e36e4e4ceea2491372b8d2f2eff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/gl/firefox-53.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "e22599c9126cf546d039ad6a3a6504791b3f29108b4936098f577142bcb29035b8a75ecaf3558601a3cedcccfbe4fe7d4d1e0a6dd5ffd6171f4fcefa4678b45e";
+      sha512 = "46c94dbb21938f420172e4e502649ac63e914e33df59df919b6b6421ce3804b47d5381f30e28d38bc336c7209c33c224d08137232352faea29eb6ac1960be6f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gn/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/gn/firefox-53.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "b7b174da4feea6503c3a37d676f916c199a16449854b97f8c3f8417511c8e24317e3cd93edce7702b170a35c48dcf71ec0d8566e6da335707a1bc826720c0043";
+      sha512 = "bf8333875e5ea28d962201712b04ff2e93dcd063be8c667bae2e700cc854d83e812c5ecd1416fd3b630fe3105fe75c72d7223daf461887546d6e50ae9de6dcae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gu-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/gu-IN/firefox-53.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "2385ba4859ff208965a274d4d23fcb4fd27006b1f73cc2af057ec813d2ee1ba584d532dcbf69f581421e3070847774b0e5bb414db5aa9dcf735315cf1c293a76";
+      sha512 = "3b8d99eefed5c155d57068a909ccc125893964c36168d0547179b6a77e1cf578373bc03abdc9aede0c92069ba312584322bd5e0a1c6c47a102d1cc54deaaf5aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/he/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/he/firefox-53.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c56a2a4da1c01a891e0eb6d11f176ad2a428fede830fcaace386c9387a11f93f0636fccbeb78ea8e2c92a20ca568a848bf24a34c270cf278c23fd76f2ae5dfb3";
+      sha512 = "825bd32254adb9af6a52abf8706f066246c20f4a7de921b4efa1f97c710d92ab7b3d11a211655a4d30a5ed5684838ff742c57adba182163416e6a2a9a22eddf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hi-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/hi-IN/firefox-53.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "22645937b5d1b0e302b4facee5396685d498441d48610dff428a77645ca2a9e9b5a790fae89ee75014446d424f33fbd3ac8aa3a25d18cc92cbec9121f32951c9";
+      sha512 = "95955d4eafd90792b478bdddb69854bd5f580e23c475318ea8fb3d999de1d1d37998598be44c7db212b1c92fd8b97278e8eea58c5b0f54d571c554827cf4afbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/hr/firefox-53.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "41a43b8f79447d42b1c2261924955d6c0f463cadc4133069c27b865a14b73fe665104e9de21e1681402dca67ead1e80438cbf9043ce9f0e389e94feb2cfd25e6";
+      sha512 = "453c9939156ee1c9229d089964b71ef152dbf5f53c032753340364fe07e8ffb8c7d83639ec2395b031cd687be88b943a182ee8fa585285c7d66e7ef1ea5666a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hsb/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/hsb/firefox-53.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5641092c539d0d61fc550a0c49992ea8618d245da33e4091bf83f2b85f74078a7037301697430adbde85b3682c99bd6f7ecaa7b933ed7c8f3c58dad9ce8f3a16";
+      sha512 = "a14d2d4a63c5f4bf9943cb5e80b3672b29f376e91bd406d7e93395113d1d5f287a3e73a30ba39989c9c35f99e5c0b904b261a65e8bf4f62f1ec5416278729a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hu/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/hu/firefox-53.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "14427a52743b9619d7e675cdcdf00d59d435c0adaa25acbce79fe127670be0d8a8f6dcb909f1d8107cc0381c53688cbe691d074d0c4368bae951abe05f0980e1";
+      sha512 = "038b4127d6cab2bb34b116b6f07bab2fa5066bef8567ff09d4569135483a8c99b58c3f9eadfaa2964e2ded191681270d7fe5d4ef718574a17f66c1cada42f898";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hy-AM/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/hy-AM/firefox-53.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b12a676c274bea2408a885598fca845a558bf0216a680e15e10e07da4dc45a583378c1fb76f95207fdb9ebe98b11cf956811496fcf0fa280f0d27d34b0d4045b";
+      sha512 = "b746dc6257b3ed1ace14375d3bb1ef93b336783c2ea244e3c180b3907fac1db97ab6cd849ad81ee5becc3e18ecd3c59555f5ba9bd3fbe73ab0a9670c17a219e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/id/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/id/firefox-53.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a50d2c3a234c6576909b1327ad60e4a6b93cb8ded5f8e42f66947d5ca55b6eba6601a7da5d65e14c06b58aaeb6c426b839585db670cc8a1502bb0d0c1037b9b3";
+      sha512 = "9b8a994a54417968bff16dc6db406e355441cb63380169904fb9d10c8d2fca9b1fed7b245c08ce7d9e9aa88e89d7396603069a6ceec36b722c3dfd4277b16565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/is/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/is/firefox-53.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9225d6e5ef21ab486c054cfed58bb2b38cd1c4d32cbe827e221c777959db31bb5b29b6c04a072547fe0cc361e12cfe46b5d5ed44c285316bb1907a97915708bc";
+      sha512 = "2597e9eb85cb6637247f14a1457f0b192a2ed3451beebcee9b63c80eb8ce508ce6051ce6e860adbfdac551cc0f53743814021fd2907225bbd41b874fa6584fe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/it/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/it/firefox-53.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "30507cd7dbbff0871575d9dd61ca646f1e187ecb921cae1e8340f2535adcb47c96b99a84683eadc7d0ab72c3aa30b98fcc9361d2dc27f4dcc891e7bfc59ac52f";
+      sha512 = "59f8572b21ea8d393604d36fe179405ccc0b1a1edfd39a6d218f2d3c3c2ca8c6051b2375b67d4be3e788b58a3cf0c66d43f83207388ad0f0768077ac9f4f246d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ja/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ja/firefox-53.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1151ef2192ff26ba790243d8fad92f43eec6afaa2a4f76d0fbf0c6cb82b1a57f7e5fc361bcff8f3c2ec178bcb2039320dd9fedc6d31d0f61dbedf90852d5935b";
+      sha512 = "d7267e4562a532657d5a09293a0febdc379a565f9ffb5088c9352f0dd94c7b9a388b37ddab77897ce6c660cf4915fddb72814e656dceea4a60b2648740d1f246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ka/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ka/firefox-53.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "884090864f90ad4dae20de7a366507d7d65dad097c8e0485c07bae0d343671e578024cd338cfa030f3560b4a4248d8b1cf55930b7e23ad81de6c71d3a3478cb6";
+      sha512 = "bf2876aab9442f1750f69a0cfb8c0d21fe08bd32199e58487bbe4d8b243083ea533b26c1decfac0cff99e249b26ba75caeec1f5623f8d27faa2635d15642eca5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kab/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/kab/firefox-53.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c8fb0910d031f92c898924457cc5c8062d1048eb73ee3f4136382abec6f33314a936607fd29073a9d07379f49df825bde0073dce8cacab0f84be832f757018a9";
+      sha512 = "8da4cd8c3e1d475311ab56ed4eae921f299bf2dd046353d9e4796c89b3b763f9b00f7001fc2aac592f7204d4749761a8b1e9be421a25c1291c315b9cabdb53cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/kk/firefox-53.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "015f3a8266dd17fb022cb08b4e5e6a0cf250d841b43157b030af54da2acaa80100a7424df172acad78839bfa4485164d81e14f0efb15ed532eaf91dd81a78bae";
+      sha512 = "bc219b95045cf5e67233fedb55d6e722a574caf0d9148bf76593cd3cd46e666749a3759ee561af57ff6fdf42cca8d07f890f17735ad9ff5e34a48d1b1d0b95ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/km/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/km/firefox-53.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e9c56276434897bcdff5b7895cab82b46b17f8be871ca6ec0ca36b99783da3db448fad7487093119fb0bbb3d08a6d074295684d83d5104b214c7a63b679acd21";
+      sha512 = "bc8c5aa244591d2189d006449f58f96c0e09fa00d464e4100ba012eb764eb960ec9f8e77b69f94ad28549daa7b13d85ce8b6907f6bfbec8d47738c3526f857c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kn/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/kn/firefox-53.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "ce79495e3afdff69816007f4f7cd6046f7864579e0699dfc09ac19ef26790ea8fa13fdfd20ea1fe5755f0a7fc11b7588fe860306ab68ad2ba72cb5bb44edebfd";
+      sha512 = "e1642b253081a9381038b6dd2d638c2bf2afbe0759c6cc0dd20c716f7037030760d82791ffb83c77a336fbd861ee63ef61d871fa52b0dbaa8a2ef75a156e898a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ko/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ko/firefox-53.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3c0541e19f7e5970f8e7115f66a1722af768997dfdd65fde8b36ffc938c8a241185f7d68f9e8d954c0323fb57b4662c9f6b1cba68c0171c0045bb1922def4499";
+      sha512 = "dcf360fdbd72ed42d3d00333b7f7e8a8544ba942a45faef73929090083a36dc1998590d459ef855a081cfbc97940186916102167fdb965f1eb07884f2b029efd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lij/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/lij/firefox-53.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "3ff3966fad4e30e2132113450d31ceae884a430950a91a27b1259e287ceec1a02c67777a1576c45e7e4c40725f7114c96b714d47e1f6cf408121e23765369d06";
+      sha512 = "c9c70e2e989e4a4f4e450c0da396eb4ce6a8f3dfea3683f26fc713c09f4c5232a21a152ab1335a8711e136993b9b4fb11303d819773ac3d7274ac2a2e5c440c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lt/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/lt/firefox-53.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e5191997323d0f21ce7dc50694b1fbabefbb203920de4c56e6b6374de9b59354cbcaaa8e7ef2292eadb8c70d3428aa4f237cd8e61a5eb6d8783979acde87c86e";
+      sha512 = "b8c24378e387e89d280c76a08613b193f82b4c75ecb7ecd8f01ba2c6cec62312deeaeb967ec1ad4e8244dd210e09b9a896fa6b43bc221a3815524e3751ce5f40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lv/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/lv/firefox-53.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b0e5dc0f277e8764632074086dbf67238b62435fb198a0ef70c18fc45c20647f945caf9ee68f0ebb791ce5bad11002c326bd90c8810e54db29061a5cf16ba8cc";
+      sha512 = "ab3f1680d9b2ed0a7a6528094ff6120172c7f643f1498af99dccd664a8f3b3f78ae9b029711798a81a611e695c4c7763393f71263f4f79192eb86f991e578f57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mai/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/mai/firefox-53.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "8b3279e34bb0b45682e27f7db1b3a56f1abca16c16b0a852ddd70b3f614977c9d03af8dcdd84d82cfb2b29c8426382606e9469c673449859f99fe96f6d3f0476";
+      sha512 = "c90823e6849721e25034d4251f366631dedf69719d3fc19f3e73090db75912402c734133d006a56c6a0c311e2fead528940afe3a83881e14ffbf6ce6db45d4f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/mk/firefox-53.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6daf8cb7e9786472872203b98f15a44bb0de1e14cd85be9547ef35e262392df1ad35d9074be0574a4df99a38668e97c8edd7f78b93bde3b227ee86c06e6c16b7";
+      sha512 = "b77a067129aab271621408d925ab94a8c0d82557923e1046d8b8a24f52ca9ec233926feb4d5306bc5e37b583ce8b60e34f16167f3d2eeecf0f61c044aa419312";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ml/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ml/firefox-53.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "2c214f629f2549aeb145901dd79d71410fadab25f6e1f9000fc0f3710af71ddbf756275e5e491e4c9d703a7458a5444d4b6e4f7c5d2666460d0ff9399c8c45c3";
+      sha512 = "fc3cb70ca6512530737a9946fb3cc9184f62371bb611f1dd794b81a44a50ea2214ba30ea03cabd945dcfbb53331adf9117b0a8abbe47c4b367759bf987111c92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/mr/firefox-53.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5126ea191ae20227e208287b3196aed4210514cd3fcb244916f39c614cff287a011d9154f09652a92cae2cfc1a3ff2b090747864205ef8376d55a165faf4ff80";
+      sha512 = "384f6b0c93136dce5ca1d8ce8a14acca7bc8c6594f3fb2df5ddb44af78aebb53c961ddc6821294eed1ca056b64c48b9a6b682e80c0ea8fcad859bb37b87c93a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ms/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ms/firefox-53.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "1d24a4f378b2515a0cef0b0e83153b1ac13da2366ed43465c68b173f5d108b07953073043e23a736af9dd87616b2549f54db74bb6be6134a797eaf9704a493c9";
+      sha512 = "ac5f37940b8ee49f0830da134c3e634c8d5bc1c13f1da5cf01e0637fbd414bed85731522de9455afc55015d191b51b31a25ca709beff7f6afb1dd1991eb2380f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nb-NO/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/nb-NO/firefox-53.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7f3d8036be432dd56ce421d0fcc9ea18ebe6a829e77cd9982e3eb461d66151ddbabb50266eecd832bfa4fcc934bca4650f9180fe7341e7dd24436ca410c5cd46";
+      sha512 = "79247cd0fac965c69c34072770db590f339da229034af66915928b5db30e89714d2475f88a89e6a929908235b96a55bbf9844b72516f4c9daef4647fe88940fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/nl/firefox-53.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "865e3793198f3a6184be1189d45a59f7fc927e461c419177419b24064b22f026c2472043fa94d5d0bf31f4766a3c7c9aa8fb0ac941e539f7a599d3057616eb63";
+      sha512 = "6e4d3fb2169193f6d8da4de668600006ee0b606276575b87bd125ea71664b0c336a77ab714d3070d228731ac1cfb0e50a363157686270e22604636e5bb2550fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nn-NO/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/nn-NO/firefox-53.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "146ad9571d8aa517f6f36a9e74250bc2fd18854686153b84a5e365f8a850d06fabd2d220bd99b0aeb51522fbe03f48f9021efbd157d3be32b84be1f028c4ad60";
+      sha512 = "f65a41a996d858bedf5130a470d601835afeca11f0e7cc0c9db5da2a95f8c9f43775b9dff63373388eb725ec7f3c75ebc35cac43cab6e6a70e647c397c4a330a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/or/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/or/firefox-53.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "1e6eea8ac94645a6d7137a841b5335cca9c018eb2c3df2685357c8003856846d06401d07417ea7cf2197a06f99ff9ef2865b200bd50607368ea062f3093f5143";
+      sha512 = "1fd1b0bbaf28532e6efd4b0ea1da3da0243376eb75217a7f96f9e463976db3269f439e224b9fd6f7df64374a4fabab1cb9650eac14d43c31bee4414fa1b2789c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pa-IN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/pa-IN/firefox-53.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "1c96db3314794c5a2840fc4fbbcc46af424b45da9a7a25a47f84a6db22896094f87d523d9828e424507bef6394002c6f585aca9f0b21687957bbbae9ad6d2b5a";
+      sha512 = "8bbd5ed6f80e8214ff4fbdf888c734b685f6e423d2769d577dbbd844d98dbb71a3a249b73901c31f7af9d40502c0556da7c722c15e56e876f6ae626209298f59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/pl/firefox-53.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "9748ccfdceff346c1b9fd888f3b50281e1b32030446bd9e8d1fc2b3931903ecbef15d2fb6bbb895f10a66a2d103a640d8a9610d8b4e91fd6558b0608a3b9ffb3";
+      sha512 = "0f735b9f5c2e31208df33f3020805a8dd86f1a58e0eade9f78f747f1f78639b643b044b7c13d58f54fd31cbe80b88701b16a8ed036086af440514d297a7db476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-BR/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/pt-BR/firefox-53.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "4403ed0cc168740b92bca6e24243f6797a6d604ef159fce37459d0d6a56aab57d1feddf5e382931d17cb388ce98a2f0cfb1b21f877dd4bc72d666e6e9d390d7b";
+      sha512 = "5d02dc3a4d9cbdcd981f37aaff7c5cc493b425f54b9c106a11d35f9ad71864b062b796db2888752608a20928f75ae50220075951f593630f0e75c3bbaadf0d1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-PT/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/pt-PT/firefox-53.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "25a08eec03fc6d09258c4c0bb545a86e0e762dfedc47551da51b35c9eae61732726a4484b44e0124fabdf4e89f5148cc435019a253d4f35740155e7c272d3516";
+      sha512 = "34aa94ed091da16d3ec461c5acc6d6b3d9af74b3b53a4ced1a31a453599ed101af95afc14016cc5d3cf3a472c6e64a560978443af59f4fe20566611c5b6bc2bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/rm/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/rm/firefox-53.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d378a1fa02ee8976c1545d31a3914745777c0a9246004d127d7beb5764643d1f57a237e1039d85388f9f8e4b987d2e9a2bd1b95bda2d11ff319c3bc7bf992243";
+      sha512 = "cd2ce4e0e7cc6a01ae0f2e9baa52d02d27da25cdc515c8835ea0eca94eff3f9b717e8a275fbb3c70a161aff71c370888df9ce2cc3fb1507862d4d9b2975278f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ro/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ro/firefox-53.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4776dea591426d6d42c1aa9d64988b57d0b691348185e1656a6363d1ad30495601501546600bfd375513773d5b2fa2030c475254f430facfd30f54dae039fc18";
+      sha512 = "2a54982ddb5f3bc3e12c2149fb048b9bccd473528ad2293d65ac5c7f7039619dedcef6bdf6f528da5808aad0c72651c0738b75c34ea660a550ee1d02d8a57d08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ru/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ru/firefox-53.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "aedb429d9cc396b71bc2eb4ee4a48fb3a35b1e3a8d0a4cd92514a864243527aadb443c3419841128253bc8700a154808281b6d54d5a455c9e8a0a986219da09c";
+      sha512 = "405f916989de464fc1d796868bf227c065b7516701ddeee88cd87cdf3798c65ce3234c8e3b051a1906c7d44a8c641dada9d475c793423b6c6978b06f32ba43fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/si/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/si/firefox-53.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "5626afbbacc76c688c887e5554fe68c75ad966b1a2d968fbeab1113626e014699c7e3eb88c6cf57a79fb3167cf00132188b842e78cdace2edf6268246c0bb616";
+      sha512 = "87dc423dcd846084855e89710515f79c33e15bfee052ada78815829a4ab36a80b07722cb66805450d9c2aab044e46927cc700e6331c49ad8c9ca3d73f9928c4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/sk/firefox-53.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e923b6bff6772e85d5e92517ffdeac5fe69cafdc0253e5cdbe7e0bf8d7796048e85609cab00c68a81953dd61fee5a45cfd962efb365c1aafc2fb331d04d499df";
+      sha512 = "f40997d4bf484cca92c30446dcb480ab9506e3845de34ca885b10d662a0c40af2a5f0bd8f9eb5f03625746e6dcc89f91dc90d3ec45c03d14c25563543e61ca25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sl/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/sl/firefox-53.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "1d719fa0a38859ce974d18288a80e4e39d2d7ac445503d1ff199087e584e716da27682a557989178fcf9ac5ffeafec520d33be467a8011ae182f1403219cb5da";
+      sha512 = "44d70ad13f16fd860f9ae2f98b93e60cd35fe7b2f758e724d666c5e133ee7a11852b3d4d4c1461f187b6781d6fe03e8f733950270563b79516184ee21f242fcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/son/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/son/firefox-53.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "41a431f673bf3b50fc881f4f038728493204e54c01b381f65709515966457629805ee74cbcc29b15790e01e0cca12d04f1dbe89ddbb02864f771ef3afe764e29";
+      sha512 = "be7232ae04d0c84ef3dfa87232fd44d296c88fffd5d147d2748c2410e71d9e00914c1d9b1f30dc53144a46b75d8f66f4768c7be49092a89f4fdc60aaf16567d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sq/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/sq/firefox-53.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "723b08e56396dc0a6d5de76c8740da5ce05a3cad52bd82d07b7acfc0796f24c92c9f1906788728a0c40779dd5a0370643da8f9a3b661227e0587032c7b8d0003";
+      sha512 = "84ad114c66593a3dbe842e86b789822ab9d648aabe781eb4fa168bfb8ae59a84d264cb9032f4232c8793181589138329eefc1a42303e49ceb3978a1daf628d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/sr/firefox-53.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "9d217e36877985e1b16dfaef3b8d38139611c9b69ef9b6b8195c7848b7422eb8c1473ae1afbe0c72a78c7210ea1230be3f61690a691a1bdef5afa000c81d4dd1";
+      sha512 = "405ce3acfe9952882b3b7575c3d76075f8c862cf7bb6679c7c57987ad33babfde4a4381b9a7769a142f2d77bb70b1dbd89aba6e89a71cf85c9c23ff2ac3e5e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sv-SE/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/sv-SE/firefox-53.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "32d937a075de2a2e82fcd8577f5675e1021b6790188c96e236501491fc01fef8ddee119efefa6285f3453fd4b769386c3f5bb5a9768b72c113636ca209f37d8a";
+      sha512 = "f0981a0dbb1170de9c7335c77537aa755dd307a2ca146593cc33d3435662c20cf45dbb4524624cbe2e45d92c334454a3573697b94e69f15a358b96e0781b8822";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ta/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ta/firefox-53.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "64950279283837ff0bc154c24f83923c5744e9373554393d7be3fcee3064677d52ac40851bdb44a5dc42ddb504b75d0f7f48ba3af85eeb0e9a227a4c4700e90e";
+      sha512 = "472e43aca4a82b560d40ae7cb6d1eb2c1ba2f35f16854ddf578c4b46e79ac92a799197836a9836dbf085e5a67f60dccad411f15609ab9c6d9d5211dcf4f836d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/te/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/te/firefox-53.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "645c17713775bb33636b67d6390e4ba419a409dc9b26c66644a61df96dba9ce1b921fdacb179a711826b71124c71d65acd64bd6f8633d26b524bc97850bab68f";
+      sha512 = "6176764add4203260696c38ccefbbd131d122c742a1e5fbf3a39a90e0f46f793a77b748dfb6ed51dcb5ef8e5c80f0d2d8b7eb83a709fb6e7e7e3b79fbba58c65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/th/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/th/firefox-53.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "96131590a5d6c0bd06e319a35466873c08b90f7922499827e84044f5b69b10ef0d79435652487761ebad0740348244204bc5deed707b6c293e15f7b48ba254fa";
+      sha512 = "780df5a04a1ab6c382bd4ca6b883f4559f7be91507f2d34721311198d3c326946faad7d799896b7990459cccc2a118be499a3e05a4768be346740565c51f8d53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/tr/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/tr/firefox-53.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "5b290f2e223f943b9b7c7df43df6ec01dbb5744d7db8c35256896ac5c4ae216fe0af72ffa6797d7a4b7c69eb9e742b48e2242914b52d02a99ed1c8a384030bc8";
+      sha512 = "4838857c6a0502e75eafc3e3f02c3acd08473d55c915dd50c9aa3a125c0a48a35a78a2d3259c4320cefc46c91a210aa8941ede0b567749fea14e8bf4b8d2cc5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uk/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/uk/firefox-53.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "112741b2048410a65d7070b2d7c8a6cc0ae2bef812d626aaf3efd907afe50bba496bd6af06edbd433140040722fc6b7999695f7e2a9cfd3049eb105219a1004f";
+      sha512 = "ce52666f29fec0103e73c72a3ca9a6465283381f45b9429da8e7223b051674d3bb730293d2db8fce13c1851e948b784900838600b4d5cc059913939c7efccd0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uz/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/ur/firefox-53.0.tar.bz2";
+      locale = "ur";
+      arch = "linux-i686";
+      sha512 = "17e9805191781db7ffa4bf3ddaa4c35799145b92b25382fc1d71f34e1bfbbe3607a60a3466fe52a50c49ca66f5adce1cf705df44a5a9cb1987e5d3962f384896";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/uz/firefox-53.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "1cbc2e527e928d4afaf138ae0515e9d6c3c2b7bb95f097c88a697c14988b84f765eb328509f451b024e2b62596f93c85ef298d5ffc76c4a8244cc77c10d9db05";
+      sha512 = "811f56c38a852862a850a066989795e90a95409503192e1801cdb0cc1300430413f088776a08b00a1f2d29f43859664bcb33bc8f9dcfcf3b3afae2d076b32f61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/vi/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/vi/firefox-53.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "925658b5946201243ebbb6c1a92537702e0afc1e67f990ecdc8b17c976791e671907c314b0681fef7eacd63a9ec554af25862f6a98c1b1508bc1c0fc2a282d35";
+      sha512 = "cf41ae5a4ea21059c33bbf614478abd983f0d6744fbb96ee4700dc922bec960db45cd85e3767fc060108b5695274dece1e05136151971a7650bca5076830c2ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/xh/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xh/firefox-53.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0ff098e6fc96238a475cbd209f03d888bc3a23fdeb45497e2ba86f52f6aad6d69b679af83f559d9b9086f01c0fcf894025138dafe6d9250b1851769a1b262e64";
+      sha512 = "b86956b0b79c18a30c21e5d6293fd5cb8a13ea5756aa1302d343987d913bbd26cca518b2d89ef927f76b334c24da4fbe839f14492dd184c79d147d4fd4c9da45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-CN/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/zh-CN/firefox-53.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "cc0bca5885820769253613f851159e91e2a982616cc84fde27d57ed0064b0e650a6239bfb8c291e2889cb2e5d1fd29de6d8e828e9e6defd65fff030d79d2ef3f";
+      sha512 = "530ebfa31a7097476d224388245a8a195509fb0da702787644ba3b0fd44c11be35942c7af2bd1f2832f10db58dcded3d91715f72d27566b315e94a8c2cb82367";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-TW/firefox-52.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/zh-TW/firefox-53.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f40191f32c211314a6ee4bbae6675eeeb70dddb10cf770c197440969487722ecf1543a2479cd18b3e55d927d642b54d06722822ac99851d2e1d400d9784baa38";
+      sha512 = "da6d2dd2fbc29bd161d07dc13e74f7cc2ade49a16e6fdb3e3a9ec420af600914eff973007e4c2445f050ada9bf406c2007de963015790e403a5085d982d95bff";
     }
     ];
 }

From b0179351036a870da8c1a89c991a359a73aab0e2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Apr 2017 03:28:08 +0200
Subject: [PATCH 1244/1744] vlc: Fix build for Qt >= 5.7.0

This basically does something similar than the AUR build:

https://aur.archlinux.org/packages/vlc-qt5/

On our side, all there is to do is to force compiling using C++11 mode
and use a patch that the AUR package took from the following upstream
patchwork URL:

https://patches.videolan.org/patch/14061/

Instead of passing CXXFLAGS to the configure script, I'm using sed here
to make sure we don't override flags figured out by configure.

For example if ./configure is used with CXXFLAGS=-std=c++11 appended or
prepended, we have something like:

... -I../include   -std=c++11 -Wall -Wextra -Wsign-compare ...

While if we don't do that at all, we have something like:

... -I../include   -g -O2 -Wall -Wextra -Wsign-compare ...

Another way would be to use NIX_CFLAGS_COMPILE, but that would affect
even compilation of C code and thus resulting in a bunch of warnings
like this:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++
              but not for C

So with our approach the flags during build look much better:

... -I../include   -std=c++11 -g -O2 -Wall -Wextra -Wsign-compare ...

Another thing I've changed is that the vlc_qt5 attribute in
all-packages.nix now uses the latest Qt 5 version, because the build for
Qt >= 5.7.0 is now no longer broken.

I've also ordered the preConfigure attribute before the configureFlags
attribute, because it makes more sense in terms of context (pre ->
configure -> post).

Tested by building on x86_64-linux with libsForQt56.vlc, libsForQt58.vlc
and vlc (the Qt 4 version, just to be sure I didn't accidentally break
it).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ttuegel
---
 pkgs/applications/video/vlc/default.nix | 21 +++++++++++++++------
 pkgs/top-level/all-packages.nix         |  3 +--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index f3554ab230e..c52d1439012 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
     sha256 = "1gjkrwlg8ab3skzl67cxb9qzg4187ifckd1z9kpy11q058fyjchn";
   };
 
+  patches = optional withQt5 (fetchurl {
+    name = "Fix-build-using-old-GCC-intrinsics.patch";
+    url = "https://patches.videolan.org/patch/14061/raw/";
+    sha256 = "16v4k7378a590diz11bdvdaqi9cpf6333hp5wr6v5sfrsma8qvpx";
+  });
+
   # Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
   # https://trac.videolan.org/vlc/ticket/16497
   postPatch = if (!withQt5) then null else
@@ -50,6 +56,15 @@ stdenv.mkDerivation rec {
 
   LIVE555_PREFIX = live555;
 
+  preConfigure = ''
+    sed -e "s@/bin/echo@echo@g" -i configure
+  '' + optionalString withQt5 ''
+    # Make sure we only *add* "-std=c++11" to CXXFLAGS instead of overriding the
+    # values figured out by configure (for example "-g -O2").
+    sed -i -re '/^ *CXXFLAGS=("[^$"]+")? *$/s/CXXFLAGS="?/&-std=c++11 /' \
+      configure
+  '';
+
   configureFlags =
     [ "--enable-alsa"
       "--with-kde-solid=$out/share/apps/solid/actions"
@@ -61,8 +76,6 @@ stdenv.mkDerivation rec {
     ]
     ++ optional onlyLibVLC  "--disable-vlc";
 
-  preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';
-
   enableParallelBuilding = true;
 
   preBuild = ''
@@ -76,9 +89,5 @@ stdenv.mkDerivation rec {
     homepage = http://www.videolan.org/vlc/;
     platforms = platforms.linux;
     license = licenses.lgpl21Plus;
-    broken =
-      if withQt5
-      then builtins.compareVersions qtbase.version "5.7.0" >= 0
-      else false;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4d4db7df03..690ca4c0bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16022,8 +16022,7 @@ with pkgs;
     gtk = gtk2;
   };
 
-  # VLC 3.0 is needed to compile in C++11 mode (QT 5.7)
-  vlc_qt5 = libsForQt56.vlc;
+  vlc_qt5 = libsForQt5.vlc;
 
   vmpk = callPackage ../applications/audio/vmpk { };
 

From ad0ad62c31547f08115ae6eb8bfcd838fb979643 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 19 Apr 2017 00:12:33 -0400
Subject: [PATCH 1245/1744] oraclejdk: 8u121 -> 8u131

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 2f16acb51d9..8e93f76ff18 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "121";
+  patchVersion = "131";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
-  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
+  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
+  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 2f16acb51d9..8e93f76ff18 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "121";
+  patchVersion = "131";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
-  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
+  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
+  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 30b774a5c7a4a6720f49b63a2ef26bd1d0c719ce Mon Sep 17 00:00:00 2001
From: Andrew Miloradovsky <miloradovsky@gmail.com>
Date: Wed, 19 Apr 2017 05:23:03 +0000
Subject: [PATCH 1246/1744] dale: 20170416 -> 20170419

- now builds on x86-32 too (+ tests)
- fairer platforms declaration
- corrected the license information
---
 pkgs/development/compilers/dale/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index d1fb9b21243..358bb060e48 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }:
 
-let version = "20170416";
+let version = "20170419";
     doCheck = false;
 in stdenv.mkDerivation {
   name = "dale-${version}";
@@ -8,8 +8,8 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "tomhrr";
     repo = "dale";
-    rev = "ecc5ea91efef8a263c7dddd6925983df5b5258b2";
-    sha256 = "0naly7jsfriiqf68q210ay9ppcvidbwwcxksy5zwy1m17aq5kxaw";
+    rev = "64e072d0520a134b9ae8038104fa977776b6e0af";
+    sha256 = "1apvq3v6ra8x0sj8gg9yavqsyxiggh2wnh1zbw2ccpg723bssl4a";
   };
 
   buildInputs = [ cmake libffi llvm_35 ] ++
@@ -28,8 +28,10 @@ in stdenv.mkDerivation {
       S-expressions for syntax and supports syntactic macros.
     '';
     homepage = "https://github.com/tomhrr/dale";
-    license = licenses.mit;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ amiloradovsky ];
-    platforms = platforms.linux;  # fails on Darwin, linking vs. FFI
+    platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
+    # failed on Darwin: linker couldn't find the FFI lib
+    # failed on AArch64: because LLVM 3.5 is failed there
   };
 }

From 024cbbd520f526bb4d425e2b4275a2872d9bcd72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 19 Apr 2017 08:27:04 +0200
Subject: [PATCH 1247/1744] iana-etc: 20170328 -> 20170417

---
 pkgs/data/misc/iana-etc/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 01203f9b0bd..ed70de517ab 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iana-etc-${version}";
-  version = "20170328";
+  version = "20170417";
 
   src = fetchurl {
     url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
-    sha256 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk";
+    sha256 = "0gzv8ldyf3g70m4k3m50p2gbqwvxa343v2q4xcnl1jqfgw9db5wf";
   };
 
   installPhase = ''
@@ -14,9 +14,10 @@ stdenv.mkDerivation rec {
     cp services protocols $out/etc/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/Mic92/iana-etc;
     description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From 2052ff856f16f4406823077158e2c81607f8728b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 19 Apr 2017 11:26:25 +0200
Subject: [PATCH 1248/1744] mutt: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 8eb1169b5a2..4800fa938a0 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "1b8dggq5x1b77a9i9250b3jhv2iddfzhr9rix1yfzckdms65mr8b";
+    sha256 = "0dgjjryp1ggbc6ivy9cfz5jl3gnbahb6d6hcwn7c7wk5npqpn18x";
   };
 
   patchPhase = optionalString (openssl != null) ''

From 192659af57d638ceb23e8965e159d57331b548da Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Wed, 19 Apr 2017 12:23:45 +0200
Subject: [PATCH 1249/1744] radare2: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index a3267d8d9ea..0d4b55bb472 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -13,12 +13,12 @@ let
   optional = stdenv.lib.optional;
 in
 stdenv.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.4.0";
   name = "radare2-${version}";
 
   src = fetchurl {
     url = "http://cloud.radare.org/get/${version}/${name}.tar.gz";
-    sha256 = "1kwp0i5sqk5almnx4g8claimqz8rwvv1fn8x66k4az1s8k7g9kiv";
+    sha256 = "bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e";
   };
 
 

From c4c33eaca1c0b74c4f2d218c713bb9879d55b1b5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 19 Apr 2017 20:56:18 +0800
Subject: [PATCH 1250/1744] dropbox: use wmctrl from nixpkgs

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e6b5b8ca067..dbdb1cafa53 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper
+{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper, makeQtWrapper
 , dbus_libs, fontconfig, freetype, gcc, glib
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
 , libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
+, qtbase, qtdeclarative, qtwebkit, wmctrl
 }:
 
 # this package contains the daemon version of dropbox
@@ -98,6 +98,9 @@ in stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox
+
+    rm $out/${appdir}/wmctrl
+    ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
   '';
 
   fixupPhase = ''

From 399065f226ca70360f25682d76be3c5e89e60239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Apr 2017 17:14:51 +0200
Subject: [PATCH 1251/1744] aspell: only set ASPELL_CONF from NIX_PROFILES in
 wrapper if unset

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

diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index e69bbe0d2f2..8a0e7950396 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     #! $SHELL -e
     if [ -z "\$ASPELL_CONF" ]; then
       for p in \$NIX_PROFILES; do
-        if [ -d "\$p/lib/aspell" ]; then
+        if [ -z "\$ASPELL_CONF" ] && [ -d "\$p/lib/aspell" ]; then
           ASPELL_CONF="data-dir \$p/lib/aspell"
         fi
       done

From d70d50501d771541a96597d32a9981e8b93e61a4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Wed, 19 Apr 2017 20:13:34 +0200
Subject: [PATCH 1252/1744] psycopg2: 2.6.1 -> 2.7.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5bde08d5c12..c5acfcf40f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19468,11 +19468,11 @@ in {
   });
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.6.1";
+    name = "psycopg2-2.7.1";
     disabled = isPyPy;
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
-      sha256 = "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva";
+      sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6";
     };
     buildInputs = optional stdenv.isDarwin pkgs.openssl;
     propagatedBuildInputs = with self; [ pkgs.postgresql ];

From 042e26861245b578d39826c1b338b33e5633c25e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Apr 2017 20:19:56 +0200
Subject: [PATCH 1253/1744] Revert "aspell: only set ASPELL_CONF from
 NIX_PROFILES in wrapper if unset"

This reverts commit 399065f226ca70360f25682d76be3c5e89e60239.

I am blind, this was already checked above. Thanks @bjornfor for noticing.
---
 pkgs/development/libraries/aspell/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 8a0e7950396..e69bbe0d2f2 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     #! $SHELL -e
     if [ -z "\$ASPELL_CONF" ]; then
       for p in \$NIX_PROFILES; do
-        if [ -z "\$ASPELL_CONF" ] && [ -d "\$p/lib/aspell" ]; then
+        if [ -d "\$p/lib/aspell" ]; then
           ASPELL_CONF="data-dir \$p/lib/aspell"
         fi
       done

From ff252c799db18ea05cc9aab408c57ec6054bbe44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Apr 2017 20:27:24 +0200
Subject: [PATCH 1254/1744] Fix typo in comment

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

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 5d3da35c54f..96d5e1fe283 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -57,7 +57,7 @@ in let
   # nixpkgs configuration), infer the other one and platform as needed.
   localSystem = lib.systems.elaborate (
     # Allow setting the platform in the config file. This take precedence over
-    # the inferred platform, but not over an explicitly passed-in onw.
+    # the inferred platform, but not over an explicitly passed-in one.
     builtins.intersectAttrs { platform = null; } config
     // args.localSystem);
 

From d8e87fc0c4357d9683f7b9fa4bea8faa34bb7693 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Wed, 19 Apr 2017 15:20:51 -0500
Subject: [PATCH 1255/1744] Disable parallel building

---
 pkgs/development/compilers/halvm/2.4.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 08e74bdb78e..c42ca4edb4a 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.4.0";
   name = "HaLVM-${version}";
   isHaLVM = true;
+  enableParallelBuilding = false;
   isGhcjs = false;
   src = fetchgit {
     rev = "65fad65966eb7e60f234453a35aeb564a09d2595";

From 940a71faedad153717aed3651cf2a06d7ced0307 Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Wed, 19 Apr 2017 22:56:16 +0200
Subject: [PATCH 1256/1744] gitkraken: 2.3.3 -> 2.4.0

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index b02da41f9d6..2090da057b0 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.3.3";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "a6e235ab1a4c1da755af8218ad819fcac6bc89b1a324aa2c0e430f3805cb1a16";
+    sha256 = "1s95wnlyy41s8gy7vq4k8w03qrhxq56fr7idsrgvcv065cf5hqmd";
   };
 
   libPath = makeLibraryPath [

From 1675d54db37d98e38f583b96d6daa6751ba5a681 Mon Sep 17 00:00:00 2001
From: Mesh33 <vincent.turrin@gmail.com>
Date: Thu, 20 Apr 2017 00:09:54 +0200
Subject: [PATCH 1257/1744] units: 2.13 -> 2.14

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

diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index e8b93569c72..90758e909e5 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "units-${version}";
-  version = "2.13";
+  version = "2.14";
 
   src = fetchurl {
     url = "mirror://gnu/units/${name}.tar.gz";
-    sha256 = "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b";
+    sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8";
   };
 
   buildInputs = [ readline ];

From 8bd1a6c0b20701618640e2db1108ab6ff6d5226b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 17 Feb 2017 19:15:08 -0500
Subject: [PATCH 1258/1744] libiconv: 1.14 -> 1.15

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

diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 5f1f6afcec1..4c634de9246 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -3,11 +3,12 @@
 assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross
 
 stdenv.mkDerivation rec {
-  name = "libiconv-1.14";
+  name = "libiconv-${version}";
+  version = "1.15";
 
   src = fetchurl {
     url = "mirror://gnu/libiconv/${name}.tar.gz";
-    sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
+    sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc";
   };
 
   patches = lib.optionals stdenv.isCygwin [

From 9902d63e8498c94abbdcb24737cd3883de0df73f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 20 Apr 2017 00:12:08 +0200
Subject: [PATCH 1259/1744] grsecurity: 4.9.22-201704120836 ->
 4.9.23-201704181901

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 779a80208d1..8d4ae1d1060 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.22";
+  version = "4.9.23";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
+    sha512 = "0nf68gpgkxglrrrpvadbbc66bpd7vfl3820z5yv4zpz8lx56y02w4pn166aqffwxr60xw15mkp65ircnhclz9qcv4778wkbwd7pv1k0";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2f0073ef25f..38483e8d765 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.22";
-      grrev  = "201704120836";
-      sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
+    { kver   = "4.9.23";
+      grrev  = "201704181901";
+      sha512 = "1cwiqrr707iz6rv72ikj6h3r6r5x325qlq21gsacsxslvk8igmj97amnqylsg32bjj0za072cb8lqf0zvrv7xzvlc9zjcwridd79vc2";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 0602b9d1943591d1ee9b056fca7919af8696d599 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 20 Apr 2017 00:16:19 +0200
Subject: [PATCH 1260/1744] torbrowser: 6.5.1 -> 6.5.2

---
 .../applications/networking/browsers/torbrowser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
index 5ce7c4780c8..9bf8a184e72 100644
--- a/pkgs/applications/networking/browsers/torbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -81,19 +81,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "6.5.1";
+  version = "6.5.2";
 
   lang = "en-US";
 
   srcs = {
     "x86_64-linux" = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i";
+      sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
     };
 
     "i686-linux" = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
+      sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
     };
   };
 in

From e662e035f9ed4d125c7534bc65e01fc73a0b0f62 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 20 Apr 2017 00:22:31 +0200
Subject: [PATCH 1261/1744] nixos/systemd-boot-builder: Don't write .pyc files

This has surfaced since d990aa716327abb018e8352dcf7ba2fcfb4fc34c.

The "simpleUefiGummiboot" installer test fails since this commit,
because that commit introduced a small check to verify whether the store
was altered.

While installing NixOS for the first time, the store is usually in
/mnt/nix/store and without the read-only bind mount that's preventing
programs from altering the store.

So after nixos-install is done creating the system closure and setting
it as the active system profile, the bootloader is written from the
closure inside the chroot. The systemd-boot-builder is invoked during
this step, which adds .pyc files for various Python modules of the
Python 3 store path, which in turn invalidates the hash of the Python 3
store path itself.

At the time the system is booted up again, the nix-store is verified and
fails with something like this:

path /nix/store/zvm545rqc4d97caqq9h7344bnd06jhzb-python3-3.5.3 was
modified! expected hash
b2c975f4b8d197443fbb09690fb3f6545e165dd44c9309d7d6df2fce0579ebeb, got
bccca19f39c9d26d857ccf1fb72818b2b817967e6d497a25a1283e36ed0acf01

Running the interpreter with the -B argument prevents Python from
writing those byte code files:

https://docs.python.org/3/using/cmdline.html#cmdoption-B

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../system/boot/loader/systemd-boot/systemd-boot-builder.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index d5e00129a82..704c574b822 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -1,4 +1,4 @@
-#! @python3@/bin/python3
+#! @python3@/bin/python3 -B
 import argparse
 import shutil
 import os

From acf12543a500916673b4bb3e23fa9f1ede63cf9c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 20 Apr 2017 08:05:15 +0900
Subject: [PATCH 1262/1744] firefox-esr: 52.0.2esr -> 52.1.0esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 86f6f995bdb..8e7b6ae198f 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -161,8 +161,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "52.0.2esr";
-    sha512 = "a0f31479e5265c7f40d3013c3dc8368c6bdf03f21f1c9054fb2ae5557065584da433b288b493680d6147a3b11155f41bd33ad2a5d53c6eaa507258c7e00d7335";
+    version = "52.1.0esr";
+    sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";

From 5989515b9410f3d557e1aba037325a218f4338f5 Mon Sep 17 00:00:00 2001
From: Tom Saeger <tom.saeger@gmail.com>
Date: Wed, 19 Apr 2017 14:41:28 -0500
Subject: [PATCH 1263/1744] lib: trivial spelling fixes

---
 lib/attrsets.nix              | 6 +++---
 lib/composable-derivation.nix | 4 ++--
 lib/customisation.nix         | 2 +-
 lib/deprecated.nix            | 4 ++--
 lib/fetchers.nix              | 2 +-
 lib/lists.nix                 | 2 +-
 lib/modules.nix               | 2 +-
 lib/strings.nix               | 4 ++--
 lib/tests.nix                 | 4 ++--
 lib/types.nix                 | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index c686e1d20eb..d2946f6ca9c 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -116,7 +116,7 @@ rec {
     listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
 
 
-  /* Filter an attribute set recursivelly by removing all attributes for
+  /* Filter an attribute set recursively by removing all attributes for
      which the given predicate return false.
 
      Example:
@@ -334,7 +334,7 @@ rec {
       value = f name (catAttrs name sets);
     }) names);
 
-  /* Implentation note: Common names  appear multiple times in the list of
+  /* Implementation note: Common names  appear multiple times in the list of
      names, hopefully this does not affect the system because the maximal
      laziness avoid computing twice the same expression and listToAttrs does
      not care about duplicated attribute names.
@@ -353,7 +353,7 @@ rec {
   zipAttrs = zipAttrsWith (name: values: values);
 
   /* Does the same as the update operator '//' except that attributes are
-     merged until the given pedicate is verified.  The predicate should
+     merged until the given predicate is verified.  The predicate should
      accept 3 arguments which are the path to reach the attribute, a part of
      the first attribute set and a part of the second attribute set.  When
      the predicate is verified, the value of the first attribute set is
diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix
index 5442dcedeab..5e55ac023f1 100644
--- a/lib/composable-derivation.nix
+++ b/lib/composable-derivation.nix
@@ -39,7 +39,7 @@ let inherit (lib) nv nvs; in
   #
   # issues:
   # * its complicated to understand
-  # * some "features" such as exact merge behaviour are burried in mergeAttrBy
+  # * some "features" such as exact merge behaviour are buried in mergeAttrBy
   #   and defaultOverridableDelayableArgs assuming the default behaviour does
   #   the right thing in the common case
   # * Eelco once said using such fix style functions are slow to evaluate
@@ -48,7 +48,7 @@ let inherit (lib) nv nvs; in
   #   / add patches the way you want without having to declare function arguments
   #
   # nice features:
-  # declaring "optional featuers" is modular. For instance:
+  # declaring "optional features" is modular. For instance:
   #   flags.curl = {
   #     configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"];
   #     buildInputs = [curl openssl];
diff --git a/lib/customisation.nix b/lib/customisation.nix
index a6c24f083a5..4853290db54 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -10,7 +10,7 @@ rec {
 
   /* `overrideDerivation drv f' takes a derivation (i.e., the result
      of a call to the builtin function `derivation') and returns a new
-     derivation in which the attributes of the original are overriden
+     derivation in which the attributes of the original are overridden
      according to the function `f'.  The function `f' is called with
      the original derivation attributes.
 
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 45a3893fc22..983e8d26892 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -253,11 +253,11 @@ rec {
   # eg { a = 7; } {  a = [ 2 3 ]; } becomes { a = [ 7 2 3 ]; }
   mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a: b: (toList a) ++ (toList b) );
 
-  # merges attributes using //, if a name exisits in both attributes
+  # merges attributes using //, if a name exists in both attributes
   # an error will be triggered unless its listed in mergeLists
   # so you can mergeAttrsNoOverride { buildInputs = [a]; } { buildInputs = [a]; } {} to get
   # { buildInputs = [a b]; }
-  # merging buildPhase does'nt really make sense. The cases will be rare where appending /prefixing will fit your needs?
+  # merging buildPhase doesn't really make sense. The cases will be rare where appending /prefixing will fit your needs?
   # in these cases the first buildPhase will override the second one
   # ! deprecated, use mergeAttrByFunc instead
   mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
diff --git a/lib/fetchers.nix b/lib/fetchers.nix
index 19d89d6c407..21f28c32ef7 100644
--- a/lib/fetchers.nix
+++ b/lib/fetchers.nix
@@ -1,4 +1,4 @@
-# snippets that can be shared by mutliple fetchers (pkgs/build-support)
+# snippets that can be shared by multiple fetchers (pkgs/build-support)
 {
 
   proxyImpureEnvVars = [
diff --git a/lib/lists.nix b/lib/lists.nix
index 82d5ba0124c..fd746f4f97b 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -191,7 +191,7 @@ rec {
   */
   optional = cond: elem: if cond then [elem] else [];
 
-  /* Return a list or an empty list, dependening on a boolean value.
+  /* Return a list or an empty list, depending on a boolean value.
 
      Example:
        optionals true [ 2 3 ]
diff --git a/lib/modules.nix b/lib/modules.nix
index 862488310d8..91e2eae0595 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -423,7 +423,7 @@ rec {
     in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
 
   /* Sort a list of properties.  The sort priority of a property is
-     1000 by default, but can be overriden by wrapping the property
+     1000 by default, but can be overridden by wrapping the property
      using mkOrder. */
   sortProperties = defs:
     let
diff --git a/lib/strings.nix b/lib/strings.nix
index ffa93c8e454..d48624257cf 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -126,8 +126,8 @@ rec {
   */
   makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
 
-  /* Dependening on the boolean `cond', return either the given string
-     or the empty string. Useful to contatenate against a bigger string.
+  /* Depending on the boolean `cond', return either the given string
+     or the empty string. Useful to concatenate against a bigger string.
 
      Example:
        optionalString true "some-string"
diff --git a/lib/tests.nix b/lib/tests.nix
index d93cadf2533..995a743fe43 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -231,7 +231,7 @@ runTests {
     };
     in {
       expr = generators.toJSON {} val;
-      # trival implementation
+      # trivial implementation
       expected = builtins.toJSON val;
   };
 
@@ -243,7 +243,7 @@ runTests {
     };
     in {
       expr = generators.toYAML {} val;
-      # trival implementation
+      # trivial implementation
       expected = builtins.toJSON val;
   };
 
diff --git a/lib/types.nix b/lib/types.nix
index c834cc8e653..45122759bfc 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -52,7 +52,7 @@ rec {
     { # Human-readable representation of the type, should be equivalent to
       # the type function name.
       name
-    , # Description of the type, defined recursively by embedding the the wrapped type if any.
+    , # Description of the type, defined recursively by embedding the wrapped type if any.
       description ? null
     , # Function applied to each definition that should return true if
       # its type-correct, false otherwise.

From 1fbbf4c169439013f02eae173976b0ff4875ef51 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 19 Apr 2017 21:40:10 -0300
Subject: [PATCH 1264/1744] tint2: 0.12.12 -> 0.14.1

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

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index f72f4fdc567..f817303d025 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12.12";
+  version = "0.14.1";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "0zgcdancsna95sjxslack9lh8f6qnj8d5wm02891mshn2jhgins3";
+    sha256 = "1wxz8sbv4cx3d3s5mbrzffidi3nayh1g6bd8m1ndz61jhv01ypam";
   };
 
   enableParallelBuilding = true;

From fabfec05124f6b5903cade29d4646f572af71556 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 19 Apr 2017 21:02:49 -0400
Subject: [PATCH 1265/1744] openjdk: 8u121-13 -> 8u131-11

---
 pkgs/development/compilers/openjdk/8.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 6eb8f67b5f5..7ddf2c7ef5d 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "121";
-  build = "13";
+  update = "131";
+  build = "11";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1ns0lnl5n05k1kgp8d6fyyk6gx57sx7rmlcc33d3vxhr58560nbv";
+             sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "0vj5mnqw80r4xqlmiab7wbrkhz3rl8ijhwqplkbs42wad75lvnh8";
+             sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0mcjjc34jvckg1f1x9v7gik3h5y4kx7skkfgzhknh14637jzb2hs";
+             sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0bxf1mrpmxgjmg40yi3ww7lh22f6h0nrvlvf5jwwzf4hb3a3998g";
+             sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "10f641ngwiqr2z6hbz0xkyfh8h3z7kdxj5b1d30rgynzghf5wksr";
+             sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1bgjpivlxi0qlmhvz838zzkzz26d4ly8b0c963kx0lpabz8p99xi";
+             sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "17bcb5ic1ifk5rda1dzjd1483k9mah5npjg5dg77iyziq8kprvri";
+             sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "19fmlipqk9qiv7jc84b0z022q403nyp7b32a5qqqcn6aavdqnf7c";
+             sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From 4b9ac70a8749a50bf61ec0875d47401d2b41a17f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 19 Apr 2017 21:06:02 -0400
Subject: [PATCH 1266/1744] scala: 2.12.1 -> 2.12.2

---
 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 7971d7a8b23..e48fc63096e 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.1";
+  name = "scala-2.12.2";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d";
+    sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 2f026678d511ba07dd5325a30e6ec6718cef6597 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 19 Apr 2017 21:09:27 -0400
Subject: [PATCH 1267/1744] scala: 2.11.10 -> 2.11.11

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

diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index 404c469b86d..469c8c8e3bc 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.10";
+  name = "scala-2.11.11";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "10rs8ak3qyxggw24ga3gjcpl3x8r1b3ykrdfrym1n154b1rrs904";
+    sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 2f6667016237634a1b84e1af2eb0ec716f80e38c Mon Sep 17 00:00:00 2001
From: Unknown <vincent.turrin@gmail.com>
Date: Thu, 20 Apr 2017 03:42:49 +0200
Subject: [PATCH 1268/1744] buildtorrent: init at 0.8

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

diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
new file mode 100644
index 00000000000..064c836f843
--- /dev/null
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let version = "0.8"; in
+
+stdenv.mkDerivation rec {
+	name = "buildtorrent";
+
+	src = fetchurl {
+		url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz";
+		sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
+	};
+
+	meta = {
+		description = "A simple commandline torrent creator";
+		homepage = http://mathr.co.uk/blog/torrent.html;
+		license = stdenv.lib.licenses.gpl3Plus;
+		platforms = stdenv.lib.platforms.all;
+	};
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 690ca4c0bd4..3e7db8866c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -707,6 +707,8 @@ with pkgs;
 
   btrbk = callPackage ../tools/backup/btrbk { };
 
+  buildtorrent = callPackage ../tools/misc/buildtorrent { };
+
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
   byobu = callPackage ../tools/misc/byobu {

From f0f9cad9f2ae06018188b39f3947bbbe5f68881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Apr 2017 07:03:17 +0200
Subject: [PATCH 1269/1744] linuxPackages.broadcom-sta: add patch to repo

fetchPatch was unreliable and the checksum kept breaking all the time
---
 .../linux/broadcom-sta/default.nix            |  7 +-
 .../linux/broadcom-sta/linux48.patch          | 64 +++++++++++++++++++
 2 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux48.patch

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index cb65b9d8403..8b2bac38438 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -25,13 +25,10 @@ stdenv.mkDerivation {
     ./i686-build-failure.patch
     ./license.patch
     ./linux-4.7.patch
+    # source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms
+    ./linux-4.8.patch
     ./null-pointer-fix.patch
     ./gcc.patch
-    (fetchpatch {
-      name = "linux-4.8.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f";
-      sha256 = "0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a";
-    })
   ];
 
   makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux48.patch b/pkgs/os-specific/linux/broadcom-sta/linux48.patch
new file mode 100644
index 00000000000..20e8a9ae49d
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux48.patch
@@ -0,0 +1,64 @@
+From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Fri, 2 Sep 2016 17:35:34 +0200
+Subject: [PATCH 1/1] Add support for Linux 4.8
+
+Orginal author: Krzysztof Kolasa
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index 2fc71fe..ec5e472 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true,
++		};
++		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
+ 		cfg80211_scan_done(wl->scan_request, true);     
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+@@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 
+ scan_done_out:
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = false,
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		cfg80211_scan_done(wl->scan_request, false);
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 	rtnl_unlock();
+@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true,
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		cfg80211_scan_done(wl->scan_request, true);	
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+-- 
+2.7.4
+

From 080c799f386e327cc102b3281425da8341c52ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Apr 2017 07:32:02 +0200
Subject: [PATCH 1270/1744] jwhois: fix service name

after an update of iana-etc the service name of whois changed
---
 pkgs/tools/networking/jwhois/default.nix        |  2 +-
 pkgs/tools/networking/jwhois/service-name.patch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/jwhois/service-name.patch

diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index 2a2e444f5b2..1d7932c7ad3 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr/bin/lynx|${lynx}/bin/lynx|g" $out/etc/jwhois.conf
   '';
 
-  patches = [ ./connect.patch ];
+  patches = [ ./connect.patch ./service-name.patch ];
 
   meta = {
     description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/pkgs/tools/networking/jwhois/service-name.patch
new file mode 100644
index 00000000000..170eddbad79
--- /dev/null
+++ b/pkgs/tools/networking/jwhois/service-name.patch
@@ -0,0 +1,17 @@
+--- a/src/dns.c   2007-06-25 23:58:38.000000000 -0700
++++ b/src/dns.c   2016-06-04 16:20:19.644865127 -0700
+@@ -113,12 +113,13 @@
+ lookup_host_addrinfo(struct addrinfo **res, const char *host, int port)
+ {
+   struct addrinfo hints;
+-  char ascport[10] = "whois";
++  char ascport[10] = "nicname";
+   int error;
+
+   memset(&hints, 0, sizeof(hints));
+   hints.ai_family = PF_UNSPEC;
+
++  hints.ai_flags = AI_ADDRCONFIG;
+   hints.ai_socktype = SOCK_STREAM;
+   if (port)
+     sprintf(ascport, "%9.9d", port);

From b61e9f6d249e9dac1465d93a1bc36abcac84d329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Apr 2017 08:12:53 +0200
Subject: [PATCH 1271/1744] linuxPackages.broadcom-sta: patch file was not
 named correctly

---
 .../linux/broadcom-sta/{linux48.patch => linux-4.8.patch}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/os-specific/linux/broadcom-sta/{linux48.patch => linux-4.8.patch} (100%)

diff --git a/pkgs/os-specific/linux/broadcom-sta/linux48.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch
similarity index 100%
rename from pkgs/os-specific/linux/broadcom-sta/linux48.patch
rename to pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch

From 61c49b1014fe9b72c72d26def2e1f8b49a60977f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 10:28:31 +0200
Subject: [PATCH 1272/1744] pythonPackages.statsmodels: fix eval

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

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index bdadac896ef..d77dc6e373a 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Statistical computations and models for use with SciPy";
     homepage = "https://www.github.com/statsmodels/statsmodels";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From 67adf69a169b8ea70c37067c5765d34ad25761e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Apr 2017 10:32:52 +0200
Subject: [PATCH 1273/1744] inetutils: fix service name

---
 pkgs/tools/networking/inetutils/default.nix        | 10 +++++++---
 pkgs/tools/networking/inetutils/service-name.patch | 11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/inetutils/service-name.patch

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 3a6e9b625b8..ad058174cff 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl }:
+{ stdenv, fetchurl, ncurses, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "inetutils-1.9.4";
@@ -8,9 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
   };
 
-  patches = [ ./whois-Update-Canadian-TLD-server.patch ];
+  patches = [
+    ./whois-Update-Canadian-TLD-server.patch
+    ./service-name.patch
+  ];
 
-  buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ];
+  buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ];
 
   configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
 
@@ -18,6 +21,7 @@ stdenv.mkDerivation rec {
   # $TMPDIR is too long.
   #doCheck = true;
 
+
   postInstall = ''
     # XXX: These programs are normally installed setuid but since it
     # fails, they end up being non-executable, hence this hack.
diff --git a/pkgs/tools/networking/inetutils/service-name.patch b/pkgs/tools/networking/inetutils/service-name.patch
new file mode 100644
index 00000000000..e34516313c5
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/service-name.patch
@@ -0,0 +1,11 @@
+--- inetutils-1.9.4.org/whois/whois.c	2015-03-31 17:40:50.000000000 +0200
++++ inetutils-1.9.4/whois/whois.c	2017-04-20 10:23:38.487358708 +0200
+@@ -576,7 +576,7 @@
+   hints.ai_family = AF_UNSPEC;
+   hints.ai_socktype = SOCK_STREAM;
+ 
+-  if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)
++  if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)
+     err_quit ("getaddrinfo: %s", gai_strerror (i));
+ 
+   for (ressave = res; res; res = res->ai_next)

From fc3fc9110a6d5bdf5beda1cfe940bab8d14d3b84 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 10:55:59 +0200
Subject: [PATCH 1274/1744] pythonPackages.netaddr: 0.7.18 -> 0.7.19

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2294ea8b62a..bcc4194e3c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15646,16 +15646,28 @@ in {
   };
 
   netaddr = buildPythonPackage rec {
-    name = "netaddr-0.7.18";
-    doCheck = !isPy35;  # https://github.com/drkjam/netaddr/issues/117
+    pname = "netaddr";
+    version = "0.7.19";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/netaddr/${name}.tar.gz";
-      sha256 = "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd";
     };
 
     LC_ALL = "en_US.UTF-8";
-    buildInputs = [ pkgs.glibcLocales ];
+    buildInputs = with self; [ pkgs.glibcLocales pytest ];
+
+    checkPhase = ''
+      py.test netaddr/tests
+    '';
+
+    patches = [
+      (pkgs.fetchpatch {
+        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; 
+        sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7";
+      })
+    ];
 
     meta = {
       homepage = https://github.com/drkjam/netaddr/;

From 60eaa476abd8639468c222380d32e52bc4eb4607 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 13:41:22 +0200
Subject: [PATCH 1275/1744] pythonPackages.ipython: 5.3.0 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
new file mode 100644
index 00000000000..0823a76e2a6
--- /dev/null
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+# Build dependencies
+, glibcLocales
+# Test dependencies
+, nose
+, pygments
+, isPy27
+, mock
+# Runtime dependencies
+, jedi
+, decorator
+, pickleshare
+, simplegeneric
+, traitlets
+, prompt_toolkit
+, pexpect
+, appnope
+}:
+
+buildPythonPackage rec {
+  pname = "ipython";
+  version = "6.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f429b82b8d9807068da734b15965768bd21b15d0b706340b6d1b4d6f6f5b98a4";
+  };
+
+  prePatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace setup.py --replace "'gnureadline'" " "
+  '';
+
+  buildInputs = [ glibcLocales ];
+
+  checkInputs = [ nose pygments ] ++ lib.optional isPy27 mock;
+
+  propagatedBuildInputs = [
+    jedi
+    decorator
+    pickleshare
+    simplegeneric
+    traitlets
+    prompt_toolkit
+    pexpect
+  ] ++ lib.optionals stdenv.isDarwin [appnope];
+
+  LC_ALL="en_US.UTF-8";
+
+  doCheck = false; # Circular dependency with ipykernel
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  # IPython 6.0.0 and above does not support Python < 3.3.
+  # The last IPython version to support older Python versions
+  # is 5.3.x.
+  disabled = pythonOlder "3.3";
+
+  meta = {
+    description = "IPython: Productive Interactive Computing";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bjornfor jgeerds fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcc4194e3c9..7739d744414 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13085,40 +13085,7 @@ in {
 
   ipyparallel = callPackage ../development/python-modules/ipyparallel { };
 
-  ipython = buildPythonPackage rec {
-    version = "5.3.0";
-    name = "ipython-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipython/${name}.tar.gz";
-      sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d";
-    };
-
-    prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace setup.py --replace "'gnureadline'" " "
-    '';
-
-    buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock];
-
-    propagatedBuildInputs = with self;
-      [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
-      simplegeneric traitlets requests2 pathlib2 pexpect ]
-      ++ optionals stdenv.isDarwin [appnope];
-
-    LC_ALL="en_US.UTF-8";
-
-    doCheck = false; # Circular dependency with ipykernel
-
-    checkPhase = ''
-      nosetests
-    '';
-    meta = {
-      description = "IPython: Productive Interactive Computing";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ bjornfor jgeerds fridh ];
-    };
-  };
+  ipython = callPackage ../development/python-modules/ipython { };
 
   ipython_genutils = buildPythonPackage rec {
     version = "0.2.0";

From 893e40571df2f2219e79f7781634d833b02cf88f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 13:41:36 +0200
Subject: [PATCH 1276/1744] pythonPackages.decorator: 4.0.10 -> 4.0.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7739d744414..ca8764918d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6146,11 +6146,11 @@ in {
 
   decorator = buildPythonPackage rec {
     name = "decorator-${version}";
-    version = "4.0.10";
+    version = "4.0.11";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/decorator/${name}.tar.gz";
-      sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070";
+      sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76";
     };
 
     meta = {

From 1e4a5b85ab26b8f2f9444eb1b8860ee07b424402 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 13:42:00 +0200
Subject: [PATCH 1277/1744] pythonPackages.prompt_toolkit: 1.0.13 -> 1.0.14

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca8764918d7..5f1e6857438 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19239,10 +19239,10 @@ in {
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "1.0.13";
+    version = "1.0.14";
 
     src = pkgs.fetchurl {
-      sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776";
+      sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f";
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
     checkPhase = ''

From 8b09dea578428285c7d71b039d1e12ab340d514c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 20 Apr 2017 13:42:20 +0200
Subject: [PATCH 1278/1744] pythonPackages.jedi: 0.9.0 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
new file mode 100644
index 00000000000..3f5d4897537
--- /dev/null
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "jedi";
+  version = "0.10.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  # 7 failed
+  #doCheck = false;
+
+  meta = {
+    homepage = https://github.com/davidhalter/jedi;
+    description = "An autocompletion tool for Python that can be used for text editors";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f1e6857438..a55f8c91d0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13243,30 +13243,7 @@ in {
 
   jabberbot = callPackage ../development/python-modules/jabberbot.nix {};
 
-  jedi = buildPythonPackage (rec {
-    name = "jedi-0.9.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jedi/${name}.tar.gz";
-      sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v";
-    };
-
-    buildInputs = [ self.pytest ];
-
-    checkPhase = ''
-      py.test test
-    '';
-
-    # 7 failed
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/davidhalter/jedi;
-      description = "An autocompletion tool for Python that can be used for text editors";
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ garbas ];
-    };
-  });
+  jedi = callPackage ../development/python-modules/jedi { };
 
   jellyfish = buildPythonPackage rec {
     version = "0.5.2";

From 6572f5e81b1cf5afef32929b888373a018052834 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Thu, 20 Apr 2017 13:50:59 +0200
Subject: [PATCH 1279/1744] keepalived service: init (#22755)

---
 nixos/modules/module-list.nix                 |   1 +
 .../networking/keepalived/default.nix         | 245 ++++++++++++++++++
 .../keepalived/virtual-ip-options.nix         |  50 ++++
 .../networking/keepalived/vrrp-options.nix    | 121 +++++++++
 4 files changed, 417 insertions(+)
 create mode 100644 nixos/modules/services/networking/keepalived/default.nix
 create mode 100644 nixos/modules/services/networking/keepalived/virtual-ip-options.nix
 create mode 100644 nixos/modules/services/networking/keepalived/vrrp-options.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 52de4b23370..530ae1d1cf0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -420,6 +420,7 @@
   ./services/networking/i2p.nix
   ./services/networking/iodine.nix
   ./services/networking/ircd-hybrid/default.nix
+  ./services/networking/keepalived/default.nix
   ./services/networking/kippo.nix
   ./services/networking/kresd.nix
   ./services/networking/lambdabot.nix
diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
new file mode 100644
index 00000000000..378cd936584
--- /dev/null
+++ b/nixos/modules/services/networking/keepalived/default.nix
@@ -0,0 +1,245 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.keepalived;
+
+  keepalivedConf = pkgs.writeText "keepalived.conf" ''
+    global_defs {
+      ${snmpGlobalDefs}
+      ${cfg.extraGlobalDefs}
+    }
+
+    ${vrrpInstancesStr}
+    ${cfg.extraConfig}
+  '';
+
+  snmpGlobalDefs = with cfg.snmp; optionalString enable (
+    optionalString (socket != null) "snmp_socket ${socket}\n"
+    + optionalString enableKeepalived "enable_snmp_keepalived\n"
+    + optionalString enableChecker "enable_snmp_checker\n"
+    + optionalString enableRfc "enable_snmp_rfc\n"
+    + optionalString enableRfcV2 "enable_snmp_rfcv2\n"
+    + optionalString enableRfcV3 "enable_snmp_rfcv3\n"
+    + optionalString enableTraps "enable_traps"
+  );
+
+  vrrpInstancesStr = concatStringsSep "\n" (map (i:
+    ''
+      vrrp_instance ${i.name} {
+        interface ${i.interface}
+        state ${i.state}
+        virtual_router_id ${toString i.virtualRouterId}
+        priority ${toString i.priority}
+        ${optionalString i.noPreempt "nopreempt"}
+
+        ${optionalString i.useVmac (
+          "use_vmac" + optionalString (i.vmacInterface != null) " ${i.vmacInterface}"
+        )}
+        ${optionalString i.vmacXmitBase "vmac_xmit_base"}
+
+        ${optionalString (i.unicastSrcIp != null) "unicast_src_ip ${i.unicastSrcIp}"}
+        unicast_peer {
+          ${concatStringsSep "\n" i.unicastPeers}
+        }
+
+        virtual_ipaddress {
+          ${concatMapStringsSep "\n" virtualIpLine i.virtualIps}
+        }
+
+        ${i.extraConfig}
+      }
+    ''
+  ) vrrpInstances);
+
+  virtualIpLine = (ip:
+    ip.addr
+    + optionalString (notNullOrEmpty ip.brd) " brd ${ip.brd}"
+    + optionalString (notNullOrEmpty ip.dev) " dev ${ip.dev}"
+    + optionalString (notNullOrEmpty ip.scope) " scope ${ip.scope}"
+    + optionalString (notNullOrEmpty ip.label) " label ${ip.label}"
+  );
+
+  notNullOrEmpty = s: !(s == null || s == "");
+
+  vrrpInstances = mapAttrsToList (iName: iConfig:
+    {
+      name = iName;
+    } // iConfig
+  ) cfg.vrrpInstances;
+
+  vrrpInstanceAssertions = i: [
+    { assertion = i.interface != "";
+      message = "services.keepalived.vrrpInstances.${i.name}.interface option cannot be empty.";
+    }
+    { assertion = i.virtualRouterId >= 0 && i.virtualRouterId <= 255;
+      message = "services.keepalived.vrrpInstances.${i.name}.virtualRouterId must be an integer between 0..255.";
+    }
+    { assertion = i.priority >= 0 && i.priority <= 255;
+      message = "services.keepalived.vrrpInstances.${i.name}.priority must be an integer between 0..255.";
+    }
+    { assertion = i.vmacInterface == null || i.useVmac;
+      message = "services.keepalived.vrrpInstances.${i.name}.vmacInterface has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set.";
+    }
+    { assertion = !i.vmacXmitBase || i.useVmac;
+      message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set.";
+    }
+  ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps);
+
+  virtualIpAssertions = vrrpName: ip: [
+    { assertion = ip.addr != "";
+      message = "The 'addr' option for an services.keepalived.vrrpInstances.${vrrpName}.virtualIps entry cannot be empty.";
+    }
+  ];
+
+  pidFile = "/run/keepalived.pid";
+
+in
+{
+
+  options = {
+    services.keepalived = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Keepalived.
+        '';
+      };
+
+      snmp = {
+
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether to enable the builtin AgentX subagent.
+          '';
+        };
+
+        socket = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            Socket to use for connecting to SNMP master agent. If this value is
+            set to null, keepalived's default will be used, which is
+            unix:/var/agentx/master, unless using a network namespace, when the
+            default is udp:localhost:705.
+          '';
+        };
+
+        enableKeepalived = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP handling of vrrp element of KEEPALIVED MIB.
+          '';
+        };
+
+        enableChecker = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP handling of checker element of KEEPALIVED MIB.
+          '';
+        };
+
+        enableRfc = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP handling of RFC2787 and RFC6527 VRRP MIBs.
+          '';
+        };
+
+        enableRfcV2 = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP handling of RFC2787 VRRP MIB.
+          '';
+        };
+
+        enableRfcV3 = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP handling of RFC6527 VRRP MIB.
+          '';
+        };
+
+        enableTraps = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable SNMP traps.
+          '';
+        };
+
+      };
+
+      vrrpInstances = mkOption {
+        type = types.attrsOf (types.submodule (import ./vrrp-options.nix {
+          inherit lib;
+        }));
+        default = {};
+        description = "Declarative vhost config";
+      };
+
+      extraGlobalDefs = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra lines to be added verbatim to the 'global_defs' block of the
+          configuration file
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra lines to be added verbatim to the configuration file.
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    assertions = flatten (map vrrpInstanceAssertions vrrpInstances);
+
+    systemd.timers.keepalived-boot-delay = {
+      description = "Keepalive Daemon delay to avoid instant transition to MASTER state";
+      after = [ "network.target" "network-online.target" "syslog.target" ];
+      requires = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      timerConfig = {
+        OnActiveSec = "5s";
+        Unit = "keepalived.service";
+      };
+    };
+
+    systemd.services.keepalived = {
+      description = "Keepalive Daemon (LVS and VRRP)";
+      after = [ "network.target" "network-online.target" "syslog.target" ];
+      wants = [ "network-online.target" ];
+      serviceConfig = {
+        Type = "forking";
+        PIDFile = pidFile;
+        KillMode = "process";
+        ExecStart = "${pkgs.keepalived}/sbin/keepalived"
+          + " -f ${keepalivedConf}"
+          + " -p ${pidFile}"
+          + optionalString cfg.snmp.enable " --snmp";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "always";
+        RestartSec = "1s";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/keepalived/virtual-ip-options.nix b/nixos/modules/services/networking/keepalived/virtual-ip-options.nix
new file mode 100644
index 00000000000..1b8889b1b47
--- /dev/null
+++ b/nixos/modules/services/networking/keepalived/virtual-ip-options.nix
@@ -0,0 +1,50 @@
+{ lib } :
+
+with lib;
+{
+  options = {
+
+    addr = mkOption {
+      type = types.str;
+      description = ''
+        IP address, optionally with a netmask: IPADDR[/MASK]
+      '';
+    };
+
+    brd = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The broadcast address on the interface.
+      '';
+    };
+
+    dev = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The name of the device to add the address to.
+      '';
+    };
+
+    scope = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The scope of the area where this address is valid.
+      '';
+    };
+
+    label = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Each address may be tagged with a label string. In order to preserve
+        compatibility with Linux-2.0 net aliases, this string must coincide with
+        the name of the device or must be prefixed with the device name followed
+        by colon.
+      '';
+    };
+
+  };
+}
diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-options.nix
new file mode 100644
index 00000000000..79eff3ae541
--- /dev/null
+++ b/nixos/modules/services/networking/keepalived/vrrp-options.nix
@@ -0,0 +1,121 @@
+{ lib } :
+
+with lib;
+{
+  options = {
+
+    interface = mkOption {
+      type = types.str;
+      description = ''
+        Interface for inside_network, bound by vrrp.
+      '';
+    };
+
+    state = mkOption {
+      type = types.enum [ "MASTER" "BACKUP" ];
+      default = "BACKUP";
+      description = ''
+        Initial state. As soon as the other machine(s) come up, an election will
+        be held and the machine with the highest "priority" will become MASTER.
+        So the entry here doesn't matter a whole lot.
+      '';
+    };
+
+    virtualRouterId = mkOption {
+      type = types.int;
+      description = ''
+        Arbitrary unique number 0..255. Used to differentiate multiple instances
+        of vrrpd running on the same NIC (and hence same socket).
+      '';
+    };
+
+    priority = mkOption {
+      type = types.int;
+      default = 100;
+      description = ''
+        For electing MASTER, highest priority wins. To be MASTER, make 50 more
+        than other machines.
+      '';
+    };
+
+    noPreempt = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        VRRP will normally preempt a lower priority machine when a higher
+        priority machine comes online. "nopreempt" allows the lower priority
+        machine to maintain the master role, even when a higher priority machine
+        comes back online. NOTE: For this to work, the initial state of this
+        entry must be BACKUP.
+      '';
+    };
+
+    useVmac = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Use VRRP Virtual MAC.
+      '';
+    };
+
+    vmacInterface = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+         Name of the vmac interface to use. keepalived will come up with a name
+         if you don't specify one.
+      '';
+    };
+
+    vmacXmitBase = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Send/Recv VRRP messages from base interface instead of VMAC interface.
+      '';
+    };
+
+    unicastSrcIp = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+         Default IP for binding vrrpd is the primary IP on interface. If you
+         want to hide location of vrrpd, use this IP as src_addr for unicast
+         vrrp packets.
+      '';
+    };
+
+    unicastPeers = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Do not send VRRP adverts over VRRP multicast group. Instead it sends
+        adverts to the following list of ip addresses using unicast design
+        fashion. It can be cool to use VRRP FSM and features in a networking
+        environment where multicast is not supported! IP Addresses specified can
+        IPv4 as well as IPv6.
+      '';
+    };
+
+    virtualIps = mkOption {
+      type = types.listOf (types.submodule (import ./virtual-ip-options.nix {
+        inherit lib;
+      }));
+      default = [];
+      example = literalExample ''
+        TODO: Example
+      '';
+      description = "Declarative vhost config";
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Extra lines to be added verbatim to the vrrp_instance section.
+      '';
+    };
+
+  };
+
+}

From be7ce1b0e9809da1f41571a63584fb8b9e346295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 20 Apr 2017 14:48:40 +0200
Subject: [PATCH 1280/1744] kdiff3: fix with git mergetool

The quick patch has been submitted upstream.
---
 pkgs/tools/text/kdiff3/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 4303fe82a45..bd76b89ccf7 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, lib, fetchgit,
+  kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
   extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:
 
@@ -18,6 +18,15 @@ let
 
     setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
 
+    patches = [
+      (fetchpatch {
+        name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
+        url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
+        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
+      })
+    ];
+    patchFlags = "-p 2";
+
     postPatch = ''
       sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
     '';
@@ -26,6 +35,8 @@ let
 
     propagatedBuildInputs = [ kconfig kinit kparts ];
 
+    enableParallelBuilding = true;
+
     meta = with lib; {
       homepage = http://kdiff3.sourceforge.net/;
       license = licenses.gpl2Plus;

From d15f26ec69e3e76f3c145b92a35b315532e0cd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Apr 2017 14:56:04 +0200
Subject: [PATCH 1281/1744] dino: init at unstable-2017-04-20

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

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
new file mode 100644
index 00000000000..750cf504c60
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchFromGitHub
+, vala, cmake, wrapGAppsHook, pkgconfig, gettext
+, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking
+, xorg, libXdmcp, libxkbcommon
+, libnotify
+, libgcrypt
+, epoxy
+, at_spi2_core
+, sqlite
+, dbus
+, gpgme
+, pcre
+ }:
+
+stdenv.mkDerivation rec {
+  name = "dino-unstable-2017-04-20";
+
+  src = fetchFromGitHub {
+    owner = "dino";
+    repo = "dino";
+    rev = "5c8275ed4efdc7a3a0bc2a9c3a3f46d0383ddcf4";
+    sha256 = "12k3s8k8wmjyg5m0f4f2vp83bp0m9swmrsms81yd1722z3ragxsf";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    vala
+    cmake
+    pkgconfig
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gobjectIntrospection
+    glib_networking
+    glib
+    gnome3.libgee
+    sqlite
+    gdk_pixbuf
+    gtk3
+    libnotify
+    gpgme
+    libgcrypt
+    pcre
+    xorg.libxcb
+    xorg.libpthreadstubs
+    libXdmcp
+    libxkbcommon
+    epoxy
+    at_spi2_core
+    dbus
+    gettext
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Modern Jabber/XMPP Client using GTK+/Vala";
+    homepage = https://github.com/dino/dino;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e7db8866c0..c32be2c6d8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -883,6 +883,8 @@ with pkgs;
 
   ditaa = callPackage ../tools/graphics/ditaa { };
 
+  dino = callPackage ../applications/networking/instant-messengers/dino { };
+
   dlx = callPackage ../misc/emulators/dlx { };
 
   dosage = pythonPackages.dosage;

From 7e34a9c397b8950aeaedb1a11ae76536a979bc5f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Apr 2017 08:38:55 +0100
Subject: [PATCH 1282/1744] util-linux: fix path to umount in eject

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

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 872a1897457..9126a1cdec3 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace include/pathnames.h \
       --replace "/bin/login" "${shadow}/bin/login"
+    substituteInPlace sys-utils/eject.c \
+      --replace "/bin/umount" "$out/bin/umount"
   '';
 
   crossAttrs = {

From f8189e69bc9f2a5aa92298d62b48de8712e160fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 20 Apr 2017 12:25:21 -0500
Subject: [PATCH 1283/1744] dropbox: 23.4.19 -> 24.4.16

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index db14e2b841f..2d0d194206d 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "23.4.19";
+  version = "24.4.16";
   sha256 =
     {
-      "x86_64-linux" = "09vjic4yi6g6rbliz4b56swqdpjgw0m7gs2n40xhvbqfd35prafs";
-      "i686-linux"   = "0i2x2s7p1lq315z8198wjlfqr5lqj3mxdcqxz44skrbkmqfd9hab";
+      "x86_64-linux" = "01hnx52ag7wfclxnqzs9m09pnmisz9lczxgg3wm47qmwhagnb8la";
+      "i686-linux"   = "1cr0vfjwn60xdv2kh6kmmgf6g0s2y9mqklbfah59pm7k2yr2pvnf";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 80beb55cfcc6f7286f05a6edb7390ce3d5d40c84 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Thu, 20 Apr 2017 14:18:01 -0400
Subject: [PATCH 1284/1744] imager (r-modules): add pkgs.x11 to fix build,
 unmark imager/ForestTools as broken

---
 pkgs/development/r-modules/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 40d8e2b1b43..b3611d14e4b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -262,6 +262,7 @@ let
     h5 = [ pkgs.hdf5-cpp pkgs.which ];
     h5vc = [ pkgs.zlib.dev ];
     HiCseg = [ pkgs.gsl_1 ];
+    imager = [ pkgs.x11 ];
     iBMQ = [ pkgs.gsl_1 ];
     igraph = [ pkgs.gmp ];
     JavaGD = [ pkgs.jdk ];
@@ -832,7 +833,6 @@ let
     "flowVS"                          # depends on broken package r-flowCore-1.38.2
     "flowWorkspace"                   # depends on broken package r-flowCore-1.38.2
     "fmcsR"                           # depends on broken package ChemmineR-2.24.2
-    "ForestTools"                     # depends on broken package imager-0.31
     "fPortfolio"                      # depends on broken package Rsymphony-0.1-26
     "fracprolif"                      # build is broken
     "funModeling"                     # build is broken
@@ -888,7 +888,6 @@ let
     "IHW"                             # depends on broken package r-lpsymphony-1.0.2
     "IHWpaper"                        # depends on broken package r-lpsymphony-1.0.2
     "IlluminaHumanMethylation450k_db" # build is broken
-    "imager"                          # build is broken
     "immunoClust"                     # depends on broken package r-flowCore-1.38.2
     "inSilicoMerging"                 # build is broken
     "intansv"                         # build is broken

From a76841e399c377c7a3f515d7dc358593b6f45280 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Apr 2017 19:55:52 +0000
Subject: [PATCH 1285/1744] asymptote: 2.40 -> 2.41

---
 pkgs/tools/graphics/asymptote/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 0fbca9f659c..de3ba3621a8 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -9,11 +9,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.40";
+    version="2.41";
     name="${baseName}-${version}";
-    hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
-    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz";
-    sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
+    hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
+    url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz";
+    sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
   };
   buildInputs = [
    ghostscriptX imagemagick fftw

From 0fcc6ca51541223c799ea233aef1bccc80caf0cc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Apr 2017 20:16:35 +0000
Subject: [PATCH 1286/1744] ocamlPackages.menhir: 20170101 -> 20170418

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index e7e29c73a6b..b02015e6d56 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170418" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr"
+  else if version == "20170418" then "0avxkighxfr9x3vh2dkc5r1k2w7q2dz005w7syyzr7qjybpavpii"
   else throw ("menhir: unknown version " ++ version);
 in
 
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
index 9d4615a006b..d52da82d6d7 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       and Yann Régis-Gianas.
     '';
     license = with licenses; [
-      qpl /* generator */
+      (if versionAtLeast version "20170418" then gpl2 else qpl) /* generator */
       lgpl2 /* library */
     ];
     platforms = ocaml.meta.platforms or [];

From 8bb981fce35167978f59bcad61144970412a0b05 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 20 Apr 2017 23:30:07 +0200
Subject: [PATCH 1287/1744] sbcl: 1.3.15 -> 1.3.16

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index d1dcda064cb..a50c71b6209 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.15";
+  version = "1.3.16";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi";
+    sha256 = "0qw8kcn66sr1k7ilm6i66dk3ybym722ccxa4xi8w7bkhgc0ripdp";
   };
 
   patchPhase = ''

From 43707f27649b9b2bb9c6e6966e53143fad2a8fd5 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 20 Apr 2017 23:30:56 +0200
Subject: [PATCH 1288/1744] sbclBootstrap.x86_64-linux: 1.2.15 -> 1.3.16

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

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 8f442bd890b..04eda583f28 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -8,9 +8,9 @@ let
       sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
     };
     x86_64-linux = rec {
-      version = "1.2.15";
+      version = "1.3.16";
       system = "x86-64-linux";
-      sha256 = "1bpbfz9x2w73hy2kh8p0kd4m1p6pin90h2zycq52r3bbz8yv47aw";
+      sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
     };
     i686-linux = rec {
       version = "1.2.7";

From e4ea8e13d66b4a7b187c4ade49d9c09432c9b975 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 20 Apr 2017 23:31:54 +0200
Subject: [PATCH 1289/1744] sbcl: remove unused file 1.2.5.nix

---
 pkgs/development/compilers/sbcl/1.2.5.nix | 84 -----------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 pkgs/development/compilers/sbcl/1.2.5.nix

diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix
deleted file mode 100644
index 4f854652ffe..00000000000
--- a/pkgs/development/compilers/sbcl/1.2.5.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ stdenv, fetchurl, sbclBootstrap, clisp, which}:
-
-stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
-  version = "1.2.5";
-
-  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr";
-  };
-
-  buildInputs = [ which ]
-    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
-    ++ (stdenv.lib.optional stdenv.isLinux clisp)
-    ;
-
-  patchPhase = ''
-    echo '"${version}.nixos"' > version.lisp-expr
-    echo "
-    (lambda (features)
-      (flet ((enable (x)
-               (pushnew x features))
-             (disable (x)
-               (setf features (remove x features))))
-        (enable :sb-thread))) " > customize-target-features.lisp
-
-    pwd
-
-    # SBCL checks whether files are up-to-date in many places..
-    # Unfortunately, same timestamp is not good enough
-    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
-    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date input/a)'
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-fasl/a)'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
-
-    # Fix software version retrieval
-    sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
-
-    # Fix the tests
-    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
-    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
-    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
-    # Use whatever `cc` the stdenv provides
-    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-  '';
-
-  preBuild = ''
-    export INSTALL_ROOT=$out
-    mkdir -p test-home
-    export HOME=$PWD/test-home
-  '';
-
-  buildPhase = if stdenv.isLinux
-    then ''
-      sh make.sh clisp --prefix=$out
-    ''
-    else ''
-      sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
-    '';
-
-  installPhase = ''
-    INSTALL_ROOT=$out sh install.sh
-  '';
-
-  meta = {
-    description = "Lisp compiler";
-    homepage = http://www.sbcl.org;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    inherit version;
-  };
-}

From 053edc0689357d03a6d51ea2f468eee8205370f8 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 20 Apr 2017 23:33:00 +0200
Subject: [PATCH 1290/1744] sbclBootstrap.aarch64-linux: init at 1.3.16

---
 pkgs/development/compilers/sbcl/bootstrap.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 04eda583f28..1fe2bb90ad9 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -17,6 +17,11 @@ let
       system = "x86-linux";
       sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
     };
+    aarch64-linux = rec {
+      version = "1.3.16";
+      system = "arm64-linux";
+      sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
+    };
     armv7l-linux = rec {
       version = "1.2.14";
       system = "armhf-linux";

From 6878d0661becfbf62b5746bac5ca4ca3d582559e Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 20 Apr 2017 23:37:24 +0200
Subject: [PATCH 1291/1744] stunnel: 5.39 -> 5.41

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

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index cf930769b86..fbebba21dbd 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.39";
+  version = "5.41";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318";
+    sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h";
   };
 
   buildInputs = [ openssl ];

From c2306a2ff4075dd44b85c3d91ae8200e2d95afab Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 21 Apr 2017 00:12:34 +0200
Subject: [PATCH 1292/1744] libpst: 0.6.68 -> 0.6.70

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

diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index 0a7eb618b18..9eb3d345ecb 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -2,11 +2,11 @@
   pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "libpst-0.6.68";
+  name = "libpst-0.6.70";
 
   src = fetchurl {
       url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
-      sha256 = "06mcaga36i65n1ifr5pw6ghcb1cjfqwrmm1xmaw1sckqf2iqx2by";
+      sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r";
     };
 
   buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2

From 2b4ad8d34e4c96675e637c2a29b48e02435fb145 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 21 Apr 2017 00:20:49 +0200
Subject: [PATCH 1293/1744] mlt: 6.2.0 -> 6.4.1

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

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index a28936fee49..15a62f26414 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.2.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7";
+    sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w";
   };
 
   buildInputs = [

From bcd349d70dd194d1660c249a1340026f0cb7d177 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 21 Apr 2017 00:25:23 +0200
Subject: [PATCH 1294/1744] picolisp: 16.6 -> 16.12

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

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 04aca84f902..2a5d9d2f574 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -3,10 +3,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "picoLisp-${version}";
-  version = "16.6";
+  version = "16.12";
   src = fetchurl {
     url = "http://www.software-lab.de/${name}.tgz";
-    sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3";
+    sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
   };
   buildInputs = optional stdenv.is64bit jdk;
   patchPhase = optionalString stdenv.isArm ''

From 8162ee9b60e1d070d4d1922d31142a70bbddd123 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 21 Apr 2017 00:32:02 +0200
Subject: [PATCH 1295/1744] cmucl: 21a -> 21b

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

diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 63290735f41..2833c5378c1 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (stdenv) system;
-  version = "21a";
+  version = "21b";
   downloadUrl = arch:
     "http://common-lisp.net/project/cmucl/downloads/release/" +
     "${version}/cmucl-${version}-${arch}.tar.bz2";
@@ -13,7 +13,7 @@ let
   dist =
     if system == "i686-linux" then fetchDist {
         arch = "x86-linux";
-        sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02";
+        sha256 = "13k3b5ygnbsq6n2i3r5i4ljw3r1qlskn2p5f4x9hrx6vfvbb3k7a";
       }
     else throw "Unsupported platform for cmucl.";
 in

From 8316eb5a5f889bcc859ef4e684df62c368e7b4e2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 17:55:47 -0500
Subject: [PATCH 1296/1744] libbsd: fixup on darwin

This is my attempt to get libbsd workin on Darwin. It's kind of a mess
right now with patches. Most of it are ugly hacks but at least it builds!
---
 pkgs/development/libraries/libbsd/default.nix | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 44a1fd5b3e2..9cef18471ab 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
   version = "0.8.3";
 
-  src = fetchurl {
-    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
+  nativeBuildInputs = [ autoreconfHook ];
+
+  preAutoreconf = "mkdir m4";
+
+  patchPhase = ''
+    substituteInPlace configure.ac \
+      --replace "m4_esyscmd([./get-version])" "${version}"
+    sed -i '38i#undef strlcpy' include/bsd/string.h
+    sed -i '38i#undef strlcat' include/bsd/string.h
+    substituteInPlace src/setproctitle.c \
+     --replace 'extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));' ""
+  '';
+
+  src = fetchFromGitHub {
+    owner = "JackieXie168";
+    repo = "libbsd";
+    rev = "macosx-${version}";
+    sha256 = "1g5h6d7i297m0hs2l0dxvsx6p0z96959pzgp75drbb7mkrf32p2z";
   };
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
     homepage = http://libbsd.freedesktop.org/;
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From b68882707290ccafdf315fc617842e81d99faf47 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 20:17:43 -0500
Subject: [PATCH 1297/1744] libbsd: use patch instead of fork

---
 .../development/libraries/libbsd/darwin.patch | 675 ++++++++++++++++++
 pkgs/development/libraries/libbsd/default.nix |  27 +-
 2 files changed, 684 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/libbsd/darwin.patch

diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
new file mode 100644
index 00000000000..77062cf4ec8
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -0,0 +1,675 @@
+diff --git a/configure.ac b/configure.ac
+index 5a432d4..a69ae0b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AS_CASE([$host_os],
+ )
+ 
+ # Checks for header files.
+-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_UID_T
+@@ -143,6 +143,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
+                 pstat_getproc sysconf])
+ AM_CONDITIONAL(HAVE_GETENTROPY, [test "x$ac_cv_func_getentropy" = "xtrue"])
+ 
++HostOS=`echo "$host" | sed 's/.*-//'`
++os_is_macosx=false
++nonLinuxOS=false
++AC_SUBST(HostOS)
++case ${HostOS} in
++	darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
++		os_is_macosx=true
++		nonLinuxOS=true
++		echo HostOS="$HostOS"
++		;;
++	*)
++		echo host="$host"
++		echo HostOS="$HostOS"
++		os_is_macosx=false
++		nonLinuxOS=false
++		;;
++esac		
++AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
++AM_COND_IF([IS_DARWIN],
++	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
++
++AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
++AM_COND_IF([NON_LINUX],
++	[AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
++
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	include/Makefile
+diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
+index ebb6160..ce882bf 100644
+--- a/include/bsd/libutil.h
++++ b/include/bsd/libutil.h
+@@ -39,7 +39,9 @@
+ #ifndef _LIBUTIL_H_
+ #define _LIBUTIL_H_
+ 
++#ifdef HAVE_FEATURES_H
+ #include <features.h>
++#endif
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
+index 7697425..ef34c4f 100644
+--- a/include/bsd/stdio.h
++++ b/include/bsd/stdio.h
+@@ -44,12 +44,16 @@
+ __BEGIN_DECLS
+ const char *fmtcheck(const char *, const char *);
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ /* XXX: The function requires cooperation from the system libc to store the
+  * line buffer in the FILE struct itself. */
+ char *fgetln(FILE *fp, size_t *lenp)
+ 	__attribute__((deprecated("This functions cannot be safely ported, "
+ 	                          "use getline(3) instead, as it is supported "
+ 	                          "by GNU and POSIX.1-2008.")));
++#else
++char *fgetln(FILE *fp, size_t *lenp);
++#endif
+ 
+ /*
+  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
+diff --git a/include/bsd/string.h b/include/bsd/string.h
+index ee2f953..a3ab077 100644
+--- a/include/bsd/string.h
++++ b/include/bsd/string.h
+@@ -37,11 +37,14 @@
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+-size_t strlcpy(char *dst, const char *src, size_t siz);
+-size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
++size_t bsd_strlcat(char *dst, const char *src, size_t siz);
++void bsd_strmode(mode_t mode, char *str);
++#else
+ void strmode(mode_t mode, char *str);
+-
++#endif
+ void explicit_bzero(void *buf, size_t len);
+ __END_DECLS
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad83dbf..0f2a7ee 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
+ 	libbsd.map
+ libbsd_la_LIBADD = \
+ 	$(CLOCK_GETTIME_LIBS)
++
++if IS_DARWIN
++libbsd_la_LDFLAGS = \
++	-Wl \
++	-version-number $(LIBBSD_ABI)
++else
+ libbsd_la_LDFLAGS = \
+ 	-Wl,--version-script=$(srcdir)/libbsd.map \
+ 	-version-number $(LIBBSD_ABI)
++endif
++
+ libbsd_la_SOURCES = \
+ 	arc4random.c \
+-	arc4random.h \
+-	arc4random_unix.h \
+-	arc4random_openbsd.h \
+ 	arc4random_uniform.c \
+ 	bsd_getopt.c \
+-	chacha_private.h \
+ 	closefrom.c \
+ 	dehumanize_number.c \
+ 	err.c \
+@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
+ 	$(nil)
+ endif
+ 
++noinst_HEADERS = \
++	arc4random.h \
++	arc4random_bsd.h \
++	arc4random_linux.h \
++	arc4random_unix.h \
++	arc4random_osx.h \
++	arc4random_openbsd.h \
++	chacha_private.h
++
+ libbsd_ctor_a_SOURCES = \
+ 	setproctitle_ctor.c \
+ 	$(nil)
+diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
+new file mode 100644
+index 0000000..ece2f85
+--- /dev/null
++++ b/src/arc4random_bsd.h
+@@ -0,0 +1,86 @@
++/*	$OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++/*
++ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
++ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
++ * appear to fail silently. So, it is not always possible to detect a PID
++ * wraparound.
++ */
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
+new file mode 100644
+index 0000000..d61a8db
+--- /dev/null
++++ b/src/arc4random_linux.h
+@@ -0,0 +1,86 @@
++/*	$OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++#ifdef __GLIBC__
++extern void *__dso_handle;
++extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
++#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
++#else
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++#endif
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
+new file mode 100644
+index 0000000..14771a6
+--- /dev/null
++++ b/src/arc4random_osx.h
+@@ -0,0 +1,82 @@
++/*	$OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <unistd.h>
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		*rsp = NULL;
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/fgetln.c b/src/fgetln.c
+index 4d1726e..9c73788 100644
+--- a/src/fgetln.c
++++ b/src/fgetln.c
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <string.h>
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ #include "local-link.h"
++#endif
+ 
+ #ifdef HAVE_GETLINE
+ struct filebuf {
+@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
+ 		return fb->buf;
+ 	}
+ }
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ libbsd_link_warning(fgetln,
+                     "This functions cannot be safely ported, use getline(3) "
+                     "instead, as it is supported by GNU and POSIX.1-2008.")
++#endif
+ #else
+ #error "Function fgetln() needs to be ported."
+ #endif
+diff --git a/src/fpurge.c b/src/fpurge.c
+index 462535a..e7eb46f 100644
+--- a/src/fpurge.c
++++ b/src/fpurge.c
+@@ -26,9 +26,11 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#if HAVE___FPURGE
+ #include <stdio_ext.h>
++#endif
+ 
+-#ifdef HAVE___FPURGE
++#ifdef HAVE___FPURGE                   /* glibc >= 2.2, Haiku, Solaris >= 7 */
+ int
+ fpurge(FILE *fp)
+ {
+@@ -42,5 +44,55 @@ fpurge(FILE *fp)
+ 	return 0;
+ }
+ #else
+-#error "Function fpurge() needs to be ported."
++#define fp_ fp
++//#error "Function fpurge() needs to be ported."
++//#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++int
++fpurge(FILE *fp)
++{
++	if (fp == NULL || fileno(fp) < 0) {
++		errno = EBADF;
++		return EOF;
++	}
++
++  /* Call the system's fpurge function.  */
++# undef fpurge
++# if !HAVE_DECL_FPURGE
++  extern int fpurge (FILE *);
++# endif
++  int result = fpurge (fp);
++# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++  if (result == 0)
++    /* Correct the invariants that fpurge broke.
++       <stdio.h> on BSD systems says:
++         "The following always hold: if _flags & __SRD, _w is 0."
++       If this invariant is not fulfilled and the stream is read-write but
++       currently reading, subsequent putc or fputc calls will write directly
++       into the buffer, although they shouldn't be allowed to.  */
++    if ((fp_->_flags & __SRD) != 0)
++      fp_->_w = 0;
++#endif
++  return result;
++}
++//#endif
++#endif
++
++#ifdef TEST
++int
++main()
++{
++	static FILE fp_bad;
++	FILE *fp;
++
++	if (fpurge(&fp_bad) == 0)
++		return 1;
++
++	fp = fopen("/dev/zero", "r");
++	if (fpurge(fp) < 0)
++		return 1;
++
++	fclose(fp);
++
++	return 0;
++}
+ #endif
+diff --git a/src/funopen.c b/src/funopen.c
+index 7d6ae31..9963162 100644
+--- a/src/funopen.c
++++ b/src/funopen.c
+@@ -137,6 +137,7 @@ funopen(const void *cookie,
+ 
+ 	return fopencookie(cookiewrap, mode, funcswrap);
+ }
++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+ #else
+ #error "Function funopen() needs to be ported."
+ #endif
+diff --git a/src/getentropy.c b/src/getentropy.c
+index 3f11a1e..8a23a07 100644
+--- a/src/getentropy.c
++++ b/src/getentropy.c
+@@ -28,9 +28,7 @@
+ #include "getentropy_linux.c"
+ #elif defined(__GNU__)
+ #include "getentropy_hurd.c"
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#include "getentropy_bsd.c"
+-#elif defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ #include "getentropy_bsd.c"
+ #elif defined(__sun)
+ #include "getentropy_solaris.c"
+diff --git a/src/hash/sha512.h b/src/hash/sha512.h
+index 4f368a1..ab22fc1 100644
+--- a/src/hash/sha512.h
++++ b/src/hash/sha512.h
+@@ -29,7 +29,11 @@
+ #ifndef _SHA512_H_
+ #define _SHA512_H_
+ 
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#include <stdint.h>
++#else
+ #include <sys/types.h>
++#endif
+ 
+ #define SHA512_DIGEST_LENGTH		64
+ 
+diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
+index c2a93be..f69013d 100644
+--- a/src/hash/sha512c.c
++++ b/src/hash/sha512c.c
+@@ -27,7 +27,11 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ 
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#include <machine/endian.h>
++#else
+ #include <sys/endian.h>
++#endif
+ #include <sys/types.h>
+ 
+ #include <string.h>
+diff --git a/src/nlist.c b/src/nlist.c
+index 0cffe55..f785b61 100644
+--- a/src/nlist.c
++++ b/src/nlist.c
+@@ -27,6 +27,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
+ #endif /* LIBC_SCCS and not lint */
+@@ -409,3 +410,4 @@ elf_sym_to_nlist(struct nlist *nl, Elf_Sym *s, Elf_Shdr *shdr, int shnum)
+ 		nl->n_type |= N_EXT;
+ }
+ #endif /* _NLIST_DO_ELF */
++#endif
+diff --git a/src/setproctitle.c b/src/setproctitle.c
+index c18c61c..b1b1591 100644
+--- a/src/setproctitle.c
++++ b/src/setproctitle.c
+@@ -32,6 +32,11 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#define __asm__(x)
++extern char **environ;
++#endif
++
+ static struct {
+ 	/* Original value. */
+ 	const char *arg0;
+@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
+  * for code linking against that version, and change the default to use the
+  * new version, so that new code depends on the implemented version. */
+ #ifdef HAVE_TYPEOF
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++//
++// HACK: even weak aliasing breaks in clang so just comment this out for now
++//
++// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
++#else
+ extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
++#endif
+ #else
+ void setproctitle_stub(const char *fmt, ...)
+ 	__attribute__((alias("setproctitle_impl")));
+diff --git a/src/strlcat.c b/src/strlcat.c
+index 21c8afb..e036132 100644
+--- a/src/strlcat.c
++++ b/src/strlcat.c
+@@ -27,7 +27,11 @@
+  * If retval >= siz, truncation occurred.
+  */
+ size_t
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strlcat(char *dst, const char *src, size_t siz)
++#else
+ strlcat(char *dst, const char *src, size_t siz)
++#endif
+ {
+ 	char *d = dst;
+ 	const char *s = src;
+diff --git a/src/strlcpy.c b/src/strlcpy.c
+index 1719d35..c63591d 100644
+--- a/src/strlcpy.c
++++ b/src/strlcpy.c
+@@ -25,7 +25,11 @@
+  * Returns strlen(src); if retval >= siz, truncation occurred.
+  */
+ size_t
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strlcpy(char *dst, const char *src, size_t siz)
++#else
+ strlcpy(char *dst, const char *src, size_t siz)
++#endif
+ {
+ 	char *d = dst;
+ 	const char *s = src;
+diff --git a/src/strmode.c b/src/strmode.c
+index 8d825ae..c1b5f8d 100644
+--- a/src/strmode.c
++++ b/src/strmode.c
+@@ -37,7 +37,11 @@ static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
+ #include <string.h>
+ 
+ void
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strmode(mode_t mode, char *p)
++#else
+ strmode(mode_t mode, char *p)
++#endif
+ {
+ 	 /* print type */
+ 	switch (mode & S_IFMT) {
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 9cef18471ab..013fea3e9fc 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,28 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
   version = "0.8.3";
 
+  src = fetchurl {
+    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
+  };
+
+  # darwin changes configure.ac which means we need to regenerate
+  # the configure scripts
   nativeBuildInputs = [ autoreconfHook ];
 
-  preAutoreconf = "mkdir m4";
-
-  patchPhase = ''
-    substituteInPlace configure.ac \
-      --replace "m4_esyscmd([./get-version])" "${version}"
-    sed -i '38i#undef strlcpy' include/bsd/string.h
-    sed -i '38i#undef strlcat' include/bsd/string.h
-    substituteInPlace src/setproctitle.c \
-     --replace 'extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));' ""
-  '';
-
-  src = fetchFromGitHub {
-    owner = "JackieXie168";
-    repo = "libbsd";
-    rev = "macosx-${version}";
-    sha256 = "1g5h6d7i297m0hs2l0dxvsx6p0z96959pzgp75drbb7mkrf32p2z";
-  };
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";

From 59c70e446c39df37bb83e9d6386c7d2e95ae399c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Apr 2017 07:02:31 +0000
Subject: [PATCH 1298/1744] jbuilder: 1.0+beta5 -> 1.0+beta7

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

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index 3fa0c2685ee..f1bf5e33a61 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, opam }:
 
 stdenv.mkDerivation {
-  name = "jbuilder-1.0+beta5";
+  name = "jbuilder-1.0+beta7";
   src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta5.tar.gz;
-    sha256 = "00kh83n3216g1n7rhh14mcmw9bj5vzq7kiixm1abrc09dhwh4m7a";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz;
+    sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8";
   };
 
   buildInputs = [ ocaml ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c32be2c6d8d..807df4e57e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -988,9 +988,7 @@ with pkgs;
 
   interlock = callPackage ../servers/interlock {};
 
-  jbuilder = callPackage ../development/tools/ocaml/jbuilder {
-    inherit (ocaml-ng.ocamlPackages_4_03) ocaml;
-  };
+  jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 

From 4dda88c89d1e41bba23ea7762f1b4f5c88b0972f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Apr 2017 07:58:45 -0400
Subject: [PATCH 1299/1744] linux: 4.9.23 -> 4.9.24

---
 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 3bcee15a774..706f31ea6c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.23";
+  version = "4.9.24";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1i8n70d0nfxin88mhg404pvll8yvm8v6766j2sdzw7sk5waiq4hs";
+    sha256 = "01ig3hmalzkn783d5pppw1x473y0mma54rx7dfnany15n62w9csh";
   };
 
   kernelPatches = args.kernelPatches;

From 1b3282d52db210757e8c0b4bea819145a501bff9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Apr 2017 08:01:22 -0400
Subject: [PATCH 1300/1744] linux: 4.10.11 -> 4.10.12

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index b6ac16f5a40..cf68997c2fb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.11";
+  version = "4.10.12";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1zk24ddrnhr56zxyg4jgzbcacl6cx3lvh2lfr8gpnrqhybgyg48i";
+    sha256 = "1i1vzv9y9pdkpyir04pnlsacnlahp15bqqgrl68hn3ni20macx7q";
   };
 
   kernelPatches = args.kernelPatches;

From 7fb1b54cc1724bceb6fa3f530f1c720b99061421 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Apr 2017 08:03:43 -0400
Subject: [PATCH 1301/1744] linux: 4.4.62 -> 4.4.63

---
 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 4153fa1d09e..c5b52890c60 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.62";
+  version = "4.4.63";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1v0xrn9rfvnjqrnw5wffx1d2x1qb82xgrsygia3m640vawg70jyf";
+    sha256 = "1v2pilwzkdcxvda96g1yy62abqz6w2zhcymgj73maz9836xsjxbv";
   };
 
   kernelPatches = args.kernelPatches;

From 05911da7bb40bc661e93b8846145302b9040840c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 21 Apr 2017 15:08:59 +0200
Subject: [PATCH 1302/1744] grsecurity: 4.9.23-201704181901 ->
 4.9.24-201704210851

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 8d4ae1d1060..166836a3275 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.23";
+  version = "4.9.24";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "0nf68gpgkxglrrrpvadbbc66bpd7vfl3820z5yv4zpz8lx56y02w4pn166aqffwxr60xw15mkp65ircnhclz9qcv4778wkbwd7pv1k0";
+    sha512 = "3031ldw2f6dwkm3z1cn7rw8y4diq57rs3na64nzkw7xw4q74cfpzzp5866vf58y0fsyl8l2vgvwza7cdhxywmmxp7q0q5385jn8nnvd";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 38483e8d765..b014dd8482c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.23";
-      grrev  = "201704181901";
-      sha512 = "1cwiqrr707iz6rv72ikj6h3r6r5x325qlq21gsacsxslvk8igmj97amnqylsg32bjj0za072cb8lqf0zvrv7xzvlc9zjcwridd79vc2";
+    { kver   = "4.9.24";
+      grrev  = "201704210851";
+      sha512 = "398cnj7cnzp2vxy54y1538bgqrg2gbz2f7wnx2yhv5xgdwc9b87z9r0d7znk3ah79vrpr2m87394m6zk7d96sjq483y4nm9b1rz5pmn";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From af1621a232271e21b82fc6b556a9f61303595140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Apr 2017 10:16:25 -0300
Subject: [PATCH 1303/1744] xfce4-whiskermenu-plugin: 1.6.2 -> 1.7.2 (#25084)

---
 pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index ffda5b94e07..92564c4eb68 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
-  version = "1.6.2";
+  version = "1.7.2";
 
   name = "${p_name}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
     rev = "v${version}";
-    sha256 = "0vfyav01hynjm7p73wwbwnn2l8l9a0hkz755wmjzr6qv06f9019d";
+    sha256 = "1rpazgnjp443abc31bgi6gp9q3sgbg13v7v74nn7vf6kl4v725ah";
   };
 
   nativeBuildInputs = [ cmake pkgconfig intltool ];

From e39264ee6f21c187ca4fe0f53025726166f860ad Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Fri, 21 Apr 2017 15:17:11 +0200
Subject: [PATCH 1304/1744] radarr: 0.2.0.596 -> 0.2.0.654 (#25082)

---
 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 a2b8a072fa2..af6cea97d2f 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.596";
+  version = "0.2.0.654";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0pcvd41ls90h12j0kfxn9yrcap5dhb22vjm87xa5pg031fca7xy0";
+    sha256 = "05sb3zk8gvydmkiy7g9ha5cmiqzqfwcydljm401zjndzwzhkz698";
   };
 
   buildInputs = [ makeWrapper ];

From 6c36c19f7d0d181b54f7c6f80adee4b1a30a17c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Apr 2017 20:07:59 +0200
Subject: [PATCH 1305/1744] LTS Haskell 8.11

---
 .../configuration-hackage2nix.yaml            | 219 ++++++++++++++----
 1 file changed, 173 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2e0b75ce56f..34250248f88 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
 
 default-package-overrides:
   - store < 0.4.1               # https://github.com/fpco/store/issues/104
-  # LTS Haskell 8.8
+  # LTS Haskell 8.11
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -55,6 +55,7 @@ default-package-overrides:
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
+  - aeson-diff ==1.1.0.2
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.7.0
@@ -65,6 +66,7 @@ default-package-overrides:
   - airship ==0.6.0
   - alarmclock ==0.4.0.2
   - alex ==3.2.1
+  - algebraic-graphs ==0.0.4
   - alternators ==0.1.1.1
   - ALUT ==2.4.0.2
   - amazonka ==1.4.5
@@ -165,18 +167,22 @@ default-package-overrides:
   - ansigraph ==0.3.0.2
   - app-settings ==0.2.0.11
   - appar ==0.1.4
+  - apportionment ==0.0.0.2
   - arbtt ==0.9.0.12
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
+  - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
   - ascii-progress ==0.3.3.0
   - asciidiagram ==1.3.3
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
-  - async ==2.1.1
+  - async ==2.1.1.1
   - async-dejafu ==0.1.3.0
   - async-extra ==0.1.0.0
+  - async-refresh ==0.2.0
+  - async-refresh-tokens ==0.1.0
   - atom-basic ==0.2.4
   - atom-conduit ==0.4.0.1
   - atomic-primops ==0.8.0.4
@@ -184,6 +190,7 @@ default-package-overrides:
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
+  - audacity ==0.0.1.1
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
@@ -195,9 +202,10 @@ default-package-overrides:
   - avers-server ==0.0.18.0
   - avwx ==0.3.0.2
   - b9 ==0.5.31
+  - backprop ==0.0.3.0
   - bake ==0.5
   - bank-holidays-england ==0.1.0.5
-  - base-compat ==0.9.2
+  - base-compat ==0.9.3
   - base-noprelude ==4.9.1.0
   - base-orphans ==0.5.4
   - base-prelude ==1.0.1.1
@@ -214,6 +222,7 @@ default-package-overrides:
   - bencode ==0.6.0.0
   - bento ==0.1.0
   - between ==0.11.0.0
+  - bibtex ==0.1.0.6
   - bifunctors ==5.4.1
   - bimap ==0.3.2
   - bimap-server ==0.1.0.1
@@ -260,6 +269,7 @@ default-package-overrides:
   - bloodhound ==0.12.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
+  - board-games ==0.1.0.6
   - boltzmann-samplers ==0.1.0.0
   - bookkeeping ==0.2.1.1
   - bool-extras ==0.4.0
@@ -278,6 +288,7 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buffer-builder ==0.2.4.4
+  - buffer-pipe ==0.0
   - bumper ==0.6.0.3
   - bv ==0.4.1
   - byteable ==0.1.1
@@ -304,6 +315,7 @@ default-package-overrides:
   - cache ==0.1.0.0
   - cacophony ==0.9.2
   - cairo ==0.13.3.1
+  - calendar-recycling ==0.0
   - call-stack ==0.1.0
   - camfort ==0.901
   - carray ==0.1.6.6
@@ -311,6 +323,7 @@ default-package-overrides:
   - case-insensitive ==1.2.0.8
   - cased ==0.1.0.0
   - cases ==0.1.3.2
+  - casing ==0.1.2.1
   - cassava ==0.4.5.1
   - cassava-conduit ==0.3.5.1
   - cassava-megaparsec ==0.1.0
@@ -345,12 +358,12 @@ default-package-overrides:
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.5
   - clang-pure ==0.2.0.2
-  - clash-ghc ==0.7.0.1
-  - clash-lib ==0.7
-  - clash-prelude ==0.11
-  - clash-systemverilog ==0.7
-  - clash-verilog ==0.7
-  - clash-vhdl ==0.7
+  - clash-ghc ==0.7.1
+  - clash-lib ==0.7.1
+  - clash-prelude ==0.11.1
+  - clash-systemverilog ==0.7.1
+  - clash-verilog ==0.7.1
+  - clash-vhdl ==0.7.1
   - classy-prelude ==1.2.0.1
   - classy-prelude-conduit ==1.2.0
   - classy-prelude-yesod ==1.2.0
@@ -377,6 +390,7 @@ default-package-overrides:
   - codo-notation ==0.5.2
   - colorful-monoids ==0.2.1.0
   - colour ==2.3.3
+  - comfort-graph ==0.0.2
   - commutative ==0.0.1.4
   - comonad ==5
   - comonad-transformers ==4.0
@@ -384,10 +398,12 @@ default-package-overrides:
   - compactmap ==0.1.4.2
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
+  - concise ==0.1.0.0
   - concurrency ==1.0.0.0
   - concurrent-output ==1.7.9
+  - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.9
+  - conduit ==1.2.9.1
   - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
@@ -418,7 +434,7 @@ default-package-overrides:
   - cookie ==0.4.2.1
   - countable ==1.0
   - courier ==0.1.1.4
-  - cpphs ==1.20.4
+  - cpphs ==1.20.5
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
@@ -458,16 +474,25 @@ default-package-overrides:
   - cubicspline ==0.1.2
   - cue-sheet ==0.1.0
   - curl ==1.3.8
+  - cutter ==0.0
   - darcs ==2.12.5
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
+  - data-accessor-template ==0.2.1.13
+  - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
+  - data-bword ==0.1.0.1
   - data-check ==0.1.0
+  - data-checked ==0.3
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
+  - data-dword ==0.3.1
+  - data-endian ==0.1.1
+  - data-fix ==0.0.4
+  - data-has ==0.2.1.0
   - data-hash ==0.2.0.1
   - data-inttrie ==0.1.2
   - data-lens-light ==0.1.2.2
@@ -475,7 +500,10 @@ default-package-overrides:
   - data-msgpack ==0.0.9
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
+  - data-ref ==0.0.1.1
   - data-reify ==0.6.1
+  - data-serializer ==0.3
+  - data-textual ==0.3.0.2
   - datasets ==0.2.1
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
@@ -487,7 +515,8 @@ default-package-overrides:
   - dejafu ==0.4.0.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
-  - deriving-compat ==0.3.5
+  - derive ==2.6.2
+  - deriving-compat ==0.3.6
   - descriptive ==0.9.4
   - diagrams ==1.4
   - diagrams-builder ==0.8.0.1
@@ -503,6 +532,7 @@ default-package-overrides:
   - diagrams-solve ==0.1.0.1
   - diagrams-svg ==1.4.1
   - dice ==0.1
+  - dictionaries ==0.1.0.1
   - Diff ==0.3.4
   - diff3 ==0.3.0
   - digest ==0.0.1.2
@@ -512,7 +542,7 @@ default-package-overrides:
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
-  - disposable ==0.2.0.3
+  - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.3.4.0
   - distributed-process ==0.6.6
@@ -546,6 +576,7 @@ default-package-overrides:
   - DRBG ==0.5.5
   - drifter ==0.2.2
   - drifter-postgresql ==0.1.0
+  - dsp ==0.2.3.1
   - dual-tree ==0.2.0.9
   - dvorak ==0.1.0.0
   - dynamic-state ==0.2.2.0
@@ -559,6 +590,7 @@ default-package-overrides:
   - EdisonAPI ==1.3.1
   - EdisonCore ==1.3.1.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
   - effin ==0.3.0.2
@@ -582,21 +614,26 @@ default-package-overrides:
   - engine-io-wai ==1.0.6
   - EntrezHTTP ==1.0.3
   - entropy ==0.3.7
+  - enummapset ==0.5.2.1
   - enummapset-th ==0.6.1.1
+  - enumset ==0.0.4
   - envelope ==0.2.1.0
   - envparse ==0.4
   - envy ==1.3.0.2
   - epub-metadata ==4.5
   - eq ==4.0.4
+  - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
   - errors ==2.1.3
   - ersatz ==0.3.1
   - esqueleto ==2.5.1
+  - etc ==0.0.0.2
   - etcd ==1.0.5
-  - ether ==0.4.0.2
+  - ether ==0.4.1.0
   - euphoria ==0.8.0.0
   - event ==0.1.4
+  - event-list ==0.1.1.3
   - eventstore ==0.14.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
@@ -609,16 +646,18 @@ default-package-overrides:
   - exhaustive ==1.1.3
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
+  - explicit-exception ==0.1.8
   - extensible ==0.3.7
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.5.1
+  - extra ==1.5.2
   - extract-dependencies ==0.2.0.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.10
+  - fast-math ==1.0.2
   - fasta ==0.10.4.2
   - fay ==0.23.1.16
   - fay-base ==0.20.0.1
@@ -643,6 +682,7 @@ default-package-overrides:
   - fingertree-psqueue ==0.3
   - finite-typelits ==0.1.1.0
   - fixed ==0.2.1.1
+  - fixed-length ==0.2
   - fixed-vector ==0.9.0.0
   - fixed-vector-hetero ==0.3.1.1
   - flac ==0.1.1
@@ -666,7 +706,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.4
+  - foundation ==0.0.6
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -681,11 +721,12 @@ default-package-overrides:
   - fsnotify-conduit ==0.1.0.0
   - funcmp ==1.8
   - fuzzcheck ==0.1.1
+  - fuzzy ==0.1.0.0
   - gd ==3000.7.3
   - Genbank ==1.0.3
   - general-games ==1.0.5
   - generic-aeson ==0.2.0.8
-  - generic-deriving ==1.11.1
+  - generic-deriving ==1.11.2
   - generic-random ==0.4.1.0
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
@@ -703,7 +744,7 @@ default-package-overrides:
   - ghc-syb-utils ==0.2.3
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.2
-  - ghc-typelits-knownnat ==0.2.3
+  - ghc-typelits-knownnat ==0.2.4
   - ghc-typelits-natnormalise ==0.5.2
   - ghcid ==0.6.6
   - ghcjs-base-stub ==0.1.0.2
@@ -717,7 +758,7 @@ default-package-overrides:
   - gi-gio ==2.0.11
   - gi-glib ==2.0.11
   - gi-gobject ==2.0.11
-  - gi-gtk ==3.0.11
+  - gi-gtk ==3.0.13
   - gi-javascriptcore ==3.0.11
   - gi-pango ==1.0.12
   - gi-soup ==2.4.11
@@ -737,6 +778,7 @@ default-package-overrides:
   - gitlib-test ==3.1.0.3
   - gitrev ==1.2.0
   - gitson ==0.5.2
+  - gl ==0.8.0
   - glabrous ==0.3.1
   - glaze ==0.2.0.2
   - glazier ==0.7.0.0
@@ -749,6 +791,7 @@ default-package-overrides:
   - gloss-rendering ==1.10.3.5
   - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.11
+  - gnuplot ==0.5.4.1
   - gogol ==0.1.1
   - gogol-adexchange-buyer ==0.1.1
   - gogol-adexchange-seller ==0.1.1
@@ -875,7 +918,7 @@ default-package-overrides:
   - hackage-db ==1.22
   - hackage-security ==0.5.2.2
   - hackernews ==1.1.1.0
-  - haddock-library ==1.4.2
+  - haddock-library ==1.4.3
   - hailgun ==0.4.1.2
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.5.1
@@ -896,12 +939,12 @@ default-package-overrides:
   - harp ==0.4.2
   - hasbolt ==0.1.1.2
   - hashable ==1.2.6.0
-  - hashable-time ==0.2
+  - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
   - haskeline ==0.7.3.1
   - haskell-gi ==0.20.1
-  - haskell-gi-base ==0.20.1
+  - haskell-gi-base ==0.20.2
   - haskell-import-graph ==1.0.1
   - haskell-lexer ==1.0.1
   - haskell-names ==0.8.0
@@ -940,12 +983,13 @@ default-package-overrides:
   - HCodecs ==0.5
   - hdaemonize ==0.5.2
   - HDBC ==2.4.0.1
+  - HDBC-mysql ==0.7.1.0
   - HDBC-session ==0.1.1.0
   - hdevtools ==0.1.5.0
   - heap ==1.0.3
   - heaps ==0.3.3
   - hebrew-time ==0.1.1
-  - hedis ==0.9.7
+  - hedis ==0.9.8
   - here ==1.2.9
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.4.0
@@ -1010,6 +1054,7 @@ default-package-overrides:
   - hsass ==0.4.1
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
+  - hscurses ==1.4.2.0
   - hsdns ==1.7
   - hse-cpp ==0.2
   - hsebaysdk ==0.4.0.0
@@ -1021,13 +1066,15 @@ default-package-overrides:
   - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
+  - hslua-aeson ==0.1.0.3
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.4
+  - HsOpenSSL ==0.11.4.6
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.3
   - hspec-attoparsec ==0.1.0.2
+  - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.4.0
   - hspec-core ==2.4.3
   - hspec-discover ==2.4.3
@@ -1041,6 +1088,7 @@ default-package-overrides:
   - hspec-wai ==0.8.0
   - hspec-wai-json ==0.8.0
   - hspec-webdriver ==1.2.0
+  - hsshellscript ==3.4.1
   - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.5
@@ -1054,10 +1102,10 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
   - HTTP ==4000.3.6
-  - http-api-data ==0.3.5
+  - http-api-data ==0.3.6
   - http-client ==0.5.6.1
-  - http-client-openssl ==0.2.0.4
-  - http-client-tls ==0.3.4
+  - http-client-openssl ==0.2.0.5
+  - http-client-tls ==0.3.4.1
   - http-common ==0.8.2.0
   - http-conduit ==2.2.3.1
   - http-date ==0.0.6.1
@@ -1067,6 +1115,7 @@ default-package-overrides:
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
   - http2 ==1.6.3
+  - httpd-shed ==0.4.0.3
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.5.0.0
   - HUnit-approx ==1.1
@@ -1104,6 +1153,7 @@ default-package-overrides:
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - IfElse ==0.85
+  - iff ==0.0.6
   - ignore ==0.1.1.0
   - ilist ==0.2.0.0
   - imagesize-conduit ==1.1
@@ -1120,13 +1170,14 @@ default-package-overrides:
   - inline-c-cpp ==0.1.0.0
   - inline-java ==0.6.1
   - inline-r ==0.9.0.1
-  - insert-ordered-containers ==0.2.0.0
+  - insert-ordered-containers ==0.2.1.0
   - instance-control ==0.1.1.1
   - integer-logarithms ==1.0.1
   - integration ==0.2.1
   - intero ==0.1.20
   - interpolate ==0.1.0
   - interpolatedstring-perl6 ==1.0.0
+  - interpolation ==0.1.0.1
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
   - intro ==0.1.0.10
@@ -1140,7 +1191,7 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.3.6.1
   - io-streams-haproxy ==1.0.0.1
-  - ip6addr ==0.5.2
+  - ip6addr ==0.5.3
   - iproute ==1.7.1
   - IPv6Addr ==0.6.3
   - irc ==0.6.1.0
@@ -1158,6 +1209,7 @@ default-package-overrides:
   - ixset ==1.0.7
   - ixset-typed ==0.3.1
   - jailbreak-cabal ==1.3.2
+  - javascript-extras ==0.3.1.0
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
@@ -1168,6 +1220,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
+  - json-ast ==0.3.1
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
@@ -1210,8 +1263,10 @@ default-package-overrides:
   - language-thrift ==0.10.0.0
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
+  - latex ==0.1.0.3
   - lattices ==1.5.0
   - lazy-csv ==0.5.1
+  - lazyio ==0.1.0.4
   - lca ==0.3
   - leapseconds-announced ==2017
   - lens ==4.15.1
@@ -1221,9 +1276,10 @@ default-package-overrides:
   - lens-family ==1.2.1
   - lens-family-core ==1.2.1
   - lens-family-th ==0.5.0.0
+  - lens-labels ==0.1.0.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.8.0
+  - lentil ==1.0.9.0
   - leveldb-haskell ==0.6.4
   - lexer-applicative ==2.1.0.1
   - lhs2tex ==1.19
@@ -1250,6 +1306,7 @@ default-package-overrides:
   - list-prompt ==0.1.1.0
   - list-t ==1
   - ListLike ==4.5.1
+  - llvm-hs-pure ==4.0.0.0
   - lmdb ==0.2.5
   - loch-th ==0.2.1
   - log ==0.7
@@ -1274,12 +1331,14 @@ default-package-overrides:
   - machines-io ==0.2.0.13
   - machines-process ==0.2.0.8
   - magic ==1.1
+  - magicbane ==0.1.1
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.1.0
   - managed ==1.0.5
   - mandrill ==0.5.3.1
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
+  - markov-chain ==0.0.3.4
   - markup ==3.1.0
   - marvin ==0.2.3
   - marvin-interpolate ==1.1
@@ -1288,10 +1347,13 @@ default-package-overrides:
   - matplotlib ==0.4.3
   - matrices ==0.4.4
   - matrix ==0.3.5.0
-  - matrix-market-attoparsec ==0.1.0.5
+  - matrix-market-attoparsec ==0.1.0.7
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
+  - mbox-utility ==0.0
   - mcmc-types ==1.0.3
+  - mediabus ==0.3.2.1
+  - mediabus-rtp ==0.3.2.1
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
@@ -1313,10 +1375,13 @@ default-package-overrides:
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.8.0
   - microlens-th ==0.4.1.1
+  - midi ==0.2.2.1
+  - midi-music-box ==0.0.0.3
   - mighty-metropolis ==1.2.0
   - mime-mail ==0.4.13.1
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
+  - minio-hs ==0.2.1
   - mintty ==0.1.1
   - misfortune ==0.1.1.2
   - missing-foreign ==0.1.1
@@ -1324,6 +1389,7 @@ default-package-overrides:
   - mixed-types-num ==0.1.0.1
   - mmap ==0.5.9
   - mmorph ==1.0.9
+  - mnist-idx ==0.1.2.8
   - mockery ==0.3.4
   - modify-fasta ==0.8.2.3
   - monad-control ==1.0.1.0
@@ -1360,6 +1426,7 @@ default-package-overrides:
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.3.1
+  - monoid-transformer ==0.0.3
   - monoidal-containers ==0.3.0.1
   - morte ==1.6.6
   - mountpoints ==1.0.2
@@ -1374,6 +1441,7 @@ default-package-overrides:
   - multiset-comb ==0.2.4.1
   - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
+  - mushu ==0.1.1
   - MusicBrainz ==0.2.4
   - mustache ==2.1.3
   - mutable-containers ==0.3.3
@@ -1407,6 +1475,7 @@ default-package-overrides:
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
+  - network-ip ==0.3
   - network-msgpack-rpc ==0.0.3
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.1
@@ -1424,13 +1493,17 @@ default-package-overrides:
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.0.1
+  - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
+  - non-negative ==0.1.1
   - nonce ==1.0.2
   - nondeterminism ==1.4
   - NoTrace ==0.3.0.1
   - nsis ==0.3.1
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
+  - numeric-prelude ==0.4.2
+  - numeric-quest ==0.2.0.1
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
   - oanda-rest-api ==0.3.0.0
@@ -1443,6 +1516,7 @@ default-package-overrides:
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
+  - one-liner ==0.8.1
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
@@ -1461,7 +1535,7 @@ default-package-overrides:
   - optional-args ==1.0.1
   - options ==1.2.1.1
   - optparse-applicative ==0.13.2.0
-  - optparse-generic ==1.1.4
+  - optparse-generic ==1.1.5
   - optparse-helper ==0.2.1.1
   - optparse-simple ==0.0.3
   - optparse-text ==0.1.1.0
@@ -1477,7 +1551,7 @@ default-package-overrides:
   - pandoc-citeproc ==0.10.4.1
   - pandoc-types ==1.17.0.5
   - pango ==0.13.3.1
-  - parallel ==3.2.1.0
+  - parallel ==3.2.1.1
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.11
@@ -1527,7 +1601,7 @@ default-package-overrides:
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.8
+  - pipes-extras ==1.0.9
   - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
   - pipes-misc ==0.2.5.0
@@ -1550,8 +1624,10 @@ default-package-overrides:
   - pointedlist ==0.6.1
   - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
+  - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
+  - pooled-io ==0.0.2.1
   - posix-paths ==0.2.1.1
   - posix-realtime ==0.0.0.4
   - post-mess-age ==0.2.1.0
@@ -1567,6 +1643,7 @@ default-package-overrides:
   - pred-set ==0.0.1
   - prednote ==0.36.0.4
   - prefix-units ==0.2.0
+  - prelude-compat ==0.0.0.1
   - prelude-extras ==0.4.0.3
   - prelude-safeenum ==0.1.1.2
   - preprocessor-tools ==1.0.1
@@ -1581,6 +1658,7 @@ default-package-overrides:
   - primes ==0.2.1.0
   - primitive ==0.6.1.0
   - printcess ==0.1.0.3
+  - probability ==0.2.5.1
   - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
   - profiteur ==0.4.2.2
@@ -1591,8 +1669,14 @@ default-package-overrides:
   - prometheus-client ==0.1.0.1
   - prometheus-metrics-ghc ==0.1.0.1
   - prompt ==0.1.1.2
+  - proto-lens ==0.2.0.1
+  - proto-lens-arbitrary ==0.1.0.2
+  - proto-lens-combinators ==0.1.0.6
+  - proto-lens-descriptors ==0.2.0.1
+  - proto-lens-optparse ==0.1.0.2
+  - proto-lens-protoc ==0.2.0.1
   - protobuf ==0.2.1.1
-  - protobuf-simple ==0.1.0.3
+  - protobuf-simple ==0.1.0.4
   - protocol-buffers ==2.4.0
   - protocol-buffers-descriptor ==2.4.0
   - protolude ==0.1.10
@@ -1631,6 +1715,7 @@ default-package-overrides:
   - random-tree ==0.6.0.5
   - range ==0.1.2.0
   - range-set-list ==0.1.2.0
+  - rank-product ==0.2.0.1
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.2.1
@@ -1641,6 +1726,7 @@ default-package-overrides:
   - rawfilepath ==0.1.1
   - rawstring-qm ==0.2.3.0
   - rdf ==0.1.0.1
+  - rdtsc ==1.3.0.1
   - read-editor ==0.1.0.2
   - read-env-var ==0.1.0.1
   - readable ==0.3.1
@@ -1655,6 +1741,7 @@ default-package-overrides:
   - ref-fd ==0.4.0.1
   - refact ==0.3.0.2
   - references ==0.3.2.1
+  - refined ==0.1.2.1
   - reflection ==2.1.2
   - reform ==0.2.7.1
   - reform-blaze ==0.2.4.3
@@ -1674,7 +1761,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.2
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.8.3.5
+  - relational-query ==0.8.3.6
   - relational-query-HDBC ==0.6.0.2
   - relational-record ==0.1.7.1
   - relational-schemas ==0.1.3.1
@@ -1722,6 +1809,8 @@ default-package-overrides:
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.3.1
   - SafeSemaphore ==0.10.1
+  - sample-frame ==0.0.3
+  - sample-frame-np ==0.0.4.1
   - sampling ==0.3.2
   - sandi ==0.4.0
   - sandman ==0.2.0.1
@@ -1730,7 +1819,7 @@ default-package-overrides:
   - scalpel ==0.5.0
   - scalpel-core ==0.5.0
   - scanner ==0.2
-  - scientific ==0.3.4.11
+  - scientific ==0.3.4.12
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -1752,7 +1841,7 @@ default-package-overrides:
   - serf ==0.1.1.0
   - servant ==0.9.1.1
   - servant-aeson-specs ==0.5.2.0
-  - servant-auth-cookie ==0.4.3.3
+  - servant-auth-cookie ==0.4.4
   - servant-blaze ==0.7.1
   - servant-cassava ==0.8
   - servant-client ==0.9.1.1
@@ -1764,7 +1853,9 @@ default-package-overrides:
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
   - servant-purescript ==0.6.0.0
+  - servant-ruby ==0.2.1.0
   - servant-server ==0.9.1.1
+  - servant-static-th ==0.1.0.3
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
   - servant-swagger-ui ==0.2.2.2.2.8
@@ -1774,6 +1865,7 @@ default-package-overrides:
   - serversession-frontend-wai ==1.0
   - serversession-frontend-yesod ==1.0
   - servius ==1.2.0.2
+  - set-cover ==0.0.8
   - set-monad ==0.2.0.0
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.4
@@ -1811,8 +1903,9 @@ default-package-overrides:
   - smoothie ==0.4.2.6
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
+  - snap-blaze ==0.2.1.5
   - snap-core ==1.0.2.0
-  - snap-server ==1.0.1.1
+  - snap-server ==1.0.2.0
   - snowflake ==0.1.1.1
   - soap ==0.2.3.3
   - soap-openssl ==0.1.0.2
@@ -1841,6 +1934,7 @@ default-package-overrides:
   - Spock-worker ==0.3.1.0
   - spool ==0.1
   - spoon ==0.3.1
+  - spreadsheet ==0.1.3.4
   - sql-words ==0.1.4.1
   - sqlite-simple ==0.4.13.0
   - sqlite-simple-errors ==0.6.0.0
@@ -1848,6 +1942,7 @@ default-package-overrides:
   - stache ==0.2.2
   - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
+  - stackage-curator ==0.14.5
   - state-plus ==0.1.2
   - stateref ==0.3
   - statestack ==0.2.0.5
@@ -1863,6 +1958,7 @@ default-package-overrides:
   - stm-containers ==0.2.15
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.2
+  - stm-split ==0.0.1
   - stm-stats ==0.2.0.0
   - stm-supply ==0.2.0.0
   - STMonadTrans ==0.4.3
@@ -1870,6 +1966,10 @@ default-package-overrides:
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
+  - storable-tuple ==0.0.3.2
+  - storablevector ==0.2.12
+  - storablevector-carray ==0.0
+  - store ==0.4.2
   - store-core ==0.4
   - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.4.2
@@ -1914,6 +2014,7 @@ default-package-overrides:
   - system-posix-redirect ==1.1.0.1
   - syz ==0.2.0.0
   - tabular ==0.2.2.7
+  - tagchup ==0.4.0.5
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
   - tagged-identity ==0.1.1
@@ -1944,16 +2045,19 @@ default-package-overrides:
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.2
   - tasty-tap ==0.0.4
-  - tasty-th ==0.1.5
+  - tasty-th ==0.1.7
   - Taxonomy ==1.0.2
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==0.6.0.0
   - tcp-streams-openssl ==0.6.0.0
+  - tdigest ==0.1
+  - tdigest-Chart ==0
   - telegram-api ==0.6.1.0
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
+  - termcolor ==0.2.0.0
   - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.0.2
@@ -1973,16 +2077,19 @@ 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-ldap ==0.1.1.8
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.2.0
   - text-postgresql ==0.0.2.2
+  - text-printer ==0.5
   - text-region ==0.1.0.1
   - text-show ==3.4.1.1
   - text-show-instances ==3.5
   - text-zipper ==0.10
   - textlocal ==0.1.0.5
   - tf-random ==0.5
+  - tfp ==1.0.0.2
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
   - th-expand-syns ==0.4.2.0
@@ -2002,6 +2109,7 @@ default-package-overrides:
   - through-text ==0.1.0.0
   - thumbnail-plus ==1.0.5
   - thyme ==0.3.5.5
+  - tibetan-utils ==0.1.1.2
   - tidal ==0.8.2
   - time-compat ==0.1.0.3
   - time-lens ==0.4.0.1
@@ -2031,7 +2139,7 @@ default-package-overrides:
   - tree-fun ==0.8.1.0
   - trifecta ==1.6.2.1
   - true-name ==0.1.0.2
-  - tsv2csv ==0.1.0.1
+  - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
   - tttool ==1.7.0.1
   - tuple ==0.3.0.2
@@ -2040,10 +2148,15 @@ default-package-overrides:
   - turtle ==1.3.2
   - turtle-options ==0.1.0.4
   - twitter-feed ==0.2.0.11
+  - twitter-types ==0.7.2.2
+  - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
   - type-assertions ==0.1.0.0
+  - type-combinators ==0.2.4.3
   - type-eq ==0.5
   - type-fun ==0.1.1
+  - type-hint ==0.1
+  - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - type-list ==0.5.0.0
@@ -2062,6 +2175,9 @@ default-package-overrides:
   - unbounded-delays ==0.1.0.10
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
+  - unfoldable ==0.9.2
+  - unfoldable-restricted ==0.0.2
+  - unicode ==0.0
   - unicode-show ==0.1.0.2
   - unicode-transforms ==0.2.1
   - unification-fd ==0.10.0.1
@@ -2070,6 +2186,8 @@ default-package-overrides:
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
   - Unique ==0.4.6.1
+  - unique ==0
+  - unit-constraint ==0.0.0
   - units ==2.4
   - units-defs ==2.0.1.1
   - units-parser ==0.1.0.0
@@ -2085,6 +2203,7 @@ default-package-overrides:
   - Unixutils ==1.54.1
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
+  - unsafe ==0.0
   - uri-bytestring ==0.2.3.1
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
@@ -2110,7 +2229,7 @@ default-package-overrides:
   - vcswrapper ==0.1.5
   - vector ==0.11.0.0
   - vector-algorithms ==0.7.0.1
-  - vector-binary-instances ==0.2.3.4
+  - vector-binary-instances ==0.2.3.5
   - vector-buffer ==0.4.1
   - vector-fftw ==0.1.3.7
   - vector-instances ==3.4
@@ -2130,13 +2249,14 @@ default-package-overrides:
   - vty ==5.15
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
+  - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.19.1
   - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
-  - wai-middleware-auth ==0.1.1.2
+  - wai-middleware-auth ==0.1.2.0
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2145,6 +2265,7 @@ default-package-overrides:
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==0.1.0.1
+  - wai-middleware-rollbar ==0.3.0
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
@@ -2157,7 +2278,7 @@ default-package-overrides:
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
-  - warp ==3.2.11.1
+  - warp ==3.2.11.2
   - warp-tls ==3.2.3
   - wave ==0.1.4
   - wavefront ==0.7.1
@@ -2176,6 +2297,7 @@ default-package-overrides:
   - webpage ==0.0.5
   - webrtc-vad ==0.1.0.3
   - websockets ==0.10.0.0
+  - websockets-rpc ==0.0.2
   - websockets-snap ==0.10.2.0
   - weigh ==0.0.3
   - wikicfp-scraper ==0.1.0.8
@@ -2204,7 +2326,7 @@ default-package-overrides:
   - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
-  - wreq ==0.5.0.0
+  - wreq ==0.5.0.1
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1
   - writer-cps-morph ==0.1.0.2
@@ -2227,6 +2349,7 @@ default-package-overrides:
   - xlsx ==0.4.3
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
+  - xml-basic ==0.1.1.3
   - xml-conduit ==1.4.0.4
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
@@ -2254,7 +2377,7 @@ default-package-overrides:
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-hashdb ==1.6.0.1
   - yesod-bin ==1.5.2.2
-  - yesod-core ==1.4.32
+  - yesod-core ==1.4.33
   - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0
   - yesod-form ==1.4.11
@@ -2284,11 +2407,15 @@ default-package-overrides:
   - yi-rope ==0.8
   - yi-snippet ==0.13.5
   - yjtools ==0.9.18
+  - yoga ==0.0.0.1
+  - youtube ==0.2.1
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
   - zip ==0.1.10
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
+  - ziptastic-client ==0.3.0.1
+  - ziptastic-core ==0.2.0.1
   - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1

From 7cfb6509ed3e842e31584b0de10d7e763dc8d3f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 09:37:32 +0200
Subject: [PATCH 1306/1744] hackage2nix: provide old versions of "store" so
 that we can build stack

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 34250248f88..4410e3c4c50 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,6 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  - store < 0.4.1               # https://github.com/fpco/store/issues/104
   # LTS Haskell 8.11
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
@@ -2448,6 +2447,8 @@ extra-packages:
   - 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
+  - store < 0.4                         # needed by stack 1.4.0
+  - store-core < 0.4                    # needed by stack 1.4.0
   - 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

From 4c8056a8d9b8e5862ad84ee849589b11b685f367 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Apr 2017 20:15:36 +0200
Subject: [PATCH 1307/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0d6c9d1b646fb5845326721125dac60fa5c86538.
---
 .../haskell-modules/hackage-packages.nix      | 4949 +++++++++++++----
 1 file changed, 3716 insertions(+), 1233 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 509f6449e02..ee906366630 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.7";
-       sha256 = "935925dabec9ebabc50947ffcb9c355639a2c1939bf68c712b3c32773a1c5685";
+       version = "1.1.0";
+       sha256 = "0072b6a48008d3f3ffb360d7c6ba493f44167a3f9eb5341a9ff25fc6f8dbc78a";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1679,16 +1679,20 @@ self: {
 
   "BitStringRandomMonad" = callPackage
     ({ mkDerivation, base, bitstring, bytestring, mtl, parallel
-     , primitive, transformers, vector
+     , primitive, QuickCheck, transformers, vector
      }:
      mkDerivation {
        pname = "BitStringRandomMonad";
-       version = "0.1.1.2";
-       sha256 = "96a5bb1cb04427a64be71f83d1a09abb950d3023ae80e3811a304748ace16dbf";
+       version = "0.2.0.2";
+       sha256 = "9142bd6d2494e6585037efe2c4e9040dcb7b781cfa1881d116b2534abf1333fc";
        libraryHaskellDepends = [
          base bitstring bytestring mtl parallel primitive transformers
          vector
        ];
+       testHaskellDepends = [
+         base bitstring bytestring mtl parallel primitive QuickCheck
+         transformers vector
+       ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -3871,12 +3875,15 @@ self: {
      }) {};
 
   "DeepDarkFantasy" = callPackage
-    ({ mkDerivation, base, constraints, mtl, random }:
+    ({ mkDerivation, base, bimap, constraints, containers, mtl, random
+     }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.4.1";
-       sha256 = "01342b63961fc2916edebb8b4bc9bd63a1719608ac4c42f5cd700a7ef471dd77";
-       libraryHaskellDepends = [ base constraints mtl random ];
+       version = "0.2017.4.19";
+       sha256 = "3f0babaaaaa01d599bdcdf9926468e024a225480982d7b843ae4133bdd31d9a5";
+       libraryHaskellDepends = [
+         base bimap constraints containers mtl random
+       ];
        testHaskellDepends = [ base constraints mtl random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
@@ -6156,6 +6163,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "Gene-CluEDO" = callPackage
+    ({ mkDerivation, ADPfusion, ADPfusionSet, base, cmdargs, containers
+     , filepath, FormalGrammars, log-domain, PrimitiveArray
+     , PrimitiveArray-Pretty, QuickCheck, ShortestPathProblems, tasty
+     , tasty-quickcheck, tasty-th, text, vector
+     }:
+     mkDerivation {
+       pname = "Gene-CluEDO";
+       version = "0.0.0.1";
+       sha256 = "88f801a06169d9748d5eabfe21638445d2d6dcfb2f4394c8c286e762cd35b010";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ADPfusion ADPfusionSet base containers filepath FormalGrammars
+         log-domain PrimitiveArray PrimitiveArray-Pretty
+         ShortestPathProblems text vector
+       ];
+       executableHaskellDepends = [ base cmdargs filepath ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th vector
+       ];
+       homepage = "https://github.com/choener/Gene-CluEDO";
+       description = "Hox gene clustering";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "GeneralTicTacToe" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -8428,20 +8461,21 @@ self: {
      }) {};
 
   "HUnit-Plus" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
-     , directory, hashable, hexpat, hostname, parsec, time, timeit
+    ({ mkDerivation, base, bytestring, Cabal, cmdargs, directory
+     , hashable, hexpat, hostname, parsec, text, time, timeit
+     , unordered-containers
      }:
      mkDerivation {
        pname = "HUnit-Plus";
-       version = "1.1.0";
-       sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74";
+       version = "2.0.0";
+       sha256 = "b225e07debe503d572e729c50b08d63a1dec76bbb0e9d2e35aedf05e45bb76f5";
        libraryHaskellDepends = [
-         base bytestring Cabal cmdargs containers hashable hexpat hostname
-         parsec time timeit
+         base bytestring Cabal cmdargs hashable hexpat hostname parsec text
+         time timeit unordered-containers
        ];
        testHaskellDepends = [
-         base bytestring Cabal cmdargs containers directory hashable hexpat
-         hostname parsec time timeit
+         base bytestring Cabal cmdargs directory hashable hexpat hostname
+         parsec text time timeit unordered-containers
        ];
        homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
@@ -9604,8 +9638,27 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4.4";
-       sha256 = "efb284b5a3c55c2c83ba3ede5810bdd1efabf1939b40317023a090046a6849eb";
+       version = "0.11.4.6";
+       sha256 = "1ad6cbb50fc1ecaa98baa6de3660a9b82a9d101f17396b0da9b6c598b1114c4c";
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
+  "HsOpenSSL_0_11_4_7" = callPackage
+    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
+     , time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.7";
+       sha256 = "d37bc6ce6e9a36d725a91763bafdb492a61d18630968aab5ee7f2493e89d5f64";
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -9899,14 +9952,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "IPv6Addr_1_0_0" = callPackage
+  "IPv6Addr_1_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "1.0.0";
-       sha256 = "2ece595b6a29a58074e6459ab03f32aae2a90b475ce3d629ccdf71844f599da4";
+       version = "1.0.1";
+       sha256 = "dff7e9d19e60f08401fd79a8d5004b2166d45d0a1160e5705aac821268a54207";
        libraryHaskellDepends = [
          aeson attoparsec base iproute network network-info random text
        ];
@@ -9919,6 +9972,35 @@ self: {
        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.0";
+       sha256 = "13c85bda2961b8748bcf643e32010322cb389da813d4bd306b1fee040d873809";
+       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 = "https://github.com/MichelBoucey/IPv6DB";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10744,6 +10826,8 @@ self: {
        pname = "LambdaHack";
        version = "0.5.0.0";
        sha256 = "2587949dcdd9f2336b5365031340a0e7aa7705b7ce088dafc9b14a208051f96f";
+       revision = "1";
+       editedCabalFile = "a5df58582a0410c3f44a573d35970564dfbc998c9c88e065765d2646169bbcf7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13073,8 +13157,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenAFP";
-       version = "1.4.2";
-       sha256 = "80558f9ac3512a98e25ace02ceed4ad5ddcf8727335b54c2b9ef3fee7ccf1e75";
+       version = "1.4.3";
+       sha256 = "47079d59bdd48df14da3020c6ad3f072727c83cb9854be6aacbe325f28793c7e";
        libraryHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl process regex-compat
@@ -16481,8 +16565,8 @@ self: {
      }:
      mkDerivation {
        pname = "StockholmAlignment";
-       version = "1.0.1";
-       sha256 = "04ae48d0061e8c7b8120c924677c33179cd837b2171e295c30558ad31583867f";
+       version = "1.0.2";
+       sha256 = "4267e5eeb5bf0f962c557ac84cf7dfec748e442d091fd12e687d033993213abb";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools SVGFonts text vector
@@ -17384,6 +17468,8 @@ self: {
        pname = "TypeCompose";
        version = "0.9.12";
        sha256 = "3a182c2cc93f8291b3aedfc32c0b1faa84a982601c1a24cbe7fe1ecc50e333e2";
+       revision = "1";
+       editedCabalFile = "038b7158deba8f68b9b32b05eb47d6ebc8709b1c960cb44d50469d1a5deb4748";
        libraryHaskellDepends = [ base base-orphans ];
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
@@ -19315,11 +19401,12 @@ self: {
 
   "accelerate-examples" = callPackage
     ({ mkDerivation, accelerate, accelerate-fft, accelerate-io
-     , ansi-wl-pprint, array, base, binary, bmp, bytestring
-     , bytestring-lexing, cereal, colour-accelerate, containers
-     , criterion, directory, fclabels, filepath, gloss, gloss-accelerate
-     , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate
-     , linear, linear-accelerate, matrix-market-attoparsec, mwc-random
+     , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint
+     , array, base, binary, bmp, bytestring, bytestring-lexing, cereal
+     , colour-accelerate, containers, criterion, directory, fclabels
+     , filepath, gloss, gloss-accelerate, gloss-raster-accelerate
+     , gloss-rendering, HUnit, lens-accelerate, linear
+     , linear-accelerate, matrix-market-attoparsec, mwc-random
      , normaldistribution, pipes, QuickCheck, random, repa, repa-io
      , scientific, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-algorithms
@@ -19328,13 +19415,16 @@ self: {
        pname = "accelerate-examples";
        version = "1.0.0.0";
        sha256 = "a659dc486da23d220aeefac958008ae9c0a214570008bfa6eaccb6fc02ac05e9";
+       revision = "2";
+       editedCabalFile = "161778294ea7ef8ffbd452f6f0321113e8e7ee72bb369862ddfce6e69a4f7532";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         accelerate ansi-wl-pprint base containers criterion directory
-         fclabels HUnit linear mwc-random QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         accelerate accelerate-llvm-native accelerate-llvm-ptx
+         ansi-wl-pprint base containers criterion directory fclabels HUnit
+         linear mwc-random QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
        ];
        executableHaskellDepends = [
          accelerate accelerate-fft accelerate-io array base binary bmp
@@ -19353,12 +19443,21 @@ self: {
      }) {};
 
   "accelerate-fft" = callPackage
-    ({ mkDerivation, accelerate, base, bytestring }:
+    ({ mkDerivation, accelerate, accelerate-llvm
+     , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring
+     , carray, cuda, cufft, fft, file-embed, storable-complex
+     }:
      mkDerivation {
        pname = "accelerate-fft";
        version = "1.0.0.0";
        sha256 = "784a486d36ac3af714952744f5f592242f11f477bdf8b336356857d593a584e3";
-       libraryHaskellDepends = [ accelerate base bytestring ];
+       revision = "1";
+       editedCabalFile = "cd5289477e41960b44fe1f5c091801dc54e3751814ad58817e34ea28b9602f80";
+       libraryHaskellDepends = [
+         accelerate accelerate-llvm accelerate-llvm-native
+         accelerate-llvm-ptx base bytestring carray cuda cufft fft
+         file-embed storable-complex
+       ];
        homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -20637,7 +20736,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_1_1_0" = callPackage
+  "aeson_1_2_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
@@ -20649,10 +20748,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.1.1.0";
-       sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6";
-       revision = "1";
-       editedCabalFile = "fac1956736821af59480cc0adaa84f6c35f6a7678d4256a818f0a5d84a23aef1";
+       version = "1.2.0.0";
+       sha256 = "cba138d97a0b785db74103a9d89d77f387f10334991b71d13cb8ce8020e30a60";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -20759,8 +20856,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.6";
        sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142";
-       revision = "4";
-       editedCabalFile = "534f6f1d1b09f88910407d670dfc9283ceaf824bf929373e0be1566f206011a3";
+       revision = "6";
+       editedCabalFile = "4cff8e8279e84b02ab85046d48f5a8a751d8c26f878a14daa7988b79ee1578c3";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          hashable nats scientific semigroups tagged text time
@@ -20817,8 +20914,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.0.0";
        sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594";
-       revision = "2";
-       editedCabalFile = "205ca010ed9726b27ebe1f63fe6260dc26b327e2998cc4bc744a30bd3b708c3b";
+       revision = "3";
+       editedCabalFile = "df84e5ff1e5b0ad03cdd8173b5d8b41da124bb07759ac9fe47a6664e2ed09787";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec base base-compat bytestring
          containers exceptions hashable parsec recursion-schemes scientific
@@ -20857,8 +20954,8 @@ self: {
     ({ mkDerivation, aeson, base, text, unordered-containers, vector }:
      mkDerivation {
        pname = "aeson-flat";
-       version = "0.1.0.0";
-       sha256 = "1db507abdb802732ffa3444cb227411ad68b430692578fc79e7c19b7165a6214";
+       version = "0.1.1";
+       sha256 = "1c4f53a629d23bbaa0cb6100f3e7fe6788b1f40711d4142c491e43ec84a08801";
        libraryHaskellDepends = [
          aeson base text unordered-containers vector
        ];
@@ -21236,8 +21333,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.12.1";
-       sha256 = "11096d66a70d036bbe5d685aa516e454623f2f6de98693dbb36e1016dce8ac8d";
+       version = "0.12.2";
+       sha256 = "ce5a44b105f1f96a9b93126f7ce75f6908dd60ab9f5b07eeb863478ec618dcc3";
        libraryHaskellDepends = [
          aeson base-prelude json-pointer json-pointer-aeson mtl-prelude
          scientific text transformers unordered-containers vector
@@ -21297,6 +21394,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affinely-extended" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "affinely-extended";
+       version = "0.1.0.0";
+       sha256 = "556d321690aa5e82ae6dce4a28c01ff74a9e32a9f5203ab43e3b2dfda6a48dae";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/clintonmead/affinely-extended";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "afis" = callPackage
     ({ mkDerivation, base, byteable, bytestring, crypto-random
      , cryptohash, HUnit, mtl, packer, QuickCheck, test-framework
@@ -22260,6 +22368,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -25842,6 +25951,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
+  "arbtt_0_9_0_13" = callPackage
+    ({ mkDerivation, aeson, array, base, binary, bytestring
+     , bytestring-progress, containers, deepseq, directory, filepath
+     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
+     , tasty-golden, tasty-hunit, terminal-progress-bar, time
+     , transformers, unix, utf8-string, X11
+     }:
+     mkDerivation {
+       pname = "arbtt";
+       version = "0.9.0.13";
+       sha256 = "89be821c7233ce7a3b9ba6df4ba7f82547f3326b3cfc7aa3197c207d0896403d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson array base binary bytestring bytestring-progress containers
+         deepseq directory filepath parsec pcre-light strict
+         terminal-progress-bar time transformers unix utf8-string X11
+       ];
+       executableSystemDepends = [ libXScrnSaver ];
+       testHaskellDepends = [
+         base binary bytestring containers deepseq directory parsec
+         pcre-light process-extras tasty tasty-golden tasty-hunit time
+         transformers unix utf8-string
+       ];
+       homepage = "http://arbtt.nomeata.de/";
+       description = "Automatic Rule-Based Time Tracker";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libXScrnSaver;};
+
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
      , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty
@@ -26219,6 +26358,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "arithmoi_0_5_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, exact-pi
+     , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck
+     , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.5.0.0";
+       sha256 = "4be5fcf0e3fff7dec673a4216f2e59ebb0d7b7645e72d1caa3f95ae14d4f4a3e";
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
+         array base containers exact-pi ghc-prim integer-gmp
+         integer-logarithms mtl random
+       ];
+       testHaskellDepends = [
+         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion integer-logarithms random
+       ];
+       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 {
@@ -26511,6 +26678,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ascii-art-to-unicode" = callPackage
+    ({ mkDerivation, base, comonad, doctest, strict }:
+     mkDerivation {
+       pname = "ascii-art-to-unicode";
+       version = "0.1.0.1";
+       sha256 = "c3aa7ed17df0d45fd9297c10b691502942897a0d4409664e676f6922b97e2eb1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base comonad ];
+       executableHaskellDepends = [ base strict ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/fmthoma/ascii-art-to-unicode#readme";
+       description = "ASCII Art to Unicode Box Drawing converter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ascii-cows" = callPackage
     ({ mkDerivation, base, random-extras, random-fu, text }:
      mkDerivation {
@@ -26890,8 +27073,8 @@ self: {
      }:
      mkDerivation {
        pname = "async";
-       version = "2.1.1";
-       sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90";
+       version = "2.1.1.1";
+       sha256 = "cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -27008,6 +27191,51 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "async-refresh" = callPackage
+    ({ mkDerivation, base, criterion, formatting, HUnit, lens
+     , lifted-async, monad-control, monad-logger, safe-exceptions, stm
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "async-refresh";
+       version = "0.2.0";
+       sha256 = "28910b3236b3d406f2de543b1ff069d88c0de4edf6129927647f47872429bb1c";
+       libraryHaskellDepends = [
+         base formatting lens lifted-async monad-control monad-logger
+         safe-exceptions stm text
+       ];
+       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;
+     }) {};
+
+  "async-refresh-tokens" = callPackage
+    ({ mkDerivation, async-refresh, base, bytestring, criterion
+     , formatting, HUnit, lens, lifted-async, monad-control
+     , monad-logger, safe-exceptions, stm, test-framework
+     , test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "async-refresh-tokens";
+       version = "0.1.0";
+       sha256 = "3e341e9cfc940ea1e484abdec90fb8fb81b31d0cf960da4e17843b2678c3193e";
+       libraryHaskellDepends = [
+         async-refresh base bytestring formatting lens lifted-async
+         monad-control monad-logger safe-exceptions stm text
+       ];
+       testHaskellDepends = [
+         base criterion HUnit monad-logger stm test-framework
+         test-framework-hunit
+       ];
+       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;
+     }) {};
+
   "asynchronous-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -27265,6 +27493,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "atomic-modify" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "atomic-modify";
+       version = "0.1.0.0";
+       sha256 = "5e000e6be97e073bd6c2436a403b07455c9c7fcff493491b991ee5fceaa8168d";
+       libraryHaskellDepends = [ base stm ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A typeclass for mutable references that have an atomic modify operation";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "atomic-primops" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
@@ -27558,6 +27798,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-iso8601" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, text, time }:
+     mkDerivation {
+       pname = "attoparsec-iso8601";
+       version = "1.0.0.0";
+       sha256 = "aa6c6d87587383e386cb85e7ffcc4a6317aa8dafb8ba9a104ecac365ce2a858a";
+       libraryHaskellDepends = [ attoparsec base base-compat text time ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Parsing of ISO 8601 dates, originally from aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "attoparsec-iteratee" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, iteratee
      , transformers
@@ -28103,8 +28355,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "8";
-       editedCabalFile = "02e4d9421b93aa3fe30c3b676ae1e7c5dca3a7b7d4c710b4f1a0925a071dca6c";
+       revision = "9";
+       editedCabalFile = "3037f35d45d512a965f96b9f3d707c6ebed6b8096c579b055b62e62de9ed801c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -28442,29 +28694,30 @@ self: {
 
   "aws-ec2" = callPackage
     ({ mkDerivation, aeson, aws, base, base16-bytestring
-     , base64-bytestring, blaze-builder, byteable, bytestring
-     , conduit-extra, containers, cryptohash, http-conduit, http-types
-     , mtl, optparse-applicative, resourcet, scientific
-     , template-haskell, text, time, unordered-containers, vector
-     , xml-conduit, yaml
+     , base64-bytestring, blaze-builder, blaze-markup, byteable
+     , bytestring, conduit-extra, containers, cryptohash, exceptions
+     , http-conduit, http-types, iproute, mtl, optparse-applicative
+     , resourcet, scientific, template-haskell, text, time
+     , unordered-containers, vector, xml-conduit, yaml
      }:
      mkDerivation {
        pname = "aws-ec2";
-       version = "0.3.3";
-       sha256 = "8d52e45cf9c37d728d1c76db6653ff56dbec853c1b924b46b1519387cc2aa3f4";
+       version = "0.3.5";
+       sha256 = "17df4a182a25d1de78cddf933e9a9ae342d989e55487cbbc6b307ced4e2aef3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aws base base16-bytestring base64-bytestring blaze-builder
-         byteable bytestring conduit-extra containers cryptohash
-         http-conduit http-types mtl resourcet scientific template-haskell
-         text time unordered-containers vector xml-conduit
+         blaze-markup byteable bytestring conduit-extra containers
+         cryptohash exceptions http-conduit http-types iproute mtl resourcet
+         scientific template-haskell text time unordered-containers vector
+         xml-conduit
        ];
        executableHaskellDepends = [
          aeson aws base bytestring containers optparse-applicative text
          unordered-containers vector yaml
        ];
-       homepage = "https://github.com/zalora/aws-ec2";
+       homepage = "https://github.com/memcachier/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28829,8 +29082,8 @@ self: {
      }:
      mkDerivation {
        pname = "axiom";
-       version = "0.4.4";
-       sha256 = "84f8b0b843c67cd34c28f4fa3fac1ef6abbdf0b141615ca29d8cc7f292895002";
+       version = "0.4.5";
+       sha256 = "717ce4edc1991da062d6b2124e8d2d39d4208b7748209ff98d238ea5f0fb087c";
        libraryHaskellDepends = [
          base bytestring containers directory ghcjs-perch mtl transformers
          transient transient-universe
@@ -29511,8 +29764,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
-       version = "0.9.2";
-       sha256 = "b47c4cec234f9ec83c292e7e213ebcfb4e0418db142f151fd8c370ccd5e2b21b";
+       version = "0.9.3";
+       sha256 = "7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210";
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
@@ -29571,6 +29824,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-orphans_0_6" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.6";
+       sha256 = "c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -30589,6 +30856,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_4_2" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
+     , QuickCheck, semigroups, tagged, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.4.2";
+       sha256 = "38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d";
+       libraryHaskellDepends = [
+         base base-orphans comonad containers semigroups tagged
+         template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck template-haskell transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/bifunctors/";
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -31022,6 +31312,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.6.0";
        sha256 = "e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5";
+       revision = "1";
+       editedCabalFile = "b114cf269065159a2e49c71bf52245a0ba6c71fd623d2cee896ac2fd3a3dcbce";
        libraryHaskellDepends = [
          aeson base binary case-insensitive hashable scientific tagged text
          text-binary time unordered-containers vector
@@ -31053,6 +31345,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "binary-parser_0_5_5" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, mtl
+     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "binary-parser";
+       version = "0.5.5";
+       sha256 = "1dab718e06a978118cd28d2412bceaa0b6ec8d67785bdb0982e259fb60fe43b3";
+       revision = "3";
+       editedCabalFile = "4ec2771d498dc996c1c7a08df2856f1c303538663d4fb201c742cffa950fc492";
+       libraryHaskellDepends = [
+         base base-prelude bytestring mtl text transformers
+       ];
+       testHaskellDepends = [
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/binary-parser";
+       description = "A highly-efficient but limited parser API specialised for bytestrings";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-parsers" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
      , bytestring-lexing, case-insensitive, criterion, deepseq
@@ -31219,8 +31534,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
-       revision = "3";
-       editedCabalFile = "6fd4d363bd8a64deacea2726daa15b67b4331f7d6b47de9980c11435564a3de1";
+       revision = "4";
+       editedCabalFile = "76530b6075b691eed9d1986d7487a03470a30abc3b92c7bb32abdcbe1a60b963";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -31841,6 +32156,7 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -33147,8 +33463,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "9";
-       editedCabalFile = "14307379cfd353cceede81149b2cae2f357d27ee23816203fd1757804e6b5b48";
+       revision = "10";
+       editedCabalFile = "b3fca3e52b9662881d181fa39c63b5b5095f77f83f0fd223c2a4cfeffa05a486";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -33754,7 +34070,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bloodhound_0_13_0_0" = callPackage
+  "bloodhound_0_14_0_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, errors, exceptions, generics-sop, hashable
      , hspec, http-client, http-types, mtl, mtl-compat, network-uri
@@ -33764,8 +34080,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.13.0.0";
-       sha256 = "65217195be1d4d29c99bfc05712e3aa6ed9f67d8e12180e703b67be1b093c4f9";
+       version = "0.14.0.0";
+       sha256 = "2e1b7becfafe753712ba7540ab9c41285a77256a5129ae05f5391a1f3cd5eeee";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers data-default-class
          exceptions hashable http-client http-types mtl mtl-compat
@@ -34114,8 +34430,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.8.0.0";
-       sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7";
+       version = "0.9.0.0";
+       sha256 = "75054c85437dce0f15363cfef7bad6fb90258a9e22e47e6f3fb5d7db3c440a08";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34741,12 +35057,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brainheck" = callPackage
+    ({ mkDerivation, base, containers, lens, megaparsec, mtl
+     , optparse-applicative, recursion-schemes, text, vector
+     }:
+     mkDerivation {
+       pname = "brainheck";
+       version = "0.1.0.1";
+       sha256 = "50f9f8aa9b2b31ab7bb85151ed986d6de4aa1a334bd8eea6dafdbd56d7c30a40";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers lens megaparsec mtl recursion-schemes text vector
+       ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       homepage = "https://github.com/vmchale/brainheck#readme";
+       description = "Brainh*ck interpreter in haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "break" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "break";
-       version = "1.0.1";
-       sha256 = "28e0cff1cc4f96aa19ebaac3caad4ca6851e89cd26bd48c4de4f611cbcf95166";
+       version = "1.0.2";
+       sha256 = "7688bb40ec0fcf2fd7acf4f662e79d3761d3ab348eb8282b58355e8a5412f272";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
        license = stdenv.lib.licenses.bsd3;
@@ -35168,6 +35503,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bug" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "bug";
+       version = "1.0.1";
+       sha256 = "18f29682de6ec6dd78e1e6afe17c13dcb6b02a4b18973bde33c47a57eeb6def5";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/nikita-volkov/bug";
+       description = "Better alternatives to the \"error\" function";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bugzilla" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
      , containers, data-default, http-conduit, http-types, iso8601-time
@@ -35855,8 +36202,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-strict-builder";
-       version = "0.4.3";
-       sha256 = "d56f6bc42518565f9310eaa13ce1d35cf29879bdae995d9b893fd309c093d231";
+       version = "0.4.5";
+       sha256 = "cf192d9951a42cf76f35c4b6dcc8d04868c5df3e279b7b29079ebcd076f8f3ce";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups
        ];
@@ -38680,8 +39027,10 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-streams";
-       version = "0.3.0.0";
-       sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b";
+       version = "0.3.0.1";
+       sha256 = "ee2ace965b317a6e6abd8197c24d34325317d95f5aad52f9ab8be9ed960e0d9d";
+       revision = "1";
+       editedCabalFile = "4163d0dd1c3de30360be4f10f3eb40b45fc4263557c5df573829688cbc3b3372";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38931,6 +39280,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_1" = 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.1";
+       sha256 = "98de26b33e95d45298afb182c961079dd9219bdebbb4a98c8bfb69c296140987";
+       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 {
@@ -39052,6 +39422,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cef3-raw" = callPackage
+    ({ mkDerivation, base, bindings-DSL, cef, gtk2 }:
+     mkDerivation {
+       pname = "cef3-raw";
+       version = "0.1.0";
+       sha256 = "e70ec9d8a43fadd7512858ec9da807bb3afa9656bbe12f82e05334386ab2c9b9";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ cef ];
+       libraryPkgconfigDepends = [ gtk2 ];
+       description = "Raw CEF3 bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {cef = null; gtk2 = pkgs.gnome2.gtk;};
+
+  "cef3-simple" = callPackage
+    ({ mkDerivation, base, cef3-raw }:
+     mkDerivation {
+       pname = "cef3-simple";
+       version = "0.1.0";
+       sha256 = "6707baebc50283201f2abae0814f62cc5a6dbd6076b89d9a3dbbf7bb582d9340";
+       libraryHaskellDepends = [ base cef3-raw ];
+       description = "Simple wrapper around cef3-raw";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ceilometer-common" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers
      , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes
@@ -40910,11 +41304,13 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.7.0.1";
-       sha256 = "74ccedf030ca1ee3c09c51b6e9fbb7caef4693f1ae0610694d03b9398d9ced56";
-       isLibrary = false;
+       version = "0.7.1";
+       sha256 = "b942391622ccc093daf78de34d81fff0f29e097f769c7cb403a802f79ae39b25";
+       revision = "1";
+       editedCabalFile = "567b69e3b3872430406fa5b1db7f86051fe42b6fc5f23c57a01a74fa62d54d8f";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
          clash-systemverilog clash-verilog clash-vhdl containers deepseq
          directory filepath ghc ghc-boot ghc-typelits-extra
@@ -40922,6 +41318,7 @@ self: {
          haskeline lens mtl process text time transformers unbound-generics
          uniplate unix unordered-containers
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
@@ -40938,8 +41335,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.7";
-       sha256 = "867a976ec5a436e953cd342ee3cff0fbeb54d32fb412ae5cade43bcb80aaab96";
+       version = "0.7.1";
+       sha256 = "087106396917d5119410d3048d1d666f572be580f22f2b61a439b60a821bb4d6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers data-binary-ieee754 deepseq directory errors fgl
@@ -40969,18 +41366,18 @@ self: {
     ({ mkDerivation, array, base, constraints, criterion
      , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, integer-gmp, lens, QuickCheck
-     , reflection, singletons, template-haskell
+     , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck
+     , reflection, singletons, template-haskell, vector
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.11";
-       sha256 = "e73490ee73228af3b2a7dca432a226a45bf5d8a52791134a99d4eeb32ac8043a";
+       version = "0.11.1";
+       sha256 = "afb318ea893448638372745cb3387f57569eb4d715c2d9462876d8e3570086b1";
        libraryHaskellDepends = [
          array base constraints data-binary-ieee754 data-default deepseq
          ghc-prim ghc-typelits-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
-         singletons template-haskell
+         ghc-typelits-natnormalise half integer-gmp lens QuickCheck
+         reflection singletons template-haskell vector
        ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [
@@ -41010,8 +41407,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.7";
-       sha256 = "1189f40348bb48d002614c3d9fbed3c228e71ab5a9a33c056256e1e763bf47bb";
+       version = "0.7.1";
+       sha256 = "65a920a186465159a7c01a8dc3853470b3c93d22d7f663795da11dea62402b3b";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -41028,8 +41425,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-verilog";
-       version = "0.7";
-       sha256 = "4a10084bd2333333af2c1616a030c57fb959f73639647ae2b6788d1d5f79e4ef";
+       version = "0.7.1";
+       sha256 = "364a45e0643fdaafda32e485bf3c79990b2862a65665fb8a4952d91d4fe87ded";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -41046,8 +41443,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.7";
-       sha256 = "6fb6c1dfa951021307bf121cb9ed622c3b726c20d2f0b873751fbd9329458af1";
+       version = "0.7.1";
+       sha256 = "462600defd6bf6ec5ae44c9e084546d7778f1d1fe8ae09885bedd1e712a47dbf";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -42173,24 +42570,6 @@ self: {
      }) {};
 
   "cmdargs" = callPackage
-    ({ mkDerivation, base, filepath, process, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "cmdargs";
-       version = "0.10.16";
-       sha256 = "fb194adb76f6f464ff38df8a6644c6ed7375cc7054278492145a705a87526fbd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base filepath process template-haskell transformers
-       ];
-       homepage = "https://github.com/ndmitchell/cmdargs#readme";
-       description = "Command line argument processing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cmdargs_0_10_17" = callPackage
     ({ mkDerivation, base, filepath, process, template-haskell
      , transformers
      }:
@@ -42206,7 +42585,6 @@ self: {
        homepage = "https://github.com/ndmitchell/cmdargs#readme";
        description = "Command line argument processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmdargs-browser" = callPackage
@@ -42511,25 +42889,27 @@ self: {
      }) {};
 
   "codex" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
-     , directory, either, filepath, hackage-db, http-client, lens
-     , machines, machines-directory, MissingH, monad-loops, network
-     , process, tar, text, transformers, wreq, yaml, zlib
+    ({ mkDerivation, ascii-progress, base, bytestring, Cabal
+     , containers, cryptohash, directory, either, filepath, hackage-db
+     , http-client, lens, machines, machines-directory, MissingH
+     , monad-loops, network, process, tar, text, transformers, wreq
+     , yaml, zlib
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.5.0.2";
-       sha256 = "491064e6cf6b1afc6be30b061f6876b1d9da1ecc769fc74f485853b5bab8d907";
+       version = "0.5.1.2";
+       sha256 = "f98093465412d4fb67c9a4e5debe92356a080f5e2670d730d5afb9b1cf383571";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers cryptohash directory either
-         filepath hackage-db http-client lens machines machines-directory
-         process tar text transformers wreq yaml zlib
+         ascii-progress base bytestring Cabal containers cryptohash
+         directory either filepath hackage-db http-client lens machines
+         machines-directory process tar text transformers wreq yaml zlib
        ];
        executableHaskellDepends = [
-         base bytestring Cabal directory either filepath hackage-db MissingH
-         monad-loops network process transformers wreq yaml
+         ascii-progress base bytestring Cabal directory either filepath
+         hackage-db MissingH monad-loops network process transformers wreq
+         yaml
        ];
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
@@ -42654,6 +43034,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "coincident-root-loci" = callPackage
+    ({ mkDerivation, array, base, combinat, containers, random, tasty
+     , tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "coincident-root-loci";
+       version = "0.2";
+       sha256 = "b05fa82685037016dc15328de28ac041e796c482e3828c5902a89ed25ea9dc5c";
+       libraryHaskellDepends = [
+         array base combinat containers random transformers
+       ];
+       testHaskellDepends = [
+         array base combinat containers tasty tasty-hunit
+       ];
+       homepage = "http://code.haskell.org/~bkomuves/";
+       description = "Equivariant CSM classes of coincident root loci";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "colada" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdargs, containers
      , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores
@@ -43295,6 +43694,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comonad_5_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers
+     , contravariant, distributive, doctest, semigroups, tagged
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "comonad";
+       version = "5.0.1";
+       sha256 = "561ffd697d9d38467d0d426947e0bade25a05e3c507235eca29ec800ad3f463d";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base containers contravariant distributive semigroups tagged
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/comonad/";
+       description = "Comonads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "comonad-extras" = callPackage
     ({ mkDerivation, array, base, comonad, containers, distributive
      , semigroupoids, transformers
@@ -43687,26 +44107,25 @@ self: {
 
   "composite-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base
-     , basic-prelude, composite-base, containers, contravariant, Frames
-     , generic-deriving, hspec, lens, profunctors, QuickCheck
-     , scientific, tagged, template-haskell, text, time
-     , unordered-containers, vector, vinyl
+     , composite-base, containers, contravariant, generic-deriving
+     , hashable, hspec, lens, profunctors, QuickCheck, scientific
+     , tagged, template-haskell, text, time, unordered-containers
+     , vector, vinyl
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.2.0.0";
-       sha256 = "57319e561a9b8d52dcaff3ef5fda46de8128e39ed2a7bbae212b32f8652f21a6";
+       version = "0.3.0.0";
+       sha256 = "c2f48c0e6e4b975b65c64988abcd72890bb1ec428a7e6f3212a58cf379cfd820";
        libraryHaskellDepends = [
-         aeson aeson-better-errors base basic-prelude composite-base
-         containers contravariant Frames generic-deriving lens profunctors
-         scientific tagged template-haskell text time unordered-containers
-         vector vinyl
+         aeson aeson-better-errors base composite-base containers
+         contravariant generic-deriving hashable lens profunctors scientific
+         tagged template-haskell text time unordered-containers vector vinyl
        ];
        testHaskellDepends = [
-         aeson aeson-better-errors aeson-qq base basic-prelude
-         composite-base containers contravariant Frames generic-deriving
-         hspec lens profunctors QuickCheck scientific tagged
-         template-haskell text time unordered-containers vector vinyl
+         aeson aeson-better-errors aeson-qq base composite-base containers
+         contravariant generic-deriving hashable hspec lens profunctors
+         QuickCheck scientific tagged template-haskell text time
+         unordered-containers vector vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "JSON for Vinyl/Frames records";
@@ -43714,19 +44133,20 @@ self: {
      }) {};
 
   "composite-base" = callPackage
-    ({ mkDerivation, base, basic-prelude, Frames, hspec, lens
-     , QuickCheck, template-haskell, text, vinyl
+    ({ mkDerivation, base, hspec, lens, monad-control, mtl, QuickCheck
+     , template-haskell, text, transformers, transformers-base, vinyl
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.2.0.0";
-       sha256 = "b18c0b286d4d8dfd8771df540dba9f8e9d0fc58484650d7434ed24e95d6428b1";
+       version = "0.3.0.0";
+       sha256 = "48ec59eb4b27cd57be950f32b59ecfca118a597fcc84da0e466a009cfe411372";
        libraryHaskellDepends = [
-         base basic-prelude Frames lens template-haskell text vinyl
+         base lens monad-control mtl template-haskell text transformers
+         transformers-base vinyl
        ];
        testHaskellDepends = [
-         base basic-prelude Frames hspec lens QuickCheck template-haskell
-         text vinyl
+         base hspec lens monad-control mtl QuickCheck template-haskell text
+         transformers transformers-base vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Shared utilities for composite-* packages";
@@ -43734,16 +44154,15 @@ self: {
      }) {};
 
   "composite-ekg" = callPackage
-    ({ mkDerivation, base, basic-prelude, composite-base, ekg, ekg-core
-     , Frames, lens, text, vinyl
+    ({ mkDerivation, base, composite-base, ekg, ekg-core, lens, text
+     , vinyl
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.2.0.0";
-       sha256 = "bb836d7e938e18848ae3bae573c4e7ec47b4dfdd56e5ebfdb556033e1a62c095";
+       version = "0.3.0.0";
+       sha256 = "548f3bd735ca1aad856f3088d37a6d631e264afa3cbd19a9b2918550f1044fda";
        libraryHaskellDepends = [
-         base basic-prelude composite-base ekg ekg-core Frames lens text
-         vinyl
+         base composite-base ekg ekg-core lens text vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "EKG Metrics for Vinyl/Frames records";
@@ -43751,18 +44170,17 @@ self: {
      }) {};
 
   "composite-opaleye" = callPackage
-    ({ mkDerivation, base, basic-prelude, bytestring, composite-base
-     , Frames, lens, opaleye, postgresql-simple, product-profunctors
-     , profunctors, template-haskell, text, vinyl
+    ({ mkDerivation, base, bytestring, composite-base, lens, opaleye
+     , postgresql-simple, product-profunctors, profunctors
+     , template-haskell, text, vinyl
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.2.0.0";
-       sha256 = "e1f018cd598679e2a79d9ce4b99463cdf0a2720ff3df57be2e1025731417ef37";
+       version = "0.3.0.0";
+       sha256 = "cfd8e41e5824044de462aa890051cc3fb283c6417ff35208cec2f5f4618ab251";
        libraryHaskellDepends = [
-         base basic-prelude bytestring composite-base Frames lens opaleye
-         postgresql-simple product-profunctors profunctors template-haskell
-         text vinyl
+         base bytestring composite-base lens opaleye postgresql-simple
+         product-profunctors profunctors template-haskell text vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Opaleye SQL for Frames records";
@@ -44144,14 +44562,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_1_1_0" = callPackage
+  "concurrency_1_1_2_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.1.1.0";
-       sha256 = "f955671cc7814d06d99a84f003423d8903604cdc9911d7f4986acaa39c519973";
+       version = "1.1.2.0";
+       sha256 = "1d33bf13dad0d3fedf53fcabfed7f99c511c6856c4e6e132809a4a84bdf37b4c";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -44449,8 +44867,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.9";
-       sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06";
+       version = "1.2.9.1";
+       sha256 = "05a4ea49a56ca27cc47b9138ed840b7aaa0176b0d917e06c1626fb940797dffe";
        libraryHaskellDepends = [
          base exceptions lifted-base mmorph monad-control mtl resourcet
          transformers transformers-base
@@ -44468,6 +44886,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_2_10" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
+     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, split
+     , transformers, transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.10";
+       sha256 = "d1167adea7da849a2636418926006546dce4cbde5ba324ade83416a691be58dd";
+       libraryHaskellDepends = [
+         base exceptions lifted-base mmorph monad-control mtl primitive
+         resourcet transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         split transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -46687,22 +47133,19 @@ self: {
      }) {};
 
   "cpphs" = callPackage
-    ({ mkDerivation, base, directory, filepath, old-locale, old-time
-     , polyparse
+    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.20.4";
-       sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e";
-       revision = "1";
-       editedCabalFile = "9304f73fec5750ee55b381f925d34c73cc1f660f5adaa6490d9d8dabf4ae1880";
+       version = "1.20.5";
+       sha256 = "c5a30c30b7479cc69704242a0313ecbcf8acf775b2164511efc0e4b47931a5b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base directory filepath old-locale old-time polyparse
+         base directory old-locale old-time polyparse
        ];
        executableHaskellDepends = [
-         base directory filepath old-locale old-time polyparse
+         base directory old-locale old-time polyparse
        ];
        homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
@@ -48110,6 +48553,8 @@ self: {
        pname = "cryptohash-md5";
        version = "0.11.100.1";
        sha256 = "710bd48770fa3e9a3b05428c6dc77fb72c91956d334a1eb89ded11bb843e18f9";
+       revision = "1";
+       editedCabalFile = "83170b82a6ca15da59f4f7831325128ce26e5ad00549d986fc294256ac963db7";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -48129,6 +48574,8 @@ self: {
        pname = "cryptohash-sha1";
        version = "0.11.100.1";
        sha256 = "3c79af33542512442f8f87f6abb1faef7cd43bbfb2859260a33251d861eb0dab";
+       revision = "1";
+       editedCabalFile = "0bd72d71afeb9183a7b9248499b871c31c2bd07166ffc97a220985ec6515f198";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -48148,6 +48595,8 @@ self: {
        pname = "cryptohash-sha256";
        version = "0.11.100.1";
        sha256 = "57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6";
+       revision = "1";
+       editedCabalFile = "0fd2d404c8c1cb3b3b3a810a5d5eaf2ade6f1cc7f30b50ae88d7102f5ca78d7b";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -48167,6 +48616,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "10698bb9575eaa414a65d9644caa9408f9276c63447406e0a4faef91db1071a9";
+       revision = "1";
+       editedCabalFile = "de229945e423e586bf5ffda9535b11b5cb9cb4299d17bd8a4de7f7dbbecf492a";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -48756,6 +49207,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cubicbezier_0_6_0_0" = callPackage
+    ({ mkDerivation, base, containers, fast-math, integration, matrices
+     , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty
+     , tasty-hunit, vector, vector-space
+     }:
+     mkDerivation {
+       pname = "cubicbezier";
+       version = "0.6.0.0";
+       sha256 = "3265ad631316aaba8854f4fbb6cc7f680e4b6a91b58216f88b818d128bbb2b24";
+       revision = "1";
+       editedCabalFile = "4023405ed972ab01de3edd95f9cbf996d9b33be26f35efeb8a287c5fdb8503a7";
+       libraryHaskellDepends = [
+         base containers fast-math integration matrices microlens
+         microlens-mtl microlens-th mtl vector vector-space
+       ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
+       description = "Efficient manipulating of 2D cubic bezier curves";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cubicspline" = callPackage
     ({ mkDerivation, base, hmatrix, safe }:
      mkDerivation {
@@ -51450,20 +51922,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "datasets_0_2_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, directory
-     , file-embed, filepath, hashable, microlens, stringsearch, text
-     , time, vector, wreq
+  "datasets_0_2_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava
+     , directory, file-embed, filepath, hashable, microlens
+     , stringsearch, text, time, vector, wreq
      }:
      mkDerivation {
        pname = "datasets";
-       version = "0.2.3";
-       sha256 = "f155d4aea31d03fd14c7050793d9e90685ba8858460ce7c3716919bd00c12ea4";
+       version = "0.2.4";
+       sha256 = "59403047f553fce17046ade4cb03bf1d5e2ee1e71f045cd8ac1e6f177693add0";
        libraryHaskellDepends = [
-         aeson base bytestring cassava directory file-embed filepath
-         hashable microlens stringsearch text time vector wreq
+         aeson attoparsec base bytestring cassava directory file-embed
+         filepath hashable microlens stringsearch text time vector wreq
        ];
-       homepage = "https://github.com/glutamate/datasets";
+       homepage = "https://github.com/filopodia/open/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51776,10 +52248,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "0.10.12";
-       sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54";
-       revision = "1";
-       editedCabalFile = "056e9977d3cf251022d8f4013531c0dd6b62afa68719b5567756386e1503271e";
+       version = "0.10.13";
+       sha256 = "aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca";
        libraryHaskellDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
@@ -51791,7 +52261,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        doCheck = false;
-       homepage = "https://john-millikin.com/software/haskell-dbus/";
+       homepage = "https://github.com/rblaze/haskell-dbus#readme";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -52808,15 +53278,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_5_1_2" = callPackage
+  "dejafu_0_6_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , monad-loops, mtl, random, ref-fd, semigroups, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.5.1.2";
-       sha256 = "0e6114f59678ff0c5a9f5a4561f9b1ae4d87c77c50fd498e447ca7f67eae6d4c";
+       version = "0.6.0.0";
+       sha256 = "c0d8f49b5c2c9d6c2d1aacc0e25eb688a795c6582df087cd619eaeea268a811e";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions monad-loops mtl
          random ref-fd semigroups transformers transformers-base
@@ -53348,8 +53818,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.3.5";
-       sha256 = "0a165c8eeb78349ded41cf51750753cdd0e25c139171789f7a4b0c6be4ccd231";
+       version = "0.3.6";
+       sha256 = "0c1fab416505e3fabaec007828073c065db077f004dcc6955f2cd32ca139356d";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell transformers
          transformers-compat
@@ -53596,8 +54066,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.1.0";
-       sha256 = "338152e2bd5e894f6d331f4c7230facb6585ebf789aab18b129d4873093f1302";
+       version = "1.2.0";
+       sha256 = "9727b876f006d0e26fafd63fccc6d456a6e462ee9524f81883c1f743eafdf1ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53611,14 +54081,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "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.0";
+       sha256 = "4e46f6a1540b8e6dc7585ba00eee6231fd38ddd1223bfda0888a8328ccb32253";
+       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-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation
      , optparse-generic, text, trifecta, vector, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.0";
-       sha256 = "514e14a765b0fd360dad7aec62980ca02424d6670be9bf5b9a5a171835a7758d";
+       version = "1.0.1";
+       sha256 = "ccf235f785207bedf29ea42d4ee26b44c2d2777fda8aa8d0306beaca43960726";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53637,8 +54129,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.1";
-       sha256 = "83e217056193e67bfa9b81074baeb0289372dd4bb185be4aff034956340d8f4c";
+       version = "1.0.2";
+       sha256 = "d86b35774d065fa198d750a411e49cf75752657193f1579400ce36cf47977db3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53720,6 +54212,8 @@ self: {
        pname = "diagrams-builder";
        version = "0.8.0.1";
        sha256 = "6e9b0eba4c9aa698ffdd21d55492b4cfd867cd4107ed8ccc591888cba7fe5b1c";
+       revision = "1";
+       editedCabalFile = "ecda2354b5f1e5f585b482eff8df0b7423c9328a03185dfc977170e48515bc64";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -53794,8 +54288,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.0.1";
        sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
-       revision = "2";
-       editedCabalFile = "f48239089189d320f3f48f25d2381f5d1e931ed7cdbdd70eb2ce246a9d04fda5";
+       revision = "4";
+       editedCabalFile = "b3b01a324248fb57044b9b324bd68cdd0de294310850d170da7d0ad5d883f390";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -55166,22 +55660,22 @@ self: {
      }) {};
 
   "discord-hs" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad
      , containers, data-default, hakyll, hashable, hslogger, http-client
      , mmorph, mtl, pipes, req, split, stm, stm-conduit, text, time
      , transformers, unordered-containers, url, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "discord-hs";
-       version = "0.2.1";
-       sha256 = "439cc60b1206c4709a9a28e9ac5c64f7fb6eb5e40014ef055624459842add95e";
+       version = "0.3.2";
+       sha256 = "2eb06980c5b4e8e25c3ba4b7ad6816edac35c637a8abde2da14a3d304a8e56f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers data-default
-         hashable hslogger http-client mmorph mtl pipes req stm stm-conduit
-         text time transformers unordered-containers url vector websockets
-         wuss
+         aeson base bytestring case-insensitive comonad containers
+         data-default hashable hslogger http-client mmorph mtl pipes req stm
+         stm-conduit text time transformers unordered-containers url vector
+         websockets wuss
        ];
        executableHaskellDepends = [ base hakyll split ];
        homepage = "https://github.com/jano017/Discord.hs";
@@ -55333,8 +55827,8 @@ self: {
     ({ mkDerivation, base, dlist, ghcjs-base-stub }:
      mkDerivation {
        pname = "disposable";
-       version = "0.2.0.3";
-       sha256 = "6d1b6d12d1f742f204effb46c204a596cd3aeeae42bebacb86c37e60db202351";
+       version = "0.2.0.4";
+       sha256 = "c23fe12dce0aef49bcd52206fe927ac6ae1aa4af5c32028d6ceb4bc52b1fc96a";
        libraryHaskellDepends = [ base dlist ghcjs-base-stub ];
        homepage = "https://github.com/louispan/disposable#readme";
        description = "Allows storing different resource-releasing actions together";
@@ -56559,6 +57053,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_11_2" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.11.2";
+       sha256 = "0752de5ea4ad4179573cfc0f357781841221b4c14f2269a32111e5dbf161948b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -57931,6 +58453,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dwergaz" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dwergaz";
+       version = "0.2.0.0";
+       sha256 = "18bd15c3019f91ac0fe9efa78c79e0cac71f31b8faa1f8dba92d700dc427d70b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/xngns/dwergaz";
+       description = "A minimal testing library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dx9base" = callPackage
     ({ mkDerivation, base, Win32 }:
      mkDerivation {
@@ -59160,6 +59695,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ekg_0_4_0_13" = 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.13";
+       sha256 = "44b1d5987e8d8061aaf05fd96f9072399ba16b07999caf5186e856c7e47bb48f";
+       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
@@ -59234,6 +59788,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-elastic" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
+     , http-client, lens, text, time, unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "ekg-elastic";
+       version = "0.2.2.0";
+       sha256 = "ae21e2ebc65d58e7faa9e4b660d4c67a1e41341014a47494e6dc9aa2bc8d8e19";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core hostname http-client lens text time
+         unordered-containers wreq
+       ];
+       homepage = "https://github.com/cdodev/ekg-elastic";
+       description = "Push metrics to elastic";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ekg-elasticsearch" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
+     , http-client, lens, text, time, unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "ekg-elasticsearch";
+       version = "0.3.0.0";
+       sha256 = "7ce37cb775b93f85e482e77d6477aab8a50e6c1fea3d9ff4264fd0adff146377";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core hostname http-client lens text time
+         unordered-containers wreq
+       ];
+       homepage = "https://github.com/cdodev/ekg-elasticsearch";
+       description = "Push metrics to elasticsearch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ekg-influxdb" = callPackage
     ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb
      , text, time, unordered-containers, vector
@@ -59266,6 +59854,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-json_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.5";
+       sha256 = "0cd5ecae57a156a5c779acff70d0fa3b02c52cb05283c0effb62a2902ebe8556";
+       libraryHaskellDepends = [
+         aeson base ekg-core text unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg-json";
+       description = "JSON encoding of ekg metrics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-log" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, ekg-core
      , fast-logger, filepath, text, time, unix, unordered-containers
@@ -59377,6 +59981,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-wai_0_1_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, http-types, network, text, time, transformers
+     , unordered-containers, wai, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "ekg-wai";
+       version = "0.1.0.1";
+       sha256 = "b814937bfaadf3d53172fb1f7e9b7f8a21799e1d7ce5247974e71e2ccf2c7493";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core ekg-json filepath http-types network
+         text time transformers unordered-containers wai wai-app-static warp
+       ];
+       homepage = "https://github.com/tvh/ekg-wai";
+       description = "Remote monitoring of processes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "electrum-mnemonic" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
@@ -59815,8 +60438,8 @@ self: {
      }:
      mkDerivation {
        pname = "elocrypt";
-       version = "0.4.1";
-       sha256 = "8f2d96c3e91584e96d7a80f34577b541047220d1d9ca5d03c950985421ee5ac3";
+       version = "0.6.0";
+       sha256 = "5804d0012a1d4cc648b4b4881d1c7627ba6798765cb2ed9f04615519098dc36e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base MonadRandom random ];
@@ -59838,8 +60461,8 @@ self: {
      }:
      mkDerivation {
        pname = "elsa";
-       version = "0.2.0.0";
-       sha256 = "79d83d3ab692b21920189ea780ab4418e06330959165b29f4d9940e1e03e64af";
+       version = "0.2.0.1";
+       sha256 = "41d484621c446a2fb80248d3f53bd68a8d7ff48d234d597165b5f33ae206f1c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60571,6 +61194,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "envelope_0_2_2_0" = callPackage
+    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
+     , text
+     }:
+     mkDerivation {
+       pname = "envelope";
+       version = "0.2.2.0";
+       sha256 = "cf4d6fe3f906e859ec3c16684a8dafb349e77f0fa4f21b7090ca33e707867ef9";
+       libraryHaskellDepends = [ aeson base http-api-data mtl text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/envelope#readme";
+       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "envparse" = callPackage
     ({ mkDerivation, base, containers, hspec, text }:
      mkDerivation {
@@ -61308,6 +61947,51 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "etc" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "etc";
+       version = "0.0.0.2";
+       sha256 = "11c93030ccf2e2dc1916b1fb52d7886ee729ac26d8b88287d4ebe253bb557db1";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory exceptions hashable
+         protolude text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers protolude tasty tasty-hunit
+         tasty-rerun text unordered-containers vector
+       ];
+       homepage = "https://github.com/roman/Haskell-etc";
+       description = "Declarative configuration spec for Haskell projects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "etc_0_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "etc";
+       version = "0.1.0.0";
+       sha256 = "3f8a444e65e9a302a3282f87207a929929c8d78b5160ffad7c5c54655068980a";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory exceptions hashable
+         protolude text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers protolude tasty tasty-hunit
+         tasty-rerun text unordered-containers vector
+       ];
+       homepage = "https://github.com/roman/Haskell-etc";
+       description = "Declarative configuration spec for Haskell projects";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "etcd" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, hspec
      , http-conduit, MonadRandom, mtl, text, time
@@ -61344,29 +62028,6 @@ self: {
      }) {};
 
   "ether" = callPackage
-    ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
-     , QuickCheck, tasty, tasty-quickcheck, template-haskell
-     , transformers, transformers-base, transformers-lift
-     }:
-     mkDerivation {
-       pname = "ether";
-       version = "0.4.0.2";
-       sha256 = "8b9dce4d444613dc46df988fa3a437297503e63ff29fd28113b35b98a8dcd953";
-       revision = "1";
-       editedCabalFile = "a876e46771d9778373b6a63d43ecb4bb88e303c420341547bfd3f9b9054d1373";
-       libraryHaskellDepends = [
-         base exceptions mmorph monad-control mtl template-haskell
-         transformers transformers-base transformers-lift
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-quickcheck transformers
-       ];
-       homepage = "https://int-index.github.io/ether/";
-       description = "Monad transformers and classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ether_0_4_1_0" = callPackage
     ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
      , QuickCheck, tasty, tasty-quickcheck, template-haskell
      , transformers, transformers-base, transformers-lift
@@ -61385,7 +62046,100 @@ self: {
        homepage = "https://int-index.github.io/ether/";
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ethereum-analyzer" = callPackage
+    ({ mkDerivation, base, bimap, bytestring, containers
+     , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "ethereum-analyzer";
+       version = "1.0.3";
+       sha256 = "c4144ad2572957cbd33d3c03c6eb68707b31e2e029741cbeb3b530237a6da8a1";
+       libraryHaskellDepends = [
+         base bimap bytestring containers ethereum-analyzer-deps extra fgl
+         graphviz hexstring hoopl text
+       ];
+       testHaskellDepends = [
+         base bytestring ethereum-analyzer-deps extra hoopl hspec text
+       ];
+       homepage = "https://github.com/ethereumK/ethereum-analyzer";
+       description = "A Ethereum contract analyzer";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "ethereum-analyzer-cli" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit-combinators
+     , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions
+     , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "ethereum-analyzer-cli";
+       version = "1.0.3";
+       sha256 = "8cd1c6e8e694147b97fcb1ed9f07442018c66dd91b736756b94ae1d5b4810b17";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit-combinators ethereum-analyzer-deps
+         exceptions hexstring http-conduit json-rpc text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base directory ethereum-analyzer ethereum-analyzer-deps hflags
+         monad-logger mtl text
+       ];
+       homepage = "https://github.com/ethereumK/ethereum-analyzer";
+       description = "A CLI frontend for ethereum-analyzer";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "ethereum-analyzer-deps" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring
+     , binary, bytestring, containers, deepseq, fast-logger, global-lock
+     , monad-logger, nibblestring, split, text
+     }:
+     mkDerivation {
+       pname = "ethereum-analyzer-deps";
+       version = "0.0.1";
+       sha256 = "2b83d2f3e13d2d85d6662df3c9469e834b9f02d60b737e94a94802ab0c8c7b71";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base base16-bytestring binary bytestring
+         containers deepseq fast-logger global-lock monad-logger
+         nibblestring split text
+       ];
+       description = "Stripped dependencies of ethereum-analyzer";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "ethereum-analyzer-webui" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ethereum-analyzer
+     , ethereum-analyzer-deps, exceptions, hflags, http-media
+     , http-types, logging-effect, monad-logger, mtl, neat-interpolation
+     , optparse-applicative, prometheus-client, prometheus-metrics-ghc
+     , protolude, servant, servant-server, text, time, wai, wai-extra
+     , warp, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "ethereum-analyzer-webui";
+       version = "1.0.3";
+       sha256 = "487dcbd54fbc52682c51e9f52aa98a49e1cb369dad50bb29b2b9a1a94f0f900a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring ethereum-analyzer exceptions http-media
+         http-types logging-effect mtl neat-interpolation
+         optparse-applicative prometheus-client prometheus-metrics-ghc
+         protolude servant servant-server text time wai wai-extra warp
+         wl-pprint-text
+       ];
+       executableHaskellDepends = [
+         base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger
+       ];
+       homepage = "https://github.com/ethereumK/ethereum-analyzer";
+       description = "A web frontend for ethereum-analyzer";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -61564,8 +62318,8 @@ self: {
      }:
      mkDerivation {
        pname = "eve";
-       version = "0.1.7";
-       sha256 = "b1d4ad466224f3cad47bce852e5c1605e3353b57adb1a4dc57591ee89e99b237";
+       version = "0.1.8";
+       sha256 = "1f2bfd2114adc4bee6096bf4ae0faa835117627eca225f9cebc9b860604d1bae";
        libraryHaskellDepends = [
          base containers data-default free lens mtl
        ];
@@ -61673,8 +62427,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.2";
-       sha256 = "20681dea13cfc53e4b8e0b27c4e8ec62462a0c0886a797eb773370db1ca0e00e";
+       version = "0.8.2.3";
+       sha256 = "5867c9f778f0947301cddd83cd940f08daa2689b9a5bac3cc268806fde08cf2b";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -61691,8 +62445,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-api";
-       version = "1.0.0";
-       sha256 = "3d72797d5d9b81f2f5f1e613d6681983d9fd541a6b5dd773d92b1982ced422e8";
+       version = "1.0.2";
+       sha256 = "d97fc24411bb872084ad41b2113070c8b576b3a055ed918e7880993c5fd64107";
        libraryHaskellDepends = [
          aeson base containers mtl protolude unordered-containers uuid
        ];
@@ -62720,8 +63474,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.5.1";
-       sha256 = "8f3397c7a176045f1bb3b2a181e36b54192cb6fb5e99a9d28552975130ec49fc";
+       version = "1.5.2";
+       sha256 = "47dcc02deb532850291f30ba2d2e7d251ac31b90021323fac71ab4c9ac80e063";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
@@ -62774,6 +63528,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extralife" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, text, time
+     }:
+     mkDerivation {
+       pname = "extralife";
+       version = "0.1.0.1";
+       sha256 = "766886bed3ce56d91dc082427849f96c8e8f116cadf06a28c1fcda94bac58488";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls text time
+       ];
+       homepage = "https://github.com/wuest/haskell-extralife-api";
+       description = "API Client for ExtraLife team and user data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ez-couch" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
      , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -63498,29 +64268,29 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
      , containers, crypto-api, cryptohash, cryptohash-cryptoapi
-     , data-default, hspec, http-conduit, http-types, HUnit, lifted-base
-     , monad-control, monad-logger, old-locale, QuickCheck, resourcet
-     , text, time, transformers, transformers-base, unordered-containers
+     , 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.0.13";
-       sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e";
-       revision = "1";
-       editedCabalFile = "ff5a76303ad659f13394147cf6a3bbc3ee25e0ddf2df684d5b9a199c546dc75c";
+       version = "1.1.1";
+       sha256 = "c8d23435144e58af8ee64dde629f072043e4800daecce1bddb0670069a657f65";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
-         cryptohash-cryptoapi data-default http-conduit http-types
-         lifted-base monad-control monad-logger old-locale resourcet text
-         time transformers transformers-base unordered-containers
+         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/prowdsponsor/fb";
+       homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63758,8 +64528,8 @@ self: {
        pname = "feed";
        version = "0.3.12.0";
        sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942";
-       revision = "1";
-       editedCabalFile = "f4f8a8372bb2337c23c91e9fb5e29b379def01dba7234db0e44b9e753c25cc8c";
+       revision = "2";
+       editedCabalFile = "32389b33d279208406a223eb0c35ca1d687f6c2ac172dc106d684c11c1c6f73d";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -64300,6 +65070,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ficketed" = callPackage
+    ({ mkDerivation, async, base, binary, blaze-html, bytestring
+     , containers, directory, http-types, mime-types, MissingH
+     , optparse-applicative, socketed, text, wai, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "ficketed";
+       version = "0.1.0.0";
+       sha256 = "9cf19ad44621750d659c6bcddb5cbc323c64bb3bd7c6b3d0a13b9759d1caa14c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base binary blaze-html bytestring containers directory
+         http-types mime-types MissingH optparse-applicative socketed text
+         wai wai-app-static warp
+       ];
+       description = "update statically hosted file in a push stule through socketed";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fields" = callPackage
     ({ mkDerivation, array, base, containers, fclabels, monads-fd
      , transformers
@@ -64431,8 +65221,8 @@ self: {
      }:
      mkDerivation {
        pname = "file-location";
-       version = "0.4.9";
-       sha256 = "be29deb3c2267913f642e511deca988cedd287ae519012d01178d37d05f814dc";
+       version = "0.4.9.1";
+       sha256 = "f4b2b84f8d602e0ae4194f897b584af95b3bfdc785e5030110743724d0b74974";
        libraryHaskellDepends = [
          base containers HUnit lifted-base template-haskell th-orphans
          transformers
@@ -65438,6 +66228,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flat" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq
+     , derive, dlist, ghc-prim, mono-traversable, pretty, primitive
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "flat";
+       version = "0.2.2";
+       sha256 = "27bb1b915b1a922d22c13c04cda6ea373e75d70fa198b6d8096027f8681bea36";
+       libraryHaskellDepends = [
+         array base bytestring containers cpu deepseq dlist ghc-prim
+         mono-traversable pretty primitive text transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers cpu deepseq derive ghc-prim pretty tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "http://github.com/tittoassini/flat";
+       description = "Principled and efficient bit-oriented binary serialization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flat-maybe" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -65484,6 +66296,19 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "flay" = callPackage
+    ({ mkDerivation, base, constraints, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "flay";
+       version = "0.1";
+       sha256 = "c44ec42882dbb5713737a44619f7bbad742cf152ce864059b78cb4605bdc8da3";
+       libraryHaskellDepends = [ base constraints ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/k0001/flay";
+       description = "Work on your datatype without knowing its shape nor its contents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flexible-defaults" = callPackage
     ({ mkDerivation, base, containers, template-haskell, th-extras
      , transformers
@@ -66038,22 +66863,27 @@ self: {
 
   "fmt" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, containers, hspec, microlens, neat-interpolation
-     , text, text-format, vector
+     , bytestring, containers, criterion, deepseq, formatting, hspec
+     , interpolate, microlens, neat-interpolation, text, text-format
+     , vector
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.4";
-       sha256 = "bfc71940c7f5c90c72945906e0887eb71894858593d536cb43b04109fd82634f";
+       version = "0.1.0.0";
+       sha256 = "94153a2e1aa613e8ab77eaa9fbc4723697b4cb4351f2383bc649290c2cbac495";
        libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring microlens text
-         text-format
+         base base16-bytestring base64-bytestring bytestring containers
+         microlens text text-format
        ];
        testHaskellDepends = [
          base bytestring containers hspec neat-interpolation text vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq formatting interpolate
+         text text-format vector
+       ];
        homepage = "http://github.com/aelve/fmt";
-       description = "Nice formatting library";
+       description = "A new formatting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66874,8 +67704,29 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.5";
-       sha256 = "d2822ebd4159ef2786909dee674397d675dcb710ee2b48a693d69a1ece30cf55";
+       version = "0.0.6";
+       sha256 = "9f0a2e9823146e7d13d1a11522446d43e110d80bde4937214107415f593c0222";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       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_0_0_7" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.7";
+       sha256 = "6b4e2ed9920a47ef7cbfe015f502695f707694f54e4febea6d296b6c08dda49b";
+       revision = "1";
+       editedCabalFile = "28e6ea019acf74e5800bebd14ba601086541f227f46682277e5ab469d767aa88";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -67498,6 +68349,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "freer-effects_0_3_0_1" = callPackage
+    ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "freer-effects";
+       version = "0.3.0.1";
+       sha256 = "6aee97d69d573b5ed0d5e549330299adba393f46845dfd8339e4cc19b48a4c8d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion free mtl ];
+       homepage = "https://github.com/IxpertaSolutions/freer-effects";
+       description = "Implementation of effect system for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
      , pretty, random, syb
@@ -69371,8 +70244,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.11.1";
-       sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9";
+       version = "1.11.2";
+       sha256 = "29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -69460,6 +70333,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-random_0_5_0_0" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "generic-random";
+       version = "0.5.0.0";
+       sha256 = "4effa13c9af919a27ac6e1268937d903e8fe7daf588668ef79a1fea62c096503";
+       revision = "1";
+       editedCabalFile = "d29d7fb8fd61317a1117ddb5189abd1498d2dccdf5a353349f712c4ea1e6e094";
+       libraryHaskellDepends = [ base QuickCheck ];
+       homepage = "http://github.com/lysxia/generic-random";
+       description = "Generic random generators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-records" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -69583,6 +70471,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-sop_0_2_5_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "generics-sop";
+       version = "0.2.5.0";
+       sha256 = "f3977cfd6c3e21555393294b2be2b8fd23729f9224828418208d06da65d34ddc";
+       libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Generic Programming using True Sums of Products";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop-lens" = callPackage
     ({ mkDerivation, base, generics-sop, lens }:
      mkDerivation {
@@ -69905,6 +70806,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-hashable" = callPackage
+    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+     , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
+     , validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-hashable";
+       version = "0.0.0.0";
+       sha256 = "ccae0bc7eb9afdc14669a5d8e8d8fbe292ea9f3613ce810ba682d541e5faafea";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-hspec genvalidity-property hashable
+         hspec QuickCheck validity
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity genvalidity-hspec hashable hspec
+         hspec-core QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity";
+       description = "Standard spec's for Hashable instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-path" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path
      , validity-path
@@ -70544,22 +71467,6 @@ self: {
      }) {};
 
   "ghc-heap-view" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-heap-view";
-       version = "0.5.7";
-       sha256 = "4b6cbb42c256987e55b5d6136f4c7efb560a5ea1fd34d4878dcec1fe9aa71524";
-       libraryHaskellDepends = [
-         base binary bytestring containers ghc template-haskell transformers
-       ];
-       testHaskellDepends = [ base deepseq ];
-       description = "Extract the heap representation of Haskell values and thunks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-heap-view_0_5_9" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc
      , template-haskell, transformers
      }:
@@ -70573,7 +71480,6 @@ 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
@@ -70768,8 +71674,8 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945";
-       revision = "1";
-       editedCabalFile = "b47858cf533ae8d72bd422106bcb9e075ae477ab2e537f59ffe437277840bcef";
+       revision = "2";
+       editedCabalFile = "d3f3470c7bd13b765891fb56b28d809cb7aeda0a78050679ae6f29b6705c46bf";
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
@@ -71026,18 +71932,19 @@ self: {
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
-     , template-haskell, transformers
+     , tasty-quickcheck, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.2.3";
-       sha256 = "bd7828cf6c3062a785ad5c35a82d2229341acca4c2fd605c4718f6f595316133";
+       version = "0.2.4";
+       sha256 = "76940aad94517a3fae00d007396edef8238d306094aa82b30da0613df0b33e82";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
          template-haskell transformers
        ];
        testHaskellDepends = [
          base ghc-typelits-natnormalise singletons tasty tasty-hunit
+         tasty-quickcheck
        ];
        homepage = "http://clash-lang.org/";
        description = "Derive KnownNat constraints from other KnownNat constraints";
@@ -71298,8 +72205,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.7.0.4";
-       sha256 = "1c9e57e7de17179c2aca7c6a0417304fa2229b498431f1137dc0a606d8315bac";
+       version = "0.8.0.0";
+       sha256 = "68f450ee0c8c3fdb9becec30bb88ab340df9639244f0e49b53caf904ed06026a";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -71328,8 +72235,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.7.0.3";
-       sha256 = "3ec7c0973dfce18d77df9b6162c29c4af6ea2356da679510c034ae8c31a4c029";
+       version = "0.8.0.0";
+       sha256 = "8a003ecab2ee0c8c8af5b8a0fb20820dc809c2e200c956bd07e6c60c5958774c";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -71341,8 +72248,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.7.0.4";
-       sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619";
+       version = "0.8.0.0";
+       sha256 = "5c1fc8af094ce01411a6ed7d9c5fa61c4cabad676539fe5383b64e7bcc7ef3e2";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71400,17 +72307,6 @@ self: {
      }) {};
 
   "ghcjs-perch" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "ghcjs-perch";
-       version = "0.3.3.1";
-       sha256 = "5a9e656474f2b57c18ed028217f7c44d00468ca2b8d433422b049084143a1275";
-       libraryHaskellDepends = [ base transformers ];
-       description = "GHCJS version of Perch library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ghcjs-perch_0_3_3_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ghcjs-perch";
@@ -71419,7 +72315,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -71815,8 +72710,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.11";
-       sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f";
+       version = "3.0.13";
+       sha256 = "a5c79de84124785e308b5fc253574bca3130e47b425fb1a7543f3f17505720a2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -71838,8 +72733,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.4.0";
-       sha256 = "2e7ce60dded6d70a4598001469894d1f415bc28d600e5a6ac9f4558c624200e4";
+       version = "0.3.4.2";
+       sha256 = "4383641d4150ca745a339628e4b824480839568b344ef0f5d6659b7354d3e88e";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -71875,7 +72770,7 @@ self: {
   "gi-gtksource" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base
+     , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
      , text, transformers
      }:
      mkDerivation {
@@ -71888,13 +72783,13 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi
          haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryPkgconfigDepends = [ gtksourceview3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) gtksourceview;};
+     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -72350,6 +73245,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gipeda_0_3_3_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava
+     , concurrent-output, containers, directory, extra, file-embed
+     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
+     , tagged, text, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "gipeda";
+       version = "0.3.3.2";
+       sha256 = "39c0e0e3b892d37a66c34d741c563bfda9d171f481b4810dbf0697c312ce2d13";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cassava concurrent-output containers
+         directory extra file-embed filepath gitlib gitlib-libgit2
+         scientific shake split tagged text transformers
+         unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/nomeata/gipeda";
+       description = "Git Performance Dashboard";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "giphy-api" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
@@ -72865,8 +73784,8 @@ self: {
        pname = "github";
        version = "0.15.0";
        sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609";
-       revision = "2";
-       editedCabalFile = "dfa08cdd826d10c2b751d80356cb956f38dddd4b7247fdb0beeefb6f98e94373";
+       revision = "3";
+       editedCabalFile = "50040d65a00580e8ff6bfc642b4a99fa722893692908c062629de88d2b3ea20f";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -72954,6 +73873,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github-release_1_0_2" = 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.0.2";
+       sha256 = "c3bc7318a9497f7b44fda6ed1ac993bd1de72b5f802fb00e2c9e6436a1e8854d";
+       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
@@ -73438,6 +74379,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_3_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.3.2";
+       sha256 = "39c84b225b4d85b0f662e22f762e3b7e9c8f67c1097f23d0af094be79f09db7f";
+       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
@@ -73623,8 +74586,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier-react";
-       version = "0.4.0.0";
-       sha256 = "2486f02a5c8375cc2b7f75d53279ef96257067e24bc1b946c9ab304cf3b7b883";
+       version = "0.6.0.0";
+       sha256 = "57b7d5b55b3c05fa27664971e206a679c52c718e88a0000c0dc692471ec1be1a";
        libraryHaskellDepends = [
          base containers deepseq disposable dlist free ghcjs-base-stub
          glazier javascript-extras lens mmorph mtl pipes-concurrency
@@ -73645,8 +74608,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier-react-examples";
-       version = "0.4.0.0";
-       sha256 = "2bff5dbf10e7f78bf61f93a8abe210d0cafcf634f3973e78aa2b1e7fd8188152";
+       version = "0.6.0.0";
+       sha256 = "f5c39db40f0ccc6cb0beeddd1118c7117af7fa7510e99edfc6ceba49c45a2aa8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73668,8 +74631,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier-react-widget";
-       version = "0.4.0.0";
-       sha256 = "f60ebf2ff016382dda3d5808eef28eb900fc62f86b5f7c6be98c92186bce2d68";
+       version = "0.6.0.0";
+       sha256 = "8ae667b96efe25af3d2ac44bdf752e2216f80e41eff4de1c9a5855b1fde2feac";
        libraryHaskellDepends = [
          base containers disposable dlist free ghcjs-base-stub glazier
          glazier-react javascript-extras lens mmorph mtl pipes-concurrency
@@ -73779,8 +74742,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.20.2.1";
-       sha256 = "95b148b68701f7a1f521e0884ab405fe61bbb5a4a1a47d399e536cad1a400110";
+       version = "2.20.3";
+       sha256 = "2c50f79c534a9d350cf956f559041d7d344f5c09586c648ec4284a6093a7aec1";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -73977,8 +74940,8 @@ self: {
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
        pname = "gloss-accelerate";
-       version = "0.2.0.0";
-       sha256 = "5039b74bac0851ceaa7b971a5a50f1533c5e7d99594bc8030ee01c473f5875ae";
+       version = "2.0.0.0";
+       sha256 = "2ea628c30c52a6a9600f6fd782b1aa65266a7253b6fca9968e1e1474a4f0d1c1";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -74101,8 +75064,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster-accelerate";
-       version = "0.2.0.0";
-       sha256 = "d88c6dd639b86a451e77b5eae86fec785b476dd337bb189b82981bf33fe580fa";
+       version = "2.0.0.0";
+       sha256 = "2db125ba6435ee4c20ac4210a66899a063f34554e80e4b7a88c6e4e579ea18c4";
        libraryHaskellDepends = [
          accelerate base colour-accelerate gloss gloss-accelerate
        ];
@@ -74396,8 +75359,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.5";
-       sha256 = "fdb2f813be0fe972855910100b544f7dbf3a2cd69d79e99bcffc9f60e761ec02";
+       version = "0.2.6";
+       sha256 = "029d9ec796ae8cb7a1986676ea85552b3f48ddaa0c92dddb49e406cd3129b79f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77980,8 +78943,8 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-examples";
-       version = "0.1.0.6";
-       sha256 = "d12f367a313bebb5d793a152ab59223ada856fb4150428d994f30b87ae60e99b";
+       version = "0.1.0.7";
+       sha256 = "5f52af837b36a2e9981aa44af01523372d760d27ce96eb6777386214c1712714";
        libraryHaskellDepends = [
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
@@ -77998,8 +78961,8 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-frp";
-       version = "0.1.0.6";
-       sha256 = "4e661fd1f137e438e1fa82d2d2bba7e9df24f5cf2e08027b2085793bc0c08ec0";
+       version = "0.1.0.7";
+       sha256 = "bacf6c5dce5cfdc30ae0cf099ac3117bb622ba36cbb366bebac424d99b68528c";
        libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
@@ -78013,8 +78976,8 @@ self: {
     ({ mkDerivation, arrows, base, grapefruit-frp }:
      mkDerivation {
        pname = "grapefruit-records";
-       version = "0.1.0.6";
-       sha256 = "f5b41878c93312c4149b8c44dbc51bef35de6f9ab9b0d6a5e898f3285c5c99e4";
+       version = "0.1.0.7";
+       sha256 = "a6b112dcae7cadba6948246eb0636459da45719bfa7c86803cf3858033f13248";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        homepage = "https://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
@@ -78028,8 +78991,8 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-ui";
-       version = "0.1.0.6";
-       sha256 = "16c7d95fa20d962c72dcc25d13ccd60d625f6c8fee6ea2b7d8a66dc1725f8fc9";
+       version = "0.1.0.7";
+       sha256 = "b2c111e0efe13a06840cc76b7fc5b2aac7b41fd5af3d672ed0637c8192bd5ce4";
        libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
@@ -78047,8 +79010,8 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-ui-gtk";
-       version = "0.1.0.6";
-       sha256 = "1f3411ae628b64f842a205e22226bc651e698dd368950d0063bf8ef3f1a7ba42";
+       version = "0.1.0.7";
+       sha256 = "483c621ddce5ad92111106d91578c23e4494a7770c610ee36662f721696ca647";
        libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk3 transformers
@@ -78758,6 +79721,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "grenade" = callPackage
+    ({ mkDerivation, ad, base, bytestring, cereal, constraints
+     , containers, criterion, deepseq, exceptions, hedgehog, hmatrix
+     , MonadRandom, mtl, primitive, random, reflection, singletons, text
+     , transformers, typelits-witnesses, vector
+     }:
+     mkDerivation {
+       pname = "grenade";
+       version = "0.1.0";
+       sha256 = "9b7c94a4587943f2de9fec9c1d44a34ad5626b49903a493f6a9a9727d8f2c5f7";
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq exceptions hmatrix
+         MonadRandom mtl primitive singletons text vector
+       ];
+       testHaskellDepends = [
+         ad base constraints hedgehog hmatrix MonadRandom mtl random
+         reflection singletons text transformers typelits-witnesses vector
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
+       description = "Practical Deep Learning in Haskell";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "greplicate" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, lens
      , QuickCheck, template-haskell
@@ -78892,6 +79878,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "groom_0_1_2_1" = callPackage
+    ({ mkDerivation, base, haskell-src-exts }:
+     mkDerivation {
+       pname = "groom";
+       version = "0.1.2.1";
+       sha256 = "a6b4a4d3af1b26f63039f04bd4176493f8dd4f6a9ab281f0e33c0151c20de59d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base haskell-src-exts ];
+       executableHaskellDepends = [ base ];
+       description = "Pretty printing for well-behaved Show instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gross" = callPackage
     ({ mkDerivation, base, lens, mtl, ncurses }:
      mkDerivation {
@@ -79009,6 +80010,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-postgresql_0_8_0_1" = 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 = "ad8ef33fb170dc63f97ef2add891d2e20f279f12495a2f56c7086d49c20b95e8";
+       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
@@ -79050,8 +80071,8 @@ self: {
      }:
      mkDerivation {
        pname = "group-by-date";
-       version = "0.1";
-       sha256 = "6660c6bd7be563375b5bacf6c3d0a0499678896808b1843e62e94c7bebb7f3ee";
+       version = "0.1.0.1";
+       sha256 = "0dd84e94fe79f318d17aceed32a5b1360f52102cff2762af48d5a474a7eeff21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79762,7 +80783,7 @@ self: {
 
   "gtksourceview3" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, glib
-     , gtk2hs-buildtools, gtk3, gtksourceview, mtl, text
+     , gtk2hs-buildtools, gtk3, gtksourceview3, mtl, text
      }:
      mkDerivation {
        pname = "gtksourceview3";
@@ -79772,11 +80793,11 @@ self: {
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
        ];
-       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryPkgconfigDepends = [ gtksourceview3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome2) gtksourceview;};
+     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "guarded-rewriting" = callPackage
     ({ mkDerivation, base, instant-generics }:
@@ -81033,8 +82054,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.2.2";
        sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41";
-       revision = "2";
-       editedCabalFile = "678fde798c4291a66cc8d0497c1df558292dd8526b46132d6c651dc090ef0e5a";
+       revision = "3";
+       editedCabalFile = "ae15fe2cddfec6ebd0e4fe78c3b295335e88deb00fdaf82adb7144ecc7a3ad6d";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -81342,8 +82363,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.17.2";
-       sha256 = "9dd499b022b775b1168c2a8fc940a8cca5eec2416289277a8f59d7321117bb15";
+       version = "2.17.4";
+       sha256 = "a51805a200e93ff8be4bf8a9c048ae29212ed8bd6dab7848d5bf11c4cf1e70fc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -81400,8 +82421,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.17.3.1";
-       sha256 = "ed8c5282260d3300dc06e45e2f9a5d53606315a15a2336db749d3faa64d564ba";
+       version = "2.17.4";
+       sha256 = "5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -81455,8 +82476,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-library";
-       version = "1.4.2";
-       sha256 = "e8edf0714ef3c0e64ad61db6e9f3c1ca0980941b4e9128c94881588cdb4168dc";
+       version = "1.4.3";
+       sha256 = "f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b";
        libraryHaskellDepends = [ base bytestring deepseq transformers ];
        testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -81674,6 +82695,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hail" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, http-client
+     , lens, lens-aeson, netrc, network-uri, optparse-applicative
+     , parsec, process, text, wreq
+     }:
+     mkDerivation {
+       pname = "hail";
+       version = "0.1.0.1";
+       sha256 = "1bbc974c1fc1858312d8937b0e0fc10123979377433547afaf056a90d442673c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory filepath http-client lens lens-aeson
+         netrc network-uri optparse-applicative parsec process text wreq
+       ];
+       homepage = "https://github.com/TaktInc/hail";
+       description = "A service for pull-based continuous deployment based on hydra";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "hailgun" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
@@ -81692,6 +82733,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.3";
+       sha256 = "57bec1b8be9b2bcf8b87fc84ff6f91a9f75edde7081f79c942cf1b2f73977e74";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -82612,17 +83672,17 @@ self: {
      }) {};
 
   "handsy" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, operational
-     , process-extras, retry, shell-escape, split, tasty, tasty-hunit
-     , tasty-th, transformers
+    ({ mkDerivation, base, bytestring, data-default-class, errors
+     , lifted-base, operational, process-extras, retry, shell-escape
+     , split, tasty, tasty-hunit, tasty-th, transformers
      }:
      mkDerivation {
        pname = "handsy";
-       version = "0.0.14";
-       sha256 = "be7efb53d3e4b1e20c9f3624db8bf3186bc98ddd52783602b09a0f84e4fd5ea8";
+       version = "0.0.14.1";
+       sha256 = "6498abb2160e45996d4ba2fd03e284bcef43f9260b05cbaf3d3c6f0015302d46";
        libraryHaskellDepends = [
-         base bytestring data-default-class operational process-extras retry
-         shell-escape split transformers
+         base bytestring data-default-class errors lifted-base operational
+         process-extras retry shell-escape split transformers
        ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-th
@@ -82785,15 +83845,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hapistrano_0_3_1_0" = callPackage
+  "hapistrano_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath, hspec
      , mtl, optparse-applicative, path, path-io, process, stm, temporary
      , time, transformers, yaml
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.1.0";
-       sha256 = "41d680421dad0d83f7c05f7271788955ff332c6acd83cc9aa1a6af776b1c7a6a";
+       version = "0.3.2.0";
+       sha256 = "2ef2cf50d8280870bb443007688c31ab8b38392e40d9d59b78eb5c6160a58928";
+       revision = "1";
+       editedCabalFile = "7849d85faebfe49d82ec513efaa2a0225aaa3170020e1d413532ca5e1e3ae389";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83608,8 +84670,8 @@ self: {
      }:
      mkDerivation {
        pname = "har";
-       version = "0.1.1.0";
-       sha256 = "e387def36cc56e1953fc0746a711d06fe8e641711b666b36be02bbe529d6a174";
+       version = "0.3.0";
+       sha256 = "268c183e842194e66a8483cc57c55ccb516d9396ce9d2c16be0495e9b0fbceea";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text
        ];
@@ -84071,14 +85133,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hashable-orphans" = callPackage
+    ({ mkDerivation, base, hashable, sorted-list, time }:
+     mkDerivation {
+       pname = "hashable-orphans";
+       version = "0";
+       sha256 = "87c0181252c6b8794a10f0539b4804341245f0ca39d7b4f69190eb031c74fb56";
+       libraryHaskellDepends = [ base hashable sorted-list time ];
+       homepage = "https://oss.xkcd.com/";
+       description = "Provides instances missing from Hashable";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hashable-time" = callPackage
     ({ mkDerivation, base, hashable, time }:
      mkDerivation {
        pname = "hashable-time";
-       version = "0.2";
-       sha256 = "97b722ab467fae0d499de91bfaf3d6e346c7c1cac126796f0031aee5dbfe2b0a";
-       revision = "1";
-       editedCabalFile = "b925aba56f1b9a5a1952fae307eaf8ee653293b68651d3807c3852dc4c771d35";
+       version = "0.2.0.1";
+       sha256 = "b5752bb9b91d7cb98b01aa68c27d6a9338e1af39763c0157ef8322d0bc15234d";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -84223,20 +85295,6 @@ self: {
      }) {};
 
   "hashtables" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
-     mkDerivation {
-       pname = "hashtables";
-       version = "1.2.1.0";
-       sha256 = "ef5122c8f3b72d1e817a4f2adb410ad88b30818934a276b7184790697f4fdcac";
-       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_1_1" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
      mkDerivation {
        pname = "hashtables";
@@ -84248,7 +85306,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
@@ -84527,6 +85584,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskeline-repl" = callPackage
+    ({ mkDerivation, base, haskeline, mtl }:
+     mkDerivation {
+       pname = "haskeline-repl";
+       version = "0.1.0.0";
+       sha256 = "1f1b05d615d6e35a98aec2bf705f848ff91f2b668e982f891537c83bbb5930e7";
+       libraryHaskellDepends = [ base haskeline mtl ];
+       homepage = "https://github.com/githubuser/haskeline-repl#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskelisp" = callPackage
     ({ mkDerivation, base, containers, mtl, protolude, text }:
      mkDerivation {
@@ -84834,32 +85902,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , 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";
-       sha256 = "9eec8bad2539b01d833f31cde7dbbe3cc911ab7ba89b68b20d4b2dfc0716d6f6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         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
-       ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "haskell-gi_0_20_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -84884,15 +85926,14 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.20";
-       sha256 = "d62e8b11d67441974e7cb52b0a30e7a1efe6051ddde62c48fe276185c670b80a";
+       version = "0.20.2";
+       sha256 = "e7ee6b5061acb06412fe321b9cb8a2c7dd31eaf8689577ae762a0ab9e7185916";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
@@ -84900,19 +85941,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_20_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
+  "haskell-go-checkers" = callPackage
+    ({ mkDerivation, base, containers, gloss }:
      mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.20.1";
-       sha256 = "e9d8d3d75e0ea91108339daa172bc938512432509caeafdf5bd96551a380f046";
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib;};
+       pname = "haskell-go-checkers";
+       version = "0.1.0.0";
+       sha256 = "0bf488fcce071ecd545025f0804e9b7287fdde4c094ce8bb82afa46738c7ac49";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base containers gloss ];
+       homepage = "https://github.com/prateekkumarweb/haskell-go-checkers";
+       description = "Go and Checkers game in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "haskell-google-trends" = callPackage
     ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
@@ -87761,23 +88802,22 @@ self: {
      }) {};
 
   "hath" = callPackage
-    ({ mkDerivation, base, cmdargs, MissingH, process, split, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, cmdargs, process, split, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "hath";
-       version = "0.3.0";
-       sha256 = "a1d7e9643a4f09395f1af453beffca2b371c4bac6003ba16fc5aa1b41c6177fe";
+       version = "0.4.2";
+       sha256 = "ba25f8e70d7ce80bfa0ef892c8cc29182781adb0858b2f539837b31c75ae1df5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base cmdargs MissingH split tasty tasty-hunit tasty-quickcheck
+         base cmdargs split tasty tasty-hunit tasty-quickcheck
        ];
        testHaskellDepends = [
-         base cmdargs MissingH process split tasty tasty-hunit
-         tasty-quickcheck
+         base cmdargs process split tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://michael.orlitzky.com/code/hath.php";
+       homepage = "http://michael.orlitzky.com/code/hath.xhtml";
        description = "Hath manipulates network blocks in CIDR notation";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -88835,21 +89875,22 @@ self: {
      }) {};
 
   "hdo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, comonad, data-default
-     , free, iproute, lens, mtl, network-uri, optparse-applicative
-     , pretty, process, random, tagged, text, time, transformers, unix
-     , unordered-containers, vector, wreq
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad
+     , data-default, free, http-conduit, iproute, lens, mtl, network-uri
+     , optparse-applicative, parsec, pretty, process, random, tagged
+     , text, time, transformers, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hdo";
-       version = "0.2";
-       sha256 = "4d031d84de97173db977731938918166f9dc54240ee53cac24d0ccf79b96c547";
+       version = "0.4";
+       sha256 = "b15832e660ec0072d50aea07fab0324a107b090d221446961dce20babffd69d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring comonad data-default free iproute lens mtl
-         network-uri pretty process random tagged text time transformers
-         unix unordered-containers vector wreq
+         aeson base bytestring case-insensitive comonad data-default free
+         http-conduit iproute lens mtl network-uri parsec pretty process
+         random tagged text time transformers unix unordered-containers
+         vector
        ];
        executableHaskellDepends = [
          aeson base bytestring comonad data-default free iproute network-uri
@@ -89012,6 +90053,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heatshrink" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty
+     , tasty-golden, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "heatshrink";
+       version = "0.1.0.0";
+       sha256 = "59dd111b2deb207b606d6615a3e5ca7ea3ddead77ea7b525e10e0cf26e4df37f";
+       libraryHaskellDepends = [ base bytestring cereal ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bytestring cereal pcre-heavy tasty tasty-golden tasty-hunit
+         text
+       ];
+       homepage = "https://github.com/fpinsight/heatshrink#readme";
+       description = "Compression and decompression using heatshrink";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hebrew-time" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, time
@@ -89063,6 +90123,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hedgehog" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions, mmorph, mtl
+     , pretty-show, primitive, random, resourcet, template-haskell, text
+     , th-lift, time, transformers, transformers-base
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.1";
+       sha256 = "4d098f3162f92fe26d15cb589f17ce83c627c4591d155475afcb97161938d8a5";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions mmorph mtl pretty-show primitive random
+         resourcet template-haskell text th-lift time transformers
+         transformers-base wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show text transformers
+       ];
+       homepage = "https://hedgehog.qa";
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hedis" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, HUnit, mtl, network, resource-pool, scanner
@@ -89071,8 +90156,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.9.7";
-       sha256 = "594c2d210745a72559de6a6a5f3fa646bf400fd0bb990c8f29d3390d1a2d6d87";
+       version = "0.9.8";
+       sha256 = "822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq mtl network
          resource-pool scanner stm text time unordered-containers vector
@@ -90759,8 +91844,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.3.2";
-       sha256 = "6fa441ccf23a2a867d24a3a229add55ce15d9ef95811e04f96e6882713824f0a";
+       version = "0.1.3.4";
+       sha256 = "f520ce30391997c4d9ac04329893b79abe7850deaea84cdb7a57c7ef6db2e21e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92201,6 +93286,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjsonpointer_1_1_1" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hspec, http-types
+     , QuickCheck, semigroups, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "1.1.1";
+       sha256 = "e3b10de420cf3d6751f69c6aabcdfccb3cae6c3ec7e6378b909aac6e46840d5f";
+       libraryHaskellDepends = [
+         aeson base hashable QuickCheck semigroups text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types QuickCheck text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
@@ -92228,7 +93335,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_6_1" = callPackage
+  "hjsonschema_1_6_2" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -92237,8 +93344,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.6.1";
-       sha256 = "c3816837b0ff64d32db0e575bf25cf3c23866b4bd1825e51172e1f964c81bc9e";
+       version = "1.6.2";
+       sha256 = "b331f637d0dbfaf59bfe582b4c270a3d53cb029cc37b22de70542277a87590cf";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-types pcre-heavy profunctors
@@ -92449,8 +93556,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.7";
-       sha256 = "54ff8674369de54eeb6e62a7a11c9e98c2c4c32730f48d2e714bc304417df6f4";
+       version = "0.2.0.8";
+       sha256 = "e691e44a95abd4b904e3c3fc8734091b919d7a39ebca40b3a0f5cbc00408747b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -92742,6 +93849,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hlint_2_0_5" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
+     , containers, cpphs, directory, extra, filepath, haskell-src-exts
+     , hscolour, process, refact, text, transformers, uniplate
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "2.0.5";
+       sha256 = "fc3517275a2878a25a6463a6e8f8492b7b525adb5f3e6099ff388e9bc280a6b1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring cmdargs containers cpphs directory
+         extra filepath haskell-src-exts hscolour process refact text
+         transformers uniplate unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hlogger" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
@@ -93461,19 +94592,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoauth2_0_5_8" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
-     , text, unordered-containers
+  "hoauth2_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
+     , http-types, microlens, text, unordered-containers, uri-bytestring
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.5.8";
-       sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60";
+       version = "1.2.0";
+       sha256 = "5ef9bc142c79b3f1d9141777c52c3276ce8b1d1352ffb41dff75920a1bc8c8a5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-         unordered-containers
+         aeson base bytestring exceptions http-conduit http-types microlens
+         text unordered-containers uri-bytestring
        ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -93698,6 +94829,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hol" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hol";
+       version = "1.0";
+       sha256 = "02096cc47725c04c58bd511a804780e748f7cdc5512e4f849fee90ff499f1f0a";
+       libraryHaskellDepends = [ base ];
+       description = "Higher order logic";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hold-em" = callPackage
     ({ mkDerivation, base, random, safe }:
      mkDerivation {
@@ -94141,8 +95283,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.9";
-       sha256 = "93f584c5f7fc6a57ee50803ae8df5e6c41051a3177044b273cb7fbcd39d11874";
+       version = "5.0.10";
+       sha256 = "eb6eec27ceb6f4d70757353156a70cc6501e7424db581bf3aba100555ed48a84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94476,23 +95618,28 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring
      , conduit, conduit-extra, containers, deepseq, directory, filepath
      , http-conduit, http-types, optparse-applicative, parallel, process
-     , QuickCheck, resourcet, scientific, text, transformers, vector
+     , QuickCheck, resourcet, text, transformers, vector
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.5.0";
-       sha256 = "94045ae1eed0a54e62e144943c132df95ca1c9804722bb773852077e745be607";
-       isLibrary = false;
+       version = "0.7.0";
+       sha256 = "f72370b572a2d5e9e792b9036fc52718c0a0d11aae34e039b9ade6c6d9260fb4";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base bytestring conduit
+         conduit-extra containers deepseq directory filepath http-conduit
+         http-types optparse-applicative resourcet text transformers vector
+       ];
        executableHaskellDepends = [
          aeson ansi-terminal attoparsec base bytestring conduit
          conduit-extra containers deepseq directory filepath http-conduit
-         http-types optparse-applicative parallel resourcet scientific text
+         http-types optparse-applicative parallel resourcet text
          transformers vector
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring containers deepseq process
-         QuickCheck scientific text vector
+         aeson attoparsec base bytestring containers deepseq directory
+         filepath process QuickCheck text transformers vector
        ];
        homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
@@ -94742,6 +95889,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hourglass-orphans" = callPackage
+    ({ mkDerivation, aeson, base, hourglass, hspec, hspec-expectations
+     , text
+     }:
+     mkDerivation {
+       pname = "hourglass-orphans";
+       version = "0.1.0.0";
+       sha256 = "9f0ba9f3b3cdd391b26daf3dce0bac44ab1f9dd883eaff063af9ebfb0b373d64";
+       libraryHaskellDepends = [ aeson base hourglass ];
+       testHaskellDepends = [
+         aeson base hourglass hspec hspec-expectations text
+       ];
+       homepage = "https://github.com/psibi/hourglass-orphans#readme";
+       description = "Orphan Aeson instances to hourglass";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "houseman" = callPackage
     ({ mkDerivation, base, bytestring, directory, dotenv, hspec
      , interpolate, io-streams, mockery, mtl, optparse-generic, parsers
@@ -95115,6 +96279,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpc-coveralls_1_0_9" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split, transformers
+     }:
+     mkDerivation {
+       pname = "hpc-coveralls";
+       version = "1.0.9";
+       sha256 = "43ab8bda2e874cfc5690bca938ab3c84688fa332d2a70b390a490ea47bb73e74";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
+       description = "Coveralls.io support for Haskell.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpc-strobe" = callPackage
     ({ mkDerivation, base, filepath, hpc }:
      mkDerivation {
@@ -95327,6 +96518,8 @@ self: {
        pname = "hprotoc";
        version = "2.4.0";
        sha256 = "6e4aedf9a421f01a22ca7a2f50b064917b4ef895d76174f59bc44ca1cc6f2f73";
+       revision = "1";
+       editedCabalFile = "89e6eab714a4538e006fc35f4c5e6bba61da9dc49f30b14c7ba6794ead08d5f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97021,7 +98214,7 @@ self: {
      , data-default, deepseq, directory, exceptions, filepath, fsnotify
      , ghc, ghc-boot, ghc-paths, ghc-syb-utils, haddock-api
      , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens
-     , lifted-base, monad-control, monad-loops, mtl, network
+     , lifted-base, mmorph, monad-control, monad-loops, mtl, network
      , optparse-applicative, process, regex-pcre-builtin, scientific
      , simple-log, syb, template-haskell, text, text-region, time
      , transformers, transformers-base, uniplate, unix
@@ -97029,15 +98222,15 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.2.2";
-       sha256 = "39fa69fb48273f81c6a6683544720cf9b61d41374901e8e1730609c1a189d1d2";
+       version = "0.2.3.2";
+       sha256 = "3f630b10a61693e09e2642a871af6eb9ddb2bec8b020a1791286c6869c3d552a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array async attoparsec base bytestring Cabal
          containers cpphs data-default deepseq directory exceptions filepath
          fsnotify ghc ghc-boot ghc-paths ghc-syb-utils haddock-api
-         haskell-src-exts hdocs hformat hlint HTTP lens lifted-base
+         haskell-src-exts hdocs hformat hlint HTTP lens lifted-base mmorph
          monad-control monad-loops mtl network optparse-applicative process
          regex-pcre-builtin scientific simple-log syb template-haskell text
          text-region time transformers transformers-base uniplate unix
@@ -97401,8 +98594,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.8.2";
-       sha256 = "0c66301edd1225d92271d9235b847a0c8bf526bc49865852adef1f355bfd5937";
+       version = "0.8.3";
+       sha256 = "4bf498a47814d95b548b023a4d3177e10f24ab6094fe37f0c610855250b4d0c1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97657,6 +98850,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hslua-aeson_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
+     , ieee754, QuickCheck, quickcheck-instances, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hslua-aeson";
+       version = "0.1.0.4";
+       sha256 = "a887c2defdb30e851d2bafd88e657db8c9982fbfbd0578e63af408643a7e2d9d";
+       libraryHaskellDepends = [
+         aeson base hashable hslua scientific text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
+         quickcheck-instances scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/tarleb/hslua-aeson#readme";
+       description = "Glue between aeson and hslua";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
      , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
@@ -98220,6 +99436,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hspec-hedgehog" = callPackage
+    ({ mkDerivation, base, hedgehog, hspec, hspec-core }:
+     mkDerivation {
+       pname = "hspec-hedgehog";
+       version = "0.0.0.1";
+       sha256 = "3bc5d51e3fbd788fc4fb23b3ba37052b1935211e1f883fe73b72e2a3414ec820";
+       libraryHaskellDepends = [ base hedgehog hspec-core ];
+       testHaskellDepends = [ base hedgehog hspec hspec-core ];
+       homepage = "https://github.com/erikd/hspec-hedgehog/";
+       description = "Hedgehog support for the Hspec testing framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hspec-jenkins" = callPackage
     ({ mkDerivation, base, blaze-markup, hspec }:
      mkDerivation {
@@ -98926,10 +100155,10 @@ self: {
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
        pname = "hsshellscript";
-       version = "3.3.4";
-       sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e";
-       revision = "2";
-       editedCabalFile = "29ba42acbe811deb1bf36828db57e8063c8e733e39e7d848fc29c0aca184602b";
+       version = "3.4.1";
+       sha256 = "6124321260ad53147315005647d0482ff901934ebf6c52ceef1c23cc24f6eb78";
+       revision = "1";
+       editedCabalFile = "77298b29f497412c56a8c2981ee48af6c52b623bf24458295af2deb86f1cdfbd";
        libraryHaskellDepends = [ base directory parsec random unix ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -99841,18 +101070,18 @@ self: {
 
   "http-api-data" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , doctest, filepath, hashable, hspec, HUnit, QuickCheck
+     , doctest, filepath, hashable, hspec, 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.5";
-       sha256 = "3711ac5f97afe8e89d1f8959138de8f2b3afd8ec30f9c6f3eebbfb2caa2fbc45";
+       version = "0.3.6";
+       sha256 = "46315cdf457553ac3ecaaa3bd2109cbe5bbf41bd561a22a9282b3b460b147641";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
-         base bytestring containers hashable text time time-locale-compat
-         unordered-containers uri-bytestring uuid-types
+         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
@@ -99863,6 +101092,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-api-data_0_3_7" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
+     , Cabal, containers, directory, doctest, filepath, hashable, hspec
+     , 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.7";
+       sha256 = "d0d2d8348d9958ab1ae1180d1a33678f346e33df3beaa4db2761bd6695a309aa";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       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
+       ];
+       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 {
@@ -100004,8 +101260,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-openssl";
-       version = "0.2.0.4";
-       sha256 = "28dddd694ed91174c2544dd388d3550df5c79d5cc4be7e4b260a825ebde1afed";
+       version = "0.2.0.5";
+       sha256 = "a1e407688800be2f337d00c89b19c8c0cc708bfbc14b58ea93f31aa5cd7160cf";
        libraryHaskellDepends = [ base HsOpenSSL http-client network ];
        testHaskellDepends = [
          base HsOpenSSL hspec http-client http-types
@@ -100098,8 +101354,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-tls";
-       version = "0.3.4";
-       sha256 = "37693b0ebcfa6ce796abf39647ff4df17361ab1ab1f999ac10faba67d3042bc1";
+       version = "0.3.4.1";
+       sha256 = "b08fed2f18a03eeac5e2db6caf15fd8922032cd9dd50412b67146948ac6b7cd5";
        libraryHaskellDepends = [
          base bytestring case-insensitive connection containers cryptonite
          data-default-class exceptions http-client http-types memory network
@@ -100596,6 +101852,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-reverse-proxy_0_4_4" = 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.4.4";
+       sha256 = "1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978";
+       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-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -101012,6 +102296,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "human-parse" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "human-parse";
+       version = "0.1.0.0";
+       sha256 = "45ed4171156d094b9632eea619db7432bb46c785fa0b8121484d8ab1c17f5602";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A lawless typeclass for parsing text entered by humans";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "human-readable-duration" = callPackage
     ({ mkDerivation, base, criterion, doctest, Glob }:
      mkDerivation {
@@ -101026,6 +102322,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "human-text" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "human-text";
+       version = "0.1.0.1";
+       sha256 = "ea9f98ad4aae1d0a3a3b8a268cf63a9b238a04aa3307d4179ba31d4c2b3c7f44";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A lawless typeclass for converting values to human-friendly text";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "hums" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , ConfigFile, containers, directory, filepath, HaXml, http-types
@@ -101086,13 +102394,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_0_4_0_1" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit, random }:
+  "hunit-dejafu_0_5_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "0.4.0.1";
-       sha256 = "b0e97ecb22eb7b0b1552daad8cd7ddab4e91c255e7fc8183e0ee2536fa7d8caf";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit random ];
+       version = "0.5.0.0";
+       sha256 = "d05e262141024e1f414ea3468176255f6de3b2650df6d11a502758914fd58816";
+       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;
@@ -101495,6 +102803,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-conduit_0_2_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
+     , mmap, vector, word8
+     }:
+     mkDerivation {
+       pname = "hw-conduit";
+       version = "0.2.0.0";
+       sha256 = "727c855c51e3e5a211641fe0e27b7a32275276f3851905b79e66ebd8db0d639d";
+       libraryHaskellDepends = [ array base bytestring conduit word8 ];
+       testHaskellDepends = [ base bytestring conduit hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion mmap vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-conduit#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-diagnostics" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -103393,24 +104720,6 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
-     , random, tf-random
-     }:
-     mkDerivation {
-       pname = "identicon";
-       version = "0.2.0";
-       sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346";
-       libraryHaskellDepends = [ base bytestring JuicyPixels ];
-       testHaskellDepends = [ base bytestring hspec JuicyPixels ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion JuicyPixels random tf-random
-       ];
-       homepage = "https://github.com/mrkkrp/identicon";
-       description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "identicon_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
      , QuickCheck, random, tf-random
      }:
@@ -103428,7 +104737,6 @@ self: {
        homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "identifiers" = callPackage
@@ -104079,6 +105387,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ilist_0_3_0_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, lens, transformers, vector
+     }:
+     mkDerivation {
+       pname = "ilist";
+       version = "0.3.0.0";
+       sha256 = "c81b0dc782e110d7861c81099cc161a4949dcea8594c65ecccb8e07e5dec794c";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec transformers ];
+       benchmarkHaskellDepends = [
+         base criterion lens transformers vector
+       ];
+       homepage = "http://github.com/aelve/ilist";
+       description = "Optimised list functions for doing index-related things";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "illuminate" = callPackage
     ({ mkDerivation, alex, array, base, containers, filemanip, filepath
      , hscolour, html, utf8-string, xhtml
@@ -104195,24 +105521,25 @@ self: {
 
   "imap" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, connection
-     , data-default, derive, either, exceptions, hslogger, HUnit, list-t
-     , monadIO, mtl, QuickCheck, random, rolling-queue, stm, stm-delay
-     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, word8
+     , containers, derive, either, exceptions, hslogger, HUnit, list-t
+     , monadIO, mtl, network, pipes, QuickCheck, random, rolling-queue
+     , stm, stm-delay, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, word8
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.2.0.3";
-       sha256 = "912e050ba15043cbc05782bd5a6069d249402f86a41d17e0761fd6153a5a5f88";
+       version = "0.3.0.0";
+       sha256 = "df9d551e51416efea48bc31f3d31096c9dfb94ad3dc0231f74b5ae5b65d26d28";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection data-default derive either
-         exceptions hslogger list-t monadIO random rolling-queue stm
+         attoparsec base bytestring connection containers derive either
+         exceptions hslogger list-t network pipes random rolling-queue stm
          stm-delay text transformers word8
        ];
        testHaskellDepends = [
-         attoparsec base bytestring connection data-default derive either
-         exceptions hslogger HUnit list-t monadIO mtl QuickCheck random
-         rolling-queue stm stm-delay tasty tasty-hunit tasty-quickcheck text
-         transformers word8
+         attoparsec base bytestring connection containers derive either
+         exceptions hslogger HUnit list-t monadIO mtl network pipes
+         QuickCheck random rolling-queue stm stm-delay tasty tasty-hunit
+         tasty-quickcheck text transformers word8
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
        license = stdenv.lib.licenses.bsd3;
@@ -105121,10 +106448,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.1.1";
-       sha256 = "7dead9ab13e8feca491f5444d6d42383f948b347c7ceb44942a21c21f8b3a522";
-       revision = "1";
-       editedCabalFile = "5f2759927fa334b8991455100079701ef0064764715e42c82f5b469325e2174d";
+       version = "1.1.2";
+       sha256 = "d5beba48d2dd15c0228e2152b5960dae8f4356d7f2ca848d5460dcd55949ae29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105317,6 +106642,8 @@ self: {
        pname = "inline-java";
        version = "0.6.1";
        sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045";
+       revision = "1";
+       editedCabalFile = "c8779aee8e53b6f5e6240c542ff2a299aaec6b6a3eb20482d83fc9e5820de5cf";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -105332,7 +106659,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "inline-java_0_6_3" = callPackage
+  "inline-java_0_6_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , directory, distributed-closure, filepath, ghc-heap-view, hspec
      , inline-c, jni, jvm, language-java, process, singletons, syb
@@ -105340,8 +106667,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.6.3";
-       sha256 = "a9d5742b78b22ea4190269d73e2cc6f74a5f45e150ee9582bdbb31ba966c657c";
+       version = "0.6.5";
+       sha256 = "696aa523d0c8a1090f5a2102bd846165d92bd5ff507368ce17e533bae4880adf";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -105415,10 +106742,10 @@ self: {
      }:
      mkDerivation {
        pname = "insert-ordered-containers";
-       version = "0.2.0.0";
-       sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e";
-       revision = "4";
-       editedCabalFile = "b4b8544fe733ff569ff0f726a632c9c10831f3c7bff804ec5d75f62225363fa5";
+       version = "0.2.1.0";
+       sha256 = "d71d126bf455898492e1d2ba18b2ad04453f8b0e4daff3926a67f0560a712298";
+       revision = "1";
+       editedCabalFile = "642acfbcacd418f194e6fd7bf6d64cbb8efaf625bb0efaaed00504f3ba54c877";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -105641,8 +106968,8 @@ self: {
        pname = "int-cast";
        version = "0.1.2.0";
        sha256 = "6bfa10f7296fb0bf63d9078e2c7520112a22988f04202c3eb25e060bde1ddd3d";
-       revision = "1";
-       editedCabalFile = "4aacf85f637814a493046953cc39cc8dca530f8d2df7ce3b37222c2e991b5621";
+       revision = "2";
+       editedCabalFile = "9a5567529932b1db9870eed2fb6ffb5e5929d3f358b29eaafc68f8e435122792";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -105676,6 +107003,8 @@ self: {
        pname = "integer-logarithms";
        version = "1.0.1";
        sha256 = "0f453f8eb8b19122eac37d04ea95e9da5f9f07eb9ad750c174c3522e7d3a784c";
+       revision = "1";
+       editedCabalFile = "3e6c78b7d38f5767da86e1948a1816e0ede7f123f93a9594e7bb5a8c902369ce";
        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
        testHaskellDepends = [
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
@@ -106092,27 +107421,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_2_0_2" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
-     , bytestring, cassava, containers, contravariant, deepseq, dlist
-     , extra, filepath, hashable, lens, megaparsec, mtl, profunctors
-     , QuickCheck, quickcheck-instances, safe, tagged, text
-     , transformers, unordered-containers, writer-cps-mtl
+  "intro_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe
+     , text, transformers, unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.2.0.2";
-       sha256 = "24a45432efcf9920391465723fde8c20384dcd2d2c4c0e7ca921f4aeb14c88d7";
+       version = "0.3.0.0";
+       sha256 = "a4400c37d0a3a56d7c57eca0474b3760acdb79b0ebb1c5c8aa5cef78910e1e4a";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
-         hashable mtl safe tagged text transformers unordered-containers
+         hashable mtl safe text transformers unordered-containers
          writer-cps-mtl
        ];
        testHaskellDepends = [
-         aeson async attoparsec base bifunctors binary bytestring cassava
-         containers contravariant deepseq dlist extra filepath hashable lens
-         megaparsec mtl profunctors QuickCheck quickcheck-instances safe
-         tagged text transformers unordered-containers writer-cps-mtl
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable lens mtl QuickCheck safe text transformers
+         unordered-containers writer-cps-mtl
        ];
        homepage = "https://github.com/minad/intro#readme";
        description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
@@ -106213,6 +107539,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "invariant_0_4_1" = callPackage
+    ({ mkDerivation, array, base, bifunctors, comonad, containers
+     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
+     , semigroups, StateVar, stm, tagged, template-haskell, transformers
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.4.1";
+       sha256 = "b0a9a54dbc3b850feb8c7dadf1ccfef4ef2fff87165e1a28e52ad297577446a1";
+       libraryHaskellDepends = [
+         array base bifunctors comonad containers contravariant ghc-prim
+         profunctors semigroups StateVar stm tagged template-haskell
+         transformers transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell98 invariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "invertible" = callPackage
     ({ mkDerivation, base, haskell-src-meta, invariant, lens
      , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
@@ -106602,22 +107950,6 @@ self: {
      }) {};
 
   "ip6addr" = callPackage
-    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
-     mkDerivation {
-       pname = "ip6addr";
-       version = "0.5.2";
-       sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";
-       revision = "1";
-       editedCabalFile = "f59669c0e8198ef3c56ecff75b7304d379fc1bbd5485114e3be6774d0d07037c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
-       homepage = "https://github.com/MichelBoucey/ip6addr";
-       description = "Commandline tool to generate IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ip6addr_0_5_3" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
        pname = "ip6addr";
@@ -106629,7 +107961,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipatch" = callPackage
@@ -108248,11 +109579,14 @@ self: {
     ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
      mkDerivation {
        pname = "javascript-extras";
-       version = "0.2.0.2";
-       sha256 = "45075e3abfe658311f209110701c02fa57dddd36b1df9405cb7ae5abdb3d6c83";
+       version = "0.3.1.0";
+       sha256 = "eaf047f32a75b89f555ebba46ee6e66a257498104beb3759f36abde50719c717";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq ghcjs-base-stub parallel text
        ];
+       executableHaskellDepends = [ base ghcjs-base-stub ];
        homepage = "https://github.com/louispan/javascript-extras#readme";
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
@@ -108618,6 +109952,39 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "jose_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, concise, containers, cryptonite, hspec, lens, memory
+     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
+     , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell
+     , text, time, unordered-containers, vector, x509
+     }:
+     mkDerivation {
+       pname = "jose";
+       version = "0.6.0.0";
+       sha256 = "91766bdc72d524e43d77cf008176ec2eb38fbdf09e1a457dae1faf78e1e7fe97";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe template-haskell text time
+         unordered-containers vector x509
+       ];
+       executableHaskellDepends = [ aeson base bytestring lens mtl ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite hspec lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe tasty tasty-hspec
+         tasty-quickcheck template-haskell text time unordered-containers
+         vector x509
+       ];
+       homepage = "https://github.com/frasertweedale/hs-jose";
+       description = "Javascript Object Signing and Encryption and JSON Web Token library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
@@ -108642,6 +110009,30 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "jose-jwt_0_7_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
+     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
+     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jose-jwt";
+       version = "0.7.6";
+       sha256 = "4aa0a8b3f7ede90e3d490361bd5bfbc918f1323d6c07ace4e53d9e1d68dac94d";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring cereal containers cryptonite
+         either memory mtl text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cryptonite doctest either hspec HUnit memory
+         mtl QuickCheck text unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
+       homepage = "http://github.com/tekul/jose-jwt";
+       description = "JSON Object Signing and Encryption Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jpeg" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -108716,8 +110107,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.8.0.1";
-       sha256 = "de68f74a6a546b91ce0a1a74512db7d1a7a583a4455d0de5ef9d300cf179cb3b";
+       version = "0.8.3.0";
+       sha256 = "e1d9838c5481f1dad2a12eecca2d1af0933e02f8f786df6bd1968b865b24f640";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -108734,8 +110125,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.7.1.0";
-       sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a";
+       version = "0.8.0.0";
+       sha256 = "27be860b6b6f8cbf4132889c88e39733b65e3727773ef9046c1dafe43537d650";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -108761,21 +110152,23 @@ self: {
 
   "jsaddle-warp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive
-     , process, QuickCheck, ref-tf, stm, text, time, transformers, wai
-     , wai-websockets, warp, websockets
+     , doctest, filepath, ghc-prim, http-types, jsaddle, lens, network
+     , primitive, process, QuickCheck, ref-tf, stm, text, time
+     , transformers, wai, wai-websockets, warp, webdriver, websockets
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.8.2.0";
-       sha256 = "e9616e7bedb12c1b37ab1e82c065d7b6de6f341ec4cb01748e623a583c834f11";
+       version = "0.8.3.0";
+       sha256 = "1749c9ddc02d140378bcac307bcd6ef198551b274f0087ac982509a0e7d2e693";
        libraryHaskellDepends = [
          aeson base containers http-types jsaddle stm text time transformers
          wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
-         base bytestring deepseq doctest filepath ghc-prim jsaddle lens
-         primitive process QuickCheck ref-tf
+         aeson base bytestring containers deepseq doctest filepath ghc-prim
+         http-types jsaddle lens network primitive process QuickCheck ref-tf
+         stm text time transformers wai wai-websockets warp webdriver
+         websockets
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -108808,8 +110201,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.2.2";
-       sha256 = "ef64f87f898566ff786ef6632800f0c0700b78137e65250e313c67683bb3d457";
+       version = "0.8.3.0";
+       sha256 = "dbd6405844157342707a8a82dd03bf150eb017112b684de8ad9f45537b6e10ba";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -108824,8 +110217,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, jsaddle }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.2.0";
-       sha256 = "aa7968119b68ed7166482f2bfb217e942fbd2ead932fc2f349894fa149d2dfb6";
+       version = "0.8.3.0";
+       sha256 = "007886eaa4cfa3a2c04828398448602eb1bcc697dfba3a890f5f577753ea13f5";
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -108922,8 +110315,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast";
-       version = "0.3";
-       sha256 = "877c8fde915cae37aa24a3d1c98dab75a81aa00a86aa7077b766ab5033c516b9";
+       version = "0.3.1";
+       sha256 = "12fd767139ad4a92f684336228f986732ec65b6abdcbbe55354cd130d10ec4ba";
        libraryHaskellDepends = [
          base scientific text unordered-containers vector
        ];
@@ -108939,8 +110332,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast-json-encoder";
-       version = "0.1";
-       sha256 = "c0e75b796effda6b295d21c2ea99f992425f7085a07513b95c9943377eb87233";
+       version = "0.1.1";
+       sha256 = "b119e690e9f6481005b7d26530a1dd60c3f10395b1e491a1ad9c34f43079514a";
        libraryHaskellDepends = [
          base-prelude contravariant contravariant-extras json-ast
          json-encoder scientific text unordered-containers vector
@@ -109142,8 +110535,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-incremental-decoder";
-       version = "0.1.1";
-       sha256 = "015c9e90dbb90ec08ebb2b5e8fbe5b4858defbeabc2f69b0b6aad1128208513d";
+       version = "0.1.2";
+       sha256 = "821dd84c1e4375f28089c618666c03ac678269c5fe6de90bfd7824305065d4a6";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring ghc-prim hashable
          interspersed matcher monad-par scientific success supplemented text
@@ -109191,8 +110584,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-pointer-aeson";
-       version = "0.1.1";
-       sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1";
+       version = "0.1.2";
+       sha256 = "7d288daf60857a59cd585cdce4200e8d8da3427b51ea2e9eb18939fc6bb3f846";
        libraryHaskellDepends = [
          aeson base-prelude json-pointer unordered-containers vector
        ];
@@ -109291,6 +110684,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c";
+       revision = "1";
+       editedCabalFile = "58dde2e281df3137bee6c229903be2ac74e60e4fcea0dbdf1e0199c5824abd91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109337,6 +110732,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5";
+       revision = "1";
+       editedCabalFile = "5ca219714b618102f3b16454f24700caad9191b8fce7ae10528502e220d41464";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109855,16 +111252,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "jvm_0_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, distributed-closure
-     , hspec, jni, singletons, text, vector
+  "jvm_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, choice, criterion
+     , distributed-closure, hspec, jni, singletons, text, vector
      }:
      mkDerivation {
        pname = "jvm";
-       version = "0.2.0";
-       sha256 = "f766db5293100de25605f883170d4869fcca7b99e1ae2b2d418cdb92eca7ccce";
+       version = "0.2.1";
+       sha256 = "73e7c287e7c31bbc62a61e43de3f2e47a76a161594ed71cd1ba190823bf66faf";
        libraryHaskellDepends = [
-         base bytestring distributed-closure jni singletons text vector
+         base bytestring choice distributed-closure jni singletons text
+         vector
        ];
        testHaskellDepends = [ base bytestring hspec text ];
        benchmarkHaskellDepends = [ base criterion jni ];
@@ -109898,8 +111296,8 @@ self: {
        pname = "jvm-streaming";
        version = "0.1";
        sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256";
-       revision = "1";
-       editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184";
+       revision = "3";
+       editedCabalFile = "57b993f64d93a59503b828da207510878117dd0f845e24906c7c4f0470cad2c1";
        libraryHaskellDepends = [
          base distributed-closure inline-java jni jvm singletons streaming
        ];
@@ -110216,8 +111614,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "9";
-       editedCabalFile = "6b788670bd0b22096693d6fca5770c5522bc3c89c9ca12123034f7957172a38a";
+       revision = "11";
+       editedCabalFile = "9fac0a290b4507cc894ae5f2e59a31a38d83ce1044d97760cd9cadde96d5a650";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -110317,6 +111715,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "karps" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring
+     , binary, bytestring, containers, cryptohash-sha256, deepseq
+     , either, exceptions, formatting, hashable, hspec, lens
+     , monad-logger, mtl, QuickCheck, random, raw-strings-qq, scientific
+     , semigroups, SHA, text, text-format, transformers
+     , unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "karps";
+       version = "0.2.0.0";
+       sha256 = "33ed22f3e4f2110dd0dadbd868746383aeb190a19a993b93d9bf03272e08e01b";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base16-bytestring binary bytestring
+         containers cryptohash-sha256 deepseq either exceptions formatting
+         hashable lens monad-logger mtl QuickCheck random scientific
+         semigroups SHA text text-format transformers unordered-containers
+         vector wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers formatting hspec QuickCheck
+         raw-strings-qq text vector
+       ];
+       homepage = "https://github.com/krapsh/kraps-haskell";
+       description = "Haskell bindings for Spark Dataframes and Datasets";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "karver" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec, text
      , unordered-containers, vector
@@ -110475,6 +111901,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "kawhi_0_2_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
+     , http-conduit, http-types, mtl, safe, scientific, smallcheck
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "kawhi";
+       version = "0.2.2";
+       sha256 = "4e97700861c2113992c656272c6b95a30968352e40199732f6122cb25dadefff";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-client http-conduit
+         http-types mtl safe scientific text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions http-client http-types mtl
+         scientific smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text
+       ];
+       homepage = "https://github.com/thunky-monk/kawhi";
+       description = "stats.NBA.com library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kazura-queue" = callPackage
     ({ mkDerivation, async, atomic-primops, base, containers, criterion
      , deepseq, doctest, exceptions, free, hspec, hspec-expectations
@@ -111018,6 +112468,8 @@ self: {
        pname = "keycode";
        version = "0.2.2";
        sha256 = "56f9407cf182b01e5f0fda80f569ff629f37d894f75ef28b6b8af3024343d310";
+       revision = "1";
+       editedCabalFile = "4aeea9bed0b4be8a05914845eb5524282210a0de8ba2d77ab217f1d71443d05f";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -111919,20 +113371,20 @@ self: {
      }) {};
 
   "lambda-calculator" = callPackage
-    ({ mkDerivation, base, hlint, hspec, HUnit, optparse-applicative
-     , parsec, Shellac, Shellac-readline
+    ({ mkDerivation, base, containers, hlint, hspec, HUnit
+     , optparse-applicative, parsec, Shellac, Shellac-readline
      }:
      mkDerivation {
        pname = "lambda-calculator";
-       version = "1.1.1";
-       sha256 = "9dec187ddefcf7276e845a50f3dc74a61ab4347c196d8f8165b1ddfa2f2dcc84";
+       version = "2.0.0";
+       sha256 = "e5312fb24d720fd9f5547397194af3df5e23506a56a44efcc7cc8f9b09e814af";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [
          base optparse-applicative Shellac Shellac-readline
        ];
-       testHaskellDepends = [ base hlint hspec HUnit ];
+       testHaskellDepends = [ base containers hlint hspec HUnit ];
        homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
@@ -114337,18 +115789,18 @@ self: {
     ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring
      , canteven-http, conduit, conduit-extra, containers
      , data-default-class, data-dword, exceptions, http-types
-     , monad-logger, network, Ranged-sets, scotty, scotty-resource, text
-     , time, transformers, unix, uuid, wai, wai-extra, warp
+     , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm
+     , text, time, transformers, unix, uuid, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.9.0.2";
-       sha256 = "784005d0ca6875192b9837ea169b4b768e0fd34881f913809c2e7310044191eb";
+       version = "0.10.0.0";
+       sha256 = "6f49e1324f5b256977e8859cae06c3993d0596a3a39776a47e75e0a21799d3df";
        libraryHaskellDepends = [
          aeson base binary binary-conduit bytestring canteven-http conduit
          conduit-extra containers data-default-class data-dword exceptions
          http-types monad-logger network Ranged-sets scotty scotty-resource
-         text time transformers unix uuid wai wai-extra warp
+         stm text time transformers unix uuid wai wai-extra warp
        ];
        homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
@@ -114607,8 +116059,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.0.5";
        sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f";
-       revision = "4";
-       editedCabalFile = "6fde3d7feb42ad58f74e89202ec01d0397bd1c8bf00b2042edaa293479d70385";
+       revision = "5";
+       editedCabalFile = "6444dd1026845cecf8a5ab70d783392ac2be7e9fd45419df2c4e9fa5cb17edb7";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -114676,8 +116128,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "lens-labels";
-       version = "0.1.0.0";
-       sha256 = "cde729cf0f9024417d17234a933a54e0a4f3e2073e84f00e8ad60da5fc39e67c";
+       version = "0.1.0.1";
+       sha256 = "341771c6b3733aeaf220a39bd8cd89a5a6365182a6059e198e9895f8e15b537b";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/google/proto-lens";
        description = "Integration of lenses with OverloadedLabels";
@@ -114860,34 +116312,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.8.0";
-       sha256 = "108af2057f56b74a8a42e8f1bbb47e7af64cff612bb90f886e93f6118651154e";
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "lentil_1_0_9_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
@@ -115460,8 +116884,8 @@ self: {
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.19.1";
-       sha256 = "e2d5e56b411098adcd139d6aae5f9226f8951b0a932af8cbfa178ffa626f326c";
+       version = "0.20.1";
+       sha256 = "df2ce59748a56fb7886109c7c7dd0bdb47eeba41fa3d0aeb0b7d8e7239528924";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
@@ -115974,6 +117398,8 @@ self: {
        pname = "lift-generics";
        version = "0.1.1";
        sha256 = "07cf2cc4416fb7b0e45595da8a964459498da976e18cdcc169ac2416143930cb";
+       revision = "1";
+       editedCabalFile = "c87b8172eb3a45b26347d563ebf8d1dbe1d1475f44858243ff81fcac5eab770f";
        libraryHaskellDepends = [
          base generic-deriving ghc-prim template-haskell
        ];
@@ -118419,27 +119845,27 @@ self: {
      }) {};
 
   "log-warper" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , containers, data-default, directory, dlist, errors, exceptions
-     , extra, filepath, formatting, hashable, hspec, HUnit, lens, mmorph
+    ({ mkDerivation, aeson, ansi-terminal, async, base, containers
+     , data-default, directory, dlist, errors, exceptions, extra
+     , filepath, formatting, hashable, hspec, HUnit, lens, mmorph
      , monad-control, monad-loops, mtl, network, QuickCheck, safecopy
      , text, text-format, time, transformers, transformers-base
      , universum, unix, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.0.4";
-       sha256 = "c2024e6a5c01d2862d05ea47273e659c3ee31afeeb2f69e67b52fec0749f0990";
+       version = "1.1.1";
+       sha256 = "6a9c42649e8ebaa3959bed7faccbc22c40d78f0d626ca8c41673284d3ce4ee7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring containers directory dlist
-         errors exceptions extra filepath formatting hashable lens mmorph
+         aeson ansi-terminal base containers directory dlist errors
+         exceptions extra filepath formatting hashable lens mmorph
          monad-control monad-loops mtl network safecopy text text-format
          time transformers transformers-base universum unix
          unordered-containers yaml
        ];
-       executableHaskellDepends = [ base exceptions text ];
+       executableHaskellDepends = [ base exceptions text universum yaml ];
        testHaskellDepends = [
          async base data-default directory filepath hspec HUnit lens
          QuickCheck universum unordered-containers
@@ -119384,8 +120810,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltext";
-       version = "0.1.2.1";
-       sha256 = "7b1af9f04f227226de237e98ace6b658768ab8b24ee86ee1252fbda41a447534";
+       version = "0.1.2.2";
+       sha256 = "0e899fe89f6621e2b266c1c155867b3959f0fa45f677b7e0a964c5f9d315148b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120115,8 +121541,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines-amazonka";
-       version = "0.4.1";
-       sha256 = "cce59823213d25be8bc6b570baaf2f2af5bcbbb5ccc79443afa6542586d5d6bd";
+       version = "0.6.0";
+       sha256 = "fc67b4018230a710f2ab182618fb051504b63f39270838609a0b9d020a90d90a";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-ec2 amazonka-s3 amazonka-sts base
          concurrent-machines containers exceptions focus hashable liblawless
@@ -120286,18 +121712,20 @@ self: {
 
   "madlang" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, composition, containers
-     , criterion, directory, hspec, hspec-megaparsec, lens, megaparsec
-     , mtl, mwc-random, optparse-applicative, text, tibetan-utils
+     , criterion, directory, file-embed-poly, hspec, hspec-megaparsec
+     , megaparsec, microlens, MonadRandom, mtl, optparse-applicative
+     , random-shuffle, template-haskell, text
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.1.0.1";
-       sha256 = "5fe47345bdeb09d6c5947df21afb3c58cda051e136e0b30696a8c02da48b18a9";
+       version = "2.3.0.3";
+       sha256 = "8382c746f0508e56656705245d593e3ab07f158c6e61a447d88d77753ff0cf28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base composition containers directory lens
-         megaparsec mtl mwc-random optparse-applicative text tibetan-utils
+         ansi-wl-pprint base composition containers directory
+         file-embed-poly megaparsec microlens MonadRandom mtl
+         optparse-applicative random-shuffle template-haskell text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -120664,6 +122092,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "makefile_1_0_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "makefile";
+       version = "1.0.0.1";
+       sha256 = "bf30dcdb767e3aa501657dc7bc5338fd015e29573f46b7a24e51e0493a1e5ff1";
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
+         attoparsec base doctest Glob QuickCheck text
+       ];
+       homepage = "http://github.com/nmattia/mask";
+       description = "Simple Makefile parser and generator";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "managed" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -121069,6 +122514,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mandrill_0_5_3_2" = 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 = "270d7df72da9c7d1d17bb3c5b115dac449b05a2931a6be41e55336b24e74f4cb";
+       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
@@ -121545,6 +123015,8 @@ self: {
        pname = "marvin";
        version = "0.2.3";
        sha256 = "79f439662bd8acd8ab528f29fad7ec73517edcf198fc29dc693c35100110553d";
+       revision = "1";
+       editedCabalFile = "a540a43827599459bed0dbfeb02f587bc0c68cdd63c73d97f1e02a81a2d65fab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121583,6 +123055,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "marvin-interpolate_1_1_1" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "marvin-interpolate";
+       version = "1.1.1";
+       sha256 = "40c87c6430f54d7f8f6f57f97367395f0a4e2cc44576c187dddfded280450dfb";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell text
+       ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
+       description = "Compile time string interpolation a la Scala and CoffeeScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
      , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
@@ -121881,8 +123371,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrix-market-attoparsec";
-       version = "0.1.0.5";
-       sha256 = "cb200336ba478707e4c0aefc7d4cb4ba4d38ec7a1d637e105184c26ff401565a";
+       version = "0.1.0.7";
+       sha256 = "52c1665cde8ffc684fb4725e545bf8b454ab2708711af7b91301b5aae72bbb31";
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
        ];
@@ -122387,6 +123877,38 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "mediabus_0_4_0_0" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, monad-control
+     , monad-logger, mtl, network, parallel, primitive, process
+     , QuickCheck, random, resourcet, singletons, spool, stm
+     , streaming-commons, tagged, template-haskell, text, time
+     , transformers, type-spec, vector
+     }:
+     mkDerivation {
+       pname = "mediabus";
+       version = "0.4.0.0";
+       sha256 = "e3bcbaef9f47fe40d0341e06187ddd4d40deec5fea7e46340703d14ae1d05701";
+       libraryHaskellDepends = [
+         array async base bytestring cereal conduit conduit-combinators
+         conduit-extra containers data-default deepseq lens lifted-async
+         monad-control monad-logger mtl network parallel primitive process
+         QuickCheck random resourcet spool stm streaming-commons tagged text
+         time transformers vector
+       ];
+       testHaskellDepends = [
+         array async base binary bytestring conduit conduit-combinators
+         conduit-extra containers data-default deepseq hspec lens
+         monad-control mtl QuickCheck singletons spool stm tagged
+         template-haskell text time transformers type-spec vector
+       ];
+       homepage = "https://github.com/lindenbaum/mediabus";
+       description = "Multimedia streaming on top of Conduit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mediabus-fdk-aac" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, criterion, deepseq, fdk-aac, ghc-prim, inline-c, lens
@@ -122455,6 +123977,45 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "mediabus-rtp_0_4_0_0" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, mediabus
+     , monad-control, monad-logger, mtl, network, parallel, primitive
+     , process, QuickCheck, random, resourcet, singletons, spool, stm
+     , streaming-commons, tagged, template-haskell, text, time
+     , transformers, type-spec, vector
+     }:
+     mkDerivation {
+       pname = "mediabus-rtp";
+       version = "0.4.0.0";
+       sha256 = "338fa64524e1647d2526b74a36c8781b0cd58c108a02826764d88a039687162d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base bytestring cereal conduit conduit-combinators
+         conduit-extra containers data-default deepseq lens lifted-async
+         mediabus monad-control monad-logger mtl network parallel primitive
+         process QuickCheck random resourcet spool stm streaming-commons
+         tagged text time transformers vector
+       ];
+       executableHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra data-default
+         lens lifted-async mediabus monad-control monad-logger mtl parallel
+         QuickCheck random stm streaming-commons tagged time vector
+       ];
+       testHaskellDepends = [
+         array async base binary bytestring conduit conduit-combinators
+         conduit-extra containers data-default deepseq hspec lens mediabus
+         monad-control monad-logger mtl QuickCheck singletons spool stm
+         tagged template-haskell text time transformers type-spec vector
+       ];
+       homepage = "https://github.com/lindenbaum/mediabus-rtp";
+       description = "Receive and Send RTP Packets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "median-stream" = callPackage
     ({ mkDerivation, base, heap, QuickCheck }:
      mkDerivation {
@@ -122931,21 +124492,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.2";
-       sha256 = "e4428c76a6da8f232d96fe12a15c130fcc808d7542c2ce21744266f3cb905012";
-       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_3" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
      , tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -122960,7 +124506,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
@@ -123426,6 +124971,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microlens-aeson_2_2_0_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
+     , scientific, tasty, tasty-hunit, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.2.0.1";
+       sha256 = "d0b1d08f91736a63daac283abf4c2a862f612fc4bd9dfaddc4017b104830f142";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring microlens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring microlens tasty tasty-hunit text
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-contra" = callPackage
     ({ mkDerivation, base, contravariant, microlens }:
      mkDerivation {
@@ -125343,28 +126911,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
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.21";
-       sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra exceptions
-         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
-         stm-chans template-haskell text transformers transformers-base
-         transformers-compat
-       ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_22" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -125384,7 +126930,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
@@ -125668,6 +127213,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-persist" = callPackage
+    ({ mkDerivation, base, hspec, monad-control, monad-logger, mtl
+     , persistent, persistent-sqlite, persistent-template, text
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-persist";
+       version = "0.0.1.0";
+       sha256 = "389c06f837678593b4cd14348bb0a8774bd6da87be0639ebadc3aca6b830f8c9";
+       libraryHaskellDepends = [
+         base monad-control monad-logger mtl persistent text
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base hspec monad-control monad-logger persistent persistent-sqlite
+         persistent-template text
+       ];
+       description = "An mtl-style typeclass and transformer for persistent";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "monad-primitive" = callPackage
     ({ mkDerivation, base, primitive, transformers }:
      mkDerivation {
@@ -126308,6 +127874,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mongoDB_2_2_0" = 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.2.0";
+       sha256 = "bc13e213b5fe23eb291eaf33a303b8899495f538d29aa3a1d6ba9400729c5d69";
+       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 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
@@ -128452,37 +130050,6 @@ self: {
      }) {};
 
   "mustache" = callPackage
-    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
-     , cmdargs, containers, directory, either, filepath, hspec, lens
-     , mtl, parsec, process, scientific, tar, template-haskell
-     , temporary, text, th-lift, unordered-containers, vector, wreq
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "mustache";
-       version = "2.1.2";
-       sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory either filepath mtl
-         parsec scientific template-haskell text th-lift
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs filepath text yaml
-       ];
-       testHaskellDepends = [
-         aeson base base-unicode-symbols bytestring directory filepath hspec
-         lens process tar temporary text unordered-containers wreq yaml zlib
-       ];
-       homepage = "https://github.com/JustusAdam/mustache";
-       description = "A mustache template parser library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "mustache_2_1_3" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
      , cmdargs, containers, directory, either, filepath, hspec, lens
      , mtl, parsec, process, scientific, tar, template-haskell
@@ -128616,6 +130183,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mvar-lock" = callPackage
+    ({ mkDerivation, base, safe-exceptions }:
+     mkDerivation {
+       pname = "mvar-lock";
+       version = "0.1.0.0";
+       sha256 = "1719f3d321129663a8c4a93a136e3c14a09de0db5328a03172e9637ba48468c8";
+       libraryHaskellDepends = [ base safe-exceptions ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A trivial lock based on MVar";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "mvc" = callPackage
     ({ mkDerivation, async, base, contravariant, foldl, managed, mmorph
      , pipes, pipes-concurrency, transformers
@@ -131649,15 +133228,17 @@ self: {
      }) {};
 
   "niagra" = callPackage
-    ({ mkDerivation, base, ghc-prim, mtl, primitive, text, transformers
+    ({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck
+     , text, transformers
      }:
      mkDerivation {
        pname = "niagra";
-       version = "0.2.3";
-       sha256 = "19d15b13766496bfceea6b871329984441d42884d662fbf25902b30538745431";
+       version = "0.2.5";
+       sha256 = "23bff9497a62fef7970065594f25840e84a8bcd34b5159812e650c3031e6b67e";
        libraryHaskellDepends = [
          base ghc-prim mtl primitive text transformers
        ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
@@ -131717,8 +133298,8 @@ self: {
      }:
      mkDerivation {
        pname = "nicovideo-translator";
-       version = "0.2.0.0";
-       sha256 = "039a1dd1e25450b96ee513091b382f2f9e00826fa2ae69811da9c9a2fe0d4bf0";
+       version = "0.3.0.0";
+       sha256 = "1fe01ffaeff2e58b24ad057df1be81a7b4561d667332a0fb454303d1d2a81ae2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132973,8 +134554,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask";
-       version = "0.0.2";
-       sha256 = "567762fe357d2114176425b115fa89b304ab9a41ca564b4b599bbc00384246b2";
+       version = "0.0.3";
+       sha256 = "edca61ca143227ce701d53d6b848c7340b66af4338cbbcfa33c201402e421871";
        libraryHaskellDepends = [
          adjunctions base distributive protolude QuickCheck singletons
          vector
@@ -133119,24 +134700,20 @@ self: {
 
   "nvim-hs-contrib" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default
-     , directory, exceptions, hspec, hspec-discover, messagepack, mtl
-     , nvim-hs, parsec, process, QuickCheck, resourcet, setenv, stm
-     , text, time, transformers, transformers-base, utf8-string
+     , directory, exceptions, filepath, hspec, hspec-discover
+     , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string
+     , yaml
      }:
      mkDerivation {
        pname = "nvim-hs-contrib";
-       version = "0.1.0";
-       sha256 = "f0de17887d394301ec1975ab768ad6a6131bd7e6580b11c8b9364980e3be6472";
+       version = "0.2.0";
+       sha256 = "6ee5e9777fbe4dcfa7085923ee1386c2f9c317177c9d61f332cf424e544d2915";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring data-default directory exceptions
-         messagepack mtl nvim-hs parsec process resourcet setenv stm text
-         time transformers transformers-base utf8-string
+         filepath messagepack mtl nvim-hs text time utf8-string yaml
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base bytestring data-default exceptions hspec
-         hspec-discover messagepack mtl nvim-hs parsec process QuickCheck
-         resourcet setenv stm text time transformers transformers-base
-         utf8-string
+         base hspec hspec-discover nvim-hs QuickCheck
        ];
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
@@ -133146,15 +134723,15 @@ self: {
 
   "nvim-hs-ghcid" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml
+     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml
      }:
      mkDerivation {
        pname = "nvim-hs-ghcid";
-       version = "0.1.0";
-       sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde";
+       version = "0.2.0";
+       sha256 = "6ed326f9de682ec3a7b8493c1f5ef710f7e14ec65c815a67911e306def880e81";
        libraryHaskellDepends = [
          base bytestring containers directory filepath ghcid nvim-hs
-         nvim-hs-contrib resourcet yaml
+         nvim-hs-contrib resourcet transformers yaml
        ];
        homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
@@ -133168,8 +134745,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvvm";
-       version = "0.7.5.1";
-       sha256 = "73914a6a1816432b0cc687a6200b52a030a705b51276f8266a984c3617f69109";
+       version = "0.7.5.2";
+       sha256 = "f1248c969830152e9bcad6d0e2234f5693c4c8625a48328f8d0cd6eb81270f1f";
        setupHaskellDepends = [
          base Cabal directory filepath template-haskell
        ];
@@ -133458,6 +135035,30 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "octane_0_18_3" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
+     , data-default-class, file-embed, http-client, http-client-tls
+     , overloaded-records, rattletrap, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.18.3";
+       sha256 = "2555a69101e39813d2f9b4f2bcbbb0a70f40592be1ef6c4414f3a7bc4297f415";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bimap binary bytestring containers data-default-class
+         file-embed overloaded-records rattletrap text
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring http-client http-client-tls
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -134035,8 +135636,8 @@ self: {
        pname = "opaleye";
        version = "0.5.3.0";
        sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73";
-       revision = "1";
-       editedCabalFile = "0188a5df6e42350cafb8771ed56b190451291bc04767a451c0aba76582bbed28";
+       revision = "2";
+       editedCabalFile = "382c87c048eba0af1b6eee069c2083a183b20806b696a16cab98db776b9afcdb";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -134249,6 +135850,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "opench-meteo" = callPackage
+    ({ mkDerivation, aeson, base, data-default, text, time }:
+     mkDerivation {
+       pname = "opench-meteo";
+       version = "0.1.0.0";
+       sha256 = "16c8d5f0a4d14d57672d41b0b6e5d4764f276db2ba86e88aa3ccc6ddc05f9b0e";
+       libraryHaskellDepends = [ aeson base data-default text time ];
+       homepage = "https://github.com/hansroland/opench";
+       description = "A Haskell implementation of the Swiss Meteo Net data API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "opencog-atomspace" = callPackage
     ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
@@ -135182,8 +136795,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-generic";
-       version = "1.1.4";
-       sha256 = "dc69bc73d6e3de52bcc5c4ccd8ce741eebb8d10747bc7f819b38b0cdaf1e520c";
+       version = "1.1.5";
+       sha256 = "ba7a5d1f8baef521e6cb0f21d723f0841f8b0f24f4c0a9f923062368e061e6f5";
        libraryHaskellDepends = [
          base bytestring optparse-applicative semigroups system-filepath
          text time transformers void
@@ -136309,6 +137922,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pandoc-filter-graphviz" = callPackage
+    ({ mkDerivation, base, base16-bytestring, byteable, bytestring
+     , containers, cryptonite, directory, filepath, pandoc, pandoc-types
+     , process, text
+     }:
+     mkDerivation {
+       pname = "pandoc-filter-graphviz";
+       version = "0.1.0.0";
+       sha256 = "24766b1a4c54ec3d5ffbd29ea01d7a9b9766c0153fec3648847015bcd6679a44";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base base16-bytestring byteable bytestring containers cryptonite
+         directory filepath pandoc pandoc-types process text
+       ];
+       homepage = "https://github.com/jpierre03/pandoc-filter-graphviz";
+       description = "A Pandoc filter to use graphviz";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pandoc-include" = callPackage
     ({ mkDerivation, base, directory, pandoc, pandoc-types, text }:
      mkDerivation {
@@ -136335,8 +137968,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-include-code";
-       version = "0.2.0";
-       sha256 = "0241672e57d3bc0a5fa6ae953cf98d6d702b36076d58eaa64490b5089f377b72";
+       version = "0.3.0";
+       sha256 = "518eeb61e25b1872580a30bf927b0dbd874b713bd6ebc412ab2fe87c02ea6c74";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136372,8 +138005,8 @@ self: {
     ({ mkDerivation, base, containers, lens, pandoc-types }:
      mkDerivation {
        pname = "pandoc-lens";
-       version = "0.6";
-       sha256 = "70ffd8f5a5086cd6e2f3f92fd3f304ac6cf5ebbef70361086984ce8a11faf3fc";
+       version = "0.6.2";
+       sha256 = "e5e126cd882d41caf1392a4a21ccc4e5f2e46e45e73ff32e7c4d324b951662a3";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
@@ -137070,8 +138703,8 @@ self: {
     ({ mkDerivation, array, base, containers, deepseq }:
      mkDerivation {
        pname = "parallel";
-       version = "3.2.1.0";
-       sha256 = "4de3cdbb71dfd13cbb70a1dc1d1d5cf34fbe9828e05eb02b3dc658fdc2148526";
+       version = "3.2.1.1";
+       sha256 = "323bb9bc9e36fb9bfb08e68a772411302b1599bfffbc6de20fa3437ce1473c17";
        libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -138917,6 +140550,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "peregrin" = callPackage
+    ({ mkDerivation, base, hspec, pg-harness-client, postgresql-simple
+     , resource-pool, text, transformers
+     }:
+     mkDerivation {
+       pname = "peregrin";
+       version = "0.1.0";
+       sha256 = "9cd335665b1d4e453d88c3dbe3ffb238ebca89890ac7998bc80f6968be2e1ac1";
+       libraryHaskellDepends = [ base postgresql-simple text ];
+       testHaskellDepends = [
+         base hspec pg-harness-client postgresql-simple resource-pool text
+         transformers
+       ];
+       description = "Database migration support for use in other libraries";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "perfecthash" = callPackage
     ({ mkDerivation, array, base, bytestring, cmph, containers
      , criterion, deepseq, hspec, QuickCheck, random, time
@@ -139055,6 +140705,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_5_0_1" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , quickcheck-simple, template-haskell, th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.5.0.1";
+       sha256 = "e30d56e8ca9ef1e1b8ac6c15907567c5b635679951a67731c55843dde3100b64";
+       libraryHaskellDepends = [
+         array base containers dlist names-th 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
@@ -139106,6 +140775,41 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent_2_7_0" = 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
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.7.0";
+       sha256 = "cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea";
+       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
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger hspec http-api-data lifted-base
+         monad-control monad-logger mtl old-locale path-pieces resource-pool
+         resourcet scientific tagged template-haskell text time transformers
+         unordered-containers vector
+       ];
+       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-audit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , getopt-generics, hashable, hspec, mongoDB, persistent
@@ -139252,8 +140956,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.5.0.1";
-       sha256 = "0fa7b288a063d0e3dd187a41992d14ac9af9eb57a494923074d3a4db3b04b91e";
+       version = "2.6.0";
+       sha256 = "e34ee25417a232e97c25989d04d8d62d907def78c6fd1710ba61f15c3d9924f9";
        libraryHaskellDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          http-api-data monad-control mongoDB network path-pieces persistent
@@ -139289,18 +140993,18 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-control, monad-logger, mysql-haskell, network
      , persistent, persistent-template, resource-pool, resourcet, text
-     , time, transformers
+     , time, tls, transformers
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.2.1.0";
-       sha256 = "bb7281fda0ff259d7d8738d541619fad2aadbc74245db72853d8fc6d669278cb";
+       version = "0.3.0.0";
+       sha256 = "e4b1b4761c946f9ed6d89a28e7d06c74dd8c34a4d1b5993154a940f420073ea6";
        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 transformers
+         resourcet text time tls transformers
        ];
        executableHaskellDepends = [
          base monad-logger persistent persistent-template transformers
@@ -140314,8 +142018,8 @@ self: {
     ({ mkDerivation, base, matrix, transformers, xml }:
      mkDerivation {
        pname = "pictikz";
-       version = "1.0.0.1";
-       sha256 = "69e1e3e93db18c36ee716ebb57e3dbb35c3894724ad36793abf80e7d5cd8f3b8";
+       version = "1.1.0.0";
+       sha256 = "2ceb510ae550c5edbadf4222a71b227324b94c2c613904691cb20e60c104507d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base matrix transformers xml ];
@@ -140932,8 +142636,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.8";
-       sha256 = "4d0f7932212988b5e4c661238d66db316cd11bae15506a87d925ae058194d37b";
+       version = "1.0.9";
+       sha256 = "102192c53657e72a43b37a1ef7b1452c3cfb0f63d21cc1aacfd70e140d722d47";
        libraryHaskellDepends = [ base foldl pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -141533,8 +143237,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-zeromq4";
-       version = "0.2.0.0";
-       sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe";
+       version = "0.3.0.0";
+       sha256 = "577ef357525645b258e068e84e58d75c315ca0aba85c39ea247f6b88e710139d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141943,6 +143647,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "plocketed" = callPackage
+    ({ mkDerivation, base, optparse-applicative, socketed }:
+     mkDerivation {
+       pname = "plocketed";
+       version = "0.1.0.1";
+       sha256 = "0f63c8565349b15df882208debfede7ccdb6fc5e143d65ccbcc3e5bd9cd1ab6e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base optparse-applicative socketed ];
+       description = "plot data from stdin through socketed";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "plot" = callPackage
     ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango
      , transformers
@@ -142037,16 +143754,13 @@ self: {
      }:
      mkDerivation {
        pname = "plotlyhs";
-       version = "0.1.0";
-       sha256 = "445bc874f9edef177830e39968ac487bfd156702750c74f287ed6387a07b5f5b";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2";
+       sha256 = "85fb0446b3e92267357dc52b770da90b222b85337f3db593e0350021d1e53259";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring lucid microlens
          microlens-th text
        ];
-       executableHaskellDepends = [ aeson base lucid microlens text ];
-       homepage = "https://github.com/glutamate/plotlyhs";
+       homepage = "https://github.com/filopodia/open/plotlyhs";
        description = "Haskell bindings to Plotly.js";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -142623,9 +144337,11 @@ self: {
        pname = "polydata";
        version = "0.1.0.0";
        sha256 = "1e1785b31d8fac68db19771440e564cec451a7cf0d4a8ac9f3bb634b4a2db7bb";
+       revision = "1";
+       editedCabalFile = "2a13f5f9f2a608617e0fc21d8af90cfb7fd367eb0e94c111bdd6a2b3d3e89980";
        libraryHaskellDepends = [ base constraint-manip indextype ];
        testHaskellDepends = [ base constraint-manip hspec indextype ];
-       description = "Wrap together data and it's constraints";
+       description = "Wrap together data and its constraints";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -143219,10 +144935,13 @@ self: {
     ({ mkDerivation, base, bytestring, process, unix, util }:
      mkDerivation {
        pname = "posix-pty";
-       version = "0.2.1";
-       sha256 = "16e941681511ef1d59300314d4f6f85192b00787fc2605fbd18a300192c4edc1";
+       version = "0.2.1.1";
+       sha256 = "a2c50cec87434afa5758fe79efa95ac730843be689dac8a1d78a9e7d66fdbbb9";
+       revision = "1";
+       editedCabalFile = "f1e54f10c49d9f27dba33539391659d2daa4874badc1554ffc6c25b329ef1db6";
        libraryHaskellDepends = [ base bytestring process unix ];
        librarySystemDepends = [ util ];
+       testHaskellDepends = [ base bytestring process ];
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
@@ -143647,8 +145366,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-typed";
-       version = "0.1.0.1";
-       sha256 = "4c30a001b15267cd8a8480bf03d8312b3038c4cd70936029ca9a7147ba06fe65";
+       version = "0.1.0.2";
+       sha256 = "5f21b97131f54fe2ac98cf78d901276e2e1ee456ebf1c8a73f824f013f35c089";
        libraryHaskellDepends = [
          base postgresql-libpq postgresql-simple template-haskell
          transformers typedquery utf8-string
@@ -143732,6 +145451,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-typed-lifted" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions
+     , lens, monad-control, postgresql-typed, transformers-base
+     }:
+     mkDerivation {
+       pname = "postgresql-typed-lifted";
+       version = "0.5.1.1";
+       sha256 = "f8a66b60c9b2106690287c16f87b1d8e22621a2950f9aaf4609bd9deb6a37a6b";
+       libraryHaskellDepends = [
+         base base-unicode-symbols bytestring exceptions lens monad-control
+         postgresql-typed transformers-base
+       ];
+       homepage = "https://gitlab.com/theunixman/postgresql-typed-lifted";
+       description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgrest" = callPackage
     ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
      , auto-update, base, base64-bytestring, bytestring
@@ -144149,20 +145885,22 @@ self: {
 
   "preamble" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
-     , fast-logger, lens, monad-control, monad-logger, mtl, resourcet
-     , safe, shakers, template-haskell, text, text-manipulate, time
-     , transformers-base, unordered-containers, uuid
+     , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl
+     , network, resourcet, safe, shakers, template-haskell, text
+     , text-manipulate, time, transformers-base, unordered-containers
+     , uuid
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.23";
-       sha256 = "9da28ef916d8c8dec8bb28071e2536a4a5076438028d2e7b1c4e4b020383b044";
+       version = "0.0.32";
+       sha256 = "428d5bd2ad1e3b1564675bf18feea19d82a5b28a2c0623de5f00e49c3eeec04d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base basic-prelude exceptions fast-logger lens monad-control
-         monad-logger mtl resourcet safe template-haskell text
-         text-manipulate time transformers-base unordered-containers uuid
+         monad-logger MonadRandom mtl network resourcet safe
+         template-haskell text text-manipulate time transformers-base
+         unordered-containers uuid
        ];
        executableHaskellDepends = [ base shakers ];
        homepage = "https://github.com/swift-nav/preamble";
@@ -144228,8 +145966,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.5.1.1";
-       sha256 = "7342dab0c18f25b023da8613798dcb3e75fceb8b082a1feb57e5597de9827ecf";
+       version = "0.5.1.2";
+       sha256 = "437b4f2578444adad0eeb519d23c339d4f5cb3532b12745bc1e94144135a0a34";
        libraryHaskellDepends = [
          base composition-extra containers hashable hashtables mtl
          poly-arity pred-set QuickCheck semigroups tries
@@ -145075,15 +146813,15 @@ self: {
      }) {};
 
   "privileged-concurrency" = callPackage
-    ({ mkDerivation, base, lifted-base, monad-control, stm
-     , transformers-base
+    ({ mkDerivation, base, contravariant, lifted-base, monad-control
+     , stm, transformers-base
      }:
      mkDerivation {
        pname = "privileged-concurrency";
-       version = "0.5";
-       sha256 = "5be035781722144dec6ab14f443ecccb6addcf4be2f871f4bb372e5a9790ebfe";
+       version = "0.6";
+       sha256 = "67f768353b4bacf2c060f6a4107b4c54216cf238d0250716865436d9b723425b";
        libraryHaskellDepends = [
-         base lifted-base monad-control stm transformers-base
+         base contravariant lifted-base monad-control stm transformers-base
        ];
        description = "Provides privilege separated versions of the concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -145568,6 +147306,8 @@ self: {
        pname = "profunctors";
        version = "5.2";
        sha256 = "87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4";
+       revision = "1";
+       editedCabalFile = "530cbe1328db594389d931c3d5dac1e6e923447d2046901d3065e1098cda1fe0";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad contravariant distributive
          tagged transformers
@@ -145589,6 +147329,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "progress-meter" = callPackage
+    ({ mkDerivation, async, base, containers, stm }:
+     mkDerivation {
+       pname = "progress-meter";
+       version = "0.1.0";
+       sha256 = "ae1322e234fa3c785e5fb47f7445ec9135fe1e006195f239a59b98d8bcd07975";
+       libraryHaskellDepends = [ async base containers stm ];
+       homepage = "https://github.com/esoeylemez/progress-meter";
+       description = "Live diagnostics for concurrent activity";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "progress-reporting" = callPackage
     ({ mkDerivation, base, deepseq, mtl, time }:
      mkDerivation {
@@ -145905,8 +147657,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.2";
-       sha256 = "cb659ab34b22126c0c07075e556a6f56170af3896f2e23dcd16035d70e578624";
+       version = "4.0.3";
+       sha256 = "b3d15b9bd473489dad05bb77b8984f732b48ddf9562c8caea4fab573ce96e096";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146025,8 +147777,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.2.0.0";
-       sha256 = "db1ce1c786941c98ac67885d583731eed5bf6998022985e699915f5aa757b07f";
+       version = "0.2.0.1";
+       sha256 = "73c0502e28c55d073e1ea9965f97f7212d27954db46a64f2b2117d4ebb9b8090";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class
          lens-family parsec pretty text transformers void
@@ -146083,8 +147835,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-descriptors";
-       version = "0.2.0.0";
-       sha256 = "1fca9713d7678b2328e5f330eebfc690b487ccca719fe2cdf84f24af71d98bb5";
+       version = "0.2.0.1";
+       sha256 = "b0ca73f013ceb40ddf89c1932e1a70b73d36f363f7219528e6184177ecb84dee";
        libraryHaskellDepends = [
          base bytestring containers data-default-class lens-family
          lens-labels proto-lens text
@@ -146116,8 +147868,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.2.0.0";
-       sha256 = "60df593b670ca8f984e67ac784a97425e5056b0cdf16f231f53cc228ada85376";
+       version = "0.2.0.1";
+       sha256 = "de085ff0bd6d3326b2e01b43eb0b00ac6286ef512984778bd22e476bf83b4d7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146188,8 +147940,8 @@ self: {
      }:
      mkDerivation {
        pname = "protobuf-simple";
-       version = "0.1.0.2";
-       sha256 = "ef2b79ffd3f11796027cbc5bbcfcc68a6d1948f66acd079bb60c6d6ed00622f3";
+       version = "0.1.0.4";
+       sha256 = "a20618342a6de7046935a347f5a7bfa17f7922140f5d57d7df0e7b0eb670c484";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146207,33 +147959,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "protobuf-simple_0_1_0_3" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
-     , QuickCheck, quickcheck-instances, split, text
-     }:
-     mkDerivation {
-       pname = "protobuf-simple";
-       version = "0.1.0.3";
-       sha256 = "55e8221677f8808539b3fc3644d4b3118afe6fb7bd9ff0be4e58783e38773f6d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 mtl text
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath mtl parsec split text
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 filepath
-         hspec parsec QuickCheck quickcheck-instances split text
-       ];
-       homepage = "https://github.com/sru-systems/protobuf-simple";
-       description = "Simple Protocol Buffers library (proto2)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "protocol-buffers" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
@@ -146397,6 +148122,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proxied_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "proxied";
+       version = "0.3";
+       sha256 = "534d4d425f2834b39689e2af301bd5ff81d1619e65664a5efd797a0c88dbeb26";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/RyanGlScott/proxied";
+       description = "Make functions consume Proxy instead of undefined";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proxy-kindness" = callPackage
     ({ mkDerivation, base, tagged }:
      mkDerivation {
@@ -146590,6 +148328,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "publicsuffix_0_20170416" = callPackage
+    ({ mkDerivation, base, criterion, filepath, hspec, random
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20170416";
+       sha256 = "f05995b722e195dd33d996074cc05f51dd07165e8519c4e27215a59598411712";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -147029,8 +148784,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.2";
-       sha256 = "bf4c3c0cb3103cf4cfc2029bfbb0509ad61fa9ef07896818b522527891878144";
+       version = "0.11.4";
+       sha256 = "98df8d401839645176a337b4dacf9014b6fcc986b64d74ebf578a5c395ab8d04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147219,6 +148974,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pushbullet" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, lens, text
+     , unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "pushbullet";
+       version = "0.0.0";
+       sha256 = "5771ae314185d66f63652b1bdea2d5653ecc1ff01eccf1ec3de5caa4492a7e5b";
+       libraryHaskellDepends = [
+         aeson base bytestring lens text unordered-containers wreq
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Simple push support for pushbullet";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pushbullet-types" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, microlens
      , microlens-th, scientific, text, time, unordered-containers
@@ -147276,15 +149047,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pusher-http-haskell_1_2_0_0" = callPackage
+  "pusher-http-haskell_1_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
      , text, time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.2.0.0";
-       sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371";
+       version = "1.2.0.1";
+       sha256 = "e8a17fe91d9d81f32eace3a40ee3090a7dc926543ba1199b48d8e9bb1379a232";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptohash hashable
          http-client http-types text time transformers unordered-containers
@@ -147723,23 +149494,23 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
-     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode
-     , MissingH, optparse-applicative, process, vector
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
+     , microlens, MissingH, optparse-applicative, process, vector
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.0.3";
-       sha256 = "ff97d131702a42710d3c9a4a211055499495bd3319697908b4fa83c4a01381f4";
+       version = "1.0.1.0";
+       sha256 = "764be703283dfc074158c6a80ed52a23af0b933fddd191bc0c175af7eece3f48";
        revision = "1";
-       editedCabalFile = "9011708b42c261b2ec8a2f7a39315fbdff193d61c8d70c73f32b60e3428fe067";
+       editedCabalFile = "6688bfa62ae7757658ba419eb13ce7ac52cb5a9956428aea61040068a87568d4";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
-         jose-jwt JuicyPixels lens MissingH optparse-applicative process
-         vector
+         jose-jwt JuicyPixels microlens MissingH optparse-applicative
+         process vector
        ];
        libraryPkgconfigDepends = [ libqrencode ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/vmchale/QRImager#readme";
+       homepage = "https://github.com/vmchale/QR-writer";
        description = "Library to generate QR codes from bytestrings and objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148209,8 +149980,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
        pname = "quickcheck-combinators";
-       version = "0.0.1";
-       sha256 = "bc334ff44f93e580e13cbe07c4ccf5924bf22df943934987f769ebec6800ec8d";
+       version = "0.0.2";
+       sha256 = "7fcd7b320a3d6d66b1db3cc8e63c21bc2b2b84329ffc490113ea7df61a711b65";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
@@ -149064,6 +150835,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rails-session" = callPackage
+    ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
+     , cryptonite, http-types, pbkdf, ruby-marshal, string-conv, tasty
+     , tasty-hspec, vector
+     }:
+     mkDerivation {
+       pname = "rails-session";
+       version = "0.1.0.0";
+       sha256 = "e897b191410818f2cb2b85985e547b87b250727cf23dc2a7d9effd5c28fdc2da";
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring cryptonite http-types
+         pbkdf ruby-marshal string-conv vector
+       ];
+       testHaskellDepends = [
+         base bytestring ruby-marshal tasty tasty-hspec vector
+       ];
+       homepage = "http://github.com/iconnect/rails-session#readme";
+       description = "Decrypt Ruby on Rails sessions in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rainbow" = callPackage
     ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck
      , text
@@ -149183,12 +150975,15 @@ self: {
      }) {};
 
   "ralist" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, deepseq, hspec }:
      mkDerivation {
        pname = "ralist";
-       version = "0.1.0.0";
-       sha256 = "b1fc92a18b3890ae9899d6d29b3de298e5e49d0f9f6174e6f34c7e2e5a784c6c";
+       version = "0.2.0.0";
+       sha256 = "ab379b5d61661796a23448b7aaa7e5d6dc64aae4cb11835caa80d80d8f2df5b7";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       homepage = "http://github.com/cartazio/ralist";
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149619,6 +151414,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rank-product" = callPackage
+    ({ mkDerivation, base, random-fu }:
+     mkDerivation {
+       pname = "rank-product";
+       version = "0.2.0.1";
+       sha256 = "79ffdf09bd6eb37109ff80e965c94def0031bd8c0d8b1cdb9918d903e91fc0b6";
+       libraryHaskellDepends = [ base random-fu ];
+       homepage = "http://github.com/GregorySchwartz/rank-product#readme";
+       description = "Find the rank product of a data set";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "rank1dynamic" = callPackage
     ({ mkDerivation, base, binary, HUnit, test-framework
      , test-framework-hunit
@@ -149651,15 +151458,15 @@ self: {
      }) {};
 
   "rapid-term" = callPackage
-    ({ mkDerivation, ansi-terminal, base, clock, kan-extensions
-     , process, transformers, unix
+    ({ mkDerivation, base, clock, kan-extensions, process, transformers
+     , unix
      }:
      mkDerivation {
        pname = "rapid-term";
-       version = "0.1.1";
-       sha256 = "49cb96ef27649b3caf9fbac4a293f03ac884dd1ed0e96a3f0b6749ad1e8ed1a0";
+       version = "0.1.2";
+       sha256 = "28f0d811c0d140bd78241a9ba1e02abde2d49259bad60b9fbb336e2c3362c560";
        libraryHaskellDepends = [
-         ansi-terminal base clock kan-extensions process transformers unix
+         base clock kan-extensions process transformers unix
        ];
        homepage = "https://github.com/esoeylemez/rapid-term";
        description = "External terminal support for rapid";
@@ -149961,6 +151768,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.3";
+       sha256 = "c3210d5a1b43fa792d6e26a98497fd11f3fd16e1e6d4f58d0b4c61b3bc0adee2";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       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
@@ -150027,7 +151854,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_2_0" = callPackage
+  "rattletrap_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
      , binary-bits, bytestring, containers, data-binary-ieee754
      , filepath, tasty, tasty-hspec, template-haskell, temporary, text
@@ -150035,8 +151862,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.2.0";
-       sha256 = "fe1ba54cce7d1d6c2b4bfe54f433bc61a31b15b866abae7ae2ee4a53b384f2c8";
+       version = "2.2.1";
+       sha256 = "aa2e970e4fa7d4d5c542aa1b89f2f8e814742a2d9087edbd19e0d527f41f219e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151201,6 +153028,8 @@ self: {
        pname = "recursion-schemes";
        version = "5.0.1";
        sha256 = "b7a97c72fd7edc2d85060626a1f7e3c56756868aec43510dfe41c1e1fa43ff03";
+       revision = "1";
+       editedCabalFile = "36143fa4a8c0474a6799fc6975a051cecfdafb72a34d43a10cd53e395286ae38";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad free semigroups
          template-haskell transformers transformers-compat
@@ -152015,6 +153844,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "refurb" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, classy-prelude
+     , composite-base, composite-opaleye, dlist, fast-logger, hspec
+     , lens, monad-logger, old-locale, opaleye, optparse-applicative
+     , postgresql-simple, process, product-profunctors, template-haskell
+     , text, these, thyme, vector-space
+     }:
+     mkDerivation {
+       pname = "refurb";
+       version = "0.2.2.0";
+       sha256 = "144e3a38291261c9db5cb5e5d8ab7fe32a12cb31ee93045c0fca3088e29dd462";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring classy-prelude composite-base
+         composite-opaleye dlist fast-logger lens monad-logger old-locale
+         opaleye optparse-applicative postgresql-simple process
+         product-profunctors template-haskell text these thyme vector-space
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base bytestring classy-prelude composite-base
+         composite-opaleye dlist fast-logger hspec lens monad-logger
+         old-locale opaleye optparse-applicative postgresql-simple process
+         product-profunctors template-haskell text these thyme vector-space
+       ];
+       homepage = "https://github.com/ConferHealth/refurb#readme";
+       description = "Tools for maintaining a database";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa
@@ -152039,20 +153896,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "regex_0_13_0_0" = callPackage
+  "regex_1_0_0_0" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
-     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
-     , transformers, unordered-containers
+     , hashable, regex-base, regex-tdfa, regex-tdfa-text
+     , template-haskell, text, time, time-locale-compat, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.13.0.0";
-       sha256 = "78b7d83fb33c5e3cf45a66743db0dfe4ed4dfea77736d09c0830bd5e287b76bd";
+       version = "1.0.0.0";
+       sha256 = "97029564bc1cf10b620cb6a04d55cabbc8ff82b3248b36d5205e906cfd6c8766";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable regex-base
-         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
-         time time-locale-compat transformers unordered-containers
+         regex-tdfa regex-tdfa-text template-haskell text time
+         time-locale-compat transformers unordered-containers
        ];
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
@@ -152205,8 +154062,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.13.0.0";
-       sha256 = "b0dc80f421768ea9a272aeccc60722da9fbadc19feaf3bb2232446d82b7ec4f8";
+       version = "1.0.0.0";
+       sha256 = "88aa93a443b8969e19d2150625098343e47d3425cf993544a6ddc1de2f5abe0c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -152484,8 +154341,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "0.13.0.0";
-       sha256 = "5a39c51ac8d8e20b1a2c5b363e6e8087ca1480e771ad7a6c2853a60738fc9983";
+       version = "1.0.0.0";
+       sha256 = "67bb2649f1b3bf4c934202b8765e71e5ea37b777d7d575e87c881dffd453efb5";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
          regex-pcre-builtin regex-tdfa template-haskell transformers
@@ -152941,8 +154798,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.3.5";
-       sha256 = "473145c2bf23b03711a307b4dd6a22609606327e0c15f8f27f874ee783f7f1a6";
+       version = "0.8.3.6";
+       sha256 = "227d39084a0d27fdb135b4e4ee48a0fbcbd9c3e99d69ba8429c2187be6fdf94b";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -152956,7 +154813,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query_0_8_3_6" = callPackage
+  "relational-query_0_9_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -152964,8 +154821,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.3.6";
-       sha256 = "227d39084a0d27fdb135b4e4ee48a0fbcbd9c3e99d69ba8429c2187be6fdf94b";
+       version = "0.9.0.1";
+       sha256 = "2dedf32ee73538fc3608bbbc062dd3f2daf6572d4282972cd872c57a772257c3";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -153000,6 +154857,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query-HDBC_0_6_1_0" = callPackage
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, relational-query
+     , relational-schemas, template-haskell, th-data-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query-HDBC";
+       version = "0.6.1.0";
+       sha256 = "377ce34c521df92099a82915a16b776aa14e9dc0a5c1e644a91150a0d3e29d0c";
+       libraryHaskellDepends = [
+         base containers convertible dlist HDBC HDBC-session names-th
+         persistable-record relational-query relational-schemas
+         template-haskell th-data-compat transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record" = callPackage
     ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
      , relational-query-HDBC
@@ -153024,8 +154902,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.3.1.1";
-       sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242";
+       version = "0.3.1.4";
+       sha256 = "e0bced76ceb888bd7c2e38afc0df18468f272af8ee68de15dddbcc9ea7809f67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153054,6 +154932,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-schemas_0_1_3_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, relational-query
+     , template-haskell, time
+     }:
+     mkDerivation {
+       pname = "relational-schemas";
+       version = "0.1.3.3";
+       sha256 = "3aaf158b18f4dea23ff42b028224ec81f72c2c6934769a639d4291cf04ea0bc3";
+       libraryHaskellDepends = [
+         base bytestring containers relational-query template-haskell time
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "RDBMSs' schema templates for relational-query";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relative-date" = callPackage
     ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time
      }:
@@ -153868,8 +155763,8 @@ self: {
        pname = "req";
        version = "0.2.0";
        sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc";
-       revision = "1";
-       editedCabalFile = "b37d82306c1346da0bbaa129073d8cc8d7fa86df7ae938fb45de47925b8ed6b0";
+       revision = "2";
+       editedCabalFile = "5895d467759fc89c2007336012c7ab38b6af831e925fce72fb98cd04be602417";
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -154857,6 +156752,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ridley" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, ekg-core
+     , ekg-prometheus-adapter, http-client, inline-c, katip, microlens
+     , microlens-th, mtl, process, prometheus, raw-strings-qq, shelly
+     , string-conv, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, time, transformers, unix, vector
+     , wai-middleware-metrics
+     }:
+     mkDerivation {
+       pname = "ridley";
+       version = "0.3.0.0";
+       sha256 = "60d4cfc2e22099b4335bdf427d499b46b6b18f4c29e7c68a148061bd4e130f8d";
+       libraryHaskellDepends = [
+         async base containers ekg-core ekg-prometheus-adapter inline-c
+         katip microlens microlens-th mtl process prometheus raw-strings-qq
+         shelly template-haskell text time transformers unix vector
+         wai-middleware-metrics
+       ];
+       testHaskellDepends = [
+         base bytestring containers ekg-core ekg-prometheus-adapter
+         http-client microlens prometheus string-conv tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       homepage = "https://github.com/iconnect/ridley#readme";
+       description = "Quick metrics to grow you app strong";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "riemann" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , directory, doctest, errors, filepath, http-client, HUnit, lens
@@ -157462,8 +159385,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.7";
-       sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e";
+       version = "2.2.0";
+       sha256 = "4964d3c77c2b9ddc0da60a2cbd26820628f796f463ca41d6fc243e3c93ad69bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158082,8 +160005,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.4.10";
-       sha256 = "4d3b8ae5d741facfb0e84a2f1b6964a7ab3817269568c37de44f1be5cc0ff1a1";
+       version = "0.3.4.12";
+       sha256 = "26fa8f757082fb686b356fb6d6d3c50e6dcbe47436c29317547e6914922e955d";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp integer-logarithms text vector
@@ -158098,31 +160021,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "scientific_0_3_4_11" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.4.11";
-       sha256 = "990f4ba464606eb2bf07059c527b8e1e7aa11e2f0d9e2f3c0b4e6aec9f9e7ed4";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp integer-logarithms text vector
-       ];
-       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
@@ -158270,8 +160168,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed";
-       revision = "4";
-       editedCabalFile = "0d6fc88c2396a69e0d0f23ccad17b7b47d548f67bc23e417aad2940fdd71c5a1";
+       revision = "5";
+       editedCabalFile = "ae76edc7f78a68ecf982aaa2d4421e80796a365fbb13c38b1cf0f77c3586e482";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -158963,8 +160861,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.2.0.1";
-       sha256 = "c214ab985c0bb5174acceaec0d5952e3bd01f6b998dbfd4025203bf4a78643b9";
+       version = "0.3.0.0";
+       sha256 = "d87affc23848b8d79033a89a4eb6d090d1be7ad1438debbc714e602f04886a7c";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -159256,6 +161154,53 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {sedna = null;};
 
+  "selda" = callPackage
+    ({ mkDerivation, base, exceptions, hashable, mtl, psqueues, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "selda";
+       version = "0.1.2.0";
+       sha256 = "8eedfc94f4e792756710bdd50ec89dd4655dce25956cf0015ea9f75fe4116385";
+       libraryHaskellDepends = [
+         base exceptions hashable mtl psqueues text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/valderman/selda";
+       description = "Type-safe, high-level EDSL for interacting with relational databases";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "selda-postgresql" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
+     , selda, text
+     }:
+     mkDerivation {
+       pname = "selda-postgresql";
+       version = "0.1.1.0";
+       sha256 = "d7424f901d1c46ef50e55f2ad0e97d8304d2ef8c674df384732761f229fe8386";
+       libraryHaskellDepends = [
+         base bytestring exceptions postgresql-libpq selda text
+       ];
+       homepage = "https://github.com/valderman/selda";
+       description = "PostgreSQL backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "selda-sqlite" = callPackage
+    ({ mkDerivation, base, direct-sqlite, exceptions, selda, text }:
+     mkDerivation {
+       pname = "selda-sqlite";
+       version = "0.1.1.0";
+       sha256 = "ed7d175665d65424b63412b47a55d6b660c4b8983e2251cff334f57d531f0b20";
+       libraryHaskellDepends = [
+         base direct-sqlite exceptions selda text
+       ];
+       homepage = "https://github.com/valderman/selda";
+       description = "SQLite backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "select" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -159438,6 +161383,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
+     , cabal-doctest, comonad, containers, contravariant, distributive
+     , doctest, semigroups, tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.2";
+       sha256 = "d957f8804ca0dc2b85ef68edcab92dba9cd5d61ea0dddc41c173dda6f97791bc";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive semigroups tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/semigroupoids";
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -159472,6 +161438,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroups_0_18_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "semigroups";
+       version = "0.18.3";
+       sha256 = "35297c986872406e2efe29620c623727369f8c578e2f9c22998d575996e5a9ca";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/ekmett/semigroups/";
+       description = "Anything that associates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroups-actions" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -159789,8 +161768,8 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.5.0";
-       sha256 = "3b553c7bf0ae0ce770e70ab970739fe815831d025c6cc32d7c351b710a9de2a6";
+       version = "0.6.1";
+       sha256 = "cd19b6fc73682e276db51c72452f875e710d74fa348695daa4c6caefbc85909d";
        libraryHaskellDepends = [ base io-streams seqid ];
        homepage = "https://github.com/LukeHoersten/seqid-streams";
        description = "Sequence ID IO-Streams";
@@ -160244,8 +162223,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.3.3";
-       sha256 = "40376b033b2bd4d78ad327d0b83c2d2dcce05406fb5fbb4fd49e306f30dfee10";
+       version = "0.4.4";
+       sha256 = "7e49a7d1b71b19544a200b0d13968878ef5f73bcd5efd4bf248834b3255dd4ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160264,6 +162243,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-cookie_0_5_0_1" = 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.1";
+       sha256 = "05933224b1eeb1c3e44e1c01c337fade7c9da864a0ed1727118fd3d9aa10c1ad";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-docs" = callPackage
     ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck
      , servant, servant-auth, servant-docs, text, yaml
@@ -160389,8 +162398,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.2.0";
-       sha256 = "4e43edd4241521b366c9a55cfd1fce1e8f9e3963037257f3552f8c946d8ed668";
+       version = "0.4.4.0";
+       sha256 = "60cc885befaf7a53d2252617e982d8f6a89c43051438a6b1cf3c102786c03a38";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
@@ -160430,8 +162439,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.1.1";
-       sha256 = "70c5ab5e1bbd3b29e9b8dcc558d08c6688fdd4fee4412ffef964454386dadfda";
+       version = "0.4.2.0";
+       sha256 = "2c9349c10789fccc0b11249305748b7868daa3e1f639b5be8c7c2b075246236c";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -160917,6 +162926,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3";
        sha256 = "086905a2c5d8903910b415b71f007c28cb6de9bccc4ab273e7ed944ceeca2cc2";
+       revision = "1";
+       editedCabalFile = "d1012bbe974704eef8d067abd6051846b8262290911c54f87fb1f10f1d9e6dcf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161271,8 +163282,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-ruby";
-       version = "0.2.0.0";
-       sha256 = "5ac0095edc4254edc3db4f4a0913669391f838a8a6b4c9f78ff00daa2b467e17";
+       version = "0.2.1.0";
+       sha256 = "90b89a911a4a8741b8cbb63af21e03d81883b913a5f380278cdfc82f36aa89e1";
        libraryHaskellDepends = [ base casing lens servant-foreign text ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/joneshf/servant-ruby#readme";
@@ -161437,6 +163448,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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.3";
+       sha256 = "9d1bf11e2063abd6a281f51337c16e05edb7fd9cb7c071c7aeac204be4351e94";
+       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-subscriber" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
@@ -162523,8 +164561,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.16";
-       sha256 = "d6f7d889b2030acbc12a233d1666828559c5c6d35ec688b9fc62ebed86eafeef";
+       version = "0.0.17";
+       sha256 = "b8705c18de95396e5b816f9f72967fbbc181579f382021cda6e2f7bd7b1cb5e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -162561,6 +164599,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_13" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.13";
+       sha256 = "a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -163897,19 +165962,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-log_0_6_0" = callPackage
-    ({ mkDerivation, async, base, containers, data-default, deepseq
-     , directory, exceptions, filepath, hformat, mtl, SafeSemaphore
+  "simple-log_0_8_5" = callPackage
+    ({ mkDerivation, async, base, base-unicode-symbols, containers
+     , data-default, deepseq, directory, exceptions, filepath, hformat
+     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
      , text, time, transformers
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.6.0";
-       sha256 = "e22ba314bcfc3be5594db3d2a7ad505dcbf7b89d91e6f71f9921d80b76fadc5d";
+       version = "0.8.5";
+       sha256 = "f435eafb411f38ab43c09c034bb3829acbbb51adcb96ebb6436d5409a967c9a5";
        libraryHaskellDepends = [
-         async base containers data-default deepseq directory exceptions
-         filepath hformat mtl SafeSemaphore text time transformers
+         async base base-unicode-symbols containers data-default deepseq
+         directory exceptions filepath hformat microlens microlens-platform
+         mmorph mtl SafeSemaphore text time transformers
        ];
+       testHaskellDepends = [ base hspec microlens-platform text ];
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -164888,8 +166956,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylark-client";
-       version = "0.1.5";
-       sha256 = "e50e874a1f16ce71721d92118740853c53ee8822d43e173e670b47297dbb3ff7";
+       version = "0.1.7";
+       sha256 = "070a1836271311e4c848bee4c69a042a7696b142fcc42df811a0a79bb28ebda2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165254,6 +167322,8 @@ self: {
        pname = "slug";
        version = "0.1.6";
        sha256 = "c4d589b30d7d4788ed5dbf1a24652a5f880751a0250707bf8ac82a3714734692";
+       revision = "1";
+       editedCabalFile = "7255ff29461a929bd2149a46d657a39b054997412032b82642a50d120d6faae0";
        libraryHaskellDepends = [
          aeson base exceptions http-api-data path-pieces persistent
          QuickCheck text
@@ -165521,6 +167591,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie_0_4_2_7" = callPackage
+    ({ mkDerivation, aeson, base, linear, text, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.4.2.7";
+       sha256 = "84561c3463d870312fafb48680ef0122688814fcbb2eb605570c48cceb64deb2";
+       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
@@ -166091,10 +168174,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-server";
-       version = "1.0.1.1";
-       sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70";
-       revision = "1";
-       editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7";
+       version = "1.0.2.0";
+       sha256 = "677f29595331aeee82b5bbbe3fdbe228093c387c6527d4b70c5492de0c5bd549";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -167476,6 +169557,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "socketed" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit-combinators
+     , conduit-extra, http-types, MissingH, optparse-applicative, stm
+     , stm-chans, stm-conduit, template-haskell, text, wai
+     , wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "socketed";
+       version = "0.1.0.0";
+       sha256 = "71410dfc76ec523e3744ddce3a32d69e4566f36b3c477c63440c1cda488e974f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring conduit-combinators conduit-extra http-types
+         MissingH optparse-applicative stm stm-chans stm-conduit
+         template-haskell text wai wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [
+         async base bytestring conduit-combinators conduit-extra http-types
+         MissingH optparse-applicative stm stm-chans stm-conduit
+         template-haskell text wai wai-websockets warp websockets
+       ];
+       description = "simpe tool to serve piped data over http and websocket";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , blaze-builder, bytestring, conduit, conduit-extra, http-types
@@ -169526,6 +171633,8 @@ self: {
        pname = "stache";
        version = "0.2.2";
        sha256 = "66c75aaf078dc778b2e33ddef4850107b5b488fd966c81c7e2f133539276b86e";
+       revision = "1";
+       editedCabalFile = "297114f7d0e3404be169b5abb243938cf531b04bf24163e81e2beaa8464da667";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -170170,6 +172279,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "state-plus_0_1_3" = callPackage
+    ({ mkDerivation, base, checkers, mtl, QuickCheck }:
+     mkDerivation {
+       pname = "state-plus";
+       version = "0.1.3";
+       sha256 = "a990264ab1d26aee077b035c1959fb792e5b015e46010d08dd065dea2a4cb0bc";
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base checkers mtl QuickCheck ];
+       description = "MonadPlus for StateT";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "state-record" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -170501,25 +172623,27 @@ self: {
      }) {};
 
   "staversion" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, http-client, http-client-tls, http-types
-     , megaparsec, optparse-applicative, QuickCheck, text, transformers
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
+     , containers, directory, filepath, hspec, http-client
+     , http-client-tls, http-types, megaparsec, optparse-applicative
+     , pretty, QuickCheck, semigroups, text, transformers
      , transformers-compat, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.1.3.2";
-       sha256 = "d3281fe9b7aa3795251c7e45d6364bfb051ffa3bee44d691f40c0c928fe886e0";
+       version = "0.1.4.0";
+       sha256 = "f09fd5ad180ddac974201de99eaf74ff6d63cc172857f9d41379eb1707eda09a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath http-client
-         http-client-tls http-types megaparsec optparse-applicative text
-         transformers transformers-compat unordered-containers yaml
+         aeson ansi-wl-pprint base bytestring Cabal containers directory
+         filepath http-client http-client-tls http-types megaparsec
+         optparse-applicative pretty semigroups text transformers
+         transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring filepath hspec QuickCheck text
+         base bytestring Cabal filepath hspec QuickCheck semigroups text
        ];
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
@@ -170749,6 +172873,8 @@ self: {
        pname = "stm";
        version = "2.4.4.1";
        sha256 = "8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384";
+       revision = "1";
+       editedCabalFile = "49cfd80cba95f84d42eda0045346c8a567df5ce434d4da3d26ac3e977826fc4f";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -171263,7 +173389,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store" = callPackage
+  "store_0_3_1" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
      , containers, contravariant, criterion, cryptohash, deepseq
@@ -171277,8 +173403,8 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.4.0";
-       sha256 = "bdbbc77a10941ee721c4c3fb456ec236ada3be51a890415c00a57cd4f06973cc";
+       version = "0.3.1";
+       sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
          containers contravariant cryptohash deepseq directory filepath free
@@ -171316,7 +173442,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store_0_4_2" = callPackage
+  "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
      , containers, contravariant, criterion, cryptohash, deepseq
@@ -171369,6 +173495,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "store-core_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "store-core";
+       version = "0.3";
+       sha256 = "8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087";
+       libraryHaskellDepends = [
+         base bytestring fail ghc-prim primitive text transformers
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast and lightweight binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -171404,30 +173547,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.4.1";
-       sha256 = "7a8a7c8bbe4c154c1a8def4a0bb7384ff9f60198ce7a8583063c7cd0c84bc790";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hashable hlint lens
-         tasty tasty-hspec template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_4_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
@@ -171449,7 +173568,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
@@ -171701,6 +173819,8 @@ self: {
        pname = "streaming-eversion";
        version = "0.3.1.1";
        sha256 = "4277a6cd32bef41230f4a74cb1786c57f9bb09b3ec57edf7acdec6c9eaa1da8d";
+       revision = "1";
+       editedCabalFile = "1aea18d0246597ae046c75b4500789b25190d585c4652f6d9af6b9b486f27229";
        libraryHaskellDepends = [
          base foldl pipes streaming transformers
        ];
@@ -172431,6 +174551,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_3_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 = "3.0.3";
+       sha256 = "95ac2cc6763cf9c6a409ec91dc438b53a1dd4993da42a901a7523a1598e6283d";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -175325,21 +177465,22 @@ self: {
      }) {};
 
   "tailfile-hinotify" = callPackage
-    ({ mkDerivation, async, base, bytestring, conceit, directory, foldl
-     , hinotify, pipes, process-streaming, streaming, streaming-eversion
-     , tasty, tasty-hunit
+    ({ mkDerivation, async, base, bytestring, conceit, directory
+     , filepath, foldl, hinotify, pipes, process-streaming, streaming
+     , streaming-eversion, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "tailfile-hinotify";
-       version = "1.0.0.2";
-       sha256 = "e63dab76d95842cef9b3b47c48cb0c2ee1fe0e5bb7bd73ff349a9c49a03aa43f";
+       version = "1.0.0.3";
+       sha256 = "df2fc8f4583dff80cffd3e714665da70e6b85c1e7e99f7a1879d7d52a10afc33";
        libraryHaskellDepends = [
          async base bytestring foldl hinotify pipes streaming
          streaming-eversion
        ];
        testHaskellDepends = [
-         async base bytestring conceit directory foldl hinotify pipes
-         process-streaming streaming streaming-eversion tasty tasty-hunit
+         async base bytestring conceit directory filepath foldl hinotify
+         pipes process-streaming streaming streaming-eversion tasty
+         tasty-hunit
        ];
        description = "Tail files in Unix, using hinotify";
        license = stdenv.lib.licenses.mit;
@@ -175822,12 +177963,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_0_4_0_0" = callPackage
+  "tasty-dejafu_0_5_0_0" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "0.4.0.0";
-       sha256 = "b2e4f21f9ccc2777d36090f71f560fbff0c3fde3bf43d966339b3fc2bf19577e";
+       version = "0.5.0.0";
+       sha256 = "5bbdd7a9aeb800078803dff2f48fb6707c6f6c633a07f197d440a586498c195f";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -175857,14 +177998,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty-discover_2_0_1" = callPackage
+  "tasty-discover_2_0_3" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "tasty-discover";
-       version = "2.0.1";
-       sha256 = "b4a9be2c27ee29de6ee41bf2a43abcc5f155ef263f3ae3c48d9a5a281e78242c";
+       version = "2.0.3";
+       sha256 = "120dfe99db61ea2acbe96a19ceae1137329b03ce8c52f95fc0ce9857633c43e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -175957,6 +178098,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3.1";
        sha256 = "8ac658b530202d84e34891a6274df1e8e08495a2e5d9d75a8e53a88d2ad85444";
+       revision = "1";
+       editedCabalFile = "ea3758e2cf8970122e4e9215786e5c25012536cbdddc12550221704a0539ae3d";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -176159,30 +178302,6 @@ self: {
      }) {};
 
   "tasty-silver" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , deepseq, directory, filepath, mtl, optparse-applicative, process
-     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
-     , temporary, text, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-silver";
-       version = "3.1.9";
-       sha256 = "7067a64be061c42102eca6c09215bcaebe27c8bb9c554c38521c105dcc69b630";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring containers deepseq directory
-         filepath mtl optparse-applicative process process-extras regex-tdfa
-         stm tagged tasty temporary text
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary
-         transformers
-       ];
-       homepage = "https://github.com/phile314/tasty-silver";
-       description = "A fancy test runner, including support for golden tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-silver_3_1_10" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -176204,7 +178323,6 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -176254,30 +178372,20 @@ self: {
      }) {};
 
   "tasty-th" = callPackage
-    ({ mkDerivation, base, tasty, template-haskell }:
+    ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit
+     , template-haskell
+     }:
      mkDerivation {
        pname = "tasty-th";
-       version = "0.1.4";
-       sha256 = "18a14d693e709046eba3bb1a4e9febfce09d04059342728f06178788a24ece35";
-       libraryHaskellDepends = [ base tasty template-haskell ];
-       homepage = "http://github.com/bennofs/tasty-th";
-       description = "Automatic tasty test case discovery using TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-th_0_1_5" = callPackage
-    ({ mkDerivation, base, haskell-src-exts, tasty, template-haskell }:
-     mkDerivation {
-       pname = "tasty-th";
-       version = "0.1.5";
-       sha256 = "6452b3b65a2d59e469df598aa808084020095b4be54c64ff669802148845d372";
+       version = "0.1.7";
+       sha256 = "435aac8f317e2f8cb1aa96fb3f7c9003c1ac28e6d3ca4c3c23f5142178de512c";
        libraryHaskellDepends = [
          base haskell-src-exts tasty template-haskell
        ];
+       testHaskellDepends = [ base tasty-hunit ];
        homepage = "http://github.com/bennofs/tasty-th";
        description = "Automatic tasty test case discovery using TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tateti-tateti" = callPackage
@@ -177306,8 +179414,8 @@ self: {
        pname = "test-framework";
        version = "0.8.1.1";
        sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273";
-       revision = "1";
-       editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e";
+       revision = "2";
+       editedCabalFile = "3e3101b9aab6788ba62a5984d326df68652021ba740cbe6cef4375fe1d80e1d6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177555,8 +179663,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-sandbox";
-       version = "0.1.5";
-       sha256 = "5a02005aed04af0ed9d2781df0921ff0934e01c0ae6ac50cc1980bf7e9c276b2";
+       version = "0.1.6";
+       sha256 = "b68d5e3ebcb77444b6e4685172cbae2f3b59121f85d61e0f80af728784ea4822";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -178409,6 +180517,8 @@ self: {
        pname = "text-show";
        version = "3.4.1.1";
        sha256 = "f0ba04cb7389decad861b668764f7d7e58a6371269f2ac5809f842d2844f9921";
+       revision = "2";
+       editedCabalFile = "d347c19babfeb5980f3730a68f830e873060ba0c5219e4068cff866045c00289";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -178890,6 +181000,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-expand-syns_0_4_3_0" = callPackage
+    ({ mkDerivation, base, containers, syb, template-haskell }:
+     mkDerivation {
+       pname = "th-expand-syns";
+       version = "0.4.3.0";
+       sha256 = "9fee68a387610574ed6445022fdcd0879a7415d910dcb6618f1de5d2001e679d";
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
+       description = "Expands type synonyms in Template Haskell ASTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-extras" = callPackage
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
@@ -179014,6 +181138,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-lift_0_7_7" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.7.7";
+       sha256 = "16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5";
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       homepage = "http://github.com/mboes/th-lift";
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-lift-instances" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , template-haskell, text, th-lift, vector
@@ -179297,8 +181435,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
-       revision = "2";
-       editedCabalFile = "12ec949fc6530adb5b534e773a786d467f59e8087480d5b50a298894aec96e2b";
+       revision = "3";
+       editedCabalFile = "acf48c0c351a4d79fc468cb1293e7b4cbc403a53981518c1d578473ce813cc12";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -179587,12 +181725,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threepenny-gui-flexbox_0_4_0_2" = callPackage
+  "threepenny-gui-flexbox_0_4_1" = callPackage
     ({ mkDerivation, base, clay, text, threepenny-gui }:
      mkDerivation {
        pname = "threepenny-gui-flexbox";
-       version = "0.4.0.2";
-       sha256 = "6edbd91b86e3711bd9198e9747cbcc49603b5f852bfb175f24abceef90ce0918";
+       version = "0.4.1";
+       sha256 = "bca8c8b56f419559d3ce2a991737c52e38f4194cb1bdfcc4744e4a4de7fc7467";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base clay text threepenny-gui ];
@@ -179870,19 +182008,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "tidal_0_9" = callPackage
-    ({ mkDerivation, base, colour, containers, hashable, hosc
-     , mersenne-random-pure64, mtl, parsec, safe, text, time, websockets
+  "tidal_0_9_2" = callPackage
+    ({ mkDerivation, applicative-numbers, base, colour, containers
+     , hashable, hosc, mersenne-random-pure64, mtl, parsec, safe, text
+     , time, websockets
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.9";
-       sha256 = "7578110ee03cf8716cadf16a8ee25c7e963a1b9cbf7d678dc2361a03bdabac86";
+       version = "0.9.2";
+       sha256 = "518187f765f2ccb70b83a65f833e4a6fa1a02be36519f27c53a738ef8c9bdc40";
        libraryHaskellDepends = [
-         base colour containers hashable hosc mersenne-random-pure64 mtl
-         parsec safe text time websockets
+         applicative-numbers base colour containers hashable hosc
+         mersenne-random-pure64 mtl parsec safe text time websockets
        ];
-       homepage = "http://tidal.lurk.org/";
+       homepage = "http://tidalcycles.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179894,8 +182033,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.9";
-       sha256 = "09d0d4893f73f93439c571dbb2365f80d72a41d28fecb21ad76d51c5dee4e9c0";
+       version = "0.9.2";
+       sha256 = "ac9555387d046e382532d8816d57b2e4999b9713fb88e0cfbfe00f8252a8de60";
        libraryHaskellDepends = [
          base containers PortMidi tidal time transformers
        ];
@@ -180821,6 +182960,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tiny-scheduler" = callPackage
+    ({ mkDerivation, async, base, time }:
+     mkDerivation {
+       pname = "tiny-scheduler";
+       version = "0.1.4.2";
+       sha256 = "aea6a3b9773e92cccfced04626ae9da51307b33a0b9374797c9aa84c9dd52e1f";
+       libraryHaskellDepends = [ async base time ];
+       homepage = "https://github.com/functor-soup/tiny-scheduler#readme";
+       description = "tiny no-brainer job scheduler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tinyMesh" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hex, serialport
      , unix
@@ -181320,8 +183471,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "312609c0037271b1091f23c2edf467e9449edca5bbed0cfb45c2c93c1bee6ad0";
-       revision = "1";
-       editedCabalFile = "41232cfabd4ba8e217d2b78f0f897d5a245756cf525c9a84c5ba2c695b533576";
+       revision = "2";
+       editedCabalFile = "a36253bf7bafd131327019f3ccac6b02cf8b6ca3db45c05e578fd600f856730e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
@@ -182547,8 +184698,8 @@ self: {
      }:
      mkDerivation {
        pname = "tries";
-       version = "0.0.4.1";
-       sha256 = "c0b8ba913f98dd0732efe37bc29bacc28d2ed6d6ac23584102865e0cbeaab28a";
+       version = "0.0.4.2";
+       sha256 = "164c26a8d5efbd669545e1028f06c090554cabbe005a377827cc9a3b9ed15994";
        libraryHaskellDepends = [
          base bytestring bytestring-trie composition composition-extra
          containers deepseq hashable keys QuickCheck quickcheck-instances
@@ -182558,7 +184709,9 @@ self: {
          base containers mtl QuickCheck quickcheck-instances tasty
          tasty-quickcheck
        ];
-       benchmarkHaskellDepends = [ base criterion ];
+       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;
@@ -182867,15 +185020,12 @@ self: {
     ({ mkDerivation, base, HUnit, split }:
      mkDerivation {
        pname = "tsv2csv";
-       version = "0.1.0.1";
-       sha256 = "c0c505350d73c53068f5c186d58de7bcabea839ce3b3d84c2c604a633f4c77fc";
-       revision = "2";
-       editedCabalFile = "f93f38f878487b20ee86e91a3923f285acd63a2a360fab8097224ec7e8da37b0";
+       version = "0.1.0.2";
+       sha256 = "2c082f8bac93a5d47e312148493d0b8f078e2e0d0e919caa0fa24cab63dd3397";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base HUnit split ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/MackeyRMS/tsv2csv";
        description = "Convert tsv to csv";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182975,6 +185125,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tttool_1_7_0_2" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, executable-path, filepath, hashable, haskeline, HPDF
+     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
+     , process, random, split, spool, template-haskell, time, vector
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "tttool";
+       version = "1.7.0.2";
+       sha256 = "37100655b5a42ced12a9d144d07462f9a5fce440faac556a4c9fe64665d00322";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base binary bytestring containers directory executable-path
+         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
+         optparse-applicative parsec process random split spool
+         template-haskell time vector yaml zlib
+       ];
+       homepage = "https://github.com/entropia/tip-toi-reveng";
+       description = "Working with files for the Tiptoi® pen";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tubes" = callPackage
     ({ mkDerivation, base, comonad, contravariant, free, mtl
      , profunctors, semigroups, transformers
@@ -183318,7 +185493,7 @@ self: {
      }) {};
 
   "tweet-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
+    ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, criterion, data-default, directory
      , extra, hspec, hspec-megaparsec, http-client, http-client-tls
      , http-types, lens, megaparsec, MissingH, optparse-applicative
@@ -183326,12 +185501,12 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.5.3.2";
-       sha256 = "749ac037384f0f9e09526cffcb7c1a55375480effeb3d586b19bcbb1f1c6e40e";
+       version = "0.5.3.6";
+       sha256 = "f3f882d1431241e5c0368d4994f675c38e13a4caae95f044e660d472d3633395";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint authenticate-oauth base bytestring composition
+         aeson ansi-wl-pprint authenticate-oauth base bytestring composition
          data-default directory extra http-client http-client-tls http-types
          lens megaparsec MissingH optparse-applicative split text
        ];
@@ -183732,8 +185907,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.2.1";
-       sha256 = "56271d64566f5c43f7557e384e2e8e655f19f782078c28e99919efc32cfff3ff";
+       version = "0.2.2";
+       sha256 = "837f9aa3b80826c93b3ce8110b84760fb786fe8e52957038b2bb3f7049fffd5b";
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default exceptions http-client
@@ -183783,8 +185958,8 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.11";
        sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
-       revision = "2";
-       editedCabalFile = "40c6941bd4bc222ad94a0963036f74f66fc1ef084b8d7c5c07f5dc9f3d861a59";
+       revision = "3";
+       editedCabalFile = "4e853ce6a5aa6db38e4ce5ca5bfa68bb5934320470fd83bbd345a5acc880f943";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -184170,6 +186345,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "type-level-integers" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "type-level-integers";
+       version = "0.0.1";
+       sha256 = "118be3a4b3ab65bb1d31220738079013bd14fc77db674a9a1577f5582ffcc7ba";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/mtesseract/type-level-integers";
+       description = "Provides integers lifted to the type level";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-level-kv-list" = callPackage
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
@@ -184266,6 +186454,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-map" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, HUnit, test-framework
+     , test-framework-hunit, vector
+     }:
+     mkDerivation {
+       pname = "type-map";
+       version = "0.1.0.0";
+       sha256 = "84e61e322c7da78a32ce4f1a5950eab6717f902c47ee7e131d8516162f565ac3";
+       revision = "1";
+       editedCabalFile = "82b3d3434e40fa630cd04f9cdcc6b25206e72332de597b85b1098269b9cd4120";
+       libraryHaskellDepends = [ base containers ghc-prim vector ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/Lysxia/type-map";
+       description = "Type-indexed maps";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "type-natural" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning
      , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic
@@ -184778,14 +186985,17 @@ self: {
      }) {};
 
   "tyro" = callPackage
-    ({ mkDerivation, aeson, base, HUnit, protolude, singletons
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, aeson, base, bytestring, HUnit, protolude
+     , reflection, singletons, test-framework, test-framework-hunit
+     , text
      }:
      mkDerivation {
        pname = "tyro";
-       version = "0.1.1.1";
-       sha256 = "b225ec138b2f98c9b478143a8f10bcd48ad944e3bd9813a2227068a23ec70cce";
-       libraryHaskellDepends = [ aeson base protolude singletons text ];
+       version = "0.2.0.0";
+       sha256 = "d076802ae695308f5d76e7ab87e37c8c890f7f05e6f78557bfcfe23b8257d084";
+       libraryHaskellDepends = [
+         aeson base bytestring protolude reflection singletons text
+       ];
        testHaskellDepends = [
          aeson base HUnit protolude test-framework test-framework-hunit text
        ];
@@ -185025,6 +187235,7 @@ self: {
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libudev;};
 
   "udp-conduit" = callPackage
@@ -185310,28 +187521,18 @@ self: {
      }) {};
 
   "unbounded-delays" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "unbounded-delays";
-       version = "0.1.0.9";
-       sha256 = "4010ca5c4ca800039db259fc7a5180f10fc98f00580c7223ac7ad401ca4190b8";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/basvandijk/unbounded-delays";
-       description = "Unbounded thread delays and timeouts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unbounded-delays_0_1_0_10" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "unbounded-delays";
        version = "0.1.0.10";
        sha256 = "1c3621437c267f313231a56cf85136bbe7ff6fea0c08a016240d482cc69ca123";
+       revision = "1";
+       editedCabalFile = "98424c728917bd4638112a913f0032be8b84e837f4f60fc96e0d6dc40d61e5c6";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/unbounded-delays";
        description = "Unbounded thread delays and timeouts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays-units" = callPackage
@@ -186214,8 +188415,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.3";
-       sha256 = "cc5b5056e4a0c930a40bb9e015c90a3adf8d15e483d6da586fcf9ea23693acb5";
+       version = "0.4.1";
+       sha256 = "1c08722ec9365d931cedcfa8dcdad31efaa6e1a46c55a83501c945b56020e12a";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe stm text text-format transformers
@@ -186379,10 +188580,8 @@ self: {
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.14.0.1";
-       sha256 = "d173f0c4ad8c80d4e1035a57c6bf3e4a8620ffb71c0c1f6ddcb474ac440a3e13";
-       revision = "4";
-       editedCabalFile = "129fd242ec0082f7c3dfa73cdadb13d7b7556a61395b62d0d2e0acbb4e3768ec";
+       version = "0.14.1.2";
+       sha256 = "8f06d68b66269385a34d59ee6b68de932e0f4ee9bfb76219d9a278260e0a9d4b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -186392,6 +188591,7 @@ self: {
          invariant pretty primitive scientific text time
          unordered-containers vector
        ];
+       homepage = "https://github.com/scrive/unjson";
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186873,6 +189073,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
+     mkDerivation {
+       pname = "uri-bytestring-aeson";
+       version = "0.1.0.0";
+       sha256 = "d852485339347c7a3c79598819d063261c297f6cfc1b0faf4d59093bb315285f";
+       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-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -188225,6 +190439,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vault_0_3_0_7" = callPackage
+    ({ mkDerivation, base, containers, hashable, unordered-containers
+     }:
+     mkDerivation {
+       pname = "vault";
+       version = "0.3.0.7";
+       sha256 = "9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0";
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       homepage = "https://github.com/HeinrichApfelmus/vault";
+       description = "a persistent store for values of arbitrary types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vault-tool" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, text, unordered-containers
@@ -188528,6 +190758,8 @@ self: {
        pname = "vector";
        version = "0.12.0.1";
        sha256 = "b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b";
+       revision = "1";
+       editedCabalFile = "0b838071449021040b4366201eb5e51790a8946a1b85c30d823bf5690e425bf6";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base HUnit QuickCheck random template-haskell test-framework
@@ -188578,8 +190810,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-binary-instances";
-       version = "0.2.3.4";
-       sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00";
+       version = "0.2.3.5";
+       sha256 = "e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
        benchmarkHaskellDepends = [
@@ -188607,8 +190839,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-builder";
-       version = "0.3";
-       sha256 = "6041b4a9b05c8d39c67cb4bedcf1192a33babda444f2ec64b24598874db45ec0";
+       version = "0.3.1";
+       sha256 = "77f3938c3b0864d56f4a0e2773c2b8f62f269b343c341ceefc07042dda73dad0";
        libraryHaskellDepends = [ base base-prelude semigroups vector ];
        testHaskellDepends = [
          quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck
@@ -190416,13 +192648,13 @@ self: {
      , clientsession, cookie, exceptions, hoauth2, http-client
      , http-client-tls, http-conduit, http-reverse-proxy, http-types
      , optparse-simple, regex-posix, safe-exceptions, shakespeare, text
-     , unix-compat, unordered-containers, vault, wai, wai-app-static
-     , wai-extra, warp, yaml
+     , unix-compat, unordered-containers, uri-bytestring, vault, wai
+     , wai-app-static, wai-extra, warp, yaml
      }:
      mkDerivation {
        pname = "wai-middleware-auth";
-       version = "0.1.1.2";
-       sha256 = "f14016ba27f24a11395661cd2969cc41cf5a5043045468c584a0e03c4ddfa896";
+       version = "0.1.2.0";
+       sha256 = "8b89a4c9c0551254eb8624d1a927981d58555a1e42c78fa442ffe548c1919312";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190430,7 +192662,8 @@ self: {
          bytestring case-insensitive cereal clientsession cookie exceptions
          hoauth2 http-client http-client-tls http-conduit http-reverse-proxy
          http-types regex-posix safe-exceptions shakespeare text unix-compat
-         unordered-containers vault wai wai-app-static wai-extra yaml
+         unordered-containers uri-bytestring vault wai wai-app-static
+         wai-extra yaml
        ];
        executableHaskellDepends = [
          base bytestring cereal clientsession optparse-simple warp
@@ -190726,29 +192959,6 @@ self: {
      }) {};
 
   "wai-middleware-metrics" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types
-     , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "wai-middleware-metrics";
-       version = "0.2.3";
-       sha256 = "c9123ca10c2d0d223ce0c39faa7097de2e61ec2b9a24cff042d7248850ea2e2a";
-       libraryHaskellDepends = [ base ekg-core http-types text time wai ];
-       testHaskellDepends = [
-         base bytestring ekg-core http-types QuickCheck scotty tasty
-         tasty-hunit tasty-quickcheck text time transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion ekg-core http-types scotty text time wai
-         wai-extra
-       ];
-       homepage = "https://github.com/Helkafen/wai-middleware-metrics";
-       description = "A WAI middleware to collect EKG request metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-metrics_0_2_4" = callPackage
     ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types
      , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text
      , time, transformers, wai, wai-extra
@@ -190769,7 +192979,6 @@ self: {
        homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -190810,6 +193019,55 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "wai-middleware-rollbar" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, hostname, http-client, http-conduit, http-types, lens
+     , lens-aeson, network, QuickCheck, text, time, unordered-containers
+     , uuid, wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-rollbar";
+       version = "0.3.0";
+       sha256 = "c97f632b96d355ec115028eb56ba4986358216c9e164d73b440e79fb244c3200";
+       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 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_4_0" = 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.4.0";
+       sha256 = "4a0e203151fc3a6d4a356a187571578b6f1ca65d8cde3c3d32bdf5636511b991";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-route" = callPackage
     ({ mkDerivation, base, bytestring, http-types, HUnit
      , test-framework, test-framework-hunit, text, wai, wai-test
@@ -190842,8 +193100,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.1";
        sha256 = "e0b5f13f410f81897759acf43198a08101d2af4c9d506164367c7d1a96d55375";
-       revision = "1";
-       editedCabalFile = "2884eb9d594bdc91a8ab7dd045e4252472c45361907c470f594a7f2a573d7752";
+       revision = "2";
+       editedCabalFile = "c9e6b72329833d8da9183c5d1b8de5119bbc183b96aee13682f2f7da5e17a8f9";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -191029,6 +193287,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-routes_0_10_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, vault, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-routes";
+       version = "0.10.0";
+       sha256 = "5e3b4d938a2b05b324c18d9448270669ed61d924315ef114ba8776505f3a0dfb";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
+         monad-loops mtl path-pieces random template-haskell text vault wai
+         wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json text wai
+       ];
+       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
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
@@ -191398,8 +193682,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.11.1";
-       sha256 = "853f672c48893936902a0c6b3e4711f58c0fd02f36e8badb46a0c8b58067e5fe";
+       version = "3.2.11.2";
+       sha256 = "fbe460ab787777b07cd0a77403453469b46736929da4047ab38032b90e4f4b6a";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          bytestring-builder case-insensitive containers ghc-prim hashable
@@ -192081,22 +194365,24 @@ self: {
      }) {};
 
   "webapp" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, blaze-builder
-     , bytestring, case-insensitive, http-types, mtl, network
-     , optparse-applicative, regex-posix, stm, streaming-commons, text
-     , transformers, unix, wai, warp, warp-tls, zlib
+    ({ mkDerivation, array, base, blaze-builder, bytestring
+     , case-insensitive, hspec, http-types, network
+     , optparse-applicative, regex-base, regex-pcre-builtin, stm, text
+     , transformers, unix, vault, wai, warp, warp-tls
      }:
      mkDerivation {
        pname = "webapp";
-       version = "0.3.6";
-       sha256 = "cc15c419454db7a1e61bbeb8827d971234b43a120a8d372d3d015991fa04c8ec";
+       version = "0.6.1";
+       sha256 = "390de0de4c7e777f217466fb532cae1edfaa45c042ea987af67200a9d92a2242";
        libraryHaskellDepends = [
-         aeson base base16-bytestring blaze-builder bytestring
-         case-insensitive http-types mtl network optparse-applicative
-         regex-posix stm streaming-commons text transformers unix wai warp
-         warp-tls zlib
+         array base blaze-builder bytestring case-insensitive http-types
+         network optparse-applicative regex-base regex-pcre-builtin stm text
+         transformers unix vault wai warp warp-tls
        ];
-       homepage = "https://github.com/fhsjaagshs/webapp";
+       testHaskellDepends = [
+         base hspec http-types network text transformers wai
+       ];
+       homepage = "https://github.com/natesymer/webapp";
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192209,6 +194495,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "webdriver_0_8_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, data-default-class, directory, directory-tree
+     , exceptions, filepath, http-client, http-types, lifted-base
+     , monad-control, network, network-uri, scientific, temporary, text
+     , time, transformers, transformers-base, unordered-containers
+     , vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "webdriver";
+       version = "0.8.5";
+       sha256 = "a8167a8b147411a929e81727a77bc31fcd7d93424442268913fb522e1932c1be";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring
+         data-default-class directory directory-tree exceptions filepath
+         http-client http-types lifted-base monad-control network
+         network-uri scientific temporary text time transformers
+         transformers-base unordered-containers vector zip-archive
+       ];
+       homepage = "https://github.com/kallisti-dev/hs-webdriver";
+       description = "a Haskell client for the Selenium WebDriver protocol";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webdriver-angular" = callPackage
     ({ mkDerivation, aeson, base, hspec, hspec-webdriver
      , language-javascript, template-haskell, text, transformers
@@ -192404,19 +194715,6 @@ self: {
      }) {inherit (pkgs) webkitgtk24x;};
 
   "webpage" = callPackage
-    ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
-     mkDerivation {
-       pname = "webpage";
-       version = "0.0.4";
-       sha256 = "17fba395357bf4d1462d1a50e2a06d1004d0df02cab524dc26e982a90f70c648";
-       libraryHaskellDepends = [
-         base blaze-html data-default lucid text
-       ];
-       description = "Organized and simple web page scaffold for blaze and lucid";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "webpage_0_0_5" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
      mkDerivation {
        pname = "webpage";
@@ -192427,7 +194725,6 @@ self: {
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -192531,6 +194828,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets_0_11_1_0" = 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.11.1.0";
+       sha256 = "3c2dc3417c99acb713276a55c16ff3bf2964ab3990044215a996ae235fa57ae1";
+       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 = [ base bytestring criterion random ];
+       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, mtl, QuickCheck, quickcheck-instances, stm, tasty
@@ -192572,6 +194901,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets-snap_0_10_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.2.1";
+       sha256 = "4264992c29f800b9623632fc366094ebbfe6353fb0e346f0a51519afed3586af";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -192907,8 +195253,8 @@ self: {
      }:
      mkDerivation {
        pname = "wide-word";
-       version = "0.1.0.2";
-       sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb";
+       version = "0.1.0.3";
+       sha256 = "e0ec5b2db38736d81c7a5fff880ed4dec2d774f24282d19aad5d72180124f879";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
        homepage = "https://github.com/erikd/wide-word";
@@ -193322,6 +195668,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wl-pprint-annotated_0_1_0_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "wl-pprint-annotated";
+       version = "0.1.0.0";
+       sha256 = "b7ce310688626b25c19e2c93c3546ce5f6a3a6c5943b0a687031b757ba494930";
+       libraryHaskellDepends = [ base containers deepseq text ];
+       testHaskellDepends = [
+         base containers deepseq tasty tasty-hunit text
+       ];
+       homepage = "https://github.com/minad/wl-pprint-annotated#readme";
+       description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wl-pprint-ansiterm" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , nats, semigroups, text, transformers, wl-pprint-extras
@@ -193348,6 +195712,8 @@ self: {
        pname = "wl-pprint-console";
        version = "0.1.0.1";
        sha256 = "a7c7f6aa14f78bf6a8aae1a629433872f8bfb377b1392f08047520cdcb3b70fc";
+       revision = "1";
+       editedCabalFile = "45b92029f969643191e9902ad781b63781d80ea857bb8d7f9763c35aa6948bd6";
        libraryHaskellDepends = [
          base bytestring colorful-monoids text wl-pprint-annotated
        ];
@@ -193501,8 +195867,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.10";
-       sha256 = "37a02e1b60d7f7779dd94a3facbb54eadbecb0729e639ec30f7c7cd98fe5baae";
+       version = "0.3.13";
+       sha256 = "e96203096f770c4241d1ac2e0b8163b6af551c32eb57950a5223f9f1c2327283";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193872,8 +196238,8 @@ self: {
      }:
      mkDerivation {
        pname = "wreq";
-       version = "0.5.0.0";
-       sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5";
+       version = "0.5.0.1";
+       sha256 = "6c2a92bb8054091e4e170066b70fbc1d42a9842aab887ccfea457f96d108168d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193939,8 +196305,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string, wreq }:
      mkDerivation {
        pname = "wreq-stringless";
-       version = "0.5.0.0";
-       sha256 = "e58cb6e6c44b33df3507c1e5fc3f7cea2961a8244c3c6840a085327ce731b921";
+       version = "0.5.0.1";
+       sha256 = "ca975c77c7a87ff673d4ca0b6156b5867273e8a1275f00c349aec3918a3f965b";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
        homepage = "https://github.com/j-keck/wreq-stringless#readme";
        description = "Simple wrapper to use wreq without Strings";
@@ -194028,21 +196394,6 @@ self: {
      }) {};
 
   "writer-cps-mtl" = callPackage
-    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
-     }:
-     mkDerivation {
-       pname = "writer-cps-mtl";
-       version = "0.1.1.2";
-       sha256 = "55d14bfe21dad79b4254c188b5b3f30144d741a821bfb024e38c798dbf7c5f61";
-       libraryHaskellDepends = [
-         base mtl transformers writer-cps-transformers
-       ];
-       homepage = "https://github.com/minad/writer-cps-mtl#readme";
-       description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "writer-cps-mtl_0_1_1_3" = callPackage
     ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
      }:
      mkDerivation {
@@ -194055,7 +196406,6 @@ self: {
        homepage = "https://github.com/minad/writer-cps-mtl#readme";
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "writer-cps-transformers" = callPackage
@@ -194070,6 +196420,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ws-chans" = callPackage
+    ({ mkDerivation, async, base, http-types, HUnit, network
+     , QuickCheck, quickcheck-instances, test-framework
+     , test-framework-quickcheck2, text, unagi-chan, wai, wai-websockets
+     , warp, websockets
+     }:
+     mkDerivation {
+       pname = "ws-chans";
+       version = "0.1.0.0";
+       sha256 = "70b5344b6711504f72c612cb2d4ff61b61927a844df427222d757e944d1c3664";
+       libraryHaskellDepends = [
+         async base network unagi-chan websockets
+       ];
+       testHaskellDepends = [
+         base http-types HUnit QuickCheck quickcheck-instances
+         test-framework test-framework-quickcheck2 text unagi-chan wai
+         wai-websockets warp websockets
+       ];
+       homepage = "https://github.com/shmish111/ws-chans";
+       description = "Unagi chan based websocket client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wsdl" = callPackage
     ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed
      , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types
@@ -194234,6 +196607,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_4" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.4";
+       sha256 = "75361b9f91752c050b271d6362a2f586d394e1d7d7f6a8d27d53bfb2945dfd5b";
+       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 {
@@ -194291,11 +196680,18 @@ self: {
      }) {};
 
   "wxc" = callPackage
-    ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }:
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , libX11, mesa, process, split, wxdirect, wxGTK
+     }:
      mkDerivation {
        pname = "wxc";
        version = "0.92.2.0";
        sha256 = "e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191";
+       revision = "1";
+       editedCabalFile = "8ebef4ae5773d0abcb5777dd1f8b9fbf978b6c7ed8b1d88bbcb25594db0c79c2";
+       setupHaskellDepends = [
+         base bytestring Cabal directory filepath process split
+       ];
        libraryHaskellDepends = [ base split wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
@@ -194336,6 +196732,8 @@ self: {
        pname = "wxdirect";
        version = "0.92.2.0";
        sha256 = "2303834061c544f7e32ffd7aaf91e644ee89e178487689f109f06625f0eefd3b";
+       revision = "1";
+       editedCabalFile = "72b1487d63c458854733436e6938a76b709cb5392f155dad8ece7aafb73979a7";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -195121,6 +197519,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xlsx_0_5_0" = 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.5.0";
+       sha256 = "2a58417a65696da106a70f135e028b6af39cc7f504d382c9f352d52b3e2cb672";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-tabular" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
@@ -196942,6 +199369,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yarn-lock" = callPackage
+    ({ mkDerivation, base, containers, megaparsec, protolude, text }:
+     mkDerivation {
+       pname = "yarn-lock";
+       version = "0.1.0";
+       sha256 = "e7a92421d7641e0741a05bdcd9632ac7b110e95802fc87a6b1ae03c1e83a4b3d";
+       libraryHaskellDepends = [
+         base containers megaparsec protolude text
+       ];
+       homepage = "https://github.com/Profpatsch/yaml-lock#readme";
+       description = "Represent and parse yarn.lock files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yarr" = callPackage
     ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim
      , missing-foreign, primitive, template-haskell
@@ -197174,6 +199615,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-articles" = callPackage
+    ({ mkDerivation, base, blaze-html, dates, directory, filepath
+     , hspec, regex-compat, shakespeare, template-haskell, text
+     , th-lift-instances, yesod, yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-articles";
+       version = "0.1.0.0";
+       sha256 = "0b2cd01a7cb488ff59a97a5e011e9d4067f48104b10207052659ac845fa8a5ca";
+       libraryHaskellDepends = [
+         base blaze-html dates directory filepath regex-compat shakespeare
+         template-haskell text th-lift-instances yesod yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-html dates directory filepath hspec regex-compat
+         shakespeare template-haskell text th-lift-instances yesod
+         yesod-core yesod-test
+       ];
+       homepage = "https://github.com/matthew-eads/yesod-articles";
+       description = "Automatically generate article previews for a yesod site";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-auth" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
@@ -197189,6 +199653,8 @@ self: {
        pname = "yesod-auth";
        version = "1.4.17";
        sha256 = "444a9b4b913e5f7addb1b9c5aa778f32d2b9e040d9b1c4d8a232fae908392891";
+       revision = "1";
+       editedCabalFile = "d9c7b733c2bd8557bb5994a0320b125d129b30f716841be42f670ad65e2c73ac";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -197317,14 +199783,14 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-fb";
-       version = "1.7";
-       sha256 = "02c041d0f58c630a2b2f4b3e810722fe71aca60c729770fd47324a9dd4dce4ce";
+       version = "1.8.0";
+       sha256 = "96d4aa8b901becac64eeb92593fe0531b76df1376cef5f2e3f1e2484dbb96588";
        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/prowdsponsor/yesod-auth-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;
@@ -197357,6 +199823,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-auth-hashdb_1_6_1" = callPackage
+    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+     , hspec, http-conduit, http-types, monad-logger, network-uri
+     , persistent, persistent-sqlite, pwstore-fast, resourcet, text
+     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hashdb";
+       version = "1.6.1";
+       sha256 = "694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8";
+       libraryHaskellDepends = [
+         aeson base bytestring persistent pwstore-fast 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-kerberos" = callPackage
     ({ mkDerivation, authenticate-kerberos, base, bytestring
      , shakespeare, text, transformers, yesod-auth, yesod-core
@@ -197687,10 +200180,10 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.32";
-       sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869";
+       version = "1.4.33";
+       sha256 = "abe26a1c5bd32e59ecc4ef84b4dad25b09ff6876f1d34249e9baff4bab5f63de";
        revision = "1";
-       editedCabalFile = "570c6168c84e518cc4978bfbbfd7a2cc23a04879937f66a8729eb592a9492af8";
+       editedCabalFile = "1bc830932296c48d528866b45239245ea5ed955a83c065c2b91a9cbc6664dd67";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -197921,13 +200414,13 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-fb";
-       version = "0.3.4";
-       sha256 = "b7e631a440037b7b077d1bcc5d859006cf5e7420923d93dfe26a07e1d3ad9e25";
+       version = "0.4.0";
+       sha256 = "95dd01bf20fc5eed60960106621d5f8212bdab985a6e92b05f51fabf7f267310";
        libraryHaskellDepends = [
          aeson base bytestring conduit crypto-api fb http-conduit text wai
          yesod-core
        ];
-       homepage = "https://github.com/prowdsponsor/yesod-fb";
+       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;
@@ -198270,6 +200763,8 @@ self: {
        pname = "yesod-persistent";
        version = "1.4.2";
        sha256 = "d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056";
+       revision = "1";
+       editedCabalFile = "4e3bd12304f5c0e111330eb9f8d1700e83d0a314463eaaebd84308bcf06041a9";
        libraryHaskellDepends = [
          base blaze-builder conduit persistent persistent-template
          resource-pool resourcet transformers yesod-core
@@ -199542,6 +202037,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yoga" = callPackage
+    ({ mkDerivation, base, bindings-DSL, ieee754 }:
+     mkDerivation {
+       pname = "yoga";
+       version = "0.0.0.1";
+       sha256 = "7b2191d2ccb7ec550496457156b74341439a214f2ed4444b3d079a468974942a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bindings-DSL ieee754 ];
+       description = "Bindings to Facebook's Yoga layout library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yoko" = callPackage
     ({ mkDerivation, base, bifunctors, containers, invariant, kinds
      , mtl, records, semigroups, template-haskell, th-sccs, type-cereal
@@ -200159,31 +202667,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, exceptions
-     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "0.1.9";
-       sha256 = "82dd97404ff2dde034b6786838ee51a5102da31c20835d61fef3bdfe69279860";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest exceptions filepath mtl path
-         path-io plan-b resourcet text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions filepath hspec path
-         path-io QuickCheck text time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/zip";
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "zip_0_1_10" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, exceptions
      , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
@@ -200205,7 +202688,7 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "zip-archive" = callPackage

From 87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Apr 2017 10:02:36 +0200
Subject: [PATCH 1308/1744] haskell-dbus: drop semicolons.patch; this change
 appears to have been included upstream

---
 .../haskell-modules/configuration-common.nix  |  4 ---
 .../patches/hdbus-semicolons.patch            | 34 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/hdbus-semicolons.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 06e1078a305..17c0601e032 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -768,10 +768,6 @@ self: super: {
   # horribly outdated (X11 interface changed a lot)
   sindre = markBroken super.sindre;
 
-  # https://github.com/jmillikin/haskell-dbus/pull/7
-  # http://hydra.cryp.to/build/498404/log/raw
-  dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch);
-
   # Test suite occasionally runs for 1+ days on Hydra.
   distributed-process-tests = dontCheck super.distributed-process-tests;
 
diff --git a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
deleted file mode 100644
index dc7ece8f3e8..00000000000
--- a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Sat, 5 Nov 2016 14:27:04 +0300
-Subject: [PATCH] getSessionAddress: take first bus address from
- semicolon-separated variable
-
----
- lib/DBus/Address.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs
-index 72ac99d..596b18c 100644
---- a/lib/DBus/Address.hs
-+++ b/lib/DBus/Address.hs
-@@ -18,6 +18,7 @@ module DBus.Address where
- import qualified Control.Exception
- import           Data.Char (digitToInt, ord, chr)
- import           Data.List (intercalate)
-+import           Data.Maybe (listToMaybe)
- import qualified Data.Map
- import           Data.Map (Map)
- import qualified System.Environment
-@@ -152,7 +153,7 @@ getSystemAddress = do
- getSessionAddress :: IO (Maybe Address)
- getSessionAddress = do
- 	env <- getenv "DBUS_SESSION_BUS_ADDRESS"
--	return (env >>= parseAddress)
-+	return $ maybe Nothing listToMaybe (env >>= parseAddresses)
- 
- -- | Returns the address in the environment variable
- -- @DBUS_STARTER_ADDRESS@, which must be set.
--- 
-2.10.1
-

From 9a7ba4e7a92ef9c992eb7f1a566682f9f1ddb1c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 09:47:38 +0200
Subject: [PATCH 1309/1744] haskell-stack: fix build by passing an old version
 of "store"

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 17c0601e032..9d689d5394a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -686,8 +686,12 @@ self: super: {
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
     else super.gtk;
 
-  # https://github.com/commercialhaskell/stack/issues/3001
-  stack = doJailbreak super.stack;
+  # The stack people don't bother making their own code compile in an LTS-based
+  # environment: https://github.com/commercialhaskell/stack/issues/3001.
+  stack = super.stack.overrideScope (self: super: {
+    store-core = self.store-core_0_3;
+    store = self.store_0_3_1;
+  });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };

From 6e50b4532ca312322b9bff57c3687d33acd2f2e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 10:05:54 +0200
Subject: [PATCH 1310/1744] halvm: mark build as broken

The build relies on /usr/bin/env, which does not exist in chroot build
environments: http://hydra.nixos.org/build/51814615.

Ping: @dmjio
---
 pkgs/development/compilers/halvm/2.4.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index c42ca4edb4a..740752e1584 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
     inherit (bootPkgs.ghc.meta) license platforms;
+    broken = true;  # http://hydra.nixos.org/build/51814615
   };
 }

From 5f33eb493f4a748717fee8e8b787b4ae94d48947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 12 Apr 2017 19:28:06 +0200
Subject: [PATCH 1311/1744] haskell-packages: factor package set construction
 in new file

Closes https://github.com/NixOS/nixpkgs/pull/24850.
---
 pkgs/development/haskell-modules/default.nix  | 102 +----------------
 pkgs/development/haskell-modules/lib.nix      |   1 +
 .../haskell-modules/make-package-set.nix      | 107 ++++++++++++++++++
 3 files changed, 114 insertions(+), 96 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/make-package-set.nix

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 694556123ab..8090732ddee 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,103 +6,13 @@
 
 let
 
-  inherit (stdenv.lib) fix' extends makeOverridable makeExtensible;
-  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
+  inherit (stdenv.lib) extends makeExtensible;
+  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet;
 
-  haskellPackages = self:
-    let
-
-      mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
-        inherit stdenv;
-        inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
-        nodejs = pkgs.nodejs-slim;
-        jailbreak-cabal = if (self.ghc.cross or null) != null
-          then self.ghc.bootPkgs.jailbreak-cabal
-          else self.jailbreak-cabal;
-        inherit (self) ghc;
-        hscolour = overrideCabal self.hscolour (drv: {
-          isLibrary = false;
-          doHaddock = false;
-          hyperlinkSource = false;      # Avoid depending on hscolour for this build.
-          postFixup = "rm -rf $out/lib $out/share $out/nix-support";
-        });
-        cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
-          mkDerivation = drv: super.mkDerivation (drv // {
-            enableSharedExecutables = false;
-            enableSharedLibraries = false;
-            doHaddock = false;
-            useCpphs = false;
-          });
-        })) (drv: {
-            isLibrary = false;
-            postFixup = "rm -rf $out/lib $out/share $out/nix-support";
-        });
-      };
-
-      mkDerivation = makeOverridable mkDerivationImpl;
-
-      callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-        overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
-      };
-
-      mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
-      defaultScope = mkScope self;
-      callPackage = drv: args: callPackageWithScope defaultScope drv args;
-
-      withPackages = packages: callPackage ./with-packages-wrapper.nix {
-        inherit (self) llvmPackages;
-        haskellPackages = self;
-        inherit packages;
-      };
-
-      haskellSrc2nix = { name, src, sha256 ? null }:
-        let
-          sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
-        in pkgs.stdenv.mkDerivation {
-          name = "cabal2nix-${name}";
-          buildInputs = [ pkgs.cabal2nix ];
-          phases = ["installPhase"];
-          LANG = "en_US.UTF-8";
-          LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
-          installPhase = ''
-            export HOME="$TMP"
-            mkdir -p "$out"
-            cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
-          '';
-      };
-
-      hackage2nix = name: version: haskellSrc2nix {
-        name   = "${name}-${version}";
-        sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
-        src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
-      };
-
-    in
-      import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
-
-        inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
-
-        callHackage = name: version: self.callPackage (self.hackage2nix name version);
-
-        # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
-
-        ghcWithPackages = selectFrom: withPackages (selectFrom self);
-
-        ghcWithHoogle = selectFrom:
-          let
-            packages = selectFrom self;
-            hoogle = callPackage ./hoogle.nix {
-              inherit packages;
-            };
-          in withPackages (packages ++ [ hoogle ]);
-
-        ghc = ghc // {
-          withPackages = self.ghcWithPackages;
-          withHoogle = self.ghcWithHoogle;
-        };
-
-      };
+  haskellPackages = makePackageSet {
+    package-set = import ./hackage-packages.nix;
+    inherit ghc;
+  };
 
   commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
   nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 0aed2211448..6c718bafda5 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -1,6 +1,7 @@
 { pkgs }:
 
 rec {
+  makePackageSet = pkgs.callPackage ./make-package-set.nix {};
 
   overrideCabal = drv: f: (drv.override (args: args // {
     mkDerivation = drv: (args.mkDerivation drv).override f;
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
new file mode 100644
index 00000000000..29b294619e6
--- /dev/null
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -0,0 +1,107 @@
+# This expression takes a file like `hackage-packages.nix` and constructs
+# a full package set out of that.
+
+# required dependencies:
+{ pkgs, stdenv, all-cabal-hashes }:
+
+# arguments:
+#  * ghc package to use
+#  * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second
+{ ghc, package-set }:
+
+# return value: a function from self to the package set
+self: let
+
+  inherit (stdenv.lib) fix' extends makeOverridable;
+  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
+
+  mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
+    inherit stdenv;
+    inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
+    nodejs = pkgs.nodejs-slim;
+    jailbreak-cabal = if (self.ghc.cross or null) != null
+      then self.ghc.bootPkgs.jailbreak-cabal
+      else self.jailbreak-cabal;
+    inherit (self) ghc;
+    hscolour = overrideCabal self.hscolour (drv: {
+      isLibrary = false;
+      doHaddock = false;
+      hyperlinkSource = false;      # Avoid depending on hscolour for this build.
+      postFixup = "rm -rf $out/lib $out/share $out/nix-support";
+    });
+    cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
+      mkDerivation = drv: super.mkDerivation (drv // {
+        enableSharedExecutables = false;
+        enableSharedLibraries = false;
+        doHaddock = false;
+        useCpphs = false;
+      });
+    })) (drv: {
+        isLibrary = false;
+        postFixup = "rm -rf $out/lib $out/share $out/nix-support";
+    });
+  };
+
+  mkDerivation = makeOverridable mkDerivationImpl;
+
+  callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
+    overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
+  };
+
+  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
+  defaultScope = mkScope self;
+  callPackage = drv: args: callPackageWithScope defaultScope drv args;
+
+  withPackages = packages: callPackage ./with-packages-wrapper.nix {
+    inherit (self) llvmPackages;
+    haskellPackages = self;
+    inherit packages;
+  };
+
+  haskellSrc2nix = { name, src, sha256 ? null }:
+    let
+      sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
+    in pkgs.stdenv.mkDerivation {
+      name = "cabal2nix-${name}";
+      buildInputs = [ pkgs.cabal2nix ];
+      phases = ["installPhase"];
+      LANG = "en_US.UTF-8";
+      LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+      installPhase = ''
+        export HOME="$TMP"
+        mkdir -p "$out"
+        cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+      '';
+  };
+
+  hackage2nix = name: version: haskellSrc2nix {
+    name   = "${name}-${version}";
+    sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
+    src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
+  };
+
+in package-set { inherit pkgs stdenv callPackage; } self // {
+
+    inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
+
+    callHackage = name: version: self.callPackage (self.hackage2nix name version);
+
+    # Creates a Haskell package from a source package by calling cabal2nix on the source.
+    callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
+
+    ghcWithPackages = selectFrom: withPackages (selectFrom self);
+
+    ghcWithHoogle = selectFrom:
+      let
+        packages = selectFrom self;
+        hoogle = callPackage ./hoogle.nix {
+          inherit packages;
+        };
+      in withPackages (packages ++ [ hoogle ]);
+
+    ghc = ghc // {
+      withPackages = self.ghcWithPackages;
+      withHoogle = self.ghcWithHoogle;
+    };
+
+  }

From f4ed1f98d1d3b7ebac460b8bca623ec964012baf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 15:55:56 +0200
Subject: [PATCH 1312/1744] haskell-gtksourceview: clean up overrides for
 versions 2 and 3 of the package

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f03fc73387f..b9e96886ac5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -126,8 +126,7 @@ self: super: builtins.intersectAttrs super {
   glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
   gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
   gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
-  gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
-  gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
+  gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
 
   # Need WebkitGTK, not just webkit.
   webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };

From 25a1ef369b4149e06ffff2158748891354011f65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 16:11:27 +0200
Subject: [PATCH 1313/1744] haskell-hsdns: fix build with GHC 7.0.x and 7.2.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index ca271e6c271..58a3002b035 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -62,6 +62,7 @@ self: super: {
 
   # Setup: Can't find transitive deps for haddock
   doctest = dontHaddock super.doctest;
+  hsdns = dontHaddock super.hsdns;
 
   # Needs hashable on pre 7.10.x compilers.
   nats_1 = addBuildDepend super.nats_1 self.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 18ebe5c8e1a..b3f78e5b753 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -63,6 +63,7 @@ self: super: {
 
   # Setup: Can't find transitive deps for haddock
   doctest = dontHaddock super.doctest;
+  hsdns = dontHaddock super.hsdns;
 
   # Needs hashable on pre 7.10.x compilers.
   nats_1 = addBuildDepend super.nats_1 self.hashable;

From 7462c7d2f75fc5a653bae86f0d5c7322136a6383 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 16:13:42 +0200
Subject: [PATCH 1314/1744] haskell-utf8-string: fix build with GHC HEAD

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index f093c0e427e..2707fb69fa9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -53,7 +53,7 @@ self: super: {
     postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
   });
   utf8-string = overrideCabal super.utf8-string (drv: {
-    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 4.3 && < 4.10|base|' utf8-string.cabal";
   });
 
   # bos/attoparsec#92

From 4c0098f1dc65bc664be941fb4290274eba703483 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 16:16:41 +0200
Subject: [PATCH 1315/1744] haskell-old-time: fix build with GHC HEAD

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 2707fb69fa9..6a9d15d402e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -87,6 +87,7 @@ self: super: {
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
   # A bunch of jailbreaks due to 'base' bump
+  old-time = doJailbreak super.old-time;
   old-locale = doJailbreak super.old-locale;
   primitive = doJailbreak super.primitive;
   test-framework = doJailbreak super.test-framework;

From 95d9b582f1b82312c0309452ba819b9dc8fa8330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Apr 2017 16:24:55 +0200
Subject: [PATCH 1316/1744] dino: disable parallel build

attempt to fix hydra build: https://hydra.nixos.org/build/51816616/nixlog/1
---
 .../applications/networking/instant-messengers/dino/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 750cf504c60..7ea19f35fe7 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -52,8 +52,6 @@ stdenv.mkDerivation rec {
     gettext
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Modern Jabber/XMPP Client using GTK+/Vala";
     homepage = https://github.com/dino/dino;

From fa8adf2c47accaefdb21f4703caa660393a9eaf8 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Fri, 21 Apr 2017 16:41:09 +0200
Subject: [PATCH 1317/1744] fetchurl: fixed typo in error message

This typo was likely introduced by copy-pasting the error message from elsewhere and forgetting to change the text, during the MD5 deprecation process (#4491).
---
 pkgs/build-support/fetchurl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 1e872fbc57a..fea06e22ab4 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -92,7 +92,7 @@ let
 
 in
 
-if md5 != "" then throw "fetchsvnssh does not support md5 anymore, please use sha256 or sha512"
+if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
 else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}"
 else stdenv.mkDerivation {
   name =

From 5864baa4c6306b1922dc3ca88db1813d5136dadf Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Thu, 20 Apr 2017 14:31:37 -0400
Subject: [PATCH 1318/1744] mapnik: add optional PostgreSQL dependency

Closes #25063.
---
 pkgs/development/libraries/mapnik/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 661e1270e7f..4bd89df1581 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python2, scons, sqlite, zlib
+
+# supply a postgresql package to enable the PostGIS input plugin
+, postgresql ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -21,6 +24,9 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
       libwebp libxml2 proj python2 sqlite zlib
+
+      # optional inputs
+      postgresql
     ];
 
   configurePhase = ''

From 6695c95ebd8034cbf5ffb5136c0949caf999d09c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 21 Apr 2017 22:58:43 +0800
Subject: [PATCH 1319/1744] unifi: 5.4.11 -> 5.4.14

---
 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 8a411f0c1a5..a11618d24f5 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.4.11";
+  version = "5.4.14";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip";
-    sha256 = "18hd0w1zif6x9yxmfpwm7vbd07n705lf36yhg3z8fy04an6njgv2";
+    sha256 = "16scryd8g0dsswawwadxxqsirir6mn0jaawv3qcszqj52vlz878w";
   };
 
   buildInputs = [ unzip ];

From b1c814ad7b57895050d0cb6b49b28c3f93df7dd6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 21 Apr 2017 18:36:21 +0200
Subject: [PATCH 1320/1744] coyim: init at 0.3.7_1

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

diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
new file mode 100644
index 00000000000..f0ca2e0bfbe
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
+  cairo, gdk_pixbuf, glib, gnome3 }:
+
+buildGoPackage rec {
+  name = "coyim-${version}";
+  version = "v0.3.7_1";
+
+  goPackagePath = "github.com/twstrike/coyim";
+
+  src = fetchFromGitHub {
+    owner = "twstrike";
+    repo = "coyim";
+    rev = "df2c52fe865d38fa27e8a7af1d87612e8c048805";
+    sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
+  };
+
+  nativeBuildInputs = [ pkgconfig glib cairo gdk_pixbuf gnome3.gtk ];
+
+  meta = {
+    description = "a safe and secure chat client";
+    homepage = https://coy.im/;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 353cbc4e375..6a20d25b67e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13198,6 +13198,8 @@ with pkgs;
 
   convchain = callPackage ../tools/graphics/convchain {};
 
+  coyim = callPackage ../applications/networking/instant-messengers/coyim {};
+
   cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
 
   csdp = callPackage ../applications/science/math/csdp {

From 1141264c3a4a82d6f025a2903a302ae312e7732b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 21 Apr 2017 14:49:28 -0300
Subject: [PATCH 1321/1744] efl: 1.18.4 -> 1.19.0

---
 pkgs/desktops/enlightenment/efl.nix | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 45e547f4a22..ac64eb5c738 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.18.4";
+  version = "1.19.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr";
+    sha256 = "1pza8lacqh3bgsvcm4h2hyc577bvnzix932g87dhg03ph4839q54";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -24,16 +24,30 @@ stdenv.mkDerivation rec {
     libinput ];
 
   # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
-  configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full"
-    "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd"
-    "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
-    "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
-    "ac_ct_CXX=foo" ];
+  configureFlags = [
+    "--enable-sdl"
+    "--enable-drm"
+    "--enable-elput"
+    "--with-opengl=full"
+    "--enable-image-loader-jp2k"
+    "--enable-xinput22"
+    "--enable-multisense"
+    "--enable-liblz4"
+    "--enable-systemd"
+    "--enable-image-loader-webp"
+    "--enable-harfbuzz"
+    "--enable-xine"
+    "--enable-fb"
+    "--disable-tslib"
+    "--with-systemdunitdir=$out/systemd/user"
+    "ac_ct_CXX=foo"
+  ];
 
   patches = [ ./efl-elua.patch ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
+    export HOME="$TEMPDIR"
   '';
 
   postInstall = ''
@@ -48,8 +62,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Enlightenment foundation libraries";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl3;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
   };
 }

From d03ee9df41c0e51049411d9d8d98f6f4f03d76dd Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 21 Apr 2017 15:16:39 -0300
Subject: [PATCH 1322/1744] pythonefl: 1.18.0 -> 1.19.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5bde08d5c12..49c8394b564 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29223,10 +29223,10 @@ EOF
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.18.0";
+    version = "1.19.0";
     src = pkgs.fetchurl {
       url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
-      sha256 = "0p92xsw7sh7965mb097lxy98va5xsrkxdqqaq11fhkpwqccy2l8p";
+      sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads";
     };
 
     preConfigure = ''
@@ -29241,9 +29241,9 @@ EOF
     meta = {
       description = "Python bindings for EFL and Elementary";
       homepage = http://enlightenment.org/;
-      maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
       platforms = platforms.linux;
       license = licenses.gpl3;
+      maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
     };
   };
 

From 34f492d7d83504453e64656d6f3d30bd6c263d1a Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 21 Apr 2017 16:44:46 +0200
Subject: [PATCH 1323/1744] kdeFrameworks: 5.32.0 -> 5.33.0

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 2 files changed, 297 insertions(+), 297 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 7343b408dff..361426d1de6 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4b902d4d57e..ebcc4fc7c38 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
-      sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
-      name = "attica-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/attica-5.33.0.tar.xz";
+      sha256 = "1dr5yhg0cy4b6k91mk6w090zjizgxaa808h799m14jqzgj63z5d6";
+      name = "attica-5.33.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
-      sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
-      name = "baloo-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/baloo-5.33.0.tar.xz";
+      sha256 = "174my99i5mggab98l38y2bk27xp25mpz58rl8rhnb3wsbgxcx7iz";
+      name = "baloo-5.33.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
-      sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
-      name = "bluez-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/bluez-qt-5.33.0.tar.xz";
+      sha256 = "0cpkdv4k68f0rcg3j91418i59dmc94qlnv3xk1chq0fdi0cssrri";
+      name = "bluez-qt-5.33.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
-      sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
-      name = "breeze-icons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/breeze-icons-5.33.0.tar.xz";
+      sha256 = "07nb4xq00fw50r4vf10npa2z690rwkmlxdy42lxx3ixci4qw4204";
+      name = "breeze-icons-5.33.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz";
-      sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i";
-      name = "extra-cmake-modules-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/extra-cmake-modules-5.33.0.tar.xz";
+      sha256 = "013adgrz8s0w7a7z2ahkv28cq4c2cy00cw6y8akpkxazqhv5xzzk";
+      name = "extra-cmake-modules-5.33.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
-      sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
-      name = "frameworkintegration-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/frameworkintegration-5.33.0.tar.xz";
+      sha256 = "01c1jq77hm3v5xi84gn5hymlnnn1igcpz9v49yxgyvnihlblb1ll";
+      name = "frameworkintegration-5.33.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
-      sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
-      name = "kactivities-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kactivities-5.33.0.tar.xz";
+      sha256 = "092gk0zn15qm4pihxf1h4qn2n618wp43k67ffy3saw4fadqmxpsz";
+      name = "kactivities-5.33.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
-      sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
-      name = "kactivities-stats-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kactivities-stats-5.33.0.tar.xz";
+      sha256 = "1269nh4l94b3yxyvzdjw6vb8pxjylrvnrv28vnar8dmx0sbh5jpf";
+      name = "kactivities-stats-5.33.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
-      sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
-      name = "kapidox-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kapidox-5.33.0.tar.xz";
+      sha256 = "162x868dwl92361ss1dxv0gqh8g4apshcgb1ww4nizy239mfj8h0";
+      name = "kapidox-5.33.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
-      sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
-      name = "karchive-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/karchive-5.33.0.tar.xz";
+      sha256 = "0i5grm0dhm9z6fd63ppykd6vl45k5nam4q8w1psrz7vjmr6sd924";
+      name = "karchive-5.33.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
-      sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
-      name = "kauth-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kauth-5.33.0.tar.xz";
+      sha256 = "1lfi4w4jgc9m83q6v3jf8p91x12vvcc3g59dlg7dh2agrh07r9y7";
+      name = "kauth-5.33.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
-      sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
-      name = "kbookmarks-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kbookmarks-5.33.0.tar.xz";
+      sha256 = "186difbzrpqlbi140ylkzb50d3fmn2pdz8i0r3gbc71726fqld82";
+      name = "kbookmarks-5.33.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
-      sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
-      name = "kcmutils-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcmutils-5.33.0.tar.xz";
+      sha256 = "0n0cmjxlp0kkgrxng2ympnl1v5a1bjr2d9c20hf31xhvmya3y9nd";
+      name = "kcmutils-5.33.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
-      sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
-      name = "kcodecs-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcodecs-5.33.0.tar.xz";
+      sha256 = "1pdijdlrl9p5w6dixqx0lmkzwsk5xarzjhpwh616j2sinfra0w31";
+      name = "kcodecs-5.33.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
-      sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
-      name = "kcompletion-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcompletion-5.33.0.tar.xz";
+      sha256 = "13mv5mm90jv4k56h4n6d7r2a0pax2mhdrm51xd99fjynad129lhi";
+      name = "kcompletion-5.33.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
-      sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
-      name = "kconfig-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kconfig-5.33.0.tar.xz";
+      sha256 = "1inhpil19pv3jjf7mz4f5g367n1ciiixndij10p1zxk5zy46zzmf";
+      name = "kconfig-5.33.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
-      sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
-      name = "kconfigwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kconfigwidgets-5.33.0.tar.xz";
+      sha256 = "0sd974r7xrpnhyqabgix0zb1rlis32ijj0wiabbqi4ns0nhhi3qf";
+      name = "kconfigwidgets-5.33.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
-      sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
-      name = "kcoreaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcoreaddons-5.33.0.tar.xz";
+      sha256 = "1906jscfc2kpd22d7yk88ziy3ky3hcfxy5y593pfzjl41gyhsiyl";
+      name = "kcoreaddons-5.33.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
-      sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
-      name = "kcrash-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcrash-5.33.0.tar.xz";
+      sha256 = "136wlvaf4r54k8x0z0jvs7l35m0v22y6zqkhc8f91dr1y2ym2jnk";
+      name = "kcrash-5.33.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
-      sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
-      name = "kdbusaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdbusaddons-5.33.0.tar.xz";
+      sha256 = "1xxbmr88w7hqxsrhjbgic0pn4adkydhv9xd77vwbzjj47123mph2";
+      name = "kdbusaddons-5.33.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
-      sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
-      name = "kdeclarative-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdeclarative-5.33.0.tar.xz";
+      sha256 = "1333vv6kbdk4sdkkc8lnncgmm3203ca8ybn9nj6ch3zqwyxcaagk";
+      name = "kdeclarative-5.33.0.tar.xz";
     };
   };
   kded = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
-      sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
-      name = "kded-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kded-5.33.0.tar.xz";
+      sha256 = "02g66ip0d0cwb8grb6f3z1j7178w76pfs2f8d2dl1rax4hnjppd0";
+      name = "kded-5.33.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
-      sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
-      name = "kdelibs4support-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kdelibs4support-5.33.0.tar.xz";
+      sha256 = "1gyyvp4kqnjaf764y2z24jk68h5h0ax1z9h25msczy6bd4ify5v9";
+      name = "kdelibs4support-5.33.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
-      sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
-      name = "kdesignerplugin-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdesignerplugin-5.33.0.tar.xz";
+      sha256 = "1f4f53xag6xbvacpn5j0zrsdwimksnckdza6kswcri5q258yb6ks";
+      name = "kdesignerplugin-5.33.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
-      sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
-      name = "kdesu-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdesu-5.33.0.tar.xz";
+      sha256 = "06scns6jgs372xx7fssdj63110nrnvy9dmm1k7gc0pyhn0a5yk8a";
+      name = "kdesu-5.33.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
-      sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
-      name = "kdewebkit-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdewebkit-5.33.0.tar.xz";
+      sha256 = "0lxca56ib5pldc6f3z2gw05jbi2kyd9rqp52pgzfs4kgvvs6gblh";
+      name = "kdewebkit-5.33.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
-      sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
-      name = "kdnssd-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdnssd-5.33.0.tar.xz";
+      sha256 = "11pnh18z030zzkiibvd9lfp5i194qwk3pccncc9968nnc0bgghxa";
+      name = "kdnssd-5.33.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
-      sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
-      name = "kdoctools-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdoctools-5.33.0.tar.xz";
+      sha256 = "04d48gi5d273x3p7572szlpyiz8iyw1ic53b9jblhyfyp93gvpb9";
+      name = "kdoctools-5.33.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
-      sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
-      name = "kemoticons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kemoticons-5.33.0.tar.xz";
+      sha256 = "0p9320zln553wi055ql04j8kk329l3wiksprg9rkgzya2gynflyl";
+      name = "kemoticons-5.33.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
-      sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
-      name = "kfilemetadata-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kfilemetadata-5.33.0.tar.xz";
+      sha256 = "1bbw1h8kml8glnck8hh4s13abbksw2fa7g93p25vbhdcyr7zgkr0";
+      name = "kfilemetadata-5.33.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
-      sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
-      name = "kglobalaccel-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kglobalaccel-5.33.0.tar.xz";
+      sha256 = "0hc46vwiz81iqzkrc0qahd7gn71kh5wc32kjvh6h4ijlnfmdih07";
+      name = "kglobalaccel-5.33.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
-      sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
-      name = "kguiaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kguiaddons-5.33.0.tar.xz";
+      sha256 = "171lvykvznrrqdi1frm9akzx5rsrj04vvav3sv64x7hfsas0a7p1";
+      name = "kguiaddons-5.33.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
-      sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
-      name = "khtml-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/khtml-5.33.0.tar.xz";
+      sha256 = "0j9viw8fydh1x548wx39bphk5bf11fyrghshxz14a79rll8w7qmc";
+      name = "khtml-5.33.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
-      sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
-      name = "ki18n-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ki18n-5.33.0.tar.xz";
+      sha256 = "02xf9q3vnw8nn2if6a3pfj8v96414j7gnc6097k0wxfyis9i46k1";
+      name = "ki18n-5.33.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
-      sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
-      name = "kiconthemes-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kiconthemes-5.33.0.tar.xz";
+      sha256 = "1zys55d7jjjjllyi9p4difnr6xg9580bgcg5pnm966ak6zhj6682";
+      name = "kiconthemes-5.33.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
-      sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
-      name = "kidletime-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kidletime-5.33.0.tar.xz";
+      sha256 = "0z6i224kmj9l15x923pa30mlhjw66chm9v8qvzg1vhmk36jyw789";
+      name = "kidletime-5.33.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
-      sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
-      name = "kimageformats-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kimageformats-5.33.0.tar.xz";
+      sha256 = "1m9d51pvrc7fa38mp4jn4cdn558nd6kvik3ry6gvv8im67qyq4ga";
+      name = "kimageformats-5.33.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
-      sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
-      name = "kinit-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kinit-5.33.0.tar.xz";
+      sha256 = "0v3dcgbi5qwg9nmn668r2v1b257qhmkdb2l3p7hhx06ygypk4yjp";
+      name = "kinit-5.33.0.tar.xz";
     };
   };
   kio = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
-      sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
-      name = "kio-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kio-5.33.0.tar.xz";
+      sha256 = "1pls5yjkhz7fkawks4c0lmsix0nafv7hyp33yh7dm4hijd8zy5cf";
+      name = "kio-5.33.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
-      sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
-      name = "kitemmodels-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kitemmodels-5.33.0.tar.xz";
+      sha256 = "1ma21qydbmj2qr4ib4qv13wip99lq3lm8d6p137bg9x6nqfa4qzn";
+      name = "kitemmodels-5.33.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
-      sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
-      name = "kitemviews-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kitemviews-5.33.0.tar.xz";
+      sha256 = "1nc07lxh37l1fwz6xmsrcplimgmrna9ij2dq3pnfrxr319c29890";
+      name = "kitemviews-5.33.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
-      sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
-      name = "kjobwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kjobwidgets-5.33.0.tar.xz";
+      sha256 = "01adg7axi1bp59z1c7xnxg2p1ahhrzxwxrjn3ci805m8ns6d40cz";
+      name = "kjobwidgets-5.33.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
-      sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
-      name = "kjs-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kjs-5.33.0.tar.xz";
+      sha256 = "1w0kdxnzcwmgskl4qsw6aq5189yxqyhq9qajihr2yga0hyglf3iv";
+      name = "kjs-5.33.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
-      sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
-      name = "kjsembed-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kjsembed-5.33.0.tar.xz";
+      sha256 = "1vk2m8i315nrys9c4kk3hdlp8hdn2ils0lb8v4nnkvbj3s1f4a8p";
+      name = "kjsembed-5.33.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
-      sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
-      name = "kmediaplayer-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kmediaplayer-5.33.0.tar.xz";
+      sha256 = "13xpvi0vxd3vva2d64x8l1knj270al4329kwf9xaays66g6gshgs";
+      name = "kmediaplayer-5.33.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
-      sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
-      name = "knewstuff-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knewstuff-5.33.0.tar.xz";
+      sha256 = "1j4jj2k6jngcp98mfxq1cdp7x0j43rgr5gxn9viqp92liak68lsh";
+      name = "knewstuff-5.33.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
-      sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
-      name = "knotifications-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knotifications-5.33.0.tar.xz";
+      sha256 = "17ppfwhl3mqd3l4r56whqcxagx6br02hdwlqy7npn32g797hkayd";
+      name = "knotifications-5.33.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
-      sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
-      name = "knotifyconfig-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knotifyconfig-5.33.0.tar.xz";
+      sha256 = "0m9fdvbakv0plq3m7sj6wj980wfd3m37cabximz9gmi0zkcadzmw";
+      name = "knotifyconfig-5.33.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
-      sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
-      name = "kpackage-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpackage-5.33.0.tar.xz";
+      sha256 = "03ls567fj54fzibc8fafffas97abyanl0sn041z51sr7mjp425cs";
+      name = "kpackage-5.33.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
-      sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
-      name = "kparts-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kparts-5.33.0.tar.xz";
+      sha256 = "0fd0dqmaf8ksx3czzihjd4z0yg682a9bcy09vdhj2grki7w9fxha";
+      name = "kparts-5.33.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
-      sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
-      name = "kpeople-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpeople-5.33.0.tar.xz";
+      sha256 = "19vag6ci82jh5lw5c7734rlp89wr7xb0d8as98ykz2wmkk0mqql7";
+      name = "kpeople-5.33.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
-      sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
-      name = "kplotting-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kplotting-5.33.0.tar.xz";
+      sha256 = "0niqhj270l36il3ql6xljg9gbb0yw25ky8wsc7l0021mxvhficri";
+      name = "kplotting-5.33.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
-      sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
-      name = "kpty-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpty-5.33.0.tar.xz";
+      sha256 = "0xcmqdphqy2a44bksqiv8cjlzfkjpbpazfk5f8ml97vdqvwa6qp5";
+      name = "kpty-5.33.0.tar.xz";
     };
   };
   kross = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
-      sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
-      name = "kross-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kross-5.33.0.tar.xz";
+      sha256 = "13dldb4df4spsqr3878bimv009fzq4pdvmwlaw753c0lrp97pd9l";
+      name = "kross-5.33.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
-      sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
-      name = "krunner-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/krunner-5.33.0.tar.xz";
+      sha256 = "0za052rsqf5kaz1c48k63a905b3x953wi6f07m44m6dm38p5ixq8";
+      name = "krunner-5.33.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
-      sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
-      name = "kservice-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kservice-5.33.0.tar.xz";
+      sha256 = "0jqq4ahscnqvzv8inhfzb9s6x97s60c4w8chpg16qwc7dqag887h";
+      name = "kservice-5.33.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
-      sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
-      name = "ktexteditor-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ktexteditor-5.33.0.tar.xz";
+      sha256 = "12fcqcxamkxv38w4j9waqmim7k801v6r6izlyg59iiy56yks4ms5";
+      name = "ktexteditor-5.33.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
-      sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
-      name = "ktextwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ktextwidgets-5.33.0.tar.xz";
+      sha256 = "09rjr3655pbzwgjsmwbjsm7jwrxydl2jwhgbk8ziv1bgcg6cjrjy";
+      name = "ktextwidgets-5.33.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
-      sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
-      name = "kunitconversion-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kunitconversion-5.33.0.tar.xz";
+      sha256 = "0bflic2va9bc17q0smc4dzmgh72cjfjjaahhsvvnj54g2qggznkq";
+      name = "kunitconversion-5.33.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
-      sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
-      name = "kwallet-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwallet-5.33.0.tar.xz";
+      sha256 = "1jpybsksai9gm2bihcgl5m56rjfd0crj9i8j0l2s4vmmzxyflczj";
+      name = "kwallet-5.33.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
-      sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
-      name = "kwayland-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwayland-5.33.0.tar.xz";
+      sha256 = "18nvdhfijnvzjiy0vjmqvf2nwz64ymxpnhlhs75y1d2ib8rm8qfq";
+      name = "kwayland-5.33.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
-      sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
-      name = "kwidgetsaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwidgetsaddons-5.33.0.tar.xz";
+      sha256 = "1dnspi7zf57lsihdynbik2iwvnhv8098vqyz0rps8s8pnjl7x8k4";
+      name = "kwidgetsaddons-5.33.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
-      sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
-      name = "kwindowsystem-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwindowsystem-5.33.0.tar.xz";
+      sha256 = "1dj18774rlpxh9p8a07shhb4dzc0zpv4qvmh4j2y4c1g6v7n6b3p";
+      name = "kwindowsystem-5.33.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
-      sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
-      name = "kxmlgui-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kxmlgui-5.33.0.tar.xz";
+      sha256 = "1q89xsrdhrsz7jb68hq8r3xdmhz0s19zwvd06skn6cfqx7r32ng0";
+      name = "kxmlgui-5.33.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
-      sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
-      name = "kxmlrpcclient-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kxmlrpcclient-5.33.0.tar.xz";
+      sha256 = "1zc6pn412day923k22br82xypvk24znb0ns1qsdlmrd2cnmv8l28";
+      name = "kxmlrpcclient-5.33.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
-      sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
-      name = "modemmanager-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/modemmanager-qt-5.33.0.tar.xz";
+      sha256 = "098l3plck45bn7lph7mfkm03q18zxl1s8aa3pyh6b69wk45r7j54";
+      name = "modemmanager-qt-5.33.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
-      sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
-      name = "networkmanager-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/networkmanager-qt-5.33.0.tar.xz";
+      sha256 = "0pc4n4m93ypx1ryasw8n3bqll7v4yqa3749ir0qi096y5vysdd2m";
+      name = "networkmanager-qt-5.33.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
-      sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
-      name = "oxygen-icons5-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/oxygen-icons5-5.33.0.tar.xz";
+      sha256 = "17kp66hra0vfkcvd7fh5q23wr040h0z6di4gdrm2zi1w5jbhw9kn";
+      name = "oxygen-icons5-5.33.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
-      sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
-      name = "plasma-framework-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/plasma-framework-5.33.0.tar.xz";
+      sha256 = "0rqm773n2r6vwmv41x27lr2zmx26s5s27ym3a6qy0w18fr86fxsd";
+      name = "plasma-framework-5.33.0.tar.xz";
     };
   };
   prison = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
-      sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
-      name = "prison-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/prison-5.33.0.tar.xz";
+      sha256 = "0hh065294s7sjj34vfwwb8zgagf1sa09l9filadl1ly0ig9f6h1r";
+      name = "prison-5.33.0.tar.xz";
     };
   };
   solid = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
-      sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
-      name = "solid-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/solid-5.33.0.tar.xz";
+      sha256 = "0jb8jjv6mhwriqxfkd9fj0b7y1ab6vnwqi53sk4w4vw53d0wkqxm";
+      name = "solid-5.33.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
-      sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
-      name = "sonnet-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/sonnet-5.33.0.tar.xz";
+      sha256 = "096ybf95rx5ybvl74nlnn9x2yb2j1akn8g8ywv1vwi2ckfpnp3sd";
+      name = "sonnet-5.33.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
-      sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
-      name = "syntax-highlighting-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/syntax-highlighting-5.33.0.tar.xz";
+      sha256 = "0nn078sw0bkw1m5vsv02n46sc05blg3qnhxpmph2cikz5y86x9jq";
+      name = "syntax-highlighting-5.33.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
-      sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
-      name = "threadweaver-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/threadweaver-5.33.0.tar.xz";
+      sha256 = "16y7irjyyp4smy7nm7j4zc3gk9a046bwxvv51l7rfs7n4z0550ki";
+      name = "threadweaver-5.33.0.tar.xz";
     };
   };
 }

From d16a4512d053e9ad85e0625c988f20d2227c8645 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 21 Apr 2017 21:38:18 +0200
Subject: [PATCH 1324/1744] wine: 2.0 -> 2.0.1

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index c38756bc48a..85965645036 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "2.0";
-    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
-    sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp";
+    version = "2.0.1";
+    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz";
+    sha256 = "10qm0xxqzvl4y3mhvaxcaacrcs8d5kdz5wf0gbxpmp36wnm4xyvc";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From c6b3c66277ff97d77d51c3a822458f19982b922a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 21 Apr 2017 21:38:28 +0200
Subject: [PATCH 1325/1744] wineUnstable: 2.5 -> 2.6

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 85965645036..42d99a39eee 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,9 +31,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.5";
+    version = "2.6";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1lnc7dnhvm1ir1hrjmihx9r47bc8wr8rhlf6pfm3lcl3nix2py8k";
+    sha256 = "1h5ajw50fax2pg9p4wch6824zxdd85g2gh9nkbllfxj3ixsn9zz6";
     inherit (stable) mono gecko32 gecko64;
   };
 

From dbb06ea3d217d55fb304e3e69b60bae0fc1ce00a Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 21 Apr 2017 21:20:49 +0100
Subject: [PATCH 1326/1744] pythonPackages.typeguard: init at 2.3.1 (#25040)

---
 .../python-modules/typeguard/default.nix      | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/typeguard/default.nix

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
new file mode 100644
index 00000000000..c099aba5b7a
--- /dev/null
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage
+, fetchPypi
+, pythonOlder
+, stdenv
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "typeguard";
+  version = "2.1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l3pih5ca469v7if255h5rqymirsw46bi6s7p885jxhq1gv6cfpk";
+  };
+
+  buildInputs = [ setuptools_scm ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg --replace " --cov" ""
+  '';
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test .
+  '';
+
+  disabled = pythonOlder "3.3";
+
+  meta = with stdenv.lib; {
+    description = "This library provides run-time type checking for functions defined with argument type annotations";
+    homepage = "https://github.com/agronholm/typeguard";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5bde08d5c12..e2a615e7a0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23151,6 +23151,8 @@ in {
     };
   };
 
+  typeguard = callPackage ../development/python-modules/typeguard { };
+
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
     version = "0.13.7";
@@ -23178,7 +23180,6 @@ in {
   runsnakerun = buildPythonPackage rec {
     name = "runsnakerun-2.0.4";
 
-
     src = pkgs.fetchurl {
       url = "mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz";
       sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef";

From c4fecfb1ec2d2ed14ff8ad35001c12c07f24b819 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 21 Apr 2017 09:01:17 +0100
Subject: [PATCH 1327/1744] ecryptfs-helper: fix makeWrapper use after 7ff6eec5

---
 pkgs/tools/security/ecryptfs/helper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 05327ad3a09..40a728f6cb1 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp $src $out/libexec/ecryptfs-helper.py
-    makeWrapper "${python2.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
+    makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py"
   '';
 
   meta = with stdenv.lib; {

From bd78749d3387f84d4f70dada335df04479f8170c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 21 Apr 2017 23:23:38 +0200
Subject: [PATCH 1328/1744] rust: improve fetch-cargo-deps determinism for
 non-sandboxed builds

When not using sandboxing, /usr/share/git-core/templates may leak into the
nix build through the libgit2 hardcoded default template search path. We now
explictly set the templatedir to avoid this problem.

See https://github.com/bennofs/nix-index/issues/2#issuecomment-296268983 for
an example case of nondeterminism.
---
 pkgs/build-support/rust/fetch-cargo-deps | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 54593994990..76661a4f9ec 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -1,3 +1,18 @@
+# copied from libgit2 source code 'repo-template.h'
+makeGitTemplate() {
+    local target="$1"
+    mkdir -p -m777 "$target/info" "$target/pack" "$target/objects" "$target/refs"
+    mkdir -p -m777 "$target/refs/heads" "$target/refs/tags" "$target/objects/info" "$target/objects/pack"
+    cat <<'EOF' > "$target/description"
+Unnamed repository; edit this file 'description' to name the repository.
+EOF
+    chmod 666 "$target/description"
+    cat <<'EOF' > "$target/info/exclude"
+# File patterns to ignore; see `git help ignore` for more information.
+# Lines that start with '#' are comments.
+EOF
+}
+
 fetchCargoDeps() {
     src=$(realpath $1)
     out=$(realpath $2)
@@ -6,6 +21,23 @@ fetchCargoDeps() {
 
     mkdir $out
 
+    # Configure git template dir to make libgit2 more deterministic
+    #
+    # Without a template dir, libgit2 defaults to /usr/share/git-core/templates,
+    # which can vary between systems if sandboxed builds aren't used.
+    #
+    # Note: we explictly set --tmpdir for mktemp here to make it more friendly
+    # for nix-shell users, where $TMPDIR is not necessarily set to NIX_BUILD_TOP
+    echo "Setting up git templatedir"
+    export GIT_TEMPLATE_DIR="$(mktemp -d --tmpdir=$NIX_BUILD_TOP git-template.XXX)"
+    makeGitTemplate "$GIT_TEMPLATE_DIR"
+    export XDG_CONFIG_HOME="$(mktemp -d --tmpdir=$NIX_BUILD_TOP home.XXX)"
+    mkdir -p $XDG_CONFIG_HOME/git
+    cat <<EOF > $XDG_CONFIG_HOME/git/config
+[init]
+  templatedir = $GIT_TEMPLATE_DIR
+EOF
+
     # Configure cargo to fetch from a local copy of the crates.io registry
 
     echo "Using rust registry from $rustRegistry"

From d387a1f0aeb2aa0a773dc890ed59a3699550dcb8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 21 Apr 2017 23:31:34 +0200
Subject: [PATCH 1329/1744] youtube-dl: 2017.04.02 -> 2017.04.17

---
 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 b9548a5bff5..998f2969925 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.04.02";
+  version = "2017.04.17";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "131z42aq2qnh394y4ykzm3mvsf62lia86y90as6acyg4v201lgk2";
+    sha256 = "0bihcjghrpj8skh216wwb7i2r990f6b7x63m8vdamq5bw317wvrj";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a5cb00e884d3a2f7a8c0976cd0152c1c1ea1cca0 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 21 Apr 2017 23:35:34 +0100
Subject: [PATCH 1330/1744] pythonPackages.wxPython: inject Cairo, Pango and
 GDK library paths

---
 pkgs/development/python-modules/wxPython/3.0.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index defdc920d6e..14f6f802ba2 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -12,6 +12,8 @@
 , isPy3k
 , isPyPy
 , python
+, cairo
+, pango
 }:
 
 assert wxGTK.unicode;
@@ -43,6 +45,15 @@ buildPythonPackage rec {
     # this check is supposed to only return false on older systems running non-framework python
     substituteInPlace src/osx_cocoa/_core_wrap.cpp \
       --replace "return wxPyTestDisplayAvailable();" "return true;"
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    substituteInPlace wx/lib/wxcairo.py \
+      --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
+    substituteInPlace wx/lib/wxcairo.py \
+      --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
+        ("gdk",        "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"),
+        ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
+        ("appsvc",     None)
+      ]}'
   '';
 
   NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0";

From c8788f4e7b1394268dfc6f38e513c1d182355144 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 21 Apr 2017 23:36:37 +0100
Subject: [PATCH 1331/1744] python2Packages.pyspread: init at 1.1

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

diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
new file mode 100644
index 00000000000..2f275005c19
--- /dev/null
+++ b/pkgs/development/python-modules/pyspread/default.nix
@@ -0,0 +1,57 @@
+{ buildPythonPackage
+, fetchPypi
+, isPy3k
+, stdenv
+, numpy
+, wxPython
+, matplotlib
+, pycairo
+, python-gnupg
+, xlrd
+, xlwt
+, jedi
+, pyenchant
+, basemap
+, pygtk
+, makeDesktopItem
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyspread";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0m1a4zvzrfrnc42j8mrbm7747w03nzyl9z02wjagccmlhi6nd9hx";
+  };
+
+  propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
+  # Could also (optionally) add pyrsvg and python bindings for libvlc
+
+  # Tests try to access X Display
+  doCheck = false;
+
+  disabled = isPy3k;
+
+  desktopItem = makeDesktopItem rec {
+    name = pname;
+    exec = name;
+    icon = name;
+    desktopName = "Pyspread";
+    genericName = "Spreadsheet";
+    comment = meta.description;
+    categories = "Development;Spreadsheet;";
+  };
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications/* $out/share/applications
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python";
+    homepage = https://manns.github.io/pyspread/;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2a615e7a0f..355d470ca5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20558,6 +20558,8 @@ in {
     };
   };
 
+  pyspread = callPackage ../development/python-modules/pyspread { };
+
   pyx = buildPythonPackage rec {
     name = "pyx-${version}";
     version = "0.14.1";

From 2f481960cfdca0f4bb135be45819c90e269f0d96 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 21 Apr 2017 17:22:36 -0300
Subject: [PATCH 1332/1744] ephoto: init at 1.0

---
 pkgs/desktops/enlightenment/default.nix |  1 +
 pkgs/desktops/enlightenment/ephoto.nix  | 39 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/enlightenment/ephoto.nix

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 2129005ab01..a8b5e08abd6 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -10,4 +10,5 @@ rec {
   econnman = callPackage ./econnman.nix { };
   terminology = callPackage ./terminology.nix { };
   rage = callPackage ./rage.nix { };
+  ephoto = callPackage ./ephoto.nix { };
 }
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
new file mode 100644
index 00000000000..b0606e95792
--- /dev/null
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, efl }:
+
+stdenv.mkDerivation rec {
+  name = "ephoto-${version}";
+  version = "1.0";
+  
+  src = fetchurl {
+    url = "http://www.smhouston.us/stuff/${name}.tar.gz";
+    sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    efl
+ ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${efl}/include/ecore-con-1"
+    "-I${efl}/include/ecore-evas-1"
+    "-I${efl}/include/ecore-imf-1"
+    "-I${efl}/include/ecore-input-1"
+    "-I${efl}/include/eet-1"
+    "-I${efl}/include/eldbus-1"
+    "-I${efl}/include/emile-1"
+    "-I${efl}/include/ethumb-1"
+    "-I${efl}/include/ethumb-client-1"
+  ];
+
+  meta = {
+    description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
+    homepage = http://smhouston.us/ephoto/;
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

From ad84b1e4b9700c77ff5a4929606df0e42f1a4676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 22 Apr 2017 09:43:00 +0200
Subject: [PATCH 1333/1744] jackett: 0.7.1197 -> 0.7.1308

---
 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 3b3f2e0cc0f..db4ae804533 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.7.1197";
+  version = "0.7.1308";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0p9xdfbb8pda5a3knnw6145jky3bf10y1dj2clgsbbygi2xnam2v";
+    sha256 = "07yadywizhq7j986ax5d9dbjn1s5bqw6zrlqp6l32ppc119qhjwf";
   };
 
   buildInputs = [ makeWrapper ];

From da2518fe250f1d5a6dd2a7d7e33a49db944e8c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 22 Apr 2017 09:43:24 +0200
Subject: [PATCH 1334/1744] i2pd: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 7f7d68fd575..49c88d817a4 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1m97s3c1fvhq6ql3zr2a2ia2n06cl8jgf28gjn4k3xg8m7s984dz";
+    sha256 = "1gz8jmy2vq520w642jiff1zg4qpgpm2qkad5dgrq9f14ri14lkpp";
   };
 
   buildInputs = [ boost zlib openssl ];

From 9497aec292ccb2f62762d067ffe71ed7f5d48787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=AFl=20Senhaji?= <ismail.senhaji@gmail.com>
Date: Sat, 22 Apr 2017 13:38:54 +0200
Subject: [PATCH 1335/1744] Add Elantech ETPS/2 Trackpoint (ThinkPad Yoga 260)

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

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 32e69dd2bf5..1f8f2891e98 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -81,7 +81,7 @@ with lib;
       services.xserver.inputClassSections =
         [''
         Identifier "Trackpoint Wheel Emulation"
-          MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}"
+          MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}"
           MatchDevicePath "/dev/input/event*"
           Option "EmulateWheel" "true"
           Option "EmulateWheelButton" "2"

From be463abc10fd3edc4f013c382e558b73f205f332 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 22 Apr 2017 14:10:48 +0200
Subject: [PATCH 1336/1744] gitlab-runner: 9.0.0 -> 9.1.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 97e195f592e..d7f13de1d26 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 = "9.0.0";
+  version = "9.1.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1f170akb7j7imgr18m32fy6v3rk98inrjl5a4xymfpivwwqyv9p8";
+    sha256 = "1mdcw755fygnf30v0gr13mx20zjqmxg5w2kj3k2jgcsh3gyrvymr";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "15mlix8j7bqjg5y07c439d7s197c16zxffknx42z1i3qxcz2mpa4";
+    sha256 = "1m5p6mlhy3xf0chrjlfpdyp24pv32b61s8iryh6a617i91vpzjg6";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "1csha30lcwm1mk6hqbh0j8bb25apyni23szw79l8xjhmiw2ch619";
+    sha256 = "0n8hcj2b1pb95x4bd7fb9ri43vgc4h2dj2v3iiziw2imqjyphfx4";
   };
 
   buildInputs = [ go-bindata ];

From d609a5eb5ccd0942c6c64da6cdf8c59ab238aa64 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 22 Apr 2017 14:11:07 +0200
Subject: [PATCH 1337/1744] gitlab-runner_1_11: 1.11.1 -> 1.11.2

---
 .../tools/continuous-integration/gitlab-runner/v1.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
index d49221d6e6a..cfc952395c2 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.11.1";
+  version = "1.11.2";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m";
+    sha256 = "08lacd2p7915y7yjnwkj2k0b0x4qj9kc53p7qgvmq8kdi31xnh4z";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw";
+    sha256 = "0lzvx3jfy8493q8zkbs7kgm5a3jgsi3f2x25jwg4lx7agcwwsygw";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47";
+    sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr";
   };
 
   buildInputs = [ go-bindata ];

From 004ecac47b4639c6f8a8419ce2e1dcd18c78268b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 21 Apr 2017 22:26:31 +0200
Subject: [PATCH 1338/1744] perl: add patch for sw_vers on darwin

Fixes #25090
---
 pkgs/development/interpreters/perl/default.nix   |  2 +-
 pkgs/development/interpreters/perl/sw_vers.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/perl/sw_vers.patch

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index bbe59f99eef..3fe04e6bde2 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -36,7 +36,7 @@ let
         ./no-sys-dirs.patch
       ]
       ++ optional stdenv.isSunOS ./ld-shared.patch
-      ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
+      ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ];
 
     postPatch = ''
       pwd="$(type -P pwd)"
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
new file mode 100644
index 00000000000..9d4cd75486e
--- /dev/null
+++ b/pkgs/development/interpreters/perl/sw_vers.patch
@@ -0,0 +1,13 @@
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index afadf53..80b7533 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -329,7 +329,7 @@ EOM
+     # sw_vers output                 what we want
+     # "ProductVersion:    10.10.5"   "10.10"
+     # "ProductVersion:    10.11"     "10.11"
+-        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
++        prodvers="10.10"
+     case "$prodvers" in
+     10.*)
+       add_macosx_version_min ccflags $prodvers

From 9e6c96f8fc11fc0c02757e2edd749473fa3810d2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 22 Apr 2017 16:32:47 +0200
Subject: [PATCH 1339/1744] grsecurity: 4.9.24-201704210851 ->
 4.9.24-2201704220732

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index b014dd8482c..6e3a182e0e2 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -101,8 +101,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.24";
-      grrev  = "201704210851";
-      sha512 = "398cnj7cnzp2vxy54y1538bgqrg2gbz2f7wnx2yhv5xgdwc9b87z9r0d7znk3ah79vrpr2m87394m6zk7d96sjq483y4nm9b1rz5pmn";
+      grrev  = "201704220732";
+      sha512 = "0n9v066z3qh296fyvsg1gnygy7jd0cy0pnywxzglh58dnibl28q2ywjnp4ff30andzzq7rvjkk4n151xvs1n04pf2azkgz6igwfisg7";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From b72d4e13c72f5761642e8a664e21bb83e4b11dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Apr 2017 16:36:10 +0200
Subject: [PATCH 1340/1744] kdiff3: fixup patch hash after #25059

I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
---
 pkgs/tools/text/kdiff3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index bd76b89ccf7..e199d77e226 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -22,7 +22,7 @@ let
       (fetchpatch {
         name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
         url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
-        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
+        sha256 = "0v638rk05wz51qcqnc6blcp2v74f04wn8ifgzw7qi5vr0yfh775r";
       })
     ];
     patchFlags = "-p 2";

From 5f9096a0332a09f2c61c4b3146b0b25715661ecd Mon Sep 17 00:00:00 2001
From: Richard Szibele <RSzibele@users.noreply.github.com>
Date: Sat, 22 Apr 2017 17:14:33 +0200
Subject: [PATCH 1341/1744] curlcpp: 20160901 -> 1.0 (#25104)

---
 lib/maintainers.nix                            |  2 +-
 pkgs/development/libraries/curlcpp/default.nix | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9f24d183625..bb8ca565dfd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -452,7 +452,7 @@
   romildo = "José Romildo Malaquias <malaquias@gmail.com>";
   rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
   ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
-  rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
+  rszibele = "Richard Szibele <richard@szibele.com>";
   rtreffer = "Rene Treffer <treffer+nixos@measite.de>";
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index 546259cd70c..9baa9aba480 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, curl }: 
 
-stdenv.mkDerivation {
-  name = "curlcpp-20160901";
+stdenv.mkDerivation rec {
+  name = "curlcpp-${version}";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "JosephP91";
     repo = "curlcpp";
-    rev = "98286da1d6c9f6158344a8e272eae5030cbf6c0e";
-    sha256 = "00nm2b8ik1yvaz5dp1b61jid841jv6zf8k5ma2nxbf1di1apqh0d";
+    rev = "${version}";
+    sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q";
   };
 
   buildInputs = [ cmake curl ];
@@ -15,9 +16,9 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://josephp91.github.io/curlcpp/";
     description = "Object oriented C++ wrapper for CURL";
-    platforms = platforms.unix ;
+    platforms = platforms.unix;
     license = licenses.mit;
-    maintainers = [ maintainers.juliendehos ];
+    maintainers = with maintainers; [ juliendehos rszibele ];
   };
 }
 

From bcd5865adf7e2096fdee3e3f365c5daf124827e5 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Sat, 22 Apr 2017 10:33:01 -0700
Subject: [PATCH 1342/1744] HaLVM: Shebang fix for Hydra

On my local nixos machine, `useSandbox = true;` wasn't enabled. This exposed the fact that various scripts weren't shebang-patched. @cleverca22 has provided the fix.

cc @peti @domenkozar @Ericson2314
---
 pkgs/development/compilers/halvm/2.4.0.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 740752e1584..06627ce0862 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -32,7 +32,10 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
   hardeningDisable = ["all"];
-  postInstall = "$out/bin/halvm-ghc-pkg recache";
+  postInstall = ''
+    patchShebangs $out/bin
+    $out/bin/halvm-ghc-pkg recache
+  '';
   passthru = {
     inherit bootPkgs;
     cross.config = "halvm";
@@ -45,6 +48,5 @@ stdenv.mkDerivation rec {
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
     inherit (bootPkgs.ghc.meta) license platforms;
-    broken = true;  # http://hydra.nixos.org/build/51814615
   };
 }

From 69ed7f6e1280bfdd891d2174628ceeb72bccecb6 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Sat, 22 Apr 2017 18:54:51 +0100
Subject: [PATCH 1343/1744] emacs-all-the-icons-fonts: init at 2.5.0

---
 .../emacs-all-the-icons-fonts/default.nix     | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix

diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
new file mode 100644
index 00000000000..0e895339f24
--- /dev/null
+++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "emacs-all-the-icons-fonts-${version}";
+  version = "2.50";
+
+  src = fetchFromGitHub {
+    owner = "domtronn";
+    repo = "all-the-icons.el";
+    rev = "2.5.0";
+    sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/all-the-icons
+    for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Icon fonts for emacs all-the-icons";
+    longDescription = ''
+      The emacs package all-the-icons provides icons to improve
+      presentation of information in emacs. This package provides
+      the fonts needed to make the package work properly.
+    '';
+    homepage = https://github.com/domtronn/all-the-icons.el;
+
+    /*
+    The fonts come under a mixture of licenses - the MIT license,
+    SIL OFL license, and Apache license v2.0. See the GitHub page
+    for further information.
+    */
+    license = licenses.free;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ rlupton20 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 836eb3695c7..c8bb71bea5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12481,6 +12481,8 @@ with pkgs;
 
   faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };
 
+  emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { };
+
   emojione = callPackage ../data/fonts/emojione {
     inherit (nodePackages) svgo;
     inherit (pythonPackages) scfbuild;

From d884024d4248d9f5867cdd76dd29b17bc01b7f2c Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 22 Apr 2017 11:39:47 -0700
Subject: [PATCH 1344/1744] emacs: 25.1 -> 25.2

---
 pkgs/applications/editors/emacs/default.nix | 28 +++------------------
 pkgs/applications/editors/emacs/macport.nix | 10 ++++----
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 79c75e76820..216c04afd72 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -26,35 +26,15 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "25.1";
+  version = "25.2";
   versionModifier = "";
 
   src = fetchurl {
-    url = "mirror://gnu//emacs/${name}.tar.xz";
-    sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr";
+    url = "mirror://gnu/emacs/${name}.tar.xz";
+    sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
   };
 
-  patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch) ++ [
-    ## Fixes a segfault in emacs 25.1
-    ## http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00917.html
-    ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358
-    (fetchurl {
-      url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199;
-      sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; })
-    (fetchurl {
-      url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0;
-      sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; })
-    (fetchurl {
-      url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c;
-      sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; })
-    (fetchurl {
-      url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240;
-      sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; })
-    (fetchurl {
-      url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a;
-      sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj";
-    })
-  ];
+  patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);
 
   nativeBuildInputs = [ pkgconfig ]
     ++ lib.optionals srcRepo [ autoconf automake texinfo ]
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 34729783cce..086da927938 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,21 +4,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  emacsVersion = "25.1";
+  emacsVersion = "25.2";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "6.1";
+  macportVersion = "6.3";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33";
+    url = "mirror:///gnu/emacs/${emacsName}.tar.xz";
+    sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
   };
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
+    sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv";
   };
 
   hiresSrc = fetchurl {

From 7e273df818a18058d57cc4d5095670ebb05ed3b1 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 22 Apr 2017 11:40:41 -0700
Subject: [PATCH 1345/1744] emacs-macport: align buildInputs and configureFlags
 on emacs

---
 pkgs/applications/editors/emacs/macport.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 086da927938..f38839a5abc 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake];
+  nativeBuildInputs = [ pkgconfig autoconf automake ];
+
+  buildInputs = [ ncurses libxml2 gnutls texinfo gettext ];
 
   propagatedBuildInputs = [
     AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
@@ -58,6 +60,7 @@ stdenv.mkDerivation rec {
     "--with-xml2=yes"
     "--with-gnutls=yes"
     "--with-mac"
+    "--with-modules"
     "--enable-mac-app=$$out/Applications"
   ];
 

From ca5913bf33870cafdb365c9faa350d5037a1b8c6 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sat, 22 Apr 2017 22:34:08 +0800
Subject: [PATCH 1346/1744] crystal: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index b8cbceb9767..8bad8f6f4d3 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.21.0";
+  version = "0.22.0";
   name = "crystal-${version}-1";
   arch =
     {
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
     url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
     sha256 =
       {
-        "x86_64-linux" = "0a44539df3813baea4381c314ad5f782b13cf1596e478851c52cd84193cc7a1f";
-        "i686-linux" = "9a45287f94d329f5ebe77f5a0d71cd0e09c3db79b0b56f6fe4a5166beed707ef";
-        "x86_64-darwin" = "e92abb33a9a592febb4e629ad68375b2577acd791a71220b8dc407904be469ee";
+        "x86_64-linux" = "03c1nmjibz8f7yhrczd49gmccx4ivqz121c64hl384w69227p7bq";
+        "i686-linux" = "1s8gpmxa9wpcc2a9csl205lcpipn1i7gwybapby3q34y7xnq9160";
+        "x86_64-darwin" = "1bnfxb0hbkx4qlkc1l88sdhcnhacqzy31hh7ksz0prah83g6vbxa";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "4dd01703f5304a0eda7f02fc362fba27ba069666097c0f921f8a3ee58808779c";
+    sha256 = "0iw5i4hjzfxykwfdyzix23pgm3gxd79r9yss3abvva8cf7ci37sv";
   };
 
   # crystal on Darwin needs libiconv to build

From 0ceb82d3dd5ce024dd9f7780c20f27d1bb61eacc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:05:07 -0400
Subject: [PATCH 1347/1744] perlPackages.SetIntSpan: init at 1.19

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0e9efde834d..343ac4758a6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11468,6 +11468,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SetIntSpan = buildPerlPackage rec {
+    name = "Set-IntSpan-1.19";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz";
+      sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi";
+    };
+
+    meta = {
+      description = "Manages sets of integers";
+    };
+  };
+
   SetObject = buildPerlPackage {
     name = "Set-Object-1.34";
     src = fetchurl {

From 76cea3de93c73865a0fb9d0e578c0e2a7c464654 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:07:25 -0400
Subject: [PATCH 1348/1744] perlPackages.BusinessHours: init at 0.12

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 343ac4758a6..4f3d55ec934 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -734,6 +734,19 @@ let self = _self // overrides; _self = with self; {
     ];
   };
 
+  BusinessHours = buildPerlPackage rec {
+    name = "Business-Hours-0.12";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz";
+      sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv";
+    };
+    buildInputs = [ TestPod TestPodCoverage ];
+    propagatedBuildInputs = [ SetIntSpan TimeLocal ];
+    meta = {
+      description = "Calculate business hours in a time period";
+    };
+  };
+
   BusinessISBN = buildPerlPackage rec {
     name = "Business-ISBN-2.09";
     src = fetchurl {

From a9f89128458895737dee9dc011fda214304088af Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:08:11 -0400
Subject: [PATCH 1349/1744] perlPackages.CSSMinifierXP: init at 1.02

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4f3d55ec934..c6d310aee7a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2790,6 +2790,18 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ Clone ];
   };
 
+  CSSMinifierXP = buildPerlPackage rec {
+    name = "CSS-Minifier-XS-0.09";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz";
+      sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8";
+    };
+    meta = {
+      description = "XS based CSS minifier";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   CSSSquish = buildPerlPackage {
     name = "CSS-Squish-0.10";
     src = fetchurl {

From 2f1ef64492a65d0d6c3cfc974e50a00747fe463a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:08:56 -0400
Subject: [PATCH 1350/1744] perlPackages.GDText: init at 0.86

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c6d310aee7a..bcf61d21894 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5732,6 +5732,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  GDText = buildPerlPackage rec {
+    name = "GDTextUtil-0.86";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz";
+      sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8";
+    };
+    propagatedBuildInputs = [ GD ];
+    meta = {
+      description = "Text utilities for use with GD";
+    };
+  };
+
   GeoIP = buildPerlPackage rec {
     name = "Geo-IP-1.45";
     src = fetchurl {

From 2d65b7f251c3998653514278589c30d9285e8800 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:09:46 -0400
Subject: [PATCH 1351/1744] perlPackages.JavaScriptMinifierXS: init at 0.11

---
 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 bcf61d21894..a8848b8f472 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7173,6 +7173,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  JavaScriptMinifierXS = buildPerlPackage rec {
+    name = "JavaScript-Minifier-XS-0.11";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz";
+      sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm";
+    };
+    propagatedBuildInputs = [ ];
+    meta = {
+      description = "XS based JavaScript minifier";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+
   JSON = buildPerlPackage {
     name = "JSON-2.90";
     src = fetchurl {

From 38574a5878bfd260e6e2135f5ebcf5ffca7c854d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:10:10 -0400
Subject: [PATCH 1352/1744] perlPackages.GDGraph: init at 1.54

---
 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 a8848b8f472..073205bec9c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5719,6 +5719,20 @@ let self = _self // overrides; _self = with self; {
     makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";
   };
 
+  GDGraph = buildPerlPackage rec {
+    name = "GDGraph-1.54";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz";
+      sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr";
+    };
+    propagatedBuildInputs = [ GD GDText ];
+    buildInputs = [ TestException CaptureTiny ];
+    meta = {
+      description = "Graph Plotting Module for Perl 5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   GDSecurityImage = buildPerlPackage {
     name = "GD-SecurityImage-1.72";
     src = fetchurl {

From b48ea664f596e153fbe6388d704142356a3f6166 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:11:15 -0400
Subject: [PATCH 1353/1744] perlPackages.MIMETools: init at 5.509

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 073205bec9c..3554c02b558 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8290,6 +8290,29 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ProcWaitStat ];
   };
 
+  MIMETools = buildPerlPackage rec {
+    name = "MIME-tools-5.509";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz";
+      sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4";
+    };
+    propagatedBuildInputs = [
+      MailTools
+      FilePath
+      FileTemp
+      MIMEBase64
+    ];
+    buildInputs = [
+      TestDeep
+      TestPod
+      TestPodCoverage
+    ];
+    meta = {
+      description = "class for parsed-and-decoded MIME message";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MIMELite = buildPerlPackage rec {
     name = "MIME-Lite-3.030";
     src = fetchurl {

From 46f952371ee587cb820095e2662ad0a4cb10d170 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:11:55 -0400
Subject: [PATCH 1354/1744] perlPackages.DataPagePageset: init at 1.02

---
 pkgs/top-level/perl-packages.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3554c02b558..bd28201bb66 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3022,6 +3022,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [TestException ClassAccessorChained];
   };
 
+  DataPagePageset = buildPerlPackage rec {
+    name = "Data-Page-Pageset-1.02";
+    src = fetchurl {
+      url = "https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz";
+      sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f";
+    };
+    buildInputs = [ TestPod TestPodCoverage ];
+    propagatedBuildInputs = [ DataPage ];
+    meta = {
+      description = "change long page list to be shorter and well navigate";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   DataPassword = buildPerlPackage {
     name = "Data-Password-1.12";
     src = fetchurl {
@@ -6883,7 +6897,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad";
     };
   };
-  
+
   IOPager = buildPerlPackage {
     name = "IO-Pager-0.06";
     src = fetchurl {
@@ -12419,7 +12433,7 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
- 
+
   TaskFreecellSolverTesting = buildPerlModule rec {
     name = "Task-FreecellSolver-Testing-v0.0.10";
     src = fetchurl {
@@ -13641,7 +13655,7 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
- 
+
   TestTrailingSpace = buildPerlPackage rec {
     name = "Test-TrailingSpace-0.0301";
     src = fetchurl {

From 55d4d50cd32afa2304327b379adc93f93663a31e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Apr 2017 16:21:45 -0400
Subject: [PATCH 1355/1744] rt: improve packaging, with a progress note

---
 pkgs/servers/rt/default.nix | 88 ++++++++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index deec6589dbb..82818037072 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -1,5 +1,35 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }:
 
+# This package isn't extremely useful as it is, but is getting close.
+# After running:
+#
+#   nix-build . -A rt
+#
+# I created a config file named myconfig.pm with:
+#
+#   use utf8;
+#   Set($rtname, '127.0.0.1');
+#   # These dirs need to be pre-created:
+#   Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/');
+#   Set($MasonDataDir, '/home/grahamc/foo/localstate/');
+#   Set($WebPort, 8080);
+#
+#   Set($DatabaseType, "SQLite");
+#   Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' );
+#
+#   1;
+#
+# and ran
+#
+#  RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init
+#
+# Then:
+#
+#   RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server
+#
+# Make sure to check out result/etc/RT_Config.pm
+#
+# Good luck.
 stdenv.mkDerivation rec {
   name = "rt-${version}";
 
@@ -12,14 +42,58 @@ stdenv.mkDerivation rec {
 
   patches = [ ./override-generated.patch ];
 
-  buildInputs = [ perl ];
+  buildInputs = [
+    makeWrapper
+    perl
+    (buildEnv {
+      name = "rt-perl-deps";
+      paths = (with perlPackages; [
+        ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI
+        CSSMinifierXP CSSSquish ConvertColor CryptEksblowfish
+        CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID
+        DataICal DataPagePageset DateExtract DateManip
+        DateTimeFormatNatural DevelGlobalDestruction EmailAddress
+        EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich
+        GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks
+        HTMLFormatTextWithLinksAndTables HTMLMason
+        HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes
+        HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP
+        LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon
+        LogDispatch MIMETools MIMETypes MailTools ModuleRefresh
+        ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack
+        RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic
+        ScopeUpper Starlet SymbolGlobalName TermReadKey
+        TextPasswordPronounceable TextQuoted TextTemplate
+        TextWikiFormat TextWrapper TimeParseDate TreeSimple
+        UNIVERSALrequire XMLRSS
+      ]);
+    })
+  ];
 
-  dontBuild = true;
+  preConfigure = ''
+    configureFlags="$configureFlags --with-web-user=$UID"
+    configureFlags="$configureFlags --with-web-group=$(id -g)"
+    configureFlags="$configureFlags --with-rt-group=$(id -g)"
+    configureFlags="$configureFlags --with-bin-owner=$UID"
+    configureFlags="$configureFlags --with-libs-owner=$UID"
+    configureFlags="$configureFlags --with-libs-group=$(id -g)"
+  '';
+  configureFlags = [
+    "--enable-graphviz"
+    "--enable-gd"
+    "--enable-gpg"
+    "--with-db-type=SQLite"
+  ];
 
-  installPhase = ''
-    mkdir $out
-    cp -a {bin,docs,etc,lib,sbin,share} $out
-    find $out -name '*.in' -exec rm '{}' \;
+  buildPhase = ''
+    make testdeps | grep -i missing | sort
+  '';
+
+  preFixup = ''
+    for i in $(find $out/bin -type f; find $out/sbin -type f); do
+      wrapProgram $i \
+          --prefix PERL5LIB ':' $PERL5LIB
+    done
   '';
 
   meta = {

From 75608e1bb3d26daeebe7a166813e648cffebd151 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 22 Apr 2017 23:34:38 +0200
Subject: [PATCH 1356/1744] wireguard: 0.0.20170409 -> 0.0.20170421

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 641fb046c6d..ef31cd9cbb5 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, libmnl, kernel ? null }:
 
-# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
+# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170409";
+  version = "0.0.20170421";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "065vxxvdsnxk9paqbafi0c622b4qayfh3ps6zzb853qp2i6kniri";
+    sha256 = "03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b26750000";
   };
 
   meta = with stdenv.lib; {

From e1244f6e8a34ce7d0c96fce398e02938bc4f13d5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 23 Apr 2017 03:19:07 +0200
Subject: [PATCH 1357/1744] Revert "display-manager: fix argument handling of
 sddm"

This reverts commit 6b7c5ba5353e2a81255879173de758fc5f08be62.

Unfortunately it seems like this broke slim, lightdm and gdm (see #25068
and #23264). This is already reverted in the 17.03 branch (99dfb6d).

TODO: We need tests for slim and lightdm and fix the test for gdm
(failing since 2016-10-26) to prevent such breakage in the future.
---
 .../modules/services/x11/display-managers/default.nix  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 543fd939914..4e2c0e01ca0 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -32,14 +32,8 @@ let
     ''
       #! ${pkgs.bash}/bin/bash
 
-      # SDDM splits "Exec" line in .desktop file by whitespace and pass script path as $1
-      if [[ "$0" = "$1" ]]; then
-        # remove superfluous $1 again
-        shift
-        # join arguments again and evaluate them in a shell context
-        # to interpret shell quoting
-        eval exec "$0" "$@"
-      fi
+      # Handle being called by SDDM.
+      if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
 
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then

From df86c9731b701cf7428b5b7d95f125f110abc779 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 18 Apr 2017 17:08:03 -0700
Subject: [PATCH 1358/1744] ripgrep: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index bc8b02ca2a8..abcd616aef9 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "13mg624867hqxp9pzpq1gn9kqkvbaqcphdjia3bz5wvff1cbxkfy";
+    sha256 = "1fbvc419gh1rix8v3bh9a63r993kvfizp49p5ps6y22wggpy0k77";
   };
 
-  depsSha256 = "0glw8xk77w2h1xg6c451fg8cmwx3vz7dyzdrbf0i8d84yq8sh0i1";
+  depsSha256 = "0vyrcgcmlf3lbp15nip2cm8xv4n6qldfbl0iwy3jb69i2mazi6nm";
 
   preFixup = ''
     mkdir -p "$out/man/man1"

From 93cacf61a8e8a8c0e362746e086c93d48c68fbe4 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 23 Apr 2017 04:11:26 +0200
Subject: [PATCH 1359/1744] asciinema: 1.3.0 -> 1.4.0

---
 pkgs/tools/misc/asciinema/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index da96bde2fd5..4b228efee9e 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -4,7 +4,7 @@ let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   name = "asciinema-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   buildInputs = with pythonPackages; [ nose ];
   propagatedBuildInputs = with pythonPackages; [ requests2 ];
@@ -13,9 +13,14 @@ in pythonPackages.buildPythonApplication rec {
     owner = "asciinema";
     repo = "asciinema";
     rev = "v${version}";
-    sha256 = "1hx7xipyy9w72iwlawldlif9qk3f7b8jx8c1wcx114pqbjz5d347";
+    sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2";
   };
 
+  patchPhase = ''
+    # disable one test which is failing with -> OSError: out of pty devices
+    rm tests/pty_recorder_test.py
+  '';
+
   checkPhase = ''
     nosetests
   '';

From 5bcaeda4c8c3bbb442049cb95c10dce602416089 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 23 Apr 2017 11:42:59 +0900
Subject: [PATCH 1360/1744] hunspell: 1.3.3 -> 1.6.1

---
 pkgs/development/libraries/hunspell/default.nix     | 13 +++++++++----
 .../libraries/qtwebkit-plugins/default.nix          |  2 +-
 pkgs/games/mudlet/libs.patch                        |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index c33434d202f..952050f0e8f 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, ncurses, readline }:
+{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "hunspell-1.3.3";
+  version = "1.6.1";
+  name = "hunspell-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/hunspell/${name}.tar.gz";
-    sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
+    url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
+    sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
 
   buildInputs = [ ncurses readline ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  autoreconfFlags = "-vfi";
+
   configureFlags = [ "--with-ui" "--with-readline" ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index fbb2ffdd83b..73e62945113 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ qtwebkit hunspell ];
 
   postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-1.3," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
     sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro
   '';
 
diff --git a/pkgs/games/mudlet/libs.patch b/pkgs/games/mudlet/libs.patch
index 3943c16e0ea..45b693828ff 100644
--- a/pkgs/games/mudlet/libs.patch
+++ b/pkgs/games/mudlet/libs.patch
@@ -7,7 +7,7 @@
 -        -llua5.1 \
 -        -lhunspell \
 +        -llua \
-+        -lhunspell-1.3 \
++        -lhunspell-1.6 \
          -L/usr/local/lib/ \
          -lyajl \
          -lGLU \

From a68f95da175819a1b4420161fb6cb14eb4b9bd1c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 23 Apr 2017 11:50:33 +0900
Subject: [PATCH 1361/1744] firefox: 52.0.2 -> 53.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 86f6f995bdb..f36e0d1c78a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -4,7 +4,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
-, autoconf213, which
+, autoconf213, which, cargo, rustc
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false, gtk3, wrapGAppsHook
 , debugBuild ? false
@@ -48,7 +48,9 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
     ++ lib.optional enableGTK3 gtk3
     ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
 
-  nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python ] ++ lib.optional enableGTK3 wrapGAppsHook;
+  nativeBuildInputs =
+    [ autoconf213 which gnused pkgconfig perl python cargo rustc ]
+    ++ lib.optional enableGTK3 wrapGAppsHook;
 
   configureFlags =
     [ "--enable-application=browser"
@@ -151,8 +153,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "52.0.2";
-    sha512 = "15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e";
+    version = "53.0";
+    sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;

From 32d649eb80d5b65da9d32146ba21605a913859a7 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sun, 23 Apr 2017 09:26:57 +0100
Subject: [PATCH 1362/1744] etcd: 3.0.6 -> 3.1.6

Upgrade etcd.

- Switches from their old dependency version system to their vendored packages.
- Fixes SSL support.
---
 pkgs/servers/etcd/default.nix |  12 +-
 pkgs/servers/etcd/deps.nix    | 335 ----------------------------------
 2 files changed, 9 insertions(+), 338 deletions(-)
 delete mode 100644 pkgs/servers/etcd/deps.nix

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 16189fb4723..15ea30aa16c 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 buildGoPackage rec {
   name = "etcd-${version}";
-  version = "3.0.6"; # After updating check that nixos tests pass
+  version = "3.1.6"; # After updating check that nixos tests pass
   rev = "v${version}";
 
   goPackagePath = "github.com/coreos/etcd";
@@ -13,10 +13,16 @@ buildGoPackage rec {
     inherit rev;
     owner = "coreos";
     repo = "etcd";
-    sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75";
+    sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0";
   };
 
-  goDeps = ./deps.nix;
+  subPackages = [
+    "cmd/etcd"
+    "cmd/etcdctl"
+    "cmd/tools/benchmark"
+    "cmd/tools/etcd-dump-db"
+    "cmd/tools/etcd-dump-logs"
+  ];
 
   buildInputs = [ libpcap ];
 
diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix
deleted file mode 100644
index 2c07817a980..00000000000
--- a/pkgs/servers/etcd/deps.nix
+++ /dev/null
@@ -1,335 +0,0 @@
-[
-{
-  goPackagePath = "github.com/beorn7/perks";
-  fetch = {
-    type = "git";
-    url = "https://github.com/beorn7/perks";
-    rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-    sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
-  };
-}
-{
-  goPackagePath = "github.com/boltdb/bolt";
-  fetch = {
-    type = "git";
-    url = "https://github.com/boltdb/bolt";
-    rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9";
-    sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay";
-  };
-}
-{
-  goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml";
-  fetch = {
-    type = "git";
-    url = "https://github.com/cloudfoundry-incubator/candiedyaml";
-    rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf";
-    sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs";
-  };
-}
-{
-  goPackagePath = "github.com/cockroachdb/cmux";
-  fetch = {
-    type = "git";
-    url = "https://github.com/cockroachdb/cmux";
-    rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d";
-    sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh";
-  };
-}
-{
-  goPackagePath = "github.com/coreos/etcd";
-  fetch = {
-    type = "git";
-    url = "https://github.com/coreos/etcd.git";
-    rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0";
-    sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75";
-  };
-}
-{
-  goPackagePath = "github.com/coreos/go-semver";
-  fetch = {
-    type = "git";
-    url = "https://github.com/coreos/go-semver";
-    rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6";
-    sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
-  };
-}
-{
-  goPackagePath = "github.com/coreos/go-systemd";
-  fetch = {
-    type = "git";
-    url = "https://github.com/coreos/go-systemd";
-    rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2";
-    sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk";
-  };
-}
-{
-  goPackagePath = "github.com/coreos/pkg";
-  fetch = {
-    type = "git";
-    url = "https://github.com/coreos/pkg";
-    rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef";
-    sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l";
-  };
-}
-{
-  goPackagePath = "github.com/ghodss/yaml";
-  fetch = {
-    type = "git";
-    url = "https://github.com/ghodss/yaml";
-    rev = "aa0c862057666179de291b67d9f093d12b5a8473";
-    sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr";
-  };
-}
-{
-  goPackagePath = "github.com/gogo/protobuf";
-  fetch = {
-    type = "git";
-    url = "https://github.com/gogo/protobuf";
-    rev = "f20a1444730c7d9949b880a0309e737d007def25";
-    sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c";
-  };
-}
-{
-  goPackagePath = "github.com/golang/protobuf";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/protobuf";
-    rev = "f592bd283e9ef86337a432eb50e592278c3d534d";
-    sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb";
-  };
-}
-{
-  goPackagePath = "github.com/google/btree";
-  fetch = {
-    type = "git";
-    url = "https://github.com/google/btree";
-    rev = "7d79101e329e5a3adf994758c578dab82b90c017";
-    sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0";
-  };
-}
-{
-  goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
-  fetch = {
-    type = "git";
-    url = "https://github.com/grpc-ecosystem/grpc-gateway";
-    rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767";
-    sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk";
-  };
-}
-{
-  goPackagePath = "github.com/jonboulle/clockwork";
-  fetch = {
-    type = "git";
-    url = "https://github.com/jonboulle/clockwork";
-    rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d";
-    sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc";
-  };
-}
-{
-  goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-  fetch = {
-    type = "git";
-    url = "https://github.com/matttproud/golang_protobuf_extensions";
-    rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-    sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-  };
-}
-{
-  goPackagePath = "github.com/prometheus/client_golang";
-  fetch = {
-    type = "git";
-    url = "https://github.com/prometheus/client_golang";
-    rev = "c5b7fccd204277076155f10851dad72b76a49317";
-    sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
-  };
-}
-{
-  goPackagePath = "github.com/prometheus/client_model";
-  fetch = {
-    type = "git";
-    url = "https://github.com/prometheus/client_model";
-    rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-    sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
-  };
-}
-{
-  goPackagePath = "github.com/prometheus/common";
-  fetch = {
-    type = "git";
-    url = "https://github.com/prometheus/common";
-    rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8";
-    sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq";
-  };
-}
-{
-  goPackagePath = "github.com/prometheus/procfs";
-  fetch = {
-    type = "git";
-    url = "https://github.com/prometheus/procfs";
-    rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
-    sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
-  };
-}
-{
-  goPackagePath = "github.com/spf13/cobra";
-  fetch = {
-    type = "git";
-    url = "https://github.com/spf13/cobra";
-    rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f";
-    sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr";
-  };
-}
-{
-  goPackagePath = "github.com/spf13/pflag";
-  fetch = {
-    type = "git";
-    url = "https://github.com/spf13/pflag";
-    rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4";
-    sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna";
-  };
-}
-{
-  goPackagePath = "github.com/ugorji/go";
-  fetch = {
-    type = "git";
-    url = "https://github.com/ugorji/go";
-    rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2";
-    sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx";
-  };
-}
-{
-  goPackagePath = "github.com/xiang90/probing";
-  fetch = {
-    type = "git";
-    url = "https://github.com/xiang90/probing";
-    rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2";
-    sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2";
-  };
-}
-{
-  goPackagePath = "golang.org/x/crypto";
-  fetch = {
-    type = "git";
-    url = "https://go.googlesource.com/crypto";
-    rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91";
-    sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz";
-  };
-}
-{
-  goPackagePath = "golang.org/x/net";
-  fetch = {
-    type = "git";
-    url = "https://go.googlesource.com/net";
-    rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4";
-    sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7";
-  };
-}
-{
-  goPackagePath = "google.golang.org/grpc";
-  fetch = {
-    type = "git";
-    url = "https://github.com/grpc/grpc-go";
-    rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584";
-    sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67";
-  };
-}
-{
-  goPackagePath = "github.com/urfave/cli";
-  fetch = {
-    type = "git";
-    url = "https://github.com/urfave/cli";
-    rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23";
-    sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n";
-  };
-}
-{
-  goPackagePath = "github.com/mattn/go-runewidth";
-  fetch = {
-    type = "git";
-    url = "https://github.com/mattn/go-runewidth";
-    rev = "d6bea18f789704b5f83375793155289da36a3c7f";
-    sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
-  };
-}
-{
-  goPackagePath = "github.com/olekukonko/tablewriter";
-  fetch = {
-    type = "git";
-    url = "https://github.com/olekukonko/tablewriter";
-    rev = "daf2955e742cf123959884fdff4685aa79b63135";
-    sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203";
-  };
-}
-{
-  goPackagePath = "github.com/dustin/go-humanize";
-  fetch = {
-    type = "git";
-    url = "https://github.com/dustin/go-humanize";
-    rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8";
-    sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k";
-  };
-}
-{
-  goPackagePath = "github.com/bgentry/speakeasy";
-  fetch = {
-    type = "git";
-    url = "https://github.com/bgentry/speakeasy";
-    rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da";
-    sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01";
-  };
-}
-{
-  goPackagePath = "github.com/kr/pty";
-  fetch = {
-    type = "git";
-    url = "https://github.com/kr/pty";
-    rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57";
-    sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk";
-  };
-}
-{
-  goPackagePath = "github.com/golang/groupcache";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/groupcache";
-    rev = "a6b377e3400b08991b80d6805d627f347f983866";
-    sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2";
-  };
-}
-{
-  goPackagePath = "gopkg.in/cheggaaa/pb.v1";
-  fetch = {
-    type = "git";
-    url = "https://gopkg.in/cheggaaa/pb.v1";
-    rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74";
-    sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb";
-  };
-}
-{
-  goPackagePath = "github.com/golang/glog";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/glog";
-    rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
-    sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
-  };
-}
-{
-  goPackagePath = "github.com/spacejam/loghisto";
-  fetch = {
-    type = "git";
-    url = "https://github.com/spacejam/loghisto";
-    rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7";
-    sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1";
-  };
-}
-{
-  goPackagePath = "github.com/akrennmair/gopcap";
-  fetch = {
-    type = "git";
-    url = "https://github.com/akrennmair/gopcap";
-    rev = "00e11033259acb75598ba416495bb708d864a010";
-    sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a";
-  };
-}
-]

From 1b3300bf01ccdb794af79440e650e6b6a043137e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 7 Apr 2017 13:08:52 +0200
Subject: [PATCH 1363/1744] nixos/tests/misc: check hidepid mount via
 /proc/mounts

---
 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 cd4086cb8f6..0efa7282368 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -122,7 +122,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       # Test hidepid
       subtest "hidepid", sub {
-          $machine->succeed("grep -Fq hidepid=2 /etc/mtab");
+          $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
           $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]");
           $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]");
       };

From 063ac4030428da5230da2144ff32dbf681b1104b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 6 Apr 2017 14:54:45 +0200
Subject: [PATCH 1364/1744] nixos: add a "hardened" profile

The idea is to provide a convenient way to enable most vanilla hardening
features in one go.  The hardened profile, then, will serve as a place for
features that enhance security but cannot be enabled for all deployments
because they interfere with legitimate use cases (e.g., using ptrace to
debug problems in an already running process).

Closes https://github.com/NixOS/nixpkgs/pull/24680
---
 nixos/modules/profiles/hardened.nix | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 nixos/modules/profiles/hardened.nix

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
new file mode 100644
index 00000000000..9933f8b25f5
--- /dev/null
+++ b/nixos/modules/profiles/hardened.nix
@@ -0,0 +1,35 @@
+# A profile with most (vanilla) hardening options enabled by default,
+# potentially at the cost of features and performance.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  security.hideProcessInformation = mkDefault true;
+
+  security.apparmor.enable = mkDefault true;
+
+  # Restrict ptrace() usage to processes with a pre-defined relationship
+  # (e.g., parent/child)
+  boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;
+
+  # Prevent replacing the running kernel image w/o reboot
+  boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
+
+  # Restrict access to kernel ring buffer (information leaks)
+  boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true;
+
+  # Hide kptrs even for processes with CAP_SYSLOG
+  boot.kernel.sysctl."kernel.kptr_restrict" = mkOverride 500 2;
+
+  # Unprivileged access to bpf() has been used for privilege escalation in
+  # the past
+  boot.kernel.sysctl."kernel.unprivileged_bpf_disabled" = mkDefault true;
+
+  # Disable bpf() JIT (to eliminate spray attacks)
+  boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false;
+
+  # ... or at least apply some hardening to it
+  boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true;
+}

From 160b9ab43f1f822b865be40104b3691ff46446aa Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 18 Apr 2017 01:04:10 +0200
Subject: [PATCH 1365/1744] runit: explain what static actually does

---
 pkgs/tools/system/runit/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 54899cb14df..5dd8d85490e 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -1,4 +1,6 @@
 { stdenv, fetchurl
+
+# Build runit-init as a static binary
 , static ? false
 }:
 

From 5a04a30653fb9bd7bbd2ce3340490beada8ea9a1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 18 Apr 2017 01:04:25 +0200
Subject: [PATCH 1366/1744] runit: replace hardcoded /sbin/runit with in-store
 runit binary

runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.

This should improve support for using runit as an init replacement.
---
 pkgs/tools/system/runit/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 5dd8d85490e..03da7bc657f 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ];
 
-  postPatch = stdenv.lib.optionalString (!static) ''
+  postPatch = ''
+    sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
+  '' + stdenv.lib.optionalString (!static) ''
     sed -i 's,-static,,g' src/Makefile
   '';
 

From eddf3fa3091f9069078196d0230032f23dac71e6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 22 Apr 2017 17:25:09 +0200
Subject: [PATCH 1367/1744] mksh: simplify expression somewhat

Also add myself to maintainers.
---
 pkgs/shells/mksh/default.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index edb44e09b1f..54d9bb77bbb 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, groff }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mksh-${version}";
@@ -12,22 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "19ivsic15903hv3ipzk0kvkaxardw7b99s8l5iw3y415lz71ld66";
   };
 
-  buildInputs = [ groff ];
-
-  hardeningDisable = [ "format" ];
-
-  buildPhase = ''
-    mkdir build-dir/
-    cp mksh.1 dot.mkshrc build-dir/
-    cd build-dir/
-    sh ../Build.sh -c lto
-  '';
+  buildPhase = ''sh ./Build.sh -r -c lto'';
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1 $out/share/mksh $out/bin
     install -D -m 755 mksh $out/bin/mksh
     install -D -m 644 mksh.1 $out/share/man/man1/mksh.1
-    install -D -m 644 mksh.cat1 $out/share/mksh/mksh.cat1
     install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc
   '';
 
@@ -41,8 +30,8 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    license = licenses.free;
-    maintainers = with maintainers; [ AndersonTorres nckx ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ AndersonTorres nckx joachifm ];
     platforms = platforms.unix;
   };
 

From 2993d37ebc86c716854278215c6b44c20f6195bd Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 22 Apr 2017 17:32:12 +0200
Subject: [PATCH 1368/1744] mksh: 52c -> 55

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

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 54d9bb77bbb..e21c97c297c 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "mksh-${version}";
-  version = "52c";
+  version = "55";
 
   src = fetchurl {
     urls = [
       "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
       "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
-    sha256 = "19ivsic15903hv3ipzk0kvkaxardw7b99s8l5iw3y415lz71ld66";
+    sha256 = "0mssqd2wp3cs9x01v6g66iy3ymdxagbyw2c0v597vnc1l6s2rm6f";
   };
 
   buildPhase = ''sh ./Build.sh -r -c lto'';

From 44c3726dcadfe4d3be5c6bff231c9252f20e3c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 11:40:18 +0200
Subject: [PATCH 1369/1744] fcron: install systab

fixes #25072
---
 nixos/modules/services/scheduling/fcron.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index bc631bdd044..af4f9f41fd0 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -149,7 +149,7 @@ in
           --group fcron \
           --directory /var/spool/fcron
         # load system crontab file
-        #${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+        /run/wrappers/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
       '';
 
       serviceConfig = {

From 600a2f2746a7c91fd53309e9810fff8a54c1c0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 13:20:32 +0200
Subject: [PATCH 1370/1744] wireguard: make myself maintainer

---
 pkgs/os-specific/linux/wireguard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index ef31cd9cbb5..bf306364b8b 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -17,7 +17,7 @@ let
     homepage     = https://www.wireguard.io/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
     description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
-    maintainers  = with maintainers; [ ericsagnes ];
+    maintainers  = with maintainers; [ ericsagnes mic92 ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;
   };

From 8deb0e104fda5f8b00b86b90ad13321aabb2b8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 13:29:43 +0200
Subject: [PATCH 1371/1744] wireguard: do not fail on warning for older kernel

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index bf306364b8b..fbff511db7c 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -35,6 +35,8 @@ let
     KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
     INSTALL_MOD_PATH = "\${out}";
 
+    NIX_CFLAGS = ["-Wno-error=cpp"];
+
     buildPhase = "make module";
   };
 

From 839b3ce5fe4258d4584a7a8ec66faa9ca5dbc764 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 23 Apr 2017 13:51:34 +0200
Subject: [PATCH 1372/1744] weechat: 1.7 -> 1.7.1

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

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

From 9ec64d28902b9f89fe704679e1d5c8fc83270130 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Apr 2017 13:58:07 +0200
Subject: [PATCH 1373/1744] oh-my-zsh: add module (#25140)

* programs.zsh: add enableOhMyZsh option to automate setup of oh-my-zsh in global zshrc

* programs.zsh: make oh-my-zsh plugins configurable

* programs.zsh: add ohMyZshCustom option

* programs.zsh: add ohMyZshTheme option

* programs.zsh: applying minor fixes to evaluate expressions properly

* programs.zsh: fix ordering of oh-my-zsh config and execution

* programs.zsh: move all oh-my-zsh params into its own scope named programs.zsh.oh-my-zsh
---
 nixos/modules/module-list.nix            |  1 +
 nixos/modules/programs/zsh/oh-my-zsh.nix | 66 ++++++++++++++++++++++++
 nixos/modules/programs/zsh/zsh.nix       |  2 +-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/programs/zsh/oh-my-zsh.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 530ae1d1cf0..6e99ead5862 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -102,6 +102,7 @@
   ./programs/wvdial.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
   ./rename.nix
   ./security/acme.nix
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
new file mode 100644
index 00000000000..335f596ca80
--- /dev/null
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zsh.oh-my-zsh;
+in
+  {
+    options = {
+      programs.zsh.oh-my-zsh = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Enable oh-my-zsh.
+          '';
+        };
+
+        plugins = mkOption {
+          default = [];
+          type = types.listOf(types.str);
+          description = ''
+            List of oh-my-zsh plugins
+          '';
+        };
+
+        custom = mkOption {
+          default = "";
+          type = types.str;
+          description = ''
+            Path to a custom oh-my-zsh package to override config of oh-my-zsh.
+          '';
+        };
+
+        theme = mkOption {
+          default = "";
+          type = types.str;
+          description = ''
+            Name of the theme to be used by oh-my-zsh.
+          '';
+        };
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = with pkgs; [ oh-my-zsh ];
+
+      programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
+        # oh-my-zsh configuration generated by NixOS
+        export ZSH=${oh-my-zsh}/share/oh-my-zsh
+
+        ${optionalString (length(cfg.plugins) > 0)
+          "plugins=(${concatStringsSep " " cfg.plugins})"
+        }
+
+        ${optionalString (stringLength(cfg.custom) > 0)
+          "ZSH_CUSTOM=\"${cfg.custom}\""
+        }
+
+        ${optionalString (stringLength(cfg.theme) > 0)
+          "ZSH_THEME=\"${cfg.theme}\""
+        }
+
+        source $ZSH/oh-my-zsh.sh
+      '';
+    };
+  }
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 990e6648e82..a39c06c0913 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -99,6 +99,7 @@ in
         '';
       };
 
+
     };
 
   };
@@ -143,7 +144,6 @@ in
 
         ${cfge.interactiveShellInit}
 
-
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
       '';
 

From 37b0be688dd8a17bdd971bfb67ab236818023e62 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Sun, 23 Apr 2017 05:13:50 -0700
Subject: [PATCH 1374/1744] bundix: 2.0.8 -> 2.1.0 (#25129)

---
 doc/languages-frameworks/ruby.xml                | 3 +--
 pkgs/development/ruby-modules/bundix/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index b52361212f3..3c6e4f5e01a 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -16,8 +16,7 @@ $ cd sensu
 $ cat > Gemfile
 source 'https://rubygems.org'
 gem 'sensu'
-$ nix-shell -p bundler --command "bundler package --path /tmp/vendor/bundle"
-$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix
+$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix --magic
 $ cat > default.nix
 { lib, bundlerEnv, ruby }:
 
diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 378f148ca6a..42d6ee04b59 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -5,9 +5,9 @@ buildRubyGem rec {
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.0.8";
+  version = "2.1.0";
 
-  sha256 = "0ikpf2g01izadjpdnc4k2rb9v4g11f1jk2y5alxc7n7rxjkwdc66";
+  sha256 = "5a073c59dfc7e2367c47e6513fc8914d27e11c08f82bc1103c4793dfb2837bef";
 
   buildInputs = [bundler];
 

From 1931ad0e2cbb636d9fa09e3aa5afff24cc9b7deb Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 23 Apr 2017 12:00:45 +0000
Subject: [PATCH 1375/1744] qemu: 2.8.1 -> 2.9.0

---
 .../virtualization/qemu/default.nix           | 66 ++-----------------
 .../virtualization/qemu/no-etc-install.patch  |  9 ++-
 2 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 3714e6b2dd5..d09926da7cd 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,7 +18,7 @@
 
 with stdenv.lib;
 let
-  version = "2.8.1";
+  version = "2.9.0";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "1kdv8aa800rbsz9qnm4saw79vr052p83by21ryah68ics9z4r3h1";
+    sha256 = "053c7ivp3li7cdagzkp2wdc5myybzjf826r6qfkcf0xvn4bv5gq0";
   };
 
   buildInputs =
@@ -54,66 +54,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = let
-    upstreamPatch = name: commit: sha256: fetchurl {
-      name = "${name}.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=${commit}";
-      inherit sha256;
-    };
-  in [
-    ./no-etc-install.patch
-
-    # bugfixes
-    # xhci: fix event queue IRQ handling
-    (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5"
-      "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0")
-
-    # xhci: only free completed transfers
-    (upstreamPatch "qemu-xhci-free-completed-transfers" "f94d18d6c6df388fde196d3ab252f57e33843a8b"
-      "0lk19qss6ky7cqnvis54742cr2z0vl8c64chhch0kp6n83hray9x")
-
-    # security fixes from upstream
-    # net: imx: limit buffer descriptor count
-    (upstreamPatch "CVE-2016-7907" "81f17e0d435c3db3a3e67e0d32ebf9c98973211f"
-      "0dzghbm3jmnyw34kd40a6akrr1cpizd9hdzqmhlc2ljab7pr1rcb")
-
-    # watchdog: 6300esb: add exit function
-    (upstreamPatch "CVE-2016-10155" "eb7a20a3616085d46aa6b4b4224e15587ec67e6e"
-      "1xk00fyls0hdza11dyfrnzcn6gibmmcrwy7sxgp6iizp6wgzi3vw")
-
-    # audio: ac97: add exit function
-    (upstreamPatch "CVE-2017-5525" "12351a91da97b414eec8cdb09f1d9f41e535a401"
-      "190b4aqr35p4lb3rjarknfi1ip1c9zizliqp1dd6frx4364y5yp2")
-
-    # audio: es1370: add exit function
-    (upstreamPatch "CVE-2017-5526" "069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da"
-      "05xgzd3zldk3x2vqpjag9z5ilhdkpkyh633fb5kvnz8scns6v86f")
-
-    # serial: fix memory leak in serial exit
-    (upstreamPatch "CVE-2017-5579" "8409dc884a201bf74b30a9d232b6bbdd00cb7e2b"
-      "0lbcyhif1kdcy8my0bv8aqr2f421kmljcch3plrjzj9pgcm4sv83")
-
-    # megasas: fix guest-triggered memory leak
-    (upstreamPatch "CVE-2017-5856" "765a707000e838c30b18d712fe6cb3dd8e0435f3"
-      "03pjkn8l8rp9ip5h5rm1dp0nrwd43nmgpwamz4z1vy3rli1z3yjw")
-
-    # virtio-gpu: fix resource leak in virgl_cmd_resource_unref
-    (upstreamPatch "CVE-2017-5857" "5e8e3c4c75c199aa1017db816fca02be2a9f8798"
-      "1kz14rmxf049zl5m27apzpbvy8dk0g47n9gnwy0nm70g65rl1dh8")
-
-    # usb: ccid: check ccid apdu length
-    (upstreamPatch "CVE-2017-5898" "c7dfbf322595ded4e70b626bf83158a9f3807c6a"
-      "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn")
-
-    # xhci: apply limits to loops
-    (upstreamPatch "CVE-2017-5973" "f89b60f6e5fee3923bedf80e82b4e5efc1bb156b"
-      "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6")
-
-    # sd: sdhci: check transfer mode register in multi block transfer
-    (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
-      "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
-
-  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+  patches = [ ./no-etc-install.patch ]
+    ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index fbc5d1c7f76..47b4b3176dc 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,11 +1,10 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -461,7 +461,7 @@
+@@ -597,7 +597,7 @@
  
  
- install: all $(if $(BUILD_DOCS),install-doc) \
--install-datadir install-localstatedir
-+install-datadir
+-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
++install: all $(if $(BUILD_DOCS),install-doc) install-datadir
  ifneq ($(TOOLS),)
- 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
+	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
  endif

From fa652cef2211c95467451fb3d3e8617e7fa07264 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 23 Apr 2017 13:47:59 +0100
Subject: [PATCH 1376/1744] Fix node2nix installation instructions in README

---
 pkgs/development/node-packages/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 138d1475c2f..c1ed650f232 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -2,7 +2,7 @@ Node.js packages
 ===============
 To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
 
- 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA node2nix`.
+ 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA nodePackages.node2nix`.
  2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update,
     or remove package entries.
  3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.

From 4204c47b5c601a9cfec9712305a355d1a87d9aad Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 23 Apr 2017 16:06:55 +0300
Subject: [PATCH 1377/1744] qtstyleplugins: 2016-12-01 -> 2017-03-11

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

diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index 215a038adbe..dc27e2034f1 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, qmakeHook, qtbase, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "qtstyleplugins-2016-12-01";
+  name = "qtstyleplugins-2017-03-11";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtstyleplugins";
-    rev = "7aa47640c202cc4a9c16aa7df98191236743c8ba";
-    sha256 = "0pysgn5yhbh85rv7syvf2w9g1gj1z1nwspjri39dc95vj108lin5";
+    rev = "335dbece103e2cbf6c7cf819ab6672c2956b17b3";
+    sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
   };
 
   buildInputs = [ qmakeHook pkgconfig gtk2 ];
@@ -23,6 +23,5 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     maintainers = [ maintainers.gnidorah ];
     platforms = platforms.linux;
-    broken = builtins.compareVersions qtbase.version "5.7.0" > 0;
   };
 }

From 6df350ffc81e2a5891daa4962f68014378308c1c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 23 Apr 2017 16:34:24 +0300
Subject: [PATCH 1378/1744] firefox-bin: use wrapGAppsHook

---
 .../networking/browsers/firefox-bin/default.nix    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 5bd275ba31d..b05615e304e 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, makeWrapper
+{ stdenv, fetchurl, config, wrapGAppsHook
 , alsaLib
 , atk
 , cairo
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
 
   src = fetchurl { inherit (source) url sha512; };
 
-  phases = "unpackPhase installPhase";
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
@@ -124,11 +124,12 @@ stdenv.mkDerivation {
       stdenv.cc.cc
     ];
 
-  buildInputs = [ makeWrapper gtk3 defaultIconTheme ];
+  buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
 
   # "strip" after "patchelf" may break binaries.
   # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
+  dontStrip = true;
+  dontPatchELF = true;
 
   installPhase =
     ''
@@ -167,10 +168,7 @@ stdenv.mkDerivation {
       Categories=Application;Network;
       EOF
 
-      wrapProgram "$out/bin/firefox" \
-        --argv0 "$out/bin/.firefox-wrapped" \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
-        --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
+      gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
     '';
 
   passthru.ffmpegSupport = true;

From a02b18998fabaa43e31aa133ce83b4d5558c7f59 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 23 Apr 2017 16:34:46 +0300
Subject: [PATCH 1379/1744] firefox-bin: don't install .desktop file

It's handled by wrapFirefox.
---
 .../networking/browsers/firefox-bin/default.nix      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index b05615e304e..b6e8ac10fc9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -156,18 +156,6 @@ stdenv.mkDerivation {
       # wrapFirefox expects "$out/lib" instead of "$out/usr/lib"
       ln -s "$out/usr/lib" "$out/lib"
 
-      # Create a desktop item.
-      mkdir -p $out/share/applications
-      cat > $out/share/applications/firefox.desktop <<EOF
-      [Desktop Entry]
-      Type=Application
-      Exec=$out/bin/firefox
-      Icon=$out/usr/lib/firefox-bin-${version}/browser/icons/mozicon128.png
-      Name=Firefox
-      GenericName=Web Browser
-      Categories=Application;Network;
-      EOF
-
       gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
     '';
 

From b1750d699cfa6ef50ea02a41ee4758afc74d9536 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 23 Apr 2017 14:37:41 +0200
Subject: [PATCH 1380/1744] linux-chromiumos: remove 3.14

3.14 is no longer supported upstream by kernel.org and thus no longer
receives security patches. The git commit mentioned in this .nix isn't
even available in the linked repository --
https://chromium.googlesource.com/chromiumos/third_party/kernel -- so I
think this .nix might be dead anyway. Finally, it specifies 3.14.0,
which is so ridiculously old (the latest was 3.14.79) that nobody
develops for it.

Fixes: #25145
Supports: #25127
---
 .../fix-double-Kconfig-entry-3.14.patch       | 47 -------------------
 .../mfd-fix-dependency.patch                  | 25 ----------
 .../linux/kernel/linux-chromiumos-3.14.nix    | 21 ---------
 pkgs/os-specific/linux/kernel/patches.nix     |  6 ---
 pkgs/top-level/all-packages.nix               | 10 ----
 5 files changed, 109 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix

diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
deleted file mode 100644
index 7fdcafa62d9..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Fri, 25 Dec 2015 17:11:40 +0300
-Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry
-
----
- drivers/base/Kconfig | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
-index 946ced4..fc3405e1 100644
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER
- 	  no longer required unless you have a special firmware file that
- 	  resides in a non-standard path.
- 
--config WANT_DEV_COREDUMP
--	bool
--	help
--	  Drivers should "select" this option if they desire to use the
--	  device coredump mechanism.
--
--config ALLOW_DEV_COREDUMP
--	bool "Allow device coredump" if EXPERT
--	default y
--	help
--	  This option controls if the device coredump mechanism is available or
--	  not; if disabled, the mechanism will be omitted even if drivers that
--	  can use it are enabled.
--	  Say 'N' for more sensitive systems or systems that don't want
--	  to ever access the information to not have the code, nor keep any
--	  data.
--
--	  If unsure, say Y.
--
--config DEV_COREDUMP
--	bool
--	default y if WANT_DEV_COREDUMP
--	depends on ALLOW_DEV_COREDUMP
--
- config DEBUG_DRIVER
- 	bool "Driver Core verbose debug messages"
- 	depends on DEBUG_KERNEL
--- 
-2.6.3
-
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
deleted file mode 100644
index f17ecce92d1..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Fri, 25 Dec 2015 17:11:56 +0300
-Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC
-
----
- drivers/mfd/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index f425dce..a62a285 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE
- 
- config MFD_CROS_EC
- 	tristate "Support ChromeOS Embedded Controller"
--	depends on MFD_CORE
-+	select MFD_CORE
- 	help
- 	  If you say Y here you get support for the ChromeOS Embedded
- 	  Controller (EC) providing keyboard, battery and power services.
--- 
-2.6.3
-
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
deleted file mode 100644
index c8e189dcbfc..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args:
-
-# ChromiumOS requires a 64bit build host
-assert stdenv.is64bit;
-
-import ./generic.nix (args // rec {
-  version = "3.14.0";
-  extraMeta.branch = "3.14";
-
-  src = fetchgit {
-    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
-    rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57";
-    sha256 = "1gysrjanvnkbvgml7ipjr119bmlqfqn2zz5ca5kjkapwrfm3cb69";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-  features.chromiumos = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 6e3a182e0e2..22bdc3594ef 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -123,12 +123,6 @@ rec {
       patch = ./genksyms-fix-segfault.patch;
     };
 
-
-  chromiumos_Kconfig_fix_entries_3_14 =
-    { name = "Kconfig_fix_entries_3_14";
-      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch;
-    };
-
   chromiumos_Kconfig_fix_entries_3_18 =
     { name = "Kconfig_fix_entries_3_18";
       patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689b3082c0f..f7ee20a6d71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11688,15 +11688,6 @@ with pkgs;
     ];
   };
 
-  linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix {
-    kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14
-                      kernelPatches.chromiumos_mfd_fix_dependency
-                      kernelPatches.chromiumos_no_link_restrictions
-                      kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
-                    ];
-  };
-
   linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
@@ -11911,7 +11902,6 @@ with pkgs;
   };
 
   # ChromiumOS kernels
-  linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14);
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
 

From aef776836da2205d4b4f1cae99c5f7a72d6b114f Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Sun, 23 Apr 2017 16:05:38 +0200
Subject: [PATCH 1381/1744] zfs: Bump incompatibleKernelVersion to "4.11"

https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.
---
 pkgs/os-specific/linux/zfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 602031bab73..5c178f47b50 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -123,7 +123,7 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.10";
+      incompatibleKernelVersion = "4.11";
 
       version = "0.6.5.9";
 

From 55657286709b481a2c6e31d8447d006e1fdd25d1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 23 Apr 2017 17:08:12 +0300
Subject: [PATCH 1382/1744] system-config-printer: 1.5.7 -> 1.5.9

Use gappsWrapHook.
---
 .../misc/system-config-printer/default.nix    | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index f1a9c4b4640..0d66ef66b48 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
+{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
 , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl
 , libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
+, gobjectIntrospection, libgnome_keyring3
 , cups-filters
 , pythonPackages
 , withGUI ? true
 }:
 
-let majorVersion = "1.5";
-
-in stdenv.mkDerivation rec {
-  name = "system-config-printer-${majorVersion}.7";
+stdenv.mkDerivation rec {
+  name = "system-config-printer-${version}";
+  version = "1.5.9";
 
   src = fetchurl {
-    url = "http://cyberelk.net/tim/data/system-config-printer/${majorVersion}/${name}.tar.xz";
-    sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn";
+    url = "https://github.com/zdohnal/system-config-printer/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "03bwlpsiqpxzcwd78a7rmwiww4jnqd7kl7il4kx78l1r57lasd2r";
   };
 
   patches = [ ./detect_serverbindir.patch ];
@@ -22,8 +22,12 @@ in stdenv.mkDerivation rec {
     [ intltool pkgconfig glib udev libusb1 cups xmlto
       libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
       pythonPackages.python pythonPackages.wrapPython
+      libnotify gobjectIntrospection gdk_pixbuf pango atk
+      libgnome_keyring3
     ];
 
+  nativeBuildInputs = [ wrapGAppsHook ];
+
   pythonPath = with pythonPackages;
     [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
 
@@ -33,36 +37,22 @@ in stdenv.mkDerivation rec {
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     ];
 
-  stripDebugList = "bin lib etc/udev";
+  stripDebugList = [ "bin" "lib" "etc/udev" ];
 
   postInstall =
-    let
-      giTypelibPath = stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gdk_pixbuf.out gtk3.out pango.out atk.out libnotify.out ];
-    in
     ''
-      export makeWrapperArgs="--set prefix $out \
-          --set GI_TYPELIB_PATH ${giTypelibPath} \
-          --set CUPS_DATADIR ${cups-filters}/share/cups"
-      wrapPythonPrograms
-
-      # The program imports itself, so we need to move shell wrappers to a proper place.
-      fixupWrapper() {
-        mv "$out/share/system-config-printer/$2.py" \
-           "$out/bin/$1"
-        sed -i "s/.$2.py-wrapped/$2.py/g" "$out/bin/$1"
-        mv "$out/share/system-config-printer/.$2.py-wrapped" \
-           "$out/share/system-config-printer/$2.py"
-      }
-      fixupWrapper scp-dbus-service scp-dbus-service
-      fixupWrapper system-config-printer system-config-printer
-      fixupWrapper system-config-printer-applet applet
-      # This __init__.py is both executed and imported.
-      ( cd $out/share/system-config-printer/troubleshoot
-        mv .__init__.py-wrapped __init__.py
+      buildPythonPath "$out $pythonPath"
+      gappsWrapperArgs+=(
+        --prefix PATH "$program_PATH"
+        --set CUPS_DATADIR "${cups-filters}/share/cups"
       )
 
+      find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do
+        patchPythonScript "$f"
+      done
+
       # The below line will be unneeded when the next upstream release arrives.
-      sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
+      sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
 
       # Manually expand literal "$(out)", which have failed to expand
       sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \

From 13162b9ddb3dd92e4c75c55b1f73f3731384b2d6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 23 Apr 2017 17:52:36 +0300
Subject: [PATCH 1383/1744] fritzing: 0.9.0b -> 0.9.3b

Fixes #24943.
---
 .../science/electronics/fritzing/default.nix  | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 0f817a71a70..838697f1394 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,24 +1,45 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, boost }:
+{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmakeHook, pkgconfig
+, qtbase, qtsvg, qtserialport, boost, libgit2
+}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.0b";
   name = "fritzing-${version}";
+  version = "0.9.3b";
 
-  src = fetchurl {
-    url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2";
-    sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk";
+  src = fetchFromGitHub {
+    owner = "fritzing";
+    repo = "fritzing-app";
+    rev = version;
+    sha256 = "0hpyc550xfhr6gmnc85nq60w00rm0ljm0y744dp0z88ikl04f4s3";
   };
 
-  unpackPhase = ''
-    tar xjf ${src}
-  '';
+  parts = fetchFromGitHub {
+    owner = "fritzing";
+    repo = "fritzing-parts";
+    rev = version;
+    sha256 = "1d2v8k7p176j0lczx4vx9n9gbg3vw09n2c4b6w0wj5wqmifywhc1";
+  };
 
-  buildInputs = [ qtbase qtsvg boost qmakeHook ];
+  patches = [(fetchpatch {
+    name = "0001-Squashed-commit-of-the-following.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Squashed-commit-of-the-following.patch?h=fritzing";
+    sha256 = "1cv6myidxhy28i8m8v13ghzkvx5978p9dcd8v7885y0l1h3108mf";
+  })];
+
+  buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
+
+  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
 
   qmakeFlags = [ "phoenix.pro" ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
-    cd fritzing-${version}.source
+    ln -s "$parts" parts
+  '';
+
+  postInstall = ''
+    wrapQtProgram $out/bin/Fritzing
   '';
 
   meta = {

From 35eeb08dc675a89d8f4c18da59f5c8995311b925 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Sat, 22 Apr 2017 15:59:06 -0700
Subject: [PATCH 1384/1744] plex: fix startup issue

Fixes an issue with plex on startup

Fixes #24090
---
 nixos/modules/services/misc/plex.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 9c0bea8d3bf..ecd9a6f52da 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -91,7 +91,7 @@ in
         # Copy the database skeleton files to /var/lib/plex/.skeleton
         # See the the Nix expression for Plex's package for more information on
         # why this is done.
-        test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
+        install --owner ${cfg.user} --group ${cfg.group} -d "${cfg.dataDir}/.skeleton"
         for db in "com.plexapp.plugins.library.db"; do
             if [ ! -e  "${cfg.dataDir}/.skeleton/$db" ]; then
               cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"

From a667897e0436b7ed25587885e04f754e56e32865 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Sun, 23 Apr 2017 08:00:40 -0800
Subject: [PATCH 1385/1744] kile: build with okular for embedded viewer

kile: build with okular for embedded viewer
---
 pkgs/applications/editors/kile/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index a5914c92e8f..fa8d4d8313e 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -17,6 +17,7 @@
 , kparts
 , ktexteditor
 , kwindowsystem
+, okular
 , poppler
 }:
 
@@ -48,6 +49,7 @@ let
         kparts
         ktexteditor
         kwindowsystem
+        okular.unwrapped
         poppler
         qtscript
       ];
@@ -64,5 +66,5 @@ kdeWrapper
 {
   inherit unwrapped;
   targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped ];
+  paths = [ konsole.unwrapped okular.unwrapped ];
 }

From c44be81d3898386282a88ad3ca07a6558e654bf0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 23 Apr 2017 18:37:30 +0200
Subject: [PATCH 1386/1744] Revert "ipfs: 0.4.6 -> 0.4.8" (#25149)

This reverts commit a3098900448544a084cb0ab0d83d9caadd19bbca.
---
 pkgs/applications/networking/ipfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 2be39df6147..a00aebef296 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "0.4.8";
-  rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87";
+  version = "0.4.6";
+  rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5";
+      sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh";
+    sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13";
   };
 
   meta = with stdenv.lib; {

From 83e1400e0ce762a9932041977e3c9b90f049425b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 19:02:50 +0200
Subject: [PATCH 1387/1744] nixos/slim: Implement logging to journal

The main change here is a patch of SLiM to tread a log file of
/dev/stderr specially in that it now uses std::cerr instead of a file
for logging.

This allows us to set the logfile to stderr in NixOS for the generated
SLiM configuration file and we now get logging to the systemd journal.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../services/x11/display-managers/slim.nix    |  7 +-
 .../display-managers/slim/default.nix         |  4 +
 .../display-managers/slim/no-logfile.patch    | 80 +++++++++++++++++++
 3 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/display-managers/slim/no-logfile.patch

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 05b979eef47..0c4dd1973b5 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -17,6 +17,7 @@ let
       login_cmd exec ${pkgs.stdenv.shell} ${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
       ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
       ${optionalString (cfg.defaultUser != null) ("focus_password yes")}
       ${optionalString cfg.autoLogin "auto_login yes"}
@@ -128,11 +129,7 @@ in
   config = mkIf cfg.enable {
 
     services.xserver.displayManager.job =
-      { preStart =
-          ''
-            rm -f /var/log/slim.log
-          '';
-        environment =
+      { environment =
           { SLIM_CFGFILE = slimConfig;
             SLIM_THEMESDIR = slimThemesDir;
           };
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index fca84199e51..c75a8976b3f 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
       # Ensure that sessions appear in sort order, rather than in
       # directory order.
       ./sort-sessions.patch
+
+      # Allow to set logfile to a special "/dev/stderr" in order to continue
+      # logging to stderr and thus to the journal.
+      ./no-logfile.patch
     ];
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
diff --git a/pkgs/applications/display-managers/slim/no-logfile.patch b/pkgs/applications/display-managers/slim/no-logfile.patch
new file mode 100644
index 00000000000..f2f5f154993
--- /dev/null
+++ b/pkgs/applications/display-managers/slim/no-logfile.patch
@@ -0,0 +1,80 @@
+diff --git a/log.cpp b/log.cpp
+index b44677a..7c89dda 100644
+--- a/log.cpp
++++ b/log.cpp
+@@ -1,23 +1,31 @@
+ #include "log.h"
+ #include <iostream>
++#include <cstring>
+ 
+ bool
+ LogUnit::openLog(const char * filename)
+ {
+-	if (logFile.is_open()) {
++	if (isFile && logFile.is_open()) {
+ 		cerr << APPNAME
+ 			<< ": opening a new Log file, while another is already open"
+ 			<< endl;
+-		logFile.close();
++		closeLog();
+ 	}
+-	logFile.open(filename, ios_base::app);
+ 
+-	return !(logFile.fail());
++	if (strcmp(filename, "/dev/stderr") == 0) {
++		isFile = false;
++		return true;
++	} else {
++		logFile.open(filename, ios_base::app);
++		isFile = true;
++		return !(logFile.fail());
++	}
+ }
+ 
+ void
+ LogUnit::closeLog()
+ {
++	if (!isFile) return;
+ 	if (logFile.is_open())
+ 		logFile.close();
+ }
+diff --git a/log.h b/log.h
+index b7810be..ad548a2 100644
+--- a/log.h
++++ b/log.h
+@@ -9,11 +9,14 @@
+ #endif
+ #include "const.h"
+ #include <fstream>
++#include <iostream>
+ 
+ using namespace std;
+ 
+ static class LogUnit {
+ 	ofstream logFile;
++	bool isFile;
++	inline ostream &getStream() { return isFile ? logFile : cerr; }
+ public:
+ 	bool openLog(const char * filename);
+ 	void closeLog();
+@@ -22,17 +25,17 @@ public:
+ 
+ 	template<typename Type>
+ 	LogUnit & operator<<(const Type & text) {
+-		logFile << text; logFile.flush();
++		getStream() << text; getStream().flush();
+ 		return *this;
+ 	}
+ 
+ 	LogUnit & operator<<(ostream & (*fp)(ostream&)) {
+-		logFile << fp; logFile.flush();
++		getStream() << fp; getStream().flush();
+ 		return *this;
+ 	}
+ 
+ 	LogUnit & operator<<(ios_base & (*fp)(ios_base&)) {
+-		logFile << fp; logFile.flush();
++		getStream() << fp; getStream().flush();
+ 		return *this;
+ 	}
+ } logStream;

From dc87b5587e3fb39e96e6b965a26f324daf7508f8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 19:14:44 +0200
Subject: [PATCH 1388/1744] nixos: Add a VM test for the SLiM display manager

This is currently our default display manager, so I'm adding this to the
"tested" job as well to ensure we don't ship broken revisions where X is
most likely not working.

The test uses a custom SLiM theme that's specifically tailored for good
OCR results (mainly white background and black fonts without anything
else), because our default NixOS theme has a very small contrast between
background and fonts in some places.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/slim.nix       | 66 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 nixos/tests/slim.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 5c1112a1c6d..4217f5940ec 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -94,6 +94,7 @@ in rec {
         (all nixos.tests.proxy)
         (all nixos.tests.sddm.default)
         (all nixos.tests.simple)
+        (all nixos.tests.slim)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 95b284cb705..0fec97b9c27 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -299,6 +299,7 @@ in rec {
   tests.samba = callTest tests/samba.nix {};
   tests.sddm = callSubTests tests/sddm.nix {};
   tests.simple = callTest tests/simple.nix {};
+  tests.slim = callTest tests/slim.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix
new file mode 100644
index 00000000000..7b939d83638
--- /dev/null
+++ b/nixos/tests/slim.nix
@@ -0,0 +1,66 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "slim";
+
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
+
+  machine = { pkgs, lib, ... }: {
+    imports = [ ./common/user-account.nix ];
+    services.xserver.enable = true;
+    services.xserver.windowManager.default = "icewm";
+    services.xserver.windowManager.icewm.enable = true;
+    services.xserver.desktopManager.default = "none";
+    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
+      '';
+    };
+  };
+
+  enableOCR = true;
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.config.users.extraUsers.alice;
+  in ''
+    startAll;
+    $machine->waitForText(qr/Username:/);
+    $machine->sendChars("${user.name}\n");
+    $machine->waitForText(qr/Password:/);
+    $machine->sendChars("${user.password}\n");
+
+    $machine->waitForFile('${user.home}/.Xauthority');
+    $machine->succeed('xauth merge ${user.home}/.Xauthority');
+    $machine->waitForWindow('^IceWM ');
+
+    # Make sure SLiM doesn't create a log file
+    $machine->fail('test -e /var/log/slim.log');
+  '';
+})

From ddb788b6711af38d7251177f9ff2544496bca1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 22 Apr 2017 11:57:23 +0200
Subject: [PATCH 1389/1744] OVMF: get version number from edk2

OVMF is built from edk2 sources so that's where its version number comes
from (logically). The edk2 version number is 2014-12-10, so this change
only ensures the version numbers won't drift apart in the future. (There
is no hash change.)
---
 pkgs/applications/virtualization/OVMF/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index fc3c679d414..608ae594a2e 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -9,10 +9,11 @@ let
   else
     throw "Unsupported architecture";
 
+  version = (builtins.parseDrvName edk2.name).version;
 in
 
 stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
-  name = "OVMF-2014-12-10";
+  name = "OVMF-${version}";
 
   # TODO: properly include openssl for secureBoot
   buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];

From af8f87a3a124c7db1506119b379d673d1982e4c9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 6 Feb 2017 18:13:02 -0500
Subject: [PATCH 1390/1744] top-level: Do not splice `pkgs`, `buildPackages` or
 `*Platform`

 - `pkgs` is self-similar, and thus already spliced
 - `buildPackages` is an ingredient of splicing and should be kept as is
 - The platforms are not packages or package sets and couldn't be spliced

There's probably other things that shouldn't be spliced too. The best long-
term solution is simply to stop splicing altogether.
---
 pkgs/top-level/splice.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index a22587d5b57..bb6fc47b1d2 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -64,7 +64,11 @@ let
 
   splicedPackages =
     if actuallySplice
-    then splicer defaultBuildScope defaultRunScope
+    then splicer defaultBuildScope defaultRunScope // {
+      # These should never be spliced under any circumstances
+      inherit (pkgs) pkgs buildPackages
+        buildPlatform targetPlatform hostPlatform;
+    }
     else pkgs // pkgs.xorg;
 
 in

From d59e4fbb75e307fd1a0e98c44627f38bab504aeb Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 23 Apr 2017 14:01:03 -0400
Subject: [PATCH 1391/1744] stage.nix: Better explain why `buildPackages` as
 `null` is valid arg

---
 pkgs/top-level/stage.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 6febedb79f3..ead6ec18fb3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -46,7 +46,8 @@
   ##
 
 , # The package set used at build-time. If null, `buildPackages` will
-  # be defined internally as the produced package set as itself.
+  # be defined internally as the final produced package set itself. This allows
+  # us to avoid expensive splicing.
   buildPackages
 
 , # The standard environment to use for building packages.

From 863d79b36446bb2dbcc34d4f57c832ac2dc57f68 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 6 Feb 2017 18:13:02 -0500
Subject: [PATCH 1392/1744] top-level: Introduce targetPackages and a "double
 link fold"

Each bootstrapping stage ought to just depend on the previous stage, but
poorly-written compilers break this elegence. This provides an easy-enough
way to depend on the next stage: targetPackages. PLEASE DO NOT USE IT
UNLESS YOU MUST!

I'm hoping someday in a pleasant future I can revert this commit :)
---
 doc/cross-compilation.xml |  5 +++++
 pkgs/stdenv/booter.nix    | 41 ++++++++++++++++++++++++++++++++++-----
 pkgs/top-level/splice.nix |  2 +-
 pkgs/top-level/stage.nix  | 10 ++++++++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 06a8919c2a1..728616a9f26 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -167,6 +167,11 @@
       Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.
       For now, feel free to use either method.
     </para>
+    <note><para>
+      There is also a "backlink" <varname>__targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
+      This is a hack, though, to accommodate compilers with lousy build systems.
+      Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
+    </para></note>
   </section>
 
 </section>
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 2c82d12da95..d459deb6ab5 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -41,6 +41,35 @@
 # other words, this does a foldr not foldl.
 stageFuns: let
 
+  /* "dfold" a ternary function `op' between successive elements of `list' as if
+     it was a doubly-linked list with `lnul' and `rnul` base cases at either
+     end. In precise terms, `fold op lnul rnul [x_0 x_1 x_2 ... x_n-1]` is the
+     same as
+
+       let
+         f_-1  = lnul;
+         f_0   = op f_-1   x_0  f_1;
+         f_1   = op f_0    x_1  f_2;
+         f_2   = op f_1    x_2  f_3;
+         ...
+         f_n   = op f_n-1  x_n  f_n+1;
+         f_n+1 = rnul;
+       in
+         f_0
+  */
+  dfold = op: lnul: rnul: list:
+    let
+      len = builtins.length list;
+      go = pred: n:
+        if n == len
+        then rnul
+        else let
+          # Note the cycle -- call-by-need ensures finite fold.
+          cur  = op pred (builtins.elemAt list n) succ;
+          succ = go cur (n + 1);
+        in cur;
+    in go lnul 0;
+
   # Take the list and disallow custom overrides in all but the final stage,
   # and allow it in the final flag. Only defaults this boolean field if it
   # isn't already set.
@@ -55,19 +84,21 @@ stageFuns: let
 
   # Adds the stdenv to the arguments, and sticks in it the previous stage for
   # debugging purposes.
-  folder = stageFun: finalSoFar: let
-    args = stageFun finalSoFar;
+  folder = nextStage: stageFun: prevStage: let
+    args = stageFun prevStage;
     args' = args // {
       stdenv = args.stdenv // {
         # For debugging
-        __bootPackages = finalSoFar;
+        __bootPackages = prevStage;
+        __hatPackages = nextStage;
       };
     };
   in
     if args.__raw or false
     then args'
     else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
-      buildPackages = if args.selfBuild or true then null else finalSoFar;
+      buildPackages = if args.selfBuild or true then null else prevStage;
+      __targetPackages = if args.selfBuild or true then null else nextStage;
     });
 
-in lib.lists.fold folder {} withAllowCustomOverrides
+in dfold folder {} {} withAllowCustomOverrides
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index bb6fc47b1d2..43951100de3 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -66,7 +66,7 @@ let
     if actuallySplice
     then splicer defaultBuildScope defaultRunScope // {
       # These should never be spliced under any circumstances
-      inherit (pkgs) pkgs buildPackages
+      inherit (pkgs) pkgs buildPackages __targetPackages
         buildPlatform targetPlatform hostPlatform;
     }
     else pkgs // pkgs.xorg;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index ead6ec18fb3..d8e190cfd4b 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -50,6 +50,14 @@
   # us to avoid expensive splicing.
   buildPackages
 
+, # The package set used in the next stage. If null, `__targetPackages` will be
+  # defined internally as the final produced package set itself, just like with
+  # `buildPackages` and for the same reasons.
+  #
+  # THIS IS A HACK for compilers that don't think critically about cross-
+  # compilation. Please do *not* use unless you really know what you are doing.
+  __targetPackages
+
 , # The standard environment to use for building packages.
   stdenv
 
@@ -88,6 +96,8 @@ let
   stdenvBootstappingAndPlatforms = self: super: {
     buildPackages = (if buildPackages == null then self else buildPackages)
       // { recurseForDerivations = false; };
+    __targetPackages = (if __targetPackages == null then self else __targetPackages)
+      // { recurseForDerivations = false; };
     inherit stdenv
       buildPlatform hostPlatform targetPlatform;
   };

From 749d495cb3a8d0d704fc157c92307c08a1a39f99 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 23 Apr 2017 21:10:35 +0300
Subject: [PATCH 1393/1744] rambox, franz: cleanup (#25020)

---
 .../instant-messengers/franz/default.nix      | 32 +++++++++++--------
 .../instant-messengers/rambox/default.nix     | 31 ++++++++++--------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index ef84f6402b5..d5ef754e173 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -25,15 +25,18 @@ in stdenv.mkDerivation rec {
       "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy";
   };
 
-  phases = [ "unpackPhase" "installPhase" "postFixup" ];
+  # don't remove runtime deps
+  dontPatchELF = true;
 
-  deps = with xorg; [
-   gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-   libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-   libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib
-   cups expat stdenv.cc.cc
-
-   udev libnotify
+  deps = (with xorg; [
+    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+    libXrender libX11 libXtst libXScrnSaver
+  ]) ++ [
+    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
+  # runtime deps
+  ] ++ [
+    udev libnotify
   ];
 
   unpackPhase = ''
@@ -42,19 +45,20 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
-    patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz
+    patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
 
-    mkdir -p $out/bin $out/share/franz
-    cp -r * $out/share/franz
-    ln -s $out/share/franz/Franz $out/bin
+    mkdir -p $out/bin $out/opt/franz
+    cp -r * $out/opt/franz
+    ln -s $out/opt/franz/Franz $out/bin
 
+    # provide desktop item and icon
     mkdir -p $out/share/applications $out/share/pixmaps
     ln -s ${desktopItem}/share/applications/* $out/share/applications
-    ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
+    ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
   '';
 
   postFixup = ''
-    paxmark m $out/share/franz/Franz
+    paxmark m $out/opt/franz/Franz
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 15df03ac90d..f3212ea9b77 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -12,7 +12,6 @@ let
     url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
     sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b";
   };
-
   desktopItem = makeDesktopItem rec {
     name = "Rambox";
     exec = "rambox";
@@ -30,31 +29,35 @@ in stdenv.mkDerivation rec {
       "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
   };
 
-  phases = [ "unpackPhase" "installPhase" "postFixup" ];
+  # don't remove runtime deps
+  dontPatchELF = true;
 
-  deps = with xorg; [
-   gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-   libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-   libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib
-   cups expat stdenv.cc.cc
-
-   udev libnotify
+  deps = (with xorg; [
+    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+    libXrender libX11 libXtst libXScrnSaver
+  ]) ++ [
+    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
+  # runtime deps
+  ] ++ [
+    udev libnotify
   ];
 
   installPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
-    patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
+    patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
 
-    mkdir -p $out/bin $out/share/rambox
-    cp -r * $out/share/rambox
-    ln -s $out/share/rambox/rambox $out/bin
+    mkdir -p $out/bin $out/opt/rambox
+    cp -r * $out/opt/rambox
+    ln -s $out/opt/rambox/rambox $out/bin
 
+    # provide desktop item
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications
   '';
 
   postFixup = ''
-    paxmark m $out/share/rambox/rambox
+    paxmark m $out/opt/rambox/rambox
   '';
 
   meta = with stdenv.lib; {

From f84b8178aa2f9b03c42d6ddc3379b7f5adb65b02 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 20:21:26 +0200
Subject: [PATCH 1394/1744] wine-staging: Fix SHA256 hash

In c6b3c66277ff97d77d51c3a822458f19982b922a, the unstable version has
been bumped to 2.6.

Unfortunately the staging source is re-using the version attribute from
the unstable source and thus has been bumped as well.

I have built wineStaging on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
---
 pkgs/misc/emulators/wine/sources.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 42d99a39eee..8c04b4fc433 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,6 +31,7 @@ in rec {
   };
 
   unstable = fetchurl rec {
+    # NOTE: Don't forget to change the SHA256 for staging as well.
     version = "2.6";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
     sha256 = "1h5ajw50fax2pg9p4wch6824zxdd85g2gh9nkbllfxj3ixsn9zz6";
@@ -39,7 +40,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1l0sjbsajr4m7w3ar2ljwr3ffmwyv57g85a068ard3v8fv4nil22";
+    sha256 = "1j1fsq7pb7rxi7ppagrk93gmg5wk3anr9js0civxiqd3h8d4lsz2";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From f3b1d6925e5a28daea186a6dd4290e63ac7872c7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 23 Apr 2017 19:02:15 +0300
Subject: [PATCH 1395/1744] Revert "patchutils: Drop patch applied upstream"

This reverts commit 1e1b68b4a02f7e671b8e56d841b4c0962e5d6be9.
---
 pkgs/tools/text/patchutils/default.nix        |  2 +
 .../tools/text/patchutils/drop-comments.patch | 84 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/tools/text/patchutils/drop-comments.patch

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 8a066864d22..28b3b6ed5b7 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
   };
 
+  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
+
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/patchutils/drop-comments.patch b/pkgs/tools/text/patchutils/drop-comments.patch
new file mode 100644
index 00000000000..e02693a5683
--- /dev/null
+++ b/pkgs/tools/text/patchutils/drop-comments.patch
@@ -0,0 +1,84 @@
+From 58987954647f51dc42fb13b7759923c6170dd905 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Fri, 9 May 2014 16:23:27 +0100
+Subject: Make --clean drop comments after '@@' lines as well (trac #29).
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 99ad2a3..f3c6dbc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -198,6 +198,7 @@ TESTS = tests/newline1/run-test \
+ 	tests/convert1/run-test \
+ 	tests/convert2/run-test \
+ 	tests/clean1/run-test \
++	tests/clean2/run-test \
+ 	tests/stdin/run-test
+ 
+ # These ones don't work yet.
+diff --git a/src/filterdiff.c b/src/filterdiff.c
+index 383e72b..6ca2316 100644
+--- a/src/filterdiff.c
++++ b/src/filterdiff.c
+@@ -2,7 +2,7 @@
+  * filterdiff - extract (or exclude) a diff from a diff file
+  * lsdiff - show which files are modified by a patch
+  * grepdiff - show files modified by a patch containing a regexp
+- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh <twaugh@redhat.com>
++ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013, 2014 Tim Waugh <twaugh@redhat.com>
+  *
+  * 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
+@@ -408,7 +408,8 @@ do_unified (FILE *f, char *header[2], int match, char **line,
+ 							 " Hunk #%lu, %s",
+ 							 hunknum, bestname);
+ 
+-					fputs (trailing, output_to);
++					fputs (clean_comments ? "\n" : trailing,
++					       output_to);
+ 					break;
+ 				case Before:
+ 					// Note the initial line number
+diff --git a/tests/clean2/run-test b/tests/clean2/run-test
+new file mode 100755
+index 0000000..42320df
+--- /dev/null
++++ b/tests/clean2/run-test
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# This is a filterdiff(1) testcase.
++# Test: Make sure --clean removes hunk-level comments.
++
++
++. ${top_srcdir-.}/tests/common.sh
++
++cat << EOF > diff
++non-diff line
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@ this is a hunk-level comment
+++a
++EOF
++
++${FILTERDIFF} --clean diff 2>errors >filtered || exit 1
++[ -s errors ] && exit 1
++
++cat << EOF | cmp - filtered || exit 1
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@
+++a
++EOF
++
++${FILTERDIFF} --clean -x file1 diff 2>errors >filtered || exit 1
++[ -s errors ] && exit 1
++cat << EOF | cmp - filtered || exit 1
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@
+++a
++EOF
+-- 
+cgit v0.10.1
+

From 814772e93e1dd38d0a097521296350e7e0be4926 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 23 Apr 2017 19:02:25 +0300
Subject: [PATCH 1396/1744] Revert "patchutils: 0.3.3 -> 0.3.4"

This reverts commit d550c9071206013cb90ee9317080db82e286f69b.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
---
 pkgs/tools/text/patchutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 28b3b6ed5b7..75922a6c830 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchutils-0.3.4";
+  name = "patchutils-0.3.3";
 
   src = fetchurl {
     url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
-    sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
+    sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
   };
 
   patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one

From 5a3e454db37fd20f5432a64137c1025cf892eb85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Apr 2017 20:53:34 +0200
Subject: [PATCH 1397/1744] Revert "kdiff3: fixup patch hash after #25059"

This reverts commit b72d4e13c72f5761642e8a664e21bb83e4b11dd9.
The problem was fixed by the parent commit.
---
 pkgs/tools/text/kdiff3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index e199d77e226..bd76b89ccf7 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -22,7 +22,7 @@ let
       (fetchpatch {
         name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
         url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
-        sha256 = "0v638rk05wz51qcqnc6blcp2v74f04wn8ifgzw7qi5vr0yfh775r";
+        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
       })
     ];
     patchFlags = "-p 2";

From 0a12aafde42ddecfd268a21aa6ada4c0946cd30f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Apr 2017 21:17:31 +0200
Subject: [PATCH 1398/1744] zsh-syntax-highlighting: Add more configuration
 options and move to module (#25153)

* programs.zsh: factor zsh-syntax-highlighting out into its own module

* programs.zsh.syntax-highlighting: add `highlighters` option

* programs.zsh: document BC break introduced by moving zsh-syntax-completion into its own module
---
 nixos/modules/module-list.nix                 |  1 +
 .../programs/zsh/zsh-syntax-highlighting.nix  | 43 +++++++++++++++++++
 nixos/modules/programs/zsh/zsh.nix            | 16 +------
 nixos/modules/rename.nix                      |  3 ++
 4 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 nixos/modules/programs/zsh/zsh-syntax-highlighting.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6e99ead5862..4ff069f48ab 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -104,6 +104,7 @@
   ./programs/xonsh.nix
   ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
+  ./programs/zsh/zsh-syntax-highlighting.nix
   ./rename.nix
   ./security/acme.nix
   ./security/apparmor.nix
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
new file mode 100644
index 00000000000..962c1f920a8
--- /dev/null
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zsh.syntax-highlighting;
+in
+  {
+    options = {
+      programs.zsh.syntax-highlighting = {
+        enable = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Enable zsh-syntax-highlighting.
+          '';
+        };
+
+        highlighters = mkOption {
+          default = [ "main" ];
+          type = types.listOf(types.str);
+          description = ''
+            Specifies the highlighters to be used by zsh-syntax-highlighting.
+
+            The following defined options can be found here:
+            https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+          '';
+        };
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ];
+
+      programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
+        source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+        ${optionalString (length(cfg.highlighters) > 0)
+          "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
+        }
+      '';
+    };
+  }
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a39c06c0913..acb3e987aee 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -84,14 +84,6 @@ in
         type = types.bool;
       };
 
-      enableSyntaxHighlighting = mkOption {
-        default = false;
-        description = ''
-          Enable zsh-syntax-highlighting
-        '';
-        type = types.bool;
-      };
-      
       enableAutosuggestions = mkOption {
         default = false;
         description = ''
@@ -99,7 +91,6 @@ in
         '';
       };
 
-
     };
 
   };
@@ -131,10 +122,6 @@ in
 
         ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""}
 
-        ${optionalString (cfg.enableSyntaxHighlighting)
-          "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-        }
-
         ${optionalString (cfg.enableAutosuggestions)
           "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
         }
@@ -206,8 +193,7 @@ in
     environment.etc."zinputrc".source = ./zinputrc;
 
     environment.systemPackages = [ pkgs.zsh ]
-      ++ optional cfg.enableCompletion pkgs.nix-zsh-completions
-      ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting;
+      ++ optional cfg.enableCompletion pkgs.nix-zsh-completions;
 
     environment.pathsToLink = optional cfg.enableCompletion "/share/zsh";
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0174fe544e3..8a313f6c7fc 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -204,5 +204,8 @@ with lib;
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+
+    # ZSH
+    (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntax-highlighting" "enable" ])
   ];
 }

From b125fbfb0731c225bb90c31fabf2e449a03b8de9 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 23 Apr 2017 21:20:18 +0200
Subject: [PATCH 1399/1744] ponyc: 0.13.0 -> 0.13.1

https://github.com/ponylang/ponyc/issues/1848
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 5655cf61a0b..0a90927751a 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1agb7aiii7pl8zsh3h0lfzghmm1ajj15gx1j48xjyvplxixdgn9j";
+    sha256 = "1x3w7mxpwgf2bn2c1qqxbj4w5gp775l7r42lj9jvspayb6a6w28s";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From cccd8420c580fabf96e46f37556e904a202118d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 07:49:04 +0200
Subject: [PATCH 1400/1744] vimPlugins.vim-trailing-whitespace init at
 2016-03-27

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f818962b8ae..8b4ed995bad 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -525,6 +525,17 @@ rec {
 
   };
 
+  vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-trailing-whitespace-2016-03-27";
+    src = fetchgit {
+      url = "https://github.com/bronson/vim-trailing-whitespace";
+      rev = "733fb64337b6da4a51c85a43450cd620d8b617b5";
+      sha256 = "1469bd744lf8vk1nnw7kyq4ahpw84crp614mkpq88cs6rhvjhcyw";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2017-01-28";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1427f4fafa0..1fdb11058b8 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -33,6 +33,7 @@
 "github:bbchung/clighter8"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
+"github:bronson/vim-trailing-whitespace"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"

From 647b1a68cd5c3d28041eb3eac46707687798c9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 07:47:51 +0200
Subject: [PATCH 1401/1744] vimPlugins: update sources

---
 pkgs/misc/vim-plugins/default.nix | 528 ++++++++++++++----------------
 1 file changed, 252 insertions(+), 276 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8b4ed995bad..f58b9c197c3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -125,11 +125,11 @@ rec {
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2017-02-26";
+    name = "CheckAttach-2017-03-15";
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
-      rev = "4e841a854e8ee3fd24849e972a3c3f5456ef6be3";
-      sha256 = "0dvqrca1sa8r29kg2k6qhpp3mbsbk29p81zpa7gzw8h73kqfwph1";
+      rev = "b583efd45e03902438a55299623390a0f9253513";
+      sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34";
     };
     dependencies = [];
 
@@ -180,11 +180,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-02-28";
+    name = "Syntastic-2017-04-18";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "48e8b0e9d2721f608fd1d1157c9388b2626cbddf";
-      sha256 = "0q52iqnbqm1h5iy8wr4l03y8w9yamgk48sd495p255pmxn8dryc5";
+      rev = "0bfac45565efa4e94364818b3b0cb2ee46826a0f";
+      sha256 = "1s798kjdms8piq2yf6c8sxmvpp13ddp5d1ghq6fcvwfh5s5k7b2n";
     };
     dependencies = [];
 
@@ -213,22 +213,22 @@ rec {
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-02-28";
+    name = "The_NERD_Commenter-2017-04-07";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "41e686824a5b77ba5afe9c5dabdc045aac922c5a";
-      sha256 = "1c9zhlljbnskmgn8ycckznbh05cf3ldbq902gg8rn0n0433dy7wc";
+      rev = "285902752f7ab2052ac700a6d29b263dd5788afb";
+      sha256 = "1hd5ibpvxra8asr4zp0l68wc4djjgfbvh7kzmxc1r7jqr70wj8dl";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-02-25";
+    name = "The_NERD_tree-2017-04-12";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "e671e403dd1ec1da59f70605c73aaedb6cb0e637";
-      sha256 = "0g3bdwbg6hyh83qn4ad1hjk3pvq049fjqwj6viwa668zyvq4vwm4";
+      rev = "45f4d61f04e7ef33360f7735931da9ea2ebc05e0";
+      sha256 = "1wcfz94q8lv304pdr2721gsalhvns3g9ya4lq1agp2r3m6hfsrw6";
     };
     dependencies = [];
 
@@ -257,11 +257,11 @@ rec {
   };
 
   WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2016-07-06";
+    name = "WebAPI-2017-03-13";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
-      rev = "e3fa93f29a3a0754204002775e140d8a9acfd7fd";
-      sha256 = "0z6s3cnipcww4q33d4dcp0p8jw29izghcrj75fxy6dmy1yw2fbcr";
+      rev = "54b0c168dfbd3fd4a7d876a3cead1bdaf7810b0a";
+      sha256 = "1mjj87f1sb9kmpkclv9qpbmsf6j6nr536636867k1bis39rahkdg";
     };
     dependencies = [];
 
@@ -298,11 +298,11 @@ rec {
   };
 
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2016-03-10";
+    name = "commentary-2017-03-12";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
-      rev = "73e0d9a9d1f51b6cc9dc965f62669194ae851cb1";
-      sha256 = "1z409hpdk22v2ccx2y3sgcjf4fmnq7pyjfnk72srpqydfivxsl13";
+      rev = "be79030b3e8c0ee3c5f45b4333919e4830531e80";
+      sha256 = "1msbmbz96wa88ymjvcrbr07mxdrsjy1w2hl7z4pihf318ryq98cm";
     };
     dependencies = [];
 
@@ -345,18 +345,6 @@ rec {
 
   };
 
-  ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ensime-vim-2017-02-06";
-    src = fetchgit {
-      url = "git://github.com/ensime/ensime-vim";
-      rev = "7b5f79c67a078c6e1e5f8c906d4227ce86d33df8";
-      sha256 = "04knizaa4gc1z22gxj41qybjl4ysqpv15rwi28h10l7gk9fb1b41";
-    };
-    dependencies = ["vimproc" "vimshell" "self" "forms"];
-
-    pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
-  };
-
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "extradite-2015-09-22";
     src = fetchgit {
@@ -368,23 +356,12 @@ 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-02-25";
+    name = "fugitive-2017-04-11";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "87c1bda4d5573185a1f79c42a919c4b62bc34c42";
-      sha256 = "1zfq28sawq5x6y55w5m248r5vhs2g0llhs2xpihys9kg7jgj49zq";
+      rev = "b2665cc65002c3ebf3aa771bb1b65ea8ef6b57d6";
+      sha256 = "113j1l6hhf37kmja99bqx8jif2b5f04q063arqb0a8fs1sg42mxh";
     };
     dependencies = [];
 
@@ -402,22 +379,22 @@ rec {
   };
 
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-auto-save-2017-01-16";
+    name = "vim-auto-save-2017-03-10";
     src = fetchgit {
       url = "https://github.com/907th/vim-auto-save";
-      rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5";
-      sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y";
+      rev = "a81dea26d2a62dbe1a0f89aba5834aee40a89512";
+      sha256 = "16ljzp2rww9c13pl2ci2pqri1774qp3yhhh042n7vqxcwy80kjjc";
     };
     dependencies = [];
 
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-02-19";
+    name = "vim-autoformat-2017-04-12";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "42adced2500134017180ec37d10a8ffcde48e825";
-      sha256 = "0yabhdnarrb0iiv51lxjvlicmlh6ga9n51iwrriv03p43s9h5hg1";
+      rev = "c449c413a9fda26572f614ab8e369c46c065f7ac";
+      sha256 = "0llxgixv14sjajsk4lw41sn7dzjli0z96bl58515m66dld41vqxj";
     };
     dependencies = [];
 
@@ -435,44 +412,44 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-02-16";
+    name = "tsuquyomi-2017-04-17";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "043f8e0a008853bfe4c6a56a04930defe8494984";
-      sha256 = "0jzkg2wrs46g6ycidh54z0rdhvjfm1syaf6sf17cl9m7h6wprsy8";
+      rev = "3610fcded0de1b739e351c02edb2aa26d6946139";
+      sha256 = "1flgd6al8h3wvavp4wy280dxgd2a8pzfwgpkmlvl866mqgam6566";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-03-02";
+    name = "deoplete-nvim-2017-04-20";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "b9774f4a320838288670fd215901115b06b4a600";
-      sha256 = "1r91lnbjqhvpzszygkl4s1m9wc1qh4pg2pd43r66akpnddmgil0k";
+      rev = "bda6d16700d8d728ebd5d422d4936a5977c40273";
+      sha256 = "12yq8wh5hcriyzfdxip3jn5l820yd0l58h15axg7fxd0r29jfnks";
     };
     dependencies = [];
 
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2016-10-30";
+    name = "Spacegray-vim-2017-04-21";
     src = fetchgit {
       url = "https://github.com/ajh17/Spacegray.vim";
-      rev = "79936a4434bf57b64c2d73320e62b4e67d84af74";
-      sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r";
+      rev = "c9e63f8a73a9def97d3b9a6f0a38be488b516ce0";
+      sha256 = "1sdyn5qr7ylfmx4dyvbvndmd34xmi50rh8n5hi50nxmsqxc1mgij";
     };
     dependencies = [];
 
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2016-07-19";
+    name = "vim-closetag-2017-04-12";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "e7e6cb99b9abb2aaa4711b9b2a98ad029169253b";
-      sha256 = "0827yrgawfjf82z37lndf58ikyh6s8g9qhxvnbfxvz8cc4a6r21v";
+      rev = "6cfc98911d904cfcdf1f1eb231d28fbe01c0e02f";
+      sha256 = "0fwly5li52fi1i7qlilinm52d28vmcfwz5di18v369xjjnz1vd47";
     };
     dependencies = [];
 
@@ -490,11 +467,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-03-04";
+    name = "clighter8-2017-04-19";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "229012f8f8181417e0f43b4f19c4273dd7d5233a";
-      sha256 = "0hx9l1mr7im9zrwhwf6n2lyc5azna7b2lkz4v1y9f93gv78b1vv5";
+      rev = "3ee6c2ed576a381619707e20173fa52e34cc2712";
+      sha256 = "1kmlwz7pjxqhvv72bvd8ip70ds2c2bc8c70912lskyz18gx132bw";
     };
     dependencies = [];
     preFixup = ''
@@ -504,22 +481,22 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-03-03";
+    name = "neomake-2017-04-21";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "4cd4dbb68f4f5c365e213552642c7e8a8b954f83";
-      sha256 = "1h03cxdbbzghigrya2xy7a4rri5fjm8vma4bya7xfndc0sg9wlhz";
+      rev = "c4ef3148796b349b0a85840b887957e22b2b0163";
+      sha256 = "00s34nrnd8zv7rzyr9ka3gig51mk42nc7c8n4bhvyb33xfy50zsj";
     };
     dependencies = [];
 
   };
 
   vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hdevtools-2012-12-29";
+    name = "vim-hdevtools-2017-03-11";
     src = fetchgit {
       url = "https://github.com/bitc/vim-hdevtools";
-      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
-      sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz";
+      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
+      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
     };
     dependencies = [];
 
@@ -559,33 +536,33 @@ rec {
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2017-01-22";
+    name = "spacevim-2017-03-31";
     src = fetchgit {
       url = "https://github.com/ctjhoa/spacevim";
-      rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5";
-      sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn";
+      rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258";
+      sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-01-13";
+    name = "ctrlp-vim-2017-04-09";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359";
-      sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc";
+      rev = "1baa289a06dab659eae593910ef05c7d209526be";
+      sha256 = "1sml3hy2agb73rjjxkf8kkb5gkwlpvjn28ihipr12lsvi0ffrs5v";
     };
     dependencies = [];
 
   };
 
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2016-10-22";
+    name = "agda-vim-2017-03-18";
     src = fetchgit {
       url = "https://github.com/derekelkins/agda-vim";
-      rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4";
-      sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf";
+      rev = "7f00093e485f07aa1daafa71e85306397c059402";
+      sha256 = "1yc1lhzir440jmv5aivhvn3bgxncz7p0vydla6mrf14gw6fqbp12";
     };
     dependencies = [];
 
@@ -603,11 +580,11 @@ rec {
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2017-02-15";
+    name = "vim-jade-2017-04-07";
     src = fetchgit {
       url = "https://github.com/digitaltoad/vim-jade";
-      rev = "20e41fc7ca0f1f1023c64548918e2b8155bb44ea";
-      sha256 = "1smqwpzsllmwc7kafyj65fkmh8p87b14dzgldnh4cnrhkcbnddav";
+      rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975";
+      sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y";
     };
     dependencies = [];
 
@@ -636,11 +613,11 @@ rec {
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "editorconfig-vim-2016-07-16";
+    name = "editorconfig-vim-2017-04-18";
     src = fetchgit {
       url = "https://github.com/editorconfig/editorconfig-vim";
-      rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2";
-      sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g";
+      rev = "6bd7d2b3f80c73de66644e203ea10f9197c9f88b";
+      sha256 = "0y0rr3mg3s7jrl97z3wjc0q8pjfs6lgnqphkcn8r3xgskyklvy2b";
     };
     dependencies = [];
 
@@ -658,7 +635,7 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-04-13";
+    name = "vim-elixir-2017-04-12";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
       rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205";
@@ -680,11 +657,11 @@ rec {
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-03-01";
+    name = "vim-localvimrc-2017-03-09";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "aaea27fe897edbfb0c5f71ef0ac02489f4bcfefa";
-      sha256 = "1lp947x9q9746r8zfssnn2xylbvzyyzxh7s7rshqglslwd74hhz8";
+      rev = "78ade3384ece2365878dff902399e6e049296957";
+      sha256 = "0msagnpy1d65nk7a6i0fv4xchlrfbzj5lfvlbfqss825z30kysdh";
     };
     dependencies = [];
 
@@ -701,6 +678,17 @@ rec {
 
   };
 
+  ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ensime-vim-2017-04-06";
+    src = fetchgit {
+      url = "https://github.com/ensime/ensime-vim";
+      rev = "4fd7886b169388e07261c525826c0e453094e446";
+      sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01";
+    };
+    dependencies = ["vimproc" "vimshell" "self" "forms"];
+
+  };
+
   YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
@@ -713,11 +701,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-1.12";
+    name = "vim-go-2017-04-02";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "26362e4bfcd7601da5b8fcf0041744962766ef0c";
-      sha256 = "19073xxam34vkwdsrqv170f6f6vc9yy8m4034r1l8m9lf67zqla9";
+      rev = "b4936d89bd1480a864382108b49ebf5d2d16728a";
+      sha256 = "1mfsxdnipfigqmmy9l6md98f1ww9b0663a95xa4l713v66sy60cw";
     };
     dependencies = [];
 
@@ -746,22 +734,22 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-03-03";
+    name = "psc-ide-vim-2017-04-17";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "cfd4228ff907be6124953d4ff41951ce3eca28ce";
-      sha256 = "1dvdrj06l65xflq7f5k2c4awrc7hh03qr48h9i39q8lg4xc0qc1p";
+      rev = "deec92002a5a187ff8be3ae6060e202aa859d4cb";
+      sha256 = "0yjlp3rnlai2633slrhxr2g9sqqp1j9pqcm7h03gfgw6rh4kai9k";
     };
     dependencies = [];
 
   };
 
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsonnet-2016-12-16";
+    name = "vim-jsonnet-2017-04-06";
     src = fetchgit {
       url = "https://github.com/google/vim-jsonnet";
-      rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57";
-      sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251";
+      rev = "2637e273713322befc476760809d46500e6088f3";
+      sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2";
     };
     dependencies = [];
 
@@ -779,11 +767,11 @@ rec {
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-leader-guide-2017-02-12";
+    name = "vim-leader-guide-2017-03-18";
     src = fetchgit {
       url = "https://github.com/hecal3/vim-leader-guide";
-      rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da";
-      sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1";
+      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
+      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
     };
     dependencies = [];
 
@@ -801,33 +789,33 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-02-09";
+    name = "calendar-vim-2017-04-21";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852";
-      sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip";
+      rev = "0d86fb4b3ec4954c160b23ec14f461e28c9483a8";
+      sha256 = "0133yn9f5wvnph8c03fi22phawp6ahfwwvnml98p2ijwlfdjh99f";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-02-12";
+    name = "lightline-vim-2017-04-21";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a";
-      sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5";
+      rev = "6034e639e871cb33a436508a6c6ccbe3e236de4c";
+      sha256 = "0w37l1i8bfpcs6wx0h98c5b2f4kgi6b4357c0lhfmwprajh4pw7n";
     };
     dependencies = [];
 
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2016-12-25";
+    name = "thumbnail-vim-2017-04-22";
     src = fetchgit {
       url = "https://github.com/itchyny/thumbnail.vim";
-      rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c";
-      sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz";
+      rev = "c124c1f0b79bbcbd4a215abc3f20e162f1ccb7d2";
+      sha256 = "0pqg6albjp4gbdaqr0g1ns78iys7qilfkjglfipfzqsig3wa65wb";
     };
     dependencies = [];
 
@@ -856,11 +844,11 @@ rec {
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2017-01-31";
+    name = "vim-orgmode-2017-04-19";
     src = fetchgit {
       url = "https://github.com/jceb/vim-orgmode";
-      rev = "37fc5db4d167ca0def23febcb06d984ab72015be";
-      sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x";
+      rev = "8a5cb51fbb8d89b0151833a6deb654929818a964";
+      sha256 = "0siqzwblads3n69chqsifpgglcda2iz2k40q76llf78fw5ylqd16";
     };
     dependencies = [];
 
@@ -889,11 +877,11 @@ rec {
   };
 
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2017-01-26";
+    name = "auto-pairs-2017-03-22";
     src = fetchgit {
       url = "https://github.com/jiangmiao/auto-pairs";
-      rev = "e915d857fe927309ef0090e830f892204b750c43";
-      sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4";
+      rev = "20ec5b043f82ffa11a079f545438e6544ef112ed";
+      sha256 = "14pypb2kfrylhn73gx964hls040zaqnpl1am6f0yi01h524xz0xf";
     };
     dependencies = [];
 
@@ -944,11 +932,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-03-03";
+    name = "fzf-vim-2017-03-18";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "87a910a127623db9ba2eae9ec9548db1a5142a0a";
-      sha256 = "05b4slg10h9v19bvb6n8hn706w4zyyz0h8akyzzmjkrm0sv92x6r";
+      rev = "605d9da5128d551bf57603203a0fed0e8f7d5e57";
+      sha256 = "15dd3a9kypbcxgj7ick2x2dmcal6s5yj1rr98pza7ra0xqwz6pmq";
     };
     dependencies = [];
 
@@ -966,11 +954,11 @@ rec {
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2017-01-13";
+    name = "vim-peekaboo-2017-03-20";
     src = fetchgit {
       url = "https://github.com/junegunn/vim-peekaboo";
-      rev = "9de6fd70ad20cbf568664c06d673c69e2f622287";
-      sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky";
+      rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49";
+      sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m";
     };
     dependencies = [];
 
@@ -999,11 +987,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2017-03-02";
+    name = "typescript-vim-2017-03-15";
     src = fetchgit {
       url = "https://github.com/leafgarland/typescript-vim";
-      rev = "48f92032a446daf2aea64ac5912b26328c3df1ef";
-      sha256 = "1lpqqjl3im96zy8w0iwyvmzcwdijfgji0czbsmi84hx299dpn8n4";
+      rev = "4dc79bd1b0c43c16cae146bee065f2acc6d2b789";
+      sha256 = "1hm7cpkx7na106xpivzi5cqb322nanpa0sdjmvnkhgll244q5vy4";
     };
     dependencies = [];
 
@@ -1021,22 +1009,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-03-02";
+    name = "vimtex-2017-04-22";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "75c4ac90f2d254741bad326536d03f382266a150";
-      sha256 = "1l89skr6ifpavximggzyzaw11973ci5gyh48cni07a2m0z26sy07";
+      rev = "60daab3d8bf74fa27322a8ae3e408402c6dbe114";
+      sha256 = "07s6fx0g0c4q3vk2yflzx7haqcakipjqnz7dypnj0qb18712l8lg";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2017-03-04";
+    name = "vim-easymotion-2017-04-11";
     src = fetchgit {
       url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "19d00afefe5a1b8f6d891ce0b73dcde38c718fdd";
-      sha256 = "1fdfg8i1xllpgjfk52r58ar8pmbcw3gjdzj712d2n0j7mjmphdgs";
+      rev = "f916d602a17dbcb6847ad071f85342c97c93bd80";
+      sha256 = "1w093421k65aw56cb2ifnf1pf8hvx181jd776spssbybms9sdm9l";
     };
     dependencies = [];
 
@@ -1054,22 +1042,22 @@ rec {
   };
 
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow-2016-10-28";
+    name = "rainbow-2017-04-21";
     src = fetchgit {
       url = "https://github.com/luochen1990/rainbow";
-      rev = "906094f73a46ab4636806541b50c5d4182fa09e1";
-      sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p";
+      rev = "1c45e0f81324641b23d4c21edda4eabeacba031b";
+      sha256 = "143bkawg4sy1vbizfwb6p9alizyr80sr6incxrz179l9dp9r8frf";
     };
     dependencies = [];
 
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2017-02-21";
+    name = "vim-xkbswitch-2017-03-27";
     src = fetchgit {
       url = "https://github.com/lyokha/vim-xkbswitch";
-      rev = "0d88988f33b5b100fa14ab8ce93f3950ce6069e5";
-      sha256 = "0bglqbdhgrq9c3dzl6031ar6wzz733ym1af1sahb6h6zky30ij7n";
+      rev = "a85ebddb9038e6b05138c48868a319a9e13d1868";
+      sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr";
     };
     dependencies = [];
     patchPhase = ''
@@ -1080,44 +1068,44 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-02-22";
+    name = "vim-highlightedyank-2017-03-25";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "db9b1e89af6dcbc56f84db980009915cac303fb8";
-      sha256 = "05l7q7l3zbk2lssgs52srk65b53frmxw0rpnv5dma7c2mjxcn9gn";
+      rev = "d656e1e62d2b4e1abd66c5f3a13a2be31a5a80ed";
+      sha256 = "0rcd2q8f49iyv93s5g95brml7sng7lr8k9s5m4mxq3y0m9yf68fd";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-02-26";
+    name = "vim-startify-2017-04-22";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "a16e94e6879d8cb5443ebd79ec53883489f46b55";
-      sha256 = "14c179wrh9aw4lwr2b88y6cjxj7x6jyl8kk4fqwzv1h5zqh48fk6";
+      rev = "664ed502ed405e611019d86154cb4d4a6c230c1d";
+      sha256 = "1g276jpv4yw410y9ycx118n9crzdwzvxacw1vswv507xs1fm7ch7";
     };
     dependencies = [];
 
   };
 
   vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-object-2015-08-11";
+    name = "vim-indent-object-2017-03-23";
     src = fetchgit {
       url = "https://github.com/michaeljsmith/vim-indent-object";
-      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
-      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
+      rev = "41d700f14b3decccdde421fbfe49e95a084a2f89";
+      sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2";
     };
     dependencies = [];
 
   };
 
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lushtags-2016-10-12";
+    name = "lushtags-2017-04-19";
     src = fetchgit {
       url = "https://github.com/mkasa/lushtags";
-      rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a";
-      sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx";
+      rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf";
+      sha256 = "1si5n07k4r8kji4whglav9q59ksv6bi5v58xbpc2l5bavlk8kn6n";
     };
     dependencies = [];
 
@@ -1157,11 +1145,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-02-26";
+    name = "haskell-vim-2017-04-03";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "5009c37a0f005aee164f8aaf2e99c57abf7a3402";
-      sha256 = "1i2ahm0sikdybhkhmijwcmcsq86bf29jpac6mh3jh0iimimrgwi7";
+      rev = "9811f3803317c4f39c868e71b3202b5559735aef";
+      sha256 = "02f87lfpr5lslh57cqimg91llflra8934jzy0g32l5zcm7fdljdk";
     };
     dependencies = [];
 
@@ -1189,17 +1177,6 @@ rec {
     '';
   };
 
-  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "self-2014-05-28";
-    src = fetchgit {
-      url = "git://github.com/megaannum/self";
-      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
-      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
-    };
-    dependencies = [];
-
-  };
-
   shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "shabadou-vim-2016-07-19";
     src = fetchgit {
@@ -1223,33 +1200,33 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2017-02-02";
+    name = "vim-markdown-2017-03-16";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "d6d59eef6f604b6430fd6adade9e18364666232b";
-      sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6";
+      rev = "2cd50d2ca657091c6aa787a3847284fb4cceff49";
+      sha256 = "0ivrb7462dglrzmpi3a8na16bhv9bx11bdpa32k34xnypn6ghvy9";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-02-06";
+    name = "python-mode-2017-03-09";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "d113cffc3f7a48564aeb568e1c7a6f5312ff09f5";
-      sha256 = "1gn74cj629q00ar3z0c1dlngn31jr4lv04bwi2npzinn7rpf8nj6";
+      rev = "73620c44c4cd036a8133f77e2f56ca8995640cff";
+      sha256 = "0d2f8lcpjsrj3i21yinsncm9aigp024vi7mfy2hxhii7jcdmh8q5";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-02-08";
+    name = "vim-racer-2017-04-18";
     src = fetchgit {
       url = "https://github.com/racer-rust/vim-racer";
-      rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e";
-      sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd";
+      rev = "34b7f2a261f1a7147cd87aff564acb17d0172c02";
+      sha256 = "13xcbw7mw3y4jwrjszjyvil9fdhqisf8awah4cx0zs8narlajzqm";
     };
     dependencies = [];
 
@@ -1267,11 +1244,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-02-24";
+    name = "vim-grammarous-2017-04-10";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "74a88d233056ac63ef65b3dd6766494ec33e6f2e";
-      sha256 = "0av6j1i0kf1gdvj19n9mdaxkxhb6dkbl7yia81sw6j2mkdzka3jc";
+      rev = "b002d67616f959120c9fb0d05783fa7f8a59df8a";
+      sha256 = "0h7jp75a467xggg8yc31q6vqmlpcpw46ch7nj5fx81dls3vb0bbx";
     };
     dependencies = [];
 
@@ -1289,33 +1266,33 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-03-01";
+    name = "neoformat-2017-04-22";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "c59748c706b15cfae891772c4e17a31f396c8ffb";
-      sha256 = "0awb1f7ham13rwsg88q356lczblb23kxq194j8h19jmjjbb1lv7p";
+      rev = "e65c803f36f08a933b6af0d01b6756e6f71df247";
+      sha256 = "151nyg42zl7qz2nfj9dh71fgmlkfd80hzhdjadl9q8zx7xkhq0dy";
     };
     dependencies = [];
 
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-02-02";
+    name = "vim-polyglot-2017-03-24";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb";
-      sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny";
+      rev = "ef369d45a505403587ea0bae30ce6768ba51398c";
+      sha256 = "1wd6ksvvbak8vncazh49a2jmxq59w1mmrm0jvm47y8wrv300fhk9";
     };
     dependencies = [];
 
   };
 
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-01-16";
+    name = "neco-vim-2017-04-06";
     src = fetchgit {
       url = "https://github.com/shougo/neco-vim";
-      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
-      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
+      rev = "c58ce68df75af8928ce9d4c19dab3b3ff7de3fb2";
+      sha256 = "1w56s75891y8p2ng1mgmir58hlckk7ad6mz87xms2kkkx0xbqzl9";
     };
     dependencies = [];
 
@@ -1333,22 +1310,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-01-24";
+    name = "neosnippet-snippets-2017-03-29";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a";
-      sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6";
+      rev = "2a9487bacb924d8e870612b6b0a2afb34deea0ae";
+      sha256 = "0917zlh7fin2172jmlbzkszb1dqafx6l0sgxf1nm1b0k083c9bjz";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-02-13";
+    name = "neosnippet-vim-2017-04-20";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "1bd7e23c79b73da16eb0c9469b25c376d3594583";
-      sha256 = "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5";
+      rev = "c91ac0b67f0f21548aaed093cbd5186b0e106907";
+      sha256 = "0llsars9dyzaqkqk9rs41q9nj0h0gy35gqgbifqll66jnm89wlni";
     };
     dependencies = [];
 
@@ -1392,7 +1369,6 @@ rec {
       sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
     };
     dependencies = [ "vimproc-vim" ];
-
   };
 
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -1407,22 +1383,22 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-02-24";
+    name = "alchemist-vim-2017-04-21";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "31c13df87ed13428f8070718cea8a3ade4c37c99";
-      sha256 = "0c485zgrg997waf7jrw1qyzw8903yc4p5y5d7skn2irn66dl0388";
+      rev = "12d9d8b9a8875d0edb75c3d91d4f8f04f3558fb7";
+      sha256 = "0xg1yixs8p4f2sghbh204p8b10m1zb3xxi4jwiqrrw4jhprh8g4f";
     };
     dependencies = [];
 
   };
 
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hardtime-2016-12-19";
+    name = "vim-hardtime-2017-03-31";
     src = fetchgit {
       url = "https://github.com/takac/vim-hardtime";
-      rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b";
-      sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4";
+      rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b";
+      sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5";
     };
     dependencies = [];
 
@@ -1451,11 +1427,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2017-01-22";
+    name = "vim-quickrun-2017-03-21";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2";
-      sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv";
+      rev = "98889e1fc0f7136262c4dd7c312b82879df16486";
+      sha256 = "1drv53fwp24z0yb79lj2nyapyndw1yirg202hg7px9jvxjr4k8a0";
     };
     dependencies = [];
 
@@ -1473,33 +1449,33 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2016-08-30";
+    name = "vim-dispatch-2017-04-17";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "a54f2c5e18b8c2aad8c6f8ba474760e70fdaaca3";
-      sha256 = "18z1hkr3qrgj9j0kr0q3i5vq27dpkjhsm3mqyssi6k5v0iyw49dk";
+      rev = "2ede8329962893ee4bcf512e0bee1b2eeab73618";
+      sha256 = "0ahpcn2la7aalybqs7sza0hqh47lyzzpxgmr1rk5rd4z10rwql70";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2016-09-07";
+    name = "vim-eunuch-2017-03-08";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21";
-      sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc";
+      rev = "dcd29a00eb708be211d856afd3fddfbff7bc6208";
+      sha256 = "1vq1qwhm27zmnp8xda1z27fhx835kni6ifcyix644shpd8mq8bi4";
     };
     dependencies = [];
 
   };
 
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2015-05-09";
+    name = "vim-repeat-2017-04-21";
     src = fetchgit {
       url = "https://github.com/tpope/vim-repeat";
-      rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415";
-      sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7";
+      rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f";
+      sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213";
     };
     dependencies = [];
 
@@ -1539,11 +1515,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-03-28";
+    name = "youcompleteme-2017-04-12";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "03ba8a80cd04e2e051bb85eacaea802ca3c4d025";
-      sha256 = "1f44bxl4phk79p4n19p0qx5506hkhms77zi4x0sh0gh389xwxmv5";
+      rev = "5198fd9a09960b9a1919ef2400007f9bfab33a65";
+      sha256 = "0xawkixjskdb7w9kbbbk6yhqjkglyshir11s5b5bz52nzs2dy9mx";
     };
     dependencies = [];
     buildPhase = ''
@@ -1565,22 +1541,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-02-26";
+    name = "vim-airline-themes-2017-03-27";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "205f6964be55d17c908baaf89066928090b02729";
-      sha256 = "0cz39gxmrsnv9r72ymyzjwlgdi2x0dxxibwvlwp6zwdwws4l3fw8";
+      rev = "66c2839bb1126c71a0a2d1da9804161ccd3b78b6";
+      sha256 = "01czd1al7ni88q7mwszlayax6d92bkzr5a5pxssn2080xpv7vqbk";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-02-20";
+    name = "vim-pandoc-2017-04-14";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "15873af56c3c15ebd5431983741c399097fb61de";
-      sha256 = "08h1bmrjv8bjywz1fj2rjnmmwrlpdl1lv1gz5msdy817n5lf1xh2";
+      rev = "455565fb9cfae5ac3ae21c9e8ddf60c9db1e9a61";
+      sha256 = "0vg9z2vnifq52x85pn9nhd7hmwklssbq1cglkbb64adcn4a151k8";
     };
     dependencies = [];
 
@@ -1598,11 +1574,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2017-02-22";
+    name = "vim-pandoc-syntax-2017-04-13";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "2e7420ba617da6aa6acc221c41fbea44783eb585";
-      sha256 = "0k964jsr9v8nz1w2d8qy6rv66110ga6hllbp5zcrfw7j62cgmvn7";
+      rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3";
+      sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw";
     };
     dependencies = [];
 
@@ -1719,11 +1695,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-03-01";
+    name = "vim-wakatime-2017-04-22";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "a7be16c948bc4975d83c07c7bf25206953b79b22";
-      sha256 = "0lnng566bw4462xg3i4qjbqvnkxmg2m33368nllapb1yj0x735c9";
+      rev = "8d3988ce97802a4061417100ee8592c0570e9f93";
+      sha256 = "05i8y586nasxmk8szi309q49543z7wqz3s9xpf16hv16rmv3kj4j";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1769,11 +1745,11 @@ rec {
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-02-13";
+    name = "deoplete-go-2017-03-21";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "9c2d57710f022ea5fe3b0428e6635a3de77bcf9e";
-      sha256 = "0rl211rmnzwribzpqxfg99lsyln2x1i8ygyz8b9jy804fm5i24f3";
+      rev = "7990da5c8c89a47e0ccd3b7e60a836a6f115641a";
+      sha256 = "0ybd9sg4x8pczvl0hz5azzs2sn4nyc7la9890xh373dv3lyb6gk7";
     };
     dependencies = [];
     buildInputs = [ python3 ]; 
@@ -1786,22 +1762,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-02-17";
+    name = "deoplete-jedi-2017-04-11";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "a4dd511535a6fe06717a7bd2d680b9b87ade595d";
-      sha256 = "03wwqk4r2rm5yjxqw2f4302lknb9a10yfpw4b0vyr40zch6jascr";
+      rev = "e59fe25c4e09d4a26cca640a42af58178c67c9ff";
+      sha256 = "1dhphmr0q9xfyz61zy0bzm6bh21p7d5q79km7lxq8k3khgdp4xsi";
     };
     dependencies = [];
 
   };
 
   goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-2017-01-03";
+    name = "goyo-2017-04-02";
     src = fetchgit {
       url = "git://github.com/junegunn/goyo.vim";
-      rev = "ebdd67fd6160b7f95ac8fe50b382694c9961d6b8";
-      sha256 = "08kx7dsa00amwgjdq1grhapjsa8mk2z11pwgn6xc342zkvrlf0fn";
+      rev = "64e750f726d8758c493931938a17c50f75e6f823";
+      sha256 = "0g1kark21kljrk7i0ig8gfdh5kva8vj80cvi4jbph4rmrbxwjc7x";
     };
     dependencies = [];
 
@@ -1874,33 +1850,33 @@ rec {
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2016-09-05";
+    name = "sensible-2017-04-02";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "4b7535921819a5b2e39be68f81109ea684232503";
-      sha256 = "0ghds721dawm8mcd8cp23hfqpgiznh811z73zxlqrm1sg2fmdq1s";
+      rev = "e57222db3b3236782dc33b7cdbb648528b7377d9";
+      sha256 = "0ww55dcl5n02dla02wr7sq524v1njhm1gch8xxn2v5r4n1x43p8n";
     };
     dependencies = [];
 
   };
 
   sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2016-11-06";
+    name = "sleuth-2017-04-09";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
-      rev = "62c4f261874dd44e6cdc6788b4a6bc59f9dfe746";
-      sha256 = "13w4gv2k91ahdc25vhi0ilqphlnix1q5gddcihi8k7fapx990a9k";
+      rev = "b6347df73719dea0fb14695eae4d3506ebc4a36c";
+      sha256 = "0i55mpdiia8lbkvn9hxmzm2as2jc6crcv34f29pdkqppmwrvvx87";
     };
     dependencies = [];
 
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2016-11-14";
+    name = "snipmate-2017-04-20";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "2d70860ba49afc83cb5902acb99174e3cf08538d";
-      sha256 = "015h8narda721svapf17963r3r48cz63477pmb3fhy2rp8lvvif4";
+      rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e";
+      sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1929,11 +1905,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2017-01-05";
+    name = "table-mode-2017-04-20";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7";
-      sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr";
+      rev = "4e41af8e5f0bf53326d1b83c2feb1eff89fe90d4";
+      sha256 = "0l83j3963lzkmn54vcagkwm2rhk96cl9v42l5r7zcgjign28cfzw";
     };
     dependencies = [];
 
@@ -1961,22 +1937,22 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2017-03-03";
+    name = "tlib-2017-04-12";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "b80c8f0f932ffaf9078f6998fe422cfbc7b95178";
-      sha256 = "177phwdhfckhc4bm4xv1db8lxrvsi8lvv7n3c1j03w2r8f9h8pj8";
+      rev = "c0a480a3e1208fe73c7551397d79de025b8ac60b";
+      sha256 = "1rf8vrbw0pbg4vdbk4ihfwv246pwa82xa4m061znw0b14zqij84f";
     };
     dependencies = [];
 
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2016-07-19";
+    name = "undotree-2017-03-24";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
-      rev = "17dfeb6aeacc40036567d29c691898ac57b09182";
-      sha256 = "0xmc95h5nbmjx6hvfd9lvkz8hdp8fw5xm5c7wcyy5f0rg7b6l68x";
+      rev = "ad08a88df70c1865b8c9ef6eeac5cdb051d2a18a";
+      sha256 = "1i1sss8vzsym44amq19rfy95wm7143ks5h9imm7z7rah7xkcqv9l";
     };
     dependencies = [];
 
@@ -1994,11 +1970,11 @@ rec {
   };
 
   vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2016-07-12";
+    name = "vim-addon-async-2017-03-20";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
-      rev = "b14414215b394a0ef887ea301085ae4b80012e38";
-      sha256 = "1gr0rjn1vwqv4p51yb0s65gnpy1r0533lfy5nqbg20j4687yxls5";
+      rev = "eca316a4480f68c2cb62128f3187dc7b2002afde";
+      sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q";
     };
     dependencies = ["vim-addon-signs"];
 
@@ -2192,22 +2168,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-02-28";
+    name = "vim-airline-2017-04-21";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "fbd791e7f0431e18b987a2a8937a4c3d34dd2125";
-      sha256 = "15m4wdvx4x8m43x5z08sbw74i1l7vwj0qljsgs7jn36yc9453sn7";
+      rev = "13bd4701ed8ef57150f2d4f56122cd11ecf39345";
+      sha256 = "1z2ymvqpqzhz35vrcavn52dwzw03jb9vgjvcwqf775v3kpvvd7z4";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2017-03-02";
+    name = "vim-coffee-script-2017-03-03";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "1eddf182ba28d4e695fe1dbcae5b5b029218cb44";
-      sha256 = "1s9idnbj3613ldgrysp4iscd1xnrfdcgdhygfzhhsv0a0lrm40xa";
+      rev = "aace5c23d812a205c93e87ff79df72d9366928df";
+      sha256 = "1saz5m3c329m2vk8ffhvxw4virz70k2qrjncwhvjpkik27jf75yy";
     };
     dependencies = [];
 
@@ -2236,11 +2212,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-02-22";
+    name = "vim-gitgutter-2017-04-20";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "1c034be0d31168c8f4770ef7b69adb67d00d6f3d";
-      sha256 = "1wj084frahj80h1nkllmpf0qj06d96a5m5qclnd3fc2aqclcimx0";
+      rev = "f16cf539a23fc980af1293bebdae61a595baa90c";
+      sha256 = "08dy5va4cz8xiy08klbifxlz4khdqg05v8dvvlr5l774qnqlpaqj";
     };
     dependencies = [];
 
@@ -2291,22 +2267,22 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-03-02";
+    name = "vim-signify-2017-04-21";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "b4c516cd63f04c08bfc6a8eb27a971702d849f33";
-      sha256 = "108vlkrv00b6ldj4r972k3z2a3dfcs1z4788dhnx81k25rax42k4";
+      rev = "6e8c4b190078030f9cb979ce26274a79c0ac313c";
+      sha256 = "1wch8pas15z5afw71i814z4cxl8l411kdizhwljx69ghvbwkmkpg";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-03-01";
+    name = "vim-snippets-2017-04-19";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "9a2379be7698ff83985eebb394b7a9f99560a77f";
-      sha256 = "0c7gicl9m05m7wb846vbd1i7ginkm5k4rvcvcvhc9x7krn5qg64q";
+      rev = "7b02b74edf5de3d4864b7601fbd83ccc2671d0ba";
+      sha256 = "098yw0a13f09gmhpzzcsvvn6dk0pi6qg5ja6vd3qa0aal68bck8i";
     };
     dependencies = [];
 
@@ -2335,11 +2311,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-03-01";
+    name = "vimwiki-2017-04-15";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "56cb06e73e9850e60b6eb53bad8bb98ded1ab872";
-      sha256 = "1s9nppmgkr5v6ljc918qivlyzp491vnyn3cc4k3cqd1ly2ymxv48";
+      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
+      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
     };
     dependencies = [];
 
@@ -2357,11 +2333,11 @@ rec {
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2017-02-24";
+    name = "vundle-2017-04-02";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "f6cc06238d5ac888ddfc514f80392f44cb2e21ac";
-      sha256 = "00qd5nalac7q83dx779547s6dwn952adj2w3j1sgdgaybjwmsrl2";
+      rev = "6497e37694cd2134ccc3e2526818447ee8f20f92";
+      sha256 = "0mphybh0mwh5km2q0awmn8hdgvq3g45yyqpjird7kxybri6aw0kn";
     };
     dependencies = [];
 

From 77e6529953f0846f892fe9a393e12272fa9ead90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Apr 2017 21:51:17 +0200
Subject: [PATCH 1402/1744] vimPlugins.pony-vim-syntax: init at 2016-01-23

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f58b9c197c3..05080bd932f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -590,6 +590,17 @@ rec {
 
   };
 
+  pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "pony-vim-syntax-2016-01-23";
+    src = fetchgit {
+      url = "https://github.com/dleonard0/pony-vim-syntax";
+      rev = "a0ab2e14d5a3796ebec01ce196392dc1de349cb3";
+      sha256 = "1wraray7870hq75jqxyilxb125flhcgk9ysz437qbg75c495znl0";
+    };
+    dependencies = [];
+
+  };
+
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-2016-09-21";
     src = fetchgit {
@@ -1752,7 +1763,7 @@ rec {
       sha256 = "0ybd9sg4x8pczvl0hz5azzs2sn4nyc7la9890xh373dv3lyb6gk7";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -2342,5 +2353,4 @@ rec {
     dependencies = [];
 
   };
-
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1fdb11058b8..0241bf01545 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -41,6 +41,7 @@
 "github:derekelkins/agda-vim"
 "github:derekwyatt/vim-scala"
 "github:digitaltoad/vim-jade"
+"github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"
 "github:eikenb/acp"

From 3cc4bfa7a372e611f46a6fe60d59bb3abcd36469 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Apr 2017 15:15:46 -0500
Subject: [PATCH 1403/1744] wxwidgets: restructure into one folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s easier to manage these in one folder.

Affected folders from pkgs/development/libraries/:

- wxGTK-2.8
- wxGTK-2.9
- wxGTK-3.0
- wxmac

These will all go into pkgs/development/libraries/wxwidgets for now.
---
 .../libraries/{wxGTK-2.8 => wxwidgets/2.8}/default.nix    | 0
 .../libraries/{wxGTK-2.9 => wxwidgets/2.9}/default.nix    | 0
 .../libraries/{wxGTK-3.0 => wxwidgets/3.0}/default.nix    | 0
 .../{wxmac/default.nix => wxwidgets/3.0/mac.nix}          | 0
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/{wxGTK-2.8 => wxwidgets/2.8}/default.nix (100%)
 rename pkgs/development/libraries/{wxGTK-2.9 => wxwidgets/2.9}/default.nix (100%)
 rename pkgs/development/libraries/{wxGTK-3.0 => wxwidgets/3.0}/default.nix (100%)
 rename pkgs/development/libraries/{wxmac/default.nix => wxwidgets/3.0/mac.nix} (100%)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-2.8/default.nix
rename to pkgs/development/libraries/wxwidgets/2.8/default.nix
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-2.9/default.nix
rename to pkgs/development/libraries/wxwidgets/2.9/default.nix
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-3.0/default.nix
rename to pkgs/development/libraries/wxwidgets/3.0/default.nix
diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
similarity index 100%
rename from pkgs/development/libraries/wxmac/default.nix
rename to pkgs/development/libraries/wxwidgets/3.0/mac.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fcb95c3e8d..2899a2b33d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10191,26 +10191,26 @@ with pkgs;
 
   wxGTK = wxGTK28;
 
-  wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
+  wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
     inherit (gnome2) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
+  wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
+  wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxmac = callPackage ../development/libraries/wxmac {
+  wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
     inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
     inherit (darwin.stubs) setfile rez derez;
   };

From 6f3085d5723408139100c7e7d0db54c84547c3e9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Apr 2017 15:20:35 -0500
Subject: [PATCH 1404/1744] wxwidgets: add wxWindows license

all wx{GTK,widgets,windows,mac,etc}* packages use the wxWindows license.
---
 lib/licenses.nix                                     | 5 +++++
 pkgs/development/libraries/wxwidgets/2.8/default.nix | 1 +
 pkgs/development/libraries/wxwidgets/2.9/default.nix | 3 ++-
 pkgs/development/libraries/wxwidgets/3.0/default.nix | 3 ++-
 pkgs/development/libraries/wxwidgets/3.0/mac.nix     | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 000a55224ea..0919699b41e 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -531,6 +531,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Do What The F*ck You Want To Public License";
   };
 
+  wxWindows = spdx {
+    spdxId = "WXwindows";
+    fullName = "wxWindows Library Licence, Version 3.1";
+  };
+
   zlib = spdx {
     spdxId = "Zlib";
     fullName = "zlib License";
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 9538f1dd1f8..e84a2b4c18e 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -66,5 +66,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = licenses.wxWindows;
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 28cd79b5549..fb6c418fb9b 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   
   meta = {
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    platforms = with platforms; darwin ++ linux;
+    license = licenses.wxWindows;
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 4fea863827f..4044f546e3d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -78,6 +78,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   
   meta = {
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    platforms = with platforms; darwin ++ linux;
+    license = licenses.wxWindows;
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index f4e71424833..0b5b4832b2a 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -100,6 +100,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = platforms.darwin;
+    license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
   };
 }

From 3cfdaa4b2b15292fdab11499529c622b5d4d074f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Apr 2017 15:25:23 -0500
Subject: [PATCH 1405/1744] wxwidgets: add homepage and descriptions

Update meta to make things more informative.
---
 pkgs/development/libraries/wxwidgets/2.8/default.nix | 5 ++++-
 pkgs/development/libraries/wxwidgets/2.9/default.nix | 3 +++
 pkgs/development/libraries/wxwidgets/3.0/default.nix | 3 +++
 pkgs/development/libraries/wxwidgets/3.0/mac.nix     | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index e84a2b4c18e..15db4386e01 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -65,7 +65,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
     license = licenses.wxWindows;
+    homepage = "https://www.wxwidgets.org/";
+    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index fb6c418fb9b..af9dde75cf4 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -69,5 +69,8 @@ stdenv.mkDerivation {
   meta = {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
+    homepage = "https://www.wxwidgets.org/";
+    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 4044f546e3d..5b1e0fc067c 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -80,5 +80,8 @@ stdenv.mkDerivation {
   meta = {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
+    homepage = "https://www.wxwidgets.org/";
+    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 0b5b4832b2a..fc747268cab 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -102,5 +102,8 @@ stdenv.mkDerivation rec {
     platforms = platforms.darwin;
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
+    homepage = "https://www.wxwidgets.org/";
+    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }

From 5c7f4669a7880bc2f929271ae4fdbdc2ba8e2a8b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 23 Apr 2017 21:40:35 +0100
Subject: [PATCH 1406/1744] nixpkgs manual: Remove obsolete warning (#21117)

PR #815 has already been cherry-picked into the default nix version 1.11.8.
---
 doc/multiple-output.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index b7a363c750e..a81ad6ca9eb 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -16,7 +16,6 @@
 
 <section><title>Installing a split package</title>
   <para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
-  <warning><para>Currently <command>nix-env</command> almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged.</para></warning>
   <itemizedlist>
     <listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package.  The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
     <listitem><para>You can let it use the default outputs.  These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>

From 1601bf5cfcb823ac5ff4964903d19e67a9f8dc44 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Sun, 23 Apr 2017 22:45:29 +0200
Subject: [PATCH 1407/1744] ucommon: 6.3.1 -> 7.0.0

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

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 64afde3c53b..315566851fb 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -10,11 +10,11 @@ assert xor (openssl != null) (gnutls != null);
 assert !(xor (openssl != null) (zlib != null));
 
 stdenv.mkDerivation rec {
-  name = "ucommon-6.3.1";
+  name = "ucommon-7.0.0";
 
   src = fetchurl {
     url = "mirror://gnu/commoncpp/${name}.tar.gz";
-    sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm";
+    sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
   };
 
   buildInputs = [ pkgconfig ];

From 8d26be2ae622e47bad9bdf7ba8fc095cda80c548 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:39:56 -0500
Subject: [PATCH 1408/1744] antiword: supports darwin

---
 pkgs/applications/office/antiword/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix
index 059c68b77e6..4858a9f8bb9 100644
--- a/pkgs/applications/office/antiword/default.nix
+++ b/pkgs/applications/office/antiword/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
 
   prePatch = ''
     sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h
+    substituteInPlace Makefile --replace "gcc" "cc"
   '';
 
   patches = [ ./10_fix_buffer_overflow_wordole_c.patch ];
@@ -25,6 +26,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
 
     maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 32d95b1f04d7b146721b522f4457f5ff0cdc0fbc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:40:17 -0500
Subject: [PATCH 1409/1744] dvdauthor: supports darwin

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

diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 7559c4c70e7..c15a892e698 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec{
     description = "Tools for generating DVD files to be played on standalone DVD players";
     homepage = http://dvdauthor.sourceforge.net/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From e75fde66e9854101eebeed0f6b391f1927cfa3ae Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:40:43 -0500
Subject: [PATCH 1410/1744] dconf: supports darwin

---
 pkgs/desktops/gnome-3/3.22/core/dconf/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
index f67dc7e32ae..9200c4180bd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
@@ -18,8 +18,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
                   intltool docbook_xsl docbook_xsl_ns makeWrapper ];
 
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace client/Makefile \
+      --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1"
+  '';
+
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = gnome3.maintainers;
   };
 }

From 6d9ca46317f2026b0a2dc3d4006fb3efb18352e2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:41:05 -0500
Subject: [PATCH 1411/1744] vte: supports darwin

---
 pkgs/desktops/gnome-3/3.22/core/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
index 50aef658713..3181348d843 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "patchShebangs .";
 
-  configureFlags = [ "--enable-introspection" ];
+  configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
 
   enableParallelBuilding = true;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.lgpl2;
     maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
 

From 9f4f4f006b45116bddf5e82fde46d183640db381 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:41:49 -0500
Subject: [PATCH 1412/1744] extra-cmake-modules: supports darwin

---
 .../libraries/kde-frameworks/extra-cmake-modules/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index b2e3a371e96..f8a774b6855 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -12,7 +12,7 @@ kdeFramework {
   setupHook = ./setup-hook.sh;
 
   meta = with lib; {
-    platforms = lib.platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     homepage = "http://www.kde.org";
     license = licenses.bsd2;
     maintainers = [ maintainers.ttuegel ];

From 5042d931781081c4791c004cbb11d94f92b86447 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:42:12 -0500
Subject: [PATCH 1413/1744] libconfig: supports darwin

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

diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index df18ae06ed6..7c569b2e92d 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "A simple library for processing structured configuration files";
     license = licenses.lgpl3;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From b39f6dad2c4526069c9a573c389202933dca9a1f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:42:43 -0500
Subject: [PATCH 1414/1744] libdvdread: supports darwin

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

diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 72b582a90ad..be7e20f00eb 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A library for reading DVDs";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 6d4a1f03fac8c613032a57ca54cc61c08029d8ba Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:43:04 -0500
Subject: [PATCH 1415/1744] libfm: supports darwin

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

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 2b30dacb58f..ad400a0aef6 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Plus;
     description = "A glib-based library for file management";
     maintainers = [ maintainers.ttuegel ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From ad3b346e78d8f1b21a275b52a3817c43aca43b23 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:43:32 -0500
Subject: [PATCH 1416/1744] liblo: supports darwin

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

diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index cb62ff3628b..7b7e96012ea 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     homepage = http://sourceforge.net/projects/liblo;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 983a0f31ca8680df07dae44ee88d2da3870b517e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:45:41 -0500
Subject: [PATCH 1417/1744] menu-cache: supports darwin

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

diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 9b2fd805c31..b3c7daf990c 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     license = licenses.gpl2Plus;
     description = "Library to read freedesktop.org menu files";
     maintainers = [ maintainers.ttuegel ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From d21afc0b29697823f4cc8002ba815d20da48484b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:46:11 -0500
Subject: [PATCH 1418/1744] opencv: supports darwin

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

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 7ea32745ba0..09220efbabc 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -5,11 +5,12 @@
 , enableJPEG ? true, libjpeg
 , enablePNG ? true, libpng
 , enableTIFF ? true, libtiff
-, enableEXR ? true, openexr, ilmbase
+, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
 , enableJPEG2K ? true, jasper
 , enableFfmpeg ? false, ffmpeg
 , enableGStreamer ? false, gst_all
 , enableEigen ? false, eigen
+, darwin
 }:
 
 let
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableFfmpeg ffmpeg
     ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ])
     ;
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -76,11 +78,11 @@ stdenv.mkDerivation rec {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric flosse];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ viric flosse ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 5312c4839925c35533e06a2899188558cc225e4c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:46:22 -0500
Subject: [PATCH 1419/1744] miniupnpc: supports darwin

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

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 575bac3e9d1..bf21bae0cd6 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -19,7 +19,7 @@ let
       meta = {
         homepage = http://miniupnp.free.fr/;
         description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-        platforms = with stdenv.lib.platforms; linux ++ freebsd;
+        platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin;
       };
     };
 in {

From d3084b27985a8e6b72e92052402d87b6891efbfe Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 16:55:18 -0500
Subject: [PATCH 1420/1744] sourceHighlight: supports darwin

---
 pkgs/tools/text/source-highlight/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index 808574e2735..dc297afc9ad 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     description = "Source code renderer with syntax highlighting";
     homepage = http://www.gnu.org/software/src-highlite/;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     longDescription =
       ''
         GNU Source-highlight, given a source file, produces a document

From 0b58b437ea771d8e44abd479981977e8e1434566 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 17:04:13 -0500
Subject: [PATCH 1421/1744] libconfuse: supports darwin

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

diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index 15e0fbc6f79..a89bdec2c8a 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       quick to integrate with your code.
     '';
     license = licenses.isc;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 0293d0dbecb6ac57ceb253a07e038da0c673fbe6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 19:32:41 -0500
Subject: [PATCH 1422/1744] lhasa: supports darwin

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

diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix
index f270d29a694..64a9ad7f656 100644
--- a/pkgs/tools/compression/lhasa/default.nix
+++ b/pkgs/tools/compression/lhasa/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.isc;
     homepage = http://fragglet.github.io/lhasa;
     maintainers = with stdenv.lib; [ maintainers.sander ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 18b8a22bca1959813095f24333a8bea341b7c8cc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 19:41:13 -0500
Subject: [PATCH 1423/1744] libdiscid: support darwin

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

diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index c5da3816c41..287494b6b1f 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchurl, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig, darwin }:
 
 stdenv.mkDerivation rec {
   name = "libdiscid-${version}";
   version = "0.6.2";
 
   nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
   
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";
+
   meta = with stdenv.lib; {
     description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
     homepage = http://musicbrainz.org/doc/libdiscid;
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From bd07af92ec8ce30a7b99cfa8e91a6ba8e01dad93 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 19:44:30 -0500
Subject: [PATCH 1424/1744] desktop-file-utils: support darwin

---
 pkgs/tools/misc/desktop-file-utils/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index 7c84d913157..039ec27947a 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ stdenv, fetchurl, pkgconfig, glib, libintlOrEmpty }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "desktop-file-utils-0.22";
@@ -8,11 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4";
   };
 
-  buildInputs = [ pkgconfig glib ];
+  buildInputs = [ pkgconfig glib libintlOrEmpty ];
+
+  NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
     description = "Command line utilities for working with .desktop files";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From fe9b9e7f38999ca219ad9e6b4cf6447320ec9b70 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 19:50:10 -0500
Subject: [PATCH 1425/1744] icoutils: already supports darwin

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

diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 8b26f4ce3c8..720af4622c7 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.nongnu.org/icoutils/;
     description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 3e6579ee84e44b8db41cd87c7a4366816203fcc4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 19:56:54 -0500
Subject: [PATCH 1426/1744] libinfinity: supports darwin

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

diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index d13a9050dc9..b55e0104f70 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -3,7 +3,8 @@
 , documentation ? false # build documentation
 , avahiSupport ? false # build support for Avahi in libinfinity
 , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
-, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }:
+, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss
+, libintlOrEmpty }:
 
 let
   edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
@@ -17,7 +18,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6";
   };
 
-  buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]
+  buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss libintlOrEmpty ]
     ++ optional gtkWidgets gtk2
     ++ optional documentation gtkdoc
     ++ optional avahiSupport avahi
@@ -34,12 +35,14 @@ in stdenv.mkDerivation rec {
     ${edf avahiSupport "avahi"}
   '';
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
     homepage = http://gobby.0x539.de/;
     description = "An implementation of the Infinote protocol written in GObject-based C";
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = [ stdenv.lib.maintainers.phreedom ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 
 }

From 2c0395a24f17168d32195295786a1f603126ff89 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:44:14 -0500
Subject: [PATCH 1427/1744] wordnet: supports darwin

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

diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 2f98bc66e9b..f1bc06d395c 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
     homepage = http://wordnet.princeton.edu/;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 1091c3b489d0d3b033779026452794c6d1689734 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:44:25 -0500
Subject: [PATCH 1428/1744] colm: supports darwin

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

diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 8cf8a04f4eb..767023053c6 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "A programming language for the analysis and transformation of computer languages";
     homepage = http://www.colm.net/open-source/colm;
     license = licenses.gpl2;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ pSub ];
   };
 }

From a708fd840f4720f900b0ea65ea0c77e80c9bda7d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:44:38 -0500
Subject: [PATCH 1429/1744] zimg: supports darwin

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

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 7fb14de7951..961220bb783 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec{
     description = "Scaling, colorspace conversion and dithering library";
     homepage    = https://github.com/sekrit-twc/zimg;
     license     = licenses.wtfpl;
-    platforms   = platforms.linux; # check upstream issue #52
+    platforms   = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }

From b9c8a0182aa4eee44605054cb341ec900d3cf9ce Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:44:55 -0500
Subject: [PATCH 1430/1744] antlr: supports darwin

---
 pkgs/development/tools/parsing/antlr/3.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix
index a92e8aa7251..e6765806e4f 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 83d3976927ccc10ab4fc7fb66eaf17803a72842c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:45:06 -0500
Subject: [PATCH 1431/1744] xosd: supports darwin

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

diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index b7ab6c9a0fe..9ad37f3a63d 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "Displays text on your screen";
     homepage = http://sourceforge.net/projects/libxosd;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ pSub ];
   };
 }

From 9e92c53b537d0affd242074045ac843179e0a4ea Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:45:18 -0500
Subject: [PATCH 1432/1744] flvstreamer: supports darwin

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

diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index ab8e14fddd0..02d3bebcd30 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildPhase = ''
-    make posix
+    make CC=cc posix
   '';
 
   installPhase = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://savannah.nongnu.org/projects/flvstreamer;
 
     maintainers = [ stdenv.lib.maintainers.thammers ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 02285dcd10cfcf4275f5ee09740ebfd28797c2e2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 20 Apr 2017 23:45:29 -0500
Subject: [PATCH 1433/1744] cron: supports darwin

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

diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index dec1bacd741..bf345fadbd4 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   preBuild = ''
     substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
-    makeFlags="DESTROOT=$out"
+    makeFlags="DESTROOT=$out CC=cc"
 
     # We want to ignore the $glibc/include/paths.h definition of
     # sendmail path.
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Daemon for running commands at specific times (Vixie Cron)";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From fac85b06fdf0d3dbf9c5e5a74e0a5273b8c2dc0a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 00:10:24 -0500
Subject: [PATCH 1434/1744] exempi: supports darwin

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

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 1453db8563f..ed6728482aa 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, boost }:
+{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   name = "exempi-2.4.2";
@@ -12,11 +12,12 @@ stdenv.mkDerivation rec {
     "--with-boost=${boost.dev}"
   ];
 
-  buildInputs = [ expat zlib boost ];
+  buildInputs = [ expat zlib boost ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   meta = with stdenv.lib; {
     homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
   };
 }

From bd33551e06e68f05eb85dfc10fb620e1c1bf0f32 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 00:10:38 -0500
Subject: [PATCH 1435/1744] qwt: supports darwin

---
 pkgs/development/libraries/qwt/6_qt4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix
index 7774ab7df9e..0315ae72709 100644
--- a/pkgs/development/libraries/qwt/6_qt4.nix
+++ b/pkgs/development/libraries/qwt/6_qt4.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://qwt.sourceforge.net/;
     # LGPL 2.1 plus a few exceptions (more liberal)
     license = stdenv.lib.licenses.qwt;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
     branch = "6";
   };

From f1346f58543c87d6e1fe2f0d942cd1a3552a2ac6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 00:10:52 -0500
Subject: [PATCH 1436/1744] tesseract: supports darwin

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

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 14335a4c2a9..a5643da8c3a 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/tesseract-ocr/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From b73eb69582b11f082991fb9fff49b00827a1ea51 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 00:18:47 -0500
Subject: [PATCH 1437/1744] gst-plugins-good: supports darwin

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

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 4d9582d1381..c28cfca31c5 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       code, LGPL or LGPL-compatible for the supporting library).
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
   };
 
   src = fetchurl {

From f2d3fc12b8d2584435a85f2e777e9219694da05a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 17:44:19 -0500
Subject: [PATCH 1438/1744] girara: supports darwin

---
 pkgs/applications/misc/girara/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 860068c5667..7585ef6710a 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses
+{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty
 , withBuildColors ? true
 }:
 
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
       --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
   '';
 
-  buildInputs = [ pkgconfig gtk gettext ];
+  buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -35,7 +38,7 @@ stdenv.mkDerivation rec {
       that focuses on simplicity and minimalism.
     '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.garbas ];
   };
 }

From 68b5c5e9a9d34a726b4735d56fac362032425834 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 18:05:32 -0500
Subject: [PATCH 1439/1744] sylpheed: supports darwin

---
 pkgs/applications/networking/mailreaders/sylpheed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 509a2ab0118..a63bedfb29d 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = http://sylpheed.sraoss.jp/en/;
     description = "A lightweight and user-friendly e-mail client";
     maintainers = [ maintainers.eelco ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     license = "GPL";
   };
 }

From 2060f5b1fc2897e4fe2c48f9da3048865f5764c6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Apr 2017 18:05:57 -0500
Subject: [PATCH 1440/1744] libgtop: supports darwin

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

diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index ee4f9401bbb..de72072e48b 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }:
+{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }:
 stdenv.mkDerivation rec {
   name = "libgtop-${version}";
   major = "2.34";
@@ -10,9 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ glib ];
+  buildInputs = libintlOrEmpty;
   nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ];
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 176ca2aac84087d32f4e7aebb43799df0efe3dec Mon Sep 17 00:00:00 2001
From: DrawnWren <drawnwren@gmail.com>
Date: Sun, 23 Apr 2017 23:59:41 +0000
Subject: [PATCH 1441/1744] oh-my-zsh: changed example command

Fixed a typo in the example command. oh-my-zsh-git -> oh-my-zsh
---
 pkgs/shells/oh-my-zsh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index ea1aa6ed26c..8b83e9a37f6 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   To copy the Oh My Zsh configuration file to your home directory, run
   the following command:
 
-    $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+    $ cp -v $(nix-env -q --out-path oh-my-zsh | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
   '';
   homepage        = "http://ohmyz.sh/";
   license         = licenses.mit;

From f1708a9d7d79e2bf2961fc648625578b23b3460f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 17 Apr 2017 03:08:37 +0000
Subject: [PATCH 1442/1744] make-disk-image: change to be less VM-centric

This changes much of the make-disk-image.nix logic (and thus most NixOS
image building) to use LKL to set up the target directory structure rather
than a Linux VM. The only work we still do in a VM is less IO-heavy stuff
that while still time-consuming, is less of the overall load. The goal is
to kill more of that stuff, but that will require deeper changes to NixOS
activation scripts and switch-to-configuration.pl, and I don't want to
bite off too much at once.
---
 nixos/lib/make-disk-image.nix                 | 204 +++++++++++-------
 .../maintainers/scripts/ec2/amazon-image.nix  |   5 +-
 .../installer/tools/nixos-prepare-root.sh     |   2 +-
 3 files changed, 125 insertions(+), 86 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 8c5de22f30f..56766ec9047 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -33,42 +33,124 @@
 
 , name ? "nixos-disk-image"
 
-  # This prevents errors while checking nix-store validity, see
-  # https://github.com/NixOS/nix/issues/1134
-, fixValidity ? true
-
 , format ? "raw"
 }:
 
 with lib;
 
-pkgs.vmTools.runInLinuxVM (
+let
+  # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
+  # TODO: factor out more cleanly
+
+  # Do not include these things:
+  #   - The '.git' directory
+  #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
+  #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
+  filterFn = path: type: let basename = baseNameOf (toString path); in
+    if type == "directory" then basename != ".git"
+    else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
+    else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
+
+  nixpkgs = builtins.filterSource filterFn pkgs.path;
+
+  channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
+    mkdir -p $out
+    cp -prd ${nixpkgs} $out/nixos
+    chmod -R u+w $out/nixos
+    if [ ! -e $out/nixos/nixpkgs ]; then
+      ln -s . $out/nixos/nixpkgs
+    fi
+    rm -rf $out/nixos/.git
+    echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
+  '';
+
+  metaClosure = pkgs.writeText "meta" ''
+    ${config.system.build.toplevel}
+    ${config.nix.package.out}
+    ${channelSources}
+  '';
+
+  prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
+
+  # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
+  # image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
+  # !!! should use XML.
+  sources = map (x: x.source) contents;
+  targets = map (x: x.target) contents;
+
+  prepareImage = ''
+    export PATH=${pkgs.lib.makeSearchPathOutput "bin" "bin" prepareImageInputs}
+
+    mkdir $out
+    diskImage=nixos.raw
+    truncate -s ${toString diskSize}M $diskImage
+
+    ${if partitioned then ''
+      parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
+      offset=$((2048*512))
+    '' else ''
+      offset=0
+    ''}
+
+    mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
+  
+    root="$PWD/root"
+    mkdir -p $root
+
+    # Copy arbitrary other files into the image
+    # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of
+    # https://github.com/NixOS/nixpkgs/issues/23052.
+    set -f
+    sources_=(${concatStringsSep " " sources})
+    targets_=(${concatStringsSep " " targets})
+    set +f
+
+    for ((i = 0; i < ''${#targets_[@]}; i++)); do
+      source="''${sources_[$i]}"
+      target="''${targets_[$i]}"
+
+      if [[ "$source" =~ '*' ]]; then
+        # If the source name contains '*', perform globbing.
+        mkdir -p $root/$target
+        for fn in $source; do
+          rsync -a --no-o --no-g "$fn" $root/$target/
+        done
+      else
+        mkdir -p $root/$(dirname $target)
+        if ! [ -e $root/$target ]; then
+          rsync -a --no-o --no-g $source $root/$target
+        else
+          echo "duplicate entry $target -> $source"
+          exit 1
+        fi
+      fi
+    done
+
+    # TODO: Nix really likes to chown things it creates to its current user...
+    fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
+
+    echo "copying staging root to image..."
+    cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
+  '';
+in pkgs.vmTools.runInLinuxVM (
   pkgs.runCommand name
-    { preVM =
-        ''
-          mkdir $out
-          diskImage=$out/nixos.${if format == "qcow2" then "qcow2" else "img"}
-          ${pkgs.vmTools.qemu}/bin/qemu-img create -f ${format} $diskImage "${toString diskSize}M"
-          mv closure xchg/
-        '';
-      buildInputs = with pkgs; [ utillinux perl e2fsprogs parted rsync ];
-
-      # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
-      # image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
-      # !!! should use XML.
-      sources = map (x: x.source) contents;
-      targets = map (x: x.target) contents;
-
-      exportReferencesGraph =
-        [ "closure" config.system.build.toplevel ];
-      inherit postVM;
+    { preVM = prepareImage;
+      buildInputs = with pkgs; [ utillinux e2fsprogs ];
+      exportReferencesGraph = [ "closure" metaClosure ];
+      postVM = ''
+        ${if format == "raw" then ''
+          mv $diskImage $out/nixos.img
+          diskImage=$out/nixos.img
+        '' else ''
+          ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2
+          diskImage=$out/nixos.qcow2
+        ''}
+        ${postVM}
+      '';
       memSize = 1024;
     }
     ''
       ${if partitioned then ''
-        # Create a single / partition.
-        parted /dev/vda mklabel msdos
-        parted /dev/vda -- mkpart primary ext2 1M -1s
         . /sys/class/block/vda1/uevent
         mknod /dev/vda1 b $MAJOR $MINOR
         rootDisk=/dev/vda1
@@ -76,74 +158,34 @@ pkgs.vmTools.runInLinuxVM (
         rootDisk=/dev/vda
       ''}
 
-      # Create an empty filesystem and mount it.
-      mkfs.${fsType} -L nixos $rootDisk
-      mkdir /mnt
-      mount $rootDisk /mnt
-
-      # Register the paths in the Nix database.
-      printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-          ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
-
-      ${if fixValidity then ''
-        # Add missing size/hash fields to the database. FIXME:
-        # exportReferencesGraph should provide these directly.
-        ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group ""
-      '' else ""}
-
-      # In case the bootloader tries to write to /dev/sda…
+      # Some tools assume these exist
       ln -s vda /dev/xvda
       ln -s vda /dev/sda
 
-      # Install the closure onto the image
-      USER=root ${config.system.build.nixos-install}/bin/nixos-install \
-        --closure ${config.system.build.toplevel} \
-        --no-channel-copy \
-        --no-root-passwd \
-        ${optionalString (!installBootLoader) "--no-bootloader"}
+      mountPoint=/mnt
+      mkdir $mountPoint
+      mount $rootDisk $mountPoint
 
-      # Install a configuration.nix.
+      # Install a configuration.nix
       mkdir -p /mnt/etc/nixos
       ${optionalString (configFile != null) ''
         cp ${configFile} /mnt/etc/nixos/configuration.nix
       ''}
 
-      # Remove /etc/machine-id so that each machine cloning this image will get its own id
-      rm -f /mnt/etc/machine-id
+      mount --rbind /dev  $mountPoint/dev
+      mount --rbind /proc $mountPoint/proc
+      mount --rbind /sys  $mountPoint/sys
 
-      # Copy arbitrary other files into the image
-      # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of
-      # https://github.com/NixOS/nixpkgs/issues/23052.
-      set -f
-      sources_=($sources)
-      targets_=($targets)
-      set +f
+      # Set up core system link, GRUB, etc.
+      NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot
 
-      for ((i = 0; i < ''${#targets_[@]}; i++)); do
-        source="''${sources_[$i]}"
-        target="''${targets_[$i]}"
+      # TODO: figure out if I should activate, but for now I won't
+      # chroot $mountPoint /nix/var/nix/profiles/system/activate
 
-        if [[ "$source" =~ '*' ]]; then
+      # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images
+      rm -f $mountPoint/etc/machine-id
 
-          # If the source name contains '*', perform globbing.
-          mkdir -p /mnt/$target
-          for fn in $source; do
-            rsync -a --no-o --no-g "$fn" /mnt/$target/
-          done
-
-        else
-
-          mkdir -p /mnt/$(dirname $target)
-          if ! [ -e /mnt/$target ]; then
-            rsync -a --no-o --no-g $source /mnt/$target
-          else
-            echo "duplicate entry $target -> $source"
-            exit 1
-          fi
-        fi
-      done
-
-      umount /mnt
+      umount -R /mnt
 
       # Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal
       # mount, so the `-c 0` and `-i 0` don't affect it. Setting it to `now` doesn't produce deterministic
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index b4190df8335..cdfac71634d 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -6,10 +6,7 @@ let
   cfg = config.amazonImage;
 in {
 
-  imports =
-    [ ../../../modules/installer/cd-dvd/channel.nix
-      ../../../modules/virtualisation/amazon-image.nix
-    ];
+  imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
   options.amazonImage = {
     contents = mkOption {
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
index c374330f846..cd786c47ef6 100644
--- a/nixos/modules/installer/tools/nixos-prepare-root.sh
+++ b/nixos/modules/installer/tools/nixos-prepare-root.sh
@@ -70,7 +70,7 @@ for i in $closures; do
             rsync -a $j $mountPoint/nix/store/
         done
 
-        nix-store --register-validity < $i
+        nix-store --option build-users-group root --register-validity < $i
     fi
 done
 

From e879d7bd8446aaae231012cb6be6de7a895f6edd Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sun, 23 Apr 2017 21:04:07 -0700
Subject: [PATCH 1443/1744] nut: 2.7.1 -> 2.7.4

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

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 25c90488092..4d53203ccd4 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -2,11 +2,11 @@
 , libtool, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "nut-2.7.1";
+  name = "nut-2.7.4";
 
   src = fetchurl {
     url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz";
-    sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki";
+    sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
   };
 
   buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  
+
   postInstall = ''
     wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
       "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"

From 2df7f1b5b5ad5c1a4805f6d756ede50e0930e9eb Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 23 Apr 2017 21:53:00 -0700
Subject: [PATCH 1444/1744] coq.QuickChick: Update to latest version that works
 with Coq 8.6

---
 pkgs/development/coq-modules/QuickChick/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index db364ffb1af..8fc12e5759d 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,16 +1,16 @@
 {stdenv, fetchgit, coq, coqPackages}:
 
-let revision = "b73a594af5460567dc233b2f2e7b0f781ae0490d"; in
+let revision = "04785ee692036e7ba9f4c4e380b1995128a97bf8"; in
 
 stdenv.mkDerivation rec {
 
   name = "coq-QuickChick-${coq.coq-version}-${version}";
-  version = "20150605-${builtins.substring 0 7 revision}";
+  version = "20170422-${builtins.substring 0 7 revision}";
 
   src = fetchgit {
     url = git://github.com/QuickChick/QuickChick.git;
     rev = revision;
-    sha256 = "1prlihkgi2yvgzd62x80fsnxp5w1n0wyk7zrd6zwa8dbqx9pbr09";
+    sha256 = "1x5idk9d9r5mj1w54676a5j92wr1id7c9dmknkpmnh78rgrqzy5j";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fcb95c3e8d..f13eec07937 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17509,6 +17509,7 @@ with pkgs;
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
     math-classes = callPackage ../development/coq-modules/math-classes { };
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
+    QuickChick = callPackage ../development/coq-modules/QuickChick {};
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
   };
 
@@ -17524,6 +17525,7 @@ with pkgs;
     interval = callPackage ../development/coq-modules/interval {};
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
+    QuickChick = callPackage ../development/coq-modules/QuickChick {};
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
   };
 

From 71c7ca7064720cfe25ee78013229c42287e1b5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 24 Apr 2017 09:36:37 +0200
Subject: [PATCH 1445/1744] dino: 2017-04-20 -> 2017-04-24

---
 .../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 7ea19f35fe7..8bd6cfe6b0a 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-2017-04-20";
+  name = "dino-unstable-2017-04-24";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "5c8275ed4efdc7a3a0bc2a9c3a3f46d0383ddcf4";
-    sha256 = "12k3s8k8wmjyg5m0f4f2vp83bp0m9swmrsms81yd1722z3ragxsf";
+    rev = "3eb9aa0fa79ea9fcebb5f702f81c2e54aafdc8cc";
+    sha256 = "0z9ql419q53f20bw4pfwsafxl4qqnz0ip91qibsf9jn5d56kcdwv";
     fetchSubmodules = true;
   };
 

From 229e3383f43446af8cc6445d7173a882707213cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 24 Apr 2017 00:02:03 +0800
Subject: [PATCH 1446/1744] mpv: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 3a5313b7827..6816b6956cd 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -79,13 +79,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "1aq1lvhw4l0i2gc9x6ijaaj2h3894jbcpd4j055n0y9vg9vqm6yy";
+    sha256 = "16r3fyq472hzxnh6g3gm520pmw1ybslaki3pqjm2d9jnd2md1pa5";
   };
 
   patchPhase = ''

From 9b1b22fcb634e231dea196336a89fdb3269433e2 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 26 Mar 2017 19:13:09 +0200
Subject: [PATCH 1447/1744] radeon-profile: init at 20161221

---
 pkgs/tools/misc/radeon-profile/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/radeon-profile/default.nix

diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
new file mode 100644
index 00000000000..ab60bd97b35
--- /dev/null
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeQtWrapper, libXrandr }:
+
+stdenv.mkDerivation rec {
+
+  name = "radeon-profile-${version}";
+  version = "20161221";
+
+  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  buildInputs = [ qtbase libXrandr ];
+
+  src = (fetchFromGitHub {
+    owner  = "marazmista";
+    repo   = "radeon-profile";
+    rev    = version;
+    sha256 = "0zdmpc0rx6i0y32dcbz02whp95hpbmmbkmcp39f00byvjm5cprgg";
+  }) + "/radeon-profile";
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp ./radeon-profile $out/bin/radeon-profile
+    wrapQtProgram  $out/bin/radeon-profile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Application to read current clocks of AMD Radeon cards";
+    homepage    = https://github.com/marazmista/radeon-profile;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fcb95c3e8d..1e0dc7c59c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3690,6 +3690,8 @@ with pkgs;
 
   radarr = callPackage ../servers/radarr { };
 
+  radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
+
   radvd = callPackage ../tools/networking/radvd { };
 
   rambox = callPackage ../applications/networking/instant-messengers/rambox { };

From 0c318375c8c89ef890c73e288ec5e384a57176b0 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 24 Apr 2017 11:22:23 +0200
Subject: [PATCH 1448/1744] libidn2: 0.16 -> 2.0.1

See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00010.html
for release information. With this release the numbering scheme changed.
---
 pkgs/development/libraries/libidn2/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index ea26f480cd1..9a736a38e3f 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -3,11 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libidn2-0.16";
+  name = "libidn2-${version}";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz";
-    sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g";
+    url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
+    sha256 = "1lzi4wng22gyzlgkr8jk75d03f2bnnch5yhmiwb0hram2la6a8qd";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];

From f6e0e71b9d041b3f236eb2eb3845aa6ab6380aa4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Apr 2017 07:08:55 -0400
Subject: [PATCH 1449/1744] ammonite: 0.8.2 -> 0.8.3

---
 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 049ea51b8f9..4c64141fd4d 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-repl-${version}";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/2.12-${version}";
-    sha256 = "0fgwqdvk0nljd6xm16r8qdhjcp7ix4vx91w5ab856hllf4911120";
+    sha256 = "0y4524y2w7aq300djcazb7ckkr3gqpim2grcgb237mxq3fdvb0r8";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 87e94a061adcc9c357f1705485252228277eff9b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Mon, 24 Apr 2017 13:25:56 +0200
Subject: [PATCH 1450/1744] upgrade sipwitch to 0.9.15

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

diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 8eecfa1e276..3395be9b9c1 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.9.8";
+  name = "sipwitch-1.9.15";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b";
+    sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From e17e5590b567c5b17fbf36503d5dde571736293b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 24 Apr 2017 20:02:17 +0800
Subject: [PATCH 1451/1744] syncthing: 0.14.26 -> 0.14.27

---
 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 81c459ff15a..f90e30c61bb 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.26";
+  version = "0.14.27";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1ny41fj8gg555awqcsyvsjs1zghjlwciwhyxjh5ly16hzaixn499";
+    sha256 = "0i82r2ygcz63pidn1glxz9szgkb7yql6lhwwcqh8b1xnkrvvkz71";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 0e9a01355afa388ec71b2ccfaeac236dfb1d20fe Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 24 Apr 2017 09:16:51 -0300
Subject: [PATCH 1452/1744] cimg: fix paths and unbreak overrides

---
 pkgs/development/libraries/cimg/builder.sh  | 11 -----------
 pkgs/development/libraries/cimg/default.nix | 12 +++++++++---
 2 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/cimg/builder.sh

diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh
deleted file mode 100644
index 6473395493c..00000000000
--- a/pkgs/development/libraries/cimg/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-
-source $stdenv/setup
-
-unpackPhase
-cd $sourceRoot
-
-install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins
-
-install -m 644 CImg.h $out/include/cimg
-cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/
-cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index a9470ee3f41..c294647b35d 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl
-, unzip }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
 
@@ -13,7 +12,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ unzip ];
 
-  builder = ./builder.sh;
+  installPhase = ''
+    install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
+
+    install -m 644 CImg.h $out/include/
+    cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
+    cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/
+    cp README.txt $doc/share/doc/cimg/
+  '';
 
   outputs = [ "out" "doc" ];
 

From d16c38a260ef41ae648f994918f491437fb7c75c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 16:42:05 +0200
Subject: [PATCH 1453/1744] R: update to version 3.4.0

The new version needs TZ configured to a value other than "UTC" for the test
suite to succeed. Otherwise, an assumption in "reg-tests-1d.R" won't hold that
expects

  d <- as.POSIXlt("2016-12-06"); d$zone <- 1; format(d)

to throw an error about an invalid time zone.
---
 pkgs/applications/science/math/R/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index f87a26cda8a..20ae791c31b 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.3.3";
+  name = "R-3.4.0";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss";
+    sha256 = "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8";
   };
 
   buildInputs = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   installTargets = [ "install" "install-info" "install-pdf" ];
 
   doCheck = true;
-  preCheck = "bin/Rscript -e 'sessionInfo()'";
+  preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;
 

From 430cbcfd2bc705ecfaf59d431b1274b5e671b123 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 19:59:50 +0200
Subject: [PATCH 1454/1744] R: update CRAN and BIOC package sets

---
 pkgs/development/r-modules/bioc-packages.nix | 2504 +++++++++---------
 pkgs/development/r-modules/cran-packages.nix | 2372 +++++++++--------
 pkgs/development/r-modules/default.nix       |   13 -
 3 files changed, 2615 insertions(+), 2274 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 7d5db5a744a..a5bfe4ccea0 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -4,1217 +4,1297 @@
 # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix
 
 { self, derive }:
-let derive2 = derive { rVersion = "3.3"; };
+let derive2 = derive { rVersion = "3.4"; };
 in with self; {
-  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.2.2"; sha256="1jb88iwgp80i3ir1509chr7cjrjvk92a2d5hcdyl0vg9b0qxymbj"; depends=[ABAData gplots Rcpp]; };
-  ABSSeq = derive2 { name="ABSSeq"; version="1.8.1"; sha256="099z80h097sf0slj3m29nfdmn1a5p3b0c7sgh1wfnm6dg6y7g26k"; depends=[limma locfit]; };
-  ABarray = derive2 { name="ABarray"; version="1.40.0"; sha256="1qylnf9x8hihc9g64xpcb6jrphysmlg61aa14jd3afjak3xh52g4"; depends=[Biobase multtest]; };
-  ACME = derive2 { name="ACME"; version="2.28.0"; sha256="0l56y211r9i50gksv7bm7jzdpk8b3dmc83vkpd5xfnbigdfn7al4"; depends=[Biobase BiocGenerics]; };
-  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.12.0"; sha256="0ndgqrg0d02yx9ykgqss9n21dfmldfmgx1hpfj9bmsblyf074gxm"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
-  AGDEX = derive2 { name="AGDEX"; version="1.20.0"; sha256="0j1n9r8xagb5wrwhs7sdmvzg2vz9nwl9rf3214kq87hgwbkqn64m"; depends=[Biobase GSEABase]; };
-  AIMS = derive2 { name="AIMS"; version="1.4.0"; sha256="1sq9gwsmvrq4fdhh5p9wwrikrhgpzw5pv07ncvmirpkhh0qi50l6"; depends=[Biobase e1071]; };
-  ALDEx2 = derive2 { name="ALDEx2"; version="1.4.0"; sha256="0vhsfa7asfd8rwvi9z1g0wjsx91dldfhisa6a447wahb7m73cs4y"; depends=[GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.12.0"; sha256="1y79fll7jxw8h80h0zld0ys4an23f0f86phl8r40kbxlk002mpsq"; depends=[ARRmData]; };
-  ASEB = derive2 { name="ASEB"; version="1.16.0"; sha256="0g2qsmqmsk1ka4mvf2qkh9pxdi0xm1n7csqhwsfbmlmv3za0zkdy"; depends=[]; };
-  ASGSCA = derive2 { name="ASGSCA"; version="1.6.0"; sha256="0y1gq5xii5p5m0x19xmbs00hlc68zgw7nqnpxkk3jf8g995gvsvb"; depends=[MASS Matrix]; };
-  ASSET = derive2 { name="ASSET"; version="1.10.0"; sha256="0yb1ps4cwb36zr6f3na3wp6v6l0wi1x1hqck4irzpwmlh7vazkqj"; depends=[MASS msm mvtnorm rmeta tmvnsim]; };
-  ASSIGN = derive2 { name="ASSIGN"; version="1.8.0"; sha256="18pdw43ibbhqf25z1vcm34gpyxwxm96d28clqp8grq50zr60n9ii"; depends=[gplots msm Rlab]; };
-  AffyCompatible = derive2 { name="AffyCompatible"; version="1.32.0"; sha256="15cg6jbmn7fq89cmmfkwykmxqrz8fvq59ip691ai93n18js8hzwf"; depends=[Biostrings RCurl XML]; };
-  AffyExpress = derive2 { name="AffyExpress"; version="1.38.0"; sha256="1kq17y9864d94pvpw9hvrrl8s8fh9c7sd6cf4cykzj34729k6xm1"; depends=[affy limma]; };
-  AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.18.0"; sha256="1p8j3286ix36sckzrw726q7nsxivcgxggkmp76vmrd6l0a67bz75"; depends=[affy]; };
-  AffyTiling = derive2 { name="AffyTiling"; version="1.29.0"; sha256="0s5hrlzzxpyw52lpp7xq7vd5wds5ymph2gav4mhbbplvism7wnjz"; depends=[affxparser affy preprocessCore]; };
-  AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.22.0"; sha256="1fkl1rnj9pj654pdjfs2k6r74yvpbm331gf9cdcsq3baafygv48z"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.10.2"; sha256="09p2z1vh7hq7fkfz49n7c8yfsji66p6dry5dmi6b6gm22fj5q7f2"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-  AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.6.2"; sha256="0fws4b2cln0i9fn5cnvggjk86y2mcbzvd1r5gfs8idjsm79mzaxn"; depends=[Biobase graph log4r rjson]; };
-  AneuFinder = derive2 { name="AneuFinder"; version="1.0.3"; sha256="1a0kaxd65r9453cx8jw5y2zvybqxjlyw68x3vn0kvgz6pv84dwq1"; depends=[AneuFinderData BiocGenerics Biostrings cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 IRanges mclust preseqR ReorderCluster reshape2 Rsamtools S4Vectors]; };
-  AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.34.4"; sha256="1k3gfsjrivc7467vg0h705hh4dvzgdhknz62j7zmfxm67qk9r8rq"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-  AnnotationForge = derive2 { name="AnnotationForge"; version="1.14.2"; sha256="1vkdd1qdv5g680ipw4vwjvn52xn66xpg6ngmwyknz77ckxnnpf4q"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors XML]; };
-  AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.22.0"; sha256="1mc2y5ra8cmbmr10vnywx4hjdklrq3ihwl9m11g2vaqylwy7gh1c"; depends=[AnnotationDbi DBI]; };
-  AnnotationHub = derive2 { name="AnnotationHub"; version="2.4.2"; sha256="1jjl1q5wgwfjhrm96c7wh0w8dpaxzqy9wjisy3pmg483vg0960y4"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
-  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.2.2"; sha256="1h9qljbyjg2qgxx9knwwyfiy0kw7wp2k281hxzq66c24idp3kkrl"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings curl DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; };
-  ArrayExpress = derive2 { name="ArrayExpress"; version="1.32.0"; sha256="08fcvhjmpr1fx90qyik12hc3yb3v6i4bvx62xadxm3m2zq52nmgl"; depends=[Biobase limma oligo XML]; };
-  ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.22.1"; sha256="1p5flrkb8xwhw51fjr8zm27qgzm5v10s4kccjajiykiv0v301snh"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
-  ArrayTV = derive2 { name="ArrayTV"; version="1.10.0"; sha256="0vh53xlg4yidmk39rxa0nw2cr12f6mld1vwiq6jba5j51szqm0aw"; depends=[DNAcopy foreach oligoClasses S4Vectors]; };
-  ArrayTools = derive2 { name="ArrayTools"; version="1.32.0"; sha256="09cqab10xh052d0932p2y3svspn9lqi1zylkm7kglkksn7j27vih"; depends=[affy Biobase limma xtable]; };
-  AtlasRDF = derive2 { name="AtlasRDF"; version="1.8.0"; sha256="1hw5i074cxkwqi4gkb3abqvl9q3wz93s5fvym28id63qsmpdssl9"; depends=[hash SPARQL]; };
-  BAC = derive2 { name="BAC"; version="1.32.0"; sha256="07f8vcbdqlq4i0b6xqrlf6fr3zj8kbbjssc3pf9gy2s0kf1da6p0"; depends=[]; };
-  BADER = derive2 { name="BADER"; version="1.10.0"; sha256="1ibcchi6qgd49m4kjz3dx8nc31nkg5bjw8g5w5ih05pki0gl4219"; depends=[]; };
-  BAGS = derive2 { name="BAGS"; version="2.12.0"; sha256="1krnkamjxk71lxmm1n1zg8c2agv4w0xksz3gngpjjgzcybfnnn2i"; depends=[Biobase breastCancerVDX]; };
-  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.2.0"; sha256="0q8kj2gp0j6xrmgq1zd1230hddiy139qrdrz64m2nab5avn1fmlm"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
-  BCRANK = derive2 { name="BCRANK"; version="1.34.0"; sha256="0y6dj26qd6a3jm7lp0jcdkpvdc4jq3gp11mvv1ix724zasb57k3d"; depends=[Biostrings]; };
-  BEAT = derive2 { name="BEAT"; version="1.10.0"; sha256="0v7hl5v84bn2iik89j4wsq9vnnr392n4h2x2n8x9fdips2bjpq3w"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
-  BEclear = derive2 { name="BEclear"; version="1.4.0"; sha256="17p4g4gh6vnnymsrhfh1xhjj4ahm0dilapnlh4mf883x9q8acbda"; depends=[Matrix snowfall]; };
-  BGmix = derive2 { name="BGmix"; version="1.32.0"; sha256="1z0i0h43din2659yzzjx10bzmbak5nwrbgnab4ifq8hq6sgxyzg2"; depends=[KernSmooth]; };
-  BHC = derive2 { name="BHC"; version="1.24.0"; sha256="0v906vnh5ph1srr1s5i4cbplkyqfim6fmxn0wp290jb0ilkp3ziv"; depends=[]; };
-  BRAIN = derive2 { name="BRAIN"; version="1.18.0"; sha256="0iwz6yy164hwy1mqa869y6d1qs69ijx566dfff8mj0ym655pd3rz"; depends=[Biostrings lattice PolynomF]; };
-  BSgenome = derive2 { name="BSgenome"; version="1.40.1"; sha256="0zmlzlcwairka59is5wmkh6knh6j4d328z9fsw3v91fx6gavjl2n"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
-  BUS = derive2 { name="BUS"; version="1.28.0"; sha256="1z8l27rsz6zz8d0sga5pwn77iv5pwjgy3zjm8rcc6w3ql86za5m3"; depends=[infotheo minet]; };
-  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.0.0"; sha256="1rxncqjv7bw4f17ra00cq1xp9g72mlj1wc335g5ln7778wiax1g9"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
-  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.16.0"; sha256="1w1n9m5j9mcphvhsdj7dh8awvj1r10zna7dx13b2f280jmglg215"; depends=[RCurl RJSONIO]; };
-  Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.8.0"; sha256="0216xhqj4ysscj4lr66vibijrac7kmkmxnqsqcwwxwzqsrk5gh7z"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
-  BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.0.2"; sha256="1ryarcvb9cpmgc3yzd7qck46ff2xc417dhnfiwma3gy3gm2g4lyi"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
-  BatchQC = derive2 { name="BatchQC"; version="1.0.22"; sha256="18c675pnah7xc089ny6h8zf4150d9f3ayf5wyxji0zdkvk2gnxjv"; depends=[corpcor d3heatmap ggvis gplots knitr limma matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
-  BayesPeak = derive2 { name="BayesPeak"; version="1.24.0"; sha256="1m8c6akdi4mw1aj6482s9x8918m2a3d58s0fvvhpwzcppz7yjw33"; depends=[IRanges]; };
-  BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.24.2"; sha256="04jviwwx4brbv19kzzw69vjqhprl8sgsghw71gxmp91c6i1pv5a2"; depends=[]; };
-  BgeeDB = derive2 { name="BgeeDB"; version="1.0.3"; sha256="0g84hyirg3blbk6vxwjazgvpqzn384i6i01r7fxyqfdyfczprsfp"; depends=[Biobase data_table dplyr graph RCurl tidyr topGO]; };
-  BiGGR = derive2 { name="BiGGR"; version="1.8.0"; sha256="15ffri2xdjwqxf7mn6mxk5h9c7m0xkq2di6nlvdwvapwm9945ldq"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
-  BiRewire = derive2 { name="BiRewire"; version="3.2.1"; sha256="0y32y9vfs1sh7lwpkzpsmvgrll3x5l7y8xm3rcxalag17lkfax65"; depends=[igraph Matrix slam tsne]; };
-  BiSeq = derive2 { name="BiSeq"; version="1.12.0"; sha256="14gr8dmkpm2wzdwlhrf9gkj9307cxpsap7a0a6bfip2zgrp82414"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
-  BicARE = derive2 { name="BicARE"; version="1.30.0"; sha256="0faq2w40ikgrzcf39908icb0kph9sxbrplh86m12xwjwsbfwys47"; depends=[Biobase GSEABase multtest]; };
-  BioMVCClass = derive2 { name="BioMVCClass"; version="1.40.0"; sha256="1249q8qpnva9a1wh1q8mi0x2yggbg5kmfkcv75wdbzmc82hkck42"; depends=[Biobase graph MVCClass Rgraphviz]; };
-  BioNet = derive2 { name="BioNet"; version="1.32.0"; sha256="0zrfdlqfy18zk6z8a3slg8ksywknjbywr5r90ksyfqmvd869ick2"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
-  BioQC = derive2 { name="BioQC"; version="1.0.0"; sha256="0zqpdfdjlsfm203kva8jfv09rwdwmr47daz1zjj06p1m82bwhg1v"; depends=[Biobase Rcpp]; };
-  BioSeqClass = derive2 { name="BioSeqClass"; version="1.30.0"; sha256="1gcy27f9jim5b5q7979pz5m9rbphij0cln4mhvzwmkdwvi2ddyj8"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
-  Biobase = derive2 { name="Biobase"; version="2.32.0"; sha256="0q4icv9n5rc2qfkv6k1wjhmfcpzcyr8f45m2z3xharbdv912kl1i"; depends=[BiocGenerics]; };
-  BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.34.0"; sha256="1g4307x962ccvxdb421n3cksrrydglmp0hjhwlqlvfyddmkxmym0"; depends=[Biobase]; };
-  BiocCheck = derive2 { name="BiocCheck"; version="1.8.2"; sha256="0bvkhxmr25nb0gkncifbc3x48i5zgls3737g3xais6jx16wd4q35"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
-  BiocGenerics = derive2 { name="BiocGenerics"; version="0.18.0"; sha256="1jjp48vbph09w5bmc7368gjjywsa1lmzfybpiwlypr60b51vlkp6"; depends=[]; };
-  BiocInstaller = derive2 { name="BiocInstaller"; version="1.22.3"; sha256="02qkfq6f2b7v9klri6d1nv21r54bywv1zd5x47ka0jhhp946cqpr"; depends=[]; };
-  BiocParallel = derive2 { name="BiocParallel"; version="1.6.6"; sha256="1l39zmvhjlvlczrk5wal4y2s4g0b2kmaczgq5biah9qn45y474mw"; depends=[futile_logger snow]; };
-  BiocStyle = derive2 { name="BiocStyle"; version="2.0.3"; sha256="06aaj0snj0y3bhhfh7lr949fi6cg7gz6fwf5drdm10ckbs4zp9dk"; depends=[]; };
-  Biostrings = derive2 { name="Biostrings"; version="2.40.2"; sha256="153rfws5sdha324p1nv7jp75ip6ny0f62jzhqcvs46l85h3i8zgh"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
-  BitSeq = derive2 { name="BitSeq"; version="1.16.0"; sha256="1w585sk92053pwhw1h1qd421rr7s42cm8l8b6mm9cdvrf9095p9r"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
-  BrainStars = derive2 { name="BrainStars"; version="1.16.0"; sha256="0y6l0c17xlm8q3nbhy21bk2mrbb0a660x6h19q14x01jm58gxwis"; depends=[Biobase RCurl RJSONIO]; };
-  BridgeDbR = derive2 { name="BridgeDbR"; version="1.6.0"; sha256="0i5cqyvgyk9yjd8sc8mqrbw0dvkr24hkzlwvw3dn1zk553nwyg98"; depends=[RCurl rJava]; };
-  BrowserViz = derive2 { name="BrowserViz"; version="1.4.0"; sha256="15j9cz4x9azn81myjnhckcil24ql3lbf83dfyl33qndszi9aqin4"; depends=[BiocGenerics httpuv jsonlite]; };
-  BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.4.0"; sha256="1krl88q9z7y2f25p8c9ghr9iyrldgw64xa5za6dv35d7aiihgr9s"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; };
-  BubbleTree = derive2 { name="BubbleTree"; version="2.2.2"; sha256="1gg1qxvs930lq7f2awpgmfq455306snzvyp4qxx1cm25yklvc0h6"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr rainbow RColorBrewer WriteXLS]; };
-  BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.36.0"; sha256="19yxbw4g4l1gmn14yrr8lmd627f4br5gkgzxpif21gmjvq2iaal1"; depends=[]; };
-  BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.36.0"; sha256="00jwgdk1y8is5256q664ph9rhsm4n1pqzrzrbabf9ahq2cm75f96"; depends=[BufferedMatrix]; };
-  CAFE = derive2 { name="CAFE"; version="1.8.0"; sha256="13lf4xm55qr8knjh644gb9a610lxxn8b97lkcprjv4n7pbc4vqxp"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
-  CAGEr = derive2 { name="CAGEr"; version="1.14.0"; sha256="14fkr47hq97wh6a9ig4k4gnybzwvcgf61yqqay4wma0aqi07cd3l"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
-  CALIB = derive2 { name="CALIB"; version="1.38.0"; sha256="1fb5w9bhwd9n818mrahbv2i6bllgzq2lslzkcybyp3llbrckbigy"; depends=[limma]; };
-  CAMERA = derive2 { name="CAMERA"; version="1.28.0"; sha256="02shq9gh2zpj2vkpzyslqzqa5q68lzz6hr07pklj5qldyvgxma52"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
-  CAnD = derive2 { name="CAnD"; version="1.4.0"; sha256="1hmyi76bhjihj7313f9jxcpnmpzs8r59s2prc2in4p1xmj2v26ha"; depends=[ggplot2 reshape]; };
-  CFAssay = derive2 { name="CFAssay"; version="1.6.0"; sha256="1ni4hss9m2i8cxjnsslp0s2rlpikd78w3c0x1590l0pqki5kbgbq"; depends=[]; };
-  CGEN = derive2 { name="CGEN"; version="3.8.0"; sha256="1zandlkv5fnm4zk6xpakpqbadrc9bgd73716rlwmlxrqqbqhqzdb"; depends=[mvtnorm survival]; };
-  CGHbase = derive2 { name="CGHbase"; version="1.32.0"; sha256="1v4h2zlfrb45y80skl3f2hqnzz8gk1k387m7sz2izx33dwfxgdpd"; depends=[Biobase marray]; };
-  CGHcall = derive2 { name="CGHcall"; version="2.34.1"; sha256="0vpvlddkihsvhr03m6kvn72p3dl2qd9ncr46va05hrvhgqxr976k"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
-  CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.26.0"; sha256="033ckmn74zhmmy3fi8sbrvb2zzxyzwzmkdyal7djm63rf8f52km1"; depends=[Biobase CGHbase CGHcall]; };
-  CGHregions = derive2 { name="CGHregions"; version="1.30.0"; sha256="1lglc0wglckc6c24yzjjc9l86p7i37ag837n75d0h4lv8x1yfzik"; depends=[Biobase CGHbase]; };
-  CHRONOS = derive2 { name="CHRONOS"; version="1.0.3"; sha256="1a87shlr88i0ampzayybpnhmzd9k9j05fylb2q6n4ykk1igq5mdy"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
-  CINdex = derive2 { name="CINdex"; version="1.0.2"; sha256="1f2gqfj88dlihqw0ba24sygcg7sr7pm91hv7s2jylys3r1013r0f"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
-  CMA = derive2 { name="CMA"; version="1.30.0"; sha256="03yirnn476as8ml97valczx2ad6a2g22mfp4czg1a3kblw4s3r3k"; depends=[Biobase]; };
-  CNAnorm = derive2 { name="CNAnorm"; version="1.18.0"; sha256="0wi76k3qz5zvhqyhx2zabw7baj1pyzi0srynbdws3zdcc2qaks57"; depends=[DNAcopy]; };
-  CNEr = derive2 { name="CNEr"; version="1.8.3"; sha256="169pbzm6k1kqy5214s7ka5snmbz98zi515nfjki2crnvr1fjjgxb"; depends=[BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges readr RSQLite rtracklayer S4Vectors XVector]; };
-  CNORdt = derive2 { name="CNORdt"; version="1.14.0"; sha256="0gp0fb1rqjlcxf3sa1miq5abzcmqnpnp62lmb88a6ljkisi2hqnq"; depends=[abind CellNOptR]; };
-  CNORfeeder = derive2 { name="CNORfeeder"; version="1.12.0"; sha256="19yggabd3m5afd1lbivhqninfif4ra88nlf3kv4qi6ixvbp685km"; depends=[CellNOptR graph]; };
-  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.14.0"; sha256="052hb464pq3sr513rmn8i12mz6xczfaqd9fax6djfwwdzprva315"; depends=[CellNOptR nloptr]; };
-  CNORode = derive2 { name="CNORode"; version="1.14.0"; sha256="07xyqd51pz7ygvya4pvqpapglj82w4fwmra7c7r1yny7lcq7ylh6"; depends=[CellNOptR genalg]; };
-  CNPBayes = derive2 { name="CNPBayes"; version="1.2.2"; sha256="1r1spk29zy7sc9kgyh1r2s7awc3hh5rl2c1p5chhik39lpdvmnbs"; depends=[BiocGenerics coda combinat GenomeInfoDb GenomicRanges gtools IRanges matrixStats RColorBrewer Rcpp S4Vectors SummarizedExperiment]; };
-  CNTools = derive2 { name="CNTools"; version="1.28.0"; sha256="1iwgcphdcd5hxb4a61s30lgdp10s0435vkjz6cvhriimwq0bia4z"; depends=[genefilter]; };
-  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.2.2"; sha256="1mcdyib8gbg4w9m3r437z3a1az249pgad0db2w9cjk78hblxsi8d"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; };
-  CNVrd2 = derive2 { name="CNVrd2"; version="1.10.2"; sha256="1r0fjb6br699rkkqpkpwi8s8bk9gv5lgck4xfgbydjllbbvmiq35"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
-  CNVtools = derive2 { name="CNVtools"; version="1.66.0"; sha256="1v6y0j20d306snr3r8zrvk574ybcyg00pjxjya09r6srmci2bz74"; depends=[survival]; };
-  CODEX = derive2 { name="CODEX"; version="1.4.0"; sha256="0cjfnryzxxhmhcbwsf34509b7srgxzlv4barrh8h8dyq2wfzzrqp"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools]; };
-  COHCAP = derive2 { name="COHCAP"; version="1.10.0"; sha256="0qdwd7igd2aaqbwl5lpfrzw9qilz651b1p88794qmxwih7lmd6s5"; depends=[COHCAPanno WriteXLS]; };
-  COMPASS = derive2 { name="COMPASS"; version="1.10.2"; sha256="1y9r6d9gd1fbvmxi3cvxcmz2b3n9gbncw6p2s8gjdzqj7i0nar7x"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
-  CONFESS = derive2 { name="CONFESS"; version="1.0.2"; sha256="0xc8bns00980fwxdpbx48r6h7pddv2jiplw38svmsv497zcb2mny"; depends=[changepoint cluster contrast EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
-  CORREP = derive2 { name="CORREP"; version="1.38.0"; sha256="16zhb5ajkh10azb2mkjbq6hmf6vqvxz3bzm4q424ir4azfqrd3qs"; depends=[e1071]; };
-  COSNet = derive2 { name="COSNet"; version="1.6.0"; sha256="16gfbz6i5kmi8msgs0n5igybxz9kd4qyqv3p2dhr6n5nxzcqlhfw"; depends=[]; };
-  CRISPRseek = derive2 { name="CRISPRseek"; version="1.12.0"; sha256="0kl20amakkyl3296zbfifi669ajm6i9x4hslav20ibzykgdwkscc"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
-  CRImage = derive2 { name="CRImage"; version="1.20.0"; sha256="0061qhplzjwhdyqa1m4jzwfmpjlc24a87b5z3p7yr2vrihp66n7y"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
-  CSAR = derive2 { name="CSAR"; version="1.24.0"; sha256="1m48njl4w0x7dyxqsfpflchclwy8nj07ldwckkh6522zdqmijb46"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  CSSP = derive2 { name="CSSP"; version="1.10.0"; sha256="0p2zs1ny4khmdpnbma53npb1lh4d8fh7szp2g8xhnilvmj744y1q"; depends=[]; };
-  CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.14.0"; sha256="13nivw19hqaglg3v6pmqshwy2gnfjvigciw3wpl2791a22iaimn2"; depends=[AnnotationDbi limma qvalue]; };
-  Cardinal = derive2 { name="Cardinal"; version="1.4.0"; sha256="0b4yb6sf27by2cjqy6cr4qrzs5ms83h210m1777vy33c7l4idlc7"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; };
-  Category = derive2 { name="Category"; version="2.38.0"; sha256="0c8px9ar589f3iqkbk9vfhwj30dpnxj81h8sfq20cl1cbmcx2a04"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL RSQLite]; };
-  CausalR = derive2 { name="CausalR"; version="1.4.3"; sha256="0307k6wnhar675l25xvwi0h97x6jpi64a5y874h8gqm2a5f0ybyl"; depends=[igraph]; };
-  CellNOptR = derive2 { name="CellNOptR"; version="1.18.0"; sha256="0vqjyjn2248mpc1lc4p4sivf1lhvjiwvgyi0jifm9as2yqz2np7k"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
-  CexoR = derive2 { name="CexoR"; version="1.10.0"; sha256="0g2ln2l3vlp86zymyf2bdlc3g2piwv65vaxb7w7wd8ngp06zqais"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  ChAMP = derive2 { name="ChAMP"; version="1.10.0"; sha256="168z9lgfmhmymflfiml8g8kq6v695r94sfjhcng8wjkjn8dfbz6x"; depends=[bumphunter ChAMPdata DNAcopy doParallel GenomicRanges Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest impute isva limma marray minfi plyr preprocessCore quadprog qvalue RefFreeEWAS RPMM sva wateRmelon]; };
-  ChIPComp = derive2 { name="ChIPComp"; version="1.2.0"; sha256="1l120wiq8xmvxa513vy4vgz34ddbh870djr776yvlcsrapxdl2iz"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
-  ChIPQC = derive2 { name="ChIPQC"; version="1.8.9"; sha256="1d3rm2shs2f66dahllspb4sgnqzkds6ds0b1pp6jnrzkqhw07s5h"; 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_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
-  ChIPXpress = derive2 { name="ChIPXpress"; version="1.14.0"; sha256="1ilqkx21jsvj3x0im4fgp4kacspynqn234pjj6vpsx1981lvavxy"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
-  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.6.5"; sha256="0mncyh1ixsp4ngpc8flmkq1czi1kkgcy14ws556rymkx02v3c9pc"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR S4Vectors seqinr SummarizedExperiment VennDiagram]; };
-  ChIPseeker = derive2 { name="ChIPseeker"; version="1.8.9"; sha256="0c2sm9zs377iq9fhpqlmqkfxxldww97yd0p1isbvmzz4m8j81nqb"; 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.26.0"; sha256="14c4hyzj19c4r8s74zfpkslv0nswmb2pqf0pihn43hycn1z9dhfi"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
-  ChIPsim = derive2 { name="ChIPsim"; version="1.26.0"; sha256="0b992sv8xrrafrj30bmgmy1p7zb5qdw5kyjm23bmnk7jd9fck382"; depends=[Biostrings IRanges ShortRead XVector]; };
-  ChemmineOB = derive2 { name="ChemmineOB"; version="1.10.2"; sha256="0jxnlwprn8r8mwqgkij6r4xrh94rxx8l44h1x3scplkphdwslxbk"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
-  ChemmineR = derive2 { name="ChemmineR"; version="2.24.2"; sha256="02idsylmrpm2g20vbg81i12r6snp95lg0wbljcvrri91p09xb8xy"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; };
-  Chicago = derive2 { name="Chicago"; version="1.0.4"; sha256="10dx3ka4habmgw1ykybpb3f93qn4xghy2mivmym904i8fgli28ys"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
-  ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.26.0"; sha256="08zpng276f2dq56sgmzrjpf76plh9778f11liw01yx0c16ysxvj5"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; };
-  ClassifyR = derive2 { name="ClassifyR"; version="1.6.2"; sha256="1vz569b6prmndq4vw7g6xprx39ckprhi8bk0hn7gj62hv4drcalv"; depends=[Biobase BiocParallel locfit ROCR]; };
-  Clomial = derive2 { name="Clomial"; version="1.8.0"; sha256="1vzzb1lxmzwihihi4241xhj3l0szllzvq70da6nsir4sqikfljdm"; depends=[matrixStats permute]; };
-  Clonality = derive2 { name="Clonality"; version="1.20.0"; sha256="19fizpvnpzqcjlkyalg341c3v5w9ll7a6h3g2fqnq4ffn1n61a05"; depends=[DNAcopy]; };
-  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.0.3"; sha256="15pfs74k6ggp2v1ilbgzv5ab0w2rvq9f4igxzaq17krdakgq2krs"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
-  CoCiteStats = derive2 { name="CoCiteStats"; version="1.44.0"; sha256="1v22ld0iprp2c3hrr0vnfga2j1wvlay43p9g4mdbkiw7a6mxi21x"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  CoGAPS = derive2 { name="CoGAPS"; version="2.6.0"; sha256="0wy072pdjss5jzk5s9vm70y9xj6basqwhbiawllr716c7shcgmlb"; depends=[BH gplots RColorBrewer Rcpp]; };
-  CoRegNet = derive2 { name="CoRegNet"; version="1.8.2"; sha256="19i9mnbqnfaglfljgngcqw63gg1nka4qcqrn1l6siqx15sfc77zb"; depends=[arules igraph shiny]; };
-  CompGO = derive2 { name="CompGO"; version="1.8.1"; sha256="18vlkgrdsd2hq2w787zqg2b0hyqnxsjnx82nnk024fsirgrb5p6a"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
-  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.10.2"; sha256="0974qmzy93msn0xr1bz98bzmmq3pnc2y43116yv7vnaabqb2mml1"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; };
-  ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.36.0"; sha256="1kb2h46hp20b2mij120nz8lmn8icbjm0ixchg0p4izhsj1g3l8s2"; depends=[ALL Biobase cluster]; };
-  CopyNumber450k = derive2 { name="CopyNumber450k"; version="1.8.0"; sha256="0swjl0jh25ybnayx2q7kk6f01q1vjgplp5791im5r4q6djdisfay"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
-  CopywriteR = derive2 { name="CopywriteR"; version="2.4.0"; sha256="0lr9m7b5hn3a983y6614905yhs86676x53d78i2bk0ndh7p5hah9"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
-  CorMut = derive2 { name="CorMut"; version="1.14.0"; sha256="0asakw2bqwb8qp0zcwjachyx4w7kiw8fzwwa7sllfpa57m5m1v64"; depends=[igraph seqinr]; };
-  Cormotif = derive2 { name="Cormotif"; version="1.18.0"; sha256="17ldh2yfiapka2clz6j71jqla6a7avas3hnnxpi0p0598vawp6x0"; depends=[affy limma]; };
-  CountClust = derive2 { name="CountClust"; version="1.0.2"; sha256="192i2mvzsf558lsh2zshvgrm9q0a4xbhbgjjma1403v5cyrks8j1"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam]; };
-  CoverageView = derive2 { name="CoverageView"; version="1.8.0"; sha256="1z4prmf20r2y872yjlj5zza31rn5dlcn95348gib04hwwba6d5ak"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
-  CrispRVariants = derive2 { name="CrispRVariants"; version="1.0.2"; sha256="0y16rlk5yi2bsq28m0gw4sbr0w1rf4msyimgh28rh0imd63rmmwc"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.4.8"; sha256="0m1jbv3l3qz972q53wylrybl872ldxm1sscyw8l8p7rcznk0q5fl"; depends=[Cairo cp4p doParallel foreach ggplot2 gplots impute imputeLCMD knitr lattice limma Matrix MSnbase norm pcaMethods png preprocessCore RColorBrewer reshape2 scales tmvtnorm XLConnect]; };
-  DART = derive2 { name="DART"; version="1.20.0"; sha256="17x980mix19pb72yag6v0ingq64vn6hpynfpy4vcjrlhf9874pf6"; depends=[igraph]; };
-  DASiR = derive2 { name="DASiR"; version="1.11.0"; sha256="078ligzx37pa3apd5xpjbf8pq0i1q7cz709767aalbwhbw2zf6ak"; depends=[Biostrings GenomicRanges IRanges XML]; };
-  DBChIP = derive2 { name="DBChIP"; version="1.16.0"; sha256="1ilq33jpynz51ipsrjdbwcbl6h6a40l7d230mfqzq922347dd9ll"; depends=[DESeq edgeR]; };
-  DChIPRep = derive2 { name="DChIPRep"; version="1.2.3"; sha256="10h2nwzd9z7c0nb1pw28zivq0fjpn7slzavhcwjfbynixhq2v84i"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
-  DECIPHER = derive2 { name="DECIPHER"; version="2.0.2"; sha256="01plhsbw94pjvj9hc9css0zj7vp3xzad39sbwicx7rc0wpzk5knw"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
-  DEDS = derive2 { name="DEDS"; version="1.46.0"; sha256="1pli8wgcgcsdv2r4gw9fygiv842iyi1a2w80axla98l53wjzljyw"; depends=[]; };
-  DEFormats = derive2 { name="DEFormats"; version="1.0.2"; sha256="034kbmsjgdg916cgihjmaa237dx6xn24ndz50a5fxvjmpy8y99am"; depends=[checkmate DESeq2 edgeR GenomicRanges SummarizedExperiment]; };
-  DEGraph = derive2 { name="DEGraph"; version="1.24.0"; sha256="1yarc6xr0swlc6q583kmm65vpp195v86h8gsidr9as2y6cm6ggww"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-  DEGreport = derive2 { name="DEGreport"; version="1.8.2"; sha256="1763z307m4k8h66xd7fjzljxggcgnf74k0rhdn40j83mbvcs4ar4"; depends=[BiocGenerics edgeR ggplot2 plyr]; };
-  DEGseq = derive2 { name="DEGseq"; version="1.26.0"; sha256="04fxbnhgg6l674vr0xav0fl7vg8isqsnksvhanssarvaa1wqlrys"; depends=[qvalue samr]; };
-  DESeq = derive2 { name="DESeq"; version="1.24.0"; sha256="01v5ikwpzxlp6f9p17qrvxbigxdhr0y24b9pjkh7n6ak2faqz5k7"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-  DESeq2 = derive2 { name="DESeq2"; version="1.12.4"; sha256="12h77f0dpi5xaj7aqf50kkyn6lq9j7bcsly1r0ffmyfcszrp1sfx"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.18.4"; sha256="0dm9n0k26gg78v8qmnjly3mdigfjdp2lzaabyss8ilcbx81z64ic"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
-  DFP = derive2 { name="DFP"; version="1.30.0"; sha256="0r5jjzmirnb4ngcb497yqg0fg1di1lcax2nlhbq27v1grb9001q9"; depends=[Biobase]; };
-  DMRcaller = derive2 { name="DMRcaller"; version="1.4.2"; sha256="1s57yfjajjw9m5i15p3wywfc1dins22fwd18bly7a14yxb6qdyrk"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-  DMRcate = derive2 { name="DMRcate"; version="1.8.6"; sha256="0y1ysmavim5jc0mr1higk5sz9cg8bydav7zj2vn0p6da45ijjzqd"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi plyr S4Vectors]; };
-  DMRforPairs = derive2 { name="DMRforPairs"; version="1.8.0"; sha256="1hjw3d3pwdg10bwkxwjcrcjxrcanyk13zbrhb50p0zhys5gksp78"; depends=[GenomicRanges Gviz R2HTML]; };
-  DNABarcodes = derive2 { name="DNABarcodes"; version="1.2.2"; sha256="12qw1f3h4sb89fv5i9wr65hb86x84a6j5f3khwv8r9w0y6cp9llq"; depends=[BH Matrix Rcpp]; };
-  DNAcopy = derive2 { name="DNAcopy"; version="1.46.0"; sha256="0vwv2mndfjpcjp4sybg75abc7xnx8zyw8zjk717k6xh8c33ymcip"; depends=[]; };
-  DNAshapeR = derive2 { name="DNAshapeR"; version="1.0.2"; sha256="10x1331rmvdywsfd9agzir4lalv97bzwsa4vwifw7gizdbb3a5b8"; depends=[Biostrings fields GenomicRanges Rcpp]; };
-  DOQTL = derive2 { name="DOQTL"; version="1.8.0"; sha256="0vlvvwhqg8vw45p6kp3p3nazvy9hkpr8wz8sxrvkdy6pyj4nwws1"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; };
-  DOSE = derive2 { name="DOSE"; version="2.10.7"; sha256="1i3pfkvx7z1n6wzb4rnmdrnsjisfl0lnh29wl1k8kj1pgj1qbjy5"; depends=[AnnotationDbi DO_db ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
-  DRIMSeq = derive2 { name="DRIMSeq"; version="1.0.2"; sha256="0gkv3xvsklnhsyiwzxwqvsj3nii9rqswfbvw7nxk209zrmmqkj7l"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges reshape2 S4Vectors]; };
-  DSS = derive2 { name="DSS"; version="2.12.0"; sha256="0l9sgp198pdmd36hipsk3whf29d44qqay2d1k4mchsbq0qbmwsza"; depends=[Biobase bsseq]; };
-  DTA = derive2 { name="DTA"; version="2.18.0"; sha256="0y7516d5yxijnl15wmvh8n5wyp3551ph5vzdm6i0yy0riaihqki8"; depends=[LSD scatterplot3d]; };
-  DeMAND = derive2 { name="DeMAND"; version="1.2.1"; sha256="1haqr8mq77jvvkrc1pfs37i89fd3zjjdi59nnl9qlll1k761qh99"; depends=[KernSmooth]; };
-  DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.14.0"; sha256="14bd8yd5zy4nagmcfr9r510410va9avcljaxxwjbbprp6chxm64h"; depends=[ggplot2 limSolve pcaMethods]; };
-  DiffBind = derive2 { name="DiffBind"; version="2.0.9"; sha256="0sy1mb986mi1cxzy1ar5hmshzmqdw8082h725d0yiinymqbfc529"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; };
-  DiffLogo = derive2 { name="DiffLogo"; version="1.2.1"; sha256="0dj8qkxx17sn1yh5wwcb4mmghsigicfz5kb5sldk3j988f0pnbcj"; depends=[cba]; };
-  DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.14.0"; sha256="14xr8g3bzhni780pafi2jm53fd124xw9rnvdanhqzwqk5l8mrqzn"; depends=[BiocGenerics IRanges S4Vectors]; };
-  DriverNet = derive2 { name="DriverNet"; version="1.12.0"; sha256="1xwvryjf98hi4l5g4qwg8ilw3kw206r9ipn4dy5jv5kzgirp3p4f"; depends=[]; };
-  DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.12.0"; sha256="1bj86zlcp73km49zqv8ijlq9zq7bjnmf2bhcdhrcf0rixph52q62"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
-  DupChecker = derive2 { name="DupChecker"; version="1.10.2"; sha256="0npx294zvpypk23z0h2pmyazc7w8d5wywl6psyr2m2vhmcrax5xl"; depends=[R_utils RCurl]; };
-  DynDoc = derive2 { name="DynDoc"; version="1.50.0"; sha256="0j00kjlv1h9vx5jmq7cwj2vwnif52rqcs4mb0j9dv1mndqcdf2p6"; depends=[]; };
-  EBImage = derive2 { name="EBImage"; version="4.14.2"; sha256="1dvjnkzjfsshm15jxcmzs82jarxqx9dr8z5kafyxjklh2arivwgx"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-  EBSEA = derive2 { name="EBSEA"; version="1.0.0"; sha256="11wgdgrqv83bhlngl9wqrazydsjvawnwrdb9b82h50hd5h080vvh"; depends=[edgeR gtools limma]; };
-  EBSeq = derive2 { name="EBSeq"; version="1.12.0"; sha256="0yqrrabx78ml8na1ppwg6b0a47pc2c488c5pfavyi75v04k708yp"; depends=[blockmodeling gplots testthat]; };
-  EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.6.0"; sha256="001swq9m414mk6r8j5iglfbp1cw3xp165hf68jk2dy9sz0p0l25j"; depends=[EBSeq]; };
-  EBarrays = derive2 { name="EBarrays"; version="2.36.0"; sha256="1jvfk0f4rr8f502vhgh4fq5x7m9823xl3ncyl032rdsrwbildbxp"; depends=[Biobase cluster lattice]; };
-  EBcoexpress = derive2 { name="EBcoexpress"; version="1.16.0"; sha256="069smdyv8bpd5v2nz2i67h6vqpfdf5r9n5s2cyk7g136a0p29zca"; depends=[EBarrays mclust minqa]; };
-  EDASeq = derive2 { name="EDASeq"; version="2.6.2"; sha256="05infzrah41xh3mzbckh2g9hywbn3xqwx3jjzvyxs3q5z209av91"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
-  EDDA = derive2 { name="EDDA"; version="1.10.0"; sha256="10rlahznhva9b6f4isb604a7di753md6l260z987291vp70m0pyf"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
-  EGAD = derive2 { name="EGAD"; version="1.0.4"; sha256="0ysn42wpji4nphdwdy2j25v137rlxpyvg2wqifqm0vh09m7mgwr5"; depends=[arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
-  EGSEA = derive2 { name="EGSEA"; version="1.0.3"; sha256="1f7fsh3kzhq3l55lczxmv724hwy6pq4gb1rnhc4pkqandl7vvsig"; depends=[AnnotationDbi Biobase edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils hwriter limma org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview safe stringi topGO]; };
-  ELBOW = derive2 { name="ELBOW"; version="1.8.0"; sha256="0133j9zdmpy22l4672dhz8y1i2hi8a1izxakrvd0ldbmg502jscw"; depends=[]; };
-  ELMER = derive2 { name="ELMER"; version="1.4.2"; sha256="0nbbh2rwynr28y2rmsd0nmpc5b22x5bbvhgrh447w9znl05smqx6"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; };
-  EMDomics = derive2 { name="EMDomics"; version="2.2.2"; sha256="0qdachnnhvwyh9v3s9isd6yyksxi8gs56nf29v5rfw7429v2wgmf"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
-  ENCODExplorer = derive2 { name="ENCODExplorer"; version="1.4.3"; sha256="0khc5qfwjl2adqgayjz5yhg0g3jw0blkqxqih9jxkccrw83b28b6"; depends=[jsonlite RCurl RSQLite]; };
-  ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.20.0"; sha256="012f7scrmnxqjg52gjhswrrxbvagsdxmiwbxs4n6358yf214wr2h"; depends=[rJava XML]; };
-  ENmix = derive2 { name="ENmix"; version="1.8.0"; sha256="01r332wngrvzg5daspaf6dqkwanyc40mv2k6qc8iz2wvh3vdpg4q"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
-  EWCE = derive2 { name="EWCE"; version="1.0.2"; sha256="1qcqadqfjmhr96mnd86wx9x5ncc6pm593kcqx8wnlgkkdzr6flq5"; depends=[biomaRt ggplot2 reshape2]; };
-  EasyqpcR = derive2 { name="EasyqpcR"; version="1.14.0"; sha256="1vnh0g87x52qlrqk1nwfcaa4r7nb7mr6xdzrxqsivrx13k5d070q"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
-  EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.0.2"; sha256="183zn477pjrj71d5b3dnkf4mgvjb8razply0lrpq8ickvqn3z3s6"; depends=[]; };
-  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.2.2"; sha256="1fky5gb6ix2y0xfn8whwsrw793msmcrf5bjlpzk1vmvyyc5pvc9a"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.2.3"; sha256="0l1zxb5425li1jzhqd0x1dwwhl92g2d5j5jrms2bpl70klyy2af1"; depends=[AnnotationDbi Biobase biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
-  ExiMiR = derive2 { name="ExiMiR"; version="2.14.0"; sha256="0krk4dgnla63dmn5r3qy5nmq0rkmff26qdhw7rilmh3yb95ri7lx"; depends=[affy affyio Biobase limma preprocessCore]; };
-  ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.0.3"; sha256="1yvvqhd2d7lz8fwfrag68xn7sndhag89dnj37w5zwg0hfippyas9"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; };
-  ExpressionView = derive2 { name="ExpressionView"; version="1.24.0"; sha256="1sirhz91xfcbsya2s9y565hffrsjbyd4bippn92x5c8y4qhyw11z"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
-  FEM = derive2 { name="FEM"; version="2.8.0"; sha256="1jgy0k5a7h46vda32a2m077w4z1gif3vvxxch7qp7hx982y4xyjy"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
-  FGNet = derive2 { name="FGNet"; version="3.6.2"; sha256="1b4v0hx1xrzi7zyah8wb983akr9jl3f4xqr9b5yy8cv72bqvch0x"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
-  FISHalyseR = derive2 { name="FISHalyseR"; version="1.6.2"; sha256="1j4gsmzzkbz0mifqqrfgaxxrvprc1rp62dhv897wx0yhn893fynv"; depends=[abind EBImage]; };
-  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.8.0"; sha256="02y0jx0lqsikh947cs6byjahbi6yxplwv6gqfrdv2imd47g38309"; depends=[fda MASS]; };
-  FamAgg = derive2 { name="FamAgg"; version="1.0.2"; sha256="17v6jy03f3x6a09f5fdqkw0gd4h5ipl1bcsqzq39vvkmrvdr6q09"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
-  FindMyFriends = derive2 { name="FindMyFriends"; version="1.2.2"; sha256="18wz62sr4nf3df165bik57khz7wq5xab6s6b100ml7crn912a7li"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
-  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.4.0"; sha256="1rixa090sdbv8crfccygaq3lhx5171fqaf7vn8dsbawfqczzmyam"; depends=[jsonlite RCurl XML]; };
-  FlowSOM = derive2 { name="FlowSOM"; version="1.4.0"; sha256="05rsy2hdjv4fr9bv1b8phzdj0xw4ilgk8m3dgqlnlm6m8sylhnk2"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; };
-  FourCSeq = derive2 { name="FourCSeq"; version="1.6.2"; sha256="13c23ndssfhzcqv8wl37zmswajyk4x08aj0v562j0zcqnqcrscg1"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
-  FunciSNP = derive2 { name="FunciSNP"; version="1.14.0"; sha256="197v7kf6xl3b4jkyjpzgy1z49dh4dbrf8nsfa9mlzi114l5kbyy8"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
-  GENE_E = derive2 { name="GENE.E"; version="1.12.2"; sha256="0ri377knly3cwlif64c68rsk8f1fjdfx1abq55j3lr30pxyphc97"; depends=[RCurl rhdf5]; };
-  GENESIS = derive2 { name="GENESIS"; version="2.2.7"; sha256="1dllw2kjrnmp61xakxavwbrgr1rfrad7hs2msbc8k6axw4n90hl4"; depends=[Biobase gdsfmt graph GWASTools SeqArray SeqVarTools]; };
-  GEOmetadb = derive2 { name="GEOmetadb"; version="1.32.2"; sha256="1pr2zl4814b5zpzn0msyy2hwf39kv03ci3fi5113xlpbiy1rj9ch"; depends=[GEOquery RSQLite]; };
-  GEOquery = derive2 { name="GEOquery"; version="2.38.4"; sha256="1ckgxd7h8009h0bnmvggpd6yppp461zw2bcqkda5hiwys8mfb78x"; depends=[Biobase httr RCurl XML]; };
-  GEOsearch = derive2 { name="GEOsearch"; version="1.2.2"; sha256="0fdkf590kvjscvvjg2lfkz7bw7jg2vpay1z99l9yrnpgaqv146vl"; depends=[org_Hs_eg_db org_Mm_eg_db]; };
-  GEOsubmission = derive2 { name="GEOsubmission"; version="1.24.0"; sha256="0fvdps5ly55j442lisg6hj96wn6821427xc1bdfyc7ri1ds4fxgy"; depends=[affy Biobase]; };
-  GEWIST = derive2 { name="GEWIST"; version="1.16.0"; sha256="1qrs0apb27isv8aabv64ym1rr4zvv201v43zhmgdjdlbmwcfyjky"; depends=[car]; };
-  GGBase = derive2 { name="GGBase"; version="3.34.0"; sha256="1nbqpfdpi3bh26wqmvrrfk8khpy6sgsrvkj7b193ycbdnsjv2iqk"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
-  GGtools = derive2 { name="GGtools"; version="5.8.0"; sha256="1zrl22p5cfhw6w0034176js8y0rzmdhdias1acin7dwbw588rp5l"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
-  GLAD = derive2 { name="GLAD"; version="2.36.0"; sha256="09wpmh5mahvg16hfl8h5rqvrxpc81df4k7z5wv93s0p41kx6kil7"; depends=[]; };
-  GMRP = derive2 { name="GMRP"; version="1.0.0"; sha256="15rh0sy29v91c0s91vjfmci64ar6x58lfm3ixgwm6z7lf0xhbrl3"; depends=[diagram GenomicRanges plotrix]; };
-  GOFunction = derive2 { name="GOFunction"; version="1.20.0"; sha256="06y42nydbc19z5kzp80iy3b3xhq0wmk2mfsp9chxvgrc54a21ynj"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
-  GOSemSim = derive2 { name="GOSemSim"; version="1.30.3"; sha256="15g7r0cccfphm32pw9bmk28k54vl21b0jczx8nr1z2q5kgg04ca8"; depends=[AnnotationDbi GO_db Rcpp]; };
-  GOSim = derive2 { name="GOSim"; version="1.10.0"; sha256="03s79r03f2nv6blf3qrvfazx89jiyyn9bm41b53rig1lpadp2fzh"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
-  GOTHiC = derive2 { name="GOTHiC"; version="1.8.1"; sha256="0s4jsk4j2yxh5mqvvni5c606hyfqjgh9p7g4rssh9gq9saglpgni"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
-  GOexpress = derive2 { name="GOexpress"; version="1.6.1"; sha256="09m0g03f0s9fnp1c1h1d1mv0dw73msbifpdf8ldyqcx75c3xdx6k"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; };
-  GOstats = derive2 { name="GOstats"; version="2.38.1"; sha256="1hhw6vqr8f3g4jzq0v8f2za0r1h117j5s6av87zxs41cv7dq1wb3"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; };
-  GOsummaries = derive2 { name="GOsummaries"; version="2.6.0"; sha256="0skhvpr80jgxfzk1c7jf2206jnxs44v6r2j39l4xj4llcfjf46b1"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
-  GRENITS = derive2 { name="GRENITS"; version="1.24.0"; sha256="1qhjqpjdasql1i8njnq431qp8zqklb1xh170lqlwjcfhhmnprzai"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-  GSALightning = derive2 { name="GSALightning"; version="1.0.2"; sha256="1ahcm9iikql1d73ng7irs37rwp99q1jp5g2nbxdk7436f7hglcgv"; depends=[data_table Matrix]; };
-  GSAR = derive2 { name="GSAR"; version="1.6.0"; sha256="1q3pjwf66mi3kws88whw72xfh5xskvw55g7wiq3dp0kr0r45d5am"; depends=[igraph]; };
-  GSCA = derive2 { name="GSCA"; version="2.2.0"; sha256="0vq94s36yq591lgva3v1317kh6dpq3wvy38ayxab0zmxzqhnighb"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
-  GSEABase = derive2 { name="GSEABase"; version="1.34.1"; sha256="1mvgja8malrnbzfakzjl5mmi7g080kj8zgxwc5964hcmn33i937j"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
-  GSEAlm = derive2 { name="GSEAlm"; version="1.32.0"; sha256="0axqalz4ixjsv91ga3sc9f9f5ncm8lr5fk6v40ng58nzb6xsk0sc"; depends=[Biobase]; };
-  GSRI = derive2 { name="GSRI"; version="2.20.0"; sha256="0mwv7riwgg0jc06skna8cph7q7ry1a9k7alrhxxgysd9458m8v9l"; depends=[Biobase fdrtool genefilter GSEABase les]; };
-  GSReg = derive2 { name="GSReg"; version="1.6.0"; sha256="1wibhyqi2kfbi5fqmx867lxb4dw8ymfk6xkg0vjws5d2a5r5yf1d"; depends=[]; };
-  GSVA = derive2 { name="GSVA"; version="1.20.0"; sha256="1n3hi48p7p5alzlw4rlxk7mp5bp3ybkf76a8b2swa7ifq52jiin2"; depends=[Biobase BiocGenerics GSEABase]; };
-  GUIDEseq = derive2 { name="GUIDEseq"; version="1.2.1"; sha256="07ihkg1am7mfwc6f51zwpmm41sh1a3fsdkbdwk0p396f3069lva7"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors]; };
-  GWASTools = derive2 { name="GWASTools"; version="1.18.0"; sha256="07rxyl5b32ydnywx6z9ic156s1q6nn8wqx096pknyawi7wi9k3ad"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf4 quantsmooth RSQLite sandwich survival]; };
-  GenRank = derive2 { name="GenRank"; version="1.0.2"; sha256="0dipv90wskcymvkmdw0313w5asz6wcnpx4nph3ab7kidgii6d8gp"; depends=[matrixStats reshape2 survcomp]; };
-  GenVisR = derive2 { name="GenVisR"; version="1.0.4"; sha256="1593xfyk9pz92ndxgjr0ma4b1q7kjkx03a9kln4y16y2rxvfm4zh"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; };
-  GeneAnswers = derive2 { name="GeneAnswers"; version="2.14.0"; sha256="17zfm2zm52m6x4kc07d9n06xyfw4ym7rk6d8z4mgxrmns7v83dkw"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
-  GeneBreak = derive2 { name="GeneBreak"; version="1.2.0"; sha256="1k9f4vdg09h2bxs5gn7fjc6vm9zdq3afdcjl0bv33m6703k50k6i"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
-  GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.18.0"; sha256="055n0m0nwblasr6rwd28zpq6iranyymm403dd5bqi4kq6zg6ld4a"; depends=[Biobase PGSEA]; };
-  GeneGA = derive2 { name="GeneGA"; version="1.22.0"; sha256="1p77yncy6frzqyc22yhaqx63j8xkv4idfqysald7bc8n8cvk7x03"; depends=[hash seqinr]; };
-  GeneMeta = derive2 { name="GeneMeta"; version="1.44.0"; sha256="1l1ldj01a7p0ygb055kfbl2j2cj0y9xgalbq9fdn07j21jxf6wxl"; depends=[Biobase genefilter]; };
-  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.14.4"; sha256="0560351z8f7rv7jn1ff88y1z9lyn7hd53zghfkhy2mbkjwvbn3lw"; depends=[graph plyr Rcpp]; };
-  GeneOverlap = derive2 { name="GeneOverlap"; version="1.8.0"; sha256="0dnp91knca25l5q62ga36p04kwb7a1drmzjcbyvhkxxfd6d7h6jh"; depends=[gplots RColorBrewer]; };
-  GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.28.0"; sha256="0z2m96i7rv9vffw5h70lgkq9b6wj8m0p8n6nl184rkpq1d14fhk3"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; };
-  GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.16.0"; sha256="1kj1xdscqhi84x89ygw9sc8yr991y19bc932ynhblhjrxs1fxrjb"; depends=[Biobase limma MASS survival]; };
-  GeneSelector = derive2 { name="GeneSelector"; version="2.22.0"; sha256="1ykmmzr2cal43n72547ywl5w871pfxilhxnqdl2ki0dxss9l8cap"; depends=[Biobase limma multtest samr siggenes]; };
-  GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.40.0"; sha256="17r1bqa0ay6d5dyihgxwv4i1mc12980dkc5j995c5qkpcg0f3zv2"; depends=[gmodels gtools mvtnorm]; };
-  GeneticsPed = derive2 { name="GeneticsPed"; version="1.34.0"; sha256="04lgnrpx8zd1rz7zdsyvjbvnlg6l4r4rbf82xdr5bhrn9805hw7c"; depends=[gdata genetics MASS]; };
-  GenoGAM = derive2 { name="GenoGAM"; version="1.0.3"; sha256="0ag9v97hdk7vi0052ksapvsgh61w6i5g4fp9lygyfvb5kbzh6k5n"; depends=[BiocParallel data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.32.0"; sha256="17w40q7ykmc01xgr72z2j5yk3gyvf5y62s17n0yk4vlary01g9iv"; depends=[biomaRt]; };
-  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.8.7"; sha256="1x96468bbjx7z3ikp1dgr2krnz9pwx86vmssfbfrsikaxfs4q829"; depends=[BiocGenerics IRanges S4Vectors]; };
-  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.8.4"; sha256="1cccvalmm83ilk1kpq31ll8kdy9xclsr4pm4mlcc7bmp0rwkd2p2"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.24.5"; sha256="17qpisdgqyjz2mnaiwc4dx7dg11pwq3mkvmkah9zn07g9rhh8f7p"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
-  GenomicFiles = derive2 { name="GenomicFiles"; version="1.8.0"; sha256="1blvi0817c2926msjiggmrizchqzmsa2ksvfl8yg13a45s52rkil"; depends=[Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.6.2"; sha256="1cm2zp9l9jdb6bgpq1sx799j24gs077ysvg02yn4qvag0p0xf1h5"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
-  GenomicRanges = derive2 { name="GenomicRanges"; version="1.24.3"; sha256="098a34hfgb5z120v6wpl5nv8v61nm65yg6xq0j7i9bigvxr7apg2"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
-  GenomicTuples = derive2 { name="GenomicTuples"; version="1.6.2"; sha256="04pq3f474lbhdni2hx942qs1wbsbq4454pgnr75bfj7q94rbx0fr"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
-  Genominator = derive2 { name="Genominator"; version="1.26.0"; sha256="1d4j1k2m19w7bh41xjpl898yxhd05b2ja2ysrrpnincigdzsrczk"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
-  Glimma = derive2 { name="Glimma"; version="1.0.0"; sha256="147bjpll9rjz77wdhmn75pjxv8znihix5f5sm539m897inviabcm"; depends=[DESeq2 edgeR]; };
-  GlobalAncova = derive2 { name="GlobalAncova"; version="3.40.0"; sha256="0ir53i68zvb9vjvsiwqhqgppkk6r6jm6ydjcff6264mhp5pbmjsf"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-  GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.4.2"; sha256="03y56akzkz7dy6868kcy03gqsnsjl7si5cfsx972m8wrhx5wa466"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
-  GraphAT = derive2 { name="GraphAT"; version="1.44.0"; sha256="1rb4zvlbljpvb0091j0phv6fdcpvk3f9b77dg3x2jcj321kbcgd2"; depends=[graph MCMCpack]; };
-  GraphAlignment = derive2 { name="GraphAlignment"; version="1.36.0"; sha256="1nayinwnpqsn66idxyliwi6md7c7w3j9bdn4b049sqk45yq25v05"; depends=[]; };
-  GraphPAC = derive2 { name="GraphPAC"; version="1.14.0"; sha256="14ia19g7k05r7hljybl8ipqh6bk2yc04l7vq3j30fxq9ahjx0l5h"; depends=[igraph iPAC RMallow TSP]; };
-  GreyListChIP = derive2 { name="GreyListChIP"; version="1.4.1"; sha256="18fxm3mns373ljdsc6aqm9k3m6088fhg095bg6gamyd99dyf7y9p"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
-  Guitar = derive2 { name="Guitar"; version="1.10.0"; sha256="1mgswk1gr2y5ilj8v07rincibg941i4rbmk8nd73xvw2pg83gvx8"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
-  Gviz = derive2 { name="Gviz"; version="1.16.5"; sha256="0r83ml7jfpdn2286wh1614arla3ih5nqvjjnsb3n9883j2prakr4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
-  HCsnip = derive2 { name="HCsnip"; version="1.12.0"; sha256="11sfhf931xnk6qmxmfiybfs5izgr932r3r0xxbbm96xbm6xxk7n5"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
-  HDF5Array = derive2 { name="HDF5Array"; version="1.0.2"; sha256="0df0xyn8f58vycyakx1xsv0jz43mkhbr3d9bb2cc0p5082hwk65a"; depends=[BiocGenerics IRanges rhdf5 S4Vectors]; };
-  HDTD = derive2 { name="HDTD"; version="1.6.0"; sha256="0838l4fnfany068fz20vrcr4m4yb6di88i0whn8hyfjm8ws21461"; depends=[]; };
-  HELP = derive2 { name="HELP"; version="1.30.0"; sha256="0aql69piqrfgav9fh3ff1byamd3c9k8nil3a09k4affdxl3nhqah"; depends=[Biobase]; };
-  HEM = derive2 { name="HEM"; version="1.44.0"; sha256="1fj92nzkng5cgy2wkifjmcpn2lfqw3ginyxzs36pxryz12v8yg2f"; depends=[Biobase]; };
-  HIBAG = derive2 { name="HIBAG"; version="1.8.3"; sha256="0s6vcx03kzxyqddzr7h3qhf6m9ax7l9n9jx9amk2f046wfhy4z7d"; depends=[]; };
-  HMMcopy = derive2 { name="HMMcopy"; version="1.14.0"; sha256="0ac2d8byinx6li1r622k960lpyihgf5xp0jdifvl5dmn1va0gmdl"; depends=[geneplotter IRanges]; };
-  HTSFilter = derive2 { name="HTSFilter"; version="1.12.0"; sha256="03bd29q6irgq6nqfp1grq3dzv1x1pz5bl2sx1z4714i75i8wildw"; depends=[Biobase DESeq DESeq2 edgeR]; };
-  HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.24.0"; sha256="0cmcihsqxacvxf4nan48i1f22bzz4g0j2vcn0vc3r4jirznxcjs6"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
-  HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.2.0"; sha256="0v5m8ix7j6db2fa461w4c50rn7xp415gaa3dl78hwbhns30f0il0"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; };
-  HTqPCR = derive2 { name="HTqPCR"; version="1.26.0"; sha256="0lk6qrq6in9y8xg1656m1j9mrwfajbadhr2ry7lyp8wx5acai7nz"; depends=[affy Biobase gplots limma RColorBrewer]; };
-  Harman = derive2 { name="Harman"; version="1.0.2"; sha256="0v7szj4xh8xr4zg3p0x1gf7b278a6y8blz962ygj77pnccmqikf6"; depends=[Rcpp]; };
-  Harshlight = derive2 { name="Harshlight"; version="1.44.0"; sha256="10dq78la4kby2zay69l3s9plrd271w5f8kmkmwxmscfqbv0zhi59"; depends=[affy altcdfenvs Biobase]; };
-  Heatplus = derive2 { name="Heatplus"; version="2.18.0"; sha256="13rzsahx3a4w2s1v99kz4lg6sgll2md9ibf2jz7dkk8gafbn1yri"; depends=[RColorBrewer]; };
-  HiTC = derive2 { name="HiTC"; version="1.16.0"; sha256="1rk3q4s4kpcbkm23ccw61p1isvrim3y3dhvi1kcs6yqbb3lg1nvl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
-  HilbertCurve = derive2 { name="HilbertCurve"; version="1.2.2"; sha256="0gjv39l5sxsllc3c620ndnarvl4x2fd3i86pwy4wqy5riq5xxaph"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
-  HilbertVis = derive2 { name="HilbertVis"; version="1.30.0"; sha256="0przsvy6zqs4chwn0m625h421zi7dpapma7wib6v8i5lf85d4d2a"; depends=[lattice]; };
-  HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.30.0"; sha256="0w2n511dkazajbm80kq9paypwphryf61x2rpfprc5va5wxhs36x8"; depends=[HilbertVis]; };
-  HybridMTest = derive2 { name="HybridMTest"; version="1.16.0"; sha256="0g2cknzbj043m8gm8qps0mdnamcqg08pd40hm7fmz70piw7sjw3f"; depends=[Biobase fdrtool MASS survival]; };
-  IHW = derive2 { name="IHW"; version="1.0.2"; sha256="1drhgvgl6gfzi0ii5dw86mw8bm6f008v07nbzn3865vq4l99kmm1"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
-  IMPCdata = derive2 { name="IMPCdata"; version="1.6.0"; sha256="155633pgv06qqch0x8isczm7i5w4azg99vfzbbx31xh7y0dawb8y"; depends=[rjson]; };
-  INPower = derive2 { name="INPower"; version="1.8.0"; sha256="12xixf4wzsa5fbcp7prbj7lg0aswlcqcx6f6q2y6x34g7jyh047n"; depends=[mvtnorm]; };
-  INSPEcT = derive2 { name="INSPEcT"; version="1.2.2"; sha256="1bmd1f662nf6s2aw2lg7pfq2d5rqbmpj7zp7wp6abc94gm8vsxzx"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; };
-  IONiseR = derive2 { name="IONiseR"; version="1.2.3"; sha256="1dwdkqf493c19p5b3phbj4g364h0aj32szjq3n3h3rn8aw0cjs87"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
-  IPPD = derive2 { name="IPPD"; version="1.20.0"; sha256="030pyqdmlqmriwcm3bikk0wf4qjhkrdjb306csr7327iqq4kbm0d"; depends=[bitops digest MASS Matrix XML]; };
-  IRanges = derive2 { name="IRanges"; version="2.6.1"; sha256="06pyam3bjjfw2m3l86rda503lsz2jcg645lcnhvrz6qi0nv359yg"; depends=[BiocGenerics S4Vectors]; };
-  ISoLDE = derive2 { name="ISoLDE"; version="1.0.2"; sha256="1nc3r8y49fgvgx0vj2m79cd5ywnm93a6vqy20cr1llg4fpnmdlb4"; depends=[]; };
-  ITALICS = derive2 { name="ITALICS"; version="2.32.0"; sha256="18afl5gkrzh89wzmlpsfjzcm32yl1521dm2vrdhmy1kjjsy1g1f6"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
-  IVAS = derive2 { name="IVAS"; version="1.4.0"; sha256="10q5wmvwi10f81a0gss0shjv947yfghib1pk26cj04icr96v6b6f"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
-  Icens = derive2 { name="Icens"; version="1.44.0"; sha256="0aw92cq446dpwi6nnck72xvk67jwfr829klzbn9a6b0z53qmlb1w"; depends=[survival]; };
-  IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.16.0"; sha256="1q7s0zy9bx1ypca232yqj25k8g3w33078dp5ik48j1ga71bp1xwk"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
-  IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.20.0"; sha256="1z67dj5qil8l2acryqvax6v1qp0z4jnf1iiy1l87j09kyn2949p4"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
-  IdeoViz = derive2 { name="IdeoViz"; version="1.6.0"; sha256="111vqwx7cxi419jzcz3yqhzv4436flj1h839rimn5vhlk9dlq6zr"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
-  Imetagene = derive2 { name="Imetagene"; version="1.2.2"; sha256="1bfqjq3c62j5hirx95bi03q0mxnizgqsm6mf6snfd8b33752fy0r"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
-  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.0.2"; sha256="08nfnvchbimhdrywcf8bsghml5pwhb2ys2jyqh0nvmj9g19khhg5"; depends=[Biobase data_table ggplot2 gplots gtools pheatmap RCurl reshape2 Rlabkey scales]; };
-  InPAS = derive2 { name="InPAS"; version="1.4.4"; sha256="0939f6ag20im9n8vq04k2nza1hl32mwm1xr9lyg4kpbq80gyscs4"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
-  InteractionSet = derive2 { name="InteractionSet"; version="1.0.4"; sha256="05sa7rrgw7563af9fzy8r1ndhy9f8cd2ymxc9p9fd4xmw1yk31s9"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors SummarizedExperiment]; };
-  IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.8.0"; sha256="0sg1fqsblhxynm4yvh5jzkrjw7h7rqi3n5ck5996xd0r5zhyqd1q"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
-  JunctionSeq = derive2 { name="JunctionSeq"; version="1.2.4"; sha256="1allsshg9bbl0krx9as31g41px0fvk3hn00vis3saxshq95mcn76"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix S4Vectors statmod stringr SummarizedExperiment]; };
-  KCsmart = derive2 { name="KCsmart"; version="2.30.0"; sha256="0fpmjdlnvrcj6s3pnrhvb09hm1ws2nqxw7is7rdx4grq1j21ppgj"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
-  KEGGREST = derive2 { name="KEGGREST"; version="1.12.3"; sha256="14p6506ml6l1h2j3pr1hda8475sa4rvph4vc1z3h84bj0czciibz"; depends=[Biostrings httr png]; };
-  KEGGgraph = derive2 { name="KEGGgraph"; version="1.30.0"; sha256="14zwnncks3ayb4dwa2i08aqf7abyxcwpd95dag6si8fwhz1di4v9"; depends=[graph XML]; };
-  KEGGprofile = derive2 { name="KEGGprofile"; version="1.14.0"; sha256="04997klqr44vi87zasvr41bgjjn2gfa3abv23zqjmj4xqr5693r8"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; };
-  LBE = derive2 { name="LBE"; version="1.40.0"; sha256="174bwp93lnb1lg19yd1r1piza23zm8wi2mnk3kk0r79hj9y1vx04"; depends=[]; };
-  LEA = derive2 { name="LEA"; version="1.4.0"; sha256="1srrabmvb9ghvhi3vqmr348as0vjzqfmcln2lclsc6za5prqnaja"; depends=[]; };
-  LMGene = derive2 { name="LMGene"; version="2.28.0"; sha256="0d0nvkcrg8hqrjlhhmcw1194w2aw363xr5dfqv9r10r618x5s5zy"; depends=[affy Biobase multtest survival]; };
-  LOLA = derive2 { name="LOLA"; version="1.2.2"; sha256="0fjs5z64s6xd62161qkpb38dblsl9dycw4ij0kggrkrjsfqnnapa"; depends=[BiocGenerics data_table GenomicRanges IRanges S4Vectors]; };
-  LPE = derive2 { name="LPE"; version="1.46.0"; sha256="14j8ha907nsj382hx67ci0675n15j7anxg95kz7v4lrd5w6bbb5f"; depends=[]; };
-  LPEadj = derive2 { name="LPEadj"; version="1.32.0"; sha256="1lx2p99dyjg1vamglnc2j1qan52wpz2sn9lyzhq9gxh77716rxlj"; depends=[LPE]; };
-  LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.22.0"; sha256="0cx9msy13cdihpdl92xz66c9hi5lblmfm113zmd6p7zzpfjzb8rg"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
-  LedPred = derive2 { name="LedPred"; version="1.6.1"; sha256="1ryggr2n2rhsxcgxy3rkxhvvjxcmbj8rm274qyzi0i7na4m98jkq"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
-  Linnorm = derive2 { name="Linnorm"; version="1.0.6"; sha256="1s66vzwyrmxwd3y52nxikcplbl5crvcamr0cfyg5hw5hmhbx4n1g"; depends=[limma MASS Rcpp RcppArmadillo statmod]; };
-  LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.26.0"; sha256="04g4rh6digbdymlbbblvscsdvkq6nxnbsc7g5y2zp1afn175wg45"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
-  LowMACA = derive2 { name="LowMACA"; version="1.4.2"; sha256="1aj59sxnbxwl5lz9nk18jb6n2da0qr3b3zz2fiw5z5bd8qd06aj1"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
-  LymphoSeq = derive2 { name="LymphoSeq"; version="1.0.2"; sha256="0gii3d4w8219p8lc4isbkh3y6hhz2mhgr3qb5cm7hq0v10a9w85w"; depends=[circlize data_table dplyr ggplot2 ineq LymphoSeqDB plyr RColorBrewer reshape VennDiagram]; };
-  M3D = derive2 { name="M3D"; version="1.6.2"; sha256="0z20kfhx8p8l6c2lh4mhnmp8ib8jcb3ld5h2sw7n5prsd22qs1mv"; depends=[BiocGenerics BiSeq GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  MAIT = derive2 { name="MAIT"; version="1.6.0"; sha256="0qbpdilk9h6sz64p4r18iay9v8kh19y3sgik9h8mmlywfvjl2d36"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
-  MANOR = derive2 { name="MANOR"; version="1.44.0"; sha256="1h3ia41anx3bg2nzfa40vjzgrd30aayprlhj2amgiidv37xam7jd"; depends=[GLAD]; };
-  MBASED = derive2 { name="MBASED"; version="1.6.0"; sha256="1a69ymyn817qn5xdm1lnc5nf1iir8sshj4awkn2vm7nc5zf0yyw6"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
-  MBAmethyl = derive2 { name="MBAmethyl"; version="1.6.0"; sha256="1wjd3v2kj1g7hc39rg5g8npvppyrdp99fvcqiyv7fybpp4i106ws"; depends=[]; };
-  MBCB = derive2 { name="MBCB"; version="1.26.0"; sha256="1hv14jmmh8vzispdbww3hpbkb57naxqy7wcy5ilc1kz2sg4a6h30"; depends=[preprocessCore tcltk2]; };
-  MBttest = derive2 { name="MBttest"; version="1.0.0"; sha256="1df76rma5j9nc4pzz7ql9zs08hzvsclh8crhrh3pwgidny6i485h"; depends=[gplots gtools]; };
-  MCRestimate = derive2 { name="MCRestimate"; version="2.28.0"; sha256="02zlkrkzia1398wxvrqgdhika3v7nnkcy4w6bd0s1c3mzri3br4i"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
-  MEAL = derive2 { name="MEAL"; version="1.2.3"; sha256="0jji6c0g6ks13g52v0xdzk97g6ifh2jkphlbwhs1qz930wmzmyk1"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi MultiDataSet permute S4Vectors SNPassoc snpStats sva vegan]; };
-  MEDIPS = derive2 { name="MEDIPS"; version="1.22.0"; sha256="1c6p2jkx3p8fgxah1qs74ia4934m9cbw8gdmm9kig1sfipmw5rjs"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
-  MEDME = derive2 { name="MEDME"; version="1.32.0"; sha256="062dqr4l6fg6azalfl93zrfzj7xnx9fn0l4gbn5gmmvxz5ldqp86"; depends=[Biostrings drc MASS]; };
-  MEIGOR = derive2 { name="MEIGOR"; version="1.6.0"; sha256="1bmb27ka2d4khghzp8wja5aqh82jlkqsjiqg3vc550k02g9yyf2j"; depends=[CNORode deSolve Rsolnp snowfall]; };
-  MGFM = derive2 { name="MGFM"; version="1.6.0"; sha256="1ly89riycn4x92q58jhmdpqpk3y069cpipbajwla59iczjl333qj"; depends=[annotate AnnotationDbi]; };
-  MIMOSA = derive2 { name="MIMOSA"; version="1.10.2"; sha256="0c82szbvk84h8p4zws8za1lk0hchf2n9p38m9dav8g8p8p2mvm37"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-  MLInterfaces = derive2 { name="MLInterfaces"; version="1.52.0"; sha256="17plgfwj8n4861rpg4a5qlp951v5wsdr6p7xplb2did0hz555lw2"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rgl rpart sfsmisc shiny threejs]; };
-  MLP = derive2 { name="MLP"; version="1.20.0"; sha256="0s923x14xdbfqa6vnmsijfw7bifvkj4dpbvkqnnppgdm0n0y42gq"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
-  MLSeq = derive2 { name="MLSeq"; version="1.12.2"; sha256="045nbqn369lisnn5b6y1lq4xhzd724dv3b58zcl3mgi3yja3rzq5"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
-  MMDiff = derive2 { name="MMDiff"; version="1.12.0"; sha256="11gzg1qshfrhf7m7w60pqfndpq9xbjns1kzq83fhmg3xydw8byb5"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
-  MMDiff2 = derive2 { name="MMDiff2"; version="1.0.2"; sha256="05nnk927h0bywcwkqasyhb6zq8iky18bcjhiavmjbm6rs44x8r38"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
-  MPFE = derive2 { name="MPFE"; version="1.8.0"; sha256="0ipsvsan3z0z7ax94fg7vmmzyhzh9184nd0k1b26sr0ddqk36n8k"; depends=[]; };
-  MSGFgui = derive2 { name="MSGFgui"; version="1.6.2"; sha256="1b7bv47avxhvnr0ilbsfmr2yg6q3k5m62qkmxn9fapar0c7w6my1"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
-  MSGFplus = derive2 { name="MSGFplus"; version="1.6.2"; sha256="04jqff48h48s7kwhai76y1y80hwgpw8x5svl0xzb6qvqwz12lsc9"; depends=[mzID]; };
-  MSnID = derive2 { name="MSnID"; version="1.6.0"; sha256="0xgqq5gx9jgk0hflbmwsbp9l3652mm2l0jkyanxqbwn5ys6k9l2n"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-  MSnbase = derive2 { name="MSnbase"; version="1.20.7"; sha256="0540ha72mkd9paylq5qzpcxw63d6b4rzjplg2rdixzzdhfg5rcgc"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
-  MSstats = derive2 { name="MSstats"; version="3.4.0"; sha256="0fkdfvd0fm5p5x5a23n2hnysawl6idwni0ib1a4ckdgx9mb183dm"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray minpack_lm MSnbase preprocessCore Rcpp reshape reshape2 survival]; };
-  MVCClass = derive2 { name="MVCClass"; version="1.46.0"; sha256="1aa63zn86m9nc3pr9y4rnzh5irfmkqkxbgbx5qf87x0rxnl7b8c2"; depends=[]; };
-  MantelCorr = derive2 { name="MantelCorr"; version="1.42.0"; sha256="1123cvr1psl5hvin8fw3zx3rp0317pfs7jzliyl1namkyz86nmyy"; depends=[]; };
-  MassArray = derive2 { name="MassArray"; version="1.24.0"; sha256="1ijrsgfzfqg4knvfdd2jlhzc0d58q90phwjkfklxq416r68za7sh"; depends=[]; };
-  MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.38.0"; sha256="0xyilbr0qcli8qkj5nj3zydgpbx6xlqf9877vyyb471isd0h764p"; depends=[waveslim]; };
-  MatrixRider = derive2 { name="MatrixRider"; version="1.4.0"; sha256="1f114p00splb8rkz0s4l44m16xf4i00ig6h56jvca3i9knhv9g4p"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
-  MeSHDbi = derive2 { name="MeSHDbi"; version="1.8.0"; sha256="1jf4jx7cybivlasmlsn369fwcjv4jyid0i5p7aj5hqs9cb48kzfz"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
-  MeSHSim = derive2 { name="MeSHSim"; version="1.4.0"; sha256="1dgvpqfg41kawmdy9vag6ysm3iwkfijc48blw6rr5pbjmx75f3wg"; depends=[RCurl XML]; };
-  MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.44.0"; sha256="1snrpm5dx9rwb2i7g0y6q80cdjmmw5pcybifq3z1li86i5w1llic"; depends=[]; };
-  MergeMaid = derive2 { name="MergeMaid"; version="2.44.0"; sha256="1dblfravkmvjcwmd9c9c5gzl68ygczsvpydcz6n2qjfnvv2qz3cq"; depends=[Biobase MASS survival]; };
-  Mergeomics = derive2 { name="Mergeomics"; version="1.0.0"; sha256="01fz5ms2giwj18irr2rdm98hzg0hscai9zi3zwyqmkjwpifz845g"; depends=[]; };
-  Metab = derive2 { name="Metab"; version="1.6.0"; sha256="0v6003ra26lm7gcadlc8ijn3lfiqrbc3i3bqwfmgsrd477kb3ppg"; depends=[pander svDialogs xcms]; };
-  MethPed = derive2 { name="MethPed"; version="1.0.2"; sha256="0ijvk0pmjgr0x12hv12p7lbvarlaz5pg7nc2nly8hh7hmv8y807p"; depends=[Biobase randomForest]; };
-  MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.4.0"; sha256="19yws0346kia30p4sjmikbsvzfynl920n8ici3wpmcks2vs1a1xd"; depends=[Biostrings gplots seqinr stringr]; };
-  MethylAid = derive2 { name="MethylAid"; version="1.6.2"; sha256="1ih9s9jmixfa1h060y7sqmip1rwz32a445cfjhcff20bsjblld42"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; };
-  MethylMix = derive2 { name="MethylMix"; version="1.6.0"; sha256="0waq027d51gnz6l883dph2srklzf3d1fwlan3khzcmi8yq75ciar"; depends=[doParallel foreach optimx RColorBrewer RPMM]; };
-  MethylSeekR = derive2 { name="MethylSeekR"; version="1.12.0"; sha256="1x6kc2xl2jf8f6r2yjpybh51kk75xhmpb7m9j1zs1hzi0aqd0rz4"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
-  Mfuzz = derive2 { name="Mfuzz"; version="2.32.0"; sha256="17afgpshz7nb0kcdks19z6izb6hrmgy9rigzw3mvk488mxhczlw8"; depends=[Biobase e1071 tkWidgets]; };
-  MiChip = derive2 { name="MiChip"; version="1.26.0"; sha256="0fddfvay8zjamb6gzmf6f6xvqjh163ss3wikf1a04ihj7if8x6nf"; depends=[Biobase]; };
-  MiPP = derive2 { name="MiPP"; version="1.44.0"; sha256="0ffiyrkda0hwjg4l062kxx5rrp57q2f716gk6n3f8dicx938fc4d"; depends=[Biobase e1071 MASS]; };
-  MiRaGE = derive2 { name="MiRaGE"; version="1.14.0"; sha256="02x8p9l48g0b7s2pjq5j3w4dxnr6r0495di1y7sknrsbc2gdczib"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
-  MineICA = derive2 { name="MineICA"; version="1.12.0"; sha256="0155kj48kxajd4sg1ajvppk1jss1wqkkyjz6xhzr3xpl9g2jnh51"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
-  MinimumDistance = derive2 { name="MinimumDistance"; version="1.16.0"; sha256="1yw8ym00bkvn955d8yrz068yxszy3jv7gh55z3357k9spf1r9kmi"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
-  Mirsynergy = derive2 { name="Mirsynergy"; version="1.8.1"; sha256="1zs09wm9n51d1bswbl6q9xmd5kb9rgbjgmqniq4nril18cqksqnp"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
-  MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.22.0"; sha256="05fnam7yak4jxjwmkzmczwrfvbqw7y91layz6g7kgzz56ifqj33s"; depends=[Biobase lattice limma statmod vsn xtable]; };
-  MoPS = derive2 { name="MoPS"; version="1.6.0"; sha256="19bkydam974lam2v7ljzmj6xs8hw5ggd839j5mld1in44q7p8y3h"; depends=[Biobase]; };
-  MotIV = derive2 { name="MotIV"; version="1.28.0"; sha256="1yzx1m1csi9x8i0jljcqla3hgwly3yb9r710q23f5kswir3qdawn"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
-  MotifDb = derive2 { name="MotifDb"; version="1.14.0"; sha256="05pbqrq547am6l74cv3pqnlw6kiasnlfx9hgicfp290ir6ws0clx"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; };
-  Mulcom = derive2 { name="Mulcom"; version="1.22.0"; sha256="08h94yykypmm5zshmf0i547g6lw4bsyn5zw8swgpiv4c2p46drhd"; depends=[Biobase fields]; };
-  MultiDataSet = derive2 { name="MultiDataSet"; version="1.0.2"; sha256="05gx3kdzrc1lyw2xx1w2vw0c562x7cj3raqi6mafs40dlxyplf0h"; depends=[Biobase BiocGenerics GenomicRanges IRanges minfi S4Vectors SummarizedExperiment]; };
-  MultiMed = derive2 { name="MultiMed"; version="1.6.0"; sha256="1shl11v2m926c2ccypj561rb17h490bndw2nflcpg19bgw43smj6"; depends=[]; };
-  NCIgraph = derive2 { name="NCIgraph"; version="1.20.0"; sha256="08kjg6ynynbccdi57hns1bxnr9cjh07w71rah8zkx2irsgg22485"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; };
-  NGScopy = derive2 { name="NGScopy"; version="1.6.0"; sha256="07hrqv4xdsi2w3ln4lbjgfkyqv22m9nj9zwcaxdxhy8sr3dr7zzw"; depends=[changepoint rbamtools Xmisc]; };
-  NOISeq = derive2 { name="NOISeq"; version="2.16.0"; sha256="0j2698rsdbm76rcdc9b1ddhrs7ka0qwi51p8cqzcymkjks4pb4jh"; depends=[Biobase Matrix]; };
-  NTW = derive2 { name="NTW"; version="1.22.0"; sha256="094lwailsdl889h880igkwmg1vkbs4k44m5l9zdncy2d4cbmz9fx"; depends=[mvtnorm]; };
-  NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.2.0"; sha256="00bw33qa0szb0g46ni35jaxk848pbfqcy5z7jv3sbfc3kfv2qzki"; depends=[Biobase matrixStats]; };
-  NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.4.0"; sha256="1y68zx0psvnyfxbslw59spdv054shrfj3m8l30f13x734ff2bcd2"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
-  NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.16.0"; sha256="08x5hv0qpkg241pxzgfs5pbs5vmf7bj36hdhr1iakmqic3p88xaf"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
-  NetPathMiner = derive2 { name="NetPathMiner"; version="1.8.0"; sha256="1brr77b0gj4mbfcxiwk0ip11shj1829i12ivwjhls2f2iwn72s4b"; depends=[igraph]; };
-  NetSAM = derive2 { name="NetSAM"; version="1.12.0"; sha256="16hcg60fnqznjj218ms3i9yz8sw9r5fgbcbg7m6fbqdf9wvblbdn"; depends=[graph igraph seriation]; };
-  NormqPCR = derive2 { name="NormqPCR"; version="1.18.0"; sha256="1h2x08ns8q4fr26mk3sqn65rqb3j6i7a0ni3fasbjsbc6yhbi2lf"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
-  NuPoP = derive2 { name="NuPoP"; version="1.22.0"; sha256="0q0qh9xwlz6flhqzvmc438h0ywj66y794mzlqyjm648qc33csd2x"; depends=[]; };
-  OCplus = derive2 { name="OCplus"; version="1.46.0"; sha256="1qib8knxymmdy0a7afmjg1zvrpb4nx1mkdc53zpdicjrv1k64v6h"; depends=[akima multtest]; };
-  OGSA = derive2 { name="OGSA"; version="1.2.0"; sha256="17cc03pv4lgs7306mhwd62hnkl74gvqpaw71rk8sas2iy0rd2xnf"; depends=[Biobase gplots limma]; };
-  OLIN = derive2 { name="OLIN"; version="1.50.0"; sha256="0a4ahksrng4bvcslx7mw6q3gf6wlgkskqigk1axaxa6jy6jyg70c"; depends=[limma locfit marray]; };
-  OLINgui = derive2 { name="OLINgui"; version="1.46.0"; sha256="1vdkxkbwxf42fp9y24xqd598ksif4najbp77s689qr2hbi3mw0rp"; depends=[marray OLIN tkWidgets widgetTools]; };
-  OSAT = derive2 { name="OSAT"; version="1.20.0"; sha256="0hccp457gqb2c1qs9jlwglvhm8dqazxgk3qj6cidh9wmdd97ppcw"; depends=[]; };
-  OTUbase = derive2 { name="OTUbase"; version="1.22.0"; sha256="0i14424m00ivvssb9qax48dxk2pm68hkwykd1xqpl38p0p4d1fh5"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
-  OmicCircos = derive2 { name="OmicCircos"; version="1.10.0"; sha256="0s55hrr712z15v0svrijgr0gvn5r8c39jyff0ihl7wyddvyky982"; depends=[GenomicRanges]; };
-  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.4.2"; sha256="05vjkr2gaa1w8lnrxpmqnf1a89clwlzjq4vb9nxmjk21gp6dgqf8"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
-  OncoScore = derive2 { name="OncoScore"; version="1.0.2"; sha256="1wynyfc76vz1qinfvbyzgawcwwyic1khdsmjqkr2b8mcs3sb97xs"; depends=[biomaRt]; };
-  OncoSimulR = derive2 { name="OncoSimulR"; version="2.2.2"; sha256="06i2scrv2dh5yhpaf2dnhjmmdknm0x06597baxk85k95q1m4zpg2"; depends=[data_table graph gtools igraph RColorBrewer Rcpp Rgraphviz]; };
-  OperaMate = derive2 { name="OperaMate"; version="1.4.0"; sha256="0qn2r3347khd671yf200p2wfbqysi2k4wk0y52vr1kji39shjqy4"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; };
-  OrderedList = derive2 { name="OrderedList"; version="1.44.0"; sha256="0z32bp9gjy0sf7qw626p2dignrcq22h6l5zwza2ap5c0hr0m7l2r"; depends=[Biobase twilight]; };
-  OrganismDbi = derive2 { name="OrganismDbi"; version="1.14.1"; sha256="0h48qkliiyl4fk1dnk2310gy76bj7nhgnw92cxllvbcq4caakv52"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
-  Oscope = derive2 { name="Oscope"; version="1.2.0"; sha256="0p9ri0djqf87jbb6pcjz5m8l0vgjc04mspdahqaj258yg2zgkvdp"; depends=[BiocParallel cluster EBSeq testthat]; };
-  OutlierD = derive2 { name="OutlierD"; version="1.36.0"; sha256="1carw9ylv7gwcawfdpx3aahbw1hnglila3miry5vhg978lk662f2"; depends=[Biobase quantreg]; };
-  PAA = derive2 { name="PAA"; version="1.7.1"; sha256="1kgqb4q6jmr34w7pkgksbzbhvvlyr57xgv7k17hibggy0b1ykp1j"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
-  PADOG = derive2 { name="PADOG"; version="1.14.0"; sha256="1s1adlswz3na5k072nbsp419ix75jg4h94jgg1w54730dymphasm"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
-  PANR = derive2 { name="PANR"; version="1.18.0"; sha256="1b4r8bz22rfykysbp2cfxa98gq2hsig8nx2kfizx5z7z28gnsfba"; depends=[igraph MASS pvclust RedeR]; };
-  PAPi = derive2 { name="PAPi"; version="1.12.0"; sha256="1dvhghn0g7ka2qvfyj785ma6pm25p7j8j76cqwjhg9n8kja9999i"; depends=[KEGGREST svDialogs]; };
-  PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.36.0"; sha256="1s2b0s5pb2yhji756y21sy22sypvp3zkmdg7jv7xnsrrnvkqjnqd"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
-  PCAN = derive2 { name="PCAN"; version="1.0.2"; sha256="1rkgkash3y07srq2y5r0hrhs8gzzwn739g5jhjdmky73m7xbdc3p"; depends=[BiocParallel]; };
-  PCpheno = derive2 { name="PCpheno"; version="1.34.0"; sha256="0y93qv6gghr461rqbq11vl0khf25n6pvrqzszybwbrw9q6hynzhw"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
-  PECA = derive2 { name="PECA"; version="1.8.0"; sha256="0qm40zwmbzj06z18k8wyqvlk6rvv70h7m8g4zrrslsjdx8anhzll"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
-  PGA = derive2 { name="PGA"; version="1.2.2"; sha256="13a4q8dldyp2djc2f33w8kj6vpaa7xzymf3p1l47mmv6gz9n17yv"; 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.46.0"; sha256="1sx7ffg0sjzs9hxh1fhp0149h6j4fhaqqrq56aanmacqpcd8lhna"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
-  PICS = derive2 { name="PICS"; version="2.16.0"; sha256="0gn1dqmhii2ys95gs85sm812kgw2pnph7mv6yml0xg0929rph3pa"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
-  PING = derive2 { name="PING"; version="2.16.0"; sha256="13yhwmcvhcvn99x6czq09zhrqaw0p644iw3jhw2gv3r93q39blci"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
-  PLPE = derive2 { name="PLPE"; version="1.32.0"; sha256="0i114wl9w4ka7w8w1jllfcq436mgpjkxaaymbxn81kfjw3jp4pql"; depends=[Biobase LPE MASS]; };
-  PREDA = derive2 { name="PREDA"; version="1.18.0"; sha256="10bnsf62vlxzymwlh683g0asmkwldgr66fwfxhdlk807lh4phi8k"; depends=[annotate Biobase lokern multtest]; };
-  PROMISE = derive2 { name="PROMISE"; version="1.24.0"; sha256="04wd1s0ki10scspd48h2m0y5wzxab2q6jd8farnca62sr7nzz46x"; depends=[Biobase GSEABase]; };
-  PROPER = derive2 { name="PROPER"; version="1.4.2"; sha256="1pqa3k4id6j1j8nwrp4ax3fbpxc9vhkyddy9vylg0s6l5c3jnqkh"; depends=[edgeR]; };
-  PROcess = derive2 { name="PROcess"; version="1.48.0"; sha256="0dna1smq8phmm2xd4928wbr2y9a4l3yv98ss8ida1fxmbxhy3sxy"; depends=[Icens]; };
-  PSEA = derive2 { name="PSEA"; version="1.6.0"; sha256="07bsdx8vclk2mjpq65zqgzx8l9pb31vj00j1qi3krk2gjb64pj1j"; depends=[Biobase MASS]; };
-  PSICQUIC = derive2 { name="PSICQUIC"; version="1.10.0"; sha256="1psivm4zlg0nidg0kzy61m0my0y8pdjwprlyzcidbjqal1s8mpzc"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
-  PWMEnrich = derive2 { name="PWMEnrich"; version="4.8.2"; sha256="1afyrrqdxacnnx1r0pzqp1nhbjrb0wqaamycvxmap9x0nq96a6ww"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
-  PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.0.3"; sha256="0n3i9385zq09jqwp81q869h5qk4xjnrnx7mlcsyng087h2sgnmvh"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; };
-  Path2PPI = derive2 { name="Path2PPI"; version="1.2.2"; sha256="00cbchrvqwxdv777f3rbgdqj127wi5383gk7j0amxvdx9xrkjyp1"; depends=[igraph]; };
-  PathNet = derive2 { name="PathNet"; version="1.12.0"; sha256="12wv9izq6hk27v2x8dv7mfvp9s51jyjydwdd2vb44a6d1pz8fn94"; depends=[]; };
-  Pbase = derive2 { name="Pbase"; version="0.12.2"; sha256="1cl9j8s5hxib5wzj42rbp747ckbidni5dii6qxylp89msvp1wlia"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
-  PhenStat = derive2 { name="PhenStat"; version="2.6.0"; sha256="0f69r7qg6cbpmlrbcz8ddmcfkzx5bixry0nksmkfbf6hbw08pgn1"; depends=[car logistf MASS nlme nortest]; };
-  Polyfit = derive2 { name="Polyfit"; version="1.6.0"; sha256="1szx61apdn014496qzr5aqzy9nfyvnbhc7w949kxmw1vrgjkrdmc"; depends=[DESeq]; };
-  Prize = derive2 { name="Prize"; version="1.2.0"; sha256="0birhqvk5myb1j41hffy71dmshc43vfx5qd9rnpwylq66dp9f9f9"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
-  ProCoNA = derive2 { name="ProCoNA"; version="1.10.0"; sha256="0hh21hdhgaf63mbbfi5pnpds2bgkybnr1xrc0w2siqnyfvva1613"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
-  Prostar = derive2 { name="Prostar"; version="1.4.12"; sha256="0720rlql0wq9spxrr438gsjn3xd7hci6vssdxa1mqq1p8xcv12ik"; depends=[DAPAR DAPARdata data_table DT rhandsontable shiny shinyAce shinyjs]; };
-  ProtGenerics = derive2 { name="ProtGenerics"; version="1.4.0"; sha256="15n8ykfwh8zng8px25qybskwcr627xwap3wzz3qs8g9mgxk69avn"; depends=[]; };
-  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.2.2"; sha256="1z5708sh0ar98xyrj3xpl87pn9zwj19wa2yq30kspp84kl924dz4"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
-  PureCN = derive2 { name="PureCN"; version="1.0.4"; sha256="1nprrvr5mfccji6iw7cfwvi1d087nxa43l30lvi0fkqnaw5ba7x2"; depends=[data_table DNAcopy GenomeInfoDb GenomicRanges IRanges RColorBrewer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  Pviz = derive2 { name="Pviz"; version="1.6.2"; sha256="1kqamr8ir84jy6ija3y3v99wadrfajwycwb687x9l219a0l8h5k4"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
-  QDNAseq = derive2 { name="QDNAseq"; version="1.8.1"; sha256="1r9j3324qc3r597gry39jbkvzhwgmsqkn8ss5z78k84b97n7raz9"; depends=[Biobase CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; };
-  QUALIFIER = derive2 { name="QUALIFIER"; version="1.16.1"; sha256="00303dl9sypzl2zii1jyjmjvcmq4ff5qqy5i4aavzq1d82slf5g4"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
-  QUBIC = derive2 { name="QUBIC"; version="1.0.3"; sha256="12qrk97m42ifqj6mk8alrhr4pxqddb2ca23raf528hxphc6z7hml"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
-  QuartPAC = derive2 { name="QuartPAC"; version="1.4.0"; sha256="1gw79h59xl45k89hj2d3l964y7w61svwlyjibz17z1r2pxc9vzj1"; depends=[data_table GraphPAC iPAC SpacePAC]; };
-  QuasR = derive2 { name="QuasR"; version="1.12.0"; sha256="15f9xqvhf7c57l12xapm4jfm32np0y8lgi31vp44dwz281gxh61q"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
-  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.0.2"; sha256="152iby14x0xx8h05c1c5wqk6ndv38hl3zzwj7iiw9m2apbfms9fs"; depends=[Rcpp]; };
-  R3CPET = derive2 { name="R3CPET"; version="1.4.2"; sha256="1cv4dxlvxdbcynm49syajhlrk9vak54v6gmljsbry0g6hjiyfiv1"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
-  R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.22.0"; sha256="11clxpbkzkvjrj6s0415285ajjziymmn5hgz61n61sjxm08al6qj"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
-  R4RNA = derive2 { name="R4RNA"; version="1.0.0"; sha256="0v6sl6xxnwkkkvs2j496kv9hqk7f5lbgpgk39fz2pyvxysccwi5y"; depends=[Biostrings]; };
-  RBGL = derive2 { name="RBGL"; version="1.48.1"; sha256="1k82zcbyfx3p9hc8r0hwq73krbhakjan8fgbfr6w8z2crfkv3zmz"; depends=[graph]; };
-  RBM = derive2 { name="RBM"; version="1.4.0"; sha256="0a17l6wmlqimb3jlh5i4qjyyhkymv4mcdhjbkis2qrf4zx6yn428"; depends=[limma marray]; };
-  RBioinf = derive2 { name="RBioinf"; version="1.32.0"; sha256="0yvbvhcydsqx2c4vmdbgcsccn71yswci82xb2qcjbps4z1q31g4x"; depends=[graph]; };
-  RCASPAR = derive2 { name="RCASPAR"; version="1.18.0"; sha256="15har8sa0drdjn033fia2gny1iacb5q06h2hr36k6hqr42y33p07"; depends=[]; };
-  RCy3 = derive2 { name="RCy3"; version="1.2.0"; sha256="020j4ay8r4rsbwpc9bjgw96hwp4m4q4rg078grg9scqfz9jjpksw"; depends=[graph httr RCurl RJSONIO]; };
-  RCyjs = derive2 { name="RCyjs"; version="1.4.0"; sha256="10d55bjav4fshn92fiif63fb17b58wsbg39fxslcyg5hl2wa8vhl"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
-  RCytoscape = derive2 { name="RCytoscape"; version="1.21.1"; sha256="0jr3wlqk8aghaxdpq9a9z7gp7hmdfgmzkflv561p9g6yawv3v1q2"; depends=[BiocGenerics graph]; };
-  RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.10.0"; sha256="1ly2xfmq3vwp2zxjqlmsjfy415h3zf6hhb71blf56g0naws7j5xh"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
-  RDRToolbox = derive2 { name="RDRToolbox"; version="1.22.0"; sha256="1p2c7l16q9lyiki1a6vq076r9crjqpr6pgjckhpcis9p9gh5gapy"; depends=[MASS rgl]; };
-  REDseq = derive2 { name="REDseq"; version="1.18.0"; sha256="14f2vh1s16dmar21h673qx8ypq5rbajazvmw6iw0bvxzbk6fy7f6"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
-  RGSEA = derive2 { name="RGSEA"; version="1.6.2"; sha256="1y5qfcspj0l1ckfqlyy0dhl3aaach2mhk8bkqyx4qr68rh496y3s"; depends=[BiocGenerics]; };
-  RGalaxy = derive2 { name="RGalaxy"; version="1.16.2"; sha256="03ippdid60iql6dlc5c7f2njfjfs7ssgfs8gl1p8kmrg4c4hd3p0"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; };
-  RGraph2js = derive2 { name="RGraph2js"; version="1.0.0"; sha256="0mhj021nczpf6ji5297zx0k7kc7503i2w5z9js5irlj5d6552700"; depends=[digest graph rjson whisker]; };
-  RIPSeeker = derive2 { name="RIPSeeker"; version="1.12.0"; sha256="1dymn67l2d6165misxh4p6j8cwlydkh75j77pxx5wdnr2x2nfkcb"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  RImmPort = derive2 { name="RImmPort"; version="1.0.2"; sha256="0278fgq6b9jl5qy2nf6r1qijcrwkzyi6wpx1hq0021k3m1q2sl0b"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
-  RLMM = derive2 { name="RLMM"; version="1.34.0"; sha256="0inyvbr5khwf24j7wdnn6x0b8zqcqf11jm5jqn6lgyxwljl5j0lq"; depends=[MASS]; };
-  RMassBank = derive2 { name="RMassBank"; version="2.0.0"; sha256="0b0aghrr1s9izk7bsxj6qr2gdavxpyjk5ks7zbnqdjwc95hprndv"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
-  RNASeqPower = derive2 { name="RNASeqPower"; version="1.12.0"; sha256="0y5cgdcj4wn3j9pxyv0hsjpbsc7ahl2a19mj6agjf8l4hn3wg3ky"; depends=[]; };
-  RNAinteract = derive2 { name="RNAinteract"; version="1.20.0"; sha256="0a33sr1iqsym990d76rhrxpmcf0g0zzg7waidc5i608496kx3012"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-  RNAither = derive2 { name="RNAither"; version="2.20.0"; sha256="0a4h1wmr158wmm477pbn2jkn5hcfj0w5dxi071shbv26b88lvfgg"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-  RNAprobR = derive2 { name="RNAprobR"; version="1.4.0"; sha256="08cp1ycx6h9h7df58v84x5l7a3b2as27hap4jd37frvhy8bwkkay"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
-  ROC = derive2 { name="ROC"; version="1.48.0"; sha256="01n66xmy2wsh2m7vxvlnvh5n40cfnqngsgzywnx5ywbq3g570328"; depends=[]; };
-  ROTS = derive2 { name="ROTS"; version="1.0.0"; sha256="1s48zavs9w3swn3q0hjq6rnld28hd8jsbqq1jr38dd4rmh1mxgxr"; depends=[Biobase Rcpp]; };
-  ROntoTools = derive2 { name="ROntoTools"; version="2.0.0"; sha256="0rmi1f8nr1ks5mwqmriqyh025qzs7j8a5fmfk7y3kb9wm5is7dm7"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
-  RPA = derive2 { name="RPA"; version="1.28.0"; sha256="08cj1li41vgxg61bgbv5gw6fnqsc1hgsm6xl3yldpy33rl3q0sg2"; depends=[affy BiocGenerics phyloseq]; };
-  RRHO = derive2 { name="RRHO"; version="1.12.0"; sha256="0vv4lxavgm1jfj2lvm7j589cbnd23mp77jfwacaswgz8q3s7l936"; depends=[VennDiagram]; };
-  RSVSim = derive2 { name="RSVSim"; version="1.12.0"; sha256="1pbsp2an6y4mgcwcsc25v6v68yn8fxpkn4anmx6rmhpdl2dvwpzc"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
-  RTCA = derive2 { name="RTCA"; version="1.24.0"; sha256="0q7cfkhayir6a437q7glyk536jhlq61kpapsrh6kvl0m5jcknai8"; depends=[Biobase gtools RColorBrewer]; };
-  RTCGA = derive2 { name="RTCGA"; version="1.2.5"; sha256="112xmvk4cx6y4ma9kmrl6yryadml3mwd1i2924gbj1xy3wk0p0f2"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
-  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.2.2"; sha256="0gfhvzswjdlxpy6i7bhni39a5qvqdkdqiwrm411g2mx38zicgnxm"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; };
-  RTN = derive2 { name="RTN"; version="1.10.0"; sha256="14dixlh8fr7kjzf6jrgcr7qhqpdbwl5r76c78mzqig5lzba3s0gy"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; };
-  RTopper = derive2 { name="RTopper"; version="1.18.0"; sha256="0bmgyn74h0i2jbqw470l3ffv6lv7iwqilgb2zx6zh1f0gsy11km9"; depends=[Biobase limma multtest]; };
-  RUVSeq = derive2 { name="RUVSeq"; version="1.6.2"; sha256="0kwgf512gld4vdmygwps0zqlas936fg05b573xvhag88rcdx8b5b"; depends=[Biobase EDASeq edgeR MASS]; };
-  RUVcorr = derive2 { name="RUVcorr"; version="1.4.2"; sha256="0japqgx5jvava36hsc3jjx5x762ayhsklnn7m242wb77k97qwi4p"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
-  RUVnormalize = derive2 { name="RUVnormalize"; version="1.6.0"; sha256="0pnx0zxacwi5qbm4cy83da60r306phzc9j8sib2n166g9wpqiypw"; depends=[Biobase RUVnormalizeData]; };
-  RWebServices = derive2 { name="RWebServices"; version="1.36.0"; sha256="03x97qwv3nryazz4d3g70lfs6la2v79favlgskbr3x3ajjc2n0cg"; depends=[RCurl SJava TypeInfo]; };
-  RamiGO = derive2 { name="RamiGO"; version="1.18.0"; sha256="0rq2xvb4gpcj5daczrj2if7v3kzs00kkvsa7kb78v37vvhif4rh8"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
-  RankProd = derive2 { name="RankProd"; version="2.44.0"; sha256="1vyghlm4a1wvq6mcw7ls0jnwf0q64730zvvycjb34x38v18wml3y"; depends=[]; };
-  RareVariantVis = derive2 { name="RareVariantVis"; version="1.6.2"; sha256="1ia1gdaw8n3v091yp1hsgy6i2dcshcm179vnm3q40ip05mm9yshz"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; };
-  Rariant = derive2 { name="Rariant"; version="1.8.3"; sha256="0cnqrl8n9piyzbrxpk22nqkkmrnnz7vrhpbg20i6sfyp34353gzj"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
-  RbcBook1 = derive2 { name="RbcBook1"; version="1.40.0"; sha256="19cwhsshw9fgq933cgrr9j31n9nf85jjix7ykdcs43rbfryzy99s"; depends=[Biobase graph rpart]; };
-  Rbowtie = derive2 { name="Rbowtie"; version="1.12.0"; sha256="1gpjc4h11g4c0v2g6fpf1kjyws93i7w1slh12gwpn4hfbha1vsp2"; depends=[]; };
-  Rcade = derive2 { name="Rcade"; version="1.14.0"; sha256="0z2rd8g9dbw2q48jmw0d25qrq4x47n708kryp5r7ssb78jmvk7nc"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; };
-  Rchemcpp = derive2 { name="Rchemcpp"; version="2.10.0"; sha256="1i4fm7ybclj5c87azqv2kjijq28wklrhs3vclyjfk5wapf6kfj5d"; depends=[ChemmineR Rcpp]; };
-  RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.12.0"; sha256="1vkfsjl0krp69vhg5riq0bnlmij1qg8xbip5sd2m48z13qwysv6b"; depends=[flowType graph Rgraphviz sfsmisc]; };
-  Rcpi = derive2 { name="Rcpi"; version="1.8.0"; sha256="0zx2x5zzx8n4ixyqk5h9sbd48nx3y68cknjpmby8j06csdzjdcc1"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
-  Rdisop = derive2 { name="Rdisop"; version="1.32.0"; sha256="1x8sdgksx4wh3kdapfmlgq312ip3a8lwi4diafgjkzjyb3rpqwgd"; depends=[Rcpp RcppClassic]; };
-  ReQON = derive2 { name="ReQON"; version="1.18.0"; sha256="0kx7mz8m4siygdg1saq1xk9n4qxpz6ymsm6hf3d566sn3ldb97dr"; depends=[rJava Rsamtools seqbias]; };
-  ReactomePA = derive2 { name="ReactomePA"; version="1.16.2"; sha256="1rd58nfkbjkryg5z2if9g2lck3da65bbr4pkph3wnlhxdn1i5q9l"; depends=[AnnotationDbi DOSE GOSemSim graphite igraph reactome_db]; };
-  ReadqPCR = derive2 { name="ReadqPCR"; version="1.18.0"; sha256="11hzn2lvgjys8jj5y6999s90jngmj8gnnq7cywql0l6dg7y4mjgq"; depends=[affy Biobase]; };
-  RedeR = derive2 { name="RedeR"; version="1.20.0"; sha256="1gy2i8kkakv89d335cj0agdbdbrrcaaz5ykpgh46aphag2z2z3fw"; depends=[igraph pvclust RCurl XML]; };
-  RefNet = derive2 { name="RefNet"; version="1.8.0"; sha256="0wc93cq5g9x7ah925k7jcz4cnlpccfkrzq4l3ahzxc338xyrsj5j"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
-  RefPlus = derive2 { name="RefPlus"; version="1.42.0"; sha256="18pnia63wxqanc8v2ljlhvxiff0l9dshfm68rq5kwlhzmihxdz9q"; depends=[affy affyPLM Biobase preprocessCore]; };
-  Repitools = derive2 { name="Repitools"; version="1.18.3"; sha256="0h1sm6jq0kn1ahkj9k8xlj9smb8j63d482wvknmx8j3xn3qmjg1r"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
-  ReportingTools = derive2 { name="ReportingTools"; version="2.12.2"; sha256="04acgb7gqf6p0dgimi5sm54kwppclamayfk8m7373bjnzd25m88w"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; };
-  Rgraphviz = derive2 { name="Rgraphviz"; version="2.16.0"; sha256="0zspfl87qz60hlnc6hcbd2sjjc9fgcq72zd75wnmf20h7ry1ngd7"; depends=[graph]; };
-  Rhtslib = derive2 { name="Rhtslib"; version="1.4.3"; sha256="1wgpn9x8abjj7fc087pdavqc3fz0pl5xdh231mgjila18irwlhb3"; depends=[zlibbioc]; };
-  RiboProfiling = derive2 { name="RiboProfiling"; version="1.2.1"; sha256="18s35h70isvy6q4psa5j04x7w0srvd3rlslzvkmb0qs2m2x786mz"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
-  Ringo = derive2 { name="Ringo"; version="1.36.0"; sha256="18rbl1mvhmh31wvlvh1mjcmy4r7688alzzg0hjswvs8dmb66pr86"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-  Risa = derive2 { name="Risa"; version="1.14.0"; sha256="0lss7cx84f2sm4r6g1r3m8qpv0ml5y0mkgdbigx49676d8hir9d8"; depends=[affy Biobase biocViews Rcpp xcms]; };
-  Rmagpie = derive2 { name="Rmagpie"; version="1.28.0"; sha256="19hvhrbzca631n4jz88k52zlaxj21lpcfcz6gdwqiibpa8p0hqhd"; depends=[Biobase e1071 kernlab pamr]; };
-  RmiR = derive2 { name="RmiR"; version="1.28.0"; sha256="10bbwcwssidad2lvk25nm9n40dgmklj7k5m7fps61ny1my4bmbhs"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
-  RnBeads = derive2 { name="RnBeads"; version="1.4.0"; sha256="0jmlcjxiri356ykg6dm0cxbmh85kljq8m3cndrfqc1wdj3jg3my3"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer S4Vectors]; };
-  RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.4.2"; sha256="1jrf22a8f5g8scpaqwyp62hlpkfa9cm9y8ifqzz6fkr319i892yy"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
-  Rnits = derive2 { name="Rnits"; version="1.6.2"; sha256="1h1g3wqrcsgmixs8bqbray6p0zknfh2gr47dxlwcmlb6gacwzkra"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
-  Roleswitch = derive2 { name="Roleswitch"; version="1.10.0"; sha256="1vfywgjnk0dgr47brpalcg8dwgway5lkc4b320mxrpjvkfa9nh60"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
-  Rolexa = derive2 { name="Rolexa"; version="1.27.0"; sha256="002bsgk5b7zkxzf26wj53k5qjfjqn55fy3qfaql6xa78yb8kzfad"; depends=[Biostrings IRanges mclust ShortRead]; };
-  RpsiXML = derive2 { name="RpsiXML"; version="2.14.0"; sha256="018l540g50nsnqwazpkla2sqf2zvsnlp4ps6j7rly2cl3qay2kzn"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
-  Rqc = derive2 { name="Rqc"; version="1.6.2"; sha256="0jm2ib52fjy13lh31xm8fn0z2rkx8sld7zykhjj2ci8514hqcczm"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
-  Rsamtools = derive2 { name="Rsamtools"; version="1.24.0"; sha256="0w0drs8cpk8nlazq64ag7nm1w5jd1m8riialivm01hz5zcra7scb"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-  Rsubread = derive2 { name="Rsubread"; version="1.22.3"; sha256="0p7d542gbk5d9pqlyhvqmapfqbay2cgdrs83dvyq0fbg98nzf32l"; depends=[]; };
-  Rtreemix = derive2 { name="Rtreemix"; version="1.34.0"; sha256="0xxkii2fmkphxj478ykdym1z09asz28cyzg8r7h6f4adns2rby7h"; depends=[Biobase graph Hmisc]; };
-  S4Vectors = derive2 { name="S4Vectors"; version="0.10.3"; sha256="09lrvy3d5q58hsgw9as4hyyx07k1vyy2zjn3xsvhyfd97yk6w6lv"; depends=[BiocGenerics]; };
-  SAGx = derive2 { name="SAGx"; version="1.46.0"; sha256="1rp190n21p5cav07rkm400al354b4wwqicz3nk095jdrjw6d5pcx"; depends=[Biobase multtest]; };
-  SANTA = derive2 { name="SANTA"; version="2.10.2"; sha256="19v4kvfsj6zqv18q1hhl1r0ngkxd3b18h19mbpd4p0chzrfzj36d"; depends=[igraph Matrix snow]; };
-  SBMLR = derive2 { name="SBMLR"; version="1.68.0"; sha256="0xamsiq5dqmb2l52ckzbra5q072s5y1xbg6983fp9626mns350ry"; depends=[deSolve XML]; };
-  SC3 = derive2 { name="SC3"; version="1.1.4"; sha256="1laxigz5141s877f22dkw4r0icq282s2s4wxlaapdnyg062m2qic"; depends=[cluster colorspace doParallel doRNG e1071 foreach ggplot2 pheatmap RColorBrewer robustbase ROCR rrcov RSelenium Rtsne shiny WriteXLS]; };
-  SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.14.0"; sha256="038d5rd649xyfl66h0gmfgp9ldmikl39qivmz0knl4g20b8p5ma0"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
-  SELEX = derive2 { name="SELEX"; version="1.4.0"; sha256="1gxdcql81l8anjdrpi4mc8aw36srry076yhi7vwlia3s9rg3371i"; depends=[Biostrings rJava]; };
-  SEPA = derive2 { name="SEPA"; version="1.2.2"; sha256="0nmi87s9288p5mrqajpkqq80y17lh71dhr996snp9przq00g2ga4"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
-  SGSeq = derive2 { name="SGSeq"; version="1.6.12"; sha256="1swb3yac81s97m2bp15j02x0s364rf1szbhfmfpnmxmqmm9jdpsb"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
-  SICtools = derive2 { name="SICtools"; version="1.2.2"; sha256="12jpr2w61pyx61rliz0snsa1ynyxl0kszvjqvk12rkihwgfrmld9"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
-  SIM = derive2 { name="SIM"; version="1.42.0"; sha256="0sqm6rgfillq0fbiisy0g3cy0xyaaa7l93vw0gcjcyysyy0gls7c"; depends=[globaltest quantreg quantsmooth]; };
-  SIMAT = derive2 { name="SIMAT"; version="1.4.0"; sha256="1z53q0f862irgdplszcpljkf27lsgw20055w0g80knygf6kkzyvq"; depends=[ggplot2 mzR Rcpp reshape2]; };
-  SISPA = derive2 { name="SISPA"; version="1.2.1"; sha256="17qvzlmbb4mpijfglfgnmk6xvirdc3xfi2fc8wwgcv4f3vw2sqmw"; depends=[changepoint data_table ggplot2 GSVA plyr]; };
-  SJava = derive2 { name="SJava"; version="0.98.0"; sha256="05y04474frdm78lpwvbqsqbg9d1nw746j0ndllh2489p6qk0w2ky"; depends=[]; };
-  SLGI = derive2 { name="SLGI"; version="1.32.0"; sha256="1ki1vyaabzlcjkmmdf1rj73wadnahdgvnyz5zkasfszxfifxa5x5"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
-  SLqPCR = derive2 { name="SLqPCR"; version="1.38.0"; sha256="0jzfcbhm45sgppxm21y969l2wwvvi3i0k73pgi91djxww9iax302"; depends=[]; };
-  SMAP = derive2 { name="SMAP"; version="1.36.0"; sha256="0w43xrmcy6rk0rfrd5jx3s646bk2nwjcignd8gh4wg9x2wp03f9n"; depends=[]; };
-  SMITE = derive2 { name="SMITE"; version="1.0.2"; sha256="1y6i5bifxfabhpp60np60rxqj5flxwrc3dxz5nclgm4c3kr95gk1"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; };
-  SNAGEE = derive2 { name="SNAGEE"; version="1.12.0"; sha256="00vxji06x84fh3sfgpdfk67ll1mxvbh58p16dyhd5xjw2rb37s6q"; depends=[SNAGEEdata]; };
-  SNPRelate = derive2 { name="SNPRelate"; version="1.6.6"; sha256="0cjgzww9pj4ivg8rdiaz1v1kv83ghsypjm57pqbx093b1xdjgkq8"; depends=[gdsfmt]; };
-  SNPchip = derive2 { name="SNPchip"; version="2.18.0"; sha256="0ajzpwspbw9jn6lpf5z0rgg1gxfr8d4qw8pwxd64784lwfcvn063"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; };
-  SNPhood = derive2 { name="SNPhood"; version="1.2.3"; sha256="00kr6ri7vv7m0qz5wzx7bd6hj92mp2pbprbyc79ggan5dzpfaxsc"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  SPEM = derive2 { name="SPEM"; version="1.12.0"; sha256="0m3cd58nm3jmdzsph3yq8ndp8civmckhf553yl1q8y4v99y9dpa4"; depends=[Biobase Rsolnp]; };
-  SPIA = derive2 { name="SPIA"; version="2.24.0"; sha256="1mp626ygyyyi2faad0qg5bi86rg21sq2bs0jxs95fwcwyziwj8np"; depends=[KEGGgraph]; };
-  SQUADD = derive2 { name="SQUADD"; version="1.22.0"; sha256="098621vqfykkry6hf06yg4fg4ickrcb8wscv89s763kjc1nlkly8"; depends=[RColorBrewer]; };
-  SRAdb = derive2 { name="SRAdb"; version="1.30.0"; sha256="0adrrs5bcpxqsji41wah2pww591wv8g1abrkim08cry5wpprznj9"; depends=[GEOquery graph RCurl RSQLite]; };
-  SSPA = derive2 { name="SSPA"; version="2.12.0"; sha256="0v9xi3s7ayab6qcark77kblnyzh2jp0vschh4ylpfgjqljy0cing"; depends=[lattice limma qvalue]; };
-  STAN = derive2 { name="STAN"; version="2.0.3"; sha256="0fkiskqylpdwgwr9nanf4xajdq9v09f6dqja69d4rw2bksb1xxqs"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; };
-  STATegRa = derive2 { name="STATegRa"; version="1.6.2"; sha256="1np76zcxqh3yqjbxqvlzfasf95bjp3sa5f7nwyzz3xffykb4fzbp"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
-  STRINGdb = derive2 { name="STRINGdb"; version="1.12.0"; sha256="0vww6nqv00n1230xqf48j99252dmpwa9sd9pgsjlvcgzbwgnccnk"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
-  SVM2CRM = derive2 { name="SVM2CRM"; version="1.4.0"; sha256="10418yvdyw9n74qjhlm9zcdnw2qpyxc75j5i3ayqdnym2xq5qfvm"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
-  SWATH2stats = derive2 { name="SWATH2stats"; version="1.2.3"; sha256="06pajvvis9wi9pn9rfgsdwhpvdyp6zf2iv0kd3rjkvr9ypl9m0z4"; depends=[data_table ggplot2 reshape2]; };
-  SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.26.0"; sha256="1m47ysqnihm0kggqwzczvl8c2njcv7whbl1pz7q75bn02wn2nx09"; depends=[]; };
-  ScISI = derive2 { name="ScISI"; version="1.44.0"; sha256="0yqq5jnyksnlwpxq9n5ajg7h0fzvm4pphsc6xks0fx7zkb7j65b2"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
-  SemDist = derive2 { name="SemDist"; version="1.6.0"; sha256="1na6imf2n5q3sjfrjnhyf8jwygn4h5mafsnmlqpjjsamn7jnnp2d"; depends=[annotate AnnotationDbi GO_db]; };
-  SeqArray = derive2 { name="SeqArray"; version="1.12.9"; sha256="083wkjbmph9lw9psfb8gvmkpwwgrs6p8l6wldcffq1bp46kzmlpk"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
-  SeqGSEA = derive2 { name="SeqGSEA"; version="1.12.0"; sha256="06srbq183hdgvjg7dlx9iycb557j9pv9ip9ffm66kigwyyyg7ys0"; depends=[Biobase biomaRt DESeq doParallel]; };
-  SeqVarTools = derive2 { name="SeqVarTools"; version="1.10.1"; sha256="1jali8s39gc9v9r69gknwsgkjxjp4sqyv45gkri289qx1cv4ck69"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray stringr VariantAnnotation]; };
-  ShortRead = derive2 { name="ShortRead"; version="1.30.0"; sha256="0qlxns4bhwfpafx3km2lnivgl2qyp7n4g1ardm6vrinpq8paxbjg"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
-  SigCheck = derive2 { name="SigCheck"; version="2.4.0"; sha256="0c2wlp96dvwjxaa533lf0dqn42nbiilca0klzw8ca0b8qq81506c"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
-  SigFuge = derive2 { name="SigFuge"; version="1.10.0"; sha256="142aas9vcsf9n69c22rfmz1aidr6r9bi6q2vzl5dcj9yyfgm44h7"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
-  SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.10.0"; sha256="11k8vwwjiz5q586cqcc4z2yr9h6kj78n3k4kwc33cb5yxvv5yf4p"; depends=[Biobase limma mclust Ringo]; };
-  SomatiCA = derive2 { name="SomatiCA"; version="2.2.1"; sha256="17kmqrqjis7zg4wn2h1jmq27q57l3p8fb8sy9x3wm5wh2kh476nn"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
-  SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.8.4"; sha256="1mkwsvn5z78sba9sx0hxrfnpkqz5xjs0zhc2a93ljx1fxzsxx8kh"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
-  SpacePAC = derive2 { name="SpacePAC"; version="1.10.0"; sha256="11vn9l50ndkxb0yi4nx1g23hzmcwlgiqjrv74vyncpkc8dw6kx76"; depends=[iPAC]; };
-  SpeCond = derive2 { name="SpeCond"; version="1.26.0"; sha256="0f2m2cyqnr495hlv167hpki2syn8pq3aicsnn52qycyx7ym4rywa"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
-  SpidermiR = derive2 { name="SpidermiR"; version="1.2.5"; sha256="0q3l0fw9yx47d02w4ivaafrb4rclnd85fmyf46lxhjaskmsb10gl"; depends=[AnnotationDbi ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
-  SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.12.0"; sha256="1jqngzakzc28vclxd14cbgfihvh161qh665ps5zmc00sjiapfh14"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
-  Starr = derive2 { name="Starr"; version="1.28.0"; sha256="15h869kg4ba6qcx0gvjfp3k4dkdxxl9pbr1cpmyjha05zvbk3zss"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
-  Streamer = derive2 { name="Streamer"; version="1.18.0"; sha256="03p4dpi5lfl3q4wfh2q26vmshawxzpj5linh1933724lip4bn20l"; depends=[BiocGenerics graph RBGL]; };
-  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.2.3"; sha256="0c43fsrha886sd0diislnlf8r5h5x7fbhphkzcm0rw3k2jz8wlyk"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  Sushi = derive2 { name="Sushi"; version="1.10.0"; sha256="0y9gz80xf5y2pilcg7c3gffsdspgr2hr51jbk4xhazijzimwf70k"; depends=[biomaRt zoo]; };
-  SwathXtend = derive2 { name="SwathXtend"; version="1.0.0"; sha256="1j0dzmx8d247s206cfzf80p6gjgh44qfccvbn0xmjrpswbwsj3sy"; depends=[e1071 lattice openxlsx VennDiagram]; };
-  SwimR = derive2 { name="SwimR"; version="1.10.0"; sha256="0prwypkjq3kry70akfah50bfh6rdhfwgcc5a7wp7vd7nz2sn78cs"; depends=[gplots heatmap_plus R2HTML signal]; };
-  TCC = derive2 { name="TCC"; version="1.12.1"; sha256="1zk7njhdv50lryrdnlnvrbkzpjz4zizwzv0v7hdxg45jak1q7zvd"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
-  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.0.13"; sha256="0hs370sjkx5x8fgz902a91q1r5p9am6s0a2sscsw1x391xz659ad"; depends=[affy Biobase BiocGenerics biomaRt circlize coin ComplexHeatmap ConsensusClusterPlus data_table dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicFeatures GenomicRanges GGally ggplot2 ggrepel ggthemes gplots httr igraph IRanges jsonlite knitr limma matlab parmigene plyr R_utils RColorBrewer readr reshape2 rvest S4Vectors scales stringr SummarizedExperiment supraHex survival TxDb_Hsapiens_UCSC_hg19_knownGene XML xml2 xtable]; };
-  TDARACNE = derive2 { name="TDARACNE"; version="1.22.0"; sha256="11hy6j6yv008bfkggjyb08k9dzk2xy5sdklga62v8lczpwd161wn"; depends=[Biobase GenKern Rgraphviz]; };
-  TEQC = derive2 { name="TEQC"; version="3.12.0"; sha256="0ayw4ir8rpq1lk2ml7djp8x67fhn43x852p3myjnb0d8war46whm"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
-  TFBSTools = derive2 { name="TFBSTools"; version="1.10.4"; sha256="1hgaqng02y0kgmjnxv8z93698hslr7cqbmgdf8rpaxg6zbn9cb0h"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
-  TIN = derive2 { name="TIN"; version="1.4.1"; sha256="1mgbbk2jifb04c07bwhj9azhgsnza05qf28l2jpi9d10qnfn0nxq"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
-  TPP = derive2 { name="TPP"; version="2.2.6"; sha256="1xzvd2pf6j7d9wwjsfvxzl4xib0h2nxkp4zzb3g60p6mfydr78gd"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr RColorBrewer RCurl reshape2 VennDiagram VGAM]; };
-  TRONCO = derive2 { name="TRONCO"; version="2.4.3"; sha256="0j32db8d067nd7fiiny4whv1hm4w8fv1ivq91ri728n21f92qw52"; depends=[bnlearn cgdsr circlize doParallel foreach gRapHD gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
-  TSCAN = derive2 { name="TSCAN"; version="1.10.2"; sha256="15mi3qg8qrwa44h52cbrmalyi13bbllzcjc4dglpp9mnybwrs126"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
-  TSSi = derive2 { name="TSSi"; version="1.18.0"; sha256="0y2grk912mv2jfadypfrxr5k2kkwl6s2dcnn7g3svj65038b92jw"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
-  TarSeqQC = derive2 { name="TarSeqQC"; version="1.2.0"; sha256="1a2gg203j9djf01w5xk04h79mn7wgd1yibgrvp1qaj3hvl0i0n54"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
-  TargetScore = derive2 { name="TargetScore"; version="1.10.0"; sha256="1rj56jjhp4cz6jp5xrbmj9s3jszq5dmczf5szbzc34fg70y4fbqs"; depends=[Matrix pracma]; };
-  TargetSearch = derive2 { name="TargetSearch"; version="1.28.1"; sha256="0wl9qx6q1czz2nhzz7di928ldv2x0bwj5si6kfm9rpw9q5v6wcs2"; depends=[ncdf4]; };
-  TitanCNA = derive2 { name="TitanCNA"; version="1.10.0"; sha256="085z6j0a0rk86lm8c1asks2rvl7f0w1ncvsly2p8s9jfbk8yahwc"; depends=[foreach GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
-  ToPASeq = derive2 { name="ToPASeq"; version="1.6.0"; sha256="1q9ys84ccv79jm475vm40ncm15dchlw8ak3xarsw9vkdrr4dv5wl"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz SummarizedExperiment TeachingDemos]; };
-  TransView = derive2 { name="TransView"; version="1.16.0"; sha256="1s4i694g2qlf9hsci6flm6z7vxic0n63rc1fi4dh8ag9ds2b9wzj"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
-  TurboNorm = derive2 { name="TurboNorm"; version="1.20.0"; sha256="0rda1gw43nbs9p3axsiwr3vv2rxnpnpsip8pjk8z6jbk01hc76jx"; depends=[affy convert lattice limma marray]; };
-  TypeInfo = derive2 { name="TypeInfo"; version="1.38.0"; sha256="1lg9s53a1cn8zqh4jkns7x9ivp4wc1557nphv6g5m227pi008vrx"; depends=[]; };
-  UNDO = derive2 { name="UNDO"; version="1.14.0"; sha256="1i9hsyrmzlnkl37wkxkxb4y26qr3ds987kb0f18c1g75pm3pg5vd"; depends=[Biobase BiocGenerics boot MASS nnls]; };
-  UniProt_ws = derive2 { name="UniProt.ws"; version="2.12.0"; sha256="09wayrpkk9mpmm8a6ckjyazlyqy9lfnz89xj665khnpblicn0f89"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
-  Uniquorn = derive2 { name="Uniquorn"; version="1.0.8"; sha256="04zc53lh2r4mv6sybs3rf4b7gqv66q1gic8fycyba8fhb4p49glp"; depends=[DBI R_utils RSQLite stringr WriteXLS]; };
-  VanillaICE = derive2 { name="VanillaICE"; version="1.34.0"; sha256="038ziyk80ilfwyxg104sz436all2spblwfy7gk64prshzlb04hbc"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.18.7"; sha256="002kif2c66wbcng953m3g1jys7w1lgz7hh3zsk4jlnhc20jdv1vj"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-  VariantFiltering = derive2 { name="VariantFiltering"; version="1.8.6"; sha256="1na1z0hk8xyvlwb43d4knnhaggbirlq1bdsb53q3s9agqkc8lki2"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; };
-  VariantTools = derive2 { name="VariantTools"; version="1.14.1"; sha256="08kasppyj8h2vrs3sk9m8f1ixk5r689j9i43j0qjdp3kl8kr8ply"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  Vega = derive2 { name="Vega"; version="1.20.0"; sha256="19pd5jgc83gwgdmi1c2n5hjark0qk20svh0w5ay49xs82f939hj2"; depends=[]; };
-  VegaMC = derive2 { name="VegaMC"; version="3.10.0"; sha256="05mkdqriizqddi6p9mnb52zamvgm8w967g1jjbinakhb6fbxqv76"; depends=[Biobase biomaRt genoset]; };
-  XBSeq = derive2 { name="XBSeq"; version="1.2.2"; sha256="1ilvzhl373lpxsq9ff5i1hx09s0jj3ahkhg6i4x2dnqciq2kkax4"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; };
-  XDE = derive2 { name="XDE"; version="2.18.0"; sha256="032bvdc2740cni5lkvkiybmyf01y6hg8xmz216p73aj75ggbp6i1"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
-  XVector = derive2 { name="XVector"; version="0.12.1"; sha256="1kydy9f5y0ihn2mbkamr1kh0g1d3g1k9d7s4i09qgw9ysr6j414v"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
-  a4 = derive2 { name="a4"; version="1.20.0"; sha256="0da0wivzg69f115yc77vajmzkqvb6y98lg35q2gsrb44wyhsvv2f"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
-  a4Base = derive2 { name="a4Base"; version="1.20.0"; sha256="0pjanqc2z19ya3p87sqfb6avb3xmmhmr96c2bg0psjrh986d67q9"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
-  a4Classif = derive2 { name="a4Classif"; version="1.20.0"; sha256="13a97mbfrzs4wfrm2qswrzw0rxiqc8405imz5lii7qygrmw3l8mr"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
-  a4Core = derive2 { name="a4Core"; version="1.20.0"; sha256="0aqrb7d54mbdpkk1q86y5ixfnp569kzrw9azl7v4fwcb9y54k344"; depends=[Biobase glmnet]; };
-  a4Preproc = derive2 { name="a4Preproc"; version="1.20.0"; sha256="06y6v1lj3wbhvr6y6q36qvkpxbbj2wcbhzzwkh4dsfvblwr90sw6"; depends=[AnnotationDbi]; };
-  a4Reporting = derive2 { name="a4Reporting"; version="1.20.0"; sha256="0rfaqy40m7mhf3zjgcmsz99sm9f4nvbk8sqxn7lswwr42656ga8g"; depends=[annaffy xtable]; };
-  aCGH = derive2 { name="aCGH"; version="1.50.0"; sha256="0g5gxc7204171lb1mf00vdi5yj4cfvvaspzd12xxp6z62ndw8ws7"; depends=[Biobase cluster multtest survival]; };
-  acde = derive2 { name="acde"; version="1.2.0"; sha256="04r23mxk2srspzl2sghkjvr98apyq2kz213wmks4kpa6lpzvsipx"; depends=[boot]; };
-  adSplit = derive2 { name="adSplit"; version="1.42.0"; sha256="1qrni9jsn9q1y9kskxynyi7pihzf79kbgchpfnbqr8q3xfjbfcm1"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
-  affxparser = derive2 { name="affxparser"; version="1.44.0"; sha256="125ckbcc1bg041a9khiv9m3hdvzhm7mmi3hk2zp4hzza11a9mww6"; depends=[]; };
-  affy = derive2 { name="affy"; version="1.50.0"; sha256="15620q8x0d42izn5hdbbmj7207id5ld1waws2d9ykplbv88ld8a5"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
-  affyContam = derive2 { name="affyContam"; version="1.30.0"; sha256="0bzifl3dvccy2x2al3p9fqwhznxp8j0hisa2sr9hs896s0frc5a6"; depends=[affy affydata Biobase]; };
-  affyILM = derive2 { name="affyILM"; version="1.24.0"; sha256="0w2x43xziy1d5nq6vmgnr753z36841y5n552h1liwbf6wzrwm4mi"; depends=[affxparser affy Biobase gcrma]; };
-  affyPLM = derive2 { name="affyPLM"; version="1.48.0"; sha256="1g4ci0k5b8i05wpa4kyxm9f83qyb0ym4v8v5vzqq35yhsh78lhw7"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
-  affyPara = derive2 { name="affyPara"; version="1.32.0"; sha256="183npqbc6zr8rwkfrsk78s8vha8fcmahwzn4fh39chf010kkxjvy"; depends=[affy affyio aplpack snow vsn]; };
-  affyQCReport = derive2 { name="affyQCReport"; version="1.50.0"; sha256="12yk6qdwj1840kys8j8iipsbyrgqkv826arqsvvb0kk9h0bqw3b8"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
-  affycomp = derive2 { name="affycomp"; version="1.48.0"; sha256="0w1095afp97c2qi2rrlp64yhxh0qrlnrgd6d3q1v608lv9nwknxs"; depends=[Biobase]; };
-  affycoretools = derive2 { name="affycoretools"; version="1.44.3"; sha256="11cvxkir715kj3z9qsshss6zpxshynzw19nk9dpvvw7g76wvljfn"; depends=[affy AnnotationDbi Biobase edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools S4Vectors xtable]; };
-  affyio = derive2 { name="affyio"; version="1.42.0"; sha256="0rx7vf9fpl4jpnvdcvwh250nnpzxarrrl87dp0pwasmghzdyl9vw"; depends=[zlibbioc]; };
-  affylmGUI = derive2 { name="affylmGUI"; version="1.46.0"; sha256="1xspid2m74cyivhmhx4jlpli9pixvx0jfs5r05w4k9mj7jjxaivv"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  affypdnn = derive2 { name="affypdnn"; version="1.46.0"; sha256="1yvr21w5s7kxl8rcp052f440l2czbwchmyi3hcpiqjvxc6fjmb9q"; depends=[affy]; };
-  agilp = derive2 { name="agilp"; version="3.4.0"; sha256="18gd0wj3gz0fbasrfi8jx1r6m0nl7q83p9dcp2jqbkgrqk6r3ki5"; depends=[]; };
-  alsace = derive2 { name="alsace"; version="1.8.0"; sha256="054pbjii52325xf3ar1ma8afnmxzwirgygj2xl5y2ngq09lyd9m6"; depends=[ALS ptw]; };
-  altcdfenvs = derive2 { name="altcdfenvs"; version="2.34.0"; sha256="009cqk05bld0h0p8wmz8103irs1gbgyrpsnq5nsglywk1i5hqq4a"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; };
-  ampliQueso = derive2 { name="ampliQueso"; version="1.10.0"; sha256="1kliy097yycls88cd3qxdg8vjwbb8v8iv9kp12kdq2ws5rc1gcvn"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
-  annaffy = derive2 { name="annaffy"; version="1.44.0"; sha256="11dfl5mfzghyc8rc3dnclmwnn4kbrgmzizbqgj5dvy5x70s79hi8"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
-  annmap = derive2 { name="annmap"; version="1.14.0"; sha256="01s00vg5p0kcpdsh4mib9xiv6y2fygqxi6n7bm6q94vrwaipjwmd"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-  annotate = derive2 { name="annotate"; version="1.50.1"; sha256="0anjh1b3vckgcfdxdd7jdhzsdivjlgx381i97iz59691kmvf8pqk"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
-  annotationTools = derive2 { name="annotationTools"; version="1.46.0"; sha256="1ywpxlb3faikjqvaksr4xx1b48daa6yf6vmhs20llp9rrpwnl51p"; depends=[Biobase]; };
-  anota = derive2 { name="anota"; version="1.20.0"; sha256="0kzf4lkgb54w8dy5xkadgnf9j4s47xnc53s3xn824k6sdg0l6grh"; depends=[multtest qvalue]; };
-  antiProfiles = derive2 { name="antiProfiles"; version="1.12.0"; sha256="1y2sw41rv92wyq4dsqy45r0yqbmvp0dyh2jq8prqaniiiwhxh1b4"; depends=[locfit matrixStats]; };
-  apComplex = derive2 { name="apComplex"; version="2.38.0"; sha256="0virfxj7x7nzs1xhh9cia3c951mlcgj918sfzy9w75p6cpciaww8"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
-  aroma_light = derive2 { name="aroma.light"; version="3.2.0"; sha256="0yjmmxh8gl5nr5w3913xvk9nxmxd8qidjmzkdxwf756g01a6gr4m"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
-  arrayMvout = derive2 { name="arrayMvout"; version="1.30.0"; sha256="12ws1bc7jwnys7dj43bd2iib7gdak9i3sirsnkldcyk6ndd18wi1"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
-  arrayQuality = derive2 { name="arrayQuality"; version="1.50.0"; sha256="0jv03ywh3hngykll9zbywlsdq0wl7629qlm285z3as6kjzv04dkk"; depends=[gridBase hexbin limma marray RColorBrewer]; };
-  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.28.2"; sha256="08jm8wxrnxik6s9lnchq5crglzxscrnh1a06nbfdaj3h9nxwcb01"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
-  attract = derive2 { name="attract"; version="1.24.0"; sha256="0d7bcdmk9dgx2yqsvvmq39l63lajx4nvx4km1b3nnqiwqph3cmlr"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; };
-  bacon = derive2 { name="bacon"; version="1.0.5"; sha256="1cnjlgjivxgswfqvk9yk8b4pi89sr8mxaci486mybpbjvzrjzsc8"; depends=[BiocParallel ellipse ggplot2]; };
-  ballgown = derive2 { name="ballgown"; version="2.4.3"; sha256="09nd5792cfi5zbqi58a8ggl4nff6n87jyix0fwn3xgf91qzcrgmr"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
-  bamsignals = derive2 { name="bamsignals"; version="1.4.3"; sha256="1xqiqvg52p6fcvhr4146djbz79r3j1kmh75mq7rndwglmiybpwmy"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
-  baySeq = derive2 { name="baySeq"; version="2.6.0"; sha256="1c2la9fw65mz4ns07h9n97di1rvzw8q8ga84x4x14y4hcm1zcr5a"; depends=[abind GenomicRanges perm]; };
-  beadarray = derive2 { name="beadarray"; version="2.22.2"; sha256="03dzp6fpwwc3znf6by1c1s279ry41c8rlszclixzkmhm1q7vxf43"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
-  beadarraySNP = derive2 { name="beadarraySNP"; version="1.38.0"; sha256="0wy6zva0z93i4hgcms8fvsbrhk9kzrapsiha72rsirgsd94zxsrw"; depends=[Biobase quantsmooth]; };
-  betr = derive2 { name="betr"; version="1.28.0"; sha256="147i92ki54l0m26i6da1mp4cx7d3g3dd3sp9dk2lz0j46wd3476n"; depends=[Biobase limma mvtnorm]; };
-  bgafun = derive2 { name="bgafun"; version="1.34.0"; sha256="0z8p6zl2080kkr48q86kqh2bhs3fiq6zzzjj8vgv7mqjwgwf8w06"; depends=[ade4 made4 seqinr]; };
-  bgx = derive2 { name="bgx"; version="1.38.0"; sha256="17dmjh35hr4jbxqwvw5r5w99m27ck8zyfdysd86cc679fc1d6ird"; depends=[affy Biobase gcrma]; };
-  bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.18.1"; sha256="0qv3l5yvg530a3mqdgnp01z3idkxr8qlnd30qplr8wr33gxvqa9f"; depends=[bigmemory]; };
-  bioDist = derive2 { name="bioDist"; version="1.44.0"; sha256="1z1pgyrz1fswvsjravamx1w756w7y1ld4v8ijbhms8n39397jzza"; depends=[Biobase KernSmooth]; };
-  bioassayR = derive2 { name="bioassayR"; version="1.10.15"; sha256="01gr7k0irkblhivnz4vj2y6pxwkhz2ccw9y4wcw4cf6j0yp6aq9x"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
-  biobroom = derive2 { name="biobroom"; version="1.4.2"; sha256="1i5y32sb8zm23nkxx05b05wcqr1zgg2mh2rfdif3a27ax6r6vkiy"; depends=[Biobase broom dplyr tidyr]; };
-  biocGraph = derive2 { name="biocGraph"; version="1.34.0"; sha256="0x1ka2b6gwzncb3s8k4dz8wnwfwiwzcmfzp0xrh94mrmwhda618p"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
-  biocViews = derive2 { name="biocViews"; version="1.40.1"; sha256="1d1g06zwx3xhc07mdhs5x31730xw08fg3x73xyfj0qdy2ykww3f9"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; };
-  biomaRt = derive2 { name="biomaRt"; version="2.28.0"; sha256="1g0w6an9hkflgyhvq6pmrs92s93qarv23v636b9a4bz771wjvm5v"; depends=[AnnotationDbi RCurl XML]; };
-  biomformat = derive2 { name="biomformat"; version="1.0.2"; sha256="1shbf6gscvj6n52azvx6phcql3p462bk68cr9gr44lshq3y3g49d"; depends=[jsonlite Matrix plyr rhdf5]; };
-  biomvRCNS = derive2 { name="biomvRCNS"; version="1.12.0"; sha256="1yr8bhqmkmvmw26fv53xkam05z17b0chwziv8b793f8zlkq34hw7"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
-  biosigner = derive2 { name="biosigner"; version="1.0.8"; sha256="16v3kvd4zgsws59cz67642dnyzk9a8fjdb5g2mssh6znk9v6ig4a"; depends=[e1071 randomForest ropls]; };
-  biosvd = derive2 { name="biosvd"; version="2.8.0"; sha256="11wzvy6x5zvqxl1g3z7xbsmn94ygy7fiazaq97fg88xqcc910kmv"; depends=[Biobase BiocGenerics NMF]; };
-  biovizBase = derive2 { name="biovizBase"; version="1.20.0"; sha256="1plrwh1rqm6830xzmws9fna6azyalfnvn6r55bxifnhxy2zi1dpv"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  birta = derive2 { name="birta"; version="1.16.0"; sha256="0nrvdpfjra9ndqk2v07pl8srizg5nfigk3l25d28wzz81ngvcdfq"; depends=[Biobase limma MASS]; };
-  birte = derive2 { name="birte"; version="1.8.1"; sha256="1d9hvwc7fcdbk4c93qgmgcrs5fpjjl4f469z8sk60ryrc8v58i9f"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
-  blima = derive2 { name="blima"; version="1.6.0"; sha256="1hirr1g1q6bn6l877m9zz9vl8vnpdv8ziacp8d2if98anh8xmp4q"; depends=[beadarray Biobase BiocGenerics]; };
-  bridge = derive2 { name="bridge"; version="1.36.0"; sha256="027098brim9m6dwf5m5ksjidy4g5q4s7hq92spqvnmjpcfrc9bzx"; depends=[rama]; };
-  bsseq = derive2 { name="bsseq"; version="1.8.2"; sha256="0pv4fsw0mjcyq3171d507bwv8aqwzsqdy0v2ghlkx5z94qxsk67g"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; };
-  bumphunter = derive2 { name="bumphunter"; version="1.12.0"; sha256="02apjhvwqizlwmcw6qzaqj9p73j5qvnnf7bxzmgqy76m0723k2qi"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
-  caOmicsV = derive2 { name="caOmicsV"; version="1.2.0"; sha256="1a90karz4m13lpsys9zlif6y95xxh4b5g8l6db2v0hfcfrz5msk5"; depends=[bc3net igraph]; };
-  canceR = derive2 { name="canceR"; version="1.4.0"; sha256="1fk8mv5jx22y36m7bb8avf51dgpzyhx5j1kk1vglcyym9g4d39cw"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
-  cancerclass = derive2 { name="cancerclass"; version="1.16.0"; sha256="0j3apzzkh744hha3nzsg0inhgr24dp9l217vgzjyrxq2x6rq9fra"; depends=[binom Biobase]; };
-  casper = derive2 { name="casper"; version="2.6.0"; sha256="071x3182mjwd56dchz6mndzc3gpibxbvh30k957qdmmfc6bpadi0"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
-  categoryCompare = derive2 { name="categoryCompare"; version="1.16.2"; sha256="0l4zaw9f3h0innxpxphv46f7blk0aa1xfy6r7rya2rqb89rnf3vk"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
-  ccrepe = derive2 { name="ccrepe"; version="1.8.2"; sha256="0qh1a5j4i1x4w6d7nvv4fb4prhyfhb54knav3849c6flkx4px2pn"; depends=[infotheo]; };
-  cellGrowth = derive2 { name="cellGrowth"; version="1.16.0"; sha256="00qijblp5ycjhl6vrvdjfzx87k95p84mxglk1gpnrsqxkvaf61dx"; depends=[lattice locfit]; };
-  cellHTS = derive2 { name="cellHTS"; version="1.42.0"; sha256="0ghls72gnsgqc28km5a1i37y0hg2774b09ws20l6jfgj215lsfas"; depends=[Biobase genefilter prada RColorBrewer]; };
-  cellHTS2 = derive2 { name="cellHTS2"; version="2.36.0"; sha256="0f6406a1r5gqh25kq6fl9hws5bxjcmg8dz93hf24iqfkri8qzzw8"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
-  cellTree = derive2 { name="cellTree"; version="1.2.2"; sha256="0wzdbyg8yj602mndpmwaqfhyql424w0fgnphyv4v2qr52wwzpz12"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
-  cellity = derive2 { name="cellity"; version="1.0.2"; sha256="0qg1g8k6wfamsazj13nlrra3zydj5r2yn42zkzniwyrc40fvlm86"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
-  cghMCR = derive2 { name="cghMCR"; version="1.30.0"; sha256="1g66pc61nj628dip1rysc0mdq6yjhiznv6p8nfw5lmm1kbg3jzn1"; depends=[BiocGenerics CNTools DNAcopy limma]; };
-  charm = derive2 { name="charm"; version="2.18.0"; sha256="1lram97r7bqbmi6qxwdjsi4m6vvqry84f2l2afzl1f6v7yjzs1fj"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
-  chimera = derive2 { name="chimera"; version="1.14.0"; sha256="01j46sycs492j550n6z38nj23s6v0b0mrffpyc2hv95g6nf5vmx7"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  chipenrich = derive2 { name="chipenrich"; version="1.10.0"; sha256="0nx5mmdxjra1vkdssn3dwf6jafdqvjbc53vcqfva0ns4jyyzx89l"; depends=[chipenrich_data GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; };
-  chipseq = derive2 { name="chipseq"; version="1.22.0"; sha256="0b42aikjq4wk83v314yrq1jjmz0vszk9z00xw069h84shz4zrnng"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
-  chopsticks = derive2 { name="chopsticks"; version="1.36.0"; sha256="01r6w9y7gw0zja2vpr5g4mp4400njixc0mrlmy010brdfjx6zgg1"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="1.16.0"; sha256="1h0nfn74agdhwcr1w1xj0iid3y0g0mkf22b3zajxyr9yjpjws7z8"; depends=[Biobase changepoint cluster DPpackage ICSNP IRanges MASS]; };
-  chromDraw = derive2 { name="chromDraw"; version="2.2.0"; sha256="16p54kd35ghdx67pnlcm6v9paic0iwl5sz4343v8rhf8yf9dxyih"; depends=[GenomicRanges Rcpp]; };
-  chromPlot = derive2 { name="chromPlot"; version="1.0.0"; sha256="1qwnqmihapc0xiii8ihpw9xralwaac2jn1k62rd1a83w6b3l76f7"; depends=[biomaRt GenomicRanges]; };
-  cisPath = derive2 { name="cisPath"; version="1.12.0"; sha256="1a3kjahscpdpgv07d3sjag29szyjnrn2fmgv534ljasjqdk7ay5k"; depends=[]; };
-  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.10.2"; sha256="1p2c2a7snnz25msmzxa30aijpha8mivpw6rmbqcqhv78xv5a51qq"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
-  cleaver = derive2 { name="cleaver"; version="1.10.2"; sha256="08v4a6rc5yx3vqjdjdzxsxh6m4dnj52ybnchhhx0qq3y8ma4djd3"; depends=[Biostrings IRanges S4Vectors]; };
-  clippda = derive2 { name="clippda"; version="1.22.0"; sha256="19in9vc3w35v1ixwc2i7n1nm8zc7i79hhig2n224zjrl15j0bd9a"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
-  clipper = derive2 { name="clipper"; version="1.12.0"; sha256="0f8zx4s7linhwflnz57qhgx16zkxlgd8mlsck4py5zvs9zz7ph6c"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
-  clonotypeR = derive2 { name="clonotypeR"; version="1.10.2"; sha256="1l4dmbszg4qkw4ksj1lcfrfi5j8fvk51qsc1l7bhvcvzwvbp9p6b"; depends=[]; };
-  clst = derive2 { name="clst"; version="1.20.0"; sha256="04wq05qyrxbd138y7npfmnr7d8pngldcm77ksf5ckn92n6gc46nk"; depends=[lattice ROC]; };
-  clstutils = derive2 { name="clstutils"; version="1.20.0"; sha256="0fz7mcf7csfmw9r18anliwkh77nv6bhkq6ah6cx1a5nvn05pq4l9"; depends=[ape clst lattice rjson RSQLite]; };
-  clustComp = derive2 { name="clustComp"; version="1.0.0"; sha256="0k0l8s50hnpsfsfalfcvjfg38dv9pyi12g8m17nqrrvkldld7p9y"; depends=[sm]; };
-  clusterProfiler = derive2 { name="clusterProfiler"; version="3.0.5"; sha256="1sm8dcyps81phf2jz7xc27wg3i43nr32883r2pb4s7syqsl4kvn0"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim GSEABase IRanges magrittr plyr qvalue S4Vectors tidyr topGO]; };
-  clusterStab = derive2 { name="clusterStab"; version="1.44.0"; sha256="039xnvsji3aqvxkj4zq02lv5nk0hkgkhhvk7x9bqhgc1jlafgbrf"; depends=[Biobase]; };
-  cn_farms = derive2 { name="cn.farms"; version="1.20.0"; sha256="1f55s7x8g7jyljgcdxvcfgy65h5dm7fmgwxb1qdh557sifalvy0v"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-  cn_mops = derive2 { name="cn.mops"; version="1.18.0"; sha256="08mhnn6vgbcfb1y84s2f7mk96z5fhafrb72cacfc8ija4l0a86ki"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
-  cnvGSA = derive2 { name="cnvGSA"; version="1.16.0"; sha256="1ggm0gk6vjx7161xc8pcy7d9z1z4mngxbhjmmnj9w7qd2225yblk"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
-  coGPS = derive2 { name="coGPS"; version="1.16.0"; sha256="1y5c43s6ivmin43rahvywm0jqyflw3klzj56b5f5yvbcn13m463w"; depends=[]; };
-  coMET = derive2 { name="coMET"; version="1.4.4"; sha256="0cawkc12cj2039p7d416jalz0n6p311lir2f5cdly79n2phi1wyx"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
-  coRNAi = derive2 { name="coRNAi"; version="1.22.0"; sha256="1ib66fljgiqykjs0i9yrqsa979ibz7nllh3f3gybzrs86k8i5p6h"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
-  cobindR = derive2 { name="cobindR"; version="1.10.0"; sha256="16b085jxfc2ph69m8rd7523mkvribbykzv05g54jakqcgz613g6f"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-  codelink = derive2 { name="codelink"; version="1.40.2"; sha256="16a2qshsc7515a35cah6snifv30rbb3gzb034amz1g3a2h24z2bq"; depends=[annotate Biobase BiocGenerics limma]; };
-  cogena = derive2 { name="cogena"; version="1.6.2"; sha256="0xy31pr6ginsxzf2lwyd9mnraw690zj37xylm7xfi1w1kchg3nfh"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
-  compEpiTools = derive2 { name="compEpiTools"; version="1.6.4"; sha256="1v22hzp89409vfdi6v56cg4galfb8yr3sqpv9igjjvbbyvyil7p2"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
-  compcodeR = derive2 { name="compcodeR"; version="1.8.2"; sha256="0w39pnyygvgicdivmcb6p0691fbrmg628d54i1wan070ndxkqn2x"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
-  consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.0.2"; sha256="1lwzp5l463xg2q97mhf1cz1fgqyf0gwkzipnw1ars6832vpd579s"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; };
-  contiBAIT = derive2 { name="contiBAIT"; version="1.0.0"; sha256="1apjm3i4vlkwfgrrby58aimixqlmc56l24dc2vff8s8b568582w6"; depends=[BH BiocParallel clue cluster colorspace diagram DNAcopy exomeCopy GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
-  conumee = derive2 { name="conumee"; version="1.4.2"; sha256="0hk6chlakd2alghnzsfgzw9bw2js4byqd7lsk5kz3iwb3dds8k9b"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges minfi rtracklayer]; };
-  convert = derive2 { name="convert"; version="1.48.0"; sha256="1pr5nn3k8a85r1ssp6hvgayrq6hars82m9v6h5arbz93ksjj4ax3"; depends=[Biobase limma marray]; };
-  copa = derive2 { name="copa"; version="1.40.0"; sha256="0ly8af559z74v2lkhiviamb54b7jfpmmnqp9fxvv2c2vg56nnigx"; depends=[Biobase]; };
-  copynumber = derive2 { name="copynumber"; version="1.12.0"; sha256="1rrc8mbkh73fizp2jdqqiarxbwryf25lwcf05dwvyqbnaz8c94zl"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  cosmiq = derive2 { name="cosmiq"; version="1.6.0"; sha256="0057j6a4lsmjfvjk48x2axmg13f6qbf4pjzc2ijz98laljlakc18"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
-  cpvSNP = derive2 { name="cpvSNP"; version="1.4.0"; sha256="0hcamhbxrs5vpgw2rrm399s17ywnqqi4lx78aga2x8v9l9acga1z"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
-  cqn = derive2 { name="cqn"; version="1.18.0"; sha256="01rqvs400ldfcyayjbqd2jpp550v8xh4a4kvic4b82dn3cxb301y"; depends=[mclust nor1mix preprocessCore quantreg]; };
-  crlmm = derive2 { name="crlmm"; version="1.30.0"; sha256="0z8b97v04gmcv2zs7pnk3bwccx28whzgkgl4d1gah1b9rjpdifaj"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-  csaw = derive2 { name="csaw"; version="1.6.1"; sha256="18qj9axgs94vkhxwx91lmpm8rssvwiidgbijzrzabss69y1m9g8y"; depends=[AnnotationDbi BiocGenerics edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
-  ctc = derive2 { name="ctc"; version="1.46.0"; sha256="0568b5b2f97jdsmhf6biixpjxd1wgh2imalcr94szynpsr5j2knz"; depends=[amap]; };
-  cummeRbund = derive2 { name="cummeRbund"; version="2.14.0"; sha256="1ni7ldzbj5sjk2124i7s2p840z4igcaak4kjb28yhv7c0c2nx362"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; };
-  customProDB = derive2 { name="customProDB"; version="1.12.0"; sha256="1nlyb71mrr7dd73n7gq5dvxp9yisqb8skfdabpn67wvx2kl0qq68"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; };
-  cycle = derive2 { name="cycle"; version="1.26.0"; sha256="0clsi3dm3dbmfd7g03gvfhc4zczfv6lfivrxgjbhs3wm79zgbl7l"; depends=[Biobase Mfuzz]; };
-  cytofkit = derive2 { name="cytofkit"; version="1.4.10"; sha256="1gdbc8k0rqrk83h90rshax6bilbb8wip9xa9bf42301a87lysnk3"; depends=[Biobase destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny vegan VGAM]; };
-  daMA = derive2 { name="daMA"; version="1.44.0"; sha256="1xx0ba5wjh1ma0fpshy50ajshfpv1w1zdmzrf21jdbq1zz8ciw87"; depends=[MASS]; };
-  dada2 = derive2 { name="dada2"; version="1.0.3"; sha256="12bb9vp2yxayzxicnxjs0cb5bria6h9w06qcfn4yhnp4641ql914"; depends=[Biostrings data_table ggplot2 Rcpp reshape2 ShortRead]; };
-  dagLogo = derive2 { name="dagLogo"; version="1.10.2"; sha256="018vdgbyfmsrxhkv9kf80yfsgdl3mqmvzfwcw5lanfyipwpl4jgm"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
-  dcGSA = derive2 { name="dcGSA"; version="1.0.1"; sha256="1nnh3xa7gg1ap24wf79clkm4vrlr9jbvq5f5crl7f5mmfmxpzp43"; depends=[BiocParallel Matrix]; };
-  ddCt = derive2 { name="ddCt"; version="1.28.0"; sha256="1k7r0w22as0226sq11kwfb5ihbim5i5bny2qvn7gx86fzyy0br43"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
-  ddgraph = derive2 { name="ddgraph"; version="1.16.0"; sha256="1yqkrzbkjn86mwjf5x5cq1gf8k20hnbhwppzkpspsdcyi68ldbf5"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
-  debrowser = derive2 { name="debrowser"; version="1.0.10"; sha256="1l3pc6xqsvhmjddv27pkndgf9dz529svyj4dkm166yq4vm6pcska"; depends=[annotate AnnotationDbi clusterProfiler DESeq2 DOSE DT edgeR GenomicRanges ggplot2 ggvis gplots igraph IRanges jsonlite org_Hs_eg_db org_Mm_eg_db RColorBrewer ReactomePA reshape2 S4Vectors shiny shinyjs stringi SummarizedExperiment]; };
-  deepSNV = derive2 { name="deepSNV"; version="1.18.1"; sha256="150aqdhzzydn2f3nr8zq6r7iwsr8l2jpaig5c8h7li9rhlzjma45"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
-  deltaGseg = derive2 { name="deltaGseg"; version="1.12.2"; sha256="0m071s1qs9xv0dxb8applj0dldv4aji9vlrflbszw82gp60wzpvf"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
-  derfinder = derive2 { name="derfinder"; version="1.6.4"; sha256="1iyabwad32g0p69651zph79zi0rvv7bpdrx66qkp7xqllddhxi8i"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-  derfinderHelper = derive2 { name="derfinderHelper"; version="1.6.3"; sha256="1d58n1xm1rpr65hg5p3y3abylhcp6ih5vnld8ny89492n0ssvf4n"; depends=[IRanges Matrix S4Vectors]; };
-  derfinderPlot = derive2 { name="derfinderPlot"; version="1.6.3"; sha256="1mdcd0cxarbjwq4qznlks9mpfz9x4w2cd04jfhfkywpf45fkc797"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; };
-  destiny = derive2 { name="destiny"; version="1.2.1"; sha256="0cwgdqx07bflrpan49ra2qcxc5dhv5xq733gb3blcam7pvjj7mfw"; depends=[Biobase BiocGenerics FNN Hmisc igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; };
-  dexus = derive2 { name="dexus"; version="1.12.1"; sha256="1ra6wxp3wvb9g5qpvh8bm0xb13yqjmnda60mq63hks6jdg2ippmp"; depends=[BiocGenerics]; };
-  diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.54.0"; sha256="0fbk3idxd9hzh9v8gk6dma7l4512k0682kcsfr72h8v0l587ayfr"; depends=[minpack_lm]; };
-  diffHic = derive2 { name="diffHic"; version="1.4.3"; sha256="1gvw6kslpadlyhslwngjfh81pgdgzn1h8dpxq32l29fpyrhiig9d"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
-  diffloop = derive2 { name="diffloop"; version="1.0.2"; sha256="0kgzvidpm6zxgh7rjrh4fvzvvkg4p3nm6pa9l57qnb1223r8ygwv"; depends=[Biobase biomaRt dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats plyr readr reshape2 S4Vectors statmod Sushi]; };
-  diggit = derive2 { name="diggit"; version="1.5.2"; sha256="1rpp472cx3pvhi2f1xr52hdxkd9s79w4wp1iy89plam86wrp0xh9"; depends=[Biobase ks viper]; };
-  dks = derive2 { name="dks"; version="1.18.0"; sha256="1nzpjph8n9s4kzyyffj6k1pbrvgzryagmr10l97dh2j2qsydz5kh"; depends=[cubature]; };
-  domainsignatures = derive2 { name="domainsignatures"; version="1.32.0"; sha256="1jv72qiq5hyajryf91f6mnvbqd4klwsb0viiw4ykid02cj14vwz1"; depends=[AnnotationDbi biomaRt KEGG_db prada]; };
-  doppelgangR = derive2 { name="doppelgangR"; version="1.0.2"; sha256="11g57fwhq7yzrzb5wdd07xxb75plrqdmdlar2qvn6kmbi2knn7dg"; depends=[Biobase BiocParallel digest impute mnormt sva]; };
-  dualKS = derive2 { name="dualKS"; version="1.32.0"; sha256="1f31qwds9xb0lymb1cdkspk4r65rm6y7v90zrxdd6j1vij42g6m9"; depends=[affy Biobase]; };
-  dupRadar = derive2 { name="dupRadar"; version="1.2.2"; sha256="1n07sr5g2hr7rgpcybcaksrihyxlgyghy5l6ldmxqdchzrz90shc"; depends=[Rsubread]; };
-  dyebias = derive2 { name="dyebias"; version="1.32.0"; sha256="0g3lslnbbqxfbbyg16is33gd4v55cvqx00bcj0ig8w3xk31lpfph"; depends=[Biobase marray]; };
-  easyRNASeq = derive2 { name="easyRNASeq"; version="2.8.2"; sha256="0bmwcx8gpr3a1fl4vz41s9k5rsi4l0jivsfxwvsw1kw87py00qvl"; 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.44.0"; sha256="16zsqrvbwl8ayh4x87ycnzv3iyqjixwd2rkc5xhk3ywd8khvdp0i"; depends=[Biobase]; };
-  edge = derive2 { name="edge"; version="2.4.2"; sha256="168qgzszvmv9rjk999a1csvv9k27bgpjl67m9qi46y14y0mnlgmk"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
-  edgeR = derive2 { name="edgeR"; version="3.14.0"; sha256="14vrygy7rz5ngaap4kgkvr3j18y5l6m742n79h68plk6iqgmsskn"; depends=[limma]; };
-  eiR = derive2 { name="eiR"; version="1.12.2"; sha256="00vzydf6nf6cql7qds5nxbw46cr5w4h02xiayi7ayg7nl54xdfa2"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
-  eisa = derive2 { name="eisa"; version="1.24.0"; sha256="0pn6ilkvnji974j9qjhvqgfh7427nxaqwjvd22mplsnr81mfrr6d"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
-  ensemblVEP = derive2 { name="ensemblVEP"; version="1.12.0"; sha256="1akhzdk9kczy34fczff1j420682rkbniwcjx1bqrml75jd87xz36"; depends=[BiocGenerics Biostrings GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
-  ensembldb = derive2 { name="ensembldb"; version="1.4.7"; sha256="1310n4ws68xw0ymac59w172jd61s547wl6zagzkk2zhk00bfwfma"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
-  epigenomix = derive2 { name="epigenomix"; version="1.12.0"; sha256="0rhhnh835ah5d9hsv64i6y9hqb9yqmd15f7g4xkc7hws84jw3alb"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
-  epivizr = derive2 { name="epivizr"; version="2.2.4"; sha256="0jvp08mfk05v2gmmxnbxbr825w2n75dc7jwvw88aymn0cc4bv5mf"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
-  epivizrData = derive2 { name="epivizrData"; version="1.0.3"; sha256="101jn7fabzk3jkn25vn5r3g4iyjjm9qq8gdqq8wk45m0b5gglf7p"; depends=[Biobase epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
-  epivizrServer = derive2 { name="epivizrServer"; version="1.0.3"; sha256="1zzixb6gz43l9wlj4g6givax9rykb26xjx0i1xfnlwbxfl62z3wm"; depends=[httpuv mime R6 rjson]; };
-  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.0.4"; sha256="0sd9vddihba3xwi2yjmzilklavggrwpavffbs9mhrjnh6hl62h73"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
-  erccdashboard = derive2 { name="erccdashboard"; version="1.6.0"; sha256="0f4q701yd8zghzxj6mj8ljd0h09q7f694mlm566p4867gc4iqs3c"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
-  erma = derive2 { name="erma"; version="0.4.2"; sha256="09fmys40b2vz8py69bblq7chxqwn34mcq460zqlxpj51f7d1zn1d"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
-  eudysbiome = derive2 { name="eudysbiome"; version="1.2.0"; sha256="1pcfbx120vyxvdw7hfaqmy1snc2ksvra59kz0qi0mjimvva69hd9"; depends=[Biostrings plyr R_utils Rsamtools]; };
-  exomeCopy = derive2 { name="exomeCopy"; version="1.18.0"; sha256="008dvhcha5jjawzvxknqzxgv3cp0v1nxv60ngjkqczzihac66pby"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
-  exomePeak = derive2 { name="exomePeak"; version="2.6.0"; sha256="1lwk5y3ma373mcr3l9cq9biq6qj7yc1lljmpa8qndwckgkg2dzl7"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
-  explorase = derive2 { name="explorase"; version="1.36.0"; sha256="1aa21qgx59g8iipys9rm57ll3smjwz49wi7l2s833svd5z53amkf"; depends=[limma rggobi RGtk2]; };
-  fCI = derive2 { name="fCI"; version="1.2.2"; sha256="1fhxhy6jkkly439l2sfz8mg4nknqgh167j6b413iikl2b7w9sg83"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
-  fabia = derive2 { name="fabia"; version="2.18.1"; sha256="1hm6zlcky156zb3wppmxhkrm8xjkl12kcn8hh2kc95k6hsajc6zb"; depends=[Biobase]; };
-  facopy = derive2 { name="facopy"; version="1.6.0"; sha256="0wgd05sg3h9h8v7y9kva0v6296928bbzbifdkfp2910fsjw8pvdl"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz S4Vectors scales]; };
-  factDesign = derive2 { name="factDesign"; version="1.48.0"; sha256="1cxyzxxz0cli21bqcsg2arcdqnimczql8d47skdwv449mxgcan9c"; depends=[Biobase]; };
-  farms = derive2 { name="farms"; version="1.24.0"; sha256="06swwfjbaq2xqbkrabv4jk4xxnxkmvjpx3a0rx0mi0j7fv8i5xs8"; depends=[affy Biobase MASS]; };
-  fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.8.0"; sha256="1d7y120sxh3dqfyhpc4bayplrfwvarfj31imrad3h8mpk6j7a3jg"; depends=[Hmisc LiquidAssociation WGCNA]; };
-  fastseg = derive2 { name="fastseg"; version="1.18.0"; sha256="1dnlws7wv9dl5adimzmzcmhg7zlc7xrfxvbzdf86hnh6ci0wvxji"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  fdrame = derive2 { name="fdrame"; version="1.44.0"; sha256="16dlcmn8ldh4irxbczr0pyljj98rgjz6xb084nz7gqg7w5mfdakl"; depends=[]; };
-  ffpe = derive2 { name="ffpe"; version="1.16.0"; sha256="1nhi0xbicw7iglizq3kxhywmlmyxaj30c588ccaf039v9p0rx165"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
-  flagme = derive2 { name="flagme"; version="1.28.0"; sha256="01andc84ls5r3pa0m63mxl3f203kf5i6z00hj4fs1c0999jyv14x"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
-  flipflop = derive2 { name="flipflop"; version="1.10.0"; sha256="1pm64f58m3i4vq95s6y4kan2cw5zc70xjh1z3h6343jqn9vfpnxv"; depends=[GenomicRanges IRanges Matrix]; };
-  flowAI = derive2 { name="flowAI"; version="1.2.9"; sha256="1gb3a8f4xsjwspyacdbi2h5kicsawh20dd22xnpg8nlviypqz912"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; };
-  flowBeads = derive2 { name="flowBeads"; version="1.10.0"; sha256="1vvggb937iabdn9y6z81sc5vshdyi9017ivz0mf5npi09gm02xb5"; depends=[Biobase flowCore knitr rrcov xtable]; };
-  flowBin = derive2 { name="flowBin"; version="1.8.0"; sha256="138h229ny5k9abclby79phlywyckgkqdkd02sdg16028amckmgq7"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
-  flowCHIC = derive2 { name="flowCHIC"; version="1.6.0"; sha256="1gy7cgyy1ifn989vgkik3b633li6ir3kznhb4wh21wqvrfy9d39n"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
-  flowCL = derive2 { name="flowCL"; version="1.10.0"; sha256="14z6pyjc5v5zi3l9qiz85yrbhaykyfw77vmvb4nzrvm6mdqm1z5r"; depends=[Rgraphviz SPARQL]; };
-  flowClean = derive2 { name="flowClean"; version="1.10.0"; sha256="1slf34rss2l1faj2kszgaiafaj0n0wddfgrnpylav62lfricyzih"; depends=[bit changepoint flowCore sfsmisc]; };
-  flowClust = derive2 { name="flowClust"; version="3.10.1"; sha256="0y5mylb09fnyk8a8bhr8g3xpzz3l8pcs7xi91gdxjqamkqi8v700"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-  flowCore = derive2 { name="flowCore"; version="1.38.2"; sha256="1pspsjmvc3lk06i0mrccdpmp0snpb79ng7dip4lc5rbbr9764ps3"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
-  flowCyBar = derive2 { name="flowCyBar"; version="1.8.0"; sha256="1vj97swrfqh3v50js0hk1agfnjzdawsc0pjrvcncs3avh9awag1r"; depends=[gplots vegan]; };
-  flowDensity = derive2 { name="flowDensity"; version="1.6.0"; sha256="1x9jfkv4s5l1pa4cjm5d96l1s9nvxjv8vxlkyax33h009cci4yzs"; depends=[car flowCore GEOmap gplots RFOC]; };
-  flowFP = derive2 { name="flowFP"; version="1.30.0"; sha256="1nqqm0zmv9rf46dflshmhcgwi15kg0f7szljxm4l4j4vg377hc0w"; depends=[Biobase BiocGenerics flowCore flowViz]; };
-  flowFit = derive2 { name="flowFit"; version="1.10.0"; sha256="0wfsg359zi7bi8wgf5zfwj3gjk5sghynsd9la5x1idsm2hfkqh7x"; depends=[flowCore flowViz gplots kza minpack_lm]; };
-  flowMap = derive2 { name="flowMap"; version="1.10.2"; sha256="11fkd89rcwmzfln375p9hgv1z79ipvvhha7krz6wvi0z63lv1131"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
-  flowMatch = derive2 { name="flowMatch"; version="1.8.0"; sha256="071fkhwfwwabbrb1vmwwdvg96lizyf67wvf6g080qac9jsqq2xid"; depends=[Biobase flowCore Rcpp]; };
-  flowMeans = derive2 { name="flowMeans"; version="1.32.0"; sha256="0z06479v8xihjyvb8y615yqkd5mkw2879z7qciwkyc32dy3kp6zs"; depends=[Biobase feature flowCore rrcov]; };
-  flowMerge = derive2 { name="flowMerge"; version="2.20.0"; sha256="1ibclh3wdz07rqzri61y01ijvrrj8bjmv3l9ddlzgzs6wk07r842"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
-  flowPeaks = derive2 { name="flowPeaks"; version="1.14.0"; sha256="0ypp5qhl4wxfsbz64d7zvkk606h7wniz4s01zswv61vhygjhr8p0"; depends=[]; };
-  flowPlots = derive2 { name="flowPlots"; version="1.20.0"; sha256="01gjkks9cvrjzacpynsv5i9ir4569b7q9yzfzk337xhz5r140brh"; depends=[]; };
-  flowQ = derive2 { name="flowQ"; version="1.32.0"; sha256="1bf5avnjn5vg2569pyvrrsq1jv6n0sslyxm9rav2mj321smy05lm"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
-  flowQB = derive2 { name="flowQB"; version="1.18.4"; sha256="15gk1nbn4yhjw7378d84y3lh4kr1p2bxdra1wfd8scz7nyd6q8kr"; depends=[extremevalues flowCore]; };
-  flowStats = derive2 { name="flowStats"; version="3.30.1"; sha256="0sblxshpkw9sx16p1ni9wg6hmhdv9q5i8ssccq41rhrgnyiahacc"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS]; };
-  flowTrans = derive2 { name="flowTrans"; version="1.24.0"; sha256="1ri3frs5z702scn88zrymhm8slwl4g1273yn14w065vay9gq2klr"; depends=[flowClust flowCore flowViz]; };
-  flowType = derive2 { name="flowType"; version="2.10.0"; sha256="0w0zgddk89bavjhjnkjv7bmqpg2q3d9fxadll4da2dsqzg4nwpy2"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
-  flowUtils = derive2 { name="flowUtils"; version="1.36.0"; sha256="1vd01iw2ki7yqq7g9islqy3z8ks6ciih7j2ja2gff31kvn95lyyc"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
-  flowVS = derive2 { name="flowVS"; version="1.4.2"; sha256="0d0xrsscnsxl3b2rm7rhvjm0rhca9x6hckxq5hvnmwdcnyswr2jr"; depends=[flowCore flowStats flowViz]; };
-  flowViz = derive2 { name="flowViz"; version="1.36.2"; sha256="1b1sp46lbkdsyx43g3qxx3ggvj8hy17bg71n6l8r6gh0i39fagqn"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.18.11"; sha256="0i16fq30lbrjq3nkd6lkkz9c9p2azprnsjw9bm0y01wkzjlhc9hz"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz scales stringr XML]; };
-  flowcatchR = derive2 { name="flowcatchR"; version="1.6.2"; sha256="0p1yb5gz2zyc6g9k3jxsbllvysj65srhnj1bsh57qmk7glkda7wl"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
-  fmcsR = derive2 { name="fmcsR"; version="1.14.2"; sha256="07c14iix1c31axskgxf8ffwyrryxpdmsq33nwfpv20951c3n9zc1"; depends=[BiocGenerics ChemmineR RUnit]; };
-  focalCall = derive2 { name="focalCall"; version="1.6.0"; sha256="16y4ry894ricj3jyq26y5kcyb90za2f7bpc8n9qxb5b69179dsdw"; depends=[CGHcall]; };
-  frma = derive2 { name="frma"; version="1.24.0"; sha256="0rglkly4b0n9hsw47hznymmzk1g6c64qk12bkhfj6hcp8hg4swss"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
-  frmaTools = derive2 { name="frmaTools"; version="1.24.0"; sha256="1wgybdhqvh1ip9qiqcgnsav0bdm9lspxgb611vh7nga4qlham2y5"; depends=[affy Biobase DBI preprocessCore]; };
-  gCMAP = derive2 { name="gCMAP"; version="1.16.0"; sha256="0914vnpzy5kmff9d09x5bdisy01r0j482hm0jy3d7v1c0ij57psl"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
-  gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.12.0"; sha256="1ba4ayc2ylyrijym48lyrmkn2az3x42n8q0cb7snwb9wc8c4pn5x"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
-  gQTLBase = derive2 { name="gQTLBase"; version="1.4.2"; sha256="1xhpxpjhnjzwwpmsm9v0jxqikl52fwaw6h8lyp6svzjwcxni863h"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  gQTLstats = derive2 { name="gQTLstats"; version="1.4.3"; sha256="0lbhmicn47zqblnanwd8j05lnmcgmxz21n7r3fr1vj3wigkl2p77"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggplot2 gQTLBase IRanges limma mgcv reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
-  gaga = derive2 { name="gaga"; version="2.18.0"; sha256="0pp0k2gqb5ysxxgfw4551lc87rd5b5n4fxkp0c59hdiwqr2gm9jv"; depends=[Biobase coda EBarrays mgcv]; };
-  gage = derive2 { name="gage"; version="2.22.0"; sha256="1hcl0ipripvkz8i9bk6vlb0qhx7mq487vay7668h4byjdxw33axq"; depends=[AnnotationDbi graph KEGGREST]; };
-  gaggle = derive2 { name="gaggle"; version="1.40.0"; sha256="0xs2rblfh4wa05jdb6fjf8mgqhfwgjzbrf8gq9nsh8lgv4a8azz0"; depends=[graph rJava RUnit]; };
-  gaia = derive2 { name="gaia"; version="2.16.0"; sha256="14fnwf7rizc8vp7mjbnw16ar5l21kkgggxn1rrmwpsjd321rzyc3"; depends=[]; };
-  garfield = derive2 { name="garfield"; version="1.0.2"; sha256="00xpv7aqx0bh9azmpkxlpwjn0kp0wijpac9ssz9ic9chs2p9b4ga"; depends=[]; };
-  gaucho = derive2 { name="gaucho"; version="1.8.2"; sha256="0w09hd7r1y41yv3fyarzrkqw3gzzqk6qplbqrdd74hz7iq4rxcqg"; depends=[GA graph heatmap_plus png Rgraphviz]; };
-  gcatest = derive2 { name="gcatest"; version="1.2.2"; sha256="04il1idfisf99d7v50gpk5dscn9vs787mxw4h3ga9f5a73ii1hn9"; depends=[lfa]; };
-  gcrma = derive2 { name="gcrma"; version="2.44.0"; sha256="0zvv9wqv5cxs203cfnxgvlf7xmdkcm66jx4jjdamjvvlnlbgbvd4"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-  gdsfmt = derive2 { name="gdsfmt"; version="1.8.3"; sha256="1cvg87fzgd1fzdphxkl5vh0frbjwrghf2i4hrwgh9h9pszkjpirc"; depends=[]; };
-  geNetClassifier = derive2 { name="geNetClassifier"; version="1.12.0"; sha256="0i5pbcsz1y9z75yvc7fdk7820y1hmbr28jfmvm382c43namcki55"; depends=[Biobase e1071 EBarrays minet]; };
-  geecc = derive2 { name="geecc"; version="1.6.0"; sha256="11a3dlgzaagb6iyx8pa38kxv50wvb1s96m36w0azcg1z3z77h6yy"; depends=[gplots hypergea MASS]; };
-  genArise = derive2 { name="genArise"; version="1.48.0"; sha256="0zyxnx2xx5ywz3cgbmkh7ay0fwgmgn320knbs8mz8bniilc2mm0b"; depends=[locfit tkrplot xtable]; };
-  genbankr = derive2 { name="genbankr"; version="1.0.4"; sha256="0x6m9qa61cka549gd0fvywc63rkj2afxhgyfjmyfg4x9dxdxc670"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
-  geneRecommender = derive2 { name="geneRecommender"; version="1.44.0"; sha256="0hij3vx023z9wc905hhq845wya4ivapnpf5cp57vvcssxxks91nl"; depends=[Biobase]; };
-  geneRxCluster = derive2 { name="geneRxCluster"; version="1.8.0"; sha256="1nrq2sfazs0zpnlh70lsnalvgqb3z8sqr3fryxqdb4vp26alddbk"; depends=[GenomicRanges IRanges]; };
-  genefilter = derive2 { name="genefilter"; version="1.54.2"; sha256="1hmz6as0njvrsrdbgmk72jyclnnqvfdvp6kqv456h43ldq2ajfv5"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
-  genefu = derive2 { name="genefu"; version="2.4.2"; sha256="09priw4chfy853dadylfk8h2jjwajccq4kcyjxdfycd8np02f6sq"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
-  geneplotter = derive2 { name="geneplotter"; version="1.50.0"; sha256="0lvrywl0251g4y0h0qlgkbg4l83ja5544c85z1wj30qxiy77iqc2"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
-  genoCN = derive2 { name="genoCN"; version="1.24.0"; sha256="1wd21qd153lnq8z69mia84ij8v9323is81njxivh4lqcrr2m0lgr"; depends=[]; };
-  genomation = derive2 { name="genomation"; version="1.4.2"; sha256="017hxh3yhizlsswd2vw8504arkckrcgq5zraiw67lldq9wzs5qzg"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer S4Vectors seqPattern]; };
-  genomeIntervals = derive2 { name="genomeIntervals"; version="1.28.0"; sha256="0ic0h1jd1qddqg90j7i55cyjc28jqc1s1qvbjdv0xi2zfl0yfi5g"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
-  genomes = derive2 { name="genomes"; version="3.2.0"; sha256="16gyr1wb822hw92cf00njkgls1i718n67zprpc9q364b9js1095g"; depends=[curl readr]; };
-  genoset = derive2 { name="genoset"; version="1.28.2"; sha256="1zrng0c0yws8hlhz09gm68dlc6xk5kmjz3xxqhfg5dr56sdryg1y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  genotypeeval = derive2 { name="genotypeeval"; version="1.2.2"; sha256="1asmy822hb6i02jgbx005zb7p02zladhp5zvbgi3apxy9h17fwlw"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
-  genphen = derive2 { name="genphen"; version="1.0.0"; sha256="1030gg9cqmzz4iwssv9y0ai42ar356w6y61aj96p3901jbq78v0v"; depends=[Biostrings e1071 effsize ggplot2 randomForest]; };
-  gespeR = derive2 { name="gespeR"; version="1.4.2"; sha256="1npbfm20cbq9raq9d26biy65c1ag705k1s068yc9z6j51w4a9h8m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
-  ggbio = derive2 { name="ggbio"; version="1.20.2"; sha256="167ppjb4kkxhgxmlzfcgwa7ggm6mkfg2b0z2q1iav0kc9sdy1zz4"; depends=[AnnotationDbi 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.0.6"; sha256="1xpavy6dcgq5zwlyi7wb0ldavqdh74bkg2plpbp7lmmn496w26n6"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
-  ggtree = derive2 { name="ggtree"; version="1.4.20"; sha256="15fnkbq9jcw5n54z5vm5dj9giaxm0a8w3017gkd3klyywlcpk7mp"; depends=[ape ggplot2 jsonlite magrittr tidyr]; };
-  girafe = derive2 { name="girafe"; version="1.24.0"; sha256="0qr0mv1biv6xs86sc3kv97p19kc12hvxa96mhbpw4qabbmaaadh8"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-  globalSeq = derive2 { name="globalSeq"; version="1.0.2"; sha256="1hbi19i0jyg3axjgmvakdckk5hdbm6p3hxxnqh2xgnf7qwkj74v3"; depends=[]; };
-  globaltest = derive2 { name="globaltest"; version="5.26.0"; sha256="0myg87l3aqrk03qiibzya8fx12xn7w3myizhhvbd84v86xgjl8dp"; depends=[annotate AnnotationDbi Biobase survival]; };
-  gmapR = derive2 { name="gmapR"; version="1.14.0"; sha256="034z2z2gav7nny0c9npn9h71hlq15ag866fbab7ii8rqvapy6vh0"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  goProfiles = derive2 { name="goProfiles"; version="1.34.0"; sha256="0m2cki0mrf874nhj390zb7i41v6a9lrr22sx2x6yq22qs6067p32"; depends=[AnnotationDbi Biobase GO_db]; };
-  goTools = derive2 { name="goTools"; version="1.46.0"; sha256="15n35kp826lgp0bl91p1zxy65a7vx8ln895vqp31ss06hqlgrksf"; depends=[AnnotationDbi GO_db]; };
-  goseq = derive2 { name="goseq"; version="1.24.0"; sha256="05zm23bj1i9al9bsg870pyk1r663vsv08sz9wn5dmriwv9rq2i4b"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
-  gpls = derive2 { name="gpls"; version="1.44.0"; sha256="07v0k6bsf35rkj7irsz7rwfba3fnnszy2kx6n0qzphlcgwda94hx"; depends=[]; };
-  gprege = derive2 { name="gprege"; version="1.16.0"; sha256="103z7bsjqwc4d4mimaavrd46v8l0pchrahhgqkkpyjxq6ibk7krw"; depends=[gptk]; };
-  graph = derive2 { name="graph"; version="1.50.0"; sha256="0ys5s19m5r30rlr0fnx2h0z2qw7n2xrad4l2yfb1bbrk8dwyf4pi"; depends=[BiocGenerics]; };
-  graphite = derive2 { name="graphite"; version="1.18.1"; sha256="0s9si7jz044nv80r0zyy4kvc0sjd8mckhnhn05bb16ym5650qg2r"; depends=[AnnotationDbi BiocGenerics graph rappdirs]; };
-  groHMM = derive2 { name="groHMM"; version="1.6.0"; sha256="1l9mcyzyc548114ysb9r0q7hgzw3yy7gpiahrzkzj6hblc4f1jyp"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
-  gtrellis = derive2 { name="gtrellis"; version="1.4.2"; sha256="133wlm7807rz9wa37prjrwginwlljbyvf5j7zlslzihpfj3b1q2n"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
-  gwascat = derive2 { name="gwascat"; version="2.4.2"; sha256="1q6wfp234c2ja2k3r2m21mfgwz3dwy2ayml9vxbdhgsi496ixray"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
-  h5vc = derive2 { name="h5vc"; version="2.6.3"; sha256="0x4frfkx6l30ns686ybqqhqvxn3x8gwm5m9zbcvnk8yd864jxfwh"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
-  hapFabia = derive2 { name="hapFabia"; version="1.14.1"; sha256="1fmlw49ab6b5ry7qsh9riismki8slh4kym4agpkfbdj4qjhicdwq"; depends=[Biobase fabia]; };
-  hiAnnotator = derive2 { name="hiAnnotator"; version="1.6.2"; sha256="1p6w035pm6ikkf8nv1lah0055rblmj8313bjwxkqm8m5g51imz7b"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
-  hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.8.2"; sha256="18iq1f6hvxi3n7bm25np8daa5bvmyayhq47w2qf1nbbl7j8vyi4z"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator rSFFreader sonicLength xlsx]; };
-  hierGWAS = derive2 { name="hierGWAS"; version="1.2.0"; sha256="0gnc9cnwy9ji8r7jiy2irsikb06v044cmhpjfgphsqchaf53h4sv"; depends=[fastcluster fmsb glmnet]; };
-  hopach = derive2 { name="hopach"; version="2.32.0"; sha256="15x6mrk9f0vjbddafzr8g5p3j1a7z5ws2a361nj83djnx4z7mnh8"; depends=[Biobase BiocGenerics cluster]; };
-  hpar = derive2 { name="hpar"; version="1.14.2"; sha256="0rmnwrkblljlpa1d19sxjwqw6hcqx6aajl2vv8g9qlcwklp0igl8"; depends=[]; };
-  htSeqTools = derive2 { name="htSeqTools"; version="1.18.0"; sha256="0n05bsqxmji335nkfg7a38i91k8nf7mf1vkhi8mg6mags7sqysl2"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; };
-  hyperdraw = derive2 { name="hyperdraw"; version="1.24.0"; sha256="1bng0b48blj3mmga799j2103lwdnrh1shbp0jjczzyrhh8l30xby"; depends=[graph hypergraph Rgraphviz]; };
-  hypergraph = derive2 { name="hypergraph"; version="1.44.0"; sha256="10vyxw05a6asyvphzxdv10fl437nqwxcy8z2maqijxhhkrq91mz9"; depends=[graph]; };
-  iASeq = derive2 { name="iASeq"; version="1.16.0"; sha256="0ggcpygyf4x39ky1y0p7f67i0knnhrmpab20gcf5cs5239l1k369"; depends=[]; };
-  iBBiG = derive2 { name="iBBiG"; version="1.16.0"; sha256="1776i6jsgfhwmbzflx487l7aav5a9xa5v3md6wzwkalmq4vz1h0s"; depends=[ade4 biclust xtable]; };
-  iBMQ = derive2 { name="iBMQ"; version="1.12.0"; sha256="14rmnzzq5ix2in0hhz36nzixvm51jgsrhrzp28767vfrw3d59dqn"; depends=[Biobase ggplot2]; };
-  iCARE = derive2 { name="iCARE"; version="1.0.0"; sha256="035i02mi92kqsrn1n81j7bqxzf1czra4fdrfya0ihjyvjl363hsx"; depends=[]; };
-  iCOBRA = derive2 { name="iCOBRA"; version="1.0.2"; sha256="16f7vdlwnnlk73lwi3y5yvcb5ww9qkc6ynyyafi73a4mj4vyiw0x"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; };
-  iCheck = derive2 { name="iCheck"; version="1.2.0"; sha256="16rr1l1s0kbhk8xhbr4cac0xb7sd9p92y9dm8hyi5hd65w3yryzc"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d vsn]; };
-  iChip = derive2 { name="iChip"; version="1.26.0"; sha256="1271033d2rfj4ib50955rk3bspj78h1aslmf8pkfbmb2y1pm1jz9"; depends=[limma]; };
-  iClusterPlus = derive2 { name="iClusterPlus"; version="1.8.0"; sha256="1ryalbvf24pd2lk3brxy6zb616n5sfqn484lxgsl04mb8k4qppzd"; depends=[]; };
-  iGC = derive2 { name="iGC"; version="1.2.2"; sha256="0p8nhybxn82c82i6z7hy4ddlnkrw5r3zsal67wkvbxw40h0ljpmx"; depends=[data_table plyr]; };
-  iPAC = derive2 { name="iPAC"; version="1.16.0"; sha256="0qh1fikcqkl2hxqfkgxy16nlzqnqkkpz93b81kbpj1bgb4y3amnm"; depends=[Biostrings gdata multtest scatterplot3d]; };
-  iSeq = derive2 { name="iSeq"; version="1.24.0"; sha256="0sbnnr0mcnidvk3bb303a3i4n5f5lf3c2p3rnaj1m96msfjfhfmw"; depends=[]; };
-  ibh = derive2 { name="ibh"; version="1.20.0"; sha256="1fx1bb14z0is1zbarxy3bd7ynrlxf97z2501k2ajq5c5ijm05kkr"; depends=[simpIntLists]; };
-  idiogram = derive2 { name="idiogram"; version="1.48.0"; sha256="0p0ji1yqp8ygzm8bqdq5zw73rw1n5c9y104k2bnf90vp9q8428kr"; depends=[annotate Biobase plotrix]; };
-  illuminaio = derive2 { name="illuminaio"; version="0.14.0"; sha256="0vywygdg57msqm1a9m5ld40rf06fir686gc0h5ygs9gcs2rm7979"; depends=[base64]; };
-  imageHTS = derive2 { name="imageHTS"; version="1.22.0"; sha256="0rrjwf1yfdln7xwsizssjfavr4dwmdm1bwys09bk8ja63d5s9zb5"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
-  immunoClust = derive2 { name="immunoClust"; version="1.4.0"; sha256="144nhjg6r3jjn7ws0gqfhzsfhkx4b2azvijrjqndr958bip81qnr"; depends=[flowCore lattice]; };
-  impute = derive2 { name="impute"; version="1.46.0"; sha256="0v9ibgv8kp8il52miz7b7z65mv6irqxylx6lfzkxgvxd970dgrz0"; depends=[]; };
-  inSilicoDb = derive2 { name="inSilicoDb"; version="2.7.0"; sha256="14sv2rwfjv3h5l9qxd4c1wc83gfghmwbwds92g4wfvflbda9i6g8"; depends=[Biobase RCurl rjson]; };
-  inSilicoMerging = derive2 { name="inSilicoMerging"; version="1.15.0"; sha256="1dvbkjn5pj6w6ixrkvljbz843dsmihcnhbs6vm6a1iyc2l6dx41k"; depends=[Biobase]; };
-  intansv = derive2 { name="intansv"; version="1.10.0"; sha256="0fgc45gaqm2vpvcbvwm54w93i7fmp4pv365pqqcq6sy3lilzxn92"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
-  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.10.2"; sha256="1rvqh3krhcmqk82ykhcpqm93xci5bsh0xg8dw45jb80ldfz00nrh"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.10.3"; sha256="0gn19dd8m8jc8cjkwy12m7g7mzbxpfg2lhw0pklhbb00nq1hykqa"; depends=[BiocGenerics shiny]; };
-  inveRsion = derive2 { name="inveRsion"; version="1.20.0"; sha256="1sjrpcccnnk2jfiwxm1ly0mzj8h6z3dvv9r3sa2ph5k4v13rn3gn"; depends=[haplo_stats]; };
-  iontree = derive2 { name="iontree"; version="1.18.0"; sha256="07j97v062sm1dv3bz7n5s7z5vimizkmv5g8ck4irvdjwm7my572a"; depends=[rJava RSQLite XML]; };
-  isobar = derive2 { name="isobar"; version="1.18.0"; sha256="1zckdyaclbnmyhmzavlr350q1pqqwrl9s0cdplfr1bj6hjififc0"; depends=[Biobase distr plyr]; };
-  isomiRs = derive2 { name="isomiRs"; version="1.0.3"; sha256="1kclz9kl3pvg2djm6kkxwg8nds33pryf7l27ilx51hcarci78gkq"; depends=[BiocGenerics DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots IRanges plyr RColorBrewer S4Vectors SummarizedExperiment]; };
-  iterativeBMA = derive2 { name="iterativeBMA"; version="1.30.0"; sha256="0x6sd1zdw5lr5r5fw3xig1466cch3snradcms8dl9y1dwnv7vr2v"; depends=[Biobase BMA leaps]; };
-  iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.30.0"; sha256="0vbvkqlj2facp4wfww650wm9m3czh33rj99d7mmi9h2qsvmbza21"; depends=[BMA leaps survival]; };
-  jmosaics = derive2 { name="jmosaics"; version="1.11.0"; sha256="1wg8mqh72dqwzqyx0wr1y0wqqmy10qv7fx0ybb78fh76jdwrq4lw"; depends=[mosaics]; };
-  joda = derive2 { name="joda"; version="1.20.0"; sha256="06lli20fxdvf9836xmg1dkf7f62khnd4lpz9c3xna9wqawcdk3wa"; depends=[bgmm RBGL]; };
-  kebabs = derive2 { name="kebabs"; version="1.6.2"; sha256="1bc5qg23h0f648l2xpizvyagd6jwwhwj1hw5s70jkb42qfvgpyr5"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
-  keggorthology = derive2 { name="keggorthology"; version="2.24.0"; sha256="0340gpvjpnk00iyn06bp0ad1cibp6b0kq4gk143mvkcvyk8vhk01"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
-  kimod = derive2 { name="kimod"; version="1.0.0"; sha256="05g1kvdfnhb77iwnad85214lf2q6lmrsz29lgc95kwyn62r60fj8"; depends=[Biobase cluster]; };
-  lapmix = derive2 { name="lapmix"; version="1.38.0"; sha256="1k4057cykcm1nzzp09yb31pl2w9ii047cc4iknndklp3827riyc0"; depends=[Biobase]; };
-  ldblock = derive2 { name="ldblock"; version="1.2.2"; sha256="1rr01m9dgzg3lxnql0fvak89rnjwnlqxclq70wks1j6wr5ggyxqi"; depends=[Matrix snpStats]; };
-  les = derive2 { name="les"; version="1.22.0"; sha256="17cxxbf5z2v5ada43lj6blb6c0wcfp8izvgyi58dv1rf8nmp77w7"; depends=[boot fdrtool gplots RColorBrewer]; };
-  lfa = derive2 { name="lfa"; version="1.2.2"; sha256="1xqjj7q70qxx952yf28s2ry03mj4csbri21gi7rl5ixi0581ji3a"; depends=[corpcor]; };
-  limma = derive2 { name="limma"; version="3.28.21"; sha256="1dvisifd2rr7s1rrsqj5vrv2qcg4la4yi2ajbn0zkk5z81ffxv9f"; depends=[]; };
-  limmaGUI = derive2 { name="limmaGUI"; version="1.48.0"; sha256="0rr6202jp7qx2csbvqr6qcg8584v9msmiqgcm6r1wmrwggh7nksb"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  lmdme = derive2 { name="lmdme"; version="1.14.0"; sha256="1ng0ng1pxdrxpmmaqzg8dxl4wics06z9g28zfgpdzq1hacckspd4"; depends=[limma pls stemHypoxia]; };
-  logicFS = derive2 { name="logicFS"; version="1.42.0"; sha256="0311x3miljdg9d1fw0x24il4c2i0d799z3si44vw7r6xxws11fzb"; depends=[LogicReg mcbiopi]; };
-  logitT = derive2 { name="logitT"; version="1.30.0"; sha256="16fqyk0kkidz7as21zslii97mhzclmf7pd5bimvajv9hbx7m1284"; depends=[affy]; };
-  lol = derive2 { name="lol"; version="1.20.0"; sha256="1vp25q5a1q9fzagy85lb0ab3iiapj4ilas5wkjxavh6bx6198z4w"; depends=[Matrix penalized]; };
-  lpNet = derive2 { name="lpNet"; version="2.4.0"; sha256="02bq0fw0hq50y591ys85lk50hy2ad72izrvf7wds1x4c3sgcbhnm"; depends=[lpSolve nem]; };
-  lpsymphony = derive2 { name="lpsymphony"; version="1.0.2"; sha256="1ckijz59g5sx8phwg28xv17iwlja6mdnffnzrwqg1f17kc423vzm"; depends=[]; };
-  lumi = derive2 { name="lumi"; version="2.24.0"; sha256="1p8w6lfwlzcizc6517hb85ih8p9wzqklk2s7qsacsprfwh1h7wvq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
-  mAPKL = derive2 { name="mAPKL"; version="1.4.2"; sha256="089hsy6x144qrwqd555py8zlb7zka4yjf1qww0lx7kv131295wkf"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; };
-  mBPCR = derive2 { name="mBPCR"; version="1.26.0"; sha256="1c57c3dfaxdzalqnsfg9ac5kppn8hdajnxmy58rzma0509k9kjkd"; depends=[Biobase oligoClasses SNPchip]; };
-  mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.6.0"; sha256="1p2wk16db2g2ns6vvk7ms5s10n3xk37nbbpdgjrim9b1jxiv7mf3"; depends=[GenABEL MASS outliers qtl]; };
-  maCorrPlot = derive2 { name="maCorrPlot"; version="1.42.0"; sha256="14i8q92jhp22r6mkb2813507q270z6jhpq1qvagaardvhvaqjqzj"; depends=[lattice]; };
-  maPredictDSC = derive2 { name="maPredictDSC"; version="1.10.0"; sha256="0w3csffy6285d3y9lj8b7i59x5x4zkgwf2pl07y5vx7rdpjg9rfr"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
-  maSigPro = derive2 { name="maSigPro"; version="1.44.0"; sha256="05piq7h2zg8pgxd29xgk346ikbbam02fsg8i4k9q55i5bnx7ifmb"; depends=[Biobase limma MASS Mfuzz]; };
-  maanova = derive2 { name="maanova"; version="1.42.0"; sha256="0kypia11sal5gmiykapzaly18qsrbv4qi22ilz5c1plrk65rz0li"; depends=[Biobase]; };
-  macat = derive2 { name="macat"; version="1.46.0"; sha256="137g4wmdyzfyj45gjxla0caf0pp0gbns30v521j7awlxq8rsd6qh"; depends=[annotate Biobase]; };
-  made4 = derive2 { name="made4"; version="1.46.0"; sha256="1wj7pfajhwhl6gbja4hr8jlzciighgzhhvy8553pkj4mnrv204r3"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maigesPack = derive2 { name="maigesPack"; version="1.36.0"; sha256="061bp7mqi1n0c1vcbnbmmpxbj2lvjvbcny4vh55klqw1r7wqjbm6"; depends=[convert graph limma marray]; };
-  makecdfenv = derive2 { name="makecdfenv"; version="1.48.0"; sha256="0s065hgmrinrixxc813114cqi91n0s10ngkbm8r20q5jm3xfsiqd"; depends=[affy affyio Biobase zlibbioc]; };
-  manta = derive2 { name="manta"; version="1.18.0"; sha256="0kqic6985zxz9hwcmyhc0px6ggdmshbsz4x3xyw9mc1q2d6svjdp"; depends=[caroline edgeR Hmisc]; };
-  marray = derive2 { name="marray"; version="1.50.0"; sha256="1rzbk40zzkr7xll5dzfy92jjmf0qkkw9l806kaz1mwfal8qka87m"; depends=[limma]; };
-  maskBAD = derive2 { name="maskBAD"; version="1.16.0"; sha256="0s1l2s2niqsvjk2083i8141mrvf8ardxg5mg7w742r5ga0m469sq"; depends=[affy gcrma]; };
-  massiR = derive2 { name="massiR"; version="1.8.0"; sha256="01yhz3cf9wgxszrcvxkyqj8ab8a5p52kqj1zg499147kaf8hciqn"; depends=[Biobase cluster diptest gplots]; };
-  matchBox = derive2 { name="matchBox"; version="1.14.0"; sha256="1fnxyig4wmhaymbn4adh7pxxk9qqck796n34w4lrrx0ggxwlz2g1"; depends=[]; };
-  mcaGUI = derive2 { name="mcaGUI"; version="1.20.0"; sha256="0akv7l6sy6nvj658q8pjp7dhkkfsx7x9iww9mv0jwyfdn811saa2"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
-  mdgsa = derive2 { name="mdgsa"; version="1.4.2"; sha256="047syngjdzjpad3iqy0s1a6f5pyl3rmsmadasjzc4f3l7xyq6jmn"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
-  mdqc = derive2 { name="mdqc"; version="1.34.0"; sha256="0xm6v7irlkhbi1ny93fglhixajbp41lkv7yjzr8ysszvdakwrmmr"; depends=[cluster MASS]; };
-  meshr = derive2 { name="meshr"; version="1.8.0"; sha256="171is2w5d7i26mmdncz2wx3y48dnqhbzgskwsn3l3c1acmnrpbr6"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; };
-  messina = derive2 { name="messina"; version="1.8.2"; sha256="01p0zbmay73v2ba41fs0hmnn47q7flggc0y0jhgf22cpjmsqm0qj"; depends=[foreach ggplot2 plyr Rcpp survival]; };
-  metaArray = derive2 { name="metaArray"; version="1.50.0"; sha256="1kfhiplzxvz0j99h2kigqfwpgpqzp17yl3dq2qw51s99257gwjvd"; depends=[Biobase MergeMaid]; };
-  metaCCA = derive2 { name="metaCCA"; version="1.0.2"; sha256="0g345pxmlhkxdx8fm725y52vx8zd24wi5rxhqh5xs087dqyzmy6k"; depends=[]; };
-  metaMS = derive2 { name="metaMS"; version="1.8.0"; sha256="1skvlqz8q9k3pqibbjyr9ajx9x1p11649lmh8f0sgi6y4xframq7"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
-  metaSeq = derive2 { name="metaSeq"; version="1.12.0"; sha256="1x398spd55qwj4pj5bfsmh0skj4gqy7h4dv16c65lk7r9qmkg99s"; depends=[NOISeq Rcpp snow]; };
-  metaX = derive2 { name="metaX"; version="1.4.2"; sha256="0d70jnljn2r26vrsyndf8pac0k731q38l8g84sb932ff7w48sqkf"; depends=[ape BBmisc boot bootstrap CAMERA caret data_table DiffCorr DiscriMiner doParallel dplyr faahKO ggplot2 igraph impute lattice missForest mixOmics Nozzle_R1 pcaMethods pheatmap pls plyr preprocessCore pROC RColorBrewer RCurl reshape2 scales scatterplot3d SSPA stringr tidyr VennDiagram vsn xcms]; };
-  metabomxtr = derive2 { name="metabomxtr"; version="1.6.0"; sha256="0shgzl0k2b3ig6gycgl4xf09qwk288p61dqd2gi231p4q825sc5v"; depends=[Biobase Formula multtest optimx plyr]; };
-  metagene = derive2 { name="metagene"; version="2.4.4"; sha256="0p8d6fq1zn0k8r7fb6iz80azk866abw1kqahx1lx35vgaxxm9smx"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges matrixStats muStat R6 Rsamtools rtracklayer]; };
-  metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.1.0"; sha256="1z7wj7zglm05ny0caqkj8h22sxgawrh295i4jlis6y39lhwbv6bj"; depends=[Biobase Biostrings dplyr lattice lazyeval magrittr RSQLite ShortRead stringr]; };
-  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.14.2"; sha256="08iwmv4ggsw98h6pf26dzbpb5qg77pcmjapxr77z4mhcram6yaxi"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
-  metahdep = derive2 { name="metahdep"; version="1.30.0"; sha256="0yifwp5cya5j8c1kl9a8nfqgn2l8imfjb1gzcxf32c53jwppwbf9"; depends=[]; };
-  metaseqR = derive2 { name="metaseqR"; version="1.12.2"; sha256="0ycfqjxd9vyx4dky42yxg3754lx37s1yc3r1nr774r0kbzaykbc3"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
-  methVisual = derive2 { name="methVisual"; version="1.24.0"; sha256="1g4ijymr6bv384vcsdpkamn5mk0gkd5mf7yiyjmbsgzwxx6mrpii"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
-  methyAnalysis = derive2 { name="methyAnalysis"; version="1.14.0"; sha256="1nva4c9f30x5ym3cd2f3r4dxksihdaqzzskkanb7f6n89xdl512h"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; };
-  methylMnM = derive2 { name="methylMnM"; version="1.10.0"; sha256="1944palwb2hfvsi8j4384fhjmqfk41fihq2w9y3cff0993j5i8cp"; depends=[edgeR statmod]; };
-  methylPipe = derive2 { name="methylPipe"; version="1.6.2"; sha256="1mci0y9dy1lb5vv7makh4mbm4h5ybdi0ay6qqf343y56zpjdlwmm"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
-  methylumi = derive2 { name="methylumi"; version="2.18.2"; sha256="1jxmk1r44x847sny1jrkka20a1z27yh7fv9pwgaabl5z8vxhpbyy"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
-  mgsa = derive2 { name="mgsa"; version="1.20.0"; sha256="0zy1mmil5s2jiwknixavxhn05b58qyr87gc1yd7i86z7d0f66zjh"; depends=[gplots]; };
-  miRLAB = derive2 { name="miRLAB"; version="1.2.2"; sha256="1wd591kd12dlj8dzxyv7dadi5clr0l6ar9n6lscc2yr16jwlwcv6"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
-  miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.0.2"; sha256="1nc4qgk5sr1l007q5rqm2492azbbmffd7y17r0kfscr2pv67cs4x"; depends=[AnnotationDbi DBI miRBaseVersions_db]; };
-  miRNApath = derive2 { name="miRNApath"; version="1.32.0"; sha256="1cijz8wbaq0wg6f0qf37b65fska619fw8vxy57anm258nasi1z8m"; depends=[]; };
-  miRNAtap = derive2 { name="miRNAtap"; version="1.6.0"; sha256="0dbqh8jwzqhdjs8gd8095qzhbwn5c8ahqn7qq0dhl1yhhv3hpbw5"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
-  miRcomp = derive2 { name="miRcomp"; version="1.2.2"; sha256="19x8ldv1bdnbmjwjaicqmaf7iy391n42h5y1lckjlbcsxbss84bi"; depends=[Biobase KernSmooth miRcompData]; };
-  microRNA = derive2 { name="microRNA"; version="1.30.0"; sha256="1y997xxnf6b3magg2jkg26pa6sibz9c30bcc2131minvw2a1x7i4"; depends=[Biostrings]; };
-  minet = derive2 { name="minet"; version="3.30.0"; sha256="06ya26k7k8a3pphqfr93xcplrl2di895mnqmvywqg17lgn2df557"; depends=[infotheo]; };
-  minfi = derive2 { name="minfi"; version="1.18.6"; sha256="1mbrjmmjib5fw8jvk9fw6gfwfcqwi87qgwjphsvdfwhczlzkii7j"; 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]; };
-  mirIntegrator = derive2 { name="mirIntegrator"; version="1.2.0"; sha256="0axnmf01xdbf50jzi16awx4anj44diyshzhwjy9akcq0fw3x9bs9"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
-  missMethyl = derive2 { name="missMethyl"; version="1.6.2"; sha256="02i343siji4z48zg8p9daxl57smgc3myx2f0s67mmzp59gbabz7q"; depends=[AnnotationDbi BiasedUrn IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
-  mitoODE = derive2 { name="mitoODE"; version="1.10.0"; sha256="1vgywn96b1p6yndhxcx2297p93skdpw8r7yzfz6ph828camw7g73"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
-  mmnet = derive2 { name="mmnet"; version="1.10.2"; sha256="18ypmvx4pjqv40k2jclq92gl2cw9qpkakifv2jnaa27qnp1x9ivc"; depends=[Biobase flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
-  mogsa = derive2 { name="mogsa"; version="1.6.4"; sha256="14mfnsylckgv01k8g2hj5vxbfiih0d0jk77rb0r8p21lcd25ls7a"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
-  monocle = derive2 { name="monocle"; version="1.6.2"; sha256="1j65kdzrlzyfzv1in0lswqksv3rs336jddnpxyw8k27iz343dvvf"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 HSMMSingleCell igraph irlba limma matrixStats plyr reshape2 VGAM]; };
-  mosaics = derive2 { name="mosaics"; version="2.10.0"; sha256="0kazrdn03a5969d7gy86wfvskpw3bmfib7pbd1p59pic5nnhqznp"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
-  motifRG = derive2 { name="motifRG"; version="1.16.0"; sha256="1ds22paqc0923y6z1fy0arw0wxvvmglfvfgarhywv1qywhq68mbq"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
-  motifStack = derive2 { name="motifStack"; version="1.16.2"; sha256="1a37h7ryj9hj43mb1ynrsi5ypfaw2cr1cfmccw44bwf1fn5grzl3"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
-  motifbreakR = derive2 { name="motifbreakR"; version="1.2.2"; sha256="0zfvig6rf4ix5hh6mk5lada9sh7cr6nbngqr6gqgm5hy5bvkn51m"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
-  msa = derive2 { name="msa"; version="1.4.5"; sha256="0g3p5kfyszll09dwdfjwkkdyhnfj1ymk4bfk1j01vlzqhcd3d2hl"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
-  msmsEDA = derive2 { name="msmsEDA"; version="1.10.0"; sha256="0spbbj1vxyyhmhbg79sby9i7hw8lxzn95qp1qpcds6pzbi98555p"; depends=[gplots MASS MSnbase RColorBrewer]; };
-  msmsTests = derive2 { name="msmsTests"; version="1.10.0"; sha256="04gdsxdpmrpj8nzm5jn96dzvyxrcjj29nks4n0rx53lqada3zx8y"; depends=[edgeR msmsEDA MSnbase qvalue]; };
-  multiClust = derive2 { name="multiClust"; version="1.0.2"; sha256="1a4brwg01ni96p661aqvaivdrfg6x7iwv5sh1303bm7fzr8kyhhh"; depends=[amap cluster ctc dendextend mclust survival]; };
-  multiscan = derive2 { name="multiscan"; version="1.32.0"; sha256="0kxnnk55605km690ikfglbnc39kps4a26r2v9wcdfngza0jcf4xa"; depends=[Biobase]; };
-  multtest = derive2 { name="multtest"; version="2.28.0"; sha256="11z0rzfzfk2fgl0l7hv9sb6g19d9ixkn634fnfb2pz141bbsrcwd"; depends=[Biobase BiocGenerics MASS survival]; };
-  muscle = derive2 { name="muscle"; version="3.14.0"; sha256="0h9czpi4qvl94kgdil6c263k4r55a0baw2h11qn0i8vy6szgb4l0"; depends=[Biostrings]; };
-  mvGST = derive2 { name="mvGST"; version="1.6.0"; sha256="16gdxqghch4422vnjf1phzfrdp63043bag2jmhm3yni0z92b47p1"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
-  mygene = derive2 { name="mygene"; version="1.8.0"; sha256="17a5q7zbsm1qk7asz4ddf5vgyxvfsxkpxhn52p5gd6aikv5kjdqr"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
-  myvariant = derive2 { name="myvariant"; version="1.2.0"; sha256="06d7awkmx8fg4m8j09lscs1kvk9nx1nbd0xmb6divsjhb3mx1p0j"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
-  mzID = derive2 { name="mzID"; version="1.10.2"; sha256="18fwrd3df0gbji1g48dd1zblmf7hz33h1jwfx0nana0j8y8x3xr1"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-  mzR = derive2 { name="mzR"; version="2.6.3"; sha256="1kfz5kwbjpz3pg0ccrkx0alq14bcp4z6az4k8h3766n9zcb69774"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
-  ncdfFlow = derive2 { name="ncdfFlow"; version="2.18.0"; sha256="01614r9507vwz7irdccxb3swlx5jlxrmdcnxjgd7yxzfdwsc012x"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
-  neaGUI = derive2 { name="neaGUI"; version="1.9.0"; sha256="12sca0i2h7k6lcr525cnc476bf1g6gqzvi6zm0zpdbciyl9cxbny"; depends=[hwriter]; };
-  nem = derive2 { name="nem"; version="2.46.0"; sha256="0aa6lgivy69daaixx5zzymlfypn22gn1x0126ygrbv9g8vpzr470"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
-  netbenchmark = derive2 { name="netbenchmark"; version="1.4.2"; sha256="0id1b0v6vkzdh030vq3ppfr808kq1blyb6s4jncr772izy4irnmb"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; };
-  netbiov = derive2 { name="netbiov"; version="1.6.0"; sha256="12d28igggc8mw05bzxl67647akx1yrw671s67jfdc0zyg2xvfgi9"; depends=[igraph]; };
-  nethet = derive2 { name="nethet"; version="1.4.2"; sha256="0ygz7zqksp5i1fk5gqpb4dlsqyi3z609379h654arzkr1s1kvdqj"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
-  netresponse = derive2 { name="netresponse"; version="1.32.2"; sha256="1qx8xsxlgib73c2bgjxj01y8y47c8mi15708pdb589dm8aldkilq"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
-  networkBMA = derive2 { name="networkBMA"; version="1.14.0"; sha256="1az74f0fa9z9x4d68mjxlzf1d5x1zjam494qs79r294qbf7h7jpr"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; };
-  nnNorm = derive2 { name="nnNorm"; version="2.36.0"; sha256="02s0rcwq5b0bar5h8x08xgz1gdvr69dlv4l3s84d4s1rb2bmjipa"; depends=[marray nnet]; };
-  nondetects = derive2 { name="nondetects"; version="2.2.0"; sha256="06dkj8fd2l3a0x2zz84g3kfyqsw3pridn05admhag0nalzqiy6c3"; depends=[Biobase HTqPCR limma mvtnorm]; };
-  normalize450K = derive2 { name="normalize450K"; version="1.0.0"; sha256="0rfzvg4lc8wppx5g5zhcgp8vh4qw9gynmmnwdgnf48fmdvkirpm9"; depends=[Biobase illuminaio quadprog]; };
-  npGSEA = derive2 { name="npGSEA"; version="1.8.0"; sha256="130w9rw7njff90b070kkq395ariy9y409kxxmbq61fmdmnqvxnnk"; depends=[Biobase BiocGenerics GSEABase]; };
-  nucleR = derive2 { name="nucleR"; version="2.4.0"; sha256="1s6k181g4q23x1pk9728vbsjia8dlcwn1gl2b9rvwagspidyvq1p"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-  nucleoSim = derive2 { name="nucleoSim"; version="1.0.2"; sha256="0vyjr0lbswfwdil48pafljz79s384qr7pk4jsfqnih07c8drj5pb"; depends=[IRanges S4Vectors]; };
-  nudge = derive2 { name="nudge"; version="1.38.0"; sha256="01gvisf0894hz1jgmhf9d0b98rj92k1bfhy3pn1fpqp4qq9i3dp0"; depends=[]; };
-  occugene = derive2 { name="occugene"; version="1.32.0"; sha256="06ywswmbmkajwa7wwj0bbmgwk50h0af9b5m1bvm26w6yqkpxyn0v"; depends=[]; };
-  odseq = derive2 { name="odseq"; version="1.0.2"; sha256="1y2nvm05pf7pmrrb1kfvkspqwrlq5fsk28kbp6bh3df7f4rahwpx"; depends=[kebabs mclust msa]; };
-  oligo = derive2 { name="oligo"; version="1.36.1"; sha256="1jwbj5b3n9vwgf81cr8cnxhiynmnh2yjzsd1520a67na739ddsxr"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
-  oligoClasses = derive2 { name="oligoClasses"; version="1.34.0"; sha256="1jz5s7srrdxxfppplajq7q4c1sqwbw6lwsb0xms2chw1qnshj3r5"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
-  omicade4 = derive2 { name="omicade4"; version="1.12.0"; sha256="031vnyv15aw1kmw0cdjsmb2q0g90hc1316dh8za64z0k0cmhdkb9"; depends=[ade4 made4]; };
-  oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.38.0"; sha256="0x7s8f6cvl6dlrjq5g7wq9542rpjqqgal1x0jh1za667n5cw1zgv"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
-  ontoCAT = derive2 { name="ontoCAT"; version="1.24.0"; sha256="188j6wl5y9zvki4gzfv58i50vf56q36snk025pkj973nll82m4vl"; depends=[rJava]; };
-  openCyto = derive2 { name="openCyto"; version="1.10.3"; sha256="1i0qq7v5s09cm6icp7347dlcbf9n81fai8xxv6ahk90jngmlsncs"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-  oposSOM = derive2 { name="oposSOM"; version="1.10.0"; sha256="0ybyqxy4z0djppjj7gqw71pm4ll6b5rzwrc7zfsil9n1n33ajvdj"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-  oppar = derive2 { name="oppar"; version="1.0.2"; sha256="0nzjiy18amidc7x388lpq65i2yj0lvy0xgwzzgnlyqfjcdhlasi4"; depends=[Biobase GSEABase GSVA]; };
-  pRoloc = derive2 { name="pRoloc"; version="1.12.4"; sha256="1qvg41wyn9snqr0fqygcpma4q80kr7gxsfh78yz4jmykqdvgwm53"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
-  pRolocGUI = derive2 { name="pRolocGUI"; version="1.6.2"; sha256="1ka87amamlzbapb1ih0x5mlcq0lmz4prqsdf0j4il01kq5x9ml5i"; depends=[dplyr DT MSnbase pRoloc scales shiny]; };
-  paircompviz = derive2 { name="paircompviz"; version="1.10.0"; sha256="0b1vfkg554pmm0nmfjlbriqvbvy4fzik8cwn7qqsvzqs1928ii0i"; depends=[Rgraphviz]; };
-  pandaR = derive2 { name="pandaR"; version="1.4.2"; sha256="17gx2hfr1s79c69y8w3fmfrrvkzbr2m0917cq7wwdpxxi376b6yk"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; };
-  panp = derive2 { name="panp"; version="1.42.0"; sha256="17hlbi20bxm2qidk8aa224vsqp9dfjjd79yhh0711h9aylwixn6m"; depends=[affy Biobase]; };
-  parglms = derive2 { name="parglms"; version="1.4.2"; sha256="1k04zpwwk1aknlwg5xqsl1pszwbh2873606y2ycqsi7ngz1yhwnx"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
-  parody = derive2 { name="parody"; version="1.30.0"; sha256="03hvv8jgk56h60gfm62ia4f67fhszs8dv5whx3frriwbf7w2jxaw"; depends=[]; };
-  pathRender = derive2 { name="pathRender"; version="1.40.0"; sha256="1fa9d2sp1rxwmxkd1snqa5ay5q5znx8xbmn3jsga9giw9nh7iras"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
-  pathVar = derive2 { name="pathVar"; version="1.2.0"; sha256="15jha74blfxdr5398gdwg59p4wmymjkmwvinrspw29dqkxn0wm64"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
-  pathifier = derive2 { name="pathifier"; version="1.10.0"; sha256="0kj9jm0az186d89lr6p016zsnj3zjcbwcs094jqf322zz795c275"; depends=[princurve R_oo]; };
-  pathview = derive2 { name="pathview"; version="1.12.0"; sha256="1vx6s2ad0yaqv2mnc6257qgmghffhyh7cwsir2pcvy7jd7xdkcl8"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
-  paxtoolsr = derive2 { name="paxtoolsr"; version="1.6.3"; sha256="1l6d4r6c3mjsaczw4cyiglfc8dw34k56bz0vd5ddaiy01kqn5g1w"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; };
-  pbcmc = derive2 { name="pbcmc"; version="1.0.0"; sha256="0xchby283wni800wlslk7rfdm7nqnasli1d81al8rsn98lachyiq"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; };
-  pcaExplorer = derive2 { name="pcaExplorer"; version="1.0.2"; sha256="0nr84v2mwzw0bbz5y8llgkpkg10jalc0ciwnqgaskl1skxvhc4ja"; depends=[AnnotationDbi d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges limma NMF plyr S4Vectors scales shiny shinyBS shinydashboard SummarizedExperiment topGO]; };
-  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.16.0"; sha256="08c8ppxb6md10ar252xii7qgr6pjlbbiim9ap1giib7dyvzf4qjj"; depends=[AnnotationDbi Biostrings ellipse]; };
-  pcaMethods = derive2 { name="pcaMethods"; version="1.64.0"; sha256="0dkvsh758hv16h6irhr8xy4sgsxp2ki1gpan33vyqq0fzlbibhxl"; depends=[Biobase BiocGenerics MASS Rcpp]; };
-  pcot2 = derive2 { name="pcot2"; version="1.40.0"; sha256="011p0935bkvlm12f0lbcflcprlzn34m25gj64169wp15lpygpcky"; depends=[amap Biobase]; };
-  pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.36.0"; sha256="0f57fsp1aaz4sliqzamjma7shmiqfn82ggdcnzaysizn4r86gd4b"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pdmclass = derive2 { name="pdmclass"; version="1.44.0"; sha256="0mcd1s33j0l0nqma31dwh7wyx3vfbvw68rnlxksp5a6d6fx0sxlb"; depends=[Biobase fibroEset mda]; };
-  pepStat = derive2 { name="pepStat"; version="1.6.2"; sha256="1a95f5sha96ww4y92qjycimclikd19x4dc5az9nha6c7v5l67nqw"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
-  pepXMLTab = derive2 { name="pepXMLTab"; version="1.6.0"; sha256="1amgga42b7rds5k9c2m3is1s6lgh80sc8df7y9yfw1m09gwjg8vd"; depends=[XML]; };
-  phenoDist = derive2 { name="phenoDist"; version="1.20.0"; sha256="1car8mpffbbabnh7fbsrk445y0ld45lz7953sbsbrfwd9chj4dk9"; depends=[e1071 imageHTS]; };
-  phenoTest = derive2 { name="phenoTest"; version="1.20.0"; sha256="0bcg6qd51i9npskjsiflz5fl6135wchlk0pqpbnv0g33fzqvgrgi"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
-  phyloseq = derive2 { name="phyloseq"; version="1.16.2"; sha256="12h69xckgsnl12mlmn7nard4pac42w5r8m8gj4vaml9w2hwlxcgq"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
-  piano = derive2 { name="piano"; version="1.12.1"; sha256="08zl41mv4wldpbnjhgqynp56csksz9x2ggy3v6axbsf4av08xl0p"; depends=[Biobase BiocGenerics gplots igraph marray relations]; };
-  pickgene = derive2 { name="pickgene"; version="1.44.0"; sha256="0ilz8dcidximbrijy8a957hf6rxp54h45c36wmd90cbmxj54lv3c"; depends=[MASS]; };
-  pint = derive2 { name="pint"; version="1.22.0"; sha256="01ydp1y039vq359ir7h13wl7avar8layx10r132488qdv7g65gnd"; depends=[dmt Matrix mvtnorm]; };
-  pkgDepTools = derive2 { name="pkgDepTools"; version="1.38.0"; sha256="0rcrq32y3qi63ad8inc71y1gxydjc110lgz4bsvdkxykwmyxabgk"; depends=[graph RBGL]; };
-  plateCore = derive2 { name="plateCore"; version="1.30.0"; sha256="00ccxrad5xfklwh2040hvp20wqqqgh0351qj00y11bmpz4ylng2p"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
-  plethy = derive2 { name="plethy"; version="1.10.0"; sha256="0mvvhzacz1m4k9ig898r6kn7c1f7f96lky358km28gpk463cm3bp"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
-  plgem = derive2 { name="plgem"; version="1.44.0"; sha256="07ygi6gvll2bnjwn8y4nmmgcz1daah0zzgidnwblzbyj4s2d4dam"; depends=[Biobase MASS]; };
-  plier = derive2 { name="plier"; version="1.42.0"; sha256="0fqdvp75hz8c3k3779kdbl4xdjfqqvbd11vp0ad9jxan7j5giyca"; depends=[affy Biobase]; };
-  plrs = derive2 { name="plrs"; version="1.12.0"; sha256="0pwpbpp05r95qcsk00icspna35lbw67d3h5apvgl4mibdw4jyvw4"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
-  plw = derive2 { name="plw"; version="1.32.0"; sha256="114lpq9ksf8sbbcwvaczkmqgqqjfwpay1c82v192bmrhpjr3g6y4"; depends=[affy MASS]; };
-  pmm = derive2 { name="pmm"; version="1.4.0"; sha256="1kh9h6033lq4mix4x4nw67dj6kw4y4k333i72swfki0vl6b43lip"; depends=[lme4]; };
-  podkat = derive2 { name="podkat"; version="1.4.2"; sha256="0bfa2f04yr71vm1w9bqqij8gb68d5n5v1ydcnai016y7gkxxrb25"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
-  polyester = derive2 { name="polyester"; version="1.8.3"; sha256="13visqfz6kpjqyqq8i6zwg7mr2f2p5rlk6pssysa8yc0j7bk1hrn"; depends=[BiocGenerics Biostrings IRanges limma logspline S4Vectors]; };
-  ppiStats = derive2 { name="ppiStats"; version="1.38.0"; sha256="1z24495iy33qk7ymq08zrpl4kfv0s61slibsycn1diwhgshzglx3"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
-  pqsfinder = derive2 { name="pqsfinder"; version="1.0.2"; sha256="0zqxr39lpzhlv22fdhlbihnr7hwwql94amhdvddbp25frdizmann"; depends=[BH Biostrings flowCore GenomicRanges IRanges Rcpp S4Vectors]; };
-  prada = derive2 { name="prada"; version="1.48.0"; sha256="0209h2v72kqp6993kvfbddpc1s2qh880ag6j60lqfaz3zb09cd32"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
-  prebs = derive2 { name="prebs"; version="1.12.0"; sha256="0rbas8hkzlsn1ch3pgwz8sh5siwfgdfr0hpr592vjp9mmxz4jl2j"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
-  predictionet = derive2 { name="predictionet"; version="1.18.0"; sha256="0b39arsfjxz43ybm479aisl5pc2n5z4vpva5whzr8z7qh382bfan"; depends=[catnet igraph MASS penalized RBGL]; };
-  preprocessCore = derive2 { name="preprocessCore"; version="1.34.0"; sha256="0bcfi26ahs4ybagvz29vlp1wldhhbwwh73xz6v6xb07nakyzb6cf"; depends=[]; };
-  proBAMr = derive2 { name="proBAMr"; version="1.6.0"; sha256="0r5sw67h8dwqbaizvaz7prch4jxzj6gfvcym1iv30nim7iadnd0m"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
-  procoil = derive2 { name="procoil"; version="2.0.2"; sha256="0j3n3nxldwzv3pjn2djnk8ql97x6xppn0lhcz6nq4glwcdrly47b"; depends=[Biostrings kebabs S4Vectors]; };
-  profileScoreDist = derive2 { name="profileScoreDist"; version="1.0.2"; sha256="0fl71nlvzl7gi96py4q63qkrd33xrpqcvld2jly7sv0cj2ng36nc"; depends=[BiocGenerics Rcpp]; };
-  prot2D = derive2 { name="prot2D"; version="1.10.0"; sha256="1iy2lklhd4hmmf66z2yzs5bm8zmbcmdk52b0n6f4m1hlfwb0cv8n"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
-  proteinProfiles = derive2 { name="proteinProfiles"; version="1.12.1"; sha256="07ymi2m0vrnf4dzd0m6hard90y80k1v1r4i3ci8pa5mgfziws70s"; depends=[]; };
-  proteoQC = derive2 { name="proteoQC"; version="1.8.2"; sha256="0z8swyyvwcw8phwnnsvjrvr21fh2m453k57b69sqb87hisczg2ra"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; };
-  psygenet2r = derive2 { name="psygenet2r"; version="1.4.0"; sha256="1mw1d95fbq2b88by9hmil3vycrqbmpmg2kasx4grypiz1ximyngb"; depends=[BgeeDB biomaRt ggplot2 igraph RCurl reshape2 stringr topGO]; };
-  puma = derive2 { name="puma"; version="3.14.0"; sha256="0pd87cd4qn81839vvlxcvivwnfl40rbgjqz1mrmv4rbwgqz1ail5"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
-  pvac = derive2 { name="pvac"; version="1.20.0"; sha256="0n62i5byxrw879q0gxd9sbg2by4cy76f8ngmbxnwpz4bnc8j6vpj"; depends=[affy Biobase]; };
-  pvca = derive2 { name="pvca"; version="1.12.0"; sha256="0jcswb05gwrwc2zv3idzr0qcp7p1bn32xx8rhmq557aiirql1dib"; depends=[Biobase lme4 Matrix vsn]; };
-  pwOmics = derive2 { name="pwOmics"; version="1.4.0"; sha256="121qvb2mlnq7as5bjb2xzq7y8gz4x47wg2z3s7s40zvglgpdjf03"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
-  qcmetrics = derive2 { name="qcmetrics"; version="1.10.2"; sha256="0mr0iabnj51wdhv9q5wifhisfl002dhddvscqpp78kycv12dvmga"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
-  qpcrNorm = derive2 { name="qpcrNorm"; version="1.30.0"; sha256="127lqq0p80h920c5lf6k2ffng9fl3p78ivhnkk9y9drv2p2imr5f"; depends=[affy Biobase limma]; };
-  qpgraph = derive2 { name="qpgraph"; version="2.6.1"; sha256="0y2dlaww0wyrmj73h50478fjzlg8cib6rsimzhrhh48gvgaw5whl"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
-  qrqc = derive2 { name="qrqc"; version="1.26.0"; sha256="0r0gds35czs1xq5gv94n3c5i5gr2bjswij7l048npb8cqsmpvdq5"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
-  quantro = derive2 { name="quantro"; version="1.6.2"; sha256="1rv0hihccq35cjf70vpk12y60w5kl9iwhhxx0fmjbax230v4vjmg"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
-  quantsmooth = derive2 { name="quantsmooth"; version="1.38.0"; sha256="1c69rrl8cijixlcr9kzcs3wfvgizvvrsyglqr8s10s23drrwywzb"; depends=[quantreg]; };
-  qusage = derive2 { name="qusage"; version="2.4.0"; sha256="125mp6w9g335sjkf2894iycp98s5jcz3jljy0l6s46pbpy0hc77v"; depends=[Biobase limma lsmeans nlme]; };
-  qvalue = derive2 { name="qvalue"; version="2.4.2"; sha256="08zcqxs6mrqxin01m998s9lglb9ylcb4p7sqd8am57z4qcqwwcra"; depends=[ggplot2 reshape2]; };
-  r3Cseq = derive2 { name="r3Cseq"; version="1.18.0"; sha256="05rli70p45q10b7gk9k4fanw35ayljj6b6079phdsm1v7vnbdkw5"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
-  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.10.0"; sha256="1yzaj7fra1m4f89j5n1iqv9iiq9w9j5crscdhd2plm331nparhiv"; depends=[data_table XML]; };
-  rCGH = derive2 { name="rCGH"; version="1.2.2"; sha256="0ysyhgnzb50222mjlyzawdw0xw10xw8isd5knj81hwn9x80ag6jp"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; };
-  rGADEM = derive2 { name="rGADEM"; version="2.20.0"; sha256="0m1nmab4xmw4v1b6nvb3x7f7kiq24rdw4xzh591qs90rl4r0y339"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-  rGREAT = derive2 { name="rGREAT"; version="1.4.2"; sha256="08daai2dwsahsnc1yzrnbs8bs2yadz2vd7fkpaigp4k6i9b0mvrm"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
-  rHVDM = derive2 { name="rHVDM"; version="1.38.0"; sha256="0806iyx00mpi4jv9ff6x3ncfzvrk4smp60l91w5xldwysxmwn10q"; depends=[affy Biobase minpack_lm R2HTML]; };
-  rMAT = derive2 { name="rMAT"; version="3.22.0"; sha256="00gg376hqxpg02vwv6qklgaivxj04bcb6d8vd6cvdnn43j2ffpdr"; depends=[affxparser Biobase BiocGenerics IRanges]; };
-  rRDP = derive2 { name="rRDP"; version="1.6.0"; sha256="0rv2cj91w6xp7q066imgkw3r3yiwfvrl3qhm89nmnqbda8sgnw2i"; depends=[Biostrings]; };
-  rSFFreader = derive2 { name="rSFFreader"; version="0.20.0"; sha256="067mykdwa1xzr0jhp95nmdvj4z0kp983vsimpcshqzpifv7xj32s"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
-  rTANDEM = derive2 { name="rTANDEM"; version="1.12.0"; sha256="01ghsf4wr9pvssd6qs1jkxav53bw1mjyirik7992rdam7j9lidzr"; depends=[data_table Rcpp XML]; };
-  rTRM = derive2 { name="rTRM"; version="1.10.2"; sha256="1lr3f2ysw8rwqb1l5x29vqsyp4934jl9jb3yjyqqbacgrfxf7syb"; depends=[AnnotationDbi DBI igraph RSQLite]; };
-  rTRMui = derive2 { name="rTRMui"; version="1.10.0"; sha256="0j622hasfzqszsh09q9w4prv8dqbdy7hnyrrdvhbx2fkm1r6h9zp"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
-  rain = derive2 { name="rain"; version="1.6.0"; sha256="07xcqq6wb81220l8c6hb8i2d9s8vysr577bb53khxsrqnv4am57w"; depends=[gmp multtest]; };
-  rama = derive2 { name="rama"; version="1.46.0"; sha256="01xc7ys5505a8krb785w4l36yf7n050m4cdnk00vhkd60j0g6dy9"; depends=[]; };
-  randPack = derive2 { name="randPack"; version="1.18.0"; sha256="08mnwj7lb7z6pffnpvilii6bphzb5vkc4f1fzyvgbbk3zvdcrajf"; depends=[Biobase]; };
-  rbsurv = derive2 { name="rbsurv"; version="2.30.0"; sha256="1q89kz0wqixl6m9vp8x54255j2qjpkb60jd0y8a24kpphln54afq"; depends=[Biobase survival]; };
-  rcellminer = derive2 { name="rcellminer"; version="1.4.2"; sha256="0256asrz6ivjvhkwskfk71q6n3xdgnjqbggp9lz8dvsk2wl8snrn"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; };
-  reb = derive2 { name="reb"; version="1.50.0"; sha256="0bi8jv4r5h7hbkn6m8wc2kv2qyadc0gvx16jkwsk5p450lh5c5ba"; depends=[Biobase idiogram]; };
-  recoup = derive2 { name="recoup"; version="1.0.2"; sha256="09cgbdqv9q60dhd972mcgyrfcczv52idni69yj2c4jnbmx1224ks"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
-  regionReport = derive2 { name="regionReport"; version="1.6.5"; sha256="0fa9vhx2as2agbij1scpsih5f31ksqdvvrfj7mn2d3rkz8sqi9a7"; depends=[DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
-  regioneR = derive2 { name="regioneR"; version="1.4.2"; sha256="0qn5say4gy9l1lli0i98i4amjqz75f390689dxn9ncfdcaqxkprw"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer]; };
-  rfPred = derive2 { name="rfPred"; version="1.10.0"; sha256="1k1s7i9va0dnnii76nnhcv4g4a4b03rmhicl7hsbmy56fnx91qf9"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
-  rgsepd = derive2 { name="rgsepd"; version="1.4.2"; sha256="0nj8x65q0642c6gimll84r2794bw41iz1iimqfznjkndv344a8g8"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
-  rhdf5 = derive2 { name="rhdf5"; version="2.16.0"; sha256="1a1bwnwqfx40jfhf0cv6ajxdh4k9y9z5zm446cjdx8fw6garam3j"; depends=[zlibbioc]; };
-  riboSeqR = derive2 { name="riboSeqR"; version="1.6.0"; sha256="0n4apcqgcyw71sypjkia45q61i4z35rq7r653i53fhsck4prwgzx"; depends=[abind GenomicRanges]; };
-  rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.30.0"; sha256="0y5m2prpvg10xpidvihvzmywi08vhj23mi3xx9i49kn5jx46jiix"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-  rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.2.2"; sha256="0hfixw4fv0s38ar1faafvvm2z9jflh7lxzcmb8m8751b0wn9mkq2"; depends=[RColorBrewer]; };
-  roar = derive2 { name="roar"; version="1.8.0"; sha256="1ymc4bgbi90nyz4lalrwr51n138vxr59f9lvr8j454ikdda6vpgs"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  rols = derive2 { name="rols"; version="2.0.3"; sha256="0irk8h8vgpxgcka1ad5grsxq6dw734flshlsyicv96kg3nb7qqrq"; depends=[Biobase httr jsonlite progress]; };
-  ropls = derive2 { name="ropls"; version="1.4.6"; sha256="1pls9c5l8lidj6cdvls3gk0mc1sy4374mbikn95fzj4vw46vcpaz"; depends=[]; };
-  rpx = derive2 { name="rpx"; version="1.8.3"; sha256="1aq4hp38wiqv1p6lhjj8d759sr4sk6jy1jmnnb16ln4jls77hs7f"; depends=[RCurl XML]; };
-  rqubic = derive2 { name="rqubic"; version="1.18.0"; sha256="0lv9xmip5prbkb4dha7lj7nii7wvk1wvcyad8chir76lks1ysdhn"; depends=[biclust Biobase BiocGenerics]; };
-  rsbml = derive2 { name="rsbml"; version="2.30.0"; sha256="1q30yl7fny5rh1bai0z5gc5l7ci6qys0j59j417glc2pwsampcq4"; depends=[BiocGenerics graph]; };
-  rtracklayer = derive2 { name="rtracklayer"; version="1.32.2"; sha256="190767zpwc7maqjpy0x5bpkm0jp1vfawy9991fifw0mc634cjkga"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
-  sRAP = derive2 { name="sRAP"; version="1.12.0"; sha256="1wxg597ks3xa1srl8mwh90y09jc73758bfcw1pfwq2wpym5x6qsf"; depends=[gplots pls qvalue ROCR WriteXLS]; };
-  sSeq = derive2 { name="sSeq"; version="1.10.0"; sha256="1w33zc6kaxm5ripji4n2gc0sk29fqq0nzv8nmddx3qwvhv1x91k2"; depends=[caTools RColorBrewer]; };
-  safe = derive2 { name="safe"; version="3.12.0"; sha256="0f2i6zqc5x742r6501qsn0c8g0ld4lkvmvj6a2sjjacpj8g663am"; depends=[AnnotationDbi Biobase SparseM]; };
-  sagenhaft = derive2 { name="sagenhaft"; version="1.42.0"; sha256="181sw6wdkv7c3sb9m9hfgd7ki3rv63p0k5mfhal7j48wphd1l8f9"; depends=[SparseM]; };
-  sangerseqR = derive2 { name="sangerseqR"; version="1.8.2"; sha256="106p78f804b2ibkrkg6j2dxp6v9qsr03g4shkkcawb698qvgbr38"; depends=[Biostrings shiny]; };
-  sapFinder = derive2 { name="sapFinder"; version="1.10.0"; sha256="0a5kq447l0f3mdml4ykcdvp4whqzc4pn3zsvzjhrxc06d4a91y5k"; depends=[pheatmap Rcpp rTANDEM]; };
-  saps = derive2 { name="saps"; version="2.4.2"; sha256="191kmdf5czf96d7likysfxm13z240qd4z22n3dwdw94akpsfvrrp"; depends=[piano reshape2 survcomp survival]; };
-  savR = derive2 { name="savR"; version="1.10.0"; sha256="14d3r64w00j99cd9wdlcxcyhlp278skyadn0dcmmjg2lfcwv9dj5"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
-  sbgr = derive2 { name="sbgr"; version="1.1.1"; sha256="1z6xz5apv8cg6b0ciarvj0zn8s5xa93sfirzmldwsx9wmnm95kqq"; depends=[httr jsonlite objectProperties stringr]; };
-  scater = derive2 { name="scater"; version="1.0.4"; sha256="1zmaml2mbj5fkxfnah5klm2kyx09fghqddmbb4084bz7w737s2by"; depends=[Biobase BiocGenerics biomaRt data_table dplyr edgeR ggplot2 limma matrixStats plyr reshape2 rhdf5 rjson shiny shinydashboard tximport viridis]; };
-  scde = derive2 { name="scde"; version="2.0.1"; sha256="1d1wfcaxj7j4zhvs35038z7zdsn3idqhv1hb1s0bhhrvxyh95j1v"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; };
-  scran = derive2 { name="scran"; version="1.0.4"; sha256="0z748nmy5z346anbv33p7knh489d556aghrwdpp8jjv8lqqy6fha"; depends=[Biobase BiocGenerics BiocParallel dynamicTreeCut edgeR limma Matrix scater zoo]; };
-  scsR = derive2 { name="scsR"; version="1.8.0"; sha256="033f6kdmw70mf2hjadsanb1wx5wgnj69ipixb4n16262bvz54ajy"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
-  segmentSeq = derive2 { name="segmentSeq"; version="2.6.0"; sha256="07xh6gpi1pprinza2vswjpihff7hjqzsj3j6yrqmrhyja63n0ni8"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
-  seq2pathway = derive2 { name="seq2pathway"; version="1.4.0"; sha256="19r1gpmpzrxiyjx7gila1ldn714k15whhjg25kv79s2ji5fsqcrb"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
-  seqCNA = derive2 { name="seqCNA"; version="1.18.0"; sha256="16hbmzlc69jpirl8yix3lnx3hbw7jdj7njwxar47w3r3vbqhc7xg"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
-  seqLogo = derive2 { name="seqLogo"; version="1.38.0"; sha256="01jddx62nhi3r7czbh9hxy0wwpazbc9ax1fgagfxl6p4kx9xz9rb"; depends=[]; };
-  seqPattern = derive2 { name="seqPattern"; version="1.4.0"; sha256="1dj9hfnbdj11yjxwd8jmxrdkj7n6gmaaj6244g2psgarhjcp4wfb"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
-  seqTools = derive2 { name="seqTools"; version="1.6.0"; sha256="1xzc2457rjnc901dq0jaqpya04cxmk9c1y41495hmx5yimls2hnj"; depends=[zlibbioc]; };
-  seqbias = derive2 { name="seqbias"; version="1.20.0"; sha256="0yhzc8iyiqja93d919sh8jxnxq4wkydfbiygk8g3h45amzzx3iwb"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
-  seqplots = derive2 { name="seqplots"; version="1.10.2"; sha256="0dd6pmmidbkrr1gxflly1skj8qk3h882jas0a49ibmyyhgydffqx"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; };
-  sevenbridges = derive2 { name="sevenbridges"; version="1.2.8"; sha256="1b8l26anjq1bv1x71y1py3807kv4f9wzc4n2fxdgrvzdkimmnymp"; depends=[curl docopt dplyr httr jsonlite liftr objectProperties rstudioapi S4Vectors stringr uuid yaml]; };
-  shinyMethyl = derive2 { name="shinyMethyl"; version="1.6.2"; sha256="0q7lkmyh2hrxfmv5vl42d35hrgisc6x0iwgw9ahdiskmp13dwjqs"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
-  shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.10.0"; sha256="0xg5mhkgdpx12x9ys9w9bfqrg2595av88g975p50k2wikv9map14"; depends=[mixtools rTANDEM shiny xtable]; };
-  sigPathway = derive2 { name="sigPathway"; version="1.40.0"; sha256="0q1xwm87ia1zp5ry5pk5qb2rcxfi2s4ifiyn4yi24a7n2byanqy4"; depends=[]; };
-  sigaR = derive2 { name="sigaR"; version="1.15.0"; sha256="0z1nkxafiv71virpgsb32ji6z88yb9r6w7jvp2ck5yqxvv0brsg2"; depends=[Biobase CGHbase corpcor igraph marray MASS mvtnorm penalized quadprog snowfall]; };
-  siggenes = derive2 { name="siggenes"; version="1.46.0"; sha256="05adv1phvj8x9f1rnd2cz1xxyfbyk6zl0004vgfnsipklqy22z2c"; depends=[Biobase multtest]; };
-  sigsquared = derive2 { name="sigsquared"; version="1.4.0"; sha256="0683my2rflshlgx9nhamqvp3fqnxp0fb8jj14wqh29drrx6v93jk"; depends=[Biobase survival]; };
-  similaRpeak = derive2 { name="similaRpeak"; version="1.4.2"; sha256="1rdpf77mbqrs4ja0f9298qp8jfcwxl2hcbxk0ss5aia1cds8g475"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; };
-  simpleaffy = derive2 { name="simpleaffy"; version="2.48.0"; sha256="1v16zgqz2kg943lcwdc6v2hwq4ngd0qw9611pv145ysd4bx6p92l"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
-  simulatorZ = derive2 { name="simulatorZ"; version="1.6.0"; sha256="1bxpk4kigaymfgnf723s9pyfgpckhqfryjbz6b572jadf3swdjhc"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
-  sincell = derive2 { name="sincell"; version="1.4.2"; sha256="0hdx2wzs6z5birxvin0xp0xvh0zrpmbwzxgralv2aghkv21ji5l6"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
-  sizepower = derive2 { name="sizepower"; version="1.42.0"; sha256="0c17hs0yqqi92c1f27s7nh0vr1y6ak06mrv8m537w98cr659vlas"; depends=[]; };
-  skewr = derive2 { name="skewr"; version="1.4.2"; sha256="0k11mvxkrgqx5gxzi2li7pdw44zdvdyb41yh0wjqxn413qj67jp2"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
-  snapCGH = derive2 { name="snapCGH"; version="1.42.0"; sha256="10fap32vzbjwpgvbq4i1jh8sca0bdcza9xzw7mmw8cnr20ddv388"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
-  snm = derive2 { name="snm"; version="1.20.0"; sha256="15nh0p79jpwdzd3l2yzc0kfg9gbl5y5cjzbvcvklpprhh11s787r"; depends=[corpcor lme4]; };
-  snpStats = derive2 { name="snpStats"; version="1.22.0"; sha256="1hyznmdgjl96jf8aisa5nyjp4in74vn5nhipwxnc8g65j8qlmgdv"; depends=[BiocGenerics Matrix survival zlibbioc]; };
-  soGGi = derive2 { name="soGGi"; version="1.4.4"; sha256="0wdg7p5rmfdhqy7294h99pf84l1hfpqmjkvmxkx87p1a8590a9nl"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  spade = derive2 { name="spade"; version="1.20.0"; sha256="17x550ixg8f8gcjg3sc80v7bimzbvdi687m3znavkdpw03v7jcg9"; depends=[Biobase flowCore igraph Rclusterpp]; };
-  specL = derive2 { name="specL"; version="1.6.2"; sha256="1kg6zhrd7fp07jl0njd54z4m4886drkks0b8k4w17vdxw2cpajc5"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
-  spikeLI = derive2 { name="spikeLI"; version="2.32.0"; sha256="0qk447fyrfj0ha0faf62i2h5hv8wnyfng42jkqcn8k391ga33w03"; depends=[]; };
-  spkTools = derive2 { name="spkTools"; version="1.28.0"; sha256="1b76k0jp4dk2w53q8d536jfjznfdy1f2a8s44klm1rn3qw0nfp4c"; depends=[Biobase gtools RColorBrewer]; };
-  spliceR = derive2 { name="spliceR"; version="1.14.0"; sha256="09c6h8xlfpfsnxvndf9zab9kiv4kfx4j3jqqm6f5ry25y1ixv49c"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
-  spliceSites = derive2 { name="spliceSites"; version="1.20.0"; sha256="12j2mx7al7yxzhb3g6xy7v85vjipmfw0sa5nb3c3kh711r2485mj"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
-  splicegear = derive2 { name="splicegear"; version="1.44.0"; sha256="02kzm95hnn1b9384qpndqxfrc9916i50rynpw52131rjzhy2qkqy"; depends=[annotate Biobase XML]; };
-  splineTCDiffExpr = derive2 { name="splineTCDiffExpr"; version="0.99.4"; sha256="0b14hyrh2fa02yh2cvr2xjmrq81y46r6lrc6pzybi6mv3gpkdr6j"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
-  splineTimeR = derive2 { name="splineTimeR"; version="1.0.1"; sha256="1ham5hzfcv2ws9j8j07fzhvzij7fdnpnddd24sqb2w4l5p8sjj1z"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
-  splots = derive2 { name="splots"; version="1.38.0"; sha256="0pq9xgylc3qq3pzfizg25c3m6l64zvkc94xa5i8sm0v49161rjh9"; depends=[RColorBrewer]; };
-  spotSegmentation = derive2 { name="spotSegmentation"; version="1.46.0"; sha256="1hbvxfcwpaz5gbkvnsnravd9zdghkl2kqwx6mhznjbzggjp5hf1i"; depends=[mclust]; };
-  sscore = derive2 { name="sscore"; version="1.44.0"; sha256="14wl2chv9xrfn02s8dif0pa6nq41dbv5n9q2sjp1rgbknhs92l4f"; depends=[affy affyio]; };
-  sscu = derive2 { name="sscu"; version="1.0.2"; sha256="0rflgvb8anzrv5y9rzm8aiaappafyjmmak39mvz6b3mm1a32zwkq"; depends=[BiocGenerics Biostrings seqinr]; };
-  ssize = derive2 { name="ssize"; version="1.46.0"; sha256="161k421x32wp2qs705p7i7hqcf53sdmw5vllnwiqfidw62xagiya"; depends=[gdata xtable]; };
-  ssviz = derive2 { name="ssviz"; version="1.6.2"; sha256="11w4y3fv5m9qxp998k9xm9w1vg0v34npqm9s05biv0qqxwgs9v36"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
-  staRank = derive2 { name="staRank"; version="1.14.0"; sha256="1fn9m8q834v8540q8m2n9vfxdzqz2mbxb5k7mnjljf9ja07da9l8"; depends=[cellHTS2]; };
-  stepNorm = derive2 { name="stepNorm"; version="1.44.0"; sha256="1l21pw9d2scp9jczf0d4mscvd5qjqkrn4maxx9k2l2kqz47bh1dc"; depends=[marray MASS]; };
-  stepwiseCM = derive2 { name="stepwiseCM"; version="1.18.0"; sha256="1375hwx4zln7mnscfd6w7k4x6jc34m6mqs8fxmnihvkq4imhxd58"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
-  subSeq = derive2 { name="subSeq"; version="1.2.2"; sha256="04qg83x7cmjsnzg925jx8aw83gpzynkqdgxy4n44rxqspw922f11"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
-  supraHex = derive2 { name="supraHex"; version="1.10.0"; sha256="1kzkkidlr034m0sgyb32zia0p47gi52l6ki7s88559h7gx5d7bg1"; depends=[ape hexbin MASS]; };
-  survcomp = derive2 { name="survcomp"; version="1.22.0"; sha256="0l6plsjfbpx0lxkyscfnbykinjcijp1bwbrqn4i76y003g91b4yz"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
-  sva = derive2 { name="sva"; version="3.20.0"; sha256="0jqa4rdd0cd546sc1dbsq1lrm3kqcfym77xr7rsmrpc12yp85xdv"; depends=[genefilter mgcv]; };
-  switchBox = derive2 { name="switchBox"; version="1.6.0"; sha256="0ys69bh12b9idni67v1phfm1nik9z8izpix3az4xhy253gsb3idz"; depends=[]; };
-  synapter = derive2 { name="synapter"; version="1.14.2"; sha256="1wql8q8fbkl16g1xczrbcd68g41c35rfyqyrb6cj250axjl5x2q4"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-  synlet = derive2 { name="synlet"; version="1.2.2"; sha256="1rgsfxjkfv546c285cwp740gcglfjg8sbf0hw9v1dmqa16fy3pss"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
-  systemPipeR = derive2 { name="systemPipeR"; version="1.6.4"; sha256="0s2g46a5d5bvx45i3cgmib48wf8hrniyladhm0f7kgcbfx57248m"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
-  tRanslatome = derive2 { name="tRanslatome"; version="1.10.0"; sha256="0dylpkmz91gvl6zsi501yqg5kf0sagb4f6bcdb9gl68r3vbmkxnm"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
-  ternarynet = derive2 { name="ternarynet"; version="1.16.0"; sha256="0xzvvhgmbka28ka6q2inkfgc3lgi6007apndw6gb33548by7l30p"; depends=[igraph]; };
-  tigre = derive2 { name="tigre"; version="1.26.0"; sha256="0k9sjq3qxji7zsgjmy8zp0744zw17w86i2rf7yqapw2khgk80pdh"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
-  tilingArray = derive2 { name="tilingArray"; version="1.50.0"; sha256="03m6xcrs80a9kc63wawrnynxbydr54qfc2azfjj28qjb38cij792"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
-  timecourse = derive2 { name="timecourse"; version="1.44.0"; sha256="09m2laz25wmlch2r657q97ii1gryhs04yva8ym9a2z7dpypr4hpp"; depends=[Biobase limma marray MASS]; };
-  tkWidgets = derive2 { name="tkWidgets"; version="1.50.0"; sha256="1dazx95p1751kzdf0k8a1kbbbq6d258ga53j71gnbzskg2pmr3s9"; depends=[DynDoc widgetTools]; };
-  tofsims = derive2 { name="tofsims"; version="1.0.2"; sha256="0yyxwhhj6nqfxclzp05dsm8ydpvcxld73rd2qnq2xplffx9db45v"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
-  topGO = derive2 { name="topGO"; version="2.24.0"; sha256="1p4vsl32qhjw15yv9ym01ni63gjg73jaghlf17wc4zfn3iaz2zar"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
-  trackViewer = derive2 { name="trackViewer"; version="1.8.4"; sha256="0qzqzqqpajdv8srr59i7qxwn90vf0xdshnlchmn2v6k4949n3jcj"; depends=[AnnotationDbi GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz IRanges pbapply Rsamtools rtracklayer scales]; };
-  tracktables = derive2 { name="tracktables"; version="1.6.2"; sha256="1mx924d22w794gx3n5xdl711ajyxpmfwfx1x496cbcy9fqbc38sm"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
-  transcriptR = derive2 { name="transcriptR"; version="1.0.2"; sha256="08jbwajdbjx8jj7snfihyf4nzh72af4cj4grgvv5j0lqymvkziv6"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
-  traseR = derive2 { name="traseR"; version="1.2.0"; sha256="1mpvb38zg13b28s9fp3lm1m4gv002kaq7fqgxjnhk743bs4zqwbp"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
-  triform = derive2 { name="triform"; version="1.14.0"; sha256="1rfrqa5k2sfsyxpjjhs9scjgz1qzqgks13xxppz64sdlpjgrr8zw"; depends=[BiocGenerics IRanges yaml]; };
-  trigger = derive2 { name="trigger"; version="1.18.0"; sha256="1vzp9xlq2i6g659i4v1bbmh396lqwac3iwzx10kxjadzsp3kmd30"; depends=[corpcor qtl qvalue sva]; };
-  trio = derive2 { name="trio"; version="3.10.0"; sha256="07a20anzcg98nvbwkb1y3wna7kp4wwh2r994gnajl9lpp4ya8v4m"; depends=[]; };
-  triplex = derive2 { name="triplex"; version="1.12.0"; sha256="0562c7i9y3ajb6krqxfg2l7hmv8x9qrd7jqm1pkv7mb507yw3ijr"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
-  tspair = derive2 { name="tspair"; version="1.30.0"; sha256="1di6h6hm5bjl7j3hnnblfi042i0pj6rlzigprbz41spppassvg28"; depends=[Biobase]; };
-  tweeDEseq = derive2 { name="tweeDEseq"; version="1.18.0"; sha256="1i15pjvyz1idzam54d93f5i0693gjwqnnr97a6i2k7mnng859ik1"; depends=[cqn edgeR limma MASS]; };
-  twilight = derive2 { name="twilight"; version="1.48.0"; sha256="1mz8967fkjkyv75j6ahxrygvlwi1cmjiag4vd9gi6jrqqbpj0hdg"; depends=[Biobase]; };
-  tximport = derive2 { name="tximport"; version="1.0.3"; sha256="14j85aw1hhszaajnk7pj02bsj0id2y70ja94njxcr3j3rax1ngg0"; depends=[]; };
-  unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.8.0"; sha256="1fa5nmdfg52kppvxri08x97zb03c5fq2mz78jpcjaryhcz1jcpr8"; depends=[BiocGenerics HTqPCR]; };
-  variancePartition = derive2 { name="variancePartition"; version="1.2.11"; sha256="01525cbxgh9q4dnwn8ynrc1ixg9b98k7yn59svj6pdxmi2b9a58q"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; };
-  vbmp = derive2 { name="vbmp"; version="1.40.0"; sha256="0b6dw8z2lvzlfafc0p38x0skwgayafznvcwc813rkb2jcfac3q5h"; depends=[]; };
-  viper = derive2 { name="viper"; version="1.7.4"; sha256="12hyvy6dz67r3aybg4cbkzayb3j4vm0vi5ib2y9lq4195fp6ffxr"; depends=[Biobase e1071 KernSmooth mixtools]; };
-  vsn = derive2 { name="vsn"; version="3.40.0"; sha256="0cqx7kar7ihhbqdk37zhj6w5g1nw04l10vwnw2gxwm2y4229skh4"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
-  vtpnet = derive2 { name="vtpnet"; version="0.12.0"; sha256="0yq4h1pv7vkhwmk1vq0nahzyw6wnbvhlmw0rgggzbdc0irp99yj7"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
-  wateRmelon = derive2 { name="wateRmelon"; version="1.17.0"; sha256="1xhqv5hrxivw924snl1nb0biir39mzwc3m8d9qczhn52ds04wsn1"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
-  wavClusteR = derive2 { name="wavClusteR"; version="2.6.2"; sha256="0dbjkpajs4src5kgymin7b4h4yciksa112s52fm116mfll0g1rxl"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
-  waveTiling = derive2 { name="waveTiling"; version="1.14.0"; sha256="1yfvzb0k5b495460b1k2229h3qcx7gva48lc419r2y9dlnajii3d"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
-  weaver = derive2 { name="weaver"; version="1.38.0"; sha256="1g6796sw321la3rh4s28xzfv5wr91f4xva965sccl5l4vxqs5ccr"; depends=[codetools digest]; };
-  webbioc = derive2 { name="webbioc"; version="1.44.0"; sha256="0wd6xdnp3qcinj7sgl1hizl674v65n9xjbw0haf1xyrlijakpn7h"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
-  widgetTools = derive2 { name="widgetTools"; version="1.50.0"; sha256="191agm9c0g43wbncya8dnrgssx5s84i5w147na84g37r6b9cn67y"; depends=[]; };
-  xcms = derive2 { name="xcms"; version="1.48.0"; sha256="0xynzbvsknyyh5zdnh8mgs7rjf53m3fkhwqqi116lscqmf89scda"; depends=[Biobase BiocGenerics lattice mzR ProtGenerics RColorBrewer]; };
-  xmapbridge = derive2 { name="xmapbridge"; version="1.30.0"; sha256="17nccdcnwvi4vj2ykc0adq0018prfxpkzk78s315gx2l0ywkzmv4"; depends=[]; };
-  xps = derive2 { name="xps"; version="1.32.0"; sha256="0clajv5qpv6z9hhq4ns5gjys1zb5k1r6bngpjfm0g2k8alaj82rk"; depends=[]; };
-  yaqcaffy = derive2 { name="yaqcaffy"; version="1.32.0"; sha256="16sif5lsfczrl811g7237yg5pw8am2q7m9yk7zfkh3l07lr75zni"; depends=[simpleaffy]; };
-  zlibbioc = derive2 { name="zlibbioc"; version="1.18.0"; sha256="0m8l7zpx1l3qsk73k3ibkxxzzff938x3qhnwki1ymf3cnsg8cb36"; depends=[]; };
+  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.4.0"; sha256="1skhxyvyfgld2abiw8cl8wkqrq80jm2pm4p6l297v25cbsjmk3lz"; depends=[ABAData gplots Rcpp]; };
+  ABSSeq = derive2 { name="ABSSeq"; version="1.20.4"; sha256="032j430z787j1jrm0c40nn6m33vbjyngiz9ln1jx2z222ybcxrd6"; depends=[limma locfit]; };
+  ABarray = derive2 { name="ABarray"; version="1.42.0"; sha256="17vmy7419jdbrkzjll2ck2qvw3wdbba2cdazvji5zrflg9938hmj"; depends=[Biobase multtest]; };
+  ACME = derive2 { name="ACME"; version="2.30.0"; sha256="1hhqdnv4dkck47yvp17y3b741d63dxnlhbmkylz5bdab2swffz4m"; depends=[Biobase BiocGenerics]; };
+  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.14.0"; sha256="0lvj93gy2x7c6fh2lv8mr17aglk97cmp8s7nwrhysxizbhpzf6mn"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
+  AGDEX = derive2 { name="AGDEX"; version="1.22.0"; sha256="06zcc8zc5dz310wi1rp75f6015lf97dwaqgqrbxim2akrfrnhyzb"; depends=[Biobase GSEABase]; };
+  AIMS = derive2 { name="AIMS"; version="1.6.0"; sha256="1z62cw3f803vl4mymaxaa0vkvrlsmc79idqcq92qw9iznpdl2jam"; depends=[Biobase e1071]; };
+  ALDEx2 = derive2 { name="ALDEx2"; version="1.6.0"; sha256="1iiympsbj234nh7pdpgw6wiadj356i925j6in5d14jcqkq12jwpv"; depends=[BiocParallel GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+  AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.0.0"; sha256="0fh7086cdhpp05nwwj6bxwrzi9m6wkzirlb905c3g46afd9wxjrp"; depends=[]; };
+  ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.14.0"; sha256="1ikfh4sqzclhva92wz9xhlf835sw9isa6jflnsjwqilg5kivy9bp"; depends=[ARRmData]; };
+  ASAFE = derive2 { name="ASAFE"; version="1.0.0"; sha256="0jcjd5gh8j9iwq1b97jw614cz69z2s2fxv1prqkx3alibsf8jr2x"; depends=[]; };
+  ASEB = derive2 { name="ASEB"; version="1.18.0"; sha256="09kppm2lhhhd0kfy274xx6p387fxh7rfa3g4ajncnq6bspz8hvia"; depends=[]; };
+  ASGSCA = derive2 { name="ASGSCA"; version="1.8.0"; sha256="0w8lwaaj51fh3ibrdcba74x1nfar4m30dz2rii63lk0ah2xb9amy"; depends=[MASS Matrix]; };
+  ASSET = derive2 { name="ASSET"; version="1.12.0"; sha256="0vpyi5vpyys597ma8ig18hm1x2f86fwzd35wq5h68glnm3jm3vds"; depends=[MASS msm mvtnorm rmeta tmvnsim]; };
+  ASSIGN = derive2 { name="ASSIGN"; version="1.10.0"; sha256="0ks2k8r650j95wd0s7bvxl4d8bgx6dzzb4bpqc68p6bmnx80vkqv"; depends=[gplots msm Rlab]; };
+  ASpli = derive2 { name="ASpli"; version="1.0.0"; sha256="0cyq81f2ll9ygvq71p3mlmnvs8pm1582pldz1amlwwwdng7c4v36"; depends=[AnnotationDbi BiocGenerics DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges S4Vectors]; };
+  AffyCompatible = derive2 { name="AffyCompatible"; version="1.34.0"; sha256="1275r14pgj33zq275yp9xqvmxl2nqi2cgylbyjy8i9xvbg4f4sfg"; depends=[Biostrings RCurl XML]; };
+  AffyExpress = derive2 { name="AffyExpress"; version="1.40.0"; sha256="0ahj4fm2wdcza4w9m12vvfmzgl2f71xkhwf8mrwm69fp9n1s27lx"; depends=[affy limma]; };
+  AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.20.0"; sha256="03rsp23nzvzyswxziwf07x0q5w2f7lhsjpz1biz2pzv64g6xnkwi"; depends=[affy]; };
+  AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.24.0"; sha256="0jd78lh02kwxqll5qwnfkwrgfrm5scdc6p703r0vd8gl3cz8wdws"; depends=[affy affycoretools Biobase limma preprocessCore]; };
+  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.12.0"; sha256="0a4bmv7fpd134vdixlwxszlz7lx8xab8122m6p92q6gpla5fb6hk"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+  AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.8.1"; sha256="16x28f7lc5rn73m8l5z3jigkld5yf12pf5hv0mrq9l6fln1i002x"; depends=[Biobase graph log4r rjson]; };
+  Anaquin = derive2 { name="Anaquin"; version="1.0.0"; sha256="1fcbxzl4jwcbkgn4v5x4g901fpvlij5hv5n0jfvhxi8wdwqi0xq6"; depends=[ggplot2 knitr locfit plyr qvalue ROCR]; };
+  AneuFinder = derive2 { name="AneuFinder"; version="1.2.1"; sha256="1yicsbfj72qbzz03pn1wndmkmsa9i97a78cblhl3vhqgkfff8dx5"; depends=[AneuFinderData bamsignals BiocGenerics Biostrings cowplot DNAcopy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; };
+  AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.36.2"; sha256="0574lmyisn3nv9aicz9x3iivx990da4q2j4i0f1jz0mpj9v3vc2w"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
+  AnnotationForge = derive2 { name="AnnotationForge"; version="1.16.1"; sha256="0l1g9hy88sh5g567svyfd8pnjvkyklkn6a3gjn8zalvh62qqjjq1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
+  AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.24.0"; sha256="1x8rwldmwiri0jk1ypc47bgwdq8nzbbxji9pphgs69g09dijsd0f"; depends=[AnnotationDbi DBI]; };
+  AnnotationHub = derive2 { name="AnnotationHub"; version="2.6.5"; sha256="0ff2by5bw5ywxwasiq7z5zc5w7wwwjsvwkj26mjv35zvy7d33kd2"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
+  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.4.1"; sha256="16v6pqdicjsc9vr4mpjrczffw2dzfkzqp302n0c7m8q2hyw869yl"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings curl DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; };
+  ArrayExpress = derive2 { name="ArrayExpress"; version="1.34.0"; sha256="00142sbwbxgwqqhizhjkv5c6jc3575r4s3wwmq4jl6xhlb6nmab6"; depends=[Biobase limma oligo XML]; };
+  ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.24.0"; sha256="13y4z76sf05ix9ca0pw058q49y5q1z9yisngwjwkmigcz2bwp6z2"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
+  ArrayTV = derive2 { name="ArrayTV"; version="1.12.0"; sha256="10dxj9p02lbh80s17yg3blkx1jha8a962949g733k4p6l25av4jx"; depends=[DNAcopy foreach oligoClasses S4Vectors]; };
+  ArrayTools = derive2 { name="ArrayTools"; version="1.34.0"; sha256="02sbknh03k84ylbmmbby8f96dbnwyi2i7hl1p8akf7idg3skinma"; depends=[affy Biobase limma xtable]; };
+  AtlasRDF = derive2 { name="AtlasRDF"; version="1.10.0"; sha256="1ar3ggivwc5nx22kyqapv1sb0ra91nq78c989prx5bli3cxfrkxg"; depends=[hash SPARQL]; };
+  BAC = derive2 { name="BAC"; version="1.34.0"; sha256="0j7l177nc5c1imib2y1lnnza2b5824rjb10plbpa5knn15kql1l9"; depends=[]; };
+  BADER = derive2 { name="BADER"; version="1.12.0"; sha256="0q62cyjqqb5v5cnbn9nm3mlfifz140wk6r27d75dshji4arwc60y"; depends=[]; };
+  BAGS = derive2 { name="BAGS"; version="2.14.0"; sha256="0ajjbz3g09qwdl57ab2yhrdvmbw1d0hfcncglpsbf98pb6kda1br"; depends=[Biobase breastCancerVDX]; };
+  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.4.0"; sha256="1q6msd8l3v10swx4cbc71ggihnw9p3pj87v2n5mgdzpc1nngygib"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
+  BCRANK = derive2 { name="BCRANK"; version="1.36.0"; sha256="0jx6mp6ca4kwpyv341n485hlyzgqayynfrx6vl18dp6f0zkarkym"; depends=[Biostrings]; };
+  BEAT = derive2 { name="BEAT"; version="1.12.0"; sha256="03wcm4ga5vsf7iqih7p0sw39ipjaygvhx2x153fnqfhg34a4k67z"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
+  BEclear = derive2 { name="BEclear"; version="1.6.0"; sha256="1z04ylm5821s7rgrv0bgx5mmy4f09d3a5n4r0mz82lnin7i8swab"; depends=[Matrix snowfall]; };
+  BGmix = derive2 { name="BGmix"; version="1.34.0"; sha256="1zkylanfd9m35hswvyykjqz1rb84fhn51q18g32ilpk4yd78aqj2"; depends=[KernSmooth]; };
+  BHC = derive2 { name="BHC"; version="1.26.0"; sha256="0xawsqh3drpw14c9a3sacd0rmk93p6gn2yfmqlf91a41sbpj0hpc"; depends=[]; };
+  BPRMeth = derive2 { name="BPRMeth"; version="1.0.0"; sha256="0rn4q12bjy5k6g9wkghrxivfzw32qwc6sh4b2b6gaxqsq4rqbnmj"; depends=[assertthat data_table doParallel e1071 earth foreach GenomicRanges IRanges MASS randomForest S4Vectors]; };
+  BRAIN = derive2 { name="BRAIN"; version="1.20.0"; sha256="1nj78v1z98mj1n6kyw4fgradn4yqbyd58db15xwlk8d23gs902wq"; depends=[Biostrings lattice PolynomF]; };
+  BSgenome = derive2 { name="BSgenome"; version="1.42.0"; sha256="0hxwc02h5mzhkrk60d1jmlsfjf0ai9jxdc0128kj1sg4r2k1q94y"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+  BUS = derive2 { name="BUS"; version="1.30.0"; sha256="144x8zl983vis1k0nba5j2i6pywrczmq2cqdg3bd1w1z9n69643k"; depends=[infotheo minet]; };
+  BaalChIP = derive2 { name="BaalChIP"; version="1.0.0"; sha256="0dy3096078gfy9awyagqnbv63ib8bbgh36jf9zvfhilrz9d31xl5"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; };
+  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.2.0"; sha256="09q1bqgz6amraslcdihjz81q7gndn158vp6wpzb1ky9fdd6akd0a"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
+  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.18.0"; sha256="03jpwdngyjs18pzkp17fdyy5vq6h0ccqw942a7nd60dsf27mw3pf"; depends=[RCurl RJSONIO]; };
+  Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.10.0"; sha256="0cgb4qn3gg7cgp81cblg9qkim729bjvygi7wlxsnsriqfjljsb5s"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
+  BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.2.0"; sha256="0z7z6gnsczdb4x9277i0fyf5306gkn94j1j2i5aw1j990hrnb619"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
+  BatchQC = derive2 { name="BatchQC"; version="1.2.1"; sha256="0gdxbn74zrbpgg0y9w0n8mbibh0f320ghgyw32ya1agc8maqkfzm"; depends=[corpcor d3heatmap ggvis gplots knitr limma matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
+  BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.0.0"; sha256="07zmkihvakhqxc6v6hh95d3wkg32vrvag1fbx9qxfmqnnicsrnin"; depends=[Biobase]; };
+  BayesPeak = derive2 { name="BayesPeak"; version="1.26.0"; sha256="1hk31ic0r7zbvfz04h1ginkkhzbz85wdlsmym1aqbiz4x53j97wj"; depends=[IRanges]; };
+  BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.26.0"; sha256="0ms2wa4h81j4q6bwak217q8nkrkmj5zjm33i3gkifbzav2s1k5vf"; depends=[]; };
+  BgeeDB = derive2 { name="BgeeDB"; version="2.0.0"; sha256="11az0sqnjrpfw3pnf0aqgz4kqd8gd1976s9zfyl10gyrfj7h9n49"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
+  BiGGR = derive2 { name="BiGGR"; version="1.10.0"; sha256="1h2ilx761cy3f4vd52kz4vyq74khln5jiwhllg3w4vs4kczvs32k"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
+  BiRewire = derive2 { name="BiRewire"; version="3.6.0"; sha256="138q86h188nnwb4f0q1xw07n0v44cgmfzh5j9xvbkcp522lj0n92"; depends=[igraph Matrix slam tsne]; };
+  BiSeq = derive2 { name="BiSeq"; version="1.14.0"; sha256="1bdgg8mb269hipp0n8bphdgrslzmc8ykcdx848vcgppgfb0dab7a"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
+  BicARE = derive2 { name="BicARE"; version="1.32.0"; sha256="0mkdb2ijr8lb1j08nzd3vwr63vjlpfs739fwk5ay586a99n4qi0z"; depends=[Biobase GSEABase multtest]; };
+  BioMVCClass = derive2 { name="BioMVCClass"; version="1.42.0"; sha256="1zd7s997dyhl85b99nzqy5a2ljdz7gh55l02y3qadgbfazfrfbfl"; depends=[Biobase graph MVCClass Rgraphviz]; };
+  BioNet = derive2 { name="BioNet"; version="1.34.0"; sha256="1vjnlr7gasklb9dshz580bc8z8rkd98093rf0049vqf4z7d65m3j"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
+  BioQC = derive2 { name="BioQC"; version="1.2.0"; sha256="0cjh945vjcgn8lxi3gd13m96vrp01pz96mjn0apcp7xbf2rcfmmx"; depends=[Biobase Rcpp]; };
+  BioSeqClass = derive2 { name="BioSeqClass"; version="1.32.0"; sha256="1m0arhpckd2g48mwfm56av4fkgs6mcmwygxyci0jfh9hl78mp155"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
+  Biobase = derive2 { name="Biobase"; version="2.34.0"; sha256="0js9j9wqls8f571ifl9ylllbb9a9hwf7b7drf2grwb1fl31ldazl"; depends=[BiocGenerics]; };
+  BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.36.0"; sha256="1qgf7hii9zhw8awqs7j89k35y34w45xb9k4sa8csd76h3y7av3q0"; depends=[Biobase]; };
+  BiocCheck = derive2 { name="BiocCheck"; version="1.10.1"; sha256="197kpiycyl3qawm6801fxyxj81d2g57a00qxaqprapsf1d140l52"; depends=[BiocInstaller biocViews codetools graph httr optparse]; };
+  BiocGenerics = derive2 { name="BiocGenerics"; version="0.20.0"; sha256="06szdz7dfs1iyv5zdl4fjzad18nnf1zf3wvglc6c6yd9mrqlf7vk"; depends=[]; };
+  BiocInstaller = derive2 { name="BiocInstaller"; version="1.24.0"; sha256="0y1y5wmy6lzjqx3hdg15n91d417ccjj8dbvdkhmp99bs5aijwcpn"; depends=[]; };
+  BiocParallel = derive2 { name="BiocParallel"; version="1.8.2"; sha256="18zpa0vl375n9pvxsgbid1k96m17nqqgv1g1sfnlmm7kj34jxg6v"; depends=[futile_logger snow]; };
+  BiocStyle = derive2 { name="BiocStyle"; version="2.2.1"; sha256="0sl99xw940ixrm6v24lgaw3ljh56g59a6rdz7g160hx84z9f8n2n"; depends=[]; };
+  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.0.0"; sha256="0asia6f2ff80g8a2w0fckkqhcydkj4ry67c7wlxsz0xzllp14gxl"; depends=[httr knitr rmarkdown stringr]; };
+  Biostrings = derive2 { name="Biostrings"; version="2.42.1"; sha256="0vqgd9i6y3wj4zviqwgvwgd4qj6033fg01rmx1cw9bw5i8ans42d"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
+  BitSeq = derive2 { name="BitSeq"; version="1.18.0"; sha256="0kv2kk1flm6vbs7s2d6kya1jg8hajrxdg5ndihrsybaas5fby8mb"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
+  BrainStars = derive2 { name="BrainStars"; version="1.18.0"; sha256="0q0jx30baf2hnz4mplqj6jhl7mj5hncgb00cj1d6yijv9c9iiay7"; depends=[Biobase RCurl RJSONIO]; };
+  BridgeDbR = derive2 { name="BridgeDbR"; version="1.8.0"; sha256="049a5bdjxp30jc5zgswk0bsyfvri58g4zrbkw258kwgsmk44l6f4"; depends=[RCurl rJava]; };
+  BrowserViz = derive2 { name="BrowserViz"; version="1.6.0"; sha256="06a7sg26b0lwla9vzq9vnggvbhnnw5xh07r7yr258d5030nabpy3"; depends=[BiocGenerics httpuv jsonlite]; };
+  BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.6.0"; sha256="0v1l13i6xf8605xrmgfj0pi0r4w15jpzvz4inhpnm66rn0qv2r5q"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; };
+  BubbleTree = derive2 { name="BubbleTree"; version="2.4.0"; sha256="16sy8yfbjr1shbd63g9354mzxsisqp4d9nfi6hxhj5c2r35x6bga"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr rainbow RColorBrewer WriteXLS]; };
+  BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.38.0"; sha256="04l2dqnf2akq4fhy63sywnmrcddz0r7da3gbd2zgp9fyn6m5ayv0"; depends=[]; };
+  BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.38.0"; sha256="0m7pwiyrk482g73aknmhpp09vc4yb5s3jb8bp3y9d494hdy7mijl"; depends=[BufferedMatrix]; };
+  CAFE = derive2 { name="CAFE"; version="1.10.0"; sha256="0gw5c94fr1kzckai6bgyc5dkgizqir3k8zcc6mdpl5d07hwahsip"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
+  CAGEr = derive2 { name="CAGEr"; version="1.16.0"; sha256="1bbbj2bqc2xd5akmgi30w0h0rfn1n5sv626dz916alhjzhiqx52m"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
+  CALIB = derive2 { name="CALIB"; version="1.40.0"; sha256="0r0dz6vg3sx4bxajh6c8gc12wgnaahnz3yah82jsws1wzplqhkvi"; depends=[limma]; };
+  CAMERA = derive2 { name="CAMERA"; version="1.30.0"; sha256="074ln7d0f5gqsk9cxsckmklbx8grzh9kqjlf8zcz6j7ypnzkhy57"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
+  CAnD = derive2 { name="CAnD"; version="1.6.0"; sha256="14nq061i69hk8yrkiq35lk7nk58klpl7lmkjzfdd8789h87218b2"; depends=[ggplot2 reshape]; };
+  CCPROMISE = derive2 { name="CCPROMISE"; version="1.0.0"; sha256="0cx58i42dypx6sqyrmbf4gw2c2213cgjbijkq2fxf9ah8fm4ss3p"; depends=[Biobase CCP GSEABase PROMISE]; };
+  CFAssay = derive2 { name="CFAssay"; version="1.8.0"; sha256="0p91q4z8kip0pqn45kspczhffv9f6mwn1p07q2bwl5fdcbs2xp5p"; depends=[]; };
+  CGEN = derive2 { name="CGEN"; version="3.10.0"; sha256="189bhjzgcag4n216h0jnq994y439nd052yalx7ll5q7nazhw5j8w"; depends=[mvtnorm survival]; };
+  CGHbase = derive2 { name="CGHbase"; version="1.34.0"; sha256="1pb1paby9n9map71jk971qfpni2m23hcwrssqqjb7byjc9flnmf5"; depends=[Biobase marray]; };
+  CGHcall = derive2 { name="CGHcall"; version="2.36.0"; sha256="0wnyslj7yn0yc57q60w2y644lmvvvih6rzm55rrad34lz2h39bsz"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
+  CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.28.0"; sha256="1bv8vivl9b0c1dp7ka9dh3gvk1z4zpcirifh7yq0p9g9yr22k0vb"; depends=[Biobase CGHbase CGHcall]; };
+  CGHregions = derive2 { name="CGHregions"; version="1.32.0"; sha256="1cc2vz6k5lasvzj2dh8xm26j7zvvwwx8791pqhz6q2fisxq5vz1c"; depends=[Biobase CGHbase]; };
+  CHRONOS = derive2 { name="CHRONOS"; version="1.2.1"; sha256="0hzj01dw4xwivy0ikyh55i2zkf61g03m6rm6xfdhc7a49y6fzxpr"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
+  CINdex = derive2 { name="CINdex"; version="1.2.0"; sha256="096qiz86rxfhcrjs0pf3mp5zqgi3j7i4agbw53ym5kwzg486y2r2"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
+  CMA = derive2 { name="CMA"; version="1.32.0"; sha256="0706k4xjakyid6mkca6z6r24kbsnkvw7qzzadqkm45sy11z0w5l8"; depends=[Biobase]; };
+  CNAnorm = derive2 { name="CNAnorm"; version="1.20.0"; sha256="0dja320m9yiaj0kp9gmygpbqffnjdpi476wwcs2gwd6yixsldl6b"; depends=[DNAcopy]; };
+  CNEr = derive2 { name="CNEr"; version="1.10.2"; sha256="12z2iza0mgw9yrpnlv7447mcsxn8h183712q66f1j4a779mhn5ii"; depends=[annotate BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; };
+  CNORdt = derive2 { name="CNORdt"; version="1.16.0"; sha256="086ynj0nb6799qxgj7zys9gzxf4lvhacsqxr2qzl2hw4y13gxxkp"; depends=[abind CellNOptR]; };
+  CNORfeeder = derive2 { name="CNORfeeder"; version="1.14.0"; sha256="19x8xxra4n5ys8wjqwj49qs3lg5jq9y00c36avr7cckxi9kyqqhc"; depends=[CellNOptR graph]; };
+  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.16.0"; sha256="03k246x3yi0c3bw8h0642767p6zbgx8d0ahvnv29lcrb7wp9qsi3"; depends=[CellNOptR nloptr]; };
+  CNORode = derive2 { name="CNORode"; version="1.16.0"; sha256="1zsnig3r8yqa06nfxbd8czxjk72h5z7h0vd85cqkb181bwagl0r3"; depends=[CellNOptR genalg]; };
+  CNPBayes = derive2 { name="CNPBayes"; version="1.4.0"; sha256="1ly0mh6k7x443i25g0j716aflc5q2rld0fqnyr86k1x06rh0ky8q"; depends=[BiocGenerics coda combinat GenomeInfoDb GenomicRanges gtools IRanges matrixStats RColorBrewer Rcpp S4Vectors SummarizedExperiment]; };
+  CNTools = derive2 { name="CNTools"; version="1.30.0"; sha256="0wcny74g377741as9dw87n4vf6yi8yvxhxbf87x0y4zkf88aimcz"; depends=[genefilter]; };
+  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.4.0"; sha256="00xgwf62cs9l6pnvbp33b442q1mgaibac5fw4n2qsypdfb2p1xn3"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; };
+  CNVrd2 = derive2 { name="CNVrd2"; version="1.12.0"; sha256="1msjvq3200y637ybh2yb5g1c2z0aqk1bwjvrndrg36vlg7342b6y"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
+  CNVtools = derive2 { name="CNVtools"; version="1.68.0"; sha256="1lx2jhwfwya2hm8v9dkqkjhfbfp008k2k75r63wpph8yfxhyvvmz"; depends=[survival]; };
+  CODEX = derive2 { name="CODEX"; version="1.6.0"; sha256="077cbv8n6mr8ksapxj2b837ms68kyzgjlk499c69q3dji456bgfw"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
+  COHCAP = derive2 { name="COHCAP"; version="1.16.0"; sha256="14smbyviii5ghac3rhkrz87vhx6nxgv3n54k3rrzsdbrw8n0i773"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; };
+  COMPASS = derive2 { name="COMPASS"; version="1.12.0"; sha256="1cmqqcsv32ixdmm9qybvafjca6lqzc652hp4jn9vy62ffb81r8i8"; depends=[abind clue data_table knitr pdist plyr RColorBrewer Rcpp scales]; };
+  CONFESS = derive2 { name="CONFESS"; version="1.2.2"; sha256="1zw3sl5vzn6j8qppz39s2l11f9n2p5yzr4b17qgar6p41f83xffa"; depends=[changepoint cluster contrast EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
+  CORREP = derive2 { name="CORREP"; version="1.40.0"; sha256="1wd8qq11xdyis0acnzlml10m0z8fazzhmvxxqa21h2wpq0yz9m19"; depends=[e1071]; };
+  COSNet = derive2 { name="COSNet"; version="1.8.0"; sha256="07s72x0dbsnq340v1akl4jp8m63nnxck2nvivz12cvbq8hbhz6hf"; depends=[]; };
+  CRISPRseek = derive2 { name="CRISPRseek"; version="1.14.1"; sha256="0l3blmszil8zr03wg9pwl59lkyxbn1pa3pz967nlbwffcv2lqfa0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
+  CRImage = derive2 { name="CRImage"; version="1.22.0"; sha256="0km82x446b1r9b27z1cx65nd9lm8ppxkarzqwqs426hj59wpzxhf"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
+  CSAR = derive2 { name="CSAR"; version="1.26.0"; sha256="15w6mmwd5pqb144x3dyhi6x2ni00n0ak94lfrw317rajq733zr0p"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+  CSSP = derive2 { name="CSSP"; version="1.12.0"; sha256="03gpl3w7iw79gcni4xchvbkrsp7v6i8zy6aqws54za4wimwqvsnf"; depends=[]; };
+  CVE = derive2 { name="CVE"; version="1.0.0"; sha256="0xmy5mdw43db9d8pd3k6d73005hba72df24fsmgp9dv5sy9rg6p2"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny WGCNA]; };
+  CancerInSilico = derive2 { name="CancerInSilico"; version="1.0.0"; sha256="17jmyrcgs698g74hxp9mif7g4s175qdrfy5h1zz72fwcssmblh74"; depends=[BH Rcpp testthat]; };
+  CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.16.0"; sha256="1wzbrlw5zf0pmm5m41wqf73wlsidb11l7l9llrmidbg860j0jjs0"; depends=[AnnotationDbi limma qvalue]; };
+  CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.0.0"; sha256="1vja80lj16icp6jblw62b24daj7izgk9wbhbwprlbgcjvkppxfik"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; };
+  Cardinal = derive2 { name="Cardinal"; version="1.6.0"; sha256="1fwni0dwn1syz5j0961fpmnmifqb20hd23ysazfi3xvdq7pf1lw7"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; };
+  Category = derive2 { name="Category"; version="2.40.0"; sha256="16ncwz7b4y48k0p3fvbrbmvf7nfz63li9ysgcl8kp9kl4hg7llng"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL RSQLite]; };
+  CausalR = derive2 { name="CausalR"; version="1.6.0"; sha256="0l0021qslqj0xvrkg1lpmfnwdvi03yc7y2k62iz83s7k77z0wj6c"; depends=[igraph]; };
+  CellMapper = derive2 { name="CellMapper"; version="1.0.0"; sha256="1ixii9ppg7jhwvazzzjy3dq01x35yc3k81j698988dfrdls0plcv"; depends=[S4Vectors]; };
+  CellNOptR = derive2 { name="CellNOptR"; version="1.20.0"; sha256="1awz7k09rx03f8dq5g9mmnlizpx6232vvc03ycah3r1wwzgfzlhd"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
+  CexoR = derive2 { name="CexoR"; version="1.12.0"; sha256="110c7p0y3l7b491bvr78n5z8f4gmfgfjndbd8pnhn0k7abb9bvs9"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  ChAMP = derive2 { name="ChAMP"; version="2.6.4"; sha256="1f8ngnzp6yq4x746vid72ind2bi7l1wdfnipyj2wn0gsh2jpxa7c"; depends=[bumphunter ChAMPdata dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICmanifest impute isva limma marray matrixStats minfi plotly plyr preprocessCore quadprog qvalue RColorBrewer RefFreeEWAS RPMM shiny shinythemes sva wateRmelon]; };
+  ChIPComp = derive2 { name="ChIPComp"; version="1.4.0"; sha256="0wr9qrw9mnjl28fw764vhjb2shif6fl3z0hbwkhrfiz1974rdw0v"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
+  ChIPQC = derive2 { name="ChIPQC"; version="1.10.3"; sha256="1nabghyndp4bky6msb4k6gcxpgysz7rir545d5afrfi4gbk1rpfi"; 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_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
+  ChIPXpress = derive2 { name="ChIPXpress"; version="1.16.0"; sha256="19lx482jhh4h97nic57lk198a0x1xc51cnx79l9h6r9r86ncxl0w"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
+  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.8.9"; sha256="1wykx52xqnz9pcxgfzf5i0ckrw41jg0piwynx1v1ldjxajbdh904"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI 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.10.3"; sha256="00bv8i44c33ak2v6wzzk7s963wdhzb3c03ch2v8bkmnnb99sk0za"; 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.28.0"; sha256="0bv5anp4p220vh53khaqggwclp34k2402mfcj28wv9cfl7xhw4g3"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
+  ChIPsim = derive2 { name="ChIPsim"; version="1.28.0"; sha256="06f00mviqxgqqli6lkybryl81hvf1ica94sj1zjc9bzm1aiva2fv"; depends=[Biostrings IRanges ShortRead XVector]; };
+  ChemmineOB = derive2 { name="ChemmineOB"; version="1.12.0"; sha256="1f5wx3259v5whwy9h8jw7gs52n65gdby8q0lq1z9md0846i8cx6p"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
+  ChemmineR = derive2 { name="ChemmineR"; version="2.26.1"; sha256="1i3cdszdb4k0cj3sl1p2fll7vxk47w2fldjzwb3b24qab0xczyih"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; };
+  Chicago = derive2 { name="Chicago"; version="1.2.0"; sha256="1bxb35azi6sdlw0rl043h50cs20ysgmmydlscl5nn96ajk5ahs74"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
+  ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.28.0"; sha256="034cianqg08rkqi2gpw29q144hnnnjb8jrmw180lfsdqbms8hlq3"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; };
+  ClassifyR = derive2 { name="ClassifyR"; version="1.8.2"; sha256="0mn5hmlyhln7yngqvq8k6ir63jhf71b1h6s3322pppbypq25njsz"; depends=[Biobase BiocParallel locfit ROCR]; };
+  Clomial = derive2 { name="Clomial"; version="1.10.0"; sha256="0nabq2nng5hc1rpqhr8riav0gjckzhhfr6i35ff5dxb4md3bgsxm"; depends=[matrixStats permute]; };
+  Clonality = derive2 { name="Clonality"; version="1.22.0"; sha256="0qi62476ix6vm0zr7n3zvh6msl8w3lcnk8bn8c7qvynkn82ky4j4"; depends=[DNAcopy]; };
+  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.2.3"; sha256="169mi6xr5jslwgs9vyx0g90n2vp3za6v0hih714bamkk4vsjpzrv"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
+  CoCiteStats = derive2 { name="CoCiteStats"; version="1.46.0"; sha256="0jsgcgrr8nnw8mngxcvijri94k6aq2r8svzbrif22m1v7cpddhll"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  CoGAPS = derive2 { name="CoGAPS"; version="2.8.0"; sha256="1mbnyim02l1k77r2lchz7k42x9hpj1yvcq4qspyf2rh9d9p03zg6"; depends=[BH gplots RColorBrewer Rcpp]; };
+  CoRegNet = derive2 { name="CoRegNet"; version="1.10.0"; sha256="1gh9nkgxm4b583rf33g4qziz989725l42nnfyrjasjcgwb996scz"; depends=[arules igraph shiny]; };
+  CompGO = derive2 { name="CompGO"; version="1.10.0"; sha256="1walrgh7bczfzms8syi2vcmjzq1xigxl2jld9v9i7v139h4yvp6d"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
+  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.12.0"; sha256="0r5d75lj0fbskizpmhbv0w4wscpfjfq9k3vbadyfs8wadmp9xvdh"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; };
+  ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.38.0"; sha256="0lw8j9gvm227yjh0ya05j4x87a9p6s95cr7sraza0zh6qc70vgzb"; depends=[ALL Biobase cluster]; };
+  CopywriteR = derive2 { name="CopywriteR"; version="2.6.0"; sha256="1bwwnsyk7cpgwkagsnn5mv6fv233b0rkhjvbadrh70h8m4anawfj"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+  CorMut = derive2 { name="CorMut"; version="1.16.0"; sha256="0c0wx7nldq0wsa5z6l398jnnpkxjkqj9yc490x15kyds9pyazm85"; depends=[igraph seqinr]; };
+  Cormotif = derive2 { name="Cormotif"; version="1.20.0"; sha256="0wh5wj3z5q2yk9jw5wmd2adpwhl0vck19flzdwns55bfndz7s5xd"; depends=[affy limma]; };
+  CountClust = derive2 { name="CountClust"; version="1.2.0"; sha256="14frvr84dxfp4ily2x40gr7phh8d39ljxnlkz0224cc7v2lnkjz7"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam]; };
+  CoverageView = derive2 { name="CoverageView"; version="1.10.0"; sha256="1sfhir56rra207z8pl8px40qrc5hca8kf4zmrl2pk9zr7ksbd1z5"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+  CrispRVariants = derive2 { name="CrispRVariants"; version="1.2.0"; sha256="0dvzyz3rxwd5blfcaf05viy35w7n8681wzb2lr5zdc44nm92d3kz"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
+  CytoML = derive2 { name="CytoML"; version="1.0.1"; sha256="034ki5bi83m04c9l2m636vb5l1wj0nmvyphj1db7bhz8i0h8as7w"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace graph jsonlite ncdfFlow openCyto RBGL Rgraphviz XML]; };
+  DAPAR = derive2 { name="DAPAR"; version="1.6.0"; sha256="0v176my80p7p26azczw75yqi9zdfvxjf35hjr5hprhm795bppavx"; depends=[Cairo cp4p doParallel foreach ggplot2 gplots impute imputeLCMD knitr lattice limma Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer reshape2 scales tmvtnorm vioplot]; };
+  DART = derive2 { name="DART"; version="1.22.0"; sha256="0ysi99wlhb6v98nfqd6vss0c14sh87p0v13099dll18ijifvfkqr"; depends=[igraph]; };
+  DBChIP = derive2 { name="DBChIP"; version="1.18.0"; sha256="00jwf6163dbrglbq1fba3380ad7wxd8swj2xcm650m41i2nf2rqz"; depends=[DESeq edgeR]; };
+  DChIPRep = derive2 { name="DChIPRep"; version="1.4.0"; sha256="0l31w5xs2g9bdyy191gpslp41m9k42pq5lzd86vpm1xw0792q9w0"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
+  DECIPHER = derive2 { name="DECIPHER"; version="2.2.0"; sha256="07i9dgw4hck0jgxsj80sc68wf1d7d7zqxy8vbpf1ynf3m1zwkynp"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
+  DEDS = derive2 { name="DEDS"; version="1.48.0"; sha256="18bb887dhifdkcp0bgg4dfcx3nlwxnrakh0r000i856m5fn79zd5"; depends=[]; };
+  DEFormats = derive2 { name="DEFormats"; version="1.2.0"; sha256="047cvxbzs0mg14y9005f40xjgj1pgik43jb3q5z1inipqgmj1sn4"; depends=[checkmate DESeq2 edgeR GenomicRanges SummarizedExperiment]; };
+  DEGraph = derive2 { name="DEGraph"; version="1.26.0"; sha256="1s7gjraaqvndr590wbnvjq4wik6bmbdijl6l0ribd5d7r5zic0gm"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
+  DEGreport = derive2 { name="DEGreport"; version="1.10.1"; sha256="0llhniqryz3fckgmkc89h89ipc7ambi323y2awwyqc080d7ph37p"; depends=[cluster coda dplyr edgeR ggplot2 gridExtra knitr logging Nozzle_R1 pheatmap quantreg reshape tidyr]; };
+  DEGseq = derive2 { name="DEGseq"; version="1.28.0"; sha256="0p9m0bky2fa320nw22bfa270zj91aywmyp0vs67x3x4aimhirz7g"; depends=[qvalue samr]; };
+  DESeq = derive2 { name="DESeq"; version="1.26.0"; sha256="18f0400pcmla88kc2prscw0skkf7bww0mnkrj6hhxyy79dhzdy86"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
+  DESeq2 = derive2 { name="DESeq2"; version="1.14.1"; sha256="1walwkqryn1gnwz7zryr5764a0p6ia7ag4w6w9n8fskg8dkg0fqs"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+  DEXSeq = derive2 { name="DEXSeq"; version="1.20.2"; sha256="1j3ll3417smxx1akbi3kk1r2p0m8jfrgfd35rhmr3q8b3lz3x9pw"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
+  DEsubs = derive2 { name="DEsubs"; version="1.0.2"; sha256="0v35x38sh6i69m7wjwzyyjhcx88wrrz3gr5w1r80cg5rvjl8bhch"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
+  DFP = derive2 { name="DFP"; version="1.32.0"; sha256="08jjhzqr4yv2zwdgn43r3bvh2hw0fsamicyzdwcfkamvw9p5ipxf"; depends=[Biobase]; };
+  DMRcaller = derive2 { name="DMRcaller"; version="1.6.0"; sha256="196km32s5z881hsranycsmmqk1nxr3vdfhwdy9l1j179b64vz09w"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
+  DMRcate = derive2 { name="DMRcate"; version="1.10.10"; sha256="1snsq6j1na9z78mks43fhgz2iayizm4vd51kx4m8zikc198h3xw1"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; };
+  DMRforPairs = derive2 { name="DMRforPairs"; version="1.10.0"; sha256="0flr8a8bzhwcs4hhrcb8ilzr1pzlgic4d5nm8gsqnrgjdjh05np7"; depends=[GenomicRanges Gviz R2HTML]; };
+  DNABarcodes = derive2 { name="DNABarcodes"; version="1.4.0"; sha256="13xc3abfm2yg7s1h0way99vcj3577p3j183jhqq4ii86c6y9c6k7"; depends=[BH Matrix Rcpp]; };
+  DNAcopy = derive2 { name="DNAcopy"; version="1.48.0"; sha256="1idyvfvy7xx8k9vk00y4k3819qmip8iqm809j3vpxabmsn7r9zyh"; depends=[]; };
+  DNAshapeR = derive2 { name="DNAshapeR"; version="1.2.0"; sha256="0zm1c989h34iqk0w9sgz7bdz3h0njns856yhc1q7n6vfqnhhygsz"; depends=[Biostrings fields GenomicRanges Rcpp]; };
+  DOQTL = derive2 { name="DOQTL"; version="1.10.0"; sha256="0fn444vc1w274079a3yn79rnv6i1nhqp9jwyg0qkih53bg49519x"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; };
+  DOSE = derive2 { name="DOSE"; version="3.0.10"; sha256="13m5akx9hi11906sbrbcz8q36m9h8i0wqm5323bdnlprv217m8fq"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim igraph qvalue reshape2 S4Vectors scales]; };
+  DRIMSeq = derive2 { name="DRIMSeq"; version="1.2.0"; sha256="1iiqb3ccxh9y2sc913sw7lcd16bq54kj6z5hk6f7khsgwy84g5q6"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges reshape2 S4Vectors]; };
+  DSS = derive2 { name="DSS"; version="2.14.0"; sha256="09452x6cs16b2fxx7h74midxkla7cc46paqkxhilx82nf2yrjzrm"; depends=[Biobase bsseq]; };
+  DTA = derive2 { name="DTA"; version="2.20.0"; sha256="16bp4gy8ifc3ag24d6npfzvwhv4by371qilqsxnmd677pq75ccx6"; depends=[LSD scatterplot3d]; };
+  DeMAND = derive2 { name="DeMAND"; version="1.4.0"; sha256="03w9vcv8ji82hhyy70mh5smib565gzjdp4bl7i1h1y3wjmsrq760"; depends=[KernSmooth]; };
+  DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.16.0"; sha256="0p8vg1b8arpv01cdgq37c0mfmkd824b47cd8cpdzf7nhrhq53w65"; depends=[ggplot2 limSolve pcaMethods]; };
+  DeepBlueR = derive2 { name="DeepBlueR"; version="1.0.11"; sha256="1zqr0bdsf4xlkdqrpg1ihc287gppw56p9p9smy97npm2dnqygw6f"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; };
+  DiffBind = derive2 { name="DiffBind"; version="2.2.12"; sha256="0w3dwhjkf0sc7bd3m13gwym03j3pyli3xy2y7dqsqn8mhm64bqcy"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; };
+  DiffLogo = derive2 { name="DiffLogo"; version="1.4.0"; sha256="1pla3izw79il49vlrp21shyq13xvg6vbayrjs6kbhjih738x0i5j"; depends=[cba]; };
+  Director = derive2 { name="Director"; version="1.0.0"; sha256="0g0z2pp4jk9a3sfcidq8abgwnki8za73wzvpm4xdzy5g6lrcf3y7"; depends=[htmltools]; };
+  DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.16.0"; sha256="0jrjragn40qjbrm7amg066jbl1ypxzs3h5cbd7vv35iwwvzgmgr3"; depends=[BiocGenerics IRanges S4Vectors]; };
+  DriverNet = derive2 { name="DriverNet"; version="1.14.0"; sha256="19n396565sngzc3pk2dibqsza9pmp8dm1nrhlipv663r46s6j6kz"; depends=[]; };
+  DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.14.0"; sha256="0pbaa9dg8g0bwky2mjr3wjpavf82xd564c1wx813ivsdx8a69pnm"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
+  DupChecker = derive2 { name="DupChecker"; version="1.12.0"; sha256="0yrlx3w8ndij5ynfyjh0y5xyldsnsyhgw7ilnx728vfxp7zgw6fv"; depends=[R_utils RCurl]; };
+  DynDoc = derive2 { name="DynDoc"; version="1.52.0"; sha256="0nd7873m3zgyx1ryyhy9bsvzzkvdvqggk5sbnai4aph2hy2lbk1a"; depends=[]; };
+  EBImage = derive2 { name="EBImage"; version="4.16.0"; sha256="0gbl9waszvkavw68npsjq1c7yhqljgb2r0qx4f8i05cp8i0yr3rx"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
+  EBSEA = derive2 { name="EBSEA"; version="1.2.0"; sha256="1ikkj4mmr1rdcxsy1anc3ik3vy1hn0v262h17751y64bk2djvycj"; depends=[edgeR gtools limma]; };
+  EBSeq = derive2 { name="EBSeq"; version="1.14.0"; sha256="14ny417fijjnrkz5hjj8z8s6dbrqxx0cyi85585g06nrv8mm1hhl"; depends=[blockmodeling gplots testthat]; };
+  EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.8.0"; sha256="0ahmsxqixapdjpwsr1wnmk7lq5fnbqpq7vsbs9qk2a5pl2lxzqd0"; depends=[EBSeq]; };
+  EBarrays = derive2 { name="EBarrays"; version="2.38.0"; sha256="1r00rdd5zlm29jc0yq3jns08cv67f9wk6lia56m52zscqcji6nvw"; depends=[Biobase cluster lattice]; };
+  EBcoexpress = derive2 { name="EBcoexpress"; version="1.18.0"; sha256="0lhcvd49rhmcdbmxizivcn7wi9bv0av2p9mz4grpnb3a0r6hjgdm"; depends=[EBarrays mclust minqa]; };
+  EDASeq = derive2 { name="EDASeq"; version="2.8.0"; sha256="0biwxx1ssqj3isc15i7crm05cyapm47ny4jks8wr9pqha715myai"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
+  EDDA = derive2 { name="EDDA"; version="1.12.0"; sha256="1ra5jdngpiif9wd322ncg72ik2wkapcn7z3raw6rb5ii8g5706fc"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
+  EGAD = derive2 { name="EGAD"; version="1.2.0"; sha256="04zaykhl3dkaqy73dsgj0kqghisxgck2fjbwrvlc9j8rb2rggnmd"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
+  EGSEA = derive2 { name="EGSEA"; version="1.2.0"; sha256="0wd4a89l8isbgqcyls8pw5h1l68qd4k1c7nxci7q4d86vrv3xzwd"; depends=[AnnotationDbi Biobase edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview RColorBrewer safe stringi topGO]; };
+  ELBOW = derive2 { name="ELBOW"; version="1.10.0"; sha256="0x86czjfzpkxs9z6fn6siapwj6320f096bzg3bfjzaa387g89sk0"; depends=[]; };
+  ELMER = derive2 { name="ELMER"; version="1.4.1"; sha256="1q60yi3wqjmm2y6dfl5qjgxzhdjd22vsdsnan8mw1fl2kljjlbdl"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; };
+  EMDomics = derive2 { name="EMDomics"; version="2.4.0"; sha256="0fkyvmib34kwz4zzp3f0miw9bhn87hmbk0j94gla2fgxvxwby1sf"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
+  ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.0.6"; sha256="0876lfyh5584nq6sqz3yyc4ixl1pfyx1wamhdfcyq6c86yi5prgp"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; };
+  ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.22.0"; sha256="1h3nz1k2rl2b14hh61yqq3dng3h3k3qp48w8izfsdwjm9imxs3kb"; depends=[rJava XML]; };
+  ENmix = derive2 { name="ENmix"; version="1.10.0"; sha256="17ppsfbl68fsck4nyda4x8k5sdymn52dgkvky1q4cri3xvn2kkpj"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
+  EWCE = derive2 { name="EWCE"; version="1.2.0"; sha256="1iq62cn389sa0h3y6rj61n51a1wkjcpnq9a3la2gavddd0iqsbl8"; depends=[biomaRt ggplot2 reshape2]; };
+  EasyqpcR = derive2 { name="EasyqpcR"; version="1.16.0"; sha256="1hlhvpz18q6wfwmfj0fs8saacpyaild2p7qwmgmndcv2lqpmgcrh"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
+  EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.2.0"; sha256="0l7dq2ww2vi39iipazfv71i0bw6j029x3llbnd15sf7lpsplc9df"; depends=[]; };
+  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.4.0"; sha256="013y7iygzf7vy1g34c2ww55m4w1173mxbwi4pn6x75r1fmnmvkai"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats]; };
+  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.4.6"; sha256="1xijwplmlcdi2rqp8frsbwgxby6k2mnjbfv2dw560rgcmys7n395"; depends=[AnnotationDbi Biobase biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
+  ExiMiR = derive2 { name="ExiMiR"; version="2.16.0"; sha256="11pr3jlzm8hm4bizpgwvmr1ylb41rd487mp71890paqwhv91abq1"; depends=[affy affyio Biobase limma preprocessCore]; };
+  ExperimentHub = derive2 { name="ExperimentHub"; version="1.0.0"; sha256="15254v73vi7vr7cky29i58np5ljq7iawmffrb1vir54snpgw72q9"; depends=[AnnotationHub BiocGenerics BiocInstaller S4Vectors]; };
+  ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.0.0"; sha256="1i55z69idxk3zpiypid045mssvfbysbincxfp0z8sh5gf0dipj9d"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; };
+  ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.2.0"; sha256="07asxjzplx05jkxm05lxny4np9yw0i9ir0pbhg76dxnx7k1x1bv4"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; };
+  ExpressionView = derive2 { name="ExpressionView"; version="1.26.0"; sha256="0fy2cay5s9ypbrdjj6v5n8l99pq0fggw6gl9xh451vr2j0c8cmr8"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
+  FEM = derive2 { name="FEM"; version="3.2.0"; sha256="1ivhzap6hcdwpy8yf1sl4gh53c24nzm22br08z8g99wl3q3apsg0"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
+  FGNet = derive2 { name="FGNet"; version="3.8.0"; sha256="07v32575vws879745zc1c75rlwbdrybijhbc3hs7s4w4nz574lfc"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
+  FISHalyseR = derive2 { name="FISHalyseR"; version="1.8.0"; sha256="0fn92g2zzv35xhd28p5zb3qqhqy9hflz4d1sk3cjajpav26k9dnd"; depends=[abind EBImage]; };
+  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.10.0"; sha256="0ccp7s4qg2mf0mnz9hvasscgc18nmqmjrfwj9k2x1nv6rhph51cv"; depends=[fda MASS]; };
+  FamAgg = derive2 { name="FamAgg"; version="1.2.1"; sha256="16iaj8zn12kq89sksq5dqgfxyb5048vdfhvjqgvp455vi74jkx9z"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
+  FindMyFriends = derive2 { name="FindMyFriends"; version="1.4.0"; sha256="1r2jqrsgsmrlz3fa8qp7pb4bxh6am2xmgafnk5xh679kyvdhp4dh"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
+  FitHiC = derive2 { name="FitHiC"; version="1.0.0"; sha256="1pzywxdn2qkkfkhnf1n4d9fnvz3kz4301kxqmszj3d10z2wlhzab"; depends=[data_table fdrtool Rcpp]; };
+  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.6.0"; sha256="06z3wandk8vaabkbmm0w6jaknimysfm16r351alg28ajznxqiw1n"; depends=[jsonlite RCurl XML]; };
+  FlowSOM = derive2 { name="FlowSOM"; version="1.6.0"; sha256="1lbyxhs59cc3mfqbgskgnx5vbly6rr2dswn3hwlw5nh2idpwnwfn"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; };
+  FourCSeq = derive2 { name="FourCSeq"; version="1.8.0"; sha256="0n0zsmh48vy756wg3rmnsqsl0kyy8wl1sm97c0w1yp4wpak36qqp"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+  FunChIP = derive2 { name="FunChIP"; version="1.0.0"; sha256="1l0hyg3scp0b1xsx7xl8x6629iaf155k50vykjk17kb6aand5p19"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges Rcpp Rsamtools shiny]; };
+  FunciSNP = derive2 { name="FunciSNP"; version="1.18.0"; sha256="03wzrrdhnp6svf4vy907h6bbnpfgrbqhqabsah37qzld15qm2xs2"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
+  GAprediction = derive2 { name="GAprediction"; version="1.0.0"; sha256="18675g9405x4bhbgk1y3lc011cz409qgqgmnsr9pg1cr1cpfcgqh"; depends=[glmnet Matrix]; };
+  GEM = derive2 { name="GEM"; version="1.0.0"; sha256="12y8pnbvfmid0spid61nxlf79nnq64yd1q6as7mi95nqgf498lcb"; depends=[ggplot2]; };
+  GENE_E = derive2 { name="GENE.E"; version="1.14.0"; sha256="07qc96cja92zbs87qmrpxl6jym96vazygybmjvkxzb3cmw8ivcrg"; depends=[RCurl rhdf5]; };
+  GENESIS = derive2 { name="GENESIS"; version="2.4.0"; sha256="1gknm10fjgry5arz60y6yvkdpiwf1nkvyyxdgh2jbslz6ypgcy57"; depends=[Biobase gdsfmt graph GWASTools SeqArray SeqVarTools]; };
+  GEOmetadb = derive2 { name="GEOmetadb"; version="1.34.0"; sha256="0gjzhx3x1945ny8wqp1w6gwgbx81wsqbgc9l7sd2wqnf85w5y513"; depends=[GEOquery RSQLite]; };
+  GEOquery = derive2 { name="GEOquery"; version="2.40.0"; sha256="1p4dsmbibhrjdffkh8z1fff4j85jczwn4djnnpj2ifvz2x05q3vc"; depends=[Biobase httr RCurl XML]; };
+  GEOsearch = derive2 { name="GEOsearch"; version="1.0.0"; sha256="1xz3mizjh1nfmc4726jjj38qdn5byjwlinwbd3j0k2qw5dvzmjaj"; depends=[org_Hs_eg_db org_Mm_eg_db RCurl]; };
+  GEOsubmission = derive2 { name="GEOsubmission"; version="1.26.1"; sha256="0niagqjl5sqi4frjj23glgib0js1gf7p7lj4qbz8lvkg1arj2kba"; depends=[affy Biobase]; };
+  GEWIST = derive2 { name="GEWIST"; version="1.18.0"; sha256="1faw43mvv3v9yl9lbllx0gj588i7r9rfm453mwq80v9adllrnnkw"; depends=[car]; };
+  GGBase = derive2 { name="GGBase"; version="3.36.0"; sha256="1wmxv6wl6d050xjc0sc0z2i74y3xnnr6vmdynipcncbsrmsw91gv"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
+  GGtools = derive2 { name="GGtools"; version="5.10.1"; sha256="1cngmdk9ggp38gbp3kqs74ixa5ak5cm1n09z1lrhg110byim79ry"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
+  GLAD = derive2 { name="GLAD"; version="2.38.0"; sha256="1din6jgb2n6qs6g10133mc506y3bmc2gpwdcj6q8fm3jwq3iw769"; depends=[]; };
+  GMRP = derive2 { name="GMRP"; version="1.2.0"; sha256="17n77baq513wxnh0dh313h7bpj01jkfs4ybac1w5bmsqbafnakz8"; depends=[diagram GenomicRanges plotrix]; };
+  GOFunction = derive2 { name="GOFunction"; version="1.22.0"; sha256="1gn9z2si5jg7db28ldmgj03b0acv9mq884srmgjyq3ar705hkvd9"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
+  GOSemSim = derive2 { name="GOSemSim"; version="2.0.4"; sha256="1ii12y5yb6mby76c193ampvjk0klsx3kl0h6qmr3359sdx9mcbiq"; depends=[AnnotationDbi GO_db Rcpp]; };
+  GOSim = derive2 { name="GOSim"; version="1.12.0"; sha256="0539da5ljil1l158bdrj7xmgj7da33kwqk8ng5snwv9jzvmynrdn"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
+  GOTHiC = derive2 { name="GOTHiC"; version="1.10.0"; sha256="17n51iw61xyfiladvrz36ksvj6sdfgmhbxs9hx25g3j5biv0sxw0"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
+  GOexpress = derive2 { name="GOexpress"; version="1.8.1"; sha256="00gnznvyg2mpk6cv5jk842h71awikw3qbzg43vl72cxcb8iai7fj"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr VennDiagram]; };
+  GOpro = derive2 { name="GOpro"; version="1.0.0"; sha256="0wypc72p940b2jh8s83k4hs5m4flvpr724xgzscygcn3v25b23c7"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; };
+  GOstats = derive2 { name="GOstats"; version="2.40.0"; sha256="0g2czm94zhzx92z7y2r4mjfxhwml7bhab2db6820ks8nkw1zvr9n"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; };
+  GOsummaries = derive2 { name="GOsummaries"; version="2.8.0"; sha256="05aws7ln6jxisgmxkx3m3lfz87i8ayy8bdm8lgjyhhskf5gq7yzn"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
+  GRENITS = derive2 { name="GRENITS"; version="1.26.0"; sha256="1x1rxs3id7kbp7lf3a8460qh6p0mlhx1w33yyy20cd45y407xxji"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
+  GRmetrics = derive2 { name="GRmetrics"; version="1.0.0"; sha256="0pviyq23gsivqxm9pzxa5d911f32m3p8gkav9hbsn2fm2x7g8k07"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; };
+  GSALightning = derive2 { name="GSALightning"; version="1.2.0"; sha256="0hxjlnzwk16s1qxnd1dsd8f9zbwqnpq7vyrr3ag6yq4xm6rksr9v"; depends=[data_table Matrix]; };
+  GSAR = derive2 { name="GSAR"; version="1.8.0"; sha256="0wdz3jx1dnw6w71r3spfi09nqyndvb0f610qci50s824k593aglp"; depends=[igraph]; };
+  GSCA = derive2 { name="GSCA"; version="2.4.0"; sha256="1fxc3s891flai43j8i7bp9q3v6ynkbd4yx6y5rgvf8360bl62s3z"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
+  GSEABase = derive2 { name="GSEABase"; version="1.36.0"; sha256="0l2x7yj7lfb0m2dmsav5ib026dikpgl4crdckrnj776yy08lgxpj"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
+  GSEAlm = derive2 { name="GSEAlm"; version="1.34.0"; sha256="0ykxpki36spgb562805k5hi2cyp984gjr2flq591vc8qhz87d1ry"; depends=[Biobase]; };
+  GSRI = derive2 { name="GSRI"; version="2.22.0"; sha256="1dml01y75yc2f3ra65ha4ah991mvlzdnhkzllqxlah0gayvbhw52"; depends=[Biobase fdrtool genefilter GSEABase les]; };
+  GSReg = derive2 { name="GSReg"; version="1.8.0"; sha256="0ccghcpdpaa3dfaxbg682jll7gj6yh6513adffyi7q9qif6rz4jx"; depends=[]; };
+  GSVA = derive2 { name="GSVA"; version="1.22.4"; sha256="1v0znan5xyd1b3cr83ag83sk5ipnifn3882qcnfz6d26b5rq5cdz"; depends=[Biobase BiocGenerics GSEABase]; };
+  GUIDEseq = derive2 { name="GUIDEseq"; version="1.4.1"; sha256="0n21pd96q9xj6ljamq40zld0276dj4raiwdak8l27y37n1xq5bna"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
+  GWASTools = derive2 { name="GWASTools"; version="1.20.0"; sha256="07ql1iihqvmks7pzlwab6hffsp7d6by8n7sq9mgi5zqwdy1kdyw3"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf4 quantsmooth RSQLite sandwich survival]; };
+  GenRank = derive2 { name="GenRank"; version="1.2.0"; sha256="1sp43mr40dnfmxavqrn3bhbwkvrx229q7kvbwv4xbzl9980y2mwq"; depends=[matrixStats reshape2 survcomp]; };
+  GenVisR = derive2 { name="GenVisR"; version="1.4.1"; sha256="0a4nnq7nkmza8kyx6jq321rzfh843cj9yjn36pqam2w3gkx4a5q2"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; };
+  GeneAnswers = derive2 { name="GeneAnswers"; version="2.16.0"; sha256="164vas8gkrs1q9s3vhnb1f1lkqlndd5n2v7q0hb0rndjg0b08ryb"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
+  GeneBreak = derive2 { name="GeneBreak"; version="1.4.0"; sha256="153a1ca44apavrf09fc8gwyvqbln6rwjpcjq6cxa2ixw714xvmk1"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
+  GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.20.0"; sha256="0v26wyibllqw1mwncb4h8m3bg0x8zm9iv6apadp7n91x0zaqflmd"; depends=[Biobase PGSEA]; };
+  GeneGA = derive2 { name="GeneGA"; version="1.24.0"; sha256="19jr504whini0csk8cir3rs8fwccnrpf84kpnhphsc6j7ypy45qd"; depends=[hash seqinr]; };
+  GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.0.0"; sha256="15i67aqjvss9g8irh6ifr000y37irxg2glpg9qajm9kpwjvsr8kf"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; };
+  GeneMeta = derive2 { name="GeneMeta"; version="1.46.0"; sha256="1zxn1wm8wzia561hgljdyp1djidr1bzzb5kxpb73jwpxb43j8pd5"; depends=[Biobase genefilter]; };
+  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.16.0"; sha256="0mkd7ny0h0j53daxz7zwcbgnk85rmkpbsj0p4l205g3nfwa06iip"; depends=[graph plyr Rcpp]; };
+  GeneOverlap = derive2 { name="GeneOverlap"; version="1.10.0"; sha256="1y8n4r2gps65sz1yhhzr1n0frv79vwm2j9vxvs75v6c3a236x4r0"; depends=[gplots RColorBrewer]; };
+  GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.30.0"; sha256="0ac6qqzlnl29hkxyxyn6rvffg8klfp9qps0bx9hgmmhj60iwzqdi"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; };
+  GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.18.0"; sha256="04asjxn49vipaidammf568gf4gfck6d0300hdydxkpbzm8frpn0n"; depends=[Biobase limma MASS survival]; };
+  GeneSelector = derive2 { name="GeneSelector"; version="2.24.0"; sha256="1d99hqmp5jrwaq08svzvliqfli9r4731gmj3d9ly6rqaiba003zf"; depends=[Biobase limma multtest samr siggenes]; };
+  GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.42.0"; sha256="0mx55dqrib9ik0nvh96l5nz80hslz7ihi2lri98nlfanm1ckmgjn"; depends=[gmodels gtools mvtnorm]; };
+  GeneticsPed = derive2 { name="GeneticsPed"; version="1.36.0"; sha256="0z4zqni9sncigi89c2vvw7pian2zlni9rhbc9l39ig2970zyvh7s"; depends=[gdata genetics MASS]; };
+  GenoGAM = derive2 { name="GenoGAM"; version="1.2.1"; sha256="04r18wff2zjkb0hh731ssl7jplb8kn4lrmls0zzfl6iqgh539vvf"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.34.0"; sha256="0088s233lj2p0vy5wdw049zgakppvzk1zf07k628yaz8ckbgjg99"; depends=[biomaRt]; };
+  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.10.3"; sha256="18g24cf6b3vi13w85ki2mam6i2gl4yxr1zchyga34xc3dkdngzrw"; depends=[BiocGenerics IRanges RCurl S4Vectors]; };
+  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.10.1"; sha256="1dilghbsyf64iz5c0kib2c7if72x7almd5w3ali09a2b2ff2mcjk"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.26.4"; sha256="1y16lqach0v3ym5zhdhj4r2imfi0kpa0djlb51hj85yf7xkzwdlb"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
+  GenomicFiles = derive2 { name="GenomicFiles"; version="1.10.3"; sha256="03yqkl2yjdz999j1y7azcs16vg0vydrqs6sxcfkgn11fiwi6i3l2"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.8.1"; sha256="1lqwyz6ms6iw8sl2l52xbaaag10lp3k8s03c9326hxhyy3ba7c5f"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
+  GenomicRanges = derive2 { name="GenomicRanges"; version="1.26.4"; sha256="1789ycqzv20d8p1axkxrhsz9v0ww6w1dk2mfvm85p8j53zd1f67c"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+  GenomicTuples = derive2 { name="GenomicTuples"; version="1.8.3"; sha256="1wxcz06gywipyv0cnw8w7f9wccbn90l0h07zspwfd0l0d4rmqh1p"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
+  Genominator = derive2 { name="Genominator"; version="1.28.0"; sha256="0aayjr0sw9xqy4y2xyfbmbk7cbc81c5f0kf6fhdiswxl1v5f43l4"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
+  Glimma = derive2 { name="Glimma"; version="1.2.1"; sha256="0gqkm41rsdkgq15b3w2hv3n77kp85sirnypdav7g3lq00r8q69iv"; depends=[DESeq2 edgeR]; };
+  GlobalAncova = derive2 { name="GlobalAncova"; version="3.42.0"; sha256="0wxs7l4jx4c54bafvif48c4rlnv5vgl658403j4gp6w2xapbi4dv"; depends=[annotate AnnotationDbi corpcor globaltest]; };
+  GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.6.0"; sha256="12jpp6j4pzx5agnshzxa42izxby9iwl5vpaj2c7bh1m07xn35qkg"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+  GraphAT = derive2 { name="GraphAT"; version="1.46.0"; sha256="0gynda9y1px750ffgxprs8nlq85gxfkggvg9g0qdwsw32gn5s2nw"; depends=[graph MCMCpack]; };
+  GraphAlignment = derive2 { name="GraphAlignment"; version="1.38.0"; sha256="1p6qswivfmapm0qh58r0chp9jqc0yljpx9c405viss36k2sxv7k0"; depends=[]; };
+  GraphPAC = derive2 { name="GraphPAC"; version="1.16.0"; sha256="0xmcg6d5v7qzi9kxvgfigxz2zv0fgpsqrvwq3dckvziqpv214dyc"; depends=[igraph iPAC RMallow TSP]; };
+  GreyListChIP = derive2 { name="GreyListChIP"; version="1.6.0"; sha256="16rv1z40j4wkhify0xf24afd7f40pmwjm1r1nq5zhrz4im7skc8r"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
+  Guitar = derive2 { name="Guitar"; version="1.12.0"; sha256="1mfp56d4wqml5ki5mayq3cd4zidgm0jv1gxl9g04nxp7jzzcm6c1"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
+  Gviz = derive2 { name="Gviz"; version="1.18.2"; sha256="0gdd1h474gyy7g5cwrjzy6dwddblpg9gqnig5gdcbdzl0ll8kpc4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
+  HCsnip = derive2 { name="HCsnip"; version="1.14.0"; sha256="1vmh1j954pj6xfafcgwc6wfw066clqdggc79360anbr9rlfsmjkw"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
+  HDF5Array = derive2 { name="HDF5Array"; version="1.2.1"; sha256="07c4xp9v6rvi2zpg5r504rjp041h438djz4x1d28ryxpmp9sgj1a"; depends=[BiocGenerics IRanges rhdf5 S4Vectors]; };
+  HDTD = derive2 { name="HDTD"; version="1.8.0"; sha256="0diq8m2qrv42hknyvhzgjxw17jykxaw1qifpm4k4fidp55dgd9qf"; depends=[]; };
+  HELP = derive2 { name="HELP"; version="1.32.0"; sha256="0qypbj5vvv0r75izdarh48y94jc1b0msn7rnhkcqkpqcwpdfxgpl"; depends=[Biobase]; };
+  HEM = derive2 { name="HEM"; version="1.46.0"; sha256="0gsqfpg10ywskcn782h7saqqhd8y72x4cxd3z9vhwdz3rkf99maf"; depends=[Biobase]; };
+  HIBAG = derive2 { name="HIBAG"; version="1.10.0"; sha256="18dr6y6fw85hip4njzaax9sjr02xbwcicjmrxsdq4g8gx5r0rrsh"; depends=[]; };
+  HMMcopy = derive2 { name="HMMcopy"; version="1.16.0"; sha256="1syy98jgim2adchcc4ni1xji3ssixbawqafrkzq68fspsh467yc6"; depends=[geneplotter IRanges]; };
+  HTSFilter = derive2 { name="HTSFilter"; version="1.14.1"; sha256="145lbxcv0fqqby9y5fzrijvmm6rhmqr0a6n49n8syq03ibg1pa04"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; };
+  HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.26.0"; sha256="0zh3zlkgiwk1bsxv3j4bwf300531ifpg5hyniwal732zm7xbbiq3"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
+  HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.4.0"; sha256="121z3hmpgv3bhg28ns1k570s11gicmsrp4a2y4jndarxrzdi5f7k"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; };
+  HTqPCR = derive2 { name="HTqPCR"; version="1.28.0"; sha256="19gfjgf7d2xqb9vr5sg45yp2d0jmqx3s2s2y71wdg48508xf3990"; depends=[affy Biobase gplots limma RColorBrewer]; };
+  Harman = derive2 { name="Harman"; version="1.2.0"; sha256="0hdravpr71mp34ix486nx7czrfz9pqg045m4c7rs7d10p0vb76cn"; depends=[Rcpp]; };
+  Harshlight = derive2 { name="Harshlight"; version="1.46.0"; sha256="069826gdbb4xzdbizxzfn8z681vvrchk20k8awd7r7n3i01gbz5f"; depends=[affy altcdfenvs Biobase]; };
+  Heatplus = derive2 { name="Heatplus"; version="2.20.0"; sha256="0svmlq531jasggndz1n8b6sh97k9pj1i9a0w2k5iz17cpg89w9sp"; depends=[RColorBrewer]; };
+  HelloRanges = derive2 { name="HelloRanges"; version="1.0.1"; sha256="11z2d0d98l0wgxd0dicrph6ldrgvdrngibhgkknfshzcs4c6yqkv"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  HiTC = derive2 { name="HiTC"; version="1.18.1"; sha256="0l3a7f4caj2ijd54swjgz9893hy5yn2bv0gp9mjibj5x0hgrwbmf"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+  HilbertCurve = derive2 { name="HilbertCurve"; version="1.4.0"; sha256="132dn6l3g70wfznwfqg33f7saqn8av2p8nbrbymipavy5jmaki1s"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
+  HilbertVis = derive2 { name="HilbertVis"; version="1.32.0"; sha256="1k2lmvjvzfj73fpfd3ri4ifwvb30kd5k55cssr0cz2fx37rd8hiv"; depends=[lattice]; };
+  HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.32.0"; sha256="1v0s125k56nmjpmk4352ygyzi0w8is8ispqgyjcgyfhzn4fs46aw"; depends=[HilbertVis]; };
+  HybridMTest = derive2 { name="HybridMTest"; version="1.18.0"; sha256="0g62cgmy6g150fhjx2v4xk8mg6c5glz2h6ry89dr8pk5czfxqwcj"; depends=[Biobase fdrtool MASS survival]; };
+  IHW = derive2 { name="IHW"; version="1.2.0"; sha256="1m8m7zhj0hwdnb4z93dh918jynp3amnxwv0yl9zflf54nwg0p8y0"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
+  IMPCdata = derive2 { name="IMPCdata"; version="1.8.0"; sha256="15gskfs84anw2x902zhldsh8hzfhyrv9vjlb8qplkmd7prskjs48"; depends=[rjson]; };
+  INPower = derive2 { name="INPower"; version="1.10.0"; sha256="135xlhcv3h1rkipdy7vp2knr8gqgcfcsadcrl9a477iaps1ljfg1"; depends=[mvtnorm]; };
+  INSPEcT = derive2 { name="INSPEcT"; version="1.4.0"; sha256="15bn5x42igdxrj1fg9fzi2rgy1c24nxgwpqxxipqkippr985ybvg"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; };
+  IONiseR = derive2 { name="IONiseR"; version="1.4.4"; sha256="09vv5h8zwwlkc3azw1hb166wbhafdz9q7pd0xxcckwm596sbpnc6"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
+  IPO = derive2 { name="IPO"; version="1.0.0"; sha256="05g41kx40n7kv8cc51khg6wql7i8p5h53g873xvccld5vpc8dish"; depends=[CAMERA rsm xcms]; };
+  IPPD = derive2 { name="IPPD"; version="1.22.0"; sha256="1p0c5wr7lcarmlchfglmjd7d8r38mm262g8wyj7dljknlbw1p2n1"; depends=[bitops digest MASS Matrix XML]; };
+  IRanges = derive2 { name="IRanges"; version="2.8.2"; sha256="0x8h74ik3xwdnwrkn89hq5ll0qa1lp9jgzlbmpa02dpws7snfwyr"; depends=[BiocGenerics S4Vectors]; };
+  ISoLDE = derive2 { name="ISoLDE"; version="1.2.0"; sha256="1j9ckl0xq10scrrc0nr7522pz39bd5wapmpkgnlz93rflf90jq3g"; depends=[]; };
+  ITALICS = derive2 { name="ITALICS"; version="2.34.0"; sha256="1i4b94wngb6306dq5mx9vnmv69i6pl19c7kwrwmdfiq8hsl47wq1"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
+  IVAS = derive2 { name="IVAS"; version="1.6.0"; sha256="04qa9i4jkq3w040y3pzklld5p8v1qirr5vpglj3r8i01mj5r7krf"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
+  Icens = derive2 { name="Icens"; version="1.46.0"; sha256="0mfz0k2p2jsbm1rchylrl2k222p96xjdplnl0zgkhv32747svpv8"; depends=[survival]; };
+  IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.18.0"; sha256="1v98zqp5hyix49rlzvpiv289fsivcs602xi9bfhs15p9z33599qy"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
+  IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.22.0"; sha256="0kvs65qny43q4s0nkm9g8giv4d5qajpr12620208jhwbrm6jpg99"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
+  IdeoViz = derive2 { name="IdeoViz"; version="1.8.0"; sha256="1irxfpdf8i5zx96bw1v9pz5v0lrjb2z5gxzmfyibgivfp6dl9xj6"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
+  Imetagene = derive2 { name="Imetagene"; version="1.4.0"; sha256="0h80hwa8ksqwbhrwfvqp09yzlfqncrg0s6j48h9p4rhzf8958k6p"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
+  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.2.0"; sha256="1nw7swi6mq2gs8qc8k8psfzfrkxcbdkmc7vz8shsiszxp5idfy8b"; depends=[Biobase data_table ggplot2 gplots gtools pheatmap RCurl reshape2 Rlabkey scales]; };
+  ImpulseDE = derive2 { name="ImpulseDE"; version="1.0.0"; sha256="0qaq5gb19zdp4z2vhmn0gm3f1ccc8939nvcmaca34w51g4l1i4c0"; depends=[amap boot]; };
+  InPAS = derive2 { name="InPAS"; version="1.6.0"; sha256="1mkp059xzx0r1a3jv59pbwnwwkcg2kyrd2amxblgd27418j3g0mp"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
+  InteractionSet = derive2 { name="InteractionSet"; version="1.2.1"; sha256="0ax3qlsvm6zqfgli6dm68d1ip1cr74db8xbhs63mb6l84nni14y5"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors SummarizedExperiment]; };
+  IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.10.0"; sha256="17z67xxq9vs80nl69bv4n9932dvwhsvra7k2wyj4gj1mmh11v6gg"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
+  JunctionSeq = derive2 { name="JunctionSeq"; version="1.4.0"; sha256="1x7ngcyhcyi5aynp2zig24rpkkmc8bc8b5f4zlfvkxq3igh8gyri"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix S4Vectors statmod stringr SummarizedExperiment]; };
+  KCsmart = derive2 { name="KCsmart"; version="2.32.0"; sha256="1ppvnd6rs4bwxjr6qhhz5wd4fx9r3xg2mr0zjs8y7srm3k6k2djl"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
+  KEGGREST = derive2 { name="KEGGREST"; version="1.14.1"; sha256="0dcdmbkqxy0d4gg8lqlaflmjljzl9h1p2mlxnmvwgx34vnpx386y"; depends=[Biostrings httr png]; };
+  KEGGgraph = derive2 { name="KEGGgraph"; version="1.32.0"; sha256="1r5ib197swfr38ia0g23d78kx0dkgjssjmi5fc18z3nfparhkxdq"; depends=[graph XML]; };
+  KEGGprofile = derive2 { name="KEGGprofile"; version="1.16.0"; sha256="1ir3vma3n9bh8bkym0h5p2s6wbi7cjsvlz99mc34nkzqn0jxm0yl"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; };
+  LBE = derive2 { name="LBE"; version="1.42.0"; sha256="103m1j86mlqrrjzy9w5zms0hksqjbn20jqnrf83fga4z958w32fa"; depends=[]; };
+  LEA = derive2 { name="LEA"; version="1.6.0"; sha256="1ckygk393awmd963g7jykmfzcpysgi4d29psc5iqdz0h2cxrczjd"; depends=[]; };
+  LINC = derive2 { name="LINC"; version="1.2.0"; sha256="0658n1pqm9ccq0s3al7xiljysfqg06wsr0zn9hqb4bafr7amycnf"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; };
+  LMGene = derive2 { name="LMGene"; version="2.30.0"; sha256="07dchmzvdp2m2ky2f0vs32ch7cg2fgibmfwsw0din0rx96q0g3y9"; depends=[affy Biobase multtest survival]; };
+  LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.0.0"; sha256="0cbr5124rix2lib3gscx7ci1ir4mj4dy5npmxi506804a27rs6z8"; depends=[CAMERA xcms]; };
+  LOLA = derive2 { name="LOLA"; version="1.4.0"; sha256="175k4j4yj3j95gy2h7n3yinqf95l8g2vvhpsqc0j9wrpj0wwqyix"; depends=[BiocGenerics data_table GenomicRanges IRanges S4Vectors]; };
+  LPE = derive2 { name="LPE"; version="1.48.0"; sha256="1r86lj75qk9inhslh6m6cvk4d57yqxyxssp85hci3w48axz9gnfg"; depends=[]; };
+  LPEadj = derive2 { name="LPEadj"; version="1.34.0"; sha256="0fa4cq3yph30mdlx9wk8k90hwy2plflfz2sahighl0ahx98b7mij"; depends=[LPE]; };
+  LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.24.0"; sha256="102r6v36q2m03jfc65l5az4570nf3f30klkhqbsb00w0fqhmyi97"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
+  LedPred = derive2 { name="LedPred"; version="1.8.0"; sha256="1hi6y7h7yxw5dgj6aq2z48wf8qaxz9q5qd68m41myicwzgva7b8j"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
+  Linnorm = derive2 { name="Linnorm"; version="1.2.11"; sha256="07cgs6q6svkf9l9qn41702mzank6v1hm4z3isz9cdxlhz586r4cp"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 igraph limma MASS mclust Rcpp RcppArmadillo statmod vegan zoo]; };
+  LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.28.0"; sha256="1pwcdy4gp1vhdx6kgcligmr5pha5hx03yf3r0lidskcrzydk4sms"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
+  LowMACA = derive2 { name="LowMACA"; version="1.6.0"; sha256="07lgl3hcgdiin1r7ws5g7s0jw371v6qlzici0myjz9hw8p9p8gwf"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
+  LymphoSeq = derive2 { name="LymphoSeq"; version="1.2.0"; sha256="0mi82fgkl9bn9x9mhx4zw8cg0acmqsmw22v824xd2ik6c3q017pv"; depends=[circlize data_table dplyr ggplot2 ineq LymphoSeqDB plyr RColorBrewer reshape VennDiagram]; };
+  M3D = derive2 { name="M3D"; version="1.8.2"; sha256="06hxxvbk2jpbsyksvl7blll70hg2qb1kg44yv0vaa4a12cq8a1k1"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; };
+  M3Drop = derive2 { name="M3Drop"; version="1.0.0"; sha256="0adfklx4nzsy2xvz2gngqlyda4a0avdj3yal9brdk27826s2hyqf"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
+  MADSEQ = derive2 { name="MADSEQ"; version="1.0.0"; sha256="1m4mfrijyin27v0wxvv9p5i6zxiwkc0hmsriccs58qq9x4zi52ik"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM zlibbioc]; };
+  MAIT = derive2 { name="MAIT"; version="1.8.0"; sha256="085yih04ah4rbbzcchr6qvb69bbvbwsxbfmzd8wfvjdg9r6z3j8v"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
+  MANOR = derive2 { name="MANOR"; version="1.46.0"; sha256="101rdapxpvjd383mykx1l6n3h3xvh6z1q60mxwbndwfl429fypy9"; depends=[GLAD]; };
+  MAST = derive2 { name="MAST"; version="1.0.5"; sha256="1462b82alj0lbjl1zpfq8i2h3zxj38r82dvanyipg4m468ynmws7"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors stringr SummarizedExperiment]; };
+  MBASED = derive2 { name="MBASED"; version="1.8.0"; sha256="0isvf0n0zy7q5vhixnijrmyhdb0zpn74ddqdczgp3j93ripnb04q"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
+  MBAmethyl = derive2 { name="MBAmethyl"; version="1.8.0"; sha256="0l3crgq2i263wq5l91dzbj472bp0y4khlxklikfir1793sgzhwi7"; depends=[]; };
+  MBCB = derive2 { name="MBCB"; version="1.28.0"; sha256="0n6f61w5dq1hz80s434zzn78nipi75jn8zwaisgi77kb5k2xrss9"; depends=[preprocessCore tcltk2]; };
+  MBttest = derive2 { name="MBttest"; version="1.2.0"; sha256="12yqdgw3wzmzvvfdvf8lb5lyif4cpchdk21ik2k7r7qsvfwkcqnd"; depends=[gplots gtools]; };
+  MCRestimate = derive2 { name="MCRestimate"; version="2.30.0"; sha256="0sc3grx8l97cdwxvjvbmb7a3hnqbi1f9lqd4a12n2zcwcv6xr8ly"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
+  MEAL = derive2 { name="MEAL"; version="1.4.2"; sha256="05gk7gs70i36xw4sxzrwlcdkbr9bprqgg0hlqwcynyl3x816s3qr"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi MultiDataSet permute S4Vectors SNPassoc snpStats sva vegan]; };
+  MEDIPS = derive2 { name="MEDIPS"; version="1.24.0"; sha256="1gincnn8ay83rzdm3rgd8h9fgg7s1j8i8s22pn1rp073pph582yf"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
+  MEDME = derive2 { name="MEDME"; version="1.34.0"; sha256="1zrxd0bqayxbbgmpqj77lij58a4szsr3y064mmn4manhmij3hbml"; depends=[Biostrings drc MASS]; };
+  MEIGOR = derive2 { name="MEIGOR"; version="1.8.0"; sha256="0m4g0np2f5yab1h1j8swfhkgnl1s2a0xw5cvbg7l5pbmzs2fkxa1"; depends=[CNORode deSolve Rsolnp snowfall]; };
+  MGFM = derive2 { name="MGFM"; version="1.8.0"; sha256="0i05pcgk5axjr1piwm5g6wb7zh4hwya1zbvvrfr4v8rwilsyq27z"; depends=[annotate AnnotationDbi]; };
+  MGFR = derive2 { name="MGFR"; version="1.0.0"; sha256="0qbmndrvn19h8vnx2qhcpa175hvid1vlnzzi9177x73naj2lyyv3"; depends=[annotate biomaRt]; };
+  MIMOSA = derive2 { name="MIMOSA"; version="1.12.0"; sha256="0nzl95cnhf9d38v8gaxy2hlqgxbzzllvh71k5sa335zfr0p1lzr8"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
+  MLInterfaces = derive2 { name="MLInterfaces"; version="1.54.0"; sha256="1fg8l1digl14ijr53bwarbqwcaj5374vmqdkvy5jfg2s06iwdkym"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
+  MLP = derive2 { name="MLP"; version="1.22.0"; sha256="0awiqvhzzvgqmacks3yxl4a6savc39dv6brf8m0lz9rcl6cgzsza"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
+  MLSeq = derive2 { name="MLSeq"; version="1.14.1"; sha256="1wdh4rpsfnv1nzypgqm4y9c4vzv9z8snrb0nh2s9ssbcc7cwkpl7"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
+  MMDiff2 = derive2 { name="MMDiff2"; version="1.2.0"; sha256="1zy8whabpqbl1cfhh6bjax97snyy6pqfd8dqa7w21s6y4wg9krzd"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
+  MODA = derive2 { name="MODA"; version="1.0.0"; sha256="1fh26d0gfisif8v1ms321mj08202kfqngvghpg1xzr28cp59h9c8"; depends=[dynamicTreeCut igraph WGCNA]; };
+  MPFE = derive2 { name="MPFE"; version="1.10.0"; sha256="1d2b3mhcjxvdq99iqj96gygq9bivg95n2n7jxscy3gdkzpf70336"; depends=[]; };
+  MSGFgui = derive2 { name="MSGFgui"; version="1.8.0"; sha256="0g8pygqqxb4g5hh47n9jwikim8hakrbppn85ydzq4hvrsjysjdxz"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
+  MSGFplus = derive2 { name="MSGFplus"; version="1.8.0"; sha256="104h4f0jnhswn4sbr5r1ivd7g1r4gdrrjj3a0kd7p3ckl542vwcq"; depends=[mzID]; };
+  MSnID = derive2 { name="MSnID"; version="1.8.0"; sha256="0fkk3za39cxi0jyxmagmycjdslr2xf6vg3ylz14jyffqi0blw9d5"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
+  MSnbase = derive2 { name="MSnbase"; version="2.0.2"; sha256="0jjjs29dcwsjaxzfqxy98ycpg3rwxzzchkj77my3cjgdc00sm66n"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn XML]; };
+  MSstats = derive2 { name="MSstats"; version="3.6.0"; sha256="1p9000y7ca94vingg1gdd6sdxy3p0njqdinxhy3raf4gb4hmnv7y"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray minpack_lm MSnbase preprocessCore Rcpp reshape reshape2 survival]; };
+  MVCClass = derive2 { name="MVCClass"; version="1.48.0"; sha256="1jd2vh63j4jj0q4x05drrwfkn7qddxq96403ambkavcxcxs3z0x7"; depends=[]; };
+  MantelCorr = derive2 { name="MantelCorr"; version="1.44.0"; sha256="1r1lb71mw7fqlmfai7d2lbij3n9pjpvvng8lx0fpbzaxghrbcd37"; depends=[]; };
+  MassArray = derive2 { name="MassArray"; version="1.26.0"; sha256="152wy0h3zrfqyf444m7mcp6gvnx4q10ahj5nziwdp26k7zjm4jx9"; depends=[]; };
+  MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.40.0"; sha256="0c734mvynmyir7pcfy8igvvxk8y3hvcpkazsjljykfjvjs47x49p"; depends=[waveslim]; };
+  MatrixRider = derive2 { name="MatrixRider"; version="1.6.0"; sha256="0khdgn3kcj1mw5z8d2cz781n56myqgxalycg9317dap6r2hng11x"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
+  MeSHDbi = derive2 { name="MeSHDbi"; version="1.10.0"; sha256="1jyz50q4svakq8ckwnrfyc568ryhg3jxl920v7s477nxj2854pa1"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
+  MeSHSim = derive2 { name="MeSHSim"; version="1.6.0"; sha256="1ab92abmyw469v4gzk6ki95j5m9ivdwr7v74hgh8jr5zw674gfzp"; depends=[RCurl XML]; };
+  MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.46.0"; sha256="046yc0bvqxxh5x83zy7qq6b5cyhzkcg78bgyzz9w7lb7sim0h491"; depends=[]; };
+  MergeMaid = derive2 { name="MergeMaid"; version="2.46.0"; sha256="07ann5kkbp0kz2cplks934yy20ixnqjz1fnhd292lbsq493www1x"; depends=[Biobase MASS survival]; };
+  Mergeomics = derive2 { name="Mergeomics"; version="1.2.0"; sha256="187w71dr1brjz6fhdlxxvanipn9rmkyfrp5ij943y3jca0iibbij"; depends=[]; };
+  MetCirc = derive2 { name="MetCirc"; version="1.0.1"; sha256="09mw5nqvp5pj8dma7fqdiiw5qqxm3m51s2r4ji3shiliq961bkw4"; depends=[amap circlize scales shiny]; };
+  Metab = derive2 { name="Metab"; version="1.8.0"; sha256="1kb41ld1fxggmwa4chzpwnfy6473jhs79386k0py9i7z9myaf7pj"; depends=[pander svDialogs xcms]; };
+  MetaboSignal = derive2 { name="MetaboSignal"; version="1.4.0"; sha256="08j76zdkzg42j3x1h5dzw7qkx44fcj7bwigrv452s6frkanhb5ij"; depends=[AnnotationDbi biomaRt hpar igraph KEGGgraph KEGGREST mygene org_Hs_eg_db RCurl]; };
+  MethPed = derive2 { name="MethPed"; version="1.2.0"; sha256="0phja8mf6vi913kjypbyx25j9bgqj25iis4jz1y7hbafvy3vx4x8"; depends=[Biobase randomForest]; };
+  MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.6.0"; sha256="15vbqsci33fbcz94va64w53qnzx4hqzv2ss4myhy9kavk4h5ma07"; depends=[Biostrings gplots seqinr stringr]; };
+  MethylAid = derive2 { name="MethylAid"; version="1.8.0"; sha256="0c2y6r72ypgc9rjyk4779l0s3x3wpdm88ygab5zdfi9sgy108r4x"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; };
+  MethylMix = derive2 { name="MethylMix"; version="2.0.0"; sha256="06zq28ns2h2l6zlrwhgrf80ac679fq3qbrlcn0rshwz2vwbk6xha"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; };
+  MethylSeekR = derive2 { name="MethylSeekR"; version="1.14.0"; sha256="06kixgxrla3rvxf6xsg4r4yxi9qld6kx82p9xv2x978qsx717frr"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
+  Mfuzz = derive2 { name="Mfuzz"; version="2.34.0"; sha256="1bzi6kwpbkr8g4zqxw517grl2sc4pq6ph4m4vb4hmn6x6qxlijlr"; depends=[Biobase e1071 tkWidgets]; };
+  MiChip = derive2 { name="MiChip"; version="1.28.0"; sha256="0lxdcmfy1gpfpmnagg2649dbq9rj13rggv43n79l2f033awbpsp8"; depends=[Biobase]; };
+  MiPP = derive2 { name="MiPP"; version="1.46.0"; sha256="1280c04222l2hbapbw7k6rnsi8hrbpd0w49gvx50sl0mkl3zq5gh"; depends=[Biobase e1071 MASS]; };
+  MiRaGE = derive2 { name="MiRaGE"; version="1.16.0"; sha256="17ys0qwz8y4ka81ynzp46fcy5qi6mw7y7vsffqvgnsf587bdj9ia"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
+  MineICA = derive2 { name="MineICA"; version="1.14.0"; sha256="0si7l560d14vhz4k8p0c1fqmr85f91zcfz3vh0fbnyg3m4rh8yz2"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
+  MinimumDistance = derive2 { name="MinimumDistance"; version="1.18.0"; sha256="1zl8ravn0dpb6ca3f9k92p7wdhz7afjy7cx28nx0hv71aqk1q5i8"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
+  Mirsynergy = derive2 { name="Mirsynergy"; version="1.10.0"; sha256="1w98swg02n1gfk1cgjvzi09wwymn8v6v3gjlm58sgj0j47h8l4c6"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
+  MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.24.0"; sha256="1g6wlk8qlszc42jqrdlwa340p69h7fk7nmdrk0k0rdl1mmjsmcs9"; depends=[Biobase lattice limma statmod vsn xtable]; };
+  MoPS = derive2 { name="MoPS"; version="1.8.0"; sha256="1z0m6c61sp6cljaibskrk8xywpkgx4m3d2s8rdq3hs99x6w1f200"; depends=[Biobase]; };
+  MoonlightR = derive2 { name="MoonlightR"; version="1.0.0"; sha256="10r0vnyig561d5hrvhbb3srr6v1lndgjxabj03adhmn7nbv4iija"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
+  MotIV = derive2 { name="MotIV"; version="1.30.0"; sha256="1zq22llziicgfsh9ykf8blf9593h4yw3nhr58alvvp5hjjh2pz3r"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
+  MotifDb = derive2 { name="MotifDb"; version="1.16.1"; sha256="105a320znvrdkwvsixv1ddaiax1ay87wr4675pv4j79xdjh7by2z"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; };
+  Mulcom = derive2 { name="Mulcom"; version="1.24.0"; sha256="0mlmb9lk71676dz45812ni72vbid2hv2v9b1i437dr69qnppm126"; depends=[Biobase fields]; };
+  MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.0.1"; sha256="0vq7xfw3wv7i07v57qz2b3v599mfp27p6fxadlsqjql9v5jy6kk6"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors shiny shinydashboard SummarizedExperiment]; };
+  MultiDataSet = derive2 { name="MultiDataSet"; version="1.2.0"; sha256="04hrqi8x2fsfnpyk344kfrvfl66mv1lx3kdqs7ga9wnfq98b82b2"; depends=[Biobase BiocGenerics GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi S4Vectors SummarizedExperiment]; };
+  MultiMed = derive2 { name="MultiMed"; version="1.8.0"; sha256="1185flg1grb14m00km2v6z4ypl5lh6p4p05wsxq231g255aljq64"; depends=[]; };
+  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.0.0"; sha256="1a3c2bm0xx0q4gf98jiw74msmdf2fr8rbsdysd5ww9kqlzmsbr17"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF plyr pracma reshape2 SummarizedExperiment VariantAnnotation]; };
+  NCIgraph = derive2 { name="NCIgraph"; version="1.22.0"; sha256="1dbbnlbbjqvmb8adppkacl7qrxic4gavvcmh0cafpvsm3ybs4zvb"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; };
+  NGScopy = derive2 { name="NGScopy"; version="1.8.0"; sha256="0hc103pa3qbd6pd4578wdrczd4sljhb408lclkjlv3abdc6x7247"; depends=[changepoint rbamtools Xmisc]; };
+  NOISeq = derive2 { name="NOISeq"; version="2.18.0"; sha256="0iw4zy01a0lk6n60q4kw3jmgha41dxchidzg9rbsbsci3ysnl3h5"; depends=[Biobase Matrix]; };
+  NTW = derive2 { name="NTW"; version="1.24.0"; sha256="0cqc8rgkx9gqhkc62csyws7c23nf94pwigiq5myirgamga314cqb"; depends=[mvtnorm]; };
+  NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.4.0"; sha256="06zln140q6r00mhi820hzgw5zincr1kg56h3387iikyw4hyq53s2"; depends=[Biobase matrixStats]; };
+  NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.6.0"; sha256="0848h8dmbk0gj4w0p77bi6byqil76ggaikqqdxflyzv39zkw28sc"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
+  NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.18.0"; sha256="02g8rbqaddcy4w9i2ma0xmzdb84bykba3p3zmv1lylh77knmxdrw"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
+  NetPathMiner = derive2 { name="NetPathMiner"; version="1.10.0"; sha256="0ssbmp0qkvnvii646zj2qiwzrn8cyi6jvg7h937vbr6vnzv643cg"; depends=[igraph]; };
+  NetSAM = derive2 { name="NetSAM"; version="1.14.0"; sha256="1jzlpnnry9lbnfvrks5fz14nwkvg3r8pp8f5lw63izg0fx1m5ypm"; depends=[graph igraph seriation]; };
+  NormqPCR = derive2 { name="NormqPCR"; version="1.20.0"; sha256="1qik5gvzvj4zzfllj5p9cryfwq8z33jziv6p5gyfndyn5b9p2sq6"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
+  NuPoP = derive2 { name="NuPoP"; version="1.24.0"; sha256="1aqw86yn9pq1901qzqjvjw9sfqpnnqn29pagdrxqd6858x034w6n"; depends=[]; };
+  OCplus = derive2 { name="OCplus"; version="1.48.2"; sha256="04drljh5m46v9gpvfgwgajq9kn1ycb7fhbxxk6j4xq89ddlz1dk7"; depends=[akima multtest]; };
+  OGSA = derive2 { name="OGSA"; version="1.4.0"; sha256="0i2w0g4310sg1zy4z7bc9ajr4yizf313bpzwgzjngx51hsyjk9ws"; depends=[Biobase gplots limma]; };
+  OLIN = derive2 { name="OLIN"; version="1.52.0"; sha256="1q0p8jry2nw3w1a4zan0kwgc87nk2v2psnw00m5m6m0a1j9drryd"; depends=[limma locfit marray]; };
+  OLINgui = derive2 { name="OLINgui"; version="1.48.0"; sha256="168bbsacsj74ah84zbfi7h2bpnz7zclbykl9rwaic8gr4ymgz1qw"; depends=[marray OLIN tkWidgets widgetTools]; };
+  OSAT = derive2 { name="OSAT"; version="1.22.0"; sha256="0f4lz86g8205hbbdka50a6s1gbdb19zqjna4gwakb4w3ni53gqhg"; depends=[]; };
+  OTUbase = derive2 { name="OTUbase"; version="1.24.0"; sha256="0xxha9f2f2qfzb8cv4m59grbyv011w9f27zm3cq64affgzwnb5r2"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
+  OmicCircos = derive2 { name="OmicCircos"; version="1.12.0"; sha256="0q6ngrf5cyy6hyvhhhrx6ldbij7b051fgdsknm7qb4xzbsk5i75k"; depends=[GenomicRanges]; };
+  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.8.1"; sha256="0y38441v5lnj25w3qw5d4f6bijf3c9jzxp57jjhhj12vxqmrdajy"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+  OncoScore = derive2 { name="OncoScore"; version="1.2.1"; sha256="1f8nx3p8dik5b8yvpn7pvk5iy5vyy5fjgy49d3czkfwp1dzis49d"; depends=[biomaRt]; };
+  OncoSimulR = derive2 { name="OncoSimulR"; version="2.4.0"; sha256="0a1m54x14f6rz9sz9m1kwlxl8xl3vlxqz3iq5qrs8n36crqbx3nj"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr]; };
+  OperaMate = derive2 { name="OperaMate"; version="1.6.0"; sha256="152qxkf4qnkjj4grk0jsysh80daybgw6ywwm1h8l6lk64q0dhl6w"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; };
+  OrderedList = derive2 { name="OrderedList"; version="1.46.0"; sha256="1wfpypaimvzisv032irbsmk766zxq1xqh8q0qn9ipqp9hrp7mrlb"; depends=[Biobase twilight]; };
+  OrganismDbi = derive2 { name="OrganismDbi"; version="1.16.0"; sha256="0pj1qfz015203dkkik49i00jlvbbzh1p4lz2jgpk2iqx8n0yx923"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
+  Oscope = derive2 { name="Oscope"; version="1.4.0"; sha256="1cxmz482wlqvkcz9x3riwn01kz5flyzyg41ygs0flkjml64dp7hj"; depends=[BiocParallel cluster EBSeq testthat]; };
+  OutlierD = derive2 { name="OutlierD"; version="1.38.0"; sha256="10lwi35l9iv2hx7hra43i0b6n1r853rdzcbwir4m34iijjxjx9db"; depends=[Biobase quantreg]; };
+  PAA = derive2 { name="PAA"; version="1.8.0"; sha256="0kv6mxczp0mwmhyqlq2qxzzhzapl2ijmr6063aw6klsh03q1n73m"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+  PADOG = derive2 { name="PADOG"; version="1.16.0"; sha256="0f0rl44sclmbcqfsw086nalhzxrjc04yml89xwgnjny4f5kh7sri"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
+  PANR = derive2 { name="PANR"; version="1.20.0"; sha256="0ml99gy3fi55qqj6k9hbs5hwvf51344k0anwx30hnpk1xsxvcjy0"; depends=[igraph MASS pvclust RedeR]; };
+  PAPi = derive2 { name="PAPi"; version="1.14.0"; sha256="18mnm303ryyz912m6yqnc2fbdhkin1v45jb55dxaplpzh57hmsxg"; depends=[KEGGREST svDialogs]; };
+  PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.38.0"; sha256="0sws413s9gy9zkaj007wbbgkk8ghh38kzr28kmpjwviga09142zr"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
+  PCAN = derive2 { name="PCAN"; version="1.2.1"; sha256="07yhqzvvmhldlvg7d2zg3shwlhnpm381rwrbfcrazhf2bgysd9kd"; depends=[BiocParallel]; };
+  PCpheno = derive2 { name="PCpheno"; version="1.36.0"; sha256="08pxms6hs82ngjh7vcjqh7m5jchznss4i7izm37dwxp1nmy83bhy"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
+  PECA = derive2 { name="PECA"; version="1.10.0"; sha256="1g91z0ywbm7ck9bi9a2v75hx98hvxvi1b6h8wlzv6gjjsv2z849a"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
+  PGA = derive2 { name="PGA"; version="1.4.0"; sha256="12fwd2c7psp5ffmi7z81a33ynjg0khikccp5qjyin76bvnqxx7sw"; 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.48.0"; sha256="0yn1ayvf6g8g3w5lakp3224qm3h2h984zii7n7cqnzl8gciwxyb4"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
+  PICS = derive2 { name="PICS"; version="2.18.0"; sha256="1vzsrmyk4l19z0a7i9gzmrymks3jh2c8rfib6g7kn9z5pwbw56l1"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
+  PING = derive2 { name="PING"; version="2.18.0"; sha256="0rlx8dasj51xnj3nwvx4sjia7di9q3sawmz5zhp6a2kfacgss0lc"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
+  PLPE = derive2 { name="PLPE"; version="1.34.0"; sha256="1d2m9xxhvmgjn92dv1i8x7yzam377hzj6ibb3d4rmqmbjs446cdk"; depends=[Biobase LPE MASS]; };
+  PREDA = derive2 { name="PREDA"; version="1.20.0"; sha256="07477ps2whj4h0ph5kdjra4x6jlc0xyii2yp338jhgrhdnpxwjqx"; depends=[annotate Biobase lokern multtest]; };
+  PROMISE = derive2 { name="PROMISE"; version="1.26.0"; sha256="1ybgzw043fm0lzayq4ddqwgr6j5bd3a0r73aica5bg8hzr5x1pll"; depends=[Biobase GSEABase]; };
+  PROPER = derive2 { name="PROPER"; version="1.6.0"; sha256="15xqwbn098vv0h8f0cz8nzxb5swf83idb2gd25k1vzh4nv34vr4m"; depends=[edgeR]; };
+  PROcess = derive2 { name="PROcess"; version="1.50.0"; sha256="1l0kbd0b2xarw7wc4mkvyb0ixkky7slqd3w5r41isppa4wanvvjn"; depends=[Icens]; };
+  PSEA = derive2 { name="PSEA"; version="1.8.0"; sha256="0rkf4w35xgkwa2mc5h65nf5kc61cv1p3xmyz0pg0cim8q50y5wsh"; depends=[Biobase MASS]; };
+  PSICQUIC = derive2 { name="PSICQUIC"; version="1.12.1"; sha256="1948cs1ygx16kj9kj1ip2l7k2za51zkknc1sm2n51zhl7ywk9dnv"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
+  PWMEnrich = derive2 { name="PWMEnrich"; version="4.10.0"; sha256="152vkwaabwsyrgh2hdkp63gac418k4yl1iwvli45ax6cv2mb1c81"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
+  PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.2.0"; sha256="09x527v5iwhnn4gn52xlk40553lzcgfwrmrc2qn9kv791rf7k743"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; };
+  Path2PPI = derive2 { name="Path2PPI"; version="1.4.0"; sha256="0y3pz6sdrv0szi068w78kdpksxqa6dqjg3vy5sqdvj0y4sr0ss0w"; depends=[igraph]; };
+  PathNet = derive2 { name="PathNet"; version="1.14.0"; sha256="1hj9k43sb9vjryphma140g1fmqnrgj2dkcy11b0dksd9mdlldwvg"; depends=[]; };
+  PathoStat = derive2 { name="PathoStat"; version="1.0.0"; sha256="01vn24q4l7rbwksbdk0srac2rr352912bmr0brdjjfh3y9v26j8p"; depends=[alluvial ape BatchQC BiocStyle corpcor dplyr DT ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr rentrez reshape2 rmarkdown scales shiny tidyr XML]; };
+  Pbase = derive2 { name="Pbase"; version="0.14.0"; sha256="0r42974jfylqf51i00n9b1axzmqb3kv9idj6p4dz5hq223r18x1j"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
+  PharmacoGx = derive2 { name="PharmacoGx"; version="1.4.3"; sha256="1cfly0xfd7sgiv65kmmb3899glvzzypb8za9prv569d7h6vz9yq8"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer]; };
+  PhenStat = derive2 { name="PhenStat"; version="2.8.0"; sha256="1cmpkv11s55ackgdvqmhidijznnvy1xpfhqdw3h0b11vrwi17d1a"; depends=[car logistf MASS nlme nortest]; };
+  Pi = derive2 { name="Pi"; version="1.2.1"; sha256="0b79qf119n3737n1bifnc3qb36jsyh4c9h76svqy1rpkh68pairi"; depends=[dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel igraph MASS Matrix randomForest ROCR scales supraHex XGR]; };
+  Pigengene = derive2 { name="Pigengene"; version="1.0.0"; sha256="16s46alh0vm31crn3dzsf91k53v3j2hgn0rqzm1wvyw61y05la26"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
+  Polyfit = derive2 { name="Polyfit"; version="1.8.0"; sha256="0r87xv86mivdgyifvp9snmxswsyvmsif4zkzp24wycypza7wr3l3"; depends=[DESeq]; };
+  Prize = derive2 { name="Prize"; version="1.5.1"; sha256="11rzkwrkq329g2a6wzbk9yxbjza2qihdxk9l35fd39vmdw6ykfr5"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
+  ProCoNA = derive2 { name="ProCoNA"; version="1.12.0"; sha256="0k7nb2cq1xn64m96wjvn5g18kbpigslcf99hyv03ib7r790h32qy"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
+  Prostar = derive2 { name="Prostar"; version="1.6.1"; sha256="1gj9d425wxk57rf0qk8m9k9xxgmv02wbwjg1h4nl9q7c23vmxsbg"; depends=[DAPAR DAPARdata data_table DT rhandsontable shiny shinyAce shinyjs sm]; };
+  ProtGenerics = derive2 { name="ProtGenerics"; version="1.6.0"; sha256="0hb3vrrvfx6lcfalmjxm8dmigfmi5nba0pzjfgsrzd35c8mbfc6f"; depends=[]; };
+  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.4.0"; sha256="0iwcsnv05g83plsb8wdgpa9lzp136pfl7qyp3yqik1fn62s32fj4"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
+  PureCN = derive2 { name="PureCN"; version="1.2.3"; sha256="0h3w3d1dnr8ng0cg54jp02v1v6zhn8csrli9cpbszjgrn9dfxybx"; depends=[Biostrings data_table DNAcopy GenomeInfoDb GenomicRanges IRanges RColorBrewer Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; };
+  Pviz = derive2 { name="Pviz"; version="1.8.0"; sha256="1m2s37bzlxkih4c868wq3n8y3mg161laxh5p1789k3w32nlli89c"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
+  QDNAseq = derive2 { name="QDNAseq"; version="1.10.0"; sha256="0pa9r9pndk2viv7xcy961c26vx2afpc4rr7dl5zihsgb4y2az8vc"; depends=[Biobase CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; };
+  QUALIFIER = derive2 { name="QUALIFIER"; version="1.18.0"; sha256="06aamgjl3bay76wdjzqfkwcmj9bwkvbrgv542zwqppv059an9wxf"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
+  QUBIC = derive2 { name="QUBIC"; version="1.2.1"; sha256="15mqx8aqhk7hhhlingri1l27dydfv3vaqjvjmpa4lh7a0p9ac2rg"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
+  QuartPAC = derive2 { name="QuartPAC"; version="1.6.0"; sha256="0mh2rzh3cp0n0ky133iiy1zgv1q90ilqspi4l8r5d3mqi2bs056n"; depends=[data_table GraphPAC iPAC SpacePAC]; };
+  QuasR = derive2 { name="QuasR"; version="1.14.0"; sha256="1330vlvsfypr0pl7arawks4d80yjk2afn637ivcnbhrchkmicfdv"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
+  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.2.0"; sha256="0bnnh4p7ifj9kpx29x2scy7qshnbnwr9a2bzyi5npqss6nd68fpy"; depends=[Rcpp]; };
+  R3CPET = derive2 { name="R3CPET"; version="1.6.0"; sha256="1f345ci24ff1fj5i509ar8900gf4850cc88b0h7w0wm14k76s6dk"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
+  R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.24.0"; sha256="02s8rxcv1k41v2nzrpzhbh7l7hhyp94k61cic35kvbd84xs8bwvl"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
+  R4RNA = derive2 { name="R4RNA"; version="1.2.0"; sha256="0hl5khn72nid1f9863nl8wyh98xgj2zx3yp0bf7q5ja5559kqnj7"; depends=[Biostrings]; };
+  RBGL = derive2 { name="RBGL"; version="1.50.0"; sha256="1q14m8w6ih56v680kf3d9wh1qbgp7af33kz3cxafdf1vvzx9km08"; depends=[graph]; };
+  RBM = derive2 { name="RBM"; version="1.6.0"; sha256="0h0qzn1hp5g167z5r5p9b445v8nqmvzg3ixyj709zh66y93nqcwx"; depends=[limma marray]; };
+  RBioinf = derive2 { name="RBioinf"; version="1.34.0"; sha256="1q20v3h2zxxa5i655fdd6zyn3glga52mpq0dpmdrlx4yxb4pw3ms"; depends=[graph]; };
+  RCAS = derive2 { name="RCAS"; version="1.0.2"; sha256="0rim13lnh1pc5ks33x1pa63mlrn64fmmpwy7d10ypplrvn7sq75a"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges knitr motifRG org_Hs_eg_db plotly rmarkdown rtracklayer S4Vectors topGO]; };
+  RCASPAR = derive2 { name="RCASPAR"; version="1.20.0"; sha256="070j74bsjg3rq6bhi201r1vajcim8kzf99hpjcswq358q070ghbl"; depends=[]; };
+  RCy3 = derive2 { name="RCy3"; version="1.5.2"; sha256="1jkjg6byb5rwny0q77xmsc2gnppxcym59rcdn5kpgvd33l7jwnbn"; depends=[graph httr RCurl RJSONIO]; };
+  RCyjs = derive2 { name="RCyjs"; version="1.6.0"; sha256="1dh16hhm32hhk4nb12kw17gxpsg6513grvddialxhjzi21j2y698"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
+  RCytoscape = derive2 { name="RCytoscape"; version="1.24.1"; sha256="1al8w3nz19abxxsnifgzb9myciacws79z2i2ffx29yvfhcsk2z7s"; depends=[BiocGenerics graph]; };
+  RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.12.0"; sha256="1320ky26p0zq90qb5x2ysbzrz3ipcp04jz74r11qzivxzb1hzkrl"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
+  RDRToolbox = derive2 { name="RDRToolbox"; version="1.24.0"; sha256="1z0p6wi6l0lg8y4ffi5mnlm6hxlv3rx2wrlvzdqrv7pbg6vnv2m2"; depends=[MASS rgl]; };
+  REDseq = derive2 { name="REDseq"; version="1.20.0"; sha256="0wfmqanrjmrnj7prxvci3m5qaw8y8qqml6jwnbjn42b7qk57l8n6"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
+  RGSEA = derive2 { name="RGSEA"; version="1.8.0"; sha256="1fqlvshy4yp17v1cvjvgyiv23zcccrqs7l6mvapb2cs1q67bfhhx"; depends=[BiocGenerics]; };
+  RGalaxy = derive2 { name="RGalaxy"; version="1.18.0"; sha256="13r07fhas3bqmblydrc1h7r2sz1knc082iay5n8zi94x7bb5vx8b"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; };
+  RGraph2js = derive2 { name="RGraph2js"; version="1.2.0"; sha256="0shkmaxsdj078vk2h3n80cfmibxnz50mlr55hbi6vf3awj81iy1x"; depends=[digest graph rjson whisker]; };
+  RIPSeeker = derive2 { name="RIPSeeker"; version="1.14.0"; sha256="1yvn9d4psifkipv1mp42qi5h09a5023cbf7mhw6nmyqpkcw4bwjd"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  RImmPort = derive2 { name="RImmPort"; version="1.2.0"; sha256="0pl2zd9y2skhxp1clnv0y7dyi4ib2pj5a6rbq9f0nqjcwqc251h0"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
+  RLMM = derive2 { name="RLMM"; version="1.36.0"; sha256="0h7k448ajdpvqbq5vi0lx38sc581hv74224fi0grdrk9s56n3993"; depends=[MASS]; };
+  RMassBank = derive2 { name="RMassBank"; version="2.2.1"; sha256="1jkn5y8bwic6nmcd9jhs8i5kfwmldxfylapassrmzjbfg7jil4gm"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
+  RNASeqPower = derive2 { name="RNASeqPower"; version="1.14.0"; sha256="1yzd5z1dbav72w1df0z93810ym09hbmghwikkv7b8y0b2blkigcy"; depends=[]; };
+  RNAinteract = derive2 { name="RNAinteract"; version="1.22.0"; sha256="0nlz20hwyrycya82wdkaj962q1zpgncf4sjawiczz7wagll61rsm"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
+  RNAither = derive2 { name="RNAither"; version="2.22.0"; sha256="0saq1yichxgr12wcb2d6xd5qixxisk992drza82gv31c1sq8i5vx"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+  RNAprobR = derive2 { name="RNAprobR"; version="1.6.0"; sha256="1j6mrih9aqcy3d9xh05aj1p3a39ivnj0k6i482ax1l4cq7gvna7x"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
+  ROC = derive2 { name="ROC"; version="1.50.0"; sha256="0bm9vp0viyjr4xcar2b5dl0fbpy9fmnkrg0hzvhillrlh0xzzhwk"; depends=[]; };
+  ROTS = derive2 { name="ROTS"; version="1.2.0"; sha256="1grfw0bxb5fv4sy9xbwa8ydppr6g77qw8q9rminjnfqdafpqkakk"; depends=[Biobase Rcpp]; };
+  ROntoTools = derive2 { name="ROntoTools"; version="2.2.0"; sha256="0lq5al7g4r58wc0byyj2a49m9dcj1llcys9hdwlns1ahzvw6d76h"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
+  RPA = derive2 { name="RPA"; version="1.30.0"; sha256="0dq6g94jb6zam5fb667finkdn6mavvi5dnxws4dgvjw1qrlwg7vl"; depends=[affy BiocGenerics phyloseq]; };
+  RRHO = derive2 { name="RRHO"; version="1.14.0"; sha256="0iwg3hjxc9avm8mysrx0ix03ncwik0iikph9j6jgd7y7dczq3y1j"; depends=[VennDiagram]; };
+  RSVSim = derive2 { name="RSVSim"; version="1.14.0"; sha256="123fly20prx0g8bjbgqwfwrh73xjrq4xbl45rsp9q84kgi6w07i3"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
+  RTCA = derive2 { name="RTCA"; version="1.26.0"; sha256="07kb4zh14g2lvqyicmig29wn50i4sz8bcxg4vq74019al2xj7fsv"; depends=[Biobase gtools RColorBrewer]; };
+  RTCGA = derive2 { name="RTCGA"; version="1.4.0"; sha256="0y8d0y043n0ragn1saz0rw5lbx6g04ara7iggn4df5w5xzg6rm08"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
+  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.4.0"; sha256="16p872nl9470f7yksdy73n5kwn4mlgsfjkndjg50z59sbbhc7h68"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; };
+  RTN = derive2 { name="RTN"; version="1.12.0"; sha256="19rsyr07hq17jah063w74dck9c0yjn6s2i73afawbdjpcqzcrz1n"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; };
+  RTopper = derive2 { name="RTopper"; version="1.20.0"; sha256="11vqgq594z3di5pa89irrnaiynxmi332g6d35za0glhpba3bj5bz"; depends=[Biobase limma multtest]; };
+  RUVSeq = derive2 { name="RUVSeq"; version="1.8.0"; sha256="043dmg1ggfvkn8vjaz4k9qvkjrc4ncm4p74iarh02mk0pzx5m9f9"; depends=[Biobase EDASeq edgeR MASS]; };
+  RUVcorr = derive2 { name="RUVcorr"; version="1.6.0"; sha256="13c9l874qlikk5qi8qbfdy9q749xsknf9rl7pz46n03j74afad86"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
+  RUVnormalize = derive2 { name="RUVnormalize"; version="1.8.0"; sha256="1hsw0y9s2890z6vim5xjp95p3gdxcy1x2paw276rrgwbz1xda1p1"; depends=[Biobase RUVnormalizeData]; };
+  RamiGO = derive2 { name="RamiGO"; version="1.20.0"; sha256="0a61368vzjljqwk3zvd92fb8h6hgr1baiww28531kqadjf83f8nr"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
+  RankProd = derive2 { name="RankProd"; version="3.0.0"; sha256="02k3977y55qph3jx86q4s4dkhndfsbcqq2xgk4xn1nglr64z4azv"; depends=[gmp Rmpfr]; };
+  RareVariantVis = derive2 { name="RareVariantVis"; version="1.8.0"; sha256="1irnj6331sr6387k922x6548pk7727vwlzy15awjxcrqlzi5jmim"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; };
+  Rariant = derive2 { name="Rariant"; version="1.10.0"; sha256="1sl9wxdkhac2s5sp93mavpxdmif6pkmki95xm1ci8rhms7jg66xr"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
+  RbcBook1 = derive2 { name="RbcBook1"; version="1.42.0"; sha256="1plcslp68xmr0727wj9v82yyc7lf4n76ixnh6k9lnrrs1ayzz2i9"; depends=[Biobase graph rpart]; };
+  Rbowtie = derive2 { name="Rbowtie"; version="1.14.0"; sha256="11sl03ljkq7hkm6ilw91bh4p2lz6iw35xn0f5fyh37i0j5nrmikh"; depends=[]; };
+  Rcade = derive2 { name="Rcade"; version="1.16.0"; sha256="05jg13qmrg11d9gkm76d2c3drlzk5l7ld7c57f5fysakg49qbxsd"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; };
+  Rchemcpp = derive2 { name="Rchemcpp"; version="2.12.0"; sha256="140hwsb7b0cdps5vzjjv4hjcli58g1mkbapxkd8692hjd6ncvpsj"; depends=[ChemmineR Rcpp]; };
+  RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.14.0"; sha256="0w4gzcml89ww8br6xqc903ygbkmzfl5xq13k4lngcbis7b7xmxpj"; depends=[flowType graph Rgraphviz sfsmisc]; };
+  Rcpi = derive2 { name="Rcpi"; version="1.10.6"; sha256="0cqy9fr1dg85fwgkilyflwarqs0dp98xrx78xzysh0nckwbqj6mz"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
+  Rdisop = derive2 { name="Rdisop"; version="1.34.0"; sha256="0fvwv7mm771wa86by3clbrx9sh7hflp1kmcyjj3xnbilwyyglvsg"; depends=[Rcpp RcppClassic]; };
+  ReQON = derive2 { name="ReQON"; version="1.20.0"; sha256="1bg7y50zh6zd6v8pmvzdzpd51nazl7ymdx57ydc5ngai372g6s0j"; depends=[rJava Rsamtools seqbias]; };
+  ReactomePA = derive2 { name="ReactomePA"; version="1.18.1"; sha256="033cq1pjd03h543abz35mz6vdcxk9ai879b2f8jxppbrmhyi3jij"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; };
+  ReadqPCR = derive2 { name="ReadqPCR"; version="1.20.0"; sha256="0rh42d2wskcmwx81266gb9npgl2gcfxsslz2drd74yvr19vc9wg2"; depends=[affy Biobase]; };
+  RedeR = derive2 { name="RedeR"; version="1.22.0"; sha256="0si80xqv3sgyjflrc4h8sq4babcd5pqr2h87a3vbmiry9daw6q2d"; depends=[igraph pvclust RCurl XML]; };
+  RefNet = derive2 { name="RefNet"; version="1.10.1"; sha256="0ssb5lhzqwgn9zahhnyk3cqbqdk0qv46819iclz2zd3na6qpkg27"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
+  RefPlus = derive2 { name="RefPlus"; version="1.44.0"; sha256="0zai3s27xlqjjwvz4da5mq67yll4a4l8a6jyps6m9f6dw1q2c5jl"; depends=[affy affyPLM Biobase preprocessCore]; };
+  Repitools = derive2 { name="Repitools"; version="1.20.0"; sha256="05y2y7v768mir3r8c53w1qm9dhpy46fqbyhwakpjaiha1h8y6gxn"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
+  ReportingTools = derive2 { name="ReportingTools"; version="2.14.0"; sha256="02q90prc115wbhk1851gsbv4xxd39xzbav9c9vck6qirbiangj5g"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; };
+  Rgraphviz = derive2 { name="Rgraphviz"; version="2.18.0"; sha256="08brd7cmhxmbv43cf3pq0282fwyxc6hmx3y5dr7filzdb0qs8ja1"; depends=[graph]; };
+  Rhtslib = derive2 { name="Rhtslib"; version="1.6.0"; sha256="1vk3ng61dhi3pbia1lp3gl3mlr3i1vb2lkq83qb53i9dzz128wh9"; depends=[zlibbioc]; };
+  RiboProfiling = derive2 { name="RiboProfiling"; version="1.4.1"; sha256="19ndx2xdvj57r9wsz9ym3ywilib18cbpm4dswzrhdgjliw73kdjs"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
+  Ringo = derive2 { name="Ringo"; version="1.38.0"; sha256="0c6h7lm6aqs7y57w2h36g4yr7wl2h9yrp60vv4128bdxgjqkv539"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
+  Risa = derive2 { name="Risa"; version="1.16.0"; sha256="1iix9nrn0p7vvv138qxdnz9aqcicrd97hn1sfgm8n46dcn5ghmqy"; depends=[affy Biobase biocViews Rcpp xcms]; };
+  Rmagpie = derive2 { name="Rmagpie"; version="1.30.0"; sha256="00bv93d861finxi38pqbrypjiz1hsazzjrbihy4q5sfy2162xpa5"; depends=[Biobase e1071 kernlab pamr]; };
+  RmiR = derive2 { name="RmiR"; version="1.30.0"; sha256="0j0h6ififbdbc4k99k0fq5pvaig4dm0gndzbglqrl2xl77ykhpyr"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
+  RnBeads = derive2 { name="RnBeads"; version="1.6.1"; sha256="1kjxxbhm9f519sbldmklp7nizf71wq6vbnhkad23y4j05ywlywmf"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer S4Vectors]; };
+  RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.6.0"; sha256="1lyvhkli4xdhshh53dg2xl9cyy11913zm3pnfpbfha1b0cl5w7d6"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
+  Rnits = derive2 { name="Rnits"; version="1.8.0"; sha256="0dna0gv4f4ws0xwx5ikaqvn9x01yzln1ihrdc5886bnwmlrxwqm7"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
+  Roleswitch = derive2 { name="Roleswitch"; version="1.12.0"; sha256="13db86wfzw6bixjxk77d0syzazvy11x5khij2yda5py45cc6q042"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
+  RpsiXML = derive2 { name="RpsiXML"; version="2.16.0"; sha256="14wlw9cmjr6iv6zydw4l7bfg9dicgb3zk7qfnrlqd9060kgqbfv2"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
+  Rqc = derive2 { name="Rqc"; version="1.8.0"; sha256="1h3fqmkifr2bdcql161dssfbabkn4x5wg753wbg1j9lfsgn2zp96"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
+  Rsamtools = derive2 { name="Rsamtools"; version="1.26.2"; sha256="118nsajgghi4cy3h0wi7777kc70a5j1fdyxv5n1dy01glix2z4qk"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+  Rsubread = derive2 { name="Rsubread"; version="1.24.2"; sha256="14v255j1n01gl1s0d13rag6m4nmpc2gg636hy4mn505bnvqp147y"; depends=[]; };
+  Rtreemix = derive2 { name="Rtreemix"; version="1.36.0"; sha256="18a6pf517an68n5bxxrnql2qzm5jmmi0k3zaqg3n6zkmfz6izm48"; depends=[Biobase graph Hmisc]; };
+  S4Vectors = derive2 { name="S4Vectors"; version="0.12.2"; sha256="0syx0qgipx97zsp3b8afhzamsr30835a2a99yb9wnq7b50g3v3p1"; depends=[BiocGenerics]; };
+  SAGx = derive2 { name="SAGx"; version="1.48.0"; sha256="1sy7r5nnp9lq8r9217zfy8g5vzjcsh4raiwd06dk4qgshqwd091b"; depends=[Biobase multtest]; };
+  SANTA = derive2 { name="SANTA"; version="2.12.0"; sha256="19xrjv25y780jlgl0fw0hlvwdnnjkr6ql769y86qnmj5ipqmgici"; depends=[igraph Matrix snow]; };
+  SBMLR = derive2 { name="SBMLR"; version="1.70.0"; sha256="0g1wzx18sac73mwn1v1jgvdx8kbbc2ijrc8nq45h64hg00w66zys"; depends=[deSolve XML]; };
+  SC3 = derive2 { name="SC3"; version="1.3.18"; sha256="1nqrzwgb55353q9gf4lky55sda6vggq5rfnmfs0g66vld6ghs6ag"; depends=[cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov scater shiny WriteXLS]; };
+  SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.16.0"; sha256="04pfbmhnn6y842i7hd210qqqdkk1q2x25y34x6bnxvfvs5adg4nm"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
+  SELEX = derive2 { name="SELEX"; version="1.6.0"; sha256="0j8jqfxynh22r1b4cb2l0chq93i8r5izf40bfbmyxcyw56hbp9y7"; depends=[Biostrings rJava]; };
+  SEPA = derive2 { name="SEPA"; version="1.4.0"; sha256="0qrlirs7y6b4f86n9xzk29c1mpq32rjzmz22rl3dgqfanm0rhazy"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
+  SGSeq = derive2 { name="SGSeq"; version="1.8.1"; sha256="13rv6dwf7bmd2asd16kg3cvpw3zfbnx4z8xh3sficzr409r4xj5v"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
+  SICtools = derive2 { name="SICtools"; version="1.4.0"; sha256="14crfai0zy3yc74g755hvxpm0r942k6a38sgx399bybxwnlbqdd7"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
+  SIM = derive2 { name="SIM"; version="1.44.0"; sha256="1f37dc843ir2jy9998gmniydc8ypqnmp68f975vkyqicbzfplh83"; depends=[globaltest quantreg quantsmooth]; };
+  SIMAT = derive2 { name="SIMAT"; version="1.6.1"; sha256="14masfdaqbsfwi1yh9cqb2cs4b47a3sy159iig5ahlbc4x9mkmvq"; depends=[ggplot2 mzR Rcpp reshape2]; };
+  SIMLR = derive2 { name="SIMLR"; version="1.0.1"; sha256="1r5yzjmjgv1lvw4b4863zs6h54614shp2bvic439wdaqr8pcq6dk"; depends=[Matrix]; };
+  SISPA = derive2 { name="SISPA"; version="1.4.0"; sha256="1rfk3gyz5h1qz333cjim6952h01x15gl067jil6i4kislkpjlza7"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; };
+  SLGI = derive2 { name="SLGI"; version="1.34.0"; sha256="0080vwdh43i61xsii3kr517z24606dg1l412q0pg4z68p57cqrg1"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
+  SLqPCR = derive2 { name="SLqPCR"; version="1.40.0"; sha256="1zqdmq461mcz0ic9m5l4y12jmp5vf4b6w19icj2l18s9ndb2b12v"; depends=[]; };
+  SMAP = derive2 { name="SMAP"; version="1.38.0"; sha256="0qpllwng8xgx6vfg8a6vrz2353b45xhbmv8vqx81z4b0jh1knbav"; depends=[]; };
+  SMITE = derive2 { name="SMITE"; version="1.2.0"; sha256="1xqidcmr1p1nmmrhpdhbclxzfqcs33l1q8zpqs2qcbpx4svvjafb"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; };
+  SNAGEE = derive2 { name="SNAGEE"; version="1.14.0"; sha256="1qpvqxwh14iqw5w9sx366ri9h5q3fbq2cvk0brhsq9hslccb480m"; depends=[SNAGEEdata]; };
+  SNPRelate = derive2 { name="SNPRelate"; version="1.8.0"; sha256="07ml3kwpz272q40k4qynj5farwr17lwarwclsd642s2vg0xandd6"; depends=[gdsfmt]; };
+  SNPchip = derive2 { name="SNPchip"; version="2.20.0"; sha256="036k1la7ji9fgni0mgrz3bivkh2r66xzqd3q0hys4hr6bg7xrywi"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; };
+  SNPediaR = derive2 { name="SNPediaR"; version="1.0.0"; sha256="0cbw37jdmv9bvaclvnj3wyn4r05bbyab6gr0q5gapkzz7zvg8rj1"; depends=[jsonlite RCurl]; };
+  SNPhood = derive2 { name="SNPhood"; version="1.4.1"; sha256="17miqrv6v0n6nlrn8rkblqzsf6vk5gspmban8drbjc0j13fjpmli"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  SPEM = derive2 { name="SPEM"; version="1.14.0"; sha256="1pik7sd9gg9hq3yapvc046cjcm6braq2q6nfbc2fv360xsm43ahm"; depends=[Biobase Rsolnp]; };
+  SPIA = derive2 { name="SPIA"; version="2.26.0"; sha256="0z5d3bdzixams0nv6z3yr6c8cgymv2wzbnkvg6r1xfi86mrqh0s0"; depends=[KEGGgraph]; };
+  SPLINTER = derive2 { name="SPLINTER"; version="1.0.0"; sha256="0w8082mnb8zkbkrp09hcwvn7y63y9p26slx2hvjxh07zw2h2k73c"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; };
+  SQUADD = derive2 { name="SQUADD"; version="1.24.0"; sha256="1l7rkmqw571wjwcr2wh3d2q652jpcba2hgf8nfbhc1h7da0yz5n5"; depends=[RColorBrewer]; };
+  SRAdb = derive2 { name="SRAdb"; version="1.32.0"; sha256="168ijnvv3yhh9j5wbp5m4bqns63dhnmqm108pjdfwxjm2ya0dvra"; depends=[GEOquery graph RCurl RSQLite]; };
+  SRGnet = derive2 { name="SRGnet"; version="1.0.0"; sha256="02y7w06j6qjvf49k8a4k03djahv934h4npj18hj10a4941d8ixfn"; depends=[DMwR EBcoexpress gbm gRain igraph limma MASS matrixStats pvclust RedeR]; };
+  SSPA = derive2 { name="SSPA"; version="2.14.0"; sha256="0l95hws5c4gb8c1jsqpnwc3010gx9l8yi132svxa6wbms73qpfy2"; depends=[lattice limma qvalue]; };
+  STAN = derive2 { name="STAN"; version="2.2.0"; sha256="0z5b22rqyk15gpqhlafq15gaa5h9cs0v1pm64j12qww41nrd6sz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; };
+  STATegRa = derive2 { name="STATegRa"; version="1.8.0"; sha256="1qn3gdz23a23i1mm006z1s58j8ky5ik3zy67bc6ji6yv0pqcdmah"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
+  STRINGdb = derive2 { name="STRINGdb"; version="1.14.0"; sha256="17mliwk1cd67bd485j5g8wp1ch8z4mvap44ikvxa4pv51jqrqvh0"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
+  SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.0.0"; sha256="17f0a3h82yh9lsanq17prkrbs094bc4kgj9vy6hjk0ivlh0mb0wm"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; };
+  SVM2CRM = derive2 { name="SVM2CRM"; version="1.6.0"; sha256="02k95x5ifdbnr2jwkppq94q5xbpfxvix8dnqfnjjzxni2qqgwzs3"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
+  SWATH2stats = derive2 { name="SWATH2stats"; version="1.4.1"; sha256="0jnryq56yjnp7blp9hiw45w03k7g7bb08frxqv98a2zz93vqrcxd"; depends=[data_table ggplot2 reshape2]; };
+  SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.28.0"; sha256="08yyvidwzn3ijj0p339nbd94ix4f96141sa1y175cv13rfpcapdw"; depends=[]; };
+  ScISI = derive2 { name="ScISI"; version="1.46.0"; sha256="0hrm72dkn8xn5ipw7q1vixybxhc5w13d1g42k6g7ds94mgm4y7lk"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
+  SemDist = derive2 { name="SemDist"; version="1.8.0"; sha256="1a7f3md15a5fb9s483wz2mhhi99jhmbix9vwa44rnkd3c6xahvyz"; depends=[annotate AnnotationDbi GO_db]; };
+  SeqArray = derive2 { name="SeqArray"; version="1.14.1"; sha256="05s7iq3pbn3cpfqr5jvk4fxmvqcgray1d0yvk1j2d2fs6jmdsj97"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+  SeqGSEA = derive2 { name="SeqGSEA"; version="1.14.0"; sha256="03g7pzhw7xz7iwac9d8lw1z0d5hxz982b65ydjwnfq87psssklx4"; depends=[Biobase biomaRt DESeq doParallel]; };
+  SeqVarTools = derive2 { name="SeqVarTools"; version="1.12.0"; sha256="1y9bdprh3iw8m5mcys5w6cvi4msh5m2291mnh81gchypk4wmpcgi"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray stringr VariantAnnotation]; };
+  ShortRead = derive2 { name="ShortRead"; version="1.32.1"; sha256="1m7lbfxs7xwcy9xs76zy5rky2mb96anvh457xfw60lh3kygwfpxc"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
+  SigCheck = derive2 { name="SigCheck"; version="2.6.0"; sha256="0ddq2q47g6anz3y3p25p5vp2nkr4ib3slyd1z5q86gaa6rja9zsv"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
+  SigFuge = derive2 { name="SigFuge"; version="1.12.0"; sha256="0cqdzpim9la30fdcn2kk1jb8yj27hx22szlmj86jadv21wrjspwz"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
+  SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.12.0"; sha256="02rcz4h0agqm4xp5p6w3i7ssyjj9l52hg9rzp2pig854nmbyyhay"; depends=[Biobase limma mclust Ringo]; };
+  SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.10.0"; sha256="14y7ija2c1qby4gb4p9jm1dgn6d1175nlm1cwpvisi8nrri3bfzq"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+  SpacePAC = derive2 { name="SpacePAC"; version="1.12.0"; sha256="0xawxv7a59b9w4ggn2ifgwbmxslwp9f4cvkx1mafllj8m9wg8m2q"; depends=[iPAC]; };
+  SpeCond = derive2 { name="SpeCond"; version="1.28.0"; sha256="1paj6xpab9gv77fa5p6ndddsc0w9wqd59xkyvaarwka4c74i3983"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
+  SpidermiR = derive2 { name="SpidermiR"; version="1.4.8"; sha256="1nqakgccxz5112sfj89jw5mc530kxw5lspsrnhma3sb5ivv89291"; depends=[AnnotationDbi ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
+  SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.14.0"; sha256="00cgvkh5g16i2kbdlhafpjwfszcki7g5ipl7lpkrvrzk3f9701h7"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
+  StarBioTrek = derive2 { name="StarBioTrek"; version="1.0.3"; sha256="0al6l12msrgh6hv73xhqvsqnm1yyvkv34g23dazwf52lxm3qvlkn"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; };
+  Starr = derive2 { name="Starr"; version="1.30.0"; sha256="1wq7166k8incddgivrvijyzq7xd65bwl7rlqxc4c34g7fwzmh0hc"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
+  Streamer = derive2 { name="Streamer"; version="1.20.0"; sha256="00vi6wh4gq6x5yrvqs2gxmy0nbcjdhiwxzi1v2v99ax11p69h37m"; depends=[BiocGenerics graph RBGL]; };
+  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.4.0"; sha256="1kbj8sg2ik9f8d6g95wz0py62jldg01qy5rsdpg1cxw95nf7dzi3"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; };
+  Sushi = derive2 { name="Sushi"; version="1.12.0"; sha256="05cl27h76kvxvsbc70gkma3rv9xnavg9iqm7wncardc2b8jprsk1"; depends=[biomaRt zoo]; };
+  SwathXtend = derive2 { name="SwathXtend"; version="1.2.0"; sha256="0r7cmiqmp8pkzzr3hbp8k2wk4gzikxp46bxz90dbxaxhasl0b8i0"; depends=[e1071 lattice openxlsx VennDiagram]; };
+  SwimR = derive2 { name="SwimR"; version="1.12.0"; sha256="1mmj7sf1j5414gq5ng0s74xkx0cp93l7js0whnw5bvpp43d2f2iv"; depends=[gplots heatmap_plus R2HTML signal]; };
+  TCC = derive2 { name="TCC"; version="1.14.0"; sha256="09kyj1wfpkc0iphd5iml3nh2mxr3dkzs52bbqsn259pc82p8bhxb"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
+  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.2.10"; sha256="0cmv0ca3y3nc15na55j4684c2q2g2z64cpfnlxkxkgmd4djkxxwv"; depends=[affy Biobase biomaRt c3net circlize clusterProfiler ComplexHeatmap ConsensusClusterPlus data_table dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicRanges ggplot2 ggrepel ggthemes gplots gridExtra httr igraph IRanges jsonlite knitr limma matlab minet parmigene pathview plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment supraHex survival survminer tibble XML xml2 xtable]; };
+  TDARACNE = derive2 { name="TDARACNE"; version="1.24.0"; sha256="06zvmrdg1rjns750w6mlx817r9fn1nkb75qd4qhcvyz6iagpdh54"; depends=[Biobase GenKern Rgraphviz]; };
+  TEQC = derive2 { name="TEQC"; version="3.14.0"; sha256="0a85r0skfjqmqs25lgarghzlq3fqp6gcyi5dzm7s3kn0kin0y8cf"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
+  TFBSTools = derive2 { name="TFBSTools"; version="1.12.2"; sha256="0r3rgxprc61gmvc636bybw1hqf8li2h52ch54c4jp3ach0bmyjcf"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
+  TIN = derive2 { name="TIN"; version="1.6.0"; sha256="18y6786wdpq9q4cvxqw0fs01hckgfhqhglpz8sb1hh044i6i00n0"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
+  TPP = derive2 { name="TPP"; version="3.0.3"; sha256="1l0qyjwqcn5hj1820pmxfrfb0c0i226jdpbamx4kmszy5rc3b5yv"; depends=[Biobase doParallel dplyr foreach ggplot2 gridExtra knitr limma magrittr MASS nls2 openxlsx plyr RColorBrewer RCurl reshape2 rmarkdown sme tidyr VennDiagram VGAM]; };
+  TRONCO = derive2 { name="TRONCO"; version="2.6.1"; sha256="1hwyac9jrivcl4h4k5fv54ywlf2aicd4hkr44v0mz5wgbdy1glgg"; depends=[bnlearn cgdsr circlize doParallel foreach gRapHD gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
+  TSCAN = derive2 { name="TSCAN"; version="1.12.0"; sha256="0zcmm7rwhc85fb5b271mdlynplsh0qdbyaw6h6fnwl8w1rdxfa6d"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
+  TSSi = derive2 { name="TSSi"; version="1.20.0"; sha256="0f7xpd4lmv13297klvrskmiwszxl0i980vvg8ba5k9kd60qjk811"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
+  TVTB = derive2 { name="TVTB"; version="1.0.2"; sha256="1v3vcyh8sqv7bn06zzndppdpb8vvwm6jgsv0xz9yfx2lnasgbw3v"; depends=[BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges ggplot2 IRanges reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; };
+  TarSeqQC = derive2 { name="TarSeqQC"; version="1.4.1"; sha256="1x57wd2cdfw1qrsqqm6v4flzwzkq1rkq58k214nqmi602sv66nlf"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
+  TargetScore = derive2 { name="TargetScore"; version="1.12.0"; sha256="0mj25y82nvlk5sk9d2dh0p96i2bzrh0xl3cjsyxz0r7n2vyzlrl2"; depends=[Matrix pracma]; };
+  TargetSearch = derive2 { name="TargetSearch"; version="1.30.0"; sha256="1z7sf0qmq3fcpf9h569f4qd4647p1rl4372w9ch8ykyjc8md7gs0"; depends=[ncdf4]; };
+  TitanCNA = derive2 { name="TitanCNA"; version="1.12.0"; sha256="1bi6gx9k3f13zjq1pp79ixzalvql5bjlmb8fb5schghb99yx82m5"; depends=[foreach GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
+  ToPASeq = derive2 { name="ToPASeq"; version="1.8.0"; sha256="1b65f3jak7yqlfwwzcld41s40x0p1cfyc2lklvc9ngz8g12hql8z"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz SummarizedExperiment TeachingDemos]; };
+  TransView = derive2 { name="TransView"; version="1.18.0"; sha256="0hnk5msxpb8734djy07cgkgcf4wkkfcdcvg14a44drxdiahsijyk"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
+  TurboNorm = derive2 { name="TurboNorm"; version="1.22.0"; sha256="06bs841mfspzsjhh61p25apwmn0qnakbxgj1l142i9bv3z7v69cc"; depends=[affy convert lattice limma marray]; };
+  TypeInfo = derive2 { name="TypeInfo"; version="1.40.0"; sha256="108q2bxmqf4mshc5ixbf1v55099lzsprwii5qs0y9y2n8x5ra0h2"; depends=[]; };
+  UNDO = derive2 { name="UNDO"; version="1.16.0"; sha256="0pmdb7gkf7g2b45j5hiksppn75ja3r2nm71qr4a2841diz93fsri"; depends=[Biobase BiocGenerics boot MASS nnls]; };
+  UniProt_ws = derive2 { name="UniProt.ws"; version="2.14.0"; sha256="10m7qzcvhqvqskhrnxbbk2kx4fpq8dn9k2p8l665ds65ixv8xn9x"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
+  Uniquorn = derive2 { name="Uniquorn"; version="1.2.0"; sha256="19pcbl37khg4m7h4amzzc28xpm5izg8nn998b42pjvibxg6x14hb"; depends=[DBI R_utils RSQLite stringr WriteXLS]; };
+  VanillaICE = derive2 { name="VanillaICE"; version="1.36.0"; sha256="00nf5zxjv5409qj79jh1mhidsgkxjk5piysadv2ak8xwpj9zznws"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
+  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.20.3"; sha256="10v8apgfw57nd4dxmdxdrijxpw135jpp2p8wrk3wjpb3hhfjp1qj"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+  VariantFiltering = derive2 { name="VariantFiltering"; version="1.10.1"; sha256="0dy97x77v5ray8d5iw5brs15h4r9l6kizqvziccc47jxxsxl103i"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; };
+  VariantTools = derive2 { name="VariantTools"; version="1.16.0"; sha256="13i481iiv3vi1m1lwi2s1vjaaplb4y1l7blmyvpqbpa87ync5crl"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  Vega = derive2 { name="Vega"; version="1.22.0"; sha256="11a8fz2fb2zyn6fgfa9hs5i4hsswp1hdxhahm41f4spn7acglmj7"; depends=[]; };
+  VegaMC = derive2 { name="VegaMC"; version="3.12.0"; sha256="1swjak8yg33ykrfa52jiq7v3rcgwzf1w664j6wifi5bcflgbjhg1"; depends=[Biobase biomaRt genoset]; };
+  XBSeq = derive2 { name="XBSeq"; version="1.4.0"; sha256="0f72qyhs8rsa5d4xbpgqd7lzxmgxcvk5dwqihfw714vg8mis7p8y"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
+  XDE = derive2 { name="XDE"; version="2.20.0"; sha256="11phzwfpyc4dfhhgbfn54ybz71jl2z5wyysvfv34d63lv00jj3yp"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
+  XVector = derive2 { name="XVector"; version="0.14.1"; sha256="1j14ip4c260kdp3zcmgfa2v8ky88csa0gfdg6a1xsb64s03hdbm6"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
+  YAPSA = derive2 { name="YAPSA"; version="1.0.0"; sha256="104ij0pwc8bfys8by0ha99fhjgr85n9havzcsakawna3vrkj2s3b"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; };
+  a4 = derive2 { name="a4"; version="1.22.0"; sha256="12c6y89nr4cck4fsx85bnsklpjic2fkyq550xjfjimy7a2jyx9pb"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
+  a4Base = derive2 { name="a4Base"; version="1.22.0"; sha256="0w1p7ggj9q33filrkgzqkdah6pb81d6lis3p0l4mmy254kgcc61s"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
+  a4Classif = derive2 { name="a4Classif"; version="1.22.0"; sha256="01c0gl0161psm8pbwwj7ny2zfgj7f1h9crzsj2hwl6240p771a51"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
+  a4Core = derive2 { name="a4Core"; version="1.22.0"; sha256="19wb5h9w7zw33hwacnj1y2ylg3ksh1w4vg0mhpgnmrj79zn26wqz"; depends=[Biobase glmnet]; };
+  a4Preproc = derive2 { name="a4Preproc"; version="1.22.0"; sha256="1wxf2yp52y63mr3jdsk7x1ah2xm39gwj0sz3fmp42bb1nrga57kh"; depends=[AnnotationDbi]; };
+  a4Reporting = derive2 { name="a4Reporting"; version="1.22.0"; sha256="0s57kfn9ca75cqscm6lhs2hw9jxydbcyvj9fwf93ygm731q47lrq"; depends=[annaffy xtable]; };
+  aCGH = derive2 { name="aCGH"; version="1.52.0"; sha256="0spz1y4vxi262h6dmrjdimwa58vsksys0mww80lgcqnggc3inzy2"; depends=[Biobase cluster multtest survival]; };
+  acde = derive2 { name="acde"; version="1.4.0"; sha256="1rabc0d7fnjw52i6qa4r27ch95jal7kyxmsn1iqfy8mcy8w0dqi4"; depends=[boot]; };
+  adSplit = derive2 { name="adSplit"; version="1.44.0"; sha256="0hk5wzssmfaz4vc4hm9xb3j3y285pvcpavcsvas6z68143j39cws"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
+  affxparser = derive2 { name="affxparser"; version="1.46.0"; sha256="0byfdrrsd3nbs4qdnxcyzb0xd244nnbs5y0h8h6km3fnc2cibghx"; depends=[]; };
+  affy = derive2 { name="affy"; version="1.52.0"; sha256="1snq71ligf0wvaxa6zfrl13ydw0zfhspmhdyfk8q3ba3np4cz344"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
+  affyContam = derive2 { name="affyContam"; version="1.32.0"; sha256="0b3bmqnrk9mzl8ap7rabfq9mlfqi9x80721qbc99hycxywdb9cfj"; depends=[affy affydata Biobase]; };
+  affyILM = derive2 { name="affyILM"; version="1.26.0"; sha256="19iw1aaqw7a9snhyg00ldj5h2j9gvb04wjl56ikvxfa83i1w2w2d"; depends=[affxparser affy Biobase gcrma]; };
+  affyPLM = derive2 { name="affyPLM"; version="1.50.0"; sha256="02kqhjiffq52gsyaz31yz62chs2kh314ivqhwcpkr7pixhsdzhiw"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
+  affyPara = derive2 { name="affyPara"; version="1.34.0"; sha256="0f7yrgij5mvwp66hc04lnkp628iva4wb9xs54m573hmvjdmqcjxv"; depends=[affy affyio aplpack snow vsn]; };
+  affyQCReport = derive2 { name="affyQCReport"; version="1.52.0"; sha256="0sr24zaav5mqs47mv956m6qn7yjgldqmcjq3pqahb5bfbi6j3gmc"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
+  affycomp = derive2 { name="affycomp"; version="1.50.0"; sha256="0ar8pv1k0ajx9l53cb0izarfap7wfji6rbjzwhkjzdijkr1ax3gh"; depends=[Biobase]; };
+  affycoretools = derive2 { name="affycoretools"; version="1.46.5"; sha256="0c1wpqwqlcdi0sa6dbxkmscd21wni1vrnj7wmxzbf37mq6wcggpp"; depends=[affy AnnotationDbi Biobase BiocGenerics edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; };
+  affyio = derive2 { name="affyio"; version="1.44.0"; sha256="1svsl4mpk06xm505pap913x69ywks99262krag8y4ygpllj7dfyy"; depends=[zlibbioc]; };
+  affylmGUI = derive2 { name="affylmGUI"; version="1.48.0"; sha256="1zd7644p3zfw1dlgv1f7d53nml2l6bxmlaa96yazd4n37bvx1k4b"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+  affypdnn = derive2 { name="affypdnn"; version="1.48.0"; sha256="1fk5mvcg3w3p20mrwac972sxd1m1xza6dzd4kc9m5yzkjw7hp5p4"; depends=[affy]; };
+  agilp = derive2 { name="agilp"; version="3.6.0"; sha256="00fmn774rzp291fkkfncp1pg0ryg4203pnqhpqlgp58kw7dj1fmd"; depends=[]; };
+  alpine = derive2 { name="alpine"; version="1.0.0"; sha256="0gqqk0hv38f1jmlf1n78kphb2p9bsax9lv0mmd5ph5lsi0jdip7j"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; };
+  alsace = derive2 { name="alsace"; version="1.10.0"; sha256="1qikhcxs24ycap2f2wvkm27fw7r7mlzxzz18am13371igbc8rl9d"; depends=[ALS ptw]; };
+  altcdfenvs = derive2 { name="altcdfenvs"; version="2.36.0"; sha256="1z7c2kb5c8d28i110mf6vqnhzijhyz7icjrgjab0jg1jbfm466ad"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; };
+  ampliQueso = derive2 { name="ampliQueso"; version="1.12.0"; sha256="0p0ydmz185hbzvc9rcqk45hqs3288k4zd36x0a6kk6hyjmjx0z05"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
+  anamiR = derive2 { name="anamiR"; version="1.0.1"; sha256="0rw4dg54vqmwl76917wgw2fz71zghg0jp6gal32vm3752hg92l3s"; depends=[agricolae DBI DESeq2 gplots limma lumi RMySQL SummarizedExperiment]; };
+  annaffy = derive2 { name="annaffy"; version="1.46.0"; sha256="0x0d9hhw7n8ay3d2kncl10b8q7ajb4mv8f6dpzg985cf6irm9pgb"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
+  annmap = derive2 { name="annmap"; version="1.16.0"; sha256="1qfm2r6w10nmixzwrk52mwkldgc6g2fqzlppd84wwf6mlvxsmb4j"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
+  annotate = derive2 { name="annotate"; version="1.52.1"; sha256="0yymz8qxgnbybvfhqrgkd1hh9dhwxdii1yxkhr1zicjgb35xixxb"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
+  annotationTools = derive2 { name="annotationTools"; version="1.48.0"; sha256="095mrvw3vjr068zm04z8fdidjg3h8iijdvhdfizkfdp36a6lm3kk"; depends=[Biobase]; };
+  annotatr = derive2 { name="annotatr"; version="1.0.3"; sha256="0m4s98sdj5i6wifnf05hb4hjr1qqrpkwjrvc13iq151v2zmzhfbn"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges org_Dm_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db readr regioneR reshape2 rtracklayer S4Vectors TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Dmelanogaster_UCSC_dm6_ensGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene TxDb_Rnorvegicus_UCSC_rn5_refGene TxDb_Rnorvegicus_UCSC_rn6_refGene]; };
+  anota = derive2 { name="anota"; version="1.22.0"; sha256="0qknx73nx2v9y2d2wc57i07varii1y8cr0dvnjcvwr0bnnbi38za"; depends=[multtest qvalue]; };
+  antiProfiles = derive2 { name="antiProfiles"; version="1.14.0"; sha256="1frd43dcyaad6rrm8xdhf8vc4fwqyz6kyjlgvq7bxgfkdl8j0si0"; depends=[locfit matrixStats]; };
+  apComplex = derive2 { name="apComplex"; version="2.40.0"; sha256="09sd7jx0as0bqgga0ammqghkx8cff4rl8vs1nzhfpv5g00kzdqvh"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
+  aroma_light = derive2 { name="aroma.light"; version="3.4.0"; sha256="1cgad3xydmglfkqjqqxvxwxnq65m517hp1jwpw0lsfc13ip13f27"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
+  arrayMvout = derive2 { name="arrayMvout"; version="1.32.0"; sha256="1chrnjnl9yx3xjf1hk36x2xmh93hg1dnhifj8nh9c1hwgnwkkaf1"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
+  arrayQuality = derive2 { name="arrayQuality"; version="1.52.0"; sha256="0nrw7wzs73y4zcvdk96mqprpnzzcn44ys6i4cbk3hvmrqwfgrhj0"; depends=[gridBase hexbin limma marray RColorBrewer]; };
+  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.30.0"; sha256="0vdvf8wb8dcm2zygqn34l24d6liw3v1qc2nx9sl6wb3zyi4ly60s"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
+  attract = derive2 { name="attract"; version="1.26.0"; sha256="0wmkydqkrpbn460wa1xsgjic9jfd0j764nn7f7fh5f5iwif1g2gj"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; };
+  bacon = derive2 { name="bacon"; version="1.2.0"; sha256="1h38yh9d6mc4jbmhnq342ba8xndfmjr9mpf5gnq7hzb7ai2gmspy"; depends=[BiocParallel ellipse ggplot2]; };
+  ballgown = derive2 { name="ballgown"; version="2.6.0"; sha256="02f547y31a133jxqwlq0qianjj2lrlr9kn63x9i91vsyf22mb1ya"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
+  bamsignals = derive2 { name="bamsignals"; version="1.6.0"; sha256="1k42gvk5mgq4la1fp0in3an2zfdz69h6522jsqhmk0f6i75kg4mb"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
+  baySeq = derive2 { name="baySeq"; version="2.8.0"; sha256="136ll90xapsv1p6pns81kk4krgvbhsamhrych9gfb34r8p6pyplr"; depends=[abind edgeR GenomicRanges]; };
+  beadarray = derive2 { name="beadarray"; version="2.24.0"; sha256="1yjpkzknvznvc3qacdf6ma1jfxkw5basir3h0ipvfm6jnd07l1g3"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
+  beadarraySNP = derive2 { name="beadarraySNP"; version="1.40.0"; sha256="1afy96fx6600cw92my65zds9w99y4yxyzbssr06ycfrzz3sd6xrb"; depends=[Biobase quantsmooth]; };
+  betr = derive2 { name="betr"; version="1.32.0"; sha256="093lynqrfbb6iai3s2wvwmjjx8p43nb32mxghxf3ymchaq0hnbgw"; depends=[Biobase limma mvtnorm]; };
+  bgafun = derive2 { name="bgafun"; version="1.36.0"; sha256="1kjrg0c686cj7ykvas7wknc3lvdlj4jvfybfwqxwnnzxrjqn350l"; depends=[ade4 made4 seqinr]; };
+  bgx = derive2 { name="bgx"; version="1.40.0"; sha256="1lzcgfjqgvd0a8r7qi8hyb1l99qw7d68bqzy97sqaaqnfb773qr4"; depends=[affy Biobase gcrma]; };
+  bigmelon = derive2 { name="bigmelon"; version="1.0.0"; sha256="1wj8x195gaqq3h0y62ilxsrh0xz17d0vfnbcbblg392a4c41p4j2"; depends=[Biobase gdsfmt methylumi minfi wateRmelon]; };
+  bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.20.0"; sha256="0zd43xyx433s7aghs3x4963hf2pcr6q6qyx99bxrbkbdws5m9zql"; depends=[bigmemory]; };
+  bioCancer = derive2 { name="bioCancer"; version="1.2.0"; sha256="1szkrk81nyxfj8agd010495l8c3iirnixmwly38lz1f16w2p494l"; depends=[AlgDesign AnnotationFuncs Biobase broom car cgdsr clusterProfiler covr curl data_tree DiagrammeR DOSE dplyr DT geNetClassifier ggdendro ggplot2 GPArotation gridExtra htmlwidgets jsonlite knitr lubridate magrittr markdown MASS org_Hs_eg_db plyr pryr psych RCurl reactome_db ReactomePA readr scales shiny shinyAce stringr tibble tidyr visNetwork wordcloud XML yaml]; };
+  bioDist = derive2 { name="bioDist"; version="1.46.0"; sha256="1ark28jkh3zi0pc4a0xj9qmim38n9k919avx9ir35wxm81133g0a"; depends=[Biobase KernSmooth]; };
+  bioassayR = derive2 { name="bioassayR"; version="1.12.1"; sha256="09sd6naqai7qiwinjwdh6fxgswcs7z9jfh5w93vg34m29i8sry36"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
+  biobroom = derive2 { name="biobroom"; version="1.6.0"; sha256="1r2v43hpk0h6cnsaxxbks4c3c1jnakrpx693px2vg04r2gl9b9pc"; depends=[Biobase broom dplyr tidyr]; };
+  biocGraph = derive2 { name="biocGraph"; version="1.36.0"; sha256="1sxhb713sn32kpjin5m0rg32b7gw75d5a6b4m9gqj0p7537phkjd"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
+  biocViews = derive2 { name="biocViews"; version="1.42.0"; sha256="07rjk10b91pkriyq297w86199r2d3sfji3ggs9mq2gyalsa8y4b6"; depends=[Biobase graph RBGL RCurl RUnit XML]; };
+  biomaRt = derive2 { name="biomaRt"; version="2.30.0"; sha256="1x0flcghq71784q2l02j0g4f9jkmyb14f6i307n6c59d6ji7h7x6"; depends=[AnnotationDbi RCurl XML]; };
+  biomformat = derive2 { name="biomformat"; version="1.2.0"; sha256="1p768n1kw82bl2n1ifsdfvl7rxbxhgg6qg6f72nqn07x2s14rr6g"; depends=[jsonlite Matrix plyr rhdf5]; };
+  biomvRCNS = derive2 { name="biomvRCNS"; version="1.14.0"; sha256="111mhlfmnyz2m0n1s6f72kyd37fbs73fdcwva06p8b3v21pq4zbx"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
+  biosigner = derive2 { name="biosigner"; version="1.2.4"; sha256="0ckmmr9lsyvzarwpz49iwz2w31sjzlvp9pblaj5xkw7x2cj06i8l"; depends=[Biobase e1071 randomForest ropls]; };
+  biosvd = derive2 { name="biosvd"; version="2.10.0"; sha256="1gd93p178hs9rhh1w1vgxygw997lk3asmmgajkk6mh7463z340hg"; depends=[Biobase BiocGenerics NMF]; };
+  biovizBase = derive2 { name="biovizBase"; version="1.22.0"; sha256="0f3zwn0g0rc3ld8dd5sgpr14l9aff57j766h4grkiyazyyb46bnh"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  birta = derive2 { name="birta"; version="1.18.0"; sha256="101bwd0miz377ahc1v7g0rzx1m8qzgy2wmpw57bqnpfn0xawxzg3"; depends=[Biobase limma MASS]; };
+  birte = derive2 { name="birte"; version="1.10.0"; sha256="1kkj41d5w70kak00564zjycrcbr8vq3fxkg5f5j710b5shms91v2"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
+  blima = derive2 { name="blima"; version="1.8.0"; sha256="181xqsmqq1g52dvkxx7b5myj9fd1ss15x853n617fsij8sbnbarb"; depends=[beadarray Biobase BiocGenerics]; };
+  bridge = derive2 { name="bridge"; version="1.38.0"; sha256="1jfyg88i8yw6nz15sn3mhg5d7ms5xmimaca57bpj2y8yzzbbmg2k"; depends=[rama]; };
+  bsseq = derive2 { name="bsseq"; version="1.10.0"; sha256="0akzqcpcfsldjxyn9znyzdfczkkjpxxf9hfqzjqd3yj4x1hgnf4j"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; };
+  bumphunter = derive2 { name="bumphunter"; version="1.14.0"; sha256="08r5bvxnx96rv34lww0ccn1qhy98kwsdlvyp2bq21bmwqgfm5m03"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
+  caOmicsV = derive2 { name="caOmicsV"; version="1.4.0"; sha256="06zksrn6psfwfxqagf5ksqakqkpm32sls4vi8nvfpwkh69s1r7va"; depends=[bc3net igraph]; };
+  canceR = derive2 { name="canceR"; version="1.6.0"; sha256="10cai1l21cjdj61rp0s6w1a03fn03dzgcz9snb76yrr24cynhrf8"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+  cancerclass = derive2 { name="cancerclass"; version="1.18.0"; sha256="1zff6wz0529gc22c9bfnwa95xxadyhfbxjvr1b51w4zgms2bicfr"; depends=[binom Biobase]; };
+  casper = derive2 { name="casper"; version="2.8.0"; sha256="0ckqx8i7pgmjhznpw8pggc2f1147sd7vqhw2a4f0na9mv27l74iq"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
+  categoryCompare = derive2 { name="categoryCompare"; version="1.18.0"; sha256="0ppis6agdpccjg8bwr91axy770v67al93pg50zmk1rvbfl25b9gz"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
+  ccrepe = derive2 { name="ccrepe"; version="1.10.0"; sha256="14y97n28jqj78xscprgbnlwq4abf1vks3ipmp0w9y1yjj0jk0xl2"; depends=[infotheo]; };
+  cellGrowth = derive2 { name="cellGrowth"; version="1.18.0"; sha256="1yxlcli3h35aw9nzffnpv4nby255bmlkrwcdh6rr7i04393qjpzc"; depends=[lattice locfit]; };
+  cellHTS2 = derive2 { name="cellHTS2"; version="2.38.0"; sha256="117g37rvi92i21mg2ifxy9dxilvgf52nz3f51jdlcgf1w5zvm3n1"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
+  cellTree = derive2 { name="cellTree"; version="1.4.0"; sha256="1aqjz3cwl34inm7bw9pspgpi15h81si8gki3015j1ib8r45n9wda"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
+  cellity = derive2 { name="cellity"; version="1.2.0"; sha256="1lzrhqs1jq8khh3gmca381kcr6szmc17ng2jxpz025isbpc9b8y2"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
+  cghMCR = derive2 { name="cghMCR"; version="1.32.0"; sha256="1d9vygzf4dinr4xwcz7091zlyk798ph99g27dywpkqr7yijgjz8m"; depends=[BiocGenerics CNTools DNAcopy limma]; };
+  charm = derive2 { name="charm"; version="2.20.0"; sha256="14vf7jdi5hwk3rysm59kylzfajak0wqafipa8r02rij2h1354c3v"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
+  chimera = derive2 { name="chimera"; version="1.16.0"; sha256="0j7nhardm70p2l4svdb1cyqwk3j2247q5ig7ya72az5bh3bmamb6"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
+  chipenrich = derive2 { name="chipenrich"; version="1.12.1"; sha256="0vqhlljikhfb3byla05s0w95n0rfyww1rjp7g6zdsf09fy79pcw7"; depends=[chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv plyr rms S4Vectors stringr]; };
+  chipseq = derive2 { name="chipseq"; version="1.24.0"; sha256="115ayp82rs99iaswrx45skw1i5iacgwzz5k8rzijbp5qic0554n0"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
+  chopsticks = derive2 { name="chopsticks"; version="1.38.0"; sha256="1cxr419sdvy5s2whcs49hda3zy5fbgzjqgj9bb651qcwk6vc5n0h"; depends=[survival]; };
+  chroGPS = derive2 { name="chroGPS"; version="1.22.0"; sha256="0kq1dgik5dkhqb1as9zpwzpyhbw16c766vyn5all4frh0mpdiy0z"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; };
+  chromDraw = derive2 { name="chromDraw"; version="2.4.0"; sha256="0rzrcjzwqjb40l8yc25gscl6hnxwprrv738p46kmdh3a08ghxv5v"; depends=[GenomicRanges Rcpp]; };
+  chromPlot = derive2 { name="chromPlot"; version="1.2.0"; sha256="06wg345hkkpaq0m620sqgnwvk11qfkhn5yr8nyv9cbdbihqvg0if"; depends=[biomaRt GenomicRanges]; };
+  cisPath = derive2 { name="cisPath"; version="1.14.0"; sha256="108d1m3d07zblij9wsz2l6bw226bvwwl8w0gq3wdxjmgyjj48jzi"; depends=[]; };
+  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.12.0"; sha256="09bbqapri4vw9mdlch0hw6v49mxqbknrrj5q9ssyzhjhikz954sq"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
+  cleaver = derive2 { name="cleaver"; version="1.12.0"; sha256="0dnl7ihxhl640k91div133rz9kxa43wkvfyxkyqv31winymk0fy4"; depends=[Biostrings IRanges S4Vectors]; };
+  clippda = derive2 { name="clippda"; version="1.24.0"; sha256="0dqlr468awg4r1rnskzjj77c0amcq0nj1rh8j9s5ad6jvspyk1wk"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
+  clipper = derive2 { name="clipper"; version="1.14.0"; sha256="1qrj1l7qdkq6s8k2zq5rfkwnag0f1ivhcjcnzyszkf8nzpxz019g"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
+  clonotypeR = derive2 { name="clonotypeR"; version="1.12.0"; sha256="1j4s26l2k0msw8yza92348z8kpji0c9a1a83gjn7lazbs27arlnf"; depends=[]; };
+  clst = derive2 { name="clst"; version="1.22.0"; sha256="1yilfyf6azwdc48rdvfanjl0anl275qc6p1f2agyf5nfrhacpaaz"; depends=[lattice ROC]; };
+  clstutils = derive2 { name="clstutils"; version="1.22.0"; sha256="0wc7xv65dg2qi2778qlk49d3snx4ahv9km74jdysixwww2fqqqs4"; depends=[ape clst lattice rjson RSQLite]; };
+  clustComp = derive2 { name="clustComp"; version="1.2.2"; sha256="0pmna9q3y607d04pqyi4vkl5r7hl41cywsplpkmkwmwp8y1v2zls"; depends=[sm]; };
+  clusterExperiment = derive2 { name="clusterExperiment"; version="1.0.0"; sha256="0idg0iw7lb1iqzxwpilqh7njz2yv6783nzvmnxvdnx1vj7xihdky"; depends=[ape cluster dendextend howmany limma locfdr matrixStats NMF phylobase RColorBrewer SummarizedExperiment]; };
+  clusterProfiler = derive2 { name="clusterProfiler"; version="3.2.14"; sha256="0nip67hzcwc1zary2abcki4cgz32ixxkv9b8apllvz5a26scn02r"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim IRanges magrittr plyr qvalue tidyr]; };
+  clusterStab = derive2 { name="clusterStab"; version="1.46.0"; sha256="1h3j1qs6d5d4whmzljzjlg6favlb8r4nk2sm8sk5kjad37ywz3cm"; depends=[Biobase]; };
+  cn_farms = derive2 { name="cn.farms"; version="1.22.0"; sha256="18q8v82i90sj2c19idv5czy8dvlr2qghdlj29nqn8rwh8i04ayz9"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
+  cn_mops = derive2 { name="cn.mops"; version="1.20.1"; sha256="0wrf4k0a2zc6ymhlr6shncw4xdpfzwzfxig7ddrrwx4brrhn1c91"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
+  cnvGSA = derive2 { name="cnvGSA"; version="1.18.0"; sha256="18i6g6hmky6r9c6vgs67kxq5vvyaldlghlbpv518awd0y135fx4x"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
+  coGPS = derive2 { name="coGPS"; version="1.18.0"; sha256="0hcyha03gyh6zp1b24h2n9nx0vkzphh2d10nvss3ryaqj9305cxd"; depends=[]; };
+  coMET = derive2 { name="coMET"; version="1.6.0"; sha256="0biiz7g893l12ibqdx16zagyk124yjz41mmb8gb283rhlibf6bpm"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
+  coRNAi = derive2 { name="coRNAi"; version="1.24.0"; sha256="0qa7wrsz9m34dr7dm97cqwl2bzxn8zr0fkdqyr6x1jkixxfs76p1"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
+  cobindR = derive2 { name="cobindR"; version="1.12.0"; sha256="1nygdg9bipj1nwv6i1dk3mmmba7jzmf2q4wmqwf9ivgjfaskqd19"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
+  codelink = derive2 { name="codelink"; version="1.42.0"; sha256="0kxh3qs8plqlbq38mqyzc8lqcdsh4ig5ar2s12w5z8f17flax1fh"; depends=[annotate Biobase BiocGenerics limma]; };
+  cogena = derive2 { name="cogena"; version="1.8.0"; sha256="0q5w7bjaizsvzi576lpkh59j0ynjklq1h2f9sz4wssvi9xpkg7h8"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
+  compEpiTools = derive2 { name="compEpiTools"; version="1.8.0"; sha256="0bc7pmxi7j6gv1irwaab1z3x350pnnarp216lhvkn799g6bard9r"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
+  compcodeR = derive2 { name="compcodeR"; version="1.10.0"; sha256="0fzwxnf2n408k3548c3ravddd1m6vdc6212vnka5vggjhr6aapbm"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
+  consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.2.0"; sha256="0fmryl0lhahh75iy1ngqvv607iz1y9a1div3wkhw22hkzwkj0r9m"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; };
+  contiBAIT = derive2 { name="contiBAIT"; version="1.2.0"; sha256="07l8fy2caynakkixyipym7wmnvrjdng6j3gqqy6lbsczc18l2ljm"; depends=[BH BiocParallel clue cluster colorspace diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
+  conumee = derive2 { name="conumee"; version="1.8.0"; sha256="0a1abk4xfzlmz87gl6iysgriy1crs7yzhr11qajbayf7qlajyk1l"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; };
+  convert = derive2 { name="convert"; version="1.50.0"; sha256="01cgfnlnry5p3zjnb93cwm16kqdcl2szbps4pvgs3b8myznq3c4k"; depends=[Biobase limma marray]; };
+  copa = derive2 { name="copa"; version="1.42.0"; sha256="1k93l7sgia6p6acbzdg48pr3l7lcc6v3k4g2mgixm2r130i78s3v"; depends=[Biobase]; };
+  copynumber = derive2 { name="copynumber"; version="1.14.0"; sha256="1hm0k2gqgsgqvald19x09pf3x37xyyjwm5f32dxivfb04n504s1v"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
+  cosmiq = derive2 { name="cosmiq"; version="1.8.0"; sha256="12bc7hbjww6kza2hrg2x691h3nrsx74hji93xsk14zkf5z3c17wd"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
+  covEB = derive2 { name="covEB"; version="1.0.0"; sha256="0sbcsf6y68n49w7zvzci3q3dmgi7vji3b3rfa4xzqzdj89zzns8z"; depends=[Biobase gsl igraph mvtnorm]; };
+  covRNA = derive2 { name="covRNA"; version="1.0.0"; sha256="0igvcnni8in70dch50l6vx8aj66rgbaxh93y0bv86mnvmzs5avhk"; depends=[ade4 Biobase genefilter]; };
+  cpvSNP = derive2 { name="cpvSNP"; version="1.6.0"; sha256="0yw04dsbhvg1hfhd71b76cny79r553y8gfin2jzzy6jkifzd19fq"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
+  cqn = derive2 { name="cqn"; version="1.20.0"; sha256="1ac8kwd43ynli6hwfz9innlpiys1vyvq0ic8garixwpv9qwayrvs"; depends=[mclust nor1mix preprocessCore quantreg]; };
+  crisprseekplus = derive2 { name="crisprseekplus"; version="1.0.0"; sha256="1cvz483j94v2kk6fcjh22kj71zs097wghqfsdmr128za38x9vxf0"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; };
+  crlmm = derive2 { name="crlmm"; version="1.32.0"; sha256="1pa8879k0xdgmz5mk4lq8rhi0v9ai01bv3h1c0cq6blhvyca1rw2"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
+  crossmeta = derive2 { name="crossmeta"; version="1.0.1"; sha256="1fid7bl27vsj6kxkwpymkvm5b8p5xq25xk3d8x2r1k4sx10nfidl"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocInstaller data_table DT fdrtool GEOquery limma matrixStats metaMA miniUI oligo pander RColorBrewer rdrop2 shiny stringr sva]; };
+  csaw = derive2 { name="csaw"; version="1.8.1"; sha256="0vq3kxwqaaxz7k710f5y3pb8jidiqp815f5h4hy174cgmj3y1sz2"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
+  ctc = derive2 { name="ctc"; version="1.48.0"; sha256="137087cms5rdivm1fh2m5v414lcf96sch409b3yapkl8zva99i0q"; depends=[amap]; };
+  ctsGE = derive2 { name="ctsGE"; version="1.0.0"; sha256="00dmky3fggz0xq1hwwk5xk9lbk93jmym5fc0g628apq520g9h7b0"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; };
+  cummeRbund = derive2 { name="cummeRbund"; version="2.16.0"; sha256="1191frlhs738xcfqcw0la7jx4jhiqfnqqcaj1a8z61p0rkx2vi70"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; };
+  customProDB = derive2 { name="customProDB"; version="1.14.1"; sha256="0m4gl4w7lwvz1irwbrgx4xz8ipz55h2xz85pl89jpr35cxv7gh6z"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; };
+  cycle = derive2 { name="cycle"; version="1.28.0"; sha256="17azpsw3ah7ifshn0gfnfa458y70l551ix4s623d3wjbzdbk03kj"; depends=[Biobase Mfuzz]; };
+  cytofkit = derive2 { name="cytofkit"; version="1.6.5"; sha256="1ml3g8p9r7azg3c31izrvkbpfss49q8ns293jqsk9470h9yl2p4m"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny vegan VGAM]; };
+  dSimer = derive2 { name="dSimer"; version="1.0.0"; sha256="0a36xlq0hsn7krf23ynmny6gckv3iisisr7pp928jblh43pspr0r"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; };
+  daMA = derive2 { name="daMA"; version="1.46.0"; sha256="04x1ipqa04khki98yq8qyzlwjwz3p3ra18s4qc1hkfqsgqij20bm"; depends=[MASS]; };
+  dada2 = derive2 { name="dada2"; version="1.2.2"; sha256="1996n96afn074h5mkwbdi8chvswb8xc9ms6rnbb060vdzwsrfi7k"; depends=[Biostrings data_table ggplot2 Rcpp RcppParallel reshape2 ShortRead]; };
+  dagLogo = derive2 { name="dagLogo"; version="1.12.0"; sha256="14swyk3vywbm09cs4ny7wrjy9q4nmpy5nis1ik18ilmifqff3xh7"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
+  dcGSA = derive2 { name="dcGSA"; version="1.2.0"; sha256="0fz730m7agvidrq3rdkymaa9vn5ry0jj2p8bzlpzb8ab7siaqapr"; depends=[BiocParallel Matrix]; };
+  ddCt = derive2 { name="ddCt"; version="1.30.0"; sha256="03j2njmx90ivd9rb2vsd4fxcciwy9q8fj48rv3z43wrq4vbkf8s8"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
+  ddgraph = derive2 { name="ddgraph"; version="1.18.0"; sha256="17rmc4fcf1vac9jw95h4nqr32jk7vpn10ddxgl0qp9zcabxd8vm6"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
+  debrowser = derive2 { name="debrowser"; version="1.3.11"; sha256="18hc0zlw0dzhqsnjhw7grb77y3mya2hdp1g4kgkk9fah44y8xihs"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 devtools DOSE DT edgeR GenomicRanges ggplot2 ggvis gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db RColorBrewer RCurl reshape2 S4Vectors shiny shinydashboard shinyjs stringi SummarizedExperiment sva V8]; };
+  deepSNV = derive2 { name="deepSNV"; version="1.20.0"; sha256="00zl9sxifx4z2ydab6fdfyaidfin0m79v603nwv1h3kac703awvs"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
+  deltaGseg = derive2 { name="deltaGseg"; version="1.14.0"; sha256="1qwzfg284ac8snwc1v9lwqd2cfkzvgp1gc0baf802kdwnp94hpq5"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
+  derfinder = derive2 { name="derfinder"; version="1.8.5"; sha256="1snwy5q99jy5lcnrdmanclyhfsiax5gslznphzpps19hdzby045r"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+  derfinderHelper = derive2 { name="derfinderHelper"; version="1.8.1"; sha256="0920kl7lsjf9hzxh304q2n4n5nscxmaiacxqbn2ql9ja7saypqag"; depends=[IRanges Matrix S4Vectors]; };
+  derfinderPlot = derive2 { name="derfinderPlot"; version="1.8.1"; sha256="0fvyira43hknhs72s520czprgcgy4hh54pmcsd3caca2f077cxks"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; };
+  destiny = derive2 { name="destiny"; version="2.0.8"; sha256="1zqmfi8ha028lcwb147m4xin4zkgrg5aqh4mp0aidqv0d8p59hkp"; depends=[Biobase BiocGenerics FNN Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; };
+  dexus = derive2 { name="dexus"; version="1.14.0"; sha256="04vihwcvb7kx1i1pws5rhk1cdnkrhh6ipi8fwz2yfizyc253hfmh"; depends=[BiocGenerics]; };
+  diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.56.0"; sha256="17fyvgw9izdzhh1nmd0g0ibaxsy36438dbvszf9c447h21qqr3r5"; depends=[minpack_lm]; };
+  diffHic = derive2 { name="diffHic"; version="1.6.0"; sha256="1331cf5d774hsd037gvzjx8dym5m0kk2azjb17gls1fqd08y33g6"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
+  diffloop = derive2 { name="diffloop"; version="1.2.2"; sha256="1hkhprz6bxpd94l5648j03xxn5rj85dl4dl419pfi4n7r21gywrq"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; };
+  diggit = derive2 { name="diggit"; version="1.6.0"; sha256="0n5slh0w1g8zdnrbqxfram5j82yy5aaw9m7h5r5ybw6hbwmjf93r"; depends=[Biobase ks viper]; };
+  dks = derive2 { name="dks"; version="1.20.0"; sha256="09y7h7gw5p3rxrbwg4mq4qpp89cv6gj45idilv30jvsjyvv03a31"; depends=[cubature]; };
+  domainsignatures = derive2 { name="domainsignatures"; version="1.34.0"; sha256="0sw6fyv91nrgf55g0387hghxa7gsfcqb81lmpg11ccvm8pzj7hlp"; depends=[AnnotationDbi biomaRt KEGG_db prada]; };
+  doppelgangR = derive2 { name="doppelgangR"; version="1.2.0"; sha256="06zbgkyi38v80d2szfhklbnxpnl3lfqq78ha7y8zwa2l16pkpj0m"; depends=[Biobase BiocParallel digest impute mnormt sva]; };
+  dualKS = derive2 { name="dualKS"; version="1.34.0"; sha256="1qh3v18gp1flryj6wzyvi20rd7gh35rvq9cyir72cj801w95rkzs"; depends=[affy Biobase]; };
+  dupRadar = derive2 { name="dupRadar"; version="1.4.0"; sha256="1m0fk5aq5nx98khkahq1wwq4hs6rfnf3gi0bnyfcm0719hk70nah"; depends=[Rsubread]; };
+  dyebias = derive2 { name="dyebias"; version="1.34.0"; sha256="16nxwg53ccx128k5ih26gm9z18n6prbas7nxm5hgfl44ihl6a2w6"; depends=[Biobase marray]; };
+  easyRNASeq = derive2 { name="easyRNASeq"; version="2.10.0"; sha256="1jjwskac47scnbs0xdxw48l2lm389gpf38rg93z6z4sri5qk9xbk"; 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.46.0"; sha256="1mz2qk6cf0sq2395p7snj9mjqnsh3jkcbj3hd4awc4iyj4zrcw3l"; depends=[Biobase]; };
+  edge = derive2 { name="edge"; version="2.6.0"; sha256="02825wnwysafi06vr5vglwld52hz9dvyrsz57rxx7bfras1y60xw"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
+  edgeR = derive2 { name="edgeR"; version="3.16.5"; sha256="04vpa0a6dkkjyvvfbkmfjyaxf2ldkagi66g028qpaszd8jsk8yiv"; depends=[limma locfit]; };
+  eegc = derive2 { name="eegc"; version="1.0.0"; sha256="00l7aym526p9l6iz3j72v9n2c42l70mm1nx7q653jfhbivdikh0i"; 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.14.1"; sha256="16s07903wq9wwirkwv4pd77kpi1rkbmlyg24bg38zlanfyqprqfq"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
+  eisa = derive2 { name="eisa"; version="1.26.0"; sha256="0hvpk8jsh5f0b23n4bk8h238j4afw1fdkcr9l4k3m9hm4078xjj0"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
+  ensemblVEP = derive2 { name="ensemblVEP"; version="1.14.0"; sha256="175fj7w2zawpymsjbcqxwp82la6lb60ajp5sbz3hkr9mscb9xi19"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+  ensembldb = derive2 { name="ensembldb"; version="1.6.2"; sha256="1hxvjplkgkibjfzrbi6whqr7czf5digh96j7ww6szdyxy86gbf3r"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
+  epigenomix = derive2 { name="epigenomix"; version="1.14.0"; sha256="0wp8xbqy98b9i1vwdhjg3wbsi2nfqm9vl1alzp67s92sdafa0lax"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
+  epivizr = derive2 { name="epivizr"; version="2.4.1"; sha256="119q39cr0fawrr4a64qx4fxddwmxcav44fq4i0dip0wf7pr7wwrw"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
+  epivizrData = derive2 { name="epivizrData"; version="1.2.0"; sha256="0vr3czsdky6f4s60jg8ddm47kf5qsk3dj76kwwbaz9ffd3sgsv0z"; depends=[Biobase epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
+  epivizrServer = derive2 { name="epivizrServer"; version="1.2.0"; sha256="0ajxc77g604m5756bx8ivv0jqfdkglh4vjc4295d1dzwml555xil"; depends=[httpuv mime R6 rjson]; };
+  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.2.0"; sha256="0nm644hmryyn8wsgzm129nldixn6z3yqff6851c7nwifz7vkzsln"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
+  erccdashboard = derive2 { name="erccdashboard"; version="1.8.0"; sha256="09hba0gbfgq7799kd41vm4j7qsyhkfg1awi8mymqqfb9fkdladkh"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+  erma = derive2 { name="erma"; version="0.6.0"; sha256="1540i8m9fr2v8n8pzf0zfjcv2gxmfd1b2fld73hkcfv2mkfiks1m"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
+  esetVis = derive2 { name="esetVis"; version="1.0.1"; sha256="1s56qkm0r93bl7bfsp804q5fhcqmkazwh9g5jv01v23llsd6i0b6"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
+  eudysbiome = derive2 { name="eudysbiome"; version="1.4.0"; sha256="1sjqn0l25hw8y8i0g0ba22h5z9drj7m6104dwyfl41rprrasxjps"; depends=[Biostrings plyr R_utils Rsamtools]; };
+  exomeCopy = derive2 { name="exomeCopy"; version="1.20.0"; sha256="1hdhbnb318m05bhiqijnci1d0q40d0lpw5cnvsszg6jykks3axxm"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
+  exomePeak = derive2 { name="exomePeak"; version="2.8.0"; sha256="0573n29115djdbb47dkidwrx9m9j84ajamqanq0vx8rgjrg2xljm"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
+  explorase = derive2 { name="explorase"; version="1.38.0"; sha256="04338jfp3kf8wngm15ws3q2r6d2wc7kvzvf50nmx6dji52952807"; depends=[limma rggobi RGtk2]; };
+  fCCAC = derive2 { name="fCCAC"; version="1.0.0"; sha256="0mgzk2siwwq5ajmzqv7k5w3a8zsha7vawqj3frzfmsccbaifdw9h"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; };
+  fCI = derive2 { name="fCI"; version="1.4.0"; sha256="188599kcl50k3lvdn5z1r3xy4fnipma2idacxglrfh5pxbnc0wf7"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
+  fabia = derive2 { name="fabia"; version="2.20.0"; sha256="14lnyc9b0h9kb0xp7miiz3znwsbdb3ar1j5qlnfl0s9syc9y0p46"; depends=[Biobase]; };
+  facopy = derive2 { name="facopy"; version="1.8.0"; sha256="02z3bdsiz3crzlb038av9bsmbwq2wi3hxfdizngkcc8x2zp4gl4f"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz S4Vectors scales]; };
+  factDesign = derive2 { name="factDesign"; version="1.50.0"; sha256="0zmbnb5nf6724k6xbmn19pp2jflfr0ckl11zhms0yhhmagd17wlz"; depends=[Biobase]; };
+  farms = derive2 { name="farms"; version="1.26.0"; sha256="00hxllk193v5rbmqzayv7cizlz1kpba7jpxafd2n02471ga7qjvf"; depends=[affy Biobase MASS]; };
+  fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.10.0"; sha256="0aqagldg2qc8fhk6131dj4rr5yka0sr19m7pqr1pxczg6gn7yxpr"; depends=[Hmisc LiquidAssociation WGCNA]; };
+  fastseg = derive2 { name="fastseg"; version="1.20.0"; sha256="1ax0c5apmixyl7daahb3wqq8m8mc6prrylgfgbnv02rx5b3ii9hn"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; };
+  fdrame = derive2 { name="fdrame"; version="1.46.0"; sha256="1zc40aa32jijmvxc07sv4gp0hdw0m4rd06aslfjyb7ngsz16lik6"; depends=[]; };
+  ffpe = derive2 { name="ffpe"; version="1.18.0"; sha256="0p1sdapm6394j2xknn44g1vgry1ys004q9fkgchv40yy874ym1w9"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
+  fgsea = derive2 { name="fgsea"; version="1.0.2"; sha256="1yq4s4g4xxzcpkv9dpbg29444iy38vfgwj4wgr47rjjq8njfblfx"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Rcpp]; };
+  flagme = derive2 { name="flagme"; version="1.30.0"; sha256="0s6f1928fswv8fvbqrhgq6ah0j7pqpar9q5xs3nwmig3nb9x8win"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
+  flipflop = derive2 { name="flipflop"; version="1.12.0"; sha256="1sbqdynm4wbz3ybyzdaa6scpyav9fyn0zjm817sl8gpnsnp89m5g"; depends=[GenomicRanges IRanges Matrix]; };
+  flowAI = derive2 { name="flowAI"; version="1.2.10"; sha256="1hwhzzjz7hwc9751p7kvs32w0nqn3yzkbwh8v7mdpfxsx7xi5pfp"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; };
+  flowBeads = derive2 { name="flowBeads"; version="1.12.0"; sha256="1zpjgk2ppcgmhlqmknsgp0wagilgdqk8mfhjnc474yrr339dwvcs"; depends=[Biobase flowCore knitr rrcov xtable]; };
+  flowBin = derive2 { name="flowBin"; version="1.10.0"; sha256="0357nin7rcapvj82c1bxmgcn6gryi8avgzqszhk264qzmlhl2kq7"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
+  flowCHIC = derive2 { name="flowCHIC"; version="1.8.0"; sha256="1fvy99wql8lszd5kcp9gms111hw8mxkmdv68jl8cya3x7b113cr5"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
+  flowCL = derive2 { name="flowCL"; version="1.12.0"; sha256="0cxaixdx1i25p0vv8b6ynjb144cz6b9lyx40d0i21iv0fxvyxb37"; depends=[graph Rgraphviz SPARQL]; };
+  flowClean = derive2 { name="flowClean"; version="1.12.0"; sha256="05jnp36ar05sgy06rfd91zkjsbinag7nylz4fimkzlsfwkaya2i1"; depends=[bit changepoint flowCore sfsmisc]; };
+  flowClust = derive2 { name="flowClust"; version="3.12.2"; sha256="1hq7wmzd2jpbr8scvi7scg2y1cf5pq562fsl14i1p4112fhj88n1"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
+  flowCore = derive2 { name="flowCore"; version="1.40.6"; sha256="0r4plrqbmqhn7zlhr6c8zb969r41jsdb0v7vk730zc8bqhqnw5c0"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
+  flowCyBar = derive2 { name="flowCyBar"; version="1.10.0"; sha256="0q3lizif3mc057yfbxsm1b6l79ia3ls9iaalnsrlmxlbqk3rylcp"; depends=[gplots vegan]; };
+  flowDensity = derive2 { name="flowDensity"; version="1.8.0"; sha256="0s0zd6q5fxl40wv9fmdd6g2x8ar67ian0ihn61v95z2kgcrz2ygd"; depends=[car flowCore GEOmap gplots RFOC]; };
+  flowFP = derive2 { name="flowFP"; version="1.32.0"; sha256="010m41pbz2f5rcx6453x889mjwbx0rx37lcnfhrz3hsnzqnykdim"; depends=[Biobase BiocGenerics flowCore flowViz]; };
+  flowFit = derive2 { name="flowFit"; version="1.12.0"; sha256="1laaa4f4jbhr1ri6zakbh2wwivhq8b44xmb1yvvrjy61fqfl4d9f"; depends=[flowCore flowViz gplots kza minpack_lm]; };
+  flowMap = derive2 { name="flowMap"; version="1.12.0"; sha256="0pnq4dc364dr6wjvim5dav8399k2vwq0i7zfbjq70r8hk6d59c53"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
+  flowMatch = derive2 { name="flowMatch"; version="1.10.0"; sha256="11r1x2aicbgj5sbyinwzniv463yrpvxlm36agmspgjnq4ir1p3m7"; depends=[Biobase flowCore Rcpp]; };
+  flowMeans = derive2 { name="flowMeans"; version="1.34.0"; sha256="1jqci86yi0q5qvzhj9448gvv587kgkbx79r90957bwzj6z5nlj2z"; depends=[Biobase feature flowCore rrcov]; };
+  flowMerge = derive2 { name="flowMerge"; version="2.22.0"; sha256="07x5im2m98nszcaw4ip6l3pnd6j6nrc17amnnpxqpnbpm73hfsz6"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
+  flowPeaks = derive2 { name="flowPeaks"; version="1.18.0"; sha256="1211wcypqjwdv2w4pyzkmjg2c0yz18r5i4mdj114lbia6v1p1jza"; depends=[]; };
+  flowPloidy = derive2 { name="flowPloidy"; version="1.0.0"; sha256="189al2wzpr1f7haihifyfzvd42sj6nk6f305ny5v9lcr4afp3538"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
+  flowPlots = derive2 { name="flowPlots"; version="1.22.0"; sha256="0wskj8nfi0zd7rmx0spz8l2h8xzw4qpm9qnxv7s4cq3s8spknbmp"; depends=[]; };
+  flowQ = derive2 { name="flowQ"; version="1.34.0"; sha256="0ax0m6dzfhnr0n0qnhxlhq58vrxy583c9aznczldx808xf2krx8x"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
+  flowQB = derive2 { name="flowQB"; version="2.2.0"; sha256="11kwv1nwzvpfppla5n3zsz64hljlrjblbcgd04hfzzqbck5d9c7w"; depends=[extremevalues flowCore]; };
+  flowStats = derive2 { name="flowStats"; version="3.32.0"; sha256="104yp7agkvr7p8ywmrqh8xy1anrvrnnwwl34pw68bl50p7dcb5qp"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; };
+  flowTrans = derive2 { name="flowTrans"; version="1.26.0"; sha256="11h6rs6844mv5wjkr9l5hlmfv2nkwzrhg80l773mx2yllzqq84vg"; depends=[flowClust flowCore flowViz]; };
+  flowType = derive2 { name="flowType"; version="2.12.0"; sha256="1ghbxlfpc9l1cg54b898rh3p79dldhpza4qynyx2q3b0yc4hanil"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
+  flowUtils = derive2 { name="flowUtils"; version="1.38.0"; sha256="0rs62hbfzgb2mva7irjmnqcccn2zp3cn1177ji6faszkzsnmmz0i"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
+  flowVS = derive2 { name="flowVS"; version="1.6.0"; sha256="1ivsyqrxg4xg67jgmn9rm9pmmr751bpfxqsgpx8m8cw8ywxbvm3m"; depends=[flowCore flowStats flowViz]; };
+  flowViz = derive2 { name="flowViz"; version="1.38.0"; sha256="1jrn6j2i1i6hiw4xc7s271rixz1qi4nr9awyx1dv48fnp5bhz2dd"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
+  flowWorkspace = derive2 { name="flowWorkspace"; version="3.20.5"; sha256="17yd6hhlmagpasp3cksza1v8g62kkl1nw8rh0jif8sxz6hlsh7jd"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz scales stringr XML]; };
+  flowcatchR = derive2 { name="flowcatchR"; version="1.8.0"; sha256="0mzjva3vyf7xcgcr62aiy547p2ga9kv2543bwjd3f7y6ankz7cnn"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
+  fmcsR = derive2 { name="fmcsR"; version="1.16.0"; sha256="05k8c8vhdq6lqgrmc8r7dqwixindwpn32hp2a52vkqny8gn9fvbg"; depends=[BiocGenerics ChemmineR RUnit]; };
+  focalCall = derive2 { name="focalCall"; version="1.8.0"; sha256="088453sxnlz76iz6fkardi3pb3z033pi4x9na6gn85sxpa53byqf"; depends=[CGHcall]; };
+  frma = derive2 { name="frma"; version="1.26.0"; sha256="1q6hfmdh1m9nifz593i70x58q877lkyx55yigw095f2pgr7ikqg5"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
+  frmaTools = derive2 { name="frmaTools"; version="1.26.0"; sha256="1vjdci710y9zzbnhfc1yp48bzvnzp2lrl6q6gqxc64m4xh4s0fs0"; depends=[affy Biobase DBI preprocessCore]; };
+  gCMAP = derive2 { name="gCMAP"; version="1.18.0"; sha256="1s4zdhwxpwv8ddp3914syrbmpfhryvaq2lqiyal4nhhp5nklbmlj"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
+  gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.14.0"; sha256="1wdfj1qf8d80qxj17ji863gripdxdzcldfw5s6z7jblirabsxp7j"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
+  gCrisprTools = derive2 { name="gCrisprTools"; version="1.0.0"; sha256="1zqxj566hzmd1yfjrc0nfvd1djsf2vpj1jcx25c85ssssbh3if2f"; depends=[Biobase BiocParallel ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
+  gQTLBase = derive2 { name="gQTLBase"; version="1.6.0"; sha256="07fas0d1ybpk9h8qf4hdhnh0gq9ip9xc4hfaxsdnk65xy2p4dvhc"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  gQTLstats = derive2 { name="gQTLstats"; version="1.6.0"; sha256="0lpnn8992dy7bavsyym3m361sgyra54p8wz0xg25f0d4dw5bg4sq"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggplot2 gQTLBase IRanges limma mgcv reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
+  gaga = derive2 { name="gaga"; version="2.20.0"; sha256="1jnbmirwxnwdyvx76gqrz4y8rx5g9llnnbz06sqjkigprians1lw"; depends=[Biobase coda EBarrays mgcv]; };
+  gage = derive2 { name="gage"; version="2.24.0"; sha256="05kdc8pqjwhi9pl0pwm4rkisrdlkkrhnj0iwwya5vakgvh3bw42d"; depends=[AnnotationDbi graph KEGGREST]; };
+  gaggle = derive2 { name="gaggle"; version="1.42.0"; sha256="1a04mzcamgw1k1s0s2n9myv9mj84lrb4mvlircnmpy6a7ag5d3lb"; depends=[graph rJava RUnit]; };
+  gaia = derive2 { name="gaia"; version="2.18.0"; sha256="10wi2i8yqrcxjs7vp2dywrj4fqvgd3sd238bvy7kj5kvr24ajfd1"; depends=[]; };
+  garfield = derive2 { name="garfield"; version="1.2.0"; sha256="09ijwqxmwq3432bkx4zi0c8h93nj3jd4jqyz5lm65hjn2slmwbfl"; depends=[]; };
+  gaucho = derive2 { name="gaucho"; version="1.10.0"; sha256="13wavb2l3bdkd3yjsd9v53wfmylq7y19q70ybncyd6qr05mzqj07"; depends=[GA graph heatmap_plus png Rgraphviz]; };
+  gcatest = derive2 { name="gcatest"; version="1.4.0"; sha256="0b365k1a8yrqnxrrm8iclgg06h1mcrbl6kfkj2rzsajg4ahx9gly"; depends=[lfa]; };
+  gcrma = derive2 { name="gcrma"; version="2.46.0"; sha256="0yr1wcf32ihjpkb4swnnf933i0sbniyjswsvx9ly4z1dv8yigjji"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
+  gdsfmt = derive2 { name="gdsfmt"; version="1.10.1"; sha256="1mn7ircm2i9bfmxprbl2rdvwazngnv1jxdxpcdknl5c66j5lhzap"; depends=[]; };
+  geNetClassifier = derive2 { name="geNetClassifier"; version="1.14.0"; sha256="1z3j12y97n8bc8nc9gjfs1bbmjbbwgkwfp7g14g11p3qfhlsjyzn"; depends=[Biobase e1071 EBarrays minet]; };
+  geecc = derive2 { name="geecc"; version="1.8.0"; sha256="0yhi0a2141q93dxr26wr44724yyfh9bykr7swllql036nkdpfhvv"; depends=[gplots hypergea MASS Rcpp]; };
+  genArise = derive2 { name="genArise"; version="1.50.0"; sha256="1f8ic85955v866sqc02b5m2rk8agws80w2rv7g4j7kk5ssffrv0r"; depends=[locfit tkrplot xtable]; };
+  genbankr = derive2 { name="genbankr"; version="1.2.1"; sha256="1pcn4asxxzark6w5a188as3h5klwb6yj5varrf9lm6qdrhmdwimy"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
+  geneAttribution = derive2 { name="geneAttribution"; version="1.0.1"; sha256="15vbi1fax2jwbh5j82vv3qlzhkscwd9qm3ls51rgbir72m915x3a"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; };
+  geneRecommender = derive2 { name="geneRecommender"; version="1.46.0"; sha256="1ddj9w6jdbcxnzw22q8qjg6b0pydcin51h3n7l7crwa0d8wvmg6j"; depends=[Biobase]; };
+  geneRxCluster = derive2 { name="geneRxCluster"; version="1.10.0"; sha256="18h5a9yb6h7lhz4yija3vx7ca8x4mvlji659kqzy7a7prm9yqi2w"; depends=[GenomicRanges IRanges]; };
+  geneXtendeR = derive2 { name="geneXtendeR"; version="1.0.0"; sha256="104mn7rgsakc89gz3phsp00ijcw99zxbyd2q96s5ikz1c4pnf6bl"; depends=[data_table dplyr rtracklayer]; };
+  genefilter = derive2 { name="genefilter"; version="1.56.0"; sha256="1vzgciqd09csqcw9qync8blsv51ylrd86a65iadgyy6j26g01fwd"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
+  genefu = derive2 { name="genefu"; version="2.6.0"; sha256="0gh6n4k1b0f57w2lb1kjwymh5x8iirvrmhqlq46yybfs4928h147"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
+  geneplast = derive2 { name="geneplast"; version="1.0.0"; sha256="0sxvdnw4kdr2bikibhaf538qq5adr2cv4warbpmi28wjiyzs7jy1"; depends=[ape snow]; };
+  geneplotter = derive2 { name="geneplotter"; version="1.52.0"; sha256="1p6yvxi243irhjxwm97hp73abhwampj0myyf8z00ij166674pc7h"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
+  genoCN = derive2 { name="genoCN"; version="1.26.0"; sha256="0v0sg2h9f3dqwydfvydbpjw37xzl2yn26244nyq8rzb1g5p30l6l"; depends=[]; };
+  genomation = derive2 { name="genomation"; version="1.6.0"; sha256="1m4mz7wihj8yqivwkzw68div8ybk4rjsai3ffki7xp7sh21ax03y"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rhtslib Rsamtools rtracklayer RUnit S4Vectors seqPattern]; };
+  genomeIntervals = derive2 { name="genomeIntervals"; version="1.30.1"; sha256="0kglh50x76b4n0r6cfjk63bja1d1mdf5m14k7n6jjg6glprys3j5"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
+  genomes = derive2 { name="genomes"; version="3.4.0"; sha256="160279nd3iybpn6v1da9yr248fac865hg0dmxq32mbdhmp591xjy"; depends=[curl readr]; };
+  genoset = derive2 { name="genoset"; version="1.30.0"; sha256="08vyiyipcnrw3r8cyk4yzynzby8gy5mn8v16s582wzc37kdj46yz"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+  genotypeeval = derive2 { name="genotypeeval"; version="1.4.0"; sha256="057b36rjfcg45irl80c4rkiq2bkjyczdxvph6wyn6nfl657ki5k2"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
+  genphen = derive2 { name="genphen"; version="1.2.0"; sha256="1czigszpqrvqqyrgn8jhifqq31i7qkbm7gq2i9h9x11qr0l421p2"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; };
+  gespeR = derive2 { name="gespeR"; version="1.6.1"; sha256="1kk0c2hvvq1rbmkagnxsx03nd9jjnh3yci92fgb3y9vqa4gfps3n"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
+  ggbio = derive2 { name="ggbio"; version="1.22.4"; sha256="1kjhxhhinl5h3h3yyb1miwy4kzngmdi418awvdiimrnj3412vvrg"; depends=[AnnotationDbi 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.2.3"; sha256="03cb9zhpchg6ymyvp3gbma35sk81a3f7x3brkriwig74vv9x1hw5"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
+  ggtree = derive2 { name="ggtree"; version="1.6.11"; sha256="0lh6wj4bkmad2wrv6lpxz0qprhwxava6w8v0y6l3930026wj01q4"; depends=[ape ggplot2 jsonlite magrittr tidyr]; };
+  girafe = derive2 { name="girafe"; version="1.26.0"; sha256="07d0j8px5zrb07agpsvhl5v1d2hdcavcqg0q57hs2jk4ysl98way"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
+  globalSeq = derive2 { name="globalSeq"; version="1.2.0"; sha256="1laz11w4haiq4j754krcy3hlca2rmgwgcsy4vlc89lmfrc68pfmk"; depends=[]; };
+  globaltest = derive2 { name="globaltest"; version="5.28.0"; sha256="0vxwhk6c2sxy46v7amnsgvgq4yy77z5mifb917649r0q4n3jaaaw"; depends=[annotate AnnotationDbi Biobase survival]; };
+  gmapR = derive2 { name="gmapR"; version="1.16.0"; sha256="1afxlz1z6khc16ab62chnfzkm9y0vdfrfnmkdhrsqwr68lf3dh9d"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  goProfiles = derive2 { name="goProfiles"; version="1.36.0"; sha256="1imwqla70j643w7h25da0f0c52szqk81z4g8vwpdpriq512d9gm9"; depends=[AnnotationDbi Biobase GO_db]; };
+  goTools = derive2 { name="goTools"; version="1.48.0"; sha256="171picf9ic0z1lbpmyy8dkvglq75dnpzj39yzxkkinkbyzlnfhm2"; depends=[AnnotationDbi GO_db]; };
+  goseq = derive2 { name="goseq"; version="1.26.0"; sha256="1xay2ay8whwsvy10wss07svc638gg4ks1qayskplvrwxkp2kg2p8"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
+  gpls = derive2 { name="gpls"; version="1.46.0"; sha256="1y12zzkf7knc1j8xh3kqax3jzlllwb8hyfqjnxxailad3gbxwc1x"; depends=[]; };
+  gprege = derive2 { name="gprege"; version="1.18.0"; sha256="1gjcgy0bw87rgh3j8pq3940l7g6zzmwnzvkrrfviizny0p8ynxgn"; depends=[gptk]; };
+  graph = derive2 { name="graph"; version="1.52.0"; sha256="0g3dk5vsdp489fmyg8mifczmzgqrjlakkkr8i96dj15gghp3l135"; depends=[BiocGenerics]; };
+  graphite = derive2 { name="graphite"; version="1.20.1"; sha256="1lkknnjac5m5wvkvbz02548q16h6c5jhzhi410vr4lfzcz7v201a"; depends=[AnnotationDbi graph rappdirs]; };
+  groHMM = derive2 { name="groHMM"; version="1.8.0"; sha256="0d91nyhqbi5hv3mgmr2z0g29wg2md26g0hyv5mgapmz20cd9zi4y"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+  gtrellis = derive2 { name="gtrellis"; version="1.6.0"; sha256="09hds0dcs7w94gl7zm5w94kxzv09dsggn8wqibhx3a0m4h515wz7"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
+  gwascat = derive2 { name="gwascat"; version="2.6.0"; sha256="11y1knppdqcnj4w0hs33g2kcpx4sy8anb2y7kjgjxrpj4wvzinz9"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
+  h5vc = derive2 { name="h5vc"; version="2.8.1"; sha256="1c4scm9z1ckmp5cdc979a44vryraqq60bzgsn329aq92r0rpd4y2"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
+  hapFabia = derive2 { name="hapFabia"; version="1.16.1"; sha256="0j0iip9mdvksb2y83891mplmh18ajhpi6jmgrszp2kjjh3sfwicj"; depends=[Biobase fabia]; };
+  hiAnnotator = derive2 { name="hiAnnotator"; version="1.8.0"; sha256="0v0js3wkcw5dlg01g5xgj0m0rzxg86y9mxxw72jy6vr8j78wkzci"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
+  hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.10.0"; sha256="0krgb5139fl425vyz13vyzr1kiv06nysk511h4yiif4r4ggharif"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; };
+  hierGWAS = derive2 { name="hierGWAS"; version="1.4.0"; sha256="0gahm81v1gcwph2xm0p3il1pc3wp28z3ik8l0c8mvwwd3kn69cdw"; depends=[fastcluster fmsb glmnet]; };
+  hopach = derive2 { name="hopach"; version="2.34.0"; sha256="01rxryijz762bcf4dzha0rfmf263svy86aq7a8zxmampb39k5a62"; depends=[Biobase BiocGenerics cluster]; };
+  hpar = derive2 { name="hpar"; version="1.16.0"; sha256="19qx0abwmn7yl7ix6wad912d3xwvmrw13idvrrfwhwj481w7b2xw"; depends=[]; };
+  htSeqTools = derive2 { name="htSeqTools"; version="1.22.0"; sha256="1g0a3fmywcrsv7p2lv7r22hfvv3mbhl43yl71bp84v53r7pb95vw"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; };
+  hyperdraw = derive2 { name="hyperdraw"; version="1.26.0"; sha256="1jvj19fq24fpj10i2gjvrb9vmf5b4wdz5xcbifkgkbwf8pb4jcci"; depends=[graph hypergraph Rgraphviz]; };
+  hypergraph = derive2 { name="hypergraph"; version="1.46.0"; sha256="0g0hk5ykbxa0kmpmlmrw8qvvkxk8hhh1jcvx0hcbqkjmld1sgfkg"; depends=[graph]; };
+  iASeq = derive2 { name="iASeq"; version="1.18.0"; sha256="16ranqshbcfmik400gwycv37h3azhksrh1hkv9s3s8kii1aydzrq"; depends=[]; };
+  iBBiG = derive2 { name="iBBiG"; version="1.18.0"; sha256="1sz6yw0n6j8gz0rwwfinckgkcrynr6zp10vlwpfkrksnpwc2qw7i"; depends=[ade4 biclust xtable]; };
+  iBMQ = derive2 { name="iBMQ"; version="1.14.0"; sha256="1g2lf38z2j5n922k7a7q5c04jz1nncyjxy7aiic305lnjmdhh91h"; depends=[Biobase ggplot2]; };
+  iCARE = derive2 { name="iCARE"; version="1.2.0"; sha256="1yq1kp0jzf8jiwf7l8chn4lmvlzfhfwc78ivdlqydrl2xarvb725"; depends=[]; };
+  iCOBRA = derive2 { name="iCOBRA"; version="1.2.0"; sha256="1nvfp09j3n689szrjlvnjhbp7bpma6b00mpkffvadcprgalb1j63"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; };
+  iCheck = derive2 { name="iCheck"; version="1.4.0"; sha256="1vara7v0811n6d3h9b3xwbw8hd8jlxkr7mb920m5v5l86rnd798y"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; };
+  iChip = derive2 { name="iChip"; version="1.28.0"; sha256="00scfxyklyzpmd7yqpzh1xbq9d6drngczkvhmzklvnwcwxicw6sg"; depends=[limma]; };
+  iClusterPlus = derive2 { name="iClusterPlus"; version="1.10.0"; sha256="1qjr1d53xq4ad9d1fqx8cg0wf0br19ga1a7m7yrjmqxnjf82kfcc"; depends=[]; };
+  iGC = derive2 { name="iGC"; version="1.4.0"; sha256="1zw9lqwvnmvgj2xvq6dhi7vs1lklkfpmhxf99hqbbr6km30gjq6a"; depends=[data_table plyr]; };
+  iPAC = derive2 { name="iPAC"; version="1.18.0"; sha256="1m6c1ka7yx6ish9cw3kl683dp9zn3nbr4ii49b09lzjvxq6n2cbi"; depends=[Biostrings gdata multtest scatterplot3d]; };
+  iSeq = derive2 { name="iSeq"; version="1.26.0"; sha256="07ri9w8i57jigfs7zlz35k6qcin5pipv7c4w9k7nxlrm43n6s7nd"; depends=[]; };
+  ibh = derive2 { name="ibh"; version="1.22.0"; sha256="0k2pncvjc8zr4xxb4yqiphc8a02hsl2r2j6mflhzs7iw61z8rq4q"; depends=[simpIntLists]; };
+  idiogram = derive2 { name="idiogram"; version="1.50.0"; sha256="13jhq6bd938rsyqfl3qjzryqx9pv6z2k7bya8r0vrjrzcssnasyh"; depends=[annotate Biobase plotrix]; };
+  illuminaio = derive2 { name="illuminaio"; version="0.16.0"; sha256="0ysvblxbk3hdnd70l31f2qzg3qsrpdyix395zhqjz5hmviyy91q7"; depends=[base64]; };
+  imageHTS = derive2 { name="imageHTS"; version="1.24.0"; sha256="0c5szadgyz53r9cj14gc5r1s3wkv68pi66dlg9gnnpqyfcfpsd8y"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
+  immunoClust = derive2 { name="immunoClust"; version="1.6.0"; sha256="0nmgvwccfnzpfd6x6x52qgxqi56348ljpdwhylflxbd1f4szqr58"; depends=[flowCore lattice]; };
+  impute = derive2 { name="impute"; version="1.48.0"; sha256="1164zvnikbjd0ybdn9xwn520rlmdjd824vmhnl83zgv3v9lzp9bm"; depends=[]; };
+  intansv = derive2 { name="intansv"; version="1.12.0"; sha256="0djcb8yzrppbawp5dvf45cj8j3g9z95kifzyk3ndz48vr62ksaav"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
+  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.12.0"; sha256="1psai99wp2d4hchfm2m7bmy9hxwz0kfl1mc9xgq57k5vq8bdq7gc"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
+  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.12.0"; sha256="1gxa1sc2sk7xvxc4p74cwjkxdk3ns7igl51jg7a7086k729k3m8j"; depends=[BiocGenerics shiny]; };
+  inveRsion = derive2 { name="inveRsion"; version="1.22.0"; sha256="1f35l6gnvs5kz0v4d2dhq6mdpkvknhzadzka2m0jdhhpdk1vqkq3"; depends=[haplo_stats]; };
+  iontree = derive2 { name="iontree"; version="1.20.0"; sha256="1kvj73vzgrszvyyb0xlvc46ba58pznsczhxj8mxd6pp2sa3pjgbh"; depends=[rJava RSQLite XML]; };
+  isobar = derive2 { name="isobar"; version="1.20.0"; sha256="171a3jphxwx7n9kw77c1wng6fbv1fm5qxlwxz8n8fbnr6z4n0k2b"; depends=[Biobase biomaRt distr ggplot2 plyr]; };
+  isomiRs = derive2 { name="isomiRs"; version="1.2.0"; sha256="1dgbb9nlsjbjp06wsjnzml7laqi2353xk2pwi0kqhd6yqhrkcagz"; depends=[BiocGenerics DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges plyr RColorBrewer readr reshape S4Vectors SummarizedExperiment tidyr]; };
+  iterativeBMA = derive2 { name="iterativeBMA"; version="1.32.0"; sha256="1pkq48a8hsalfi9w1dcyzskbwzg1ba4dw5z3y11yb9fzxh9f5y7l"; depends=[Biobase BMA leaps]; };
+  iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.32.0"; sha256="112wv08b4c3qgfd7w3a61zi1nk2va5b7ip9ayfknvj15kzrxsy9j"; depends=[BMA leaps survival]; };
+  joda = derive2 { name="joda"; version="1.22.0"; sha256="1f2a8jn9pvi1p3x9fvj78sxl5mvar0lss4zxpivqm376sz3h71hg"; depends=[bgmm RBGL]; };
+  kebabs = derive2 { name="kebabs"; version="1.8.1"; sha256="086a7z992wrj73k7zrkxk9zcz37r8bbnrdqhf4b3jvd0cwck7vib"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
+  keggorthology = derive2 { name="keggorthology"; version="2.26.0"; sha256="0r01hz6sra2h3irjy268y24hz0yzjzcdp8wxrj5qv103fahghjk1"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
+  kimod = derive2 { name="kimod"; version="1.2.0"; sha256="1bylbi4pwk4khhgx7ffi2sa1vqvffkmzd2c09n0pws03gpjm77ic"; depends=[Biobase cluster]; };
+  lapmix = derive2 { name="lapmix"; version="1.40.0"; sha256="1mgabcribl4jgm35ypy5rkmigzsq3vxk71i2j2jsvil48fwwpmw9"; depends=[Biobase]; };
+  ldblock = derive2 { name="ldblock"; version="1.4.0"; sha256="090f1yf30mklvq1kgqq28dsr4qy1zv4b1jp0c8m4a46115d7f57x"; depends=[Matrix snpStats]; };
+  les = derive2 { name="les"; version="1.24.0"; sha256="0736ymhiq4a6aq6439nigs475x08sw3msl4jzg5g594lbs3nxklb"; depends=[boot fdrtool gplots RColorBrewer]; };
+  lfa = derive2 { name="lfa"; version="1.4.0"; sha256="1awfqd3pmzkljn19fvflxp5q8ilncamcl3hx7ns7d4r9r98d9a3s"; depends=[corpcor]; };
+  limma = derive2 { name="limma"; version="3.30.13"; sha256="1ji8kb19anwq2505zii2kzqlrnk75mk1mpz8vy4s1mckzs1cz4m0"; depends=[]; };
+  limmaGUI = derive2 { name="limmaGUI"; version="1.50.0"; sha256="19jiqpkqcchbrsqac9l8a9zrcn37qc02586kr1n8c9fayhr91iby"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+  lmdme = derive2 { name="lmdme"; version="1.16.0"; sha256="033j6pz45wf9xzgjz25s9y7jyfc92srmispsy4m1apyb22gjazgs"; depends=[limma pls stemHypoxia]; };
+  logicFS = derive2 { name="logicFS"; version="1.44.0"; sha256="0j7qwgxdqq2m1ffdp78xg875xi2drlv9im8mzjc9m9mxv45fmala"; depends=[LogicReg mcbiopi]; };
+  logitT = derive2 { name="logitT"; version="1.32.0"; sha256="17r5zbf5lv13rcjlv6vw1qvqk7ha8gbqbcb957jvcdncjh1rrv72"; depends=[affy]; };
+  lol = derive2 { name="lol"; version="1.22.0"; sha256="15q0kz4xhzj75qa3qsg2fck9w9c1s0n87dlasim35i89y56kyzki"; depends=[Matrix penalized]; };
+  lpNet = derive2 { name="lpNet"; version="2.6.0"; sha256="1bfw7xp0dbx9kdg59x5jcwjwf8bjdqky6hvcpn2q4l9p6g9h72nn"; depends=[lpSolve nem]; };
+  lpsymphony = derive2 { name="lpsymphony"; version="1.2.0"; sha256="142jynr4fs70zwc3plm4wcjki6sb3ampmy6wp1cxpb92jmdavc9y"; depends=[]; };
+  lumi = derive2 { name="lumi"; version="2.26.4"; sha256="0k8d3xc1k53j0mlyy69j6dfkx9rkc305vnp72jk2k6b071ian1xw"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
+  mAPKL = derive2 { name="mAPKL"; version="1.6.0"; sha256="0664mnmw5v6ifkrq61z4b3m3rw10133awds70h7m074qdkwl89ad"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; };
+  mBPCR = derive2 { name="mBPCR"; version="1.28.0"; sha256="1r3jv0a9xn564lmszcigpqqgfhckyjwbzzmxi632wj98cn7qj4f0"; depends=[Biobase oligoClasses SNPchip]; };
+  mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.8.0"; sha256="1a1v2wylv14rz96qwqrshkf63ll54bx7h6g3y6d9fy1qdfgncwgq"; depends=[GenABEL MASS outliers qtl]; };
+  maCorrPlot = derive2 { name="maCorrPlot"; version="1.44.0"; sha256="11i2ri10gwmd6c9852z24v24f7hwcj378lmzxynrxqhz7825s1jr"; depends=[lattice]; };
+  maPredictDSC = derive2 { name="maPredictDSC"; version="1.12.0"; sha256="0rf092xaw7jw1i0p57d725x4g0827yvgl29cj6qix92ssv3fjm92"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
+  maSigPro = derive2 { name="maSigPro"; version="1.46.0"; sha256="0i2p236ysmhvmpbs4zc1rsxgd9z2c1633kxljsnyq7wqrkf4hx7i"; depends=[Biobase MASS mclust venn]; };
+  maanova = derive2 { name="maanova"; version="1.44.0"; sha256="094zbqwj97da540z03yxprdla3fbwwhcylpg3g92p4crnp7laaym"; depends=[Biobase]; };
+  macat = derive2 { name="macat"; version="1.48.0"; sha256="1jwqq6x9nrjyl60vpnraa4n4hp3rqqr794yh6372bqjk4ini0pph"; depends=[annotate Biobase]; };
+  made4 = derive2 { name="made4"; version="1.48.0"; sha256="1rmgyns0xvm6v7svlzbpkinc66cg0zr2h2lwsv4xnnva4zs5w8ns"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
+  maftools = derive2 { name="maftools"; version="1.0.55"; sha256="1wyapzh1zzqs0v725k24wlzfwkx0ap8dd2pxaqaxbmk6pg70vn3d"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table DPpackage ggplot2 ggrepel mclust NMF RColorBrewer rjson Rsamtools VariantAnnotation wordcloud]; };
+  maigesPack = derive2 { name="maigesPack"; version="1.38.0"; sha256="1g6my6nabm810q34cgrlmgdnvn93g968a7jyymgh8rs3gpj9gzgv"; depends=[convert graph limma marray]; };
+  makecdfenv = derive2 { name="makecdfenv"; version="1.50.0"; sha256="0bkkpsq5mgnkbygp3f0rvzxnmbrbd9isfbdfgq8q4ch4hwsfba28"; depends=[affy affyio Biobase zlibbioc]; };
+  manta = derive2 { name="manta"; version="1.20.0"; sha256="1gpvjmkf14jh7z5h96ixin783xaiznag1n0lp01iarz0412jvb86"; depends=[caroline edgeR Hmisc]; };
+  marray = derive2 { name="marray"; version="1.52.0"; sha256="1d242pjas4vqqcgj2cb3p66n1n9va3bqph62nyg0kr95fy2y7nf7"; depends=[limma]; };
+  maskBAD = derive2 { name="maskBAD"; version="1.18.0"; sha256="0y932wzga1crd0xrfjdap0pnji2fkaqfx68s016apx1x78k755ig"; depends=[affy gcrma]; };
+  massiR = derive2 { name="massiR"; version="1.10.0"; sha256="0qnn4cpb0xa49cxaaf7a2i87m5np1hqa6wcsxslbmvvrfik8j11b"; depends=[Biobase cluster diptest gplots]; };
+  matchBox = derive2 { name="matchBox"; version="1.16.0"; sha256="1pz8k1ygi59h4x2ykmvzqnwv44nryhqwpb3i4wg2bgm04nvd1kcz"; depends=[]; };
+  matter = derive2 { name="matter"; version="1.0.1"; sha256="1yh2lgv1dw4cf62iy5il095v6zsa64dhdrpzn31b8aw4p5y7g2hw"; depends=[biglm BiocGenerics irlba S4Vectors]; };
+  mcaGUI = derive2 { name="mcaGUI"; version="1.22.0"; sha256="0jmsf9vdv6nzqrzgmfgqvfgar9d1ziqp1qvj85pgsi1200n91rna"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
+  mdgsa = derive2 { name="mdgsa"; version="1.6.0"; sha256="0r1zs60922pzf7n9z1sxx7599rmq4mas0frm1931a2r9rf78dwdw"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
+  mdqc = derive2 { name="mdqc"; version="1.36.0"; sha256="0fva73csci63xd4kp3nr2j3gllkkwfvp9dd0b581mfgkfa2p3khm"; depends=[cluster MASS]; };
+  meshes = derive2 { name="meshes"; version="1.0.0"; sha256="0abqbsai946lm3dj7759q6crad3xj6919vgmnm5416sjnmfvk0v2"; depends=[AnnotationDbi DOSE GOSemSim MeSH_db]; };
+  meshr = derive2 { name="meshr"; version="1.10.0"; sha256="170mpx0z9h4lxkl7b159nrbjl4vc2bdz92vfc6piwb3pmggg2r8r"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; };
+  messina = derive2 { name="messina"; version="1.10.0"; sha256="1q3ikcq5pxbiahycbxgviry820p8498q2nh5wbdw5aq26cv00nak"; depends=[foreach ggplot2 plyr Rcpp survival]; };
+  metaArray = derive2 { name="metaArray"; version="1.52.0"; sha256="0k9msa564981i0dc6fqsrcc3kpv58jjmkibpgn93c6966rxx76j2"; depends=[Biobase MergeMaid]; };
+  metaCCA = derive2 { name="metaCCA"; version="1.2.0"; sha256="1d57h6a2idc5zrr8kn851b8ny2rsy1yhalrz5lch9xzl7ly5n5jc"; depends=[]; };
+  metaMS = derive2 { name="metaMS"; version="1.10.0"; sha256="0f09cagf82by2wzb6gsi2wapwrgdymyhg37jnfalb00v0xhzzwwq"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
+  metaSeq = derive2 { name="metaSeq"; version="1.14.0"; sha256="1jm79gd1wnyrcv8cj6ymiwj5g0b4r5p7l193zfh7v2y32ki0khq8"; depends=[NOISeq Rcpp snow]; };
+  metabomxtr = derive2 { name="metabomxtr"; version="1.8.0"; sha256="1blxfg4ciad5rq1lxxj6i9hw1y7ljd60hqgp46hb2bdr97p4xq1r"; depends=[Biobase Formula multtest optimx plyr]; };
+  metagene = derive2 { name="metagene"; version="2.6.1"; sha256="0zynw4bmid9m4n2v2vxy1ybbxgag7dhhf3vsipvxwn9dxfn28ls2"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges matrixStats muStat R6 Rsamtools rtracklayer]; };
+  metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.4.0"; sha256="0sfh1zm2vkkw6gy4lkl21p33h530mff190mymf5ymj31g6ql44ag"; depends=[ape Biobase Biostrings dplyr lattice lazyeval magrittr metagenomeSeq purrr RSQLite ShortRead stringr]; };
+  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.16.0"; sha256="14q96wsya19zv0ag06s9sqjq9azrh81kfim88aqvw8mp0vvc8k0x"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
+  metahdep = derive2 { name="metahdep"; version="1.32.0"; sha256="0qnimqg6zj2hq5a9ak39z3bv9da48k1191267rdbfn5rza910hwh"; depends=[]; };
+  metaseqR = derive2 { name="metaseqR"; version="1.14.0"; sha256="1h5gg9dzn91si1ir2xbv8fsf9wdih8wxl01q83279x56ghf1sy8y"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+  methVisual = derive2 { name="methVisual"; version="1.26.0"; sha256="1dkknkr6z10i2ljfmgjb4sxn9vv46g26cf9nc7s47rbxbycjvlqw"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
+  methyAnalysis = derive2 { name="methyAnalysis"; version="1.16.1"; sha256="0rhjn2ql3c5m6ayj5mmgs8fb348nbxdsn2717x44a7aj3zamn9py"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; };
+  methylKit = derive2 { name="methylKit"; version="1.0.0"; sha256="1fxyarvz0vi4wbki70gqb1nwrmz6m7kgsvqh1am4j8m46qzv1h9a"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; };
+  methylMnM = derive2 { name="methylMnM"; version="1.12.0"; sha256="15669zficwabd3wdl3b24q3hal7d587k5lzg8s6sr3f3f9w2lyqf"; depends=[edgeR statmod]; };
+  methylPipe = derive2 { name="methylPipe"; version="1.8.0"; sha256="1mfgxz43vxksvmwywh65q5v9jlcs5a43rb9w8zvjfgpg0zg8l46l"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
+  methylumi = derive2 { name="methylumi"; version="2.20.0"; sha256="02p1wwgz7w7qvsn08mw4ffrqwsi0kkahs7sdlm6ll0r7q3z03pkk"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
+  mgsa = derive2 { name="mgsa"; version="1.22.0"; sha256="1iwlqjs70hcgcr3m1k93xkl7xbqc9gw7k5ik9j9yhzsd7s8zxvpi"; depends=[gplots]; };
+  miRLAB = derive2 { name="miRLAB"; version="1.4.0"; sha256="0lgkm4arfc37z11ilfc0wp8m4zm1dpigr01757r82ksaxc2iqv54"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
+  miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.2.0"; sha256="0y4dmd6mlwyhi9k4nqfzg5x71k3x08cg0n4j0zrdqf5dby68yc3m"; depends=[AnnotationDbi DBI miRBaseVersions_db]; };
+  miRNApath = derive2 { name="miRNApath"; version="1.34.0"; sha256="01yb8n3i5jkpmy5ksq8lrllaspdc6lyixz7zzndzrwrk0gibph3b"; depends=[]; };
+  miRNAtap = derive2 { name="miRNAtap"; version="1.8.0"; sha256="0ap5c02m7j8mvvkxcw1mkxkwx7n8cslam1q4kj93pfpnn9bk2ll1"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
+  miRcomp = derive2 { name="miRcomp"; version="1.4.0"; sha256="0j07g3cvazxafvi3m0vp4rscivxydihdjkjy0fzqaxbgin2p35gj"; depends=[Biobase KernSmooth miRcompData]; };
+  microRNA = derive2 { name="microRNA"; version="1.32.0"; sha256="0yyldx2icbr36m6n0kf1f156ixm0hbjnyzrw535d36sxhy1pplpb"; depends=[Biostrings]; };
+  minet = derive2 { name="minet"; version="3.32.0"; sha256="1qk2xr88d7hc3ymg23byaqmnx3d2spddzwr81n48hwala8sy7apk"; depends=[infotheo]; };
+  minfi = derive2 { name="minfi"; version="1.20.2"; sha256="1dj88a1mv74fp9pv3iqmvqvgvr91mwdwan6qzx0svi4gh5g5hx3n"; 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]; };
+  mirIntegrator = derive2 { name="mirIntegrator"; version="1.4.0"; sha256="0iq3223i8hl7jsgbnzz748j253n6rjvxw374g5bk1p4b0n4dcj5v"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
+  missMethyl = derive2 { name="missMethyl"; version="1.8.0"; sha256="03wy0j8jr855kw87w7l4hd6cbk8n6iamyqnw0z2r9hf4dwd54v5v"; 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.12.0"; sha256="0jcc4rzc64sadanwgrg48dcsk3ibwsxka53h3wiz3yf8mlzq605a"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
+  mmnet = derive2 { name="mmnet"; version="1.12.0"; sha256="0fb9g4cizh0zf9gqwasygsc59njj6pffrmr5f0v96fmj3gvgfs1k"; depends=[Biobase flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
+  mogsa = derive2 { name="mogsa"; version="1.8.0"; sha256="1lw39c31n1k93i9a4rdpw03s3b638yplq8xlv4n6ac4bjy14q6l6"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
+  monocle = derive2 { name="monocle"; version="2.2.0"; sha256="05nhkk7n6pz2p5gmr3siwawcbjmhcswqs49xx16ycf7bqj2hbfn7"; depends=[Biobase BiocGenerics cluster combinat DDRTree dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix reshape2 slam stringr VGAM]; };
+  mosaics = derive2 { name="mosaics"; version="2.12.0"; sha256="01fvc0qc3fd8pjh6qjf9c1k4z0427gfx2li3jd7xp05nwyfbs68d"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
+  motifRG = derive2 { name="motifRG"; version="1.18.0"; sha256="1pa97aj6c5f3gx4bgriw110764dj3m9h104ddi8rv2bpy41yd98d"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
+  motifStack = derive2 { name="motifStack"; version="1.18.0"; sha256="1h4qw89wqnl0r6drfi26h6jnvpjh5r45qc588g18rplgw3ckjmfz"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
+  motifbreakR = derive2 { name="motifbreakR"; version="1.4.0"; sha256="14mgwligzfwlg9asdr125wzg15j1rhg29xsv58r802q6r2prgryy"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
+  msPurity = derive2 { name="msPurity"; version="1.0.0"; sha256="0az2g69djc9kjzj10wgl0qpyyng6a8hzwa9ppwg66yj8da09x8zl"; depends=[doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 sapa stringr]; };
+  msa = derive2 { name="msa"; version="1.6.0"; sha256="0i3cx1s5gg24dyik1mclhbpiqhxakc63fiazihdxn4k0bdg8ca9p"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
+  msmsEDA = derive2 { name="msmsEDA"; version="1.12.0"; sha256="1l8clsma1rd322dfjr14klx0w5gjgn7fg21m4d4cyayyb44vsf1s"; depends=[gplots MASS MSnbase RColorBrewer]; };
+  msmsTests = derive2 { name="msmsTests"; version="1.12.0"; sha256="12amngakmr4h3hl0nbladynn51r2zndcd0kxkm5cyhd90rrzs18i"; depends=[edgeR msmsEDA MSnbase qvalue]; };
+  multiClust = derive2 { name="multiClust"; version="1.4.0"; sha256="1g8j8ad61njs1zbc2vrwbzp4lliapamzy9bd0cyhh520b55ziy8q"; depends=[amap cluster ctc dendextend mclust survival]; };
+  multiscan = derive2 { name="multiscan"; version="1.34.0"; sha256="12ld46bm58lr95w7v7ynyhl6mw1ws9gbdr7afjdrs7ba4313qa0j"; depends=[Biobase]; };
+  multtest = derive2 { name="multtest"; version="2.30.0"; sha256="0q302f3yf9v7mlq2kib7ynq015d5f94jrsk9drkp5vq0z5j0h3sw"; depends=[Biobase BiocGenerics MASS survival]; };
+  muscle = derive2 { name="muscle"; version="3.16.0"; sha256="0rkv1gdbpk8sss1nlq19y7p2kba8hy3dh3bx5x1rzn9cn0qn16ig"; depends=[Biostrings]; };
+  mvGST = derive2 { name="mvGST"; version="1.8.0"; sha256="19sn5rg3ny1ch5ka8agssn048wgj764cspzzj0pn3vf025qa9pbv"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
+  mygene = derive2 { name="mygene"; version="1.10.0"; sha256="1qir3d378plqxwkz006vi00qb1zgj2m13sjcaxcclcg59fh1fh9m"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
+  myvariant = derive2 { name="myvariant"; version="1.4.0"; sha256="0xlxcs0vqlwjqiwlycfznvj8n7sm54m3y287ndijs0461qkm2xil"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
+  mzID = derive2 { name="mzID"; version="1.12.0"; sha256="1zn896cpfvqp1qmq5c4vcj933hb8rxwb6gkck1wqvr7393rpqy1q"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
+  mzR = derive2 { name="mzR"; version="2.8.1"; sha256="0ipmhg6l3pf648rdx5g2ha7l5ppd3cja6afxhdw76x8ga3633x0r"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
+  ncdfFlow = derive2 { name="ncdfFlow"; version="2.20.2"; sha256="0s8gd6wf20zxi8vs1bl1d75rmssgvkrgrndzxn56g8cxdnyg95hl"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
+  nem = derive2 { name="nem"; version="2.48.0"; sha256="00x0hb1h95dh9mg3wj89l3g2fh9hdbqlisylvmlmf7dzngcyn2c3"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
+  netbenchmark = derive2 { name="netbenchmark"; version="1.6.0"; sha256="1f27n82kzwwqcpx71rv824lj1h9723vf9cjcp1djh6d8jpx6yx3a"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; };
+  netbiov = derive2 { name="netbiov"; version="1.8.0"; sha256="1yz9q8s1ls6944rwbmjmk6bzg0d16sxr93sw49vlzjqg1xydfc0x"; depends=[igraph]; };
+  nethet = derive2 { name="nethet"; version="1.6.0"; sha256="04kpkff1kvxq060jx1fqg5vjszipzyjlshmr23ybm40lj31nl92k"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
+  netprioR = derive2 { name="netprioR"; version="1.0.0"; sha256="1ilpjkwnl81rv2xn2k3174jqp9jidm0fn4aajfybz0fbhzxi5r8k"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; };
+  netresponse = derive2 { name="netresponse"; version="1.34.0"; sha256="15gq1x7ksmr5slbbdv0cfpk5nkibpq0b6mkpda0f4rg58zq0nsb6"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
+  networkBMA = derive2 { name="networkBMA"; version="2.12.0"; sha256="1ccs0ardxa7d6b8jlkrnrs2idbf3bg7610zwjdg3p25da1f9gpn0"; depends=[BH BMA Rcpp RcppArmadillo RcppEigen]; };
+  nnNorm = derive2 { name="nnNorm"; version="2.38.0"; sha256="1mdgbmdhqc1mjhjjhx8g0x6jy4pzza13f083c7wb9hhh7mi5w5jp"; depends=[marray nnet]; };
+  nondetects = derive2 { name="nondetects"; version="2.4.0"; sha256="06jraad50df9kw4sl44qs3km1ba4nfvqkkzf0ghmrs624msyl4xx"; depends=[Biobase HTqPCR limma mvtnorm]; };
+  normalize450K = derive2 { name="normalize450K"; version="1.2.0"; sha256="0h9dqm1n7kmaydjxhn9m9gw2kfwr98aa3nil32x32qsx9rsf5yk0"; depends=[Biobase illuminaio quadprog]; };
+  normr = derive2 { name="normr"; version="1.0.0"; sha256="0ad2nbyngpigx7gy9nnpifjcz33bd8vkpggjl80vp5w4swj9vkrp"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; };
+  npGSEA = derive2 { name="npGSEA"; version="1.10.0"; sha256="1w4v4b53rdg4g8zw8hbcvw3z2x7i3f4kn9i68ql7f9p7ba21qr2p"; depends=[Biobase BiocGenerics GSEABase]; };
+  nucleR = derive2 { name="nucleR"; version="2.6.0"; sha256="0aa2hi3pscjypys1zf1qdzzxsxkaj7myrja3932kb2vjnydk6da7"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+  nucleoSim = derive2 { name="nucleoSim"; version="1.2.0"; sha256="0j65i9yah3v3iidrndka05rfabgah7yk2d2fg1rqkw2nkyv47shk"; depends=[IRanges S4Vectors]; };
+  nudge = derive2 { name="nudge"; version="1.40.0"; sha256="0ggbj3bjxjklw6944icgjcy3mgcly6b7d5cl68yn1cyagmdfdl63"; depends=[]; };
+  occugene = derive2 { name="occugene"; version="1.34.0"; sha256="0qavm0wkhaq2vlrbqwb5yr79251m9nxlv4kj3bhhkdf0azzjpxmp"; depends=[]; };
+  odseq = derive2 { name="odseq"; version="1.2.0"; sha256="1bf9s0vvgvq44p37396jj7wis6isj07mips52hmq299s7r5zl6gp"; depends=[kebabs mclust msa]; };
+  oligo = derive2 { name="oligo"; version="1.38.0"; sha256="1lpdqyraamyqdz9dc56xpdph4sbx7fa4ngvdg407nblbqxbyyz3d"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
+  oligoClasses = derive2 { name="oligoClasses"; version="1.36.0"; sha256="0cs8hkiz1rmp17hf1zsc2g1zwq7ah7x3bxbjapwgy6s12f68x2g9"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
+  omicade4 = derive2 { name="omicade4"; version="1.14.0"; sha256="0z6fvr4qq2bi0lpprs5fwv7lg501pgq648pd9af6w0km5ij7hrcf"; depends=[ade4 made4]; };
+  oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.40.0"; sha256="0x1g8f2aw95yvkc2mr9998wk3xmrzraaw4zp95kp21avv196kswh"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
+  ontoCAT = derive2 { name="ontoCAT"; version="1.26.0"; sha256="1p6kgdv9h9hd87ccbvgz8l8vkmn7j9bvmq4wjvz4si5pwjghsz4l"; depends=[rJava]; };
+  openCyto = derive2 { name="openCyto"; version="1.12.1"; sha256="07nv87c578dgacld01dzvnj8sba5f6yll5d3v3754zswnl7glk4j"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+  oposSOM = derive2 { name="oposSOM"; version="1.12.0"; sha256="1hfyr7sbwr9wyhan71mr8l22qkl5q5pm09n6rbbsy1z3wfd4yj9k"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
+  oppar = derive2 { name="oppar"; version="1.2.0"; sha256="12bdfckimhrwx0zvgjm0lq320h5b6n8a8gwj50kz75fdqg7zjw0v"; depends=[Biobase GSEABase GSVA]; };
+  pRoloc = derive2 { name="pRoloc"; version="1.14.6"; sha256="15g28asmk65vzrdm9cnq083vr7vcl76z2zw7j61mnlb73z1y3vqg"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class dendextend e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
+  pRolocGUI = derive2 { name="pRolocGUI"; version="1.8.2"; sha256="0zw89sdy0y1hxydkglscn3xx29yna17a83w1c73ps4q30laybl6a"; depends=[Biobase dplyr DT MSnbase pRoloc scales shiny]; };
+  paircompviz = derive2 { name="paircompviz"; version="1.12.0"; sha256="0mwpgds5blylhh4ac24flzvpdp8xvky1yidmfafk002yf6pdk8i0"; depends=[Rgraphviz]; };
+  pandaR = derive2 { name="pandaR"; version="1.6.0"; sha256="13fs3qa42z9bh8wfbfbfzhzq9z2rj6436caqd1flx7m4ibbww9fc"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; };
+  panp = derive2 { name="panp"; version="1.44.0"; sha256="1pj9pgknfmrq8fnyk30hkn0mz1f3n6lv1dvvs7nywd8702wfyxhv"; depends=[affy Biobase]; };
+  parglms = derive2 { name="parglms"; version="1.6.0"; sha256="0lqzvy0q6nlzm9k3ar70mqrvlkiw2ks2fi07bqcccmspvvkd25a6"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
+  parody = derive2 { name="parody"; version="1.32.0"; sha256="04n9ngqmdlm44bkhgwyk7a9rky7dcm8h3jy3m6nhz8lm6k6q72h3"; depends=[]; };
+  pathRender = derive2 { name="pathRender"; version="1.42.0"; sha256="18bdli1sbb32kdza10lzf1mfd0dwlgkmbha20bjvcpd9jxxhl79z"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
+  pathVar = derive2 { name="pathVar"; version="1.4.0"; sha256="17332arpxdn9sh3lknrdnjc7dlp6qzjp0px82grkvfw9nqs0d4m3"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
+  pathifier = derive2 { name="pathifier"; version="1.12.0"; sha256="132yhr43y88kz2qaadkw3hxbrjawk76hiy0h7y72h33zmz4l5z26"; depends=[princurve R_oo]; };
+  pathview = derive2 { name="pathview"; version="1.14.0"; sha256="1nlfh2i1gj1f35z9v95yajvpp1p60z0pgjbc9xyvdg82s58ggjvd"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
+  paxtoolsr = derive2 { name="paxtoolsr"; version="1.8.0"; sha256="09z7w9mp2f710y5rf83gqw490axvsg6xgqq05n44r21741rblxdf"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; };
+  pbcmc = derive2 { name="pbcmc"; version="1.2.2"; sha256="0p7gacnbgf65iz9h7hfyybyak595ykl4xlfv4jvz4hpigbq8alzc"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; };
+  pcaExplorer = derive2 { name="pcaExplorer"; version="2.0.0"; sha256="00zak0j907wrpr4ng6lxj4fki3lg8kgx6j8y7vxiib7dd01sw2fp"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; };
+  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.18.0"; sha256="1xh7dwskik3q3npwhz2jgmpadh59q04hz6rd6fpph470d98213pm"; depends=[AnnotationDbi Biostrings ellipse]; };
+  pcaMethods = derive2 { name="pcaMethods"; version="1.66.0"; sha256="18mawhxw57pgpn87qha4mwki24gqja7wpqha8q496476vyap11xw"; depends=[Biobase BiocGenerics MASS Rcpp]; };
+  pcot2 = derive2 { name="pcot2"; version="1.42.0"; sha256="0rqkclr272ss61nlcay1wk0fy904bgw9rkryx236p7087kmjbasi"; depends=[amap Biobase]; };
+  pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.38.0"; sha256="1vhb37y8mfravdlvvsdnnxw3yjx6mf6x9wkj140s3bmrjyaabyxa"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+  pdmclass = derive2 { name="pdmclass"; version="1.46.0"; sha256="1g88p9jrhllqxjy6043gm34h1lmyqxqyvifdlxz2afrc5h0g3rs8"; depends=[Biobase fibroEset mda]; };
+  pepStat = derive2 { name="pepStat"; version="1.8.0"; sha256="1r7a10dhicq2lhk3g1yqz6q5wv0a9dwsl7pvxzhds1ix980a4rm9"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
+  pepXMLTab = derive2 { name="pepXMLTab"; version="1.8.0"; sha256="0bgr2v9hj6lvwn2r1m5bfa20bxbk1zibysmr2cnzr8qxvlcpi354"; depends=[XML]; };
+  phenoDist = derive2 { name="phenoDist"; version="1.22.0"; sha256="0945wxmf1dr6hp8pjc995nhisdnzc0rjwlpkfkw93dn10gn947w8"; depends=[e1071 imageHTS]; };
+  phenoTest = derive2 { name="phenoTest"; version="1.23.1"; sha256="1nlgzzh8ddrk943vgna9ngdha60zmpn8zmbb4sxy8sya4n1z097v"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
+  philr = derive2 { name="philr"; version="1.0.0"; sha256="0k0ck7miirmwincp1fxcmdgfbcfdvyhgpmgxv5d4nlsasr3sf9n5"; depends=[ape ggplot2 ggtree phangorn tidyr]; };
+  phyloseq = derive2 { name="phyloseq"; version="1.19.1"; sha256="19vq14gqr5wwkgbp1qdvz704ilhwvdfn7m8yzfcr6xcdxxks0gad"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
+  piano = derive2 { name="piano"; version="1.14.5"; sha256="1y6vy7fh23mpa2r65mhygaj27zwjl9v3khkff80lsaax0cc287s7"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; };
+  pickgene = derive2 { name="pickgene"; version="1.46.0"; sha256="0lcgfw8w08akrkqb74ibavav9ph5pd1daa3zbdrxkycxqxylwcmm"; depends=[MASS]; };
+  pint = derive2 { name="pint"; version="1.24.0"; sha256="1q0j037z4rq7z2yd76rnspg0xarbnblbhssm338hvh84l3kyhsvj"; depends=[dmt Matrix mvtnorm]; };
+  pkgDepTools = derive2 { name="pkgDepTools"; version="1.40.0"; sha256="1r1z4ksjjd0av85jwfvawfv4j5jkjvglf03h55zixg8iwhcgrmz1"; depends=[graph RBGL]; };
+  plateCore = derive2 { name="plateCore"; version="1.32.0"; sha256="123r9qcqan3bcqpzgw34dnrf1dgl28x01clc0j4rr61zxakapbq1"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
+  plethy = derive2 { name="plethy"; version="1.12.1"; sha256="0q8xqk123rm1sj4knljaaz97hl0pshf8m7f99kggna0hc33hgz60"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
+  plgem = derive2 { name="plgem"; version="1.46.0"; sha256="16g433rh7avqml7dlil8hm8a1ksmgfansck26r3hcg2ic9ys1gly"; depends=[Biobase MASS]; };
+  plier = derive2 { name="plier"; version="1.44.0"; sha256="0iyazrna17qc5pk4lfxqmzwhhjxpjnli8ks6v7xf8c620ydrfdlm"; depends=[affy Biobase]; };
+  plrs = derive2 { name="plrs"; version="1.14.0"; sha256="084vc0570ccl1hbp3gjp6mdk1x6qzxipyzwdh76ffahafg1lyk5s"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
+  plw = derive2 { name="plw"; version="1.34.0"; sha256="1r5b2rpzhl5xj7477saac2j1qjdrcbdd3hrsi01hfsapczggz7sl"; depends=[affy MASS]; };
+  pmm = derive2 { name="pmm"; version="1.6.0"; sha256="19v4cbc6ws84pa5byxam3cgdbmdd6qm44m1x62iz9hsmbx38fsg6"; depends=[lme4]; };
+  podkat = derive2 { name="podkat"; version="1.6.1"; sha256="01kk7j2kvb15803dgyszjardy2mb8hii7f2c08x5whbprajx1h06"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
+  polyester = derive2 { name="polyester"; version="1.10.1"; sha256="1z011zvj1jzr2diznp528skhxafngk26i080fvyc9vpviabpbl3l"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
+  ppiStats = derive2 { name="ppiStats"; version="1.40.0"; sha256="1ymyn5gf2879gb20q9aczw056ib5c7c0lhpap6f4iyxivz9lpbhq"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
+  pqsfinder = derive2 { name="pqsfinder"; version="1.2.3"; sha256="0d497y179r9yk43sh03vbanv1ilpp43a0zxj33fjnmm0cfc6w8cx"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
+  prada = derive2 { name="prada"; version="1.50.0"; sha256="1nng189vl5xykba2gahmf88sb5fx9v980bhpy419anif26hx5fdl"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
+  prebs = derive2 { name="prebs"; version="1.14.0"; sha256="0jkvpa5dvgvdln8bzd3cf4i5ki3mpf7n9353x0ba482p1qk3ip5z"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
+  predictionet = derive2 { name="predictionet"; version="1.20.0"; sha256="0c988g47nw91rv62kc6rnxvmym7xxfr4gdlj339wy70w52yjf8vk"; depends=[catnet igraph MASS penalized RBGL]; };
+  preprocessCore = derive2 { name="preprocessCore"; version="1.36.0"; sha256="1n8y12q7145f385gm2k3c6y3vwvin7jlb47la4mnl7mar6pq9kmp"; depends=[]; };
+  proBAMr = derive2 { name="proBAMr"; version="1.8.0"; sha256="1kdaxyx0y3p4zvs589q4svb8h1xjsw2sccm3287rdj6a6wp4z5km"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
+  proFIA = derive2 { name="proFIA"; version="1.0.10"; sha256="18ncxwzgyvq4ks2y0sqvm01fsw8xfvri9h5nm0446ailjwg64mj9"; depends=[Biobase BiocParallel FNN minpack_lm pracma xcms]; };
+  procoil = derive2 { name="procoil"; version="2.2.0"; sha256="1ffjrn2fg2z48c5lrabma34zyvm75fqngndxfd4g216znyzll2dn"; depends=[Biostrings kebabs S4Vectors]; };
+  profileScoreDist = derive2 { name="profileScoreDist"; version="1.2.0"; sha256="1b1mvh6aw9k72qxjslb5qa42l70y9zz4r49kyxf48nfm8hgs2cj7"; depends=[BiocGenerics Rcpp]; };
+  prot2D = derive2 { name="prot2D"; version="1.12.0"; sha256="0pdwkyqi0lplr12ayj9rrj09xhdbm7sjn821k4ilfbnxic3lldf2"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
+  proteinProfiles = derive2 { name="proteinProfiles"; version="1.14.0"; sha256="0xika21c4fadh4sxbn7kqjmmqpg85qxl3aynwfvl0qmk8xjpvdin"; depends=[]; };
+  proteoQC = derive2 { name="proteoQC"; version="1.10.0"; sha256="0396qp0jzyz1ss3ahcxbqpxgsn1rwiy87zmrfr3wl22gs44vijrv"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; };
+  psichomics = derive2 { name="psichomics"; version="1.0.8"; sha256="15v689jcc8d107cp9chzyh4bx01x5639lf474bl2ac9jlqca3mb3"; depends=[AnnotationHub data_table digest dplyr DT fastmatch highcharter httr jsonlite miscTools plyr R_utils shiny shinyBS shinyjs stringr survival Sushi XML]; };
+  psygenet2r = derive2 { name="psygenet2r"; version="1.7.4"; sha256="0553fbkbfylqk7z4rw7m4sdyddgwh5qv0rgkp0crnj0cp49cmvnc"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 igraph labeling RCurl reshape2 stringr topGO]; };
+  puma = derive2 { name="puma"; version="3.16.0"; sha256="0692cvv6v58dpi0phrh5zfraw090mc83cwpnqibgi3w7kigq5zl7"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
+  pvac = derive2 { name="pvac"; version="1.22.0"; sha256="1hhd87fh688r03l15f1m8rsaglcnqm6lzkb1lg002lzm8ghnzq81"; depends=[affy Biobase]; };
+  pvca = derive2 { name="pvca"; version="1.14.0"; sha256="1z71i79hq8n139xpqvwz03r8arpscimy4p8ms77q7q3pcxb0rs94"; depends=[Biobase lme4 Matrix vsn]; };
+  pwOmics = derive2 { name="pwOmics"; version="1.6.0"; sha256="1iq3aw9l2r3fc0kv0pj70yh8c729rb39v51hcy1bc5syfasr7shr"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
+  qcmetrics = derive2 { name="qcmetrics"; version="1.12.0"; sha256="0s2p02j1v41hg5yrryi7lf819hhfv1wrdi58wxxff4m69qzzypzg"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
+  qpcrNorm = derive2 { name="qpcrNorm"; version="1.32.0"; sha256="1q7w247r2ac4nqr262mc15q54ak0zdpw6a1sl0p7hiqcj1bc60f8"; depends=[affy Biobase limma]; };
+  qpgraph = derive2 { name="qpgraph"; version="2.8.3"; sha256="02isqzh92dw6xr8wjb2nigfkk5lxmywm09p5ywffx4fvjl1bvs4f"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
+  qrqc = derive2 { name="qrqc"; version="1.28.0"; sha256="0yl5q6c2yfizc9kaxdksc0zyl88xyy2i5m9qhcjkvzw71nlhihlj"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
+  qsea = derive2 { name="qsea"; version="1.0.3"; sha256="1r3b90ibhvrg98xji81rdfazvk7a2ib622dga7gvpqax0rs1np8i"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; };
+  quantro = derive2 { name="quantro"; version="1.8.0"; sha256="0y33mx9nvi7k2w6qzal2z0jav1c68m9rkiqx7g22rjhisg2vynvi"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
+  quantsmooth = derive2 { name="quantsmooth"; version="1.40.0"; sha256="0bxy8rj5bflk9qv672rn9yr9lmk8z5a5lakgcamisbf28s6d3qkm"; depends=[quantreg]; };
+  qusage = derive2 { name="qusage"; version="2.6.1"; sha256="1npv86c0z2ka2r3w4dydf843lhx6fsyyhxx268dnpv604rm0f662"; depends=[Biobase limma lsmeans nlme]; };
+  qvalue = derive2 { name="qvalue"; version="2.6.0"; sha256="1dijh11v1kr29gnikq09pkdvm3qwmp1a406ahx9l4j6mgn8hlsfq"; depends=[ggplot2 reshape2]; };
+  r3Cseq = derive2 { name="r3Cseq"; version="1.20.0"; sha256="039p2chdxcikjd58ighdd5vh6hp9mb3w169az0m9asrys4wgkps0"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
+  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.14.0"; sha256="1a3c1yk57rmmsxwfkmgjvkfh3vs7aq71h6iwcihyvp2b15xdg8wp"; depends=[data_table XML]; };
+  rCGH = derive2 { name="rCGH"; version="1.4.0"; sha256="0hh36zfmy7284528lfgf103r7f0839hxzr2z75gmsjjvr3c4q8vb"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; };
+  rDGIdb = derive2 { name="rDGIdb"; version="1.0.0"; sha256="0ix6j1m9bcllblwivv0i3m5mns787kpzpmx8kvb8bw4qd3lb09hq"; depends=[httr jsonlite]; };
+  rGADEM = derive2 { name="rGADEM"; version="2.22.0"; sha256="1n673zr7g27fdksikk945krc539bnyvi3awabaifc57ldzj0hz1v"; depends=[Biostrings BSgenome IRanges seqLogo]; };
+  rGREAT = derive2 { name="rGREAT"; version="1.6.0"; sha256="1q56cg6crgr95myk8pd7dmrhblcm4yl0n21dy126c0h38i6q5f5i"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+  rHVDM = derive2 { name="rHVDM"; version="1.40.0"; sha256="1v410qv0djpf6cd90fjaidlifxcfv3l7s925ni9q4dqk8dr8x4y3"; depends=[affy Biobase minpack_lm R2HTML]; };
+  rMAT = derive2 { name="rMAT"; version="3.24.0"; sha256="1s6lq7pc5g93qvwq79va9k6b2z2z65pf5hyya9bdjrr7q6bgd6fd"; depends=[affxparser Biobase BiocGenerics IRanges]; };
+  rRDP = derive2 { name="rRDP"; version="1.8.0"; sha256="1z8m3036sarciw69pqhl5ib7prilbbwx43xv597byq03n45fgawq"; depends=[Biostrings]; };
+  rSFFreader = derive2 { name="rSFFreader"; version="0.22.0"; sha256="1n9rzd3lpjzjbwpx1jvb68yymkr6k01y6a2jjyf7cdpdd9mpyg8s"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
+  rTANDEM = derive2 { name="rTANDEM"; version="1.14.2"; sha256="1c9y3lf0ksmck7zw2qm6r3mnpgrmf6gpq471bzpyx8443cs7fj7h"; depends=[data_table Rcpp XML]; };
+  rTRM = derive2 { name="rTRM"; version="1.12.0"; sha256="14ma36hx7hzaz903dzbmhzmipqlr3lnibjxr5y518wsml4ih70gi"; depends=[AnnotationDbi DBI igraph RSQLite]; };
+  rTRMui = derive2 { name="rTRMui"; version="1.12.0"; sha256="0slp9yggz7yfhpil540k6d1ppkbmmbks1ssacj6xf5h4yksc6zh8"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
+  rain = derive2 { name="rain"; version="1.8.0"; sha256="1gqkh3rjr3h6l8y3s9rdc1j4ivnpx1hmhnlp6ay63y99q4yxgj8c"; depends=[gmp multtest]; };
+  rama = derive2 { name="rama"; version="1.48.0"; sha256="0zmmilwhvh51fg0bi6jid27z38xr5yyqa0xa5kjwq3xh9pnrg17l"; depends=[]; };
+  randPack = derive2 { name="randPack"; version="1.20.0"; sha256="0wby3nwhj5d4r98p14qfl3p2z4rb73bbpfh68zf75gjaqvkm0j25"; depends=[Biobase]; };
+  rbsurv = derive2 { name="rbsurv"; version="2.32.0"; sha256="1n067rk8jiwf56rm22h8jfngwg75hp0xg7hlx86yzsdffpkmmbbv"; depends=[Biobase survival]; };
+  rcellminer = derive2 { name="rcellminer"; version="1.6.0"; sha256="1lmghcwrwdwknpsv2cq47yyaw09ishb0s7i29zs5c4ksvpmdhw5h"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; };
+  readat = derive2 { name="readat"; version="1.0.0"; sha256="0l89x1pb1c8kypdh2ka9bp9jwq8j19p34qnf2zzm34361amh90wz"; 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.52.0"; sha256="1cg88gglzr5r5m0bq51fz2xabhrlk9rybvrbbdnd7ph2ss1jxkis"; depends=[Biobase idiogram]; };
+  recount = derive2 { name="recount"; version="1.0.17"; sha256="1ffvpkzafqhy75j8r39l91lrm321yq73w5a929nngk82lwwd6dcf"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
+  recoup = derive2 { name="recoup"; version="1.2.0"; sha256="1n5af8fbly8qdwn4ggysd01s15l26lkw9dh1mnmimhhi6wzz1brj"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
+  regionReport = derive2 { name="regionReport"; version="1.8.2"; sha256="0q59fhxa9a1cr75c6m4qmgpxrv8q1jj0k1zm76xbj6anri5cmprd"; depends=[DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
+  regioneR = derive2 { name="regioneR"; version="1.6.2"; sha256="0mvwk2yjsdxda7w6f82dbj91i0zrr95ipglfyw9ndhl2ki8dka0i"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer]; };
+  regsplice = derive2 { name="regsplice"; version="1.0.0"; sha256="0kl8xsz4jph4jrj3yfnfaymhsrrmcxgfjjanbc3yfv6kj5pwjfcp"; depends=[BiocParallel edgeR glmnet limma S4Vectors SummarizedExperiment]; };
+  rfPred = derive2 { name="rfPred"; version="1.12.0"; sha256="1bc5rj00mlayahqb6vla9ghq15676fscj9kqagp1x6ivpgxqkl65"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
+  rgsepd = derive2 { name="rgsepd"; version="1.6.0"; sha256="047svzia4f5qhcr6h0p0hfzshzmissdm9hg0pp4mfd6051nkdv5x"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
+  rhdf5 = derive2 { name="rhdf5"; version="2.18.0"; sha256="0pb04li55ysag30s7rap7nnivc0rqmgsmpj43kin0rxdabfn1w0k"; depends=[zlibbioc]; };
+  riboSeqR = derive2 { name="riboSeqR"; version="1.8.0"; sha256="1196qh0vwnfwshccl725mbkf698dlyz4658cq7kpvyrpv56z5l90"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
+  rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.32.0"; sha256="0bxlc5lwxlnlbp2qj3gsdvbrb96c9dhmp3fjdnpdcjwbvwh9a2jn"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
+  rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.4.0"; sha256="1q1lsf75nbwkn91lgwkpx4lsmg94v1lbwzq7glwai4766xkvd2nb"; depends=[RColorBrewer]; };
+  roar = derive2 { name="roar"; version="1.10.0"; sha256="1hp2542vi0jqxqqin6gb5py5hvl06sn0x9ks4lb371sw0smps7ak"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  rols = derive2 { name="rols"; version="2.2.5"; sha256="0xc467hd2jzdhw73a97lvj5m2hv10w06l11yrqff13gkhch4d6mi"; depends=[Biobase httr jsonlite progress]; };
+  ropls = derive2 { name="ropls"; version="1.6.2"; sha256="0piwi6l83a7lcgsv2561d71y7hm3j3g2ax6vq2h0izf6qrzj4nvy"; depends=[Biobase]; };
+  rpx = derive2 { name="rpx"; version="1.10.2"; sha256="1814f3jdmbj2yyv8ll7lfnc6bcwbv5hn9i7wydf2xzvpi2954ijr"; depends=[RCurl XML]; };
+  rqubic = derive2 { name="rqubic"; version="1.20.0"; sha256="1d5zbicb5lsqvbb0djaixi9i05q2caysa1pxnlbvf4pc3pjl2bzh"; depends=[biclust Biobase BiocGenerics]; };
+  rsbml = derive2 { name="rsbml"; version="2.32.0"; sha256="13y47fkrq80c9s0y7rrvynr6y5df9cxr0i9zxksm27fvk7bq2rzh"; depends=[BiocGenerics graph]; };
+  rtracklayer = derive2 { name="rtracklayer"; version="1.34.2"; sha256="1j3cyvg1wg1d9l0lkcjk3jn7pb96zi17nd1qsa5lglsimja19mpl"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+  sRAP = derive2 { name="sRAP"; version="1.14.0"; sha256="04nnkxb59s9qfv8kyvqc5kw8hd60c0qnpp9v8rl2iash3yng8xxb"; depends=[gplots pls qvalue ROCR WriteXLS]; };
+  sSeq = derive2 { name="sSeq"; version="1.12.0"; sha256="0pawi0svlz3cfq14f81lkvfawa5vd59cbvk4nxgwpwwk1ldxrdiq"; depends=[caTools RColorBrewer]; };
+  safe = derive2 { name="safe"; version="3.14.0"; sha256="1n2i36gg8iykcaxy4347il2hbjd4lzrygyzibj4l9a7xprfb05y0"; depends=[AnnotationDbi Biobase SparseM]; };
+  sagenhaft = derive2 { name="sagenhaft"; version="1.44.0"; sha256="1j6y4bj156szbf454m4zmlcg1idzxq2vzis2vjl5awpm0jvgz6sa"; depends=[SparseM]; };
+  sangerseqR = derive2 { name="sangerseqR"; version="1.10.0"; sha256="058la6zb2prgnf0vwy8fc4p7n13zpm1gr7fhsy4m9qknd4mdcvkz"; depends=[Biostrings shiny]; };
+  sapFinder = derive2 { name="sapFinder"; version="1.12.0"; sha256="1fybnkzjg2jfjc4qzcr96ma75389x928110a2nmq8326xknwd6f1"; depends=[pheatmap Rcpp rTANDEM]; };
+  savR = derive2 { name="savR"; version="1.12.0"; sha256="0h32mrnwls8bgq0h71vzhr29f56hpl1hgxi7sycz7hmzp9pxcfh8"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+  scater = derive2 { name="scater"; version="1.2.0"; sha256="0pambafir3aqpgk7kdq5i2pn0278d97bn2qb9712c0jivw363whf"; depends=[Biobase BiocGenerics biomaRt data_table dplyr edgeR ggbeeswarm ggplot2 limma matrixStats plyr reshape2 rhdf5 rjson shiny shinydashboard tximport viridis]; };
+  scde = derive2 { name="scde"; version="2.2.0"; sha256="1yhg9gd8qphnfk5x93hsxqhw6mc2v6kdrw1wlgb93njic0cfmv7b"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; };
+  scran = derive2 { name="scran"; version="1.2.2"; sha256="02jlxxm3nwgdx3v4dxw7041c4klfalpbqx0qwj25pk4f0fn9xrak"; depends=[Biobase BiocGenerics BiocParallel dynamicTreeCut edgeR Matrix scater shiny statmod zoo]; };
+  scsR = derive2 { name="scsR"; version="1.10.0"; sha256="143qn75g3kijbdx2f7yg0wxa8kakyv6w119fwnfqxgpswdgdz2hn"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
+  segmentSeq = derive2 { name="segmentSeq"; version="2.8.0"; sha256="1azbyabm0nsjq45z3p6xhbxs01b5prwnq384y5yp5f6akkr3i4h7"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+  seq2pathway = derive2 { name="seq2pathway"; version="1.6.0"; sha256="0rr5fzbcyc32ciyx42kahn8f9fvk7sy6055i37ql8zk5msgrsdsw"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
+  seqCNA = derive2 { name="seqCNA"; version="1.20.0"; sha256="0951qnwgh29w7ws7mjcsrrkavipjpryf0mf0z7bgnpzdlpvkf361"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
+  seqLogo = derive2 { name="seqLogo"; version="1.40.0"; sha256="18bajdl75h3039559d81rgllqqvnq8ygsfxfx081xphxs0v6xggy"; depends=[]; };
+  seqPattern = derive2 { name="seqPattern"; version="1.6.0"; sha256="0lsa5pz36xapi3yiv78k3z286a5md5sm5g21pgfyg8zmhmkxr7y8"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
+  seqTools = derive2 { name="seqTools"; version="1.8.0"; sha256="18ld6syl85hsdzapgbh9dp2f5prprc64yr2yi5mwrlrsjpqzix00"; depends=[zlibbioc]; };
+  seqbias = derive2 { name="seqbias"; version="1.22.0"; sha256="094scvmbcfamblqnc0k9daxym890lff1968xg2lfwfhc92sdnwyd"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
+  seqplots = derive2 { name="seqplots"; version="1.12.0"; sha256="09l0sks7hzsjv8bha7ric1jhpn65ql4957lh7qg1hfd4pifyamvp"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; };
+  sevenbridges = derive2 { name="sevenbridges"; version="1.4.9"; sha256="1cy53v8a4bsyhf84201p5fwbyjbmr2j0c3075rj0baqxydbp4fqv"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
+  shinyMethyl = derive2 { name="shinyMethyl"; version="1.10.0"; sha256="0i6gjg3kjafx7pf9jkmnka33zma2ifg7kl4m71ii4a3zafy384r7"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
+  shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.12.0"; sha256="1nay7lw325v0gfgnalypyw8dl8i5nc5dwfm3x7gk3cpz2k9f1n0f"; depends=[mixtools rTANDEM shiny xtable]; };
+  sigPathway = derive2 { name="sigPathway"; version="1.42.0"; sha256="0bk2gnsli8gnw70qmsic1244h0fpy10xv8i5nns70m9hh600rssc"; depends=[]; };
+  sigaR = derive2 { name="sigaR"; version="1.22.0"; sha256="1akjzr8h429ag2sys8kka3adrfx1b2145ag7anxyl125h2dfqh97"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; };
+  siggenes = derive2 { name="siggenes"; version="1.48.0"; sha256="1djhghhh4rgjwrfprj376zy77pw1h52j4g5v3jz58xy47a346ila"; depends=[Biobase multtest]; };
+  sights = derive2 { name="sights"; version="1.0.0"; sha256="0j5gcpmv6g1b29a93sgmlrzvypfflk035rhbz578cl5ps9iqgbxy"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
+  signeR = derive2 { name="signeR"; version="1.0.1"; sha256="05mqk99c8clv1vak4f1w6q928g49lfmlmlq4v46yfrqjkrq1acll"; depends=[BiocGenerics Biostrings BSgenome class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
+  sigsquared = derive2 { name="sigsquared"; version="1.6.0"; sha256="12dqrf4ffcaigrrk9rl7d66m7fk1fiinmqrjffl80viyknjvz710"; depends=[Biobase survival]; };
+  similaRpeak = derive2 { name="similaRpeak"; version="1.6.0"; sha256="11apli0ak9givkw2r9185ckkn7zp7sjq01fvhpv3szlpli5kczkm"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; };
+  simpleaffy = derive2 { name="simpleaffy"; version="2.50.0"; sha256="1gv6843dy1dzli1cvg5pl39kk8kg0cbcj4qcz4kc20n6zq6dx88q"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
+  simulatorZ = derive2 { name="simulatorZ"; version="1.8.0"; sha256="0kw54dw4sfyxns3b78n116rxxl7yfqlaslbvmiksbqj1a2gnsifk"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
+  sincell = derive2 { name="sincell"; version="1.6.0"; sha256="0hpzrigp6hppamffv0l9fn3xn187dyfbwx91az7hav04lc4slymv"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
+  sizepower = derive2 { name="sizepower"; version="1.44.0"; sha256="0f8gaj0l47pcamml9wbzfrrv51cpclj91cqig6pyigjwqcxahi29"; depends=[]; };
+  skewr = derive2 { name="skewr"; version="1.6.0"; sha256="1xk7vf8m90bshk3179ndis672rnvvl15p00dsfh9y4kvxz2skr4q"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
+  snapCGH = derive2 { name="snapCGH"; version="1.44.0"; sha256="02dkhid7cz9lxffpnrh5d88iyvv6g23yrr14w3vpa189l6n8qvff"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
+  snm = derive2 { name="snm"; version="1.22.0"; sha256="01rwb8z9wbf4zw5kh7mnxj9add4r1a3fldvb5n0rir0wyr6snqg5"; depends=[corpcor lme4]; };
+  snpStats = derive2 { name="snpStats"; version="1.24.0"; sha256="1hkgjd12cz6rfm7w51dgc7cxvrsrqgc2byfinbp0d42rnc3600n2"; depends=[BiocGenerics Matrix survival zlibbioc]; };
+  soGGi = derive2 { name="soGGi"; version="1.6.1"; sha256="03bdclygsbvahgx6klmmp3bzcq70kjicrwxjbc6gmpi9gqsyf6nd"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  specL = derive2 { name="specL"; version="1.8.0"; sha256="07yp81v8ypbysfj881j97cl0qwsxy0yryyzr07by382iys9hdy4c"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
+  spikeLI = derive2 { name="spikeLI"; version="2.34.0"; sha256="1qaqf4f8vpnrdriz6pplbzjl2vjfhwqgrm528p3m9w48d3s1ccyy"; depends=[]; };
+  spkTools = derive2 { name="spkTools"; version="1.30.0"; sha256="0fwz77q5xqddhxilbcrv5aq5bhw4i15b0m4bw3dsmw26m0xlwsrq"; depends=[Biobase gtools RColorBrewer]; };
+  spliceR = derive2 { name="spliceR"; version="1.16.0"; sha256="1h4bbn20cfq5ml0rdy0gn5z4bqf82v6nd3y2zylni29f2gp1j3za"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
+  spliceSites = derive2 { name="spliceSites"; version="1.22.1"; sha256="1fc4h0ssd0kapgmjfksf0k6zpn5z6gkfvmacgap1nqm8s4y3912z"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
+  splicegear = derive2 { name="splicegear"; version="1.46.0"; sha256="0c8h9z525qv32d60q24x9crm1aqm511fr2c9ihwq5q7wx3wzi7bq"; depends=[annotate Biobase XML]; };
+  splineTimeR = derive2 { name="splineTimeR"; version="1.2.0"; sha256="0wv0k4x6c3m2km0qkgsmb2rr1pj3mdzacqafvg3y8f8996nn4k7s"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
+  splots = derive2 { name="splots"; version="1.40.0"; sha256="1qby74smkq6v8lmknsinfmp4qphmndfbs9b8828h68x02j2cmp06"; depends=[RColorBrewer]; };
+  spotSegmentation = derive2 { name="spotSegmentation"; version="1.48.0"; sha256="1ia6nmhllvw19hfp7zw41n43wclmzgirbcm274l1d85nqxq0a277"; depends=[mclust]; };
+  sscore = derive2 { name="sscore"; version="1.46.0"; sha256="0s6pd5m18m90fgsaqcjwq6py886z257xz6b3xyg5zr3hqy0nzy9j"; depends=[affy affyio]; };
+  sscu = derive2 { name="sscu"; version="2.2.0"; sha256="1rhijb4wyahvjfpsz5kkmw1rxc8qj9w1f5imkzb5p59n4cj094b0"; depends=[BiocGenerics Biostrings seqinr]; };
+  ssize = derive2 { name="ssize"; version="1.48.0"; sha256="1nj2nhxf85qbpx43j2ymb25wnhd6anw3a2dgxhi3bjpx6qlngnhs"; depends=[gdata xtable]; };
+  ssviz = derive2 { name="ssviz"; version="1.8.0"; sha256="1lpf941whhmksw8y8ingaqp17687f3xkgs5rimq65px8bfpa7apq"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
+  staRank = derive2 { name="staRank"; version="1.16.0"; sha256="1rx4khhj24rdkx2zf5zlgx5avkpgx3qpg0ly815gbdrv7j7imx0f"; depends=[cellHTS2]; };
+  statTarget = derive2 { name="statTarget"; version="1.4.12"; sha256="0i4dq5563fkcryax1n5mhdir9w6bq72xxx2c5alb4si892c14ygr"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr pROC randomForest rrcov]; };
+  stepNorm = derive2 { name="stepNorm"; version="1.46.0"; sha256="0ns0abii8h6dxd44n9hdh7ww11mwb9izcpawxg2vwdqj5wv342qg"; depends=[marray MASS]; };
+  stepwiseCM = derive2 { name="stepwiseCM"; version="1.20.0"; sha256="0fyf4n76r8p53byapfb0fjp7dyxsy3gh2d7f4sl81hsa69zz703g"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
+  subSeq = derive2 { name="subSeq"; version="1.4.0"; sha256="0ly7qcghf9979qmxjvd3ihs7wqys1r45x459jp3sl3skf3cnlz9m"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
+  supraHex = derive2 { name="supraHex"; version="1.12.0"; sha256="05jaqr98rwy02wzppbb2q77yw7yjkz7h6wd74mhd3v8dk4h7963g"; depends=[ape hexbin MASS]; };
+  survcomp = derive2 { name="survcomp"; version="1.24.0"; sha256="03232xxda6w9cxj7q84bdqjiza7y36kxk6l9n1nqawmy2kayc3kn"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+  sva = derive2 { name="sva"; version="3.22.0"; sha256="1wc1fjm6dzlsqqagm43y57w8jh8nsh0r0m8z1p6ximcb5gxqh7hn"; depends=[genefilter mgcv]; };
+  switchBox = derive2 { name="switchBox"; version="1.10.0"; sha256="1avzqy2iqfzb0f6d03bhjr6fr835mwy3isga96fgxnyyca8cf81r"; depends=[gplots pROC]; };
+  switchde = derive2 { name="switchde"; version="1.0.0"; sha256="0335xxl5g3xi6g9qhhhgm6qhaqpv2dqs1579c9agz05hm5fm3r1c"; depends=[Biobase dplyr ggplot2]; };
+  synapter = derive2 { name="synapter"; version="1.16.0"; sha256="0bqldlj2fq55nlsbx0d59i8rcsja9sapx34jgm8vfrch8qng9srv"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
+  synergyfinder = derive2 { name="synergyfinder"; version="1.0.0"; sha256="09vznrqz6f9db9wxralg3sb8jx8wra1d1lw5z8ywm8xfsc6jjs4s"; depends=[drc ggplot2 gplots gridBase kriging lattice nleqslv reshape2]; };
+  synlet = derive2 { name="synlet"; version="1.4.0"; sha256="18sik8k7j72sd2ix6k1qvcx44njf6rbbrj8bp6y60nzbc4z7psfk"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
+  systemPipeR = derive2 { name="systemPipeR"; version="1.8.1"; sha256="0hyi841w8fm2yzpm6lwqi3jz5kc8ny8dy5p29dxynzaw5bpjw56d"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+  tRanslatome = derive2 { name="tRanslatome"; version="1.12.0"; sha256="0jypkql5fklqsr79hzj2fvkzkam1gxrjhkhfqjpws53bvy1f6d55"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
+  ternarynet = derive2 { name="ternarynet"; version="1.18.0"; sha256="14dj124wp0q5cdhmy7ywdvrzs2dpv2gwhwqmzbqazljmmjc49mzk"; depends=[igraph]; };
+  tigre = derive2 { name="tigre"; version="1.28.1"; sha256="0imsxpk0v9vwai48hmd3ndaki5z9v3yim0a3kmx3y1aym71wx68c"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
+  tilingArray = derive2 { name="tilingArray"; version="1.52.0"; sha256="1h1bgkc2smlxrivsqv5k92ynlcwf7gzpjlzsgaimcjvrzd6rvxcp"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
+  timecourse = derive2 { name="timecourse"; version="1.46.0"; sha256="0m8jlair0bzv0rw52ydv5r1bjnkdq3vxaavhbrpaqynx31lc9hqk"; depends=[Biobase limma marray MASS]; };
+  tkWidgets = derive2 { name="tkWidgets"; version="1.52.0"; sha256="1iazw1dc0xr0vdm9vlxy0awlxmdjsvc1l0g9zrqr9h1mldpi1p5x"; depends=[DynDoc widgetTools]; };
+  tofsims = derive2 { name="tofsims"; version="1.2.0"; sha256="0msmpix09ypq9gn4gh0z15caap1736zqzzda3zp8pnbjvj45jvv6"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
+  topGO = derive2 { name="topGO"; version="2.26.0"; sha256="0j6sgvam4lk9348ag6pypcbkv93x4fk0di8ivhr23mz2s2yqzwrx"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
+  trackViewer = derive2 { name="trackViewer"; version="1.10.2"; sha256="0a54xl7g8p6nzw6zyxchb4qinbzpfl6d7g12080lnjvkcf8dm2pj"; depends=[AnnotationDbi GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz IRanges pbapply Rsamtools rtracklayer S4Vectors scales]; };
+  tracktables = derive2 { name="tracktables"; version="1.8.1"; sha256="0px4lhnz6nswih0fwqhqa37wl8j4pc33jyl2yrvi8dhfky3n4pn4"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
+  transcriptR = derive2 { name="transcriptR"; version="1.2.0"; sha256="0ny0qnwrzd9xyhjdkb6cigdsk4k0db3qivkma553zifrwrd41ja9"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
+  traseR = derive2 { name="traseR"; version="1.4.0"; sha256="03c33z1832rxq2h7hi69ya07708264v57h4f5xn29c0xmgd9zz7j"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
+  triform = derive2 { name="triform"; version="1.16.0"; sha256="18s80s90bfjz5nnm3xh0x1h2px5cq3la1x4vir1g3bgbqgmmfrrm"; depends=[BiocGenerics IRanges yaml]; };
+  trigger = derive2 { name="trigger"; version="1.20.0"; sha256="1yg6vcsqccfdd6im5xfa7m5zcm2l1iyd46bj4zfc4fjwbgqw833p"; depends=[corpcor qtl qvalue sva]; };
+  trio = derive2 { name="trio"; version="3.12.0"; sha256="1wdjapmj8wxgjg6c201jx14c1gakgr79x8xdszw8kwpnb5ih9byn"; depends=[]; };
+  triplex = derive2 { name="triplex"; version="1.14.0"; sha256="0bxxs37iia281k4y94bs0n356xpfw9wvxzzwj8pyqp2gdw876yhj"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
+  tspair = derive2 { name="tspair"; version="1.32.0"; sha256="1vicp69g5ykvqxpp00rgmnvgg87ra40wyvlnb9gj3xy3g9ixqj8g"; depends=[Biobase]; };
+  tweeDEseq = derive2 { name="tweeDEseq"; version="1.20.0"; sha256="0n6g74088ikbnfzzmiq60r3l51rch51krc05zzjg2vw1gx5zschn"; depends=[cqn edgeR limma MASS]; };
+  twilight = derive2 { name="twilight"; version="1.50.0"; sha256="0d84xcvpr7y1c6mr4z9dnp2bck52dzw7xbf99dwmj20vxq9d424r"; depends=[Biobase]; };
+  tximport = derive2 { name="tximport"; version="1.2.0"; sha256="1k5a7dad6zqg936s17f6cmwgqp11x24z9zhxndsgwbscgpyhpcb0"; depends=[]; };
+  uSORT = derive2 { name="uSORT"; version="1.0.0"; sha256="14bb5sfl0fwmg1g214dqk4i3daqxay0jkcw7a3wlh6a61dcrcfbl"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; };
+  unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.10.0"; sha256="108rrifxbk9g06ssfa4jx73j6r0r5d1xaagk071c6zi4a09pa3hh"; depends=[BiocGenerics HTqPCR]; };
+  variancePartition = derive2 { name="variancePartition"; version="1.4.2"; sha256="0iidrw8pcrd6c7z5sdff163108q493im8csikl1ahiyz1dxwfhw8"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; };
+  vbmp = derive2 { name="vbmp"; version="1.42.0"; sha256="0dqk8lgnib6if2j4j03zl59yc1g97457ib97ayycws9l56amf135"; depends=[]; };
+  viper = derive2 { name="viper"; version="1.8.0"; sha256="1wnaqfm6lds9qb6dqqrv8k8asbvgfimnkg4q7czv9bk30b9820i5"; depends=[Biobase e1071 KernSmooth mixtools]; };
+  vsn = derive2 { name="vsn"; version="3.42.3"; sha256="0mgl0azys2g90simf8wx6jdwd7gyg3m4pf12n6w6507jixm2cg97"; depends=[affy Biobase ggplot2 lattice limma]; };
+  vtpnet = derive2 { name="vtpnet"; version="0.14.0"; sha256="0w52411h0w3bidgcqxanw8f4j2053iff2dfc3qzaiaxj6gfcbf4p"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
+  wateRmelon = derive2 { name="wateRmelon"; version="1.18.0"; sha256="1jl8h5xdppnvb8zfj103858dh6lr9w20r64y769wg1kpd3zxvxfw"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
+  wavClusteR = derive2 { name="wavClusteR"; version="2.8.0"; sha256="013931vz9xz12vz27i15lr63sgmc95krqkx9kz0nsmfs458c6qfz"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
+  waveTiling = derive2 { name="waveTiling"; version="1.16.0"; sha256="0234jqsc1q2na8x0cnfc8lm52hyqakmp0bc377d6cfgzcdp7racg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
+  weaver = derive2 { name="weaver"; version="1.40.0"; sha256="0zvhiasy3s428xy0n0fk0601dbs7fgwpqmp90fbq26aj4gfxy5vg"; depends=[codetools digest]; };
+  webbioc = derive2 { name="webbioc"; version="1.46.0"; sha256="0alxpikfnfhsfjkkj8cz27x661r8gwvwvxnzndvzbw5smnyklac5"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
+  widgetTools = derive2 { name="widgetTools"; version="1.52.0"; sha256="1jj18mkaq8fc5zdaf1l1vvs9barx9b5wp0qa8rvx3j6zacdlbw2r"; depends=[]; };
+  xcms = derive2 { name="xcms"; version="1.50.1"; sha256="0gr59vn52cmpsqlbqlr55a6rfwq0sk2gqnba1fhyfjd22cbghxm8"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; };
+  xmapbridge = derive2 { name="xmapbridge"; version="1.32.0"; sha256="02fm6sy5ynq450pkcf1zlwj2ih6f48pishmhia2d5is5iy22acbh"; depends=[]; };
+  xps = derive2 { name="xps"; version="1.34.0"; sha256="1hrprdnqyy7rrvrzsnm9sy75q31zgxy134v4zbivya8f30dap4x8"; depends=[]; };
+  yamss = derive2 { name="yamss"; version="1.0.4"; sha256="0dirg1nl2bp1xr0m10yzckhwynxl6p6jmvb5s5b03g66m4a7i72p"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
+  yaqcaffy = derive2 { name="yaqcaffy"; version="1.34.0"; sha256="0wv52qnds4ni2a1p7m54ihdwiqxzdyvq0fb5dzjcq41abnkpiqsi"; depends=[simpleaffy]; };
+  yarn = derive2 { name="yarn"; version="1.0.1"; sha256="1ra8b711inispl3in1ajjwkyxax6w9w5nb9w47iacyk7kp6vi3a3"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
+  zlibbioc = derive2 { name="zlibbioc"; version="1.20.0"; sha256="0hbk90q5hl0fycfvy5nxxa4hxgglag9lzp7i0fg849bqygg5nbyq"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index a19aa0f51a2..756aced3176 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,11 +4,11 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2017-03-03"; };
+let derive2 = derive { snapshot = "2017-04-20"; };
 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=[]; };
-  ABCanalysis = derive2 { name="ABCanalysis"; version="1.1.2"; sha256="1z7m8j6zqai7kg5b00wmv7hjndpb29s6819bshwrqc7z0vz71491"; depends=[plotrix]; };
+  ABCanalysis = derive2 { name="ABCanalysis"; version="1.2.1"; sha256="0wac1ksmnxa36v99ca4hv8k0rsh3igwpcllmlv9wf7i9kgqviqwi"; depends=[plotrix]; };
   ABCoptim = derive2 { name="ABCoptim"; version="0.14.0"; sha256="0nqnflidknwxj4bzql486cs4fi51iwyw73b5sdf26s705hkknhj0"; depends=[Rcpp]; };
   ABCp2 = derive2 { name="ABCp2"; version="1.2"; sha256="1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx"; depends=[MASS]; };
   ABHgenotypeR = derive2 { name="ABHgenotypeR"; version="1.0.1"; sha256="08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l"; depends=[ggplot2 reshape2]; };
@@ -17,6 +17,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.7.1"; sha256="1h0lfzz3ydkr8idbsqhddcwsc0q7rschgypf4vb4v62f636fxw9b"; depends=[BH MASS Rcpp RcppArmadillo]; };
+  ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.4"; sha256="02hc33g35x59jn9skcspgam1qskjvwy5djrg2djl9qmwq4aj0j9k"; 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]; };
@@ -37,26 +38,27 @@ in with self; {
   AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-0"; sha256="0zksb2qxb1q054kwg4acp94hxqiasd0yw1bkllp2r38640bvlj3b"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
   AID = derive2 { name="AID"; version="1.7"; sha256="0c0057rp10aav41z7ilppbv8gsqf8ik2srygr5wx95b7hl1a4cvb"; depends=[MASS nortest tseries]; };
-  AIG = derive2 { name="AIG"; version="0.1.1"; sha256="0llsfx6nfkhz37vdqd1mjbv0sh3v2q9drk7dml5qzdxkqxbbcyi6"; depends=[dplyr mgcv]; };
+  AIG = derive2 { name="AIG"; version="0.1.3"; sha256="1wm22kf0vpvki0p4gixx4aavij2r2ns4pjv5kidfj12z1r4yc7y5"; depends=[dplyr magrittr mgcv rgl]; };
   AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
   ALA4R = derive2 { name="ALA4R"; version="1.5.6"; sha256="0fj5y6z179glhc2jj3ksd5w29xmlqm71n23hp1vynrza70fz0gna"; depends=[assertthat digest httr jsonlite plyr RCurl sp stringr wellknown]; };
   ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; };
   ALKr = derive2 { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
   ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
   ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
-  ALSM = derive2 { name="ALSM"; version="0.1.9"; sha256="11lj493wpf2hkk6cim93qad9ikqq1ni5i65xbpzj1qwq8zv7bdzk"; depends=[car leaps SuppDists]; };
+  ALSM = derive2 { name="ALSM"; version="0.2.0"; sha256="1g7zk8q462j4faq5wzzghkjc003ny6rj8hrymsgvh3fg3a72lvy3"; depends=[car leaps SuppDists]; };
   ALTopt = derive2 { name="ALTopt"; version="0.1.1"; sha256="0frpnycnljz6r24cg4z99ivm3rbg9j1nxfkhw18vbrb7gcl1hqj6"; depends=[cubature lattice]; };
   AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
   AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; };
+  AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; };
   AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
   AMModels = derive2 { name="AMModels"; version="0.1.2"; sha256="0503vwagrlg14f8n15p7jsz25mvmjinr1cyns24hpp4y2fgbc56s"; 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=[]; };
   ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; };
-  ANOM = derive2 { name="ANOM"; version="0.4.3"; sha256="0ayz5jl7pkz07n0dv4q99n3b47dwxj2ry6x4zc5xz5mgs5pgv2nl"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
+  ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   APSIM = derive2 { name="APSIM"; version="0.9.1"; sha256="0ws9zl2c5m58j0rpbhkpd1rs0pasd4fazd25xw7b3s9b738clfwa"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
-  APfun = derive2 { name="APfun"; version="0.1.0"; sha256="0iq008pq7drkl3d1m5qrhpqmmpvzxcbknax57lfzh5nxk657zx03"; depends=[]; };
+  APfun = derive2 { name="APfun"; version="0.1.1"; sha256="0vb5lmyq8wnwnxikhslaqxd65rs2pv0k3l5bghdzj6s0hp1j6kxp"; depends=[raster rgdal]; };
   APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; };
   AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
   ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; };
@@ -77,9 +79,10 @@ in with self; {
   AWR = derive2 { name="AWR"; version="1.11.89"; sha256="0mg48720ny2a28yfwqx5p4r7g7rbjbzzgbkd2m31hfyz4vnrsr4v"; depends=[rJava]; };
   AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; };
   AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
-  AbSim = derive2 { name="AbSim"; version="0.1"; sha256="0z3ghz0wmf2z4s2mnadiacir5frzlw77gca8fkvdh8rv5pwyy38c"; depends=[ape poweRlaw]; };
+  AbSim = derive2 { name="AbSim"; version="0.2.1"; sha256="1xm257dml73zjka5cs7z6yrff05xk1ab68f5xc4yqb8kkymimbrp"; depends=[ape poweRlaw]; };
   AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5"; sha256="0071llj6xqsj495nlnvhzsqbrvls7fs3xscng537332xinmfhwdr"; depends=[DESeq limma Rcpp RcppArmadillo]; };
   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]; };
   Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; };
   ActuDistns = derive2 { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; };
@@ -87,7 +90,7 @@ in with self; {
   AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; };
   AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; };
   AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.62"; sha256="0cxl58by9mfd6hf4hb2d5qnm0pgb0gplgg7mm0qhvckvghjpb00q"; depends=[MASS mgcv nlme SemiPar]; };
-  AdaptGauss = derive2 { name="AdaptGauss"; version="1.2.4"; sha256="0idqh1g4aypak1hm04vz2p3yklw6gbryjgm735gl46bzhlzlyyfv"; depends=[caTools ggplot2 mclust shiny]; };
+  AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; };
   AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; };
   AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; };
   AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; };
@@ -118,12 +121,13 @@ in with self; {
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
   AnthropMMD = derive2 { name="AnthropMMD"; version="1.0.1"; sha256="1zb5qxmnbp2ha7hsnb4cvlc6n83gimwsq2g5pwkg7yqi5xgcp1ff"; depends=[tcltk2]; };
   Anthropometry = derive2 { name="Anthropometry"; version="1.7"; sha256="09bmd7gvkxm2jvcjzz0dqj5frr07fzb3r4qzih404zynrg859r9s"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
-  ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.0"; sha256="04p1h2iahy6x65rdlrzcp18126dikrl2mapvrmh6jlwsg19b9sjc"; depends=[doParallel foreach stringr]; };
+  ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; };
   AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
   AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; };
   ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; };
+  ArCo = derive2 { name="ArCo"; version="0.1-2"; sha256="1p6vz6kqdx81j0d37scfwhpz7bf0xhij01nk3aj3a5wmbg96iv25"; depends=[boot glmnet Matrix]; };
   ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
-  ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.0"; sha256="0q0j08ih9isd91wkm39x887fjb01481g9d7i5086zs5jyahlfdkw"; depends=[coda hdrcde shiny shinythemes]; };
+  ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.1"; sha256="0i64mhyz48advljdvgyf6fvj523wf5f3kfy6zdbrwcyv0ffqln6q"; depends=[coda dplyr DT ggplot2 ggthemes hdrcde readr shiny shinythemes]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
@@ -148,18 +152,19 @@ in with self; {
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
   BAMBI = derive2 { name="BAMBI"; version="1.1.0"; sha256="1578iifmjzlhxvgih8l5va07w6zk8d6li7j1w91033lfpzivahr0"; depends=[label_switching Rcpp RcppArmadillo]; };
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
-  BANFF = derive2 { name="BANFF"; version="1.1"; sha256="1jzmrw170577xl6zliyf53862gk1gkpx4dhb6jyqxmipkn56b8la"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; };
+  BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; };
   BANOVA = derive2 { name="BANOVA"; version="0.8"; sha256="0kjmhb1y3vkm8yw4z5fqmr1ripblk82svg2ik15ml2xnriwgdpwp"; depends=[coda rjags runjags]; };
-  BAS = derive2 { name="BAS"; version="1.4.3"; sha256="1ix277flarxp5xk3w3r715i1y30bx2d49c73s1xhjrwjlpj6jj74"; depends=[]; };
+  BART = derive2 { name="BART"; version="1.1"; sha256="0cys62j10s7qg7qc0ciak4654j7n48sf67nmppdwaavga309g46d"; depends=[Rcpp survival]; };
+  BAS = derive2 { name="BAS"; version="1.4.5"; sha256="0ivi39yklnqdg6108w8k3wx9yw2nfcppiwn3mymh1vsdwv9ykaky"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-  BASS = derive2 { name="BASS"; version="0.2.0"; sha256="1sgz4clzbrbhj845nf1bbv16ww2j72vfvmb7n8hhnpv84r5q5dm9"; depends=[]; };
+  BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
   BAT = derive2 { name="BAT"; version="1.5.5"; sha256="1kgrc2crj834qlnac2kb18pp3dfpryhsrh4l84jpm561kk3wzcqb"; depends=[nls2 raster spatstat vegan]; };
   BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
   BB = derive2 { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
   BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; };
   BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
   BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; };
-  BBmisc = derive2 { name="BBmisc"; version="1.10"; sha256="0cw2mhw7qhdrx91zzd5iwyh7ch9fy4wxga8j63731q6sxr1airjl"; depends=[checkmate]; };
+  BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; };
   BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; };
   BCBCSF = derive2 { name="BCBCSF"; version="1.0-1"; sha256="0hvhnra68i0x78n57nlbxmz0qwl2flng9w47089jw6f9hzkq9r7n"; depends=[abind]; };
   BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; };
@@ -169,23 +174,23 @@ in with self; {
   BCEE = derive2 { name="BCEE"; version="1.1"; sha256="0pssqmjj13wjbkq8ls5r9zr08by24q0k9g4f1aysgxds2a4dawd1"; depends=[BMA]; };
   BCEs0 = derive2 { name="BCEs0"; version="1.1-1"; sha256="1ipg8xliqnpfa4ga9r0gqf5sfa9gass4hvrlgxazs5hb18fpsl91"; depends=[]; };
   BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
-  BCSub = derive2 { name="BCSub"; version="0.3"; sha256="0ap3mj6dm71xrx9aygnhmhkiyga0ln7xcg863da27yw2a74fdjxk"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
-  BCellMA = derive2 { name="BCellMA"; version="0.3.2"; sha256="10n2z8p8m7np0d3v3w7ig2hmi9lxf59fiwib27zxz5xzdkdf61af"; depends=[ggplot2 reshape2]; };
+  BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
+  BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.33"; sha256="1l59dk9ml40yhl71xxv0agxhiljabv15dr9gpzfdsxjbnjgk6mqi"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.35"; sha256="03n6wyiv0cib5kxds2j6wyp1kqlwq9pjyxyf60yk4148yc4b7l6l"; depends=[igraph Matrix]; };
   BEACH = derive2 { name="BEACH"; version="1.1.2"; sha256="10533ac575mcw9mv1lf3dgjjaf1hgzv3yn7ys9qi6b2k5fynhsg0"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat SASxport shiny WriteXLS xtable]; };
   BEANSP = derive2 { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="1.3.0"; sha256="0i8g9kc8vq79mbzds7s5c10kvbx3bw6c964jx33cga2z788wcv4s"; depends=[BH Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
   BEST = derive2 { name="BEST"; version="0.4.0"; sha256="1clch2271x9r5frgpis31b13jjgp4sdxd75s44chcislyzlinrlp"; depends=[coda jagsUI]; };
-  BETS = derive2 { name="BETS"; version="0.0.98"; sha256="0snw5vw0qxllfinjzqwgkyyfavzqx5kay1xx3xqjd3w8ncj1vqs5"; depends=[colorspace dygraphs FinTS forecast foreign fpp fracdiff ggplot2 grnn gtable htmlwidgets lmtest mFilter normtest plotly quadprog Rcpp rmarkdown rootSolve rugarch scales seasonal sqldf stringi stringr testthat timeDate TSA tseries TTR urca viridis zoo]; };
+  BETS = derive2 { name="BETS"; version="0.2.0"; sha256="0jw893k06wkzl4qk5mzpxhbg52f29pzg53kjg79kaknsiqbxi1m1"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn miniUI plotly RCurl rmarkdown RMySQL rstudioapi seasonal shiny sqldf stringr urca webshot zoo]; };
   BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; };
   BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
   BH = derive2 { name="BH"; version="1.62.0-1"; sha256="01vfdpfznd4ynqql33z238xr262mvy3i80lyi8l3a3p3hi0a262p"; depends=[]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
-  BIEN = derive2 { name="BIEN"; version="1.0.0"; sha256="1yzn7inxc471pnk8b1c6q3s07r8j400dhmplnk7nbbgfbagqi987"; depends=[ape DBI maptools rgdal rgeos RPostgreSQL sp]; };
+  BIEN = derive2 { name="BIEN"; version="1.1.0"; sha256="1n6a1si3llaqm69nvh348dnvaf05g1kcklwvrys7nnr3kr3adslr"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.13-24"; sha256="03p4k067s5wl7i9qy1iym9ndq4977a42nbbcac40akvibqpzhgdy"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="1.5.5"; sha256="1blqaxhx9ffa036zcz30kmkhh58l0ybmyrb2sb947f2i13h7qsk0"; depends=[haplo_stats XML]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
@@ -194,8 +199,11 @@ in with self; {
   BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
   BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
+  BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
+  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.2"; sha256="1l4qhxj4lj6p80p85nl7ld0ynq5qlq4afibza1spy7j80av2isy6"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
   BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
   BMA = derive2 { name="BMA"; version="3.18.6"; sha256="1yx54miy5vn8rb5aynsjsfjxkblq0n1k86h1iyr14rf4q9sd3phi"; 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=[]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
@@ -220,14 +228,14 @@ in with self; {
   BTSPAS = derive2 { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; };
   BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; };
   BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
-  BUCSS = derive2 { name="BUCSS"; version="0.0.1"; sha256="1in3y2z9maqd10fma67v8skpngsifr5cm9wsnfii0iflibs4ljbq"; depends=[]; };
+  BUCSS = derive2 { name="BUCSS"; version="0.0.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
-  BWStest = derive2 { name="BWStest"; version="0.2.0"; sha256="1fv4jv2fr740a1f8p6wild6szb03j8vm59y12nl4cl4aa6wn40rz"; depends=[memoise Rcpp]; };
+  BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
   BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; };
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
-  BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.1.7"; sha256="06bvx2f094r4rkzpv517h81pjg211k7ajfcq0k3lxdar7ck1388a"; depends=[foreach iterators R6 RColorBrewer rTensor]; };
+  BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.1"; sha256="0qqq7f2s9jqr85xvab9d4pma4aknlfigh4vgm445bwamb6x8ms2n"; depends=[foreach iterators R6 RColorBrewer rTensor]; };
   BacArena = derive2 { name="BacArena"; version="1.5.1"; sha256="03rk0b1dbyzhwdfj3q4a91hwhzng76fshnbnbyfblmnnnsfk4v9g"; depends=[deSolve ggplot2 glpkAPI igraph Matrix Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; };
   Bagidis = derive2 { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; };
   BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; };
@@ -238,6 +246,7 @@ in with self; {
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; };
   BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="1.1"; sha256="1njivlrn3wyr5frwqd9d152y0xlvh6d38p9i1p87bnpjpzcc7iyv"; depends=[curl quantmod rvest stringr]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; };
+  BatchMap = derive2 { name="BatchMap"; version="1.0.1.0"; sha256="1kwx28vbzhnglyjxrny4dky89sabvnapsywsjvnayw4plfa6igy5"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
   BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; };
   BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
@@ -274,7 +283,7 @@ in with self; {
   BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
   BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.1"; sha256="1vclgdqqldkwhiilv44ihflbadllna5hvggbjbpz0r3365alnmq6"; depends=[bnlearn d3heatmap lattice networkD3 rhandsontable shiny shinydashboard]; };
-  BayesianTools = derive2 { name="BayesianTools"; version="0.1.0"; sha256="195y5jwbdmi9m4vbxmcc3yw8gx2ay2vgwxsa29yb3sy542wiy0ii"; depends=[coda ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp vioplot]; };
+  BayesianTools = derive2 { name="BayesianTools"; version="0.1.1"; sha256="1x5f2lgby8qpdiv6d843a6rhmfdm3vd60gii07r09lv3f494bq76"; depends=[coda ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp vioplot]; };
   Bayesianbetareg = derive2 { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; };
   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=[]; };
@@ -283,7 +292,7 @@ in with self; {
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
   Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
-  Bergm = derive2 { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
+  Bergm = derive2 { name="Bergm"; version="4.0.0"; sha256="1iw9k9v540bnrjqqq9hvpjh8g4cr53sli31ldw4k1savzq0jirdf"; depends=[coda ergm MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
   BeviMed = derive2 { name="BeviMed"; version="4.0"; sha256="16hwjs3kv1f49la2p5qlywc02n9g7g7qzb5v4m7p2mmi0p2ybmvm"; depends=[Rcpp]; };
@@ -296,24 +305,26 @@ in with self; {
   BigQuic = derive2 { name="BigQuic"; version="1.1-7"; sha256="1bhi9dilrprgjvqyc2hb4a0y8rm9la0m5lgry9mf184p56z1syzb"; depends=[Matrix Rcpp scalreg]; };
   BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; };
   BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
-  BigVAR = derive2 { name="BigVAR"; version="1.0.1"; sha256="1hsx6fl3zjxfhjr18h2gbhgh0zzh9mdmr3zh0jnbfk8wv3y1nhxv"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
+  BigVAR = derive2 { name="BigVAR"; version="1.0.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
   BinNonNor = derive2 { name="BinNonNor"; version="1.3"; sha256="0lxhfys066wz8svr9mjb28rd85lhjicqw4py4j96w9zgi974ha51"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.1"; sha256="14b90y40wzqwaf1v1l92s17j0kggbcsg5c90l1r7wi3j4xcl20pc"; depends=[corpcor Matrix mvtnorm psych]; };
-  BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.2"; sha256="196mn1ldbj4ngrrvr3d8aqwdjcprpjh0z66655vbzqb9m3nj893l"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
+  BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.3"; sha256="18cks0hh6a49jr1yq0pwgw3scy1b7cl2060miwxswpwry9lcnnn5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
   Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
   BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.0"; sha256="08w5zcyrfz55x86nwpb4k0w0lpk1ncirjp30p46421w0xz8swk10"; depends=[expm Formula lmtest numDeriv]; };
   BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; };
   BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
+  BioInstaller = derive2 { name="BioInstaller"; version="0.0.3"; sha256="0fk9ix0iaaw1wsvfkh5zz9yjf740976akpanx7qdbzwhjn08r36x"; depends=[configr futile_logger git2r R_utils RCurl stringr]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; };
   BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
   BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
-  Biocomb = derive2 { name="Biocomb"; version="0.2"; sha256="1igav8l1s4byannhkdm5fznqrga6cv9ws1lxyam221h8cl3qz8aw"; depends=[arules class discretization e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
+  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.8-0"; sha256="0jfnwa7abwrharlwv9v9fdb5dq3mb74wjsc3ak9lp00s8nlj7jl0"; depends=[Rcmdr vegan]; };
   Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-1"; sha256="1fnx9fcybw8agc2zba61lk4ygq8qi3b747i5cnh1b3vh6dw5fapq"; depends=[classInt fields raster sp spatstat]; };
+  BisRNA = derive2 { name="BisRNA"; version="0.2.1"; sha256="1sjx53lkdhiygr2w7drs9c47hnmv2s232bsd96d6k2xn6yai593i"; depends=[knitr MASS]; };
   BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; };
   BivUnifBin = derive2 { name="BivUnifBin"; version="1.1"; sha256="0dxkk3pjnbjx04r9870lcr3hl4r5j7cd3y1fn800fz0qjnv5dahd"; depends=[BinOrdNonNor rootSolve]; };
   BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
@@ -325,13 +336,13 @@ in with self; {
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
   BoSSA = derive2 { name="BoSSA"; version="2.0"; sha256="1cj2k8ra26mnnvn3gqwl3z6qr9sy63rnszgb3a9y6dh4dkgk6hd2"; depends=[ape jsonlite RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
-  Bolstad = derive2 { name="Bolstad"; version="0.2-33"; sha256="1i01bfcmzpy9i3f3x0pmw2c6ff4zx4vk13isdnvkhbbks6ppm394"; depends=[mvtnorm]; };
+  Bolstad = derive2 { name="Bolstad"; version="0.2-34"; sha256="0snqy580glwpv37hvjnivb3f06hf2prqply1nj5ks5aryabiiz59"; 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]; };
   BoolNet = derive2 { name="BoolNet"; version="2.1.3"; sha256="1s64a46wfp31jsyfdg2m8269qaq7x798y2bj0dyk69di1nxx2daa"; depends=[igraph XML]; };
-  Boom = derive2 { name="Boom"; version="0.5"; sha256="1p1bgswzjply3afcgxdn67dq3gb46i9gxwm1l2v79wjpiizhagrb"; depends=[BH MASS]; };
-  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.7.0"; sha256="08xb931q3j16r4942p7r6cl4capc19nbywzg4hr7yv0fzcmpjprb"; depends=[BH Boom]; };
+  Boom = derive2 { name="Boom"; version="0.6"; sha256="1cz78f469lhf1s9hiimz992fablfwkpm0v268vj7028lp1jj6hix"; depends=[BH MASS]; };
+  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.8.0"; sha256="0zkz7jsdn3adi2frnxxpnaqss81ylj6lzhbnj88qvmvgfdxgk6ls"; depends=[BH Boom]; };
   BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; };
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
   BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
@@ -347,14 +358,14 @@ in with self; {
   BuyseTest = derive2 { name="BuyseTest"; version="1.0"; sha256="1nfj2ajah2dg1p47g2z0zf9s24sxj4dfn3nny1h4qmqwcb4vs55g"; depends=[data_table lava Rcpp RcppArmadillo snowfall survival]; };
   C50 = derive2 { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; };
-  CADStat = derive2 { name="CADStat"; version="3.0.6"; sha256="1qzy93fzzj4b0x0m9rrlh1wmv44rd9kvjw6wkdd3m3l2qbqsbzn8"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; };
+  CADStat = derive2 { name="CADStat"; version="3.0.7"; sha256="0ya1y5c6hw55prr6xargb4ndm6qi6k3q2ysj3qgr4w1bs3wa32ix"; depends=[bio_infer car gdata gmodels gtools iplots JavaGD JGR lattice lme4 MASS MatrixModels minqa nloptr pbkrtest png quantreg Rcpp rJava rpart SparseM XML]; };
   CALF = derive2 { name="CALF"; version="0.1.3"; sha256="0407k1afyaknlvhn5gx909vp4jl5n25r9jyqkhx9zqhzllrj25f2"; depends=[ggplot2]; };
   CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
   CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
   CANSIM2R = derive2 { name="CANSIM2R"; version="0.11"; sha256="12d5558b3wldla3sgwqdqwmfixcqfa8h92bq4a8ia284946vcbbf"; depends=[Hmisc reshape2]; };
   CARBayes = derive2 { name="CARBayes"; version="4.7"; sha256="0frpkq0hqxmdzv5hliyvw3g8cb26llnh9wjabqqm0sdpnzx64d37"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="2.4"; sha256="1z0w4cbs3gbll4fzcmg4vgbnx0bq15nb1c69aql4mdqm6i0zx6xr"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep truncdist]; };
+  CARBayesST = derive2 { name="CARBayesST"; version="2.5"; sha256="1rzw05qq395zymmnk54a4qkq9b9mqwwmiaac0qgqq4k2ig9l5271"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
   CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
@@ -373,7 +384,7 @@ in with self; {
   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="5.4-0"; sha256="1gbzk9iijn37njal6fq70y6hhl44zgi79yb3lwp3cxys1j2fp0kw"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="5.5-21"; sha256="15i2asnc5yyhb8rdw3h9cnapiidvpvmw1gg71dn9vy5z3d1g1g3s"; depends=[lattice MASS mvtnorm plyr polycor psych 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]; };
@@ -386,6 +397,7 @@ in with self; {
   CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
+  CHMM = derive2 { name="CHMM"; version="0.1.0"; sha256="18wpld1anws9hv1z8sgib5nvjdg1wmk4dv5s1ysh8s0rzwnq9x2p"; depends=[mclust]; };
   CHNOSZ = derive2 { name="CHNOSZ"; version="1.0.8"; sha256="03hvvkm7i2q73hkcm79136lzjn99apqmcdlfghbz0318490gxin5"; depends=[]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
   CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.1"; sha256="11cicxfvjhbrfjsczsv25xdy7pckmz1bnjx7xq5jbg3b1wbv4g28"; depends=[Matrix mvtnorm numDeriv stringr]; };
@@ -399,30 +411,34 @@ in with self; {
   CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
   CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
   CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-  CMplot = derive2 { name="CMplot"; version="3.1.4"; sha256="0ph8pqmlbm2j40dq4lqyfy43hz5s958vvqaglzmcqdvkgpv1ni0a"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.2.0"; sha256="0hrym0kadwyc36hpgskls1fhipiq1vrpyhsjzrkny10m9yny5c8i"; depends=[]; };
+  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]; };
   COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
   COCONUT = derive2 { name="COCONUT"; version="1.0.1"; sha256="1bpn1zhlbm99w8d80lp7iasi1ivvh0ndhpzh8glmnlnanm2b06ni"; depends=[]; };
   COMBAT = derive2 { name="COMBAT"; version="0.0.2"; sha256="1sda41db8h5gi7gqq0hj433dd6lh4xj75skjgmgqa3p80rndw461"; depends=[corpcor mvtnorm]; };
   COMBIA = derive2 { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
   COMMUNAL = derive2 { name="COMMUNAL"; version="1.1.0"; sha256="1fv5dlqajpsd9k99sfikj3ai4jpzz2fh4s3gfglwrajk0nzlxjg2"; depends=[cluster clValid fpc]; };
-  COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.3.5"; sha256="15w78h0kkqbisp34g4wj2mkq4c0pb2166f1m7s65iifnnd5plvb6"; depends=[]; };
+  COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.0"; sha256="09srjrav5x6hfgf0b0k1pjbr8ddkjjibzar971z5vr1m7wh4a29n"; depends=[]; };
   CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; };
-  CONS = derive2 { name="CONS"; version="0.1.0"; sha256="1pcr1pfchys4x566sa69als59vwpaa91jhl038pkj69scchv0max"; depends=[FactoMineR gWidgets pander raster readxl REdaS]; };
+  CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; };
   CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
-  CORElearn = derive2 { name="CORElearn"; version="1.48.0"; sha256="1pm2gqns1d7yxv4i5h110b6s6i6an7xnz379n1cm8rcfnlpndryz"; depends=[cluster rpart]; };
+  CORElearn = derive2 { name="CORElearn"; version="1.50.3"; sha256="0pa8jlvqgkdw3r5k6wlalq6xnqqc75gg2hzmc7s0qy57wjx450jw"; depends=[cluster rpart]; };
   CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; };
   COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; };
   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.1.0"; sha256="004n2s09b8wfg8aj7j400hvkbwxsxd27fyk72x6nnc8lkrpwzs5b"; depends=[MASS]; };
+  CPBayes = derive2 { name="CPBayes"; version="0.2.0"; sha256="1h4mipvmcjhs1s1dqbibxz2sf73psbwplgc5ki65y5654yqc26pl"; 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.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; };
+  CPsurv = derive2 { name="CPsurv"; version="1.0.0"; sha256="1r68pp3jbcbwgfac132h30qx6ah780aychr49rlncn17xbdalxsh"; depends=[muhaz survival]; };
   CR = derive2 { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; };
   CRAC = derive2 { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
   CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; };
@@ -430,6 +446,7 @@ in with self; {
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
   CRTgeeDR = derive2 { name="CRTgeeDR"; version="1.2"; sha256="0dq5q1gb392imfgqhzqphc7h5af0qcx2vx4fh77gwpz08ycrlkmg"; depends=[ggplot2 MASS Matrix]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
+  CSeqpat = derive2 { name="CSeqpat"; version="0.1.0"; sha256="097r5hhq45wl783qakqs8j2b3315j1bvk9pcpssx6svkn507hh66"; depends=[NLP tm]; };
   CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; };
   CTT = derive2 { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
   CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; };
@@ -438,22 +455,24 @@ in with self; {
   CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; };
   CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; };
   CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; };
+  CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; };
   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=[]; };
   CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
-  CaDENCE = derive2 { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; };
+  CaDENCE = derive2 { name="CaDENCE"; version="1.2.4"; sha256="1v6930wyh12jc2mrr4svg36nppxd1bqvcqardj2bjxzxzg998bq7"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
-  Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.1"; sha256="1wgksvfkpbr7sicfnv9g5w04kbrb9pwl40aqbflzy9kmqbjy5hhx"; depends=[]; };
+  Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; };
   CampaR1 = derive2 { name="CampaR1"; version="0.8.4"; sha256="0qlbrmqfs38bg9hsmvzd3cfgsbd2zx99f64bjv1gfhkmysmg1ysb"; depends=[bio3d ggplot2]; };
-  Canopy = derive2 { name="Canopy"; version="1.1.1"; sha256="0hv7ar4kj3d7cfpj2j5wcdbzag7w7x0zifay5hdyr0j6v776zvh6"; depends=[ape fields]; };
+  Canopy = derive2 { name="Canopy"; version="1.2.0"; sha256="10z511vp9nmyf7jaihdx2367ddsnlrfg4rdzlz7rg9b5k9d92pja"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
-  CatEncoders = derive2 { name="CatEncoders"; version="0.1.0"; sha256="1vg8a4v0fj8c4dwpynl8jf9d9lpjl08xpzkr4aa32gqkkk016mh3"; depends=[data_table Matrix]; };
+  CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; };
   CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
   CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
   CausalGAM = derive2 { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
+  CausalImpact = derive2 { name="CausalImpact"; version="1.2.0"; sha256="0l7477m320nzwpvkcnj14rj9sh4brzc48kgzh0cadfm3145583sr"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; };
   Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
   CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
   CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
@@ -481,6 +500,7 @@ in with self; {
   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]; };
+  CircularDDM = derive2 { name="CircularDDM"; version="0.0.9"; sha256="187vq7s8bp822lncv4gi3f98myg8na6cbg92zvdlzbsx50fylipf"; depends=[Rcpp RcppArmadillo]; };
   Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.0.1"; sha256="148yfsz8di73iy81l2b97a7jcr3d3gs4a4jzjgybs7305ld1ngrq"; depends=[]; };
@@ -499,7 +519,7 @@ in with self; {
   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]; };
   CoClust = derive2 { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; };
-  CoFRA = derive2 { name="CoFRA"; version="0.1001"; sha256="1nb6054mb8md3i0108n6jgwc9ydn9vn82q01jlnynfq2r3j06drw"; depends=[gplots Rcpp]; };
+  CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; };
   CoImp = derive2 { name="CoImp"; version="0.3-1"; sha256="0zj152w4cvnbfl144ggs3ixmyywxf9dqhh04jfydmv2a8n6px89n"; depends=[copula gtools locfit nnet]; };
   CoSeg = derive2 { name="CoSeg"; version="0.38"; sha256="1fkaq5zwy8j17jvpv0kzmq40km83qn9s556661ghknzp7w8flih8"; depends=[fGarch kinship2]; };
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
@@ -520,7 +540,7 @@ in with self; {
   Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; };
   CompGLM = derive2 { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
   CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
-  CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.2"; sha256="0bsgbdblxpv57mbwnf51xyiydp2bqyxkg4zzwqki85cv5xqlrq1n"; depends=[]; };
+  CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
   CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; };
@@ -534,13 +554,13 @@ in with self; {
   ConSpline = derive2 { name="ConSpline"; version="1.1"; sha256="0ap3qxqdby9rf665vh40m6f4wjz7q3cz8i4abw1ccryjlwjv1kzp"; depends=[coneproj]; };
   Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
-  Conigrave = derive2 { name="Conigrave"; version="0.1.0"; sha256="173panb3pz09fikzx3p0yjszizzi4sjl4pzrcw73ywvzkksg55kr"; depends=[ggplot2 miceadds mitools]; };
+  Conigrave = derive2 { name="Conigrave"; version="0.1.1"; sha256="0k9azng63pyq7xic5w00mllbyq17pz8g1zmgr6zpvkmfv13fa6yw"; depends=[ggplot2 miceadds mitools]; };
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
-  ConsRank = derive2 { name="ConsRank"; version="1.0.2"; sha256="11pdccndmiz4vm15kaidzwy92vi2aqi5klwxag4p2xk1xivnlm0n"; depends=[gtools MASS proxy rgl]; };
+  ConsRank = derive2 { name="ConsRank"; version="2.0.0"; sha256="05anbiahyfbw084zkaqs4p4hzpqrn1lwpicp7n55ndv1agmys22r"; depends=[gtools proxy rgl]; };
   ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.1"; sha256="04i8n8fmf2qs08dmlfls9j2509aqzb665qaz97na0wanbldxidbr"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
-  ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
+  ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.5"; sha256="0zc2i3d7b0p7qn6gy1pygq6xn31fkasdqgqa40zidzjwiwl3h3g4"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
@@ -549,9 +569,10 @@ in with self; {
   CopyNumber450kCancer = derive2 { name="CopyNumber450kCancer"; version="1.0.4"; sha256="0csmrv5n4lxd19q8q94sxs374lkqilp5x2dj8nxzs0x1v8hn0knm"; depends=[]; };
   CorReg = derive2 { name="CorReg"; version="1.1.9"; sha256="0x5bcqyi03pxsajjbsq3hwp1d4f1b8150n1z0wsdnv1jyg1rc9d7"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
   Corbi = derive2 { name="Corbi"; version="0.4-1"; sha256="01xspwzgic7yfmnp6l8w33mjnyr8lvajzp6wvwpgq3ffhli5hrf0"; depends=[CRF Matrix mpmi]; };
+  CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.0-2"; sha256="01hn80aidkzy9b4ki5f8y80hxzp96kqwzbyj7f3fjfvskvw2akhb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
   CorrMixed = derive2 { name="CorrMixed"; version="0.1-13"; sha256="02zg5kmv5qxnasnz872r3z7x7dmdcniq1x5xyfnnb3niwkdjgxzx"; depends=[nlme psych]; };
-  CorrToolBox = derive2 { name="CorrToolBox"; version="1.3"; sha256="0q6w3avlpdr35aigc2a03wzi36z5k3c7hacbarjpfv9lig3c35wc"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; };
+  CorrToolBox = derive2 { name="CorrToolBox"; version="1.4"; sha256="15x9l4swgrbry10k5iws75xs4bbh7mpcg4f4fx9yd9z92yq72ly2"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; };
   CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.14"; sha256="1if4qb1d6mg3435pk3znln8id8fj12n3j9sjv4zn104v2fr90mhr"; depends=[caTools digest xcms XML]; };
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; };
@@ -570,6 +591,7 @@ in with self; {
   Cprob = derive2 { name="Cprob"; version="1.3"; sha256="1hahvkmniahhar47nha96vcj810895wgvvg9si112hnv3sjaql3r"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; };
+  CrossScreening = derive2 { name="CrossScreening"; version="0.0.1"; sha256="147zycpq83n3rh6fd2d1vh200avfam63r0rv3yg9mgl3myqrv5v6"; depends=[plyr sensitivitymw tables]; };
   CrossVA = derive2 { name="CrossVA"; version="0.9.0"; sha256="0q5fc2maxq70s6h6dmj6amn6xzrjn6rzcsnq0cqrah2c8b6y351y"; depends=[lubridate]; };
   Crossover = derive2 { name="Crossover"; version="0.1-16"; sha256="19697wy066apkxrm99s7vflc0ih6zxxmyvj7x3dzh2icnv1gg1bb"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
   CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; };
@@ -577,25 +599,28 @@ in with self; {
   CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; };
   Cubist = derive2 { name="Cubist"; version="0.0.19"; sha256="1bjajcr2qnmqy8cakgiy4q07nj9dygz15a9jry5sa4nbkabpj4qh"; depends=[lattice reshape2]; };
   Cyclops = derive2 { name="Cyclops"; version="1.2.2"; sha256="1ly8rmfssjbi04b0k200iqh0gv3zr53x9vhj6hnrg1n3dqw0smn5"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel]; };
-  CytobankAPI = derive2 { name="CytobankAPI"; version="1.0.0"; sha256="1hkd9chpn78hwjbyv1c9pa03fh3p3bj2axilibz8pyxd2vfqdk3y"; depends=[httr jsonlite]; };
+  CytobankAPI = derive2 { name="CytobankAPI"; version="1.0.1"; sha256="097x07wjzwyviix3351m01az5y8dpmmbz7m3rb0by5ncbc3h3v9z"; depends=[httr jsonlite]; };
   D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
+  D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; };
   D3M = derive2 { name="D3M"; version="0.41.1"; sha256="1qr50xq5zccb16a1rgzfbb9bz8bbnxxb522nb8ga159nmb4cwjmp"; depends=[beanplot Rcpp]; };
   D3partitionR = derive2 { name="D3partitionR"; version="0.3.1"; sha256="09172g1xz9j746y22wj7vx759a3wnv6skqqzfazl753ms07zrwdc"; depends=[htmlwidgets]; };
+  DA_MRFA = derive2 { name="DA.MRFA"; version="1.1"; sha256="1w2m4m1bs7bqnhzcjgpmlvqs4fjfygy8hrh0yr5f527rx0jf1w4n"; depends=[Matrix optimbase psych]; };
   DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; };
-  DAAGbio = derive2 { name="DAAGbio"; version="0.63-1"; sha256="0f904cpyq140fbsxfqrm3wg41bncf6h2rkxfd37ij5m0qp067f0w"; depends=[limma]; };
+  DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; };
   DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
   DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; };
-  DAISIE = derive2 { name="DAISIE"; version="1.2"; sha256="0570q8bs2464516ink56a1ir4p5chdwnj1vygywn9lgc7n4dricd"; depends=[DDD deSolve subplex]; };
+  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]; };
   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]; };
   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.4"; sha256="1p25ddnn1r7lcqm077kxq0l5kv5104gnj0q9xf3yjyzgm4vsrfrn"; depends=[zoo]; };
+  DBEST = derive2 { name="DBEST"; version="1.5"; sha256="0jh928zxif975d751x15ys9hi5l7rw3vhmpwpbv53pvgsnlxnkaq"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
-  DBI = derive2 { name="DBI"; version="0.5-1"; sha256="1idwm9lkmz6ns6h0vvgml18mg0k7vjqiv9p5svrdcmx7r1rirpdi"; depends=[]; };
+  DBI = derive2 { name="DBI"; version="0.6-1"; sha256="1fg158k4n6l3rzx9nrwhp4nwkwpbmv1q7z2xz5rw138zws68fkgr"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.4"; sha256="04d1q04lmmxnaapdalj61k2k4p06vpff0fzr91fa5a2mvaxl6272"; depends=[DBI R6 testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
+  DCA = derive2 { name="DCA"; version="1.0"; sha256="13f22vwnxgq9wh2klhprni80092qwpwvbdp7n1apfvhim13mcyf9"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
   DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; };
   DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; };
   DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
@@ -619,7 +644,7 @@ in with self; {
   DEploid = derive2 { name="DEploid"; version="0.3.2"; sha256="12yh9w6qlg3l9w9i7isic1g825d9r7qwwwf3d0x8j7prim37w5yr"; depends=[Rcpp]; };
   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]; };
-  DHARMa = derive2 { name="DHARMa"; version="0.1.3"; sha256="0kq8q13f3jdjczsc3vq8x6i85qydqk5jmm0yl8m6x6w2nva5glvg"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
+  DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
   DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; };
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-2"; sha256="1900il14l2wvy5cjvmvg8z11q7ii311s18yif35561jilp2k9zfx"; depends=[grplasso miscTools penalized]; };
   DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; };
@@ -628,12 +653,12 @@ in with self; {
   DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; };
   DJL = derive2 { name="DJL"; version="2.6"; sha256="1vvfh9hpanac2g22k4hqy3y7j3mn34mvasw0rx3y4vjbv3h05yw6"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="1.0.0"; sha256="1rnm9f31d021yk2rhk7zcp2l9zbyxhpvdx32q6jjjjsiignjzc60"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="3.2.2"; sha256="13qpv6k3dn793kykxi9bmj2bl893lql7zsyfp6s3r7wp29k3kjj1"; depends=[abind boot MASS Rcpp readxl snowfall]; };
+  DLMtool = derive2 { name="DLMtool"; version="3.2.3"; sha256="1jfvrr24w543c6dxg7j7s0990phlh56q97710xafdcw5cl4pxgkz"; depends=[abind LBSPR Rcpp readxl snowfall]; };
+  DMMF = derive2 { name="DMMF"; version="0.2.8.0"; sha256="1zn0dpf8yn0zblh75qbln3kfxxvnbdjs5bsak1wsyayf964l7yl7"; depends=[raster rgdal sp]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.0"; sha256="11kwlk0q5c548m28n3hjsnmn8fcbjwsaw29qr4lb503mqsm2k7wn"; depends=[ellipse MCMCpack mvtnorm]; };
   DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
   DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; };
-  DNAprofiles = derive2 { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[bit Rcpp RcppProgress]; };
   DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; };
   DNAtools = derive2 { name="DNAtools"; version="0.1-22"; sha256="1kkqbzwbivd78lpphsn9xqdxqc46ng6f86nqns18gq0s2g8gvys1"; depends=[multicool Rcpp Rsolnp]; };
   DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; };
@@ -644,7 +669,7 @@ in with self; {
   DOvalidation = derive2 { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
   DPpackage = derive2 { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
-  DREGAR = derive2 { name="DREGAR"; version="0.1.0.0"; sha256="07n5iq0yv9f09wibbkamyz2x1b6sp4v0mzasfmllzlzqsr6s50gz"; depends=[msgps]; };
+  DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
   DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
@@ -673,6 +698,7 @@ in with self; {
   DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
+  DataEntry = derive2 { name="DataEntry"; version="0.9-1"; sha256="127g8vd22rir2xdhv0jdirfg2vq7iyh6y1qak8221jxdifpfvrjj"; depends=[digest gWidgets gWidgetsRGtk2 RGtk2]; };
   DataExplorer = derive2 { name="DataExplorer"; version="0.4.0"; sha256="0yxx20wzdnsz924q7mh9sbbbby04vv5rybvyqbk2s78a8lqv7abw"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
   Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; };
@@ -687,15 +713,16 @@ in with self; {
   DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
   DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-  Delaporte = derive2 { name="Delaporte"; version="4.0.3"; sha256="15zwfqvi4qvv7gp34nvsbx2zhp21b6f7dyyxb09hrvll0bczxbaj"; depends=[]; };
-  Demerelate = derive2 { name="Demerelate"; version="0.9-2"; sha256="00x0jjfzcq819pfrzs0jr5rvzpk4828q8kdb05icc79im1yq627v"; depends=[fts mlogit sfsmisc vegan]; };
+  Delaporte = derive2 { name="Delaporte"; version="6.0.0"; sha256="0jjm84m2lq7p326ji2z207a7r04l9aj1bgy82b3isgj7i01k56xy"; depends=[]; };
+  Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; };
   DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
   DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; };
   DensParcorr = derive2 { name="DensParcorr"; version="1.0"; sha256="15w0ifcq1js0wyjscfhlbga77sgzqpmz7zmwa77y92iwna8q66ad"; depends=[clime gplots]; };
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
   DepthProc = derive2 { name="DepthProc"; version="1.0.7"; sha256="1vnx9lhcrzsyygpq1rii4crxrz4c4vs60dnw0ha0y3j1mh0yxc2k"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm]; };
   Deriv = derive2 { name="Deriv"; version="3.8.0"; sha256="0a5kf5bb46wszq76wc7jasd4g2clmrvs86mrz14hngmhpmlcy7gp"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.19"; sha256="086ivipgzpq8pwc7r9a0jpd6qswp6b034jn603fw9rxz8ygz7rvj"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.20"; sha256="0jnyh7sgp3zpiqdpidyw5nv4mg99knnnaqpb1ijrdf0z104vsm2w"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9"; sha256="0fwvpp8csqdri7gddh7xzcnzzff14hlypfin2y12a0w4x0hz2fpb"; depends=[DescTools rstudioapi]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DetMCD = derive2 { name="DetMCD"; version="0.0.4"; sha256="0jdwwx15k8g3f5izcswsj28nfdw3n50x710mc938031yn7hjmkhg"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
   DetR = derive2 { name="DetR"; version="0.0.4"; sha256="0kvmbh7cdy3hmds1znahy1lqhd68y21kmmcki9xbq1b76n4h812n"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; };
@@ -720,6 +747,7 @@ in with self; {
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   Directional = derive2 { name="Directional"; version="2.6"; sha256="0qgaxsicrklkarp25k10z8w51gdidl421hnbiiyrjfslxlghqr2n"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
+  DisHet = derive2 { name="DisHet"; version="0.1.0"; sha256="0j25skxf26zwwrkzjadw6drg5wrhipk0j6wzjl3xzhpfxsz93afp"; depends=[gtools matrixStats]; };
   Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
   DiscML = derive2 { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
@@ -735,7 +763,7 @@ 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_base = derive2 { name="DoE.base"; version="0.29"; sha256="013p4y7imf6nb1mq7dx62c0nq5shf1yzdlfbri86icrdm00s63fd"; depends=[combinat conf_design lattice MASS vcd]; };
+  DoE_base = derive2 { name="DoE.base"; version="0.30"; sha256="0zpb5cvraznaawkrc7swwvsq363slv0sq1w4rs80jg14sshvr67n"; depends=[combinat conf_design lattice MASS vcd]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
   Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
@@ -744,14 +772,15 @@ in with self; {
   DoubleCone = derive2 { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj MASS Matrix]; };
   DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; };
   Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; };
+  Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; };
   DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
   DstarM = derive2 { name="DstarM"; version="0.2.1"; sha256="166843l9v99rg59iz17qs2gb45qjkxfmg676hd0krg5mhq7xgk8b"; depends=[DEoptim ggplot2 rtdists RWiener]; };
   DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
-  DySeq = derive2 { name="DySeq"; version="0.13"; sha256="0a1p2l4rpafpbggi3vshcd7xkkn1g5jy93hypgk9g7qskvhzyq0n"; depends=[MASS]; };
+  DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; };
   DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
-  DynNom = derive2 { name="DynNom"; version="4.0"; sha256="16xsgm6nb8qdk5j0srh6w7jda807sh3m73p0sbvvb5h4rf8vdy06"; depends=[BBmisc compare ggplot2 rms shiny stargazer survival]; };
+  DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; };
   DynTxRegime = derive2 { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; };
   DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
@@ -794,7 +823,7 @@ in with self; {
   EMSC = derive2 { name="EMSC"; version="0.8"; sha256="1fkwmfiw3cg0wkzcwl68dxzyiz7n35jmvjhq6jxdmb59p10f5z1j"; depends=[pracma]; };
   EMSaov = derive2 { name="EMSaov"; version="2.2"; sha256="12y0mj72la4ciwzgr38w9ssik4hixjf5kjsjwrvz6z59hi0ldfly"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
-  EMVC = derive2 { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
+  EMVC = derive2 { name="EMVC"; version="0.3"; sha256="1n7fxmqg8762lc7lg50h6wcrxrrz4nvi0xdaganz84l8vp8w90ms"; depends=[]; };
   EMbC = derive2 { name="EMbC"; version="2.0.0"; sha256="11qnln7a36zcrycbs0lz0qdvili25adv0rxdybmb6kk20a6q1lwf"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
   ENMeval = derive2 { name="ENMeval"; version="0.2.2"; sha256="1w8mjcmxxkx8lxxzzbjpv1i7cm6l8hhml7ynp80s9yiprr04bq9c"; depends=[dismo doParallel foreach raster rJava]; };
   ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; };
@@ -820,8 +849,9 @@ in with self; {
   EbayesThresh = derive2 { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
   Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; };
   Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-  EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.0-3"; sha256="09mrbg99id65y2wnmkpdjn39rd7gffa9rwqymqkcmrlz95pizkrm"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; };
+  EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1"; sha256="0ww0p4allaaz2zmj88105xr75gffcsycjjyy1ph4m9q7w5sw3c5y"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
+  EcoIndR = derive2 { name="EcoIndR"; version="1.0"; sha256="0yw27rv0w7z276cbjqqiidf4r5razp0xmam8kl8jd06q6yjpizrw"; depends=[]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
@@ -853,17 +883,21 @@ in with self; {
   EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; };
   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.10"; sha256="0kmyan9jhjsr9f1yhff94yyy56xhm9irfrzm2m4dpf56376m2w8b"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
+  Epi = derive2 { name="Epi"; version="2.12"; sha256="12c5fryvzrl09h2l5lm9s45an6rf600i7gxgw8nddy7f1p9pa9dz"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.10.0"; sha256="0x0ah55nx68mq05hpp29g9h21is3kx9d84r82j4x4asyqjv92s7v"; depends=[]; };
+  EpiCurve = derive2 { name="EpiCurve"; version="1.0-0"; sha256="0y614cghigf126vrk4fdwxik2ax6s5ay391pwb3rwhmll4zflw00"; depends=[dplyr ggplot2 ISOweek RColorBrewer]; };
   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=[]; };
-  EpiModel = derive2 { name="EpiModel"; version="1.2.8"; sha256="1h4mspa7yi2z7rj98nzs3ay2m7gccv7bp63p9sjnqp08pdwk3x5y"; depends=[ape deSolve doParallel ergm foreach lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiILM = derive2 { name="EpiILM"; version="1.1"; sha256="151gx5qr1y8im60pl41pks3w9f6ck4hmwga63f2yq5nb8lk9yn5j"; depends=[]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.3.0"; sha256="0v0aw7i4ygr710zhkbw32hxkwa0y5f7qfmfx8q07rcn3k986sj0j"; depends=[ape deSolve doParallel ergm foreach lazyeval network networkDynamic RColorBrewer tergm]; };
   EpiWeek = derive2 { name="EpiWeek"; version="1.1"; sha256="19bvjiiz8qn9nlvf3nq238qi1hszlm6asrc03p8ykp6gpl2pi6js"; depends=[]; };
   Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
   EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
+  EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; };
+  EthSEQ = derive2 { name="EthSEQ"; version="2.0.1"; sha256="014yhh1msn1vg4ncrs557xrw25vd6jplbsqw2x728hjfivrlwl78"; depends=[data_table gdsfmt rgeos SNPRelate]; };
   EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; };
   EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
@@ -880,7 +914,7 @@ in with self; {
   ExpDE = derive2 { name="ExpDE"; version="0.1.2"; sha256="0q95d5gklg834f02b2p252jb3kbbjr4sj3wdak9ljibscnnlckml"; depends=[]; };
   ExpDes = derive2 { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
   ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
-  ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.4"; sha256="1n608qz2mj1x36kmbyi7lp0zp744bf9k1zq15yhdv8yy7pcdfl0d"; depends=[CORElearn semiArtificial]; };
+  ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.8"; sha256="15qqfmgcfc77cygp5zabbf8b5bqs3wyj223waqxrryrnhvzdxxvh"; depends=[CORElearn semiArtificial]; };
   ExtDist = derive2 { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; };
   ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.5.2"; sha256="010k2ddrrmrv4ayr009sm0vdgql5n1hy2b7rxyggj8iqsm8lkxim"; depends=[Formula]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
@@ -905,7 +939,7 @@ in with self; {
   FDboost = derive2 { name="FDboost"; version="0.2-0"; sha256="10rpi132d16cjr3c08p1py8jjxgf0gk812vi3918sr71m5x0m64i"; depends=[gamboostLSS MASS Matrix mboost mgcv refund stabs zoo]; };
   FENmlm = derive2 { name="FENmlm"; version="1.0"; sha256="0mq1qa72hsz3pyqjnbyzcc7shr08cq3hng1fz53mn9mvp11vb135"; depends=[MASS Matrix numDeriv]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
-  FFTrees = derive2 { name="FFTrees"; version="1.1.8"; sha256="0zslr3k3wjvin14i7y2qfc5acf864kp9ih52bq0sb34590papy18"; depends=[circlize MASS rpart]; };
+  FFTrees = derive2 { name="FFTrees"; version="1.2.2"; sha256="1s42k48fqkpdjwqhbl7k5hci12p5zz681cys462g1ddc21bxp0gz"; depends=[circlize e1071 glmnet igraph MASS mlbench randomForest rpart snow snowfall yarrr]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
   FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
@@ -920,7 +954,8 @@ in with self; {
   FLLat = derive2 { name="FLLat"; version="1.2"; sha256="0kdc269vsc94pi00n55196a20qiv6c5pxf2xrh34w4x2vkn5mbxz"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
   FLSSS = derive2 { name="FLSSS"; version="5.2"; sha256="1px9n0rnjg32ngy8bs0z1jzmspnkn15q273w74vxjykqfd5xayfd"; depends=[Rcpp RcppParallel]; };
-  FLightR = derive2 { name="FLightR"; version="0.4.5"; sha256="0kyvnqjdr82x82l3isqw4kr31x0a15nzgmlggxbv9rjk3pxjnfbx"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
+  FLightR = derive2 { name="FLightR"; version="0.4.6"; sha256="0q1azhpdkasjsca5z4p0gnp5iirs6f9dyg6pn8269x7k1mw0pib4"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
+  FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; };
   FME = derive2 { name="FME"; version="1.3.5"; sha256="1r1mb61hylsgcryac35bz1pzfcw27gzpvfwkkf0sh754ya6xh69n"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; };
   FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; };
   FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
@@ -936,10 +971,12 @@ in with self; {
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.1"; sha256="065iywjay4a06w97lg2z98qq0j60flq4srchyg7c2a3pjrwppqc2"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; };
-  FSA = derive2 { name="FSA"; version="0.8.11"; sha256="0pwqdw7kq2fkxqwwazjcx3g9y6cwrkanfv2j58q2hhjzrhyp08qs"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; };
-  FSAdata = derive2 { name="FSAdata"; version="0.3.5"; sha256="0cj4pvhb52zpxi5r3ffkpmwf420waw5kczfw9p9jv6d5byhi6jd5"; depends=[]; };
-  FSInteract = derive2 { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Matrix Rcpp]; };
+  FRK = derive2 { name="FRK"; version="0.1.1"; sha256="1zp3ms68fd504wni7i2yddiagh34na78nbziz557n3ylxvpwllh4"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; };
+  FSA = derive2 { name="FSA"; version="0.8.12"; sha256="0byhvv32ayyq8x4kidpdapp41h0jvrp61pjdmpc4whkm9978vb87"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; };
+  FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
+  FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; };
+  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.2"; sha256="1qisnap16ish55m8k3b37n2i9nvy8wb19wy9i0bnpf0px75bxkmb"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; };
   FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; };
@@ -947,17 +984,18 @@ in with self; {
   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.3"; sha256="1vwjxzz8cdvshslx51vnvgybvmki2x3zfax2q6czxl8kacijdh9n"; depends=[ade4 xtable]; };
+  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.0"; sha256="10yim7xvzizr383hygs4s2f59ipbl4sj2i85g55zw7j5crangql3"; depends=[FactoMineR rmarkdown rrcov]; };
   FactoMineR = derive2 { name="FactoMineR"; version="1.35"; sha256="1a8mnyjh3915h3n46p6pph7nv9chxj02pjsyjv2ic78xavz7dqdg"; depends=[car cluster ellipse flashClust knitr lattice leaps MASS scatterplot3d]; };
-  FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.1"; sha256="0iycm1ih0947b8qsm1p3x42g088pk3vvayb96irmj0cd2a0fix6c"; depends=[Matrix Rcpp]; };
+  FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.11"; sha256="0k9c7byyn14mqrsxa03d4pf4dlnm4zxryk3n15rr9w9mbmrhidcy"; depends=[Matrix Rcpp]; };
   FactorsR = derive2 { name="FactorsR"; version="1.1"; sha256="06193gw4q9yvhmgzlv8w2xi9f418cjkn9jx72l41426wapjhygdy"; depends=[]; };
   Factoshiny = derive2 { name="Factoshiny"; version="1.0.5"; sha256="1jqk80raqf3kxympkqfayzwwc61yipzh4cbklrb9kmay5ryg4gj9"; depends=[colourpicker FactoMineR shiny]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
-  FamEvent = derive2 { name="FamEvent"; version="1.2"; sha256="1z611g6nginmga2mzkjlplwmfiiply2wwnbn6icsn412wzj8a606"; depends=[kinship2 MASS survival truncnorm]; };
+  FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
   FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; };
   FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
   FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
-  FastImputation = derive2 { name="FastImputation"; version="1.3.1"; sha256="05rs5mzb7aww7x06zqn4q053jqxbrc185ra11brm0xkb02cc1dih"; depends=[]; };
+  FastImputation = derive2 { name="FastImputation"; version="2.0"; sha256="0zhin8000c78kba6zly9mvpxdxx68kcsh2hn697pxkl73wqsz3p5"; depends=[Matrix]; };
   FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; };
   FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; };
   FastPCS = derive2 { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
@@ -986,6 +1024,7 @@ in with self; {
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
+  FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.1"; sha256="0wdlw8wz10jb0ablfkpjmhkz31h7c19blpzifg1kknknvg8wmbkd"; depends=[changepoint evir zyp]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
@@ -993,7 +1032,7 @@ in with self; {
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
   ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; };
   ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; };
-  ForestTools = derive2 { name="ForestTools"; version="0.1.0"; sha256="0jvsz96ll3apl4br5m8cbs24yds05xh93brvrib6yiwcss55avf1"; depends=[APfun imager maptools raster rgdal rgeos sp TileManager]; };
+  ForestTools = derive2 { name="ForestTools"; version="0.1.4"; sha256="0czvslmhz5syvd8h5zz6wl3nfp2dpyx3wf9x1d1hkgfgxkkl6f1y"; depends=[APfun imager raster rgdal rgeos sp TileManager]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
   Formula = derive2 { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
@@ -1012,11 +1051,12 @@ in with self; {
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
   FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.0"; sha256="1n2m6p03bfip2fxfg8v4k43zgv7lcwwgv4myw2rj46djfwl2l9i7"; depends=[FuzzyNumbers MASS]; };
-  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.8.0"; sha256="1rpmwyqgdbc4hcx375m6j6djbhm4ggb6j9sni2dq8rwza96qv5zb"; depends=[]; };
+  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; };
   FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-3"; sha256="1c7yynrz0vfvan9mfin2vsrkhhi3sy8c5nya7l8hja0nh1a4bzki"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
   FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; };
   FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; };
-  FuzzyR = derive2 { name="FuzzyR"; version="2.0"; sha256="1li54ad0lqmmdsr9pcp56d2n8ki6hzdljy8l3lzhrsjmii7ycasw"; depends=[plyr shiny]; };
+  FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="1.0"; sha256="1mqpdii0lf1p19kmzw93bzqbfjx2jzbphd0aacyzzai72vzx6aj1"; depends=[FuzzyNumbers]; };
+  FuzzyR = derive2 { name="FuzzyR"; version="2.1"; sha256="08mhwzyksw0snxxcwn2kg62ya8smfvrls30znqhmnbkn5ijz0642"; depends=[plyr shiny]; };
   FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.2"; sha256="01rdvsvdfyg8cz6rl1kzwzg9ns5zmikmb7ljlavvzcbg4i1vliqq"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
   FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; };
   FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
@@ -1026,13 +1066,15 @@ in with self; {
   GA4Stratification = derive2 { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; };
   GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
   GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
+  GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; };
+  GADMTools = derive2 { name="GADMTools"; version="2.0-1"; sha256="1i0kl7wxi9vfr6rhry64b2yvjv47ap1m3bglmc2anrz2xmj3af7v"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; };
   GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
   GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
   GAMens = derive2 { name="GAMens"; version="1.2"; sha256="1x1q6a5p2lsx0gbfm976ps4braqaxa26ii6g3iag9ssafyhb0r1f"; depends=[caTools gam mlbench]; };
   GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
   GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
   GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; };
-  GAS = derive2 { name="GAS"; version="0.1.5"; sha256="14n973bks28chxxlidz578359nh8kd2jjp32k1fp2r8qfddsk21i"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
+  GAS = derive2 { name="GAS"; version="0.1.9"; sha256="125gfh561p02jlvk6sj465v50yiysnxz900c1xsmrhnvkfmgl7br"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
   GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; };
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
@@ -1040,27 +1082,27 @@ in with self; {
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalignR = derive2 { name="GCalignR"; version="0.1.0"; sha256="0prky8n2j6xvq4srxcp08k4wlikg7hhj78mw7fjqbf01sl0zhwz5"; depends=[ggplot2 readr reshape2 stringr]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
-  GDAtools = derive2 { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; };
+  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]; };
-  GDINA = derive2 { name="GDINA"; version="1.2.1"; sha256="1ay3s4r8v4zzggmxbq7m1kppb2bpa8mcgsiaak82955l19k40dy4"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; };
+  GDINA = derive2 { name="GDINA"; version="1.4.2"; sha256="14686mkyxk7gjp0ivz1wkmry15qrf50fcwwza1j98791yjkqsbyf"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.0.0"; sha256="0fs5gamfpv5z4p92x76gy55zmf0pmh5cdhgnp9dnh58x0d9mij5y"; depends=[gee]; };
   GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
-  GEOmap = derive2 { name="GEOmap"; version="2.3-8"; sha256="14nar0djn8jzcyv0aij79xr3iqbgllrpcnfazi865plfa5ah7k9v"; depends=[fields MBA RPMG splancs]; };
-  GERGM = derive2 { name="GERGM"; version="0.10.0"; sha256="0fg984d553zfnnv00flmlzib4zjvgp33lgmbczvr4wssj4rsbpj7"; depends=[BH coda ggplot2 igraph plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
+  GEOmap = derive2 { name="GEOmap"; version="2.4-0"; sha256="0jhzsp5f427r652mnaw3zg0vv13jaz11bfbbxppmxvya6k2jimyg"; depends=[fields MBA RPMG splancs]; };
+  GERGM = derive2 { name="GERGM"; version="0.11.2"; sha256="0vvvbb7y5lqa60n7w14gm8r7gwgah593w63162amjxmdk9jir9bi"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
   GESE = derive2 { name="GESE"; version="2.0.0"; sha256="04gd9xplwk5kknwikn5c8wa01bbc10ijfj08gpycf0x0q54szf8y"; depends=[kinship2]; };
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
   GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
-  GEVcdn = derive2 { name="GEVcdn"; version="1.1.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; };
+  GEVcdn = derive2 { name="GEVcdn"; version="1.1.5"; sha256="0nqym5jqgshx6ad4k4nwain6lnhx5y7s3b10f2xmcn93287p3rji"; depends=[VGAM]; };
   GEint = derive2 { name="GEint"; version="0.1.2"; sha256="12jkrflv9p05bnsx5xqyr55c18q1vrs1wlcni38zyppd334yyiyh"; depends=[geepack mvtnorm nleqslv pracma rje speedglm]; };
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
-  GFA = derive2 { name="GFA"; version="1.0.0"; sha256="1mgcgdypfpd3i5n5kgk162p1jp9gfz1h7h3rlzrw9srsbc6dza97"; depends=[]; };
+  GFA = derive2 { name="GFA"; version="1.0.1"; sha256="073mwbrvvacrvqw4mwm13wd4rh3wlvwxkakal0k9xwxi5q9kl2rs"; depends=[]; };
   GFD = derive2 { name="GFD"; version="0.2.2"; sha256="1llz22cqp26336ybfkmn98v80zl09hpjx34f9c5bf39lc6w1645h"; depends=[magic MASS Matrix plotrix plyr]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGIR = derive2 { name="GGIR"; version="1.4"; sha256="0vg7kpz8cx12jc06z8hjgss6n20z9h262z4rki4mnmllv2hmjqx2"; depends=[data_table]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
-  GGMselect = derive2 { name="GGMselect"; version="0.1-11"; sha256="1ir3zyi9xxq9aq1zxl506x1fwxsv7rd350k461l9lc2r5338xrgh"; depends=[gtools lars mvtnorm]; };
+  GGMselect = derive2 { name="GGMselect"; version="0.1-12"; sha256="1vjzmnnvnckr8s0badqm3l15arsa31fwg4wq6c2wx3g0hi1nzxxs"; depends=[gtools lars mvtnorm]; };
   GGally = derive2 { name="GGally"; version="1.3.0"; sha256="12ddab0nd0f9c7bb6cx3c22mliyvc8xsxv26aqz3cvfbla8crp3b"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; };
@@ -1069,9 +1111,11 @@ in with self; {
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
   GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; };
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
+  GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
   GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
+  GMAC = derive2 { name="GMAC"; version="1.0"; sha256="0936j60cf7jvy8frr8p8ysbg5if14r0wm896aq89ivxfypvw7n1g"; depends=[qvalue]; };
   GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; };
   GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
@@ -1088,9 +1132,10 @@ in with self; {
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
   GPareto = derive2 { name="GPareto"; version="1.0.3"; sha256="1krvnmyn0yw65fn92lsxw0y3pxzpkx6b5dsgvrm47gyaphpynk4s"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
   GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
+  GPoM = derive2 { name="GPoM"; version="1.0"; sha256="14h9g2rg5yzw68hg2a3s2lp19ilq7dl1k3cjnd9k516b5gdm2izl"; depends=[deSolve rgl]; };
   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-3"; sha256="0dmws29ahbjhx82s2i8jfzhl8pp5q201a592w90jvhwy2bnm1ywk"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   GRANBase = derive2 { name="GRANBase"; version="1.2.1"; sha256="1fxbgl7z61qdfg0lcjylc00wr819kg9kycc42gsjl1gxxy94b433"; depends=[hwriter switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
   GRS_test = derive2 { name="GRS.test"; version="1.0"; sha256="1igyb3rma1v2arx1k16fanvzmlywx0n9lf5jz69vnf6z2qmqvrg5"; depends=[]; };
@@ -1100,11 +1145,11 @@ in with self; {
   GSAQ = derive2 { name="GSAQ"; version="1.0"; sha256="1p1rab2dlh4h9bfg464nhx708p7kc4q01ifccdh5756lq1qh2kzv"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="1.1"; sha256="0r0bgfmlxb81am34gm5c1bxfwkjl82f51ck1lqf7jwc7w08d75az"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="1.3"; sha256="003n4mqch9kb7d0jpna3f8yg1ajbn6abrpiz4r8slhl3nps09yn4"; depends=[memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-3"; sha256="1cvdgdnsddl1z6qmxwdglvrf3p8ph8cf3ablnxspn4k70cpiwq3c"; 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="0.1"; sha256="1bw249b3a58d9q8cj91w9syyghf6sy8xqnx2jawp83qp8lfbix5x"; depends=[MASS psych]; };
-  GSODR = derive2 { name="GSODR"; version="1.0.1"; sha256="14rc9gs4375mwk5gzz17iadb5gnphw411rh4sxhg8y48gj6drlqs"; depends=[curl data_table dplyr fields plyr purrr R_utils readr rgdal sp]; };
+  GSODR = derive2 { name="GSODR"; version="1.0.2.1"; sha256="08hgm3yafmy0jy2d8g2l30c8mw9rq36pbv5vp5cgv4inwsgazl43"; depends=[curl data_table dplyr fields plyr purrr R_utils readr rgdal sp]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; };
@@ -1117,7 +1162,7 @@ in with self; {
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
   GWRM = derive2 { name="GWRM"; version="2.1.0.2"; sha256="1i8f2a43vn7zjsfb108ckjhi23m93mbm3lc7w7w6grp4ny98xr6g"; depends=[doParallel foreach]; };
-  GWmodel = derive2 { name="GWmodel"; version="2.0-1"; sha256="1030qkrwn4b40553j80ignq2dvrnsi1p6wvhq7iq7nmc9jcil1wz"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; };
+  GWmodel = derive2 { name="GWmodel"; version="2.0-3"; sha256="0sbxhslqj86lbbwj20sqavaypgqp1d5g29h74lwh5dz87ymhs244"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
   GameTheory = derive2 { name="GameTheory"; version="2.5"; sha256="05isd08z7k52nvic52gnlmnqvvrxxipcn2njfiz3kp105wvdw1rp"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
@@ -1142,21 +1187,21 @@ in with self; {
   GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
   Geneland = derive2 { name="Geneland"; version="4.0.6"; sha256="0xm5k0ihmg8j0cx2as1h8lgm1g0vrfdbpb0nacmdqdhafaj03iyz"; depends=[fields RandomFields]; };
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
-  GeneralTree = derive2 { name="GeneralTree"; version="0.0.1"; sha256="0wlhpxky4vckmcg0imvcxsg2rg2pbrh5822lpkdp28aj7b4s7wqv"; depends=[R6]; };
   GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
-  GenomicTools = derive2 { name="GenomicTools"; version="0.2.3"; sha256="1ga2myi2y5rpab0v58y1ndfqrxmbl1wdr3d0s8215apwiax4rfm4"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
+  GenomicMating = derive2 { name="GenomicMating"; version="1.0"; sha256="16ky71vnrnarvws1bhgq8ymgdqmb8gnfs9cil29cgm88kp0ra36b"; depends=[Rcpp RcppArmadillo]; };
+  GenomicTools = derive2 { name="GenomicTools"; version="0.2.4"; sha256="1r1d36ik0xrpznz19jrw4m7xf3xsqhx9vwsnal8k030k6vjip82d"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
   GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; };
   GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
   GeoGenetix = derive2 { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
   GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; };
   GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
-  GerminaR = derive2 { name="GerminaR"; version="1.0"; sha256="10zwa5grkz95q69l8yvvcj071lql7hh7f7cbmjxl1vnsyanlan4x"; depends=[agricolae assertthat dplyr ggplot2 gtools magrittr shiny tidyr]; };
+  GerminaR = derive2 { name="GerminaR"; version="1.1"; sha256="1ijx2bd0fpki3pqm9grksc60f43qg9y5412mwd847xqqjpc1mxm4"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tidyr]; };
   GetHFData = derive2 { name="GetHFData"; version="1.2.4"; sha256="0bhrxxrmhmvpks81n9xxzcwgp370ym7sxz6x7cnv50gzyd1yz9sm"; depends=[curl dplyr lubridate RCurl readr stringr]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.2.5"; sha256="0ghi9iram9d67vs12hkw362qnvmk1lk72pjgmx118i4yxh5gvvw3"; depends=[curl RCurl readxl stringi stringr]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="0.1.5"; sha256="109x6m904x1cnqb9d0s4yglx6lfllhpdzl6is5d559bfsb990vwd"; depends=[GlobalOptions rjson]; };
+  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]; };
@@ -1166,16 +1211,16 @@ in with self; {
   Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
   GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
-  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.10"; sha256="0vkfr29q92g02138g2iscn95g3dc3shvzlmrh502fw89asm7kh57"; depends=[]; };
+  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.11"; sha256="15zayfijpbp1xqzykbhkw97qm70kcvjzqh6sz71rb91jdv5zi01x"; depends=[]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.3"; sha256="0b2ijr9zlsp1287da3h9qm5cm17xk8zm8cdcj6d4kz0ivgg444py"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
   Gmisc = derive2 { name="Gmisc"; version="1.4.1"; sha256="1xdgmvzixc03qz34l57gy85w711iimmfqn6w20rr5b67m5m63drz"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; };
   GofKmt = derive2 { name="GofKmt"; version="1.0"; sha256="1b91js02kam515p7s0c6v63rl31wk16bvkr4f4z25wa5nb8g8p81"; depends=[Rsolnp]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; };
-  Grace = derive2 { name="Grace"; version="0.5.1"; sha256="1bx2bqfxxgq5dq9825iad5zgjxx3b2lgw18lzc1fxq5rnximsh08"; depends=[glmnet MASS scalreg]; };
+  Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; };
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
   GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; };
-  GraphKit = derive2 { name="GraphKit"; version="0.4"; sha256="12h7p1ka4036d3c1vri014jci02zkjgira6rk8f1mcrv94sywinc"; depends=[Rcpp RcppArmadillo]; };
+  GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; };
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; };
@@ -1185,7 +1230,7 @@ in with self; {
   GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GrowingSOM = derive2 { name="GrowingSOM"; version="0.1.1"; sha256="0pzhf27kk9nc73w6wp0qd50i7hk7904y90l2ppdgy738z9gcbz4i"; depends=[plotrix]; };
-  GrpString = derive2 { name="GrpString"; version="0.1.1"; sha256="0kqz2m6ycj83s5kcgbf7l6cpfgfrza7b0y23cgljf952pys2ndys"; depends=[plyr]; };
+  GrpString = derive2 { name="GrpString"; version="0.3.1"; sha256="0j2xyil4z3dcl306ralf277ixypk0i0dfysbbl5j22ykgg21lbfd"; depends=[plyr]; };
   GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; };
   GuardianR = derive2 { name="GuardianR"; version="0.8"; sha256="07bg7wz7d2rgjkw5ldzi5p7nd4ch39m6ql5w4sqnvds4r08jspj9"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
@@ -1223,10 +1268,10 @@ in with self; {
   HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
   HMP = derive2 { name="HMP"; version="1.4.3"; sha256="15fsyk61y141wdkc5cjrw05gc5kzl2a8cmk2n54c8gmhhjbjy692"; depends=[dirmult doParallel foreach gplots MASS]; };
   HMPTrees = derive2 { name="HMPTrees"; version="1.3"; sha256="1q0zfwhzfr45mykql8hsp6pzkfhcplr7gkq7dbd8xa97wxsf63yd"; depends=[ape dirmult doParallel foreach HMP]; };
-  HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
+  HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-  HRM = derive2 { name="HRM"; version="0.5.0"; sha256="0xppx5ip0qhrfhri7yzqmkqrr6lf1a4pmk2lc5vxmsxdfs273y9r"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
+  HRM = derive2 { name="HRM"; version="0.5.1"; sha256="0ng9p9x6ka4cdi53vbzy298y9ahdjr037y5wyzlmmhm2cy182wby"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HSAR = derive2 { name="HSAR"; version="0.4.0"; sha256="1k40hh546hrdm2yh64l51sky17mnmkzckb7l3bnkpw495rsk73g2"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
@@ -1242,6 +1287,7 @@ in with self; {
   HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
   HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
   HWxtest = derive2 { name="HWxtest"; version="1.1.7"; sha256="030fl88bj0g7y9b9kd56bnxh0cad6y84bnmvsgwlanb51n3ggz3w"; depends=[]; };
+  HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; };
   HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
@@ -1251,7 +1297,7 @@ in with self; {
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.6"; sha256="1zpba8l8fjc7ncrw0virfv1s9zaa4xsyn63jiay8ivik98siqhkb"; depends=[mice]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
-  HelpersMG = derive2 { name="HelpersMG"; version="1.8"; sha256="1lw0p02rzb4b9b66435w8dr058bfzpcygfgi75av28lrc75c6skv"; depends=[coda]; };
+  HelpersMG = derive2 { name="HelpersMG"; version="1.9"; sha256="10icxks0b2sq7s2g7m4vs8857mlw5hkpnmphy7dfd1r8cbf7y7sh"; depends=[coda]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
   HiCfeat = derive2 { name="HiCfeat"; version="1.2"; sha256="01b8isvn4my41n3608k80d38vgd3waq7rxsx1v4p0rl1f3pxn7dn"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
   HiCglmi = derive2 { name="HiCglmi"; version="1.0"; sha256="01v7g9h86xb4i8gc2rsyyx952mqafyapydhyyik098s1war4hkf9"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
@@ -1269,7 +1315,7 @@ in with self; {
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
   HiveR = derive2 { name="HiveR"; version="0.2.55"; sha256="14hdnpiw0ccmzb0lj9gwn92hzwwmlpgrxv7mj8kwp89n7kqccvl7"; depends=[jpeg plyr png RColorBrewer]; };
   Hmisc = derive2 { name="Hmisc"; version="4.0-2"; sha256="1lg9k0kj803wsm3h0a991q9l2lrgsqryzfv2z79b88kjbfapqpqr"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
-  HoRM = derive2 { name="HoRM"; version="0.1.0"; sha256="07vq8v1pdmm35sna9yz7n6al4g9mf45sx1rbzgsymyjac38zw62k"; depends=[ggplot2 MASS orthopolynom quantmod]; };
+  HoRM = derive2 { name="HoRM"; version="0.1.1"; sha256="0l0gcp1bagm7zbjg7hw2748aqjn9592531d0w5vjap0jgalaig32"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; };
   Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; };
   Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; };
   HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
@@ -1297,7 +1343,7 @@ in with self; {
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
   ICCbin = derive2 { name="ICCbin"; version="1.0"; sha256="1ybhxk5bvgfsz45r1kbb8b82qwjb8a88q11x5c4dbdk85fkxg3w9"; depends=[]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
-  ICEbox = derive2 { name="ICEbox"; version="1.1"; sha256="0yv9ybvk6s3lnyx5xfsnx19x32r9g9gk7klkpc8q672pl4fn4yp5"; depends=[sfsmisc]; };
+  ICEbox = derive2 { name="ICEbox"; version="1.1.1"; sha256="1j2sdszvi6h1pjv1n46qymgfxc7rdznspjxpyf2aa3axh0v0l3zk"; depends=[sfsmisc]; };
   ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
   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]; };
@@ -1313,7 +1359,7 @@ in with self; {
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
   IDmining = derive2 { name="IDmining"; version="1.0.0"; sha256="112m9dpzq6dl055wf1hhnxqr0rfvm1dv75mbj60fdwlf5q4sgsia"; depends=[dplyr]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
-  IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.4.1"; sha256="093c7jx74hl41v6i75qlphshw6gbxn7cl9063f971ilxi4hmsd21"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
+  IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
   ILS = derive2 { name="ILS"; version="0.1.0"; sha256="18phs1q28mpwvwnzn0hgjxy978f7n4c3p94jxjp0sy3as67hqphp"; depends=[depthTools fda_usc MASS multcomp]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
@@ -1322,17 +1368,19 @@ in with self; {
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
   IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; };
   IMPACT = derive2 { name="IMPACT"; version="0.1.0"; sha256="17m2gqwaqam8wv7214x4hp93imgfzilgm42zx5z21ipypiq6rqfy"; depends=[]; };
+  IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; };
   IMak = derive2 { name="IMak"; version="1.1.2"; sha256="19si4hhvi8kddkp2kr1yw2bcw1qkk0i42saklvwk751gdmyzl9p3"; depends=[]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
   IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
   IPSUR = derive2 { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
+  IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; };
   IPtoCountry = derive2 { name="IPtoCountry"; version="0.0.1"; sha256="1b10z93mc31cr1c5wxp9xz9cr3jm4n4g5kav09dyallpgw60rskp"; depends=[data_table devtools dtables ggplot2 install_load maps scales]; };
   IQCC = derive2 { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
   IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.4"; sha256="0in50k366yjqgpgzh73bfb8v6cqdrr68b8xvsa1jmi2f438j3nrx"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.1"; sha256="0h2r1yijc00va48zhvb9b0mnmw9b1anfhs9v8gjqyv4dy6l8lrif"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
-  IRTShiny = derive2 { name="IRTShiny"; version="1.1"; sha256="0izw7mk78b9ab2p6jb5vph80cjbaq0m6xvyw8xlzypa3j3ns17sv"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
+  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.3"; sha256="0ba0pcjxhw93wdhz513j7a595bj5jfi50xagb85znxh5bi0lsxp4"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRTpp = derive2 { name="IRTpp"; version="0.2.6.1"; sha256="10shzyiawk65pikawvhg58kx6fpvs1dazqmfjf3rfvly1lc0px1q"; depends=[FactoMineR MASS mvtnorm numDeriv Rcpp]; };
   IRdisplay = derive2 { name="IRdisplay"; version="0.4.4"; sha256="19l4flvik8zw2pany8dpjbrh0bji6bag6pmclgwqnq80532hnfp8"; depends=[repr]; };
   ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
@@ -1366,24 +1414,26 @@ in with self; {
   Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
   InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; };
   InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; };
-  Infusion = derive2 { name="Infusion"; version="1.0.0"; sha256="1n0wp05xzr1sbd1a5p36d7f9lg7bhp1yha71zg6h5zjdzpsjjh1a"; depends=[blackbox geometry Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; };
+  Infusion = derive2 { name="Infusion"; version="1.1.0"; sha256="07wzs0gnqgasxsvqawdsywasb2ybcml8fbg4jrmdy02ni8d8zmhs"; depends=[blackbox geometry Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; };
   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.4"; sha256="1r42zzrm5cmqlaxxzla0fwf5l34qjil9ndmv2cdwzw1kbqp84qz4"; depends=[Biobase ggplot2 nlme]; };
+  IntegratedJM = derive2 { name="IntegratedJM"; version="1.5"; sha256="0vw2k8f0smb2vbn10rqp5alhra8q5d87c0zjs2xjc8w6i72fy2q8"; depends=[Biobase ggplot2 nlme]; };
   IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.5"; sha256="0f2jsf6lh1nrrfqdgq72jqan94f81cr2pckfcjn86c933gjlq4bm"; depends=[bootstrap caTools ggplot2 limSolve Rcpp]; };
   InterSIM = derive2 { name="InterSIM"; version="2.1"; sha256="092fw918qq8pahyxxznabkdfrb8700bpkkq96zj8ihpkx2ngkxln"; depends=[MASS NMF]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.7.3"; sha256="1ql9mdl9q7n7kj4c6wfgjfi87bp7n30knbxg9way7ifgr2yqn8bb"; 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]; };
+  InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; };
   Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
   Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
   InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="0.83"; sha256="1iwhgfb7z9pbnwzn626v0w0ycfjlhpaiv1yzm062samvr0lqiyrh"; depends=[enviPat plyr Rdisop]; };
   InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.6-1"; sha256="16qlskxszpi24qsdl821n72pzdvmf1gg7lnlwyhyzhzzkh9az1pd"; depends=[glmnet mboost]; };
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
+  Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.3"; sha256="11hfyxlnqzk9fpjbisbgdyx99svm0sak0x0r4xrlrxw66f0gwllf"; depends=[e1071 GameTheoryAllocation]; };
   InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
   IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.1.0"; sha256="0741093vq1cqs9zh95fc6kwpd4a4r4yxvmcnp7f7j5xxyqy1h3xz"; depends=[]; };
   IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; };
@@ -1392,8 +1442,8 @@ in with self; {
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
   IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="0.10"; sha256="1hlhj36bmxlj8y83kmis0knwgfn0s8dab1nw0715d2vhh74g4xmp"; depends=[MASS]; };
-  IsoriX = derive2 { name="IsoriX"; version="0.4-1"; sha256="0j6lb7kvxw1lywq0jg8d26936521pyw5apz9k9cf34pb3hsa5qm2"; depends=[latticeExtra numDeriv proxy RandomFields raster rasterVis sp spaMM]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="0.11"; sha256="0nk3xs84mk4fkwlrxnrd5hn9h4ysdpn41m8j0sjmfcw4s5ar36fd"; depends=[MASS]; };
+  IsoriX = derive2 { name="IsoriX"; version="0.5"; sha256="177z16afx0ws1y99phhb3wpy5qpf9w1964rh0dxqrwr7xas20jlq"; depends=[latticeExtra numDeriv proxy raster rasterVis sp spaMM]; };
   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]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
@@ -1424,8 +1474,9 @@ in with self; {
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
   KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; };
+  KENDL = derive2 { name="KENDL"; version="1.0"; sha256="1w5d23l3fyxa0rf7nwnp4y8p4lxpf14kl0avpz6kwaxrizw3zgmk"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.2.5"; sha256="144yiwww0vn309dikhj8irppg021qjy3zi6m6yna14payplnqyxr"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.2.6"; sha256="0v03wx9rl73d880db680q1cnl8wcl6lkn4jfgk39kwlqb5348fb2"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
   KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
@@ -1444,7 +1495,7 @@ in with self; {
   Kernelheaping = derive2 { name="Kernelheaping"; version="1.6"; sha256="1xsszbx6srrgzdddr11pfrmfi985amjwngsrbhg8mgn58pwz3yiy"; depends=[ks MASS plyr sp sparr]; };
   Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
-  KnowBR = derive2 { name="KnowBR"; version="1.1"; sha256="10cnnr110wyzxlmh8w3gfp53dx9jww0bv95rly8rvp5bhrava8y5"; depends=[]; };
+  KnowBR = derive2 { name="KnowBR"; version="1.2"; sha256="1d2rzggj3jp8r748mrvk4c692xkmbim5avxjy30qzn3wmy15r479"; depends=[]; };
   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.0"; sha256="14c6ngc37xpxy5pd5jishaqz6aahky32p0x5bfsn5zirdahlphsa"; depends=[leaps]; };
@@ -1469,7 +1520,7 @@ in with self; {
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
   LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
-  LEGIT = derive2 { name="LEGIT"; version="1.0.0"; sha256="0j15z2krj7b1939vrvjhcr3aw5crjdrvn6llzzrkibrh71m4dscq"; depends=[formula_tools pROC]; };
+  LEGIT = derive2 { name="LEGIT"; version="1.0.4"; sha256="1va3y3mxjc41pridrk0lp0vb7ds4x93sv3i8h7h3dc9p58daw20j"; depends=[formula_tools pROC]; };
   LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; };
   LGEWIS = derive2 { name="LGEWIS"; version="0.2"; sha256="0aqvj6vphg33jfyfkj0zkdbp60a94jlc1vcsba2nyywc54qm9wjh"; depends=[CompQuadForm geeM pls SKAT]; };
   LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; };
@@ -1482,7 +1533,7 @@ in with self; {
   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.3"; sha256="0jgfdkzx8zhfjsmx828j1x1dmikqhdpgpqzr7nq8zyr4805l67xx"; depends=[MASS MultiLCIRT]; };
-  LNIRT = derive2 { name="LNIRT"; version="0.1.0"; sha256="0szcdp9vl1mifb3ybwi836xif7b57vk2jqp0zcadkfardjpc7pd0"; depends=[MASS]; };
+  LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; };
   LOST = derive2 { name="LOST"; version="1.2"; sha256="1ymdhd2iayqyf7kvvcc234bslxn1wdds54m1bi234g1f4ljj1qv8"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; };
@@ -1509,7 +1560,7 @@ in with self; {
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
   LTRCtrees = derive2 { name="LTRCtrees"; version="0.5.0"; sha256="18awxiln2ilr0jjyvkv47a3xy7v8rjlaksklb4pcn1kdlvb1nqf0"; depends=[interval partykit rpart survival]; };
   LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
-  LW1949 = derive2 { name="LW1949"; version="1.0.0"; sha256="0icfgsh93f4i73p7wpacb6dsg4cdfh71l7rwhqknnifvb5nvp8sv"; depends=[MASS mgcv plotrix]; };
+  LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; };
   LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; };
   LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="2.0"; sha256="0xqqq8glrq5c089riybviq3zv3la1pqhi2fcalrz3i9n2fc13nd1"; depends=[data_table maptools rgdal rgeos sp spdep]; };
   Lahman = derive2 { name="Lahman"; version="5.0-0"; sha256="03zfgsgf36lnsjlrqfh1npqnz52dhd6xyzs7k1sxygwy62lg03lx"; depends=[dplyr]; };
@@ -1519,13 +1570,13 @@ in with self; {
   Langevin = derive2 { name="Langevin"; version="1.2"; sha256="0iy1nh4wzipw8spmfr0kscdnpaz3cq4idkbl5khiia2jid0kimvl"; depends=[Rcpp RcppArmadillo]; };
   LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; };
   LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.0.1"; sha256="0yc6bv1mvs8ivrjgi49xz5bn4if24693rw148w5zxd11r3ryy8dy"; depends=[]; };
-  LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.1"; sha256="1vd47vf88qsac02sdnwag1zgvclnjw10apdbfkapxkik3xs0wkck"; depends=[Matrix Rcpp]; };
-  LatentREGpp = derive2 { name="LatentREGpp"; version="0.2.2"; sha256="0y00rf53bwmx3f6k637n3jh8597k96xm679li079ij5l7j9r2yb3"; depends=[ade4 BH FactoMineR fastGHQuad MASS mvtnorm numDeriv optimx paran randtoolbox Rcpp RSpectra sirt statmod]; };
+  LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; };
   Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
   LatticeKrig = derive2 { name="LatticeKrig"; version="6.2"; sha256="1d3qphpydgrqkyk5y5pr6jjndaf9vnfcin447x4z0iczannhggbk"; depends=[fields spam]; };
+  LeArEst = derive2 { name="LeArEst"; version="0.1.4"; sha256="0x4bwwrqkql9f01lgli3d9083ziihaj35afnz857ydrdx4ckhw4f"; depends=[conicfit jpeg opencpu]; };
   LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
-  LeafArea = derive2 { name="LeafArea"; version="0.1.5"; sha256="1a3yygpnc160qkwp3fd6aksynd533z5slncvby06byngqb42ib4h"; depends=[]; };
+  LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
   LendingClub = derive2 { name="LendingClub"; version="1.0.2"; sha256="1k7jvlmjyp5n45lz20as6v93lvgap766qlxp1chvv83ranh6dw3d"; depends=[dplyr httr jsonlite]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
@@ -1562,18 +1613,17 @@ in with self; {
   LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; };
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.7.3"; sha256="1g2dqar35rrnky9p8h14p63prq9x7fl629y2xkaf70gfkk1j4pg4"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.7.4"; sha256="11q444h0bk8il02rk3lhnh614zhzi9clc2wwimhmgbmlar0znbqh"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   M4comp = derive2 { name="M4comp"; version="0.0.1"; sha256="1lxm6qcbdp7i00vxbikhyl7pdxnz4czar10kh9xm0qwy8sl8lxg2"; depends=[]; };
   MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAINT_Data = derive2 { name="MAINT.Data"; version="1.0.1"; sha256="0qddlp4yfqfmswgjnfqlj9zqn6jdy94rzw92g0rl83iia9diqsmp"; depends=[MASS miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
-  MALDIquant = derive2 { name="MALDIquant"; version="1.16.1"; sha256="0058i0nc81qp7sj7j9bcy7s2vkmbacj5ycwdnvsfmsr172adxdar"; depends=[]; };
+  MALDIquant = derive2 { name="MALDIquant"; version="1.16.2"; sha256="0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
-  MAMA = derive2 { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; };
   MAMS = derive2 { name="MAMS"; version="1.01"; sha256="0vm1pnh5bcggsip4cpbfif2j2glvbsscpnpjsycbd2y0m05asccz"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
-  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.4"; sha256="1xw0wk2a14xwgay3vw7s1sxpwrmm01lqnfphcnhf1iyhdsxqnnnc"; depends=[magic MASS Matrix plotrix plyr]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.5"; sha256="1xh1nn2wipxyl8nj3vnpbyyww2np3pv12c78sf87kyl4q5c20v64"; depends=[ellipse magic MASS Matrix plotrix plyr]; };
   MAPA = derive2 { name="MAPA"; version="2.0.1"; sha256="013gp1wnw77nf1d9mvvw9zxs3dml9jvxd50nifx76bpkr00im940"; depends=[forecast RColorBrewer smooth]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
@@ -1589,8 +1639,8 @@ in with self; {
   MAc = derive2 { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
   MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
   MAd = derive2 { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; };
-  MBA = derive2 { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[BH sp]; };
-  MBC = derive2 { name="MBC"; version="0.10-1"; sha256="14y0adpm0h57b6r15hi69ri69kmfvxnacvxsspfhijyxhnwgnan6"; depends=[energy Matrix]; };
+  MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; };
+  MBC = derive2 { name="MBC"; version="0.10-2"; sha256="0c40k3m9z9cqk3778hwyy0i56qnsvw1dwpa6p9v097fbpacfsrg2"; depends=[energy Matrix]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
   MBESS = derive2 { name="MBESS"; version="4.2.0"; sha256="02d7wpsh58jq79ph9xxx33ikzb4j05kdfmjy935gyx3i3mycapm1"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; };
   MBHdesign = derive2 { name="MBHdesign"; version="1.0.61"; sha256="1ahc3xwwgfn052m674l2cxjw87qgp788hzx30z56dihfpirvw45f"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
@@ -1609,6 +1659,7 @@ in with self; {
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.24"; sha256="0s2x8kazn3g3x3z4ji95c5vmfj8awcjmx92c0alsj5ms1bqxsh7x"; depends=[ape coda corpcor cubature Matrix tensorA]; };
   MCMCpack = derive2 { name="MCMCpack"; version="1.3-9"; sha256="0wvv7qzrm1h5w4znz6dqypyxdj5ckpsljid1l9cs1xl9mnjfgpay"; depends=[coda lattice MASS mcmc quantreg]; };
+  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.6"; sha256="1gz01jqi4w0lnp4mkxa5ri09hkc4c2qwxifbmx50m75rhr0328hr"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   MCMCvis = derive2 { name="MCMCvis"; version="0.7.1"; sha256="1hqkxqs1s0m1znqlf6bjx5nscqv8galnkxgp738pcvvw0mwn19pk"; depends=[coda rstan]; };
   MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-9"; sha256="03zqassvyqwllg1yjfdg2zxamkg2dy8cy19ki5srpn6clv5zy1rj"; depends=[lattice mvtnorm]; };
@@ -1618,15 +1669,15 @@ in with self; {
   MChtest = derive2 { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
   MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
   MDM = derive2 { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
-  MDMR = derive2 { name="MDMR"; version="0.4.3"; sha256="0vgqdvvryyyzibpfwax8qx45phc9iwb5rwgqpcp21d32z0n7a56f"; depends=[CompQuadForm]; };
-  MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[linprog Matrix]; };
+  MDMR = derive2 { name="MDMR"; version="0.5.0"; sha256="185qdm39mydsb7h09j0763a13wd84h0w8rx2g0xwdynp2rakkw75"; depends=[car CompQuadForm lme4]; };
+  MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; };
   MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
   MDplot = derive2 { name="MDplot"; version="1.0.0"; sha256="18q25qxwqd8jwn8y781xqisd15k9p81nmxkx41pyi703njav1fm1"; depends=[gplots gtools MASS RColorBrewer]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
-  MESS = derive2 { name="MESS"; version="0.4-3"; sha256="0317nk2lbrrflg6gaz7nz413n4i79xvh6jndw0m4dzlwmcj6al2r"; depends=[geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  MESS = derive2 { name="MESS"; version="0.4-15"; sha256="0cfhbl099znjyij6sfhp5ma7yk1cj20paqixdy8lrif31mgkibd0"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
   MEclustnet = derive2 { name="MEclustnet"; version="1.1"; sha256="1ayyrxdb9qd7fxnr8y2lbjcd2c8m38mjm1ks6z22vyddbhkf78in"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; };
   MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
@@ -1635,7 +1686,7 @@ in with self; {
   MFPCA = derive2 { name="MFPCA"; version="1.0-1"; sha256="0sw8svp0zgdl2yyvf3jq3c3kai6pnnn93cizgyjdc63y74k3n3pz"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
-  MGLM = derive2 { name="MGLM"; version="0.0.7"; sha256="0wqwdx8gskrp2y04f947m0cvgd685n8g3wgggc8sv0ra7z2qzx9y"; depends=[]; };
+  MGLM = derive2 { name="MGLM"; version="0.0.8"; sha256="1yzi679jm7x9qkz0d3az84clkjfc7wjnxkk6n6s6ia4bnw05d5v7"; depends=[]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
   MHTdiscrete = derive2 { name="MHTdiscrete"; version="0.1.3"; sha256="14qhrja5b2nxph3mda55y31jix41i6w884m9yl4c0f9g730ai7l6"; depends=[]; };
@@ -1656,14 +1707,14 @@ in with self; {
   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.0"; sha256="1zbydvw4sv5q0lh2d4z0alrlc28dy6xnxd67iq8qd0k28gpwnzd1"; depends=[lme4 nlme]; };
+  MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
   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]; };
   MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
-  MMDai = derive2 { name="MMDai"; version="1.0.1"; sha256="0bh25yhdyk5i4gh4h6f5i8gkwympy3i2xwlkgrj18jzghyy02rx2"; depends=[DirichletReg]; };
+  MMDai = derive2 { name="MMDai"; version="1.2.0"; sha256="083007bp3spgjx9y65hwk6074yky1sf5n7w44pfnxzrjbc7d0qhb"; depends=[DirichletReg]; };
   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=[]; };
@@ -1674,6 +1725,8 @@ in with self; {
   MODIS = derive2 { name="MODIS"; version="1.0.0"; sha256="05p4lisdbpzvq42pvfc2hdqr5p16gkr85g4bcc5j4h4f4cva5drl"; depends=[bitops mapdata maps ptw raster RCurl rgdal rgeos sp XML]; };
   MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; };
   MODISTools = derive2 { name="MODISTools"; version="0.95.1"; sha256="099xh987phvya67b75c8j4z58zpqf69q3qxh280l9ka3w6pq3ljm"; depends=[RCurl XML]; };
+  MODIStsp = derive2 { name="MODIStsp"; version="1.3.2"; sha256="1qsw7s1skkfadyap3w8z1rb9yjls154wp7a2fa2ifxm9164976b8"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 hash httr pacman plyr raster RCurl rgdal rgeos RJSONIO sp stringr XML xts]; };
+  MOEADr = derive2 { name="MOEADr"; version="0.2.1"; sha256="0m5nbr2xcy9nl808ydsn07w0p3pl2cd7dqfz9mk0z52mghvz390f"; depends=[assertthat FNN]; };
   MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
   MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
   MPAgenomics = derive2 { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[cghseg changepoint glmnet HDPenReg R_utils spikeslab]; };
@@ -1700,11 +1753,12 @@ in with self; {
   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]; };
-  MST = derive2 { name="MST"; version="1.3"; sha256="0qxkwkb13g6jqsiwa44izp2f3swzc7zhkprpl2qlxfs6sszr9v36"; depends=[MASS partykit survival]; };
+  MST = derive2 { name="MST"; version="2.0"; sha256="131c98lzy1cs1gbv20nv9r6yhlyyhk43hh1mrx12k1cgw299265k"; depends=[Formula MASS partykit survival]; };
   MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; };
   MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
   MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
   MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
+  MTA = derive2 { name="MTA"; version="0.1.0"; sha256="0h1nnvylp5yvzx6mljayjjz73l0bjyz5zahymxa9z3z7jlahvkwh"; depends=[igraph rgeos sp]; };
   MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; };
   MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
   MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; };
@@ -1712,20 +1766,20 @@ in with self; {
   MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
   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.0.1"; sha256="1vl6wn7ryn529bhx2l5frw89dqn79bnk4qfih4mj1dyycwh3h4fj"; depends=[CompQuadForm]; };
+  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]; };
   MVR = derive2 { name="MVR"; version="1.31.0"; sha256="114qv235dmbmdlg2dssbgn0bj78r6khg58xswvv98d58kfypw581"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
-  MVar_pt = derive2 { name="MVar.pt"; version="1.9.7"; sha256="1d5xgq3ydzv69v5dazkmmbxgag530cx5m1a3566kxkdk02rd8i71"; depends=[]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="1.9.8"; sha256="0ysdrdjlljbscw92ylyq4m22zvj3b9yp9mpw4pdlnzwix9z0k2yx"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
-  MXM = derive2 { name="MXM"; version="0.9.8"; sha256="1bi8lkw3dx5m2p6r8yr60ysxs0ijkaahjvh7c8q7vlg8116fdvbp"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; };
+  MXM = derive2 { name="MXM"; version="0.9.9"; sha256="1d6k941psi7d4ycsalvbi8n6xhahj235fgq75izjvnwxbs0j704b"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
   MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; };
   MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; };
   Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; };
-  ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.2"; sha256="0ywkd4i9bxavxffh89sxcz995vfnk1czcvcjdwzbvrpxa5fwbx79"; depends=[Rcpp RcppArmadillo]; };
+  ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.3"; sha256="1ppc0ik7vx14n6alq9wpykgfacg78ph9fc5r9k9jqm55nwz4d3xh"; depends=[Rcpp RcppArmadillo]; };
   ManlyMix = derive2 { name="ManlyMix"; version="0.1.7"; sha256="10m5kfs8n34frygn36ryn4h8128p4smmr5s2ngbbj05dchni09ai"; depends=[]; };
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; };
@@ -1733,7 +1787,7 @@ in with self; {
   MareyMap = derive2 { name="MareyMap"; version="1.3.3"; sha256="0d8prx08321f0p42xbnf0b1446fq4km35xs3ih5ssbdm14q7fnln"; depends=[tkrplot]; };
   MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; };
   MasterBayes = derive2 { name="MasterBayes"; version="2.54"; sha256="016xk43mhl4249p3wsx0v68b69nmp7zllaa0c1in5l18g5v0npi0"; depends=[coda genetics gtools kinship2]; };
-  MatchIt = derive2 { name="MatchIt"; version="2.4-22"; sha256="16j7kwnr94736p58a9fsjydkbixm71jgdmgfcvmr26c8r5q89042"; depends=[MASS]; };
+  MatchIt = derive2 { name="MatchIt"; version="3.0.1"; sha256="0iifn286ssdavpg3ajlmd5z7n5wn0rsj3l23xf6qnvij35k95kbw"; depends=[MASS Matching rgenoud]; };
   MatchItSE = derive2 { name="MatchItSE"; version="1.0"; sha256="01ghv3hdlsx6ypvsh7k0mi20yc8vg7z602mhcprhhh97qsb81v6h"; depends=[Rcpp RcppArmadillo]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; };
@@ -1747,13 +1801,15 @@ in with self; {
   MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.0"; sha256="1ylz51b9k6bi6xm1aarv7aff1n35bwb66nk1vzzkyqn9pylhmcmw"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-2"; sha256="0mk5h9bafy1ndi1h6vcjh285xfj38gjpiz6n8xcmp8zh6vi6gx70"; depends=[ggplot2 raster]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.8"; sha256="007i1zmklcmj76kmyl60wvcgb9vzrn677k81n5mmfz36vr0zkp8f"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; };
+  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.9"; sha256="19j8mxlhwkr9safgs685kwz1b85z1mplihcjd1m7yc3sdpvmnsdd"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.6"; sha256="01m2kawkxs9k7va3bvv7bknl4y13rhy8zczc093f10msgy6nqncl"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
+  MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.0"; sha256="1gggia97ww4kiqhh2lnsmadgdxvpr36mdx1yrbgarj0sp6ilrd3l"; depends=[]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.4"; sha256="0kk9gv2dzhg1y8s68aws327ysx33cy622djbfd5isbr7ikv2h80v"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
+  Meiosis = derive2 { name="Meiosis"; version="1.0.0"; sha256="0p8csgxpf898gk4kxnxhp1m0bl5kwqzhzj7l18072x2qi9cmb8gh"; depends=[BH Rcpp]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.2.0"; sha256="1rnsjrvshj41srbzrplfhqw5y68dab489rjn5bdhrk1lm0vz0zvc"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; };
   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]; };
@@ -1773,7 +1829,7 @@ in with self; {
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
   MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
   MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; };
-  MetaboList = derive2 { name="MetaboList"; version="1.0"; sha256="0gfv093l5s5gy98qcz49kr1qk8afkz1hm0hrd9a7k4r54fn6vx3c"; depends=[enviPick]; };
+  MetaboList = derive2 { name="MetaboList"; version="1.1"; sha256="19vgf3y0r926dnpj1711607x5cjk8hmz2kzfgyhabq7mk2djdbbb"; depends=[enviPick]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
@@ -1815,14 +1871,15 @@ in with self; {
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; };
-  Momocs = derive2 { name="Momocs"; version="1.1.0"; sha256="0r9q1ag25fcj9zl0vd5d6c6ijpildmqi2p7fnmhcp023x026sy2v"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; };
+  Momocs = derive2 { name="Momocs"; version="1.1.6"; sha256="15rmda0d270wallhn9f0nksms194js3vy71cii0aih02rwcpg9kw"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
   MonetDBLite = derive2 { name="MonetDBLite"; version="0.3.1"; sha256="1lbymf7kh3jag7qhb873mw2g66xp1589w2linp0r7kx0ia86rqd3"; depends=[codetools DBI digest]; };
   MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; };
   MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-8"; sha256="1dd2m4c726j94cxwsma33sc166c9656m7sl2b29bg6i0bmpvpmd2"; depends=[quadprog]; };
-  Morpho = derive2 { name="Morpho"; version="2.4.1.1"; sha256="0wshfxxkbwwnj92law22wdfxw8hai1s576hi6gq2lda0684ccyvb"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
+  MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.1"; sha256="0y76fg7s9i3s5iqrmirb797swg03y9akvn3ixg4gxm68diswsl8n"; depends=[abind codetools rlecuyer snow snowfall]; };
+  Morpho = derive2 { name="Morpho"; version="2.5"; sha256="0gy34ksl5ykfvjpnlk5z6jc9npxdp5vbxfc7yvsbcaciy8x1qc1m"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortHump = derive2 { name="MortHump"; version="0.1"; sha256="0wks6kis1fa7vgcmwhaq57zrlk5m0c5rgkfipz64phky02c7v4c2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer WeightedCluster]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
@@ -1845,15 +1902,16 @@ in with self; {
   MultiPhen = derive2 { name="MultiPhen"; version="2.0.1"; sha256="1gvsivx8qz5yl4rc4db8sg2llg8s4bgkg22aanvr01h649a08m16"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; };
   MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; };
   MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
+  MultiVarSel = derive2 { name="MultiVarSel"; version="1.0"; sha256="0r1l7h2rm7vlvnrsq0khjdd5cb236g9xq1fb1vr15038kf0lmkij"; depends=[ggplot2 glmnet Matrix]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
   MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.1"; sha256="0x13q2kckw7c7bl35vdxyhhr7ij62wf0qbkxa40fi6aq2gjh89m6"; depends=[lme4 Matrix statmod]; };
   MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.2"; sha256="1xp1bdkp87kvgsg4q5b91r712l6sdvmlcvaychi72pvgv33a8x11"; depends=[bootstrap Rcpp]; };
   MvBinary = derive2 { name="MvBinary"; version="1.1"; sha256="1lrrxvphxv4gmlazx67q4bck9373nqylqgkwcjzwb52291a3zyiv"; depends=[mgcv]; };
   Myrrix = derive2 { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
-  NADA = derive2 { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
+  NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
-  NAM = derive2 { name="NAM"; version="1.5.0"; sha256="01p0xncaly7pxc9fpiqh77z0pq6cbbskj40r7rhhbiad5pdihb0r"; depends=[randomForest Rcpp]; };
+  NAM = derive2 { name="NAM"; version="1.5.1"; sha256="0k3dkkrisqx71srma4lwkyk1rayhyjr0h91lzx3l2yal9r12flpc"; depends=[randomForest Rcpp]; };
   NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; };
@@ -1866,6 +1924,7 @@ in with self; {
   NFP = derive2 { name="NFP"; version="0.99.2"; sha256="1wnllzlww8257sbrgvfyvd21qvhf7j17mcpf6d4p6binaw8svnsb"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; };
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
+  NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
   NHMM = derive2 { name="NHMM"; version="3.7"; sha256="0h6m01y42yswjgx3cfj4xwj0wq9nw0gzjz7vf9prm3vag3wnfs2q"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
   NHMSAR = derive2 { name="NHMSAR"; version="1.4"; sha256="12szfj9lssx2x3ng99q34f2knn4b7588dz8b307fhqj4r0f8iqh3"; depends=[caTools glasso lars ncvreg SIS ucminf]; };
   NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
@@ -1880,7 +1939,7 @@ in with self; {
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
   NMOF = derive2 { name="NMOF"; version="0.40-0"; sha256="1zxbhpcl82v0wvp4dfpavwckvfyd2a9f4pbghk4mgqi0vhl8fgpz"; depends=[]; };
   NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; };
-  NNS = derive2 { name="NNS"; version="0.2.6"; sha256="0lynyfj5njvk2smlp9l83fri6308kr6bblckz31wwk3bpy0mlh4c"; depends=[rgl]; };
+  NNS = derive2 { name="NNS"; version="0.3.1"; sha256="15aczifs0dbqixaqg7w97cxc17hvphgzdg56zzzfjdwr4y9g2jrk"; depends=[data_table rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
@@ -1895,7 +1954,7 @@ in with self; {
   NPMPM = derive2 { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
-  NPflow = derive2 { name="NPflow"; version="0.10.1"; sha256="0lq3xchw932qjfk0akvxqpy50jnn4gwmyghvb8iabc7scl6px97n"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
+  NPflow = derive2 { name="NPflow"; version="0.12.0"; sha256="0vdnhwls80yaqh9mnfprks4l609jf4vcic1x99rji1gjmawhs93r"; 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.9"; sha256="0ianzczznigkbialzdm43w9wkgnsx24393v7hnxcvxqczzhl795h"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
@@ -1918,8 +1977,10 @@ in with self; {
   NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; };
+  NetworkChange = derive2 { name="NetworkChange"; version="0.1"; sha256="1820zw6gwf3qy7c1qwi32ww08by1amwajrqqw5zsgkh935xrx1sz"; depends=[abind ggplot2 LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
   NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; };
-  NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.1"; sha256="0lgkj7r2rsf91ig5f1w85vpzy8aa43pk8vjif15ci3any82yz4is"; depends=[dplyr expm ggplot2 Matrix]; };
+  NetworkInference = derive2 { name="NetworkInference"; version="1.0.0"; sha256="1x0p20v5imh3ixypdnnjqsvk83lxr8v0i2irvmzxwaq5m0j1pfzc"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; };
+  NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.0"; sha256="04r0716vlv54cjybxspq61ahb12f2i8krhils5layr436k7slm07"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
@@ -1928,15 +1989,15 @@ in with self; {
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
-  NonCompart = derive2 { name="NonCompart"; version="0.2.6"; sha256="1zvpgdir2wzbg20l4v2fdpf1f3kw78pzx7kg1m8v83738f9jhc3a"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.3.0"; sha256="0c6sdsigfmkan1q728n6v3s2lyg0y24cdbl7xdjfgdwsvg67kbdb"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; };
-  NormPsy = derive2 { name="NormPsy"; version="1.0.4"; sha256="07xx3n9g8ka9k6zqkx1963nqbqi6qlnkxy0fary7l1arv7vjly4s"; depends=[lcmm]; };
+  NormPsy = derive2 { name="NormPsy"; version="1.0.5"; sha256="0zhv6p9ffm2g02nr302j3qc6mrk5n4xxznircgbp4jx7hcj7cf1m"; depends=[lcmm]; };
   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]; };
   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=[]; };
   OAIHarvester = derive2 { name="OAIHarvester"; version="0.2-2"; sha256="0r3yz8x123f0p9d165074ylnmf3hkyyc4h1758018m9iqj5cqp2h"; depends=[curl XML]; };
-  OBsMD = derive2 { name="OBsMD"; version="0.1-0.4"; sha256="00hakq94lkkx9iscxm3sv4hslyqsnjcxs74l6v89bm8p5ds8dlzl"; depends=[]; };
+  OBsMD = derive2 { name="OBsMD"; version="0.2-0.00"; sha256="16km0v6678lbgh9n2d9nvmpq6k7d2gicc68wnfy4kvn9vmpr79cz"; depends=[Rcpp]; };
   OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; };
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   ODMconverter = derive2 { name="ODMconverter"; version="2.3"; sha256="07j9p2hfx3almd5n3j0clc1alj5wzrnzljd9w13bbd6nrvil1krm"; depends=[xlsx XML]; };
@@ -1956,10 +2017,11 @@ in with self; {
   ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
   ORIClust = derive2 { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
   ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
-  OSMscale = derive2 { name="OSMscale"; version="0.4.1"; sha256="175m15mas5kpqq93czlgiimkxvl4mg40dw04il1jnk4gypj4ifjq"; depends=[berryFunctions OpenStreetMap sp]; };
+  OSCV = derive2 { name="OSCV"; version="1.0"; sha256="17wrfak6b6m2l3iqbhdwcfh0rlqb14rkvrbari7v46gya9v7hq20"; depends=[mc2d]; };
+  OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; };
   OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; };
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
-  OTUtable = derive2 { name="OTUtable"; version="1.0.0"; sha256="0wdzi1ii5hwvr2fby26ydc4jhwl0gyi24jnl4yib6621hnjgv10y"; depends=[]; };
+  OTUtable = derive2 { name="OTUtable"; version="1.1.0"; sha256="1q1vr5jkzmx2ha119af8hxml23l7lla32ap7g7nzlrdmbnbhzv80"; depends=[]; };
   OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
   Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="2.0.1"; sha256="0knkq33yf0b5flbkmc5ng4ys4x840rzkfrr26jcp7ri3bqg87lqv"; depends=[birk rgdal rgeos spdep]; };
@@ -1974,10 +2036,10 @@ in with self; {
   OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest 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.4"; sha256="1bzfbfckc7yaflsd74c5zs2ig4rkd3q9fzxxrw4kc0vgijalyf3p"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
-  OpenML = derive2 { name="OpenML"; version="1.2"; sha256="16zvxr45jcw4z30jmg9l6xdlkq76wbi89xj8c328qkwlghik17sy"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
+  OpenImageR = derive2 { name="OpenImageR"; version="1.0.5"; sha256="152vmms1phaqqipl6xgmi24pzf26a0m28kj26snjyhz4cg8sqhai"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
+  OpenML = derive2 { name="OpenML"; version="1.3"; sha256="0gp8d6prkjwjwbk3wp59z7l2y9950pcz1kn2vab37990axw64gyd"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.7.4"; sha256="18zgypwjd37fcmsc3gzsa3ww6b7l9y9sm7jgj5x79hzqn0mfknfv"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.7.10"; sha256="1q08c1pjy2q3kjfb62qx13g0sxkp2pkxs7x8vikb740ck52vfcrh"; 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]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; };
@@ -2001,9 +2063,9 @@ 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.6"; sha256="04jbyxgw8cpbjajlnal66y1kfjnxd4v6gp32wg7cdp7cmz0yxbii"; depends=[dplyr igraph parmigene Rcpp]; };
+  PAC = derive2 { name="PAC"; version="1.0.7"; sha256="0khrhn7f6sps8qyivn7vs60vycfhvzllwcgfszk1fvnwgahg5918"; depends=[dplyr igraph infotheo parmigene Rcpp]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
-  PAFit = derive2 { name="PAFit"; version="0.9.6"; sha256="0jallwvzrjw4vv1gnszlhx6jv8g67wx41kgcil0yz8867wf1sxkb"; depends=[RColorBrewer Rcpp VGAM]; };
+  PAFit = derive2 { name="PAFit"; version="0.9.9.0"; sha256="0m8q3rahi41zp75b8g9nbyq1ldbx0hkfknn1pchgc2vxppn973cr"; depends=[magicaxis MASS RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
@@ -2025,9 +2087,11 @@ in with self; {
   PBSmapping = derive2 { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; };
   PBSmodelling = derive2 { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
   PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
+  PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; };
   PCAmixdata = derive2 { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
   PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
-  PCGSE = derive2 { name="PCGSE"; version="0.3"; sha256="1fb4in6b8d5n0zjfys33y35n3srqpzrnyk2qhzvpjsjf7jmn9898"; depends=[MASS RMTstat safe]; };
+  PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; };
+  PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
   PCICt = derive2 { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
   PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; };
@@ -2035,7 +2099,7 @@ in with self; {
   PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; };
   PCovR = derive2 { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation MASS Matrix ThreeWay]; };
   PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; };
-  PDQutils = derive2 { name="PDQutils"; version="0.1.5"; sha256="1k9zfdsxyn384ymq920y0p0fps6svlq08sp13ayg0mindsswmp3k"; depends=[moments orthopolynom]; };
+  PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; };
   PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
   PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; };
   PEIP = derive2 { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix pracma RSEIS]; };
@@ -2044,7 +2108,6 @@ in with self; {
   PGEE = derive2 { name="PGEE"; version="1.4"; sha256="1hzqx1a3zgg07dqw7yyykvlaxjqpr04ch48bmnl4byy6izfghy8m"; depends=[MASS mvtnorm]; };
   PGICA = derive2 { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
-  PGRdup = derive2 { name="PGRdup"; version="0.2.3"; sha256="10nm71kj746ap7qx1qr7y8xm3m732blkaac20lwif2zljl3cy2dl"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3"; sha256="1b9sxy2slfzls2snif738sjw34k3hs2i55g1yb1kbx06702q47ak"; depends=[ppcor SuppDists]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
   PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
@@ -2066,9 +2129,11 @@ in with self; {
   PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; };
+  POUMM = derive2 { name="POUMM"; version="1.2.2"; sha256="0j44qlwx602iy7n6xj40v7gg5dsfrn4zqmkb89bji8fjixpnyhaa"; depends=[ape coda data_table foreach GGally ggplot2 gsl Matrix Rcpp RcppArmadillo]; };
   PP = derive2 { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
+  PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; };
   PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
@@ -2081,19 +2146,19 @@ in with self; {
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   PSCBS = derive2 { name="PSCBS"; version="0.62.0"; sha256="15r3rpqd4fpnssbbpkw0vxmgl3akid5r8n20nvr50bfzrl0w8j7f"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.3"; sha256="0x2w0prcnyy82zvr0g2h18rc67r8wzvax3h9psk9dd4il8s4xfpw"; depends=[cluster data_table forecast knitr]; };
-  PSM = derive2 { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; };
   PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; };
   PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
-  PTXQC = derive2 { name="PTXQC"; version="0.82.2"; sha256="1slx4c2s3agrpfxhr4fs2gy9mhiqvnhsqs06m2wkan909fkjdw1z"; depends=[data_table ggdendro ggplot2 gridExtra gtable plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
+  PTXQC = derive2 { name="PTXQC"; version="0.82.3"; sha256="1nhdqdv6nsgm3y9d5j5r1142h8vkw6k7frg1rv71z49bf4zw2l4j"; depends=[data_table ggdendro ggplot2 gridExtra gtable plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
   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.0.0"; sha256="1m2wg0fzmlf9xbynr7mw6izkjp3r32fm4l6njrfkcr9gqfz2dab8"; depends=[survival]; };
+  PWEALL = derive2 { name="PWEALL"; version="1.1.0"; sha256="0k66wzyvy89zfnsyrgbj5vr4w6c008lw2jlfkrm11l01vvgy7wgf"; depends=[survival]; };
+  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="0.99.9"; sha256="019kggrp956jry59qg5s2jwy7mcg3vvjf9741q2zvxhr0dqn86ps"; depends=[cluster dplyr dygraphs futile_logger ggmap httr leaflet lubridate mapproj maps maptools MazamaSpatialUtils openair png RColorBrewer RCurl readr reshape2 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]; };
   PairedData = derive2 { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
-  PanJen = derive2 { name="PanJen"; version="1.1"; sha256="00bvmwskawmi4x89wcn6k37nrdxfil7j1n6kc368yxvrfwvxgssy"; depends=[Formula lasso2 mgcv RColorBrewer]; };
+  PanJen = derive2 { name="PanJen"; version="1.3"; sha256="1n7qw3vwppv1dfpp5z2ybcy9gg73kk0zbzmdi4f5y1fri2d1sli4"; depends=[Formula lasso2 mgcv RColorBrewer]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
@@ -2104,20 +2169,19 @@ in with self; {
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
   Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.0"; sha256="1wwfq0zwf2b2wlq4pwhw92d02f715l7bkc0si7gndk0mp2pibcrx"; depends=[]; };
-  Pasha = derive2 { name="Pasha"; version="0.99.21"; sha256="0z77n5wplapdfcqxbak7mg58a9nnnwwqcznah5lswlwa0prz18jc"; depends=[Biostrings bitops GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
   PathSelectMP = derive2 { name="PathSelectMP"; version="1.0"; sha256="19gkd7il4whxp1mm4pinlrl8yj09b5sknz8c4g75n2hhh96libns"; depends=[mice MplusAutomation]; };
   PatternClass = derive2 { name="PatternClass"; version="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; };
   PdPDB = derive2 { name="PdPDB"; version="1.0"; sha256="1rnphdklyzznpzf57gwlnr498612d54kl5jkqnza6h8if7nqr4kd"; depends=[plyr]; };
   Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; };
   Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
-  PearsonDS = derive2 { name="PearsonDS"; version="0.98"; sha256="11y44j7js67k4kgg2rdc3y23ckaih63fvm5li7z6p6d8anlx1fcv"; depends=[]; };
+  PearsonDS = derive2 { name="PearsonDS"; version="1.0"; sha256="1fnlkadq53vl0gn3b066kvxh1s3pljkpxlpfbyp8jcyp8gxm6i8n"; depends=[]; };
   PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
   PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   PeerPerformance = derive2 { name="PeerPerformance"; version="2.1.2"; sha256="07as5csvrlr3a55miadhbcvjrjag7g69wxmb8z7rpipppa8f9q7y"; depends=[lmtest sandwich snow]; };
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
-  Peptides = derive2 { name="Peptides"; version="1.2.1"; sha256="0s6d3b9qgc38az11pa7r427dzcfhf2a2hl4c97av8c43hfvyrnzi"; depends=[]; };
+  Peptides = derive2 { name="Peptides"; version="2.0.0"; sha256="0m0xhimi5pjc8nd0n9x83zwciaa14yjixfmwnnaxrmq0b7abgs0b"; depends=[]; };
   PerFit = derive2 { name="PerFit"; version="1.4.1"; sha256="0mzd9yrgsswxlhljlk8nxi0dhy3k4a9jax9w9c9s29j4m7z9jf01"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.12"; sha256="0f886q0vgplrprzwrjcjh4g92i1nzkzpzp4qhr4n9kkz8rrxf125"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; };
@@ -2149,28 +2213,29 @@ in with self; {
   PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
   PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.1"; sha256="02xa028jrc50fmrasidjsh5h6z9i8gyyc68q6809ic1bs23sq06i"; depends=[BB corpcor Matrix mvtnorm]; };
   PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.2"; sha256="0ig3iqj0h2v4a4ahf8l2nfvjx4846skkdk5sb7qab8bkqqqkmbpy"; depends=[corpcor GenOrd Matrix mvtnorm]; };
-  PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.2"; sha256="0bpgr3zzma04l8652da39vifszjyq17sx2hdq5nsqw3fb2s13zyh"; depends=[BB corpcor GenOrd MASS Matrix]; };
-  PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.3"; sha256="0y29p06q977qiybzgay7yx779blv29b8i1vmxfwklc5bm3xiplri"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
-  PoisNonNor = derive2 { name="PoisNonNor"; version="1.2"; sha256="01mixrlpk1vcqh9v5qiz9vkn9rkwks3hss91sjyyw3jjqpggxvp6"; depends=[BB corpcor MASS Matrix]; };
+  PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.3"; sha256="0cwp9zkw89bdvak7jrjmw0n1c1xkkw0kb1l5kn8vrpm7xkwzva8h"; depends=[BB corpcor GenOrd MASS Matrix]; };
+  PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.4"; sha256="0sgj76crzb7byi0nbx50y0v8zr02b8jl1qfzapj46l2f8z78vkrm"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
+  PoisNonNor = derive2 { name="PoisNonNor"; version="1.3"; sha256="0p39sad9wiwrhgg9vdx0gzgd4kf2wwxjzmyav04q8ijbmqp0mjbw"; depends=[BB corpcor MASS Matrix]; };
   PoisNor = derive2 { name="PoisNor"; version="1.1"; sha256="0z5h8rdb7kjqzasrdvkpkvwv05rfazv92cza8pln1qrvi6cdk5f3"; depends=[corpcor Matrix mvtnorm]; };
   PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
+  Polychrome = derive2 { name="Polychrome"; version="0.8.2"; sha256="1ab7vzvrql7j8d1z5ki7dl5s03b5c9vphx5wd6v8cv1nadxfyqgc"; depends=[colorspace rgl]; };
   PolynomF = derive2 { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
   Pomic = derive2 { name="Pomic"; version="1.0.3"; sha256="16c0z50zlr9vb1g3j7zdgm2nx595mbwmr4hry184fvkv2hrkk4xc"; depends=[]; };
   PopED = derive2 { name="PopED"; version="0.3.2"; sha256="1lvzqpij4dqbw144ya25bhlx96mwaxz932r0bl3jsx1si9ijb8xz"; depends=[codetools dplyr ggplot2 MASS mvtnorm]; };
   PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
   PopGenReport = derive2 { name="PopGenReport"; version="3.0.0"; sha256="0z4g7ll3dk9mgawnn7k0ysgj8w55adivc4zcrr898x399g7vnfx4"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
-  PopGenome = derive2 { name="PopGenome"; version="2.2.0"; sha256="1rwqv7pa5is2ciyx25q042jxk7jwvr7v64r2z32ak8dc1218x35a"; depends=[ff]; };
+  PopGenome = derive2 { name="PopGenome"; version="2.2.3"; sha256="1v8gwsp45vbqrbvcg4z6s29mnqii7a0cjm4df8y6lyh296xqma7w"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
   PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
   PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; };
-  PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.7"; sha256="043bpyrzl5r7gifi450l162sp7l5pgb1p6arfbf118i0jg0m61j9"; depends=[ggplot2 rJava zoo]; };
+  PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; };
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
   PoweR = derive2 { name="PoweR"; version="1.0.5"; sha256="0zr2p2hyxdh194n3s0g71q9zyvl67czp0wc39zl3fivfk3zkf98r"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.4-5"; sha256="0wjry83dkrnl6bblb0688hx5ihwwkya05dwb9nrnv39033ksd0a9"; depends=[mvtnorm PowerTOST]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.4-3"; sha256="1yxxg0y8w6g5138wznd3fil3pmizb20ar1h5gavlbil5b1bhhm44"; depends=[cubature mvtnorm]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.4-4"; sha256="0dy2zwq2f1g9j295ppc3mwdxabh88kkkw81l0cq8qsvz886iz1mf"; depends=[cubature mvtnorm]; };
   PowerUpR = derive2 { name="PowerUpR"; version="0.1.3"; sha256="1znhkyxl8qrs288zf0cr6sxgq6ir029fmilda0k73scc6k1jxz7f"; depends=[nloptr]; };
   PracTools = derive2 { name="PracTools"; version="0.4"; sha256="1klknzbpgjyvrws6d7gwrdmglc16xag3pa3i8rk0zg62wvyb4l1v"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
@@ -2188,7 +2253,7 @@ in with self; {
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
   ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; };
   ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; };
-  ProfessR = derive2 { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; };
+  ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
   ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.7"; sha256="0jf8r9lbczvjvnzf15lz6fm31naxm1fpqni88484yrd6vpxjacq6"; depends=[]; };
@@ -2207,8 +2272,7 @@ in with self; {
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   PwrGSD = derive2 { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-3"; sha256="0p4h30wqsz8czz6r4xjg5q79190hq242x9fsaw7v5433px1gmr44"; depends=[pack R6]; };
-  QCA = derive2 { name="QCA"; version="2.5"; sha256="0f0gia23aqkhvxna15vcck75im4r3nc6mbs1svg5hldc33088wh7"; depends=[fastdigest lpSolve shiny venn]; };
-  QCA3 = derive2 { name="QCA3"; version="0.0-8"; sha256="1cqk5hhx57c4ayg0kn4gz3sfwm1jik96a80psfyb7cnmbxwdgw2s"; depends=[lpSolveAPI]; };
+  QCA = derive2 { name="QCA"; version="2.6"; sha256="1f518s990i23yiddkp2d756864nfkk6zadrl373ibqlgl3ahp74b"; depends=[fastdigest lpSolve shiny venn]; };
   QCAGUI = derive2 { name="QCAGUI"; version="2.5"; sha256="1v15rd5wmdx1zdssklbchw71cr9v1mjp1mfkv5kg2xa3hp0x2hz9"; depends=[QCA]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCApro = derive2 { name="QCApro"; version="1.1-1"; sha256="0rp1mcgp21m4wi301kwb7vzilb4z0pq78h9wavkpyxnq0ch6hnlh"; depends=[lpSolve]; };
@@ -2220,7 +2284,7 @@ in with self; {
   QFASA = derive2 { name="QFASA"; version="1.0.2"; sha256="1gfclbalcfcfmb8bq7rp8kpnaqblai9y7n7n7zh4a3qmia5vrz2b"; depends=[Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
   QGglmm = derive2 { name="QGglmm"; version="0.5.1"; sha256="1112w9dwbr9smxa869w4833iw1vclscr1zbjn2f0xklnpn3nb40d"; depends=[mvtnorm R2Cuba]; };
-  QICD = derive2 { name="QICD"; version="1.1.1"; sha256="0mg17w62yzgslifbc08vglsxwiczicgzilczidpjwlcrg3lq8jjc"; depends=[]; };
+  QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; };
   QNB = derive2 { name="QNB"; version="1.1.7"; sha256="1xakzwsaf5297nxx5a193ji0dn30rw3yly4rhdjqabgrh3fgzv92"; depends=[locfit]; };
   QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; };
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
@@ -2242,7 +2306,7 @@ in with self; {
   QuantTools = derive2 { name="QuantTools"; version="0.5.4"; sha256="01xn9ksb2v3glqpxhdizp8b0786azkm8kv6xxdqk3q7ysm44lac1"; depends=[data_table fasttime Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
-  QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.3"; sha256="1j7v6cg3rafs9a8qmlmqk1an39kd6h6pbspd7zalmnq1v1a10m91"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
+  QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.4"; sha256="1dqibl4rnf1qbk44srh8ndka0ni7a463hlpf7sdpgx2b57414jkd"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; };
   Quor = derive2 { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
   R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; };
@@ -2252,7 +2316,7 @@ in with self; {
   R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; };
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; };
   R_oo = derive2 { name="R.oo"; version="1.21.0"; sha256="0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34"; depends=[R_methodsS3]; };
-  R_rsp = derive2 { name="R.rsp"; version="0.40.0"; sha256="1hz5fnxz30m3cc7x7ha1swx4pn8c2244z6ka6v9m3l5lpdgc1367"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
+  R_rsp = derive2 { name="R.rsp"; version="0.41.0"; sha256="01l430avj5ggmdsla2kiriix72g0dlzx9klniq321bs0za808v3c"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
   R_utils = derive2 { name="R.utils"; version="2.5.0"; sha256="17q3w5dlly5xl2srrzsmf9s7vs5d576vqbcs6sr2p5x4qvqa1q8s"; depends=[R_methodsS3 R_oo]; };
   R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
   R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
@@ -2268,12 +2332,13 @@ in with self; {
   R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
   R2admb = derive2 { name="R2admb"; version="0.7.15"; sha256="1v01fbcc7hx6mswn4gkwpm6k171956wk51ls6sgca1i6ia6ckmli"; depends=[coda lattice]; };
   R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; };
+  R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
   R6 = derive2 { name="R6"; version="2.2.0"; sha256="1ir51pb0y6yj05qaxsflk4a6hv8n73cwlb0qajcskbrz632dsyvx"; depends=[]; };
   R6Frame = derive2 { name="R6Frame"; version="0.1.0"; sha256="0ib0van2qk0p89qmii8naj1jx56i6j7srvydzm41pyq2xdg0bmga"; depends=[data_table lazyeval R6]; };
-  RAC = derive2 { name="RAC"; version="1.0.1"; sha256="1idy7kik0gfzd404xs8g2mg5ycinld1wp1a9lxd2wqmyc8ghpd0y"; depends=[matrixStats plotrix rstudioapi]; };
+  RAC = derive2 { name="RAC"; version="1.1.1"; sha256="0ybyjjpw8f4wbdhkhbnjg8wy82ibxsywyjrsi406l2knnkx0mvmg"; depends=[matrixStats plotrix rstudioapi]; };
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
   RADami = derive2 { name="RADami"; version="1.1-2"; sha256="1k4g58r64i19j8wj3d202283bnwaxf19l7ckiz29dlw4zidx6mvz"; depends=[ape Biostrings geiger hierfstat IRanges phangorn]; };
   RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; };
@@ -2286,17 +2351,17 @@ in with self; {
   RANN_L1 = derive2 { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
-  RAdwords = derive2 { name="RAdwords"; version="0.1.11"; sha256="069ik7irl68chwpfdpp06ng2w272kr0cx7fjd1c6zz4nrsw8zxrn"; depends=[RCurl rjson]; };
+  RAdwords = derive2 { name="RAdwords"; version="0.1.12"; sha256="0g2lbrqqh3azyc2xlafgqnd1langjg8xhma1njjcd3jn7q21mhnk"; 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=[]; };
   RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
   RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
-  RBMRB = derive2 { name="RBMRB"; version="2.0.2"; sha256="0znkw5n123xhn902nyv1p0bpm0djyscsyqdab3bpps0n35mfxlq5"; depends=[data_table ggplot2 httr plotly rjson]; };
+  RBMRB = derive2 { name="RBMRB"; version="2.0.4"; sha256="0l6w3j4dykxd5r3h3qj7hsz77657bhif7qk020hvmcg17jszr9a2"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.1"; sha256="0g243h4zpjigayf7kryfpdvshycaxz12ifqilyk3ylz91kk61nmb"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
-  RBerkeley = derive2 { name="RBerkeley"; version="0.7-5"; sha256="049qvlpqwcaj82fdl815c0b2il7jbs6karibqpkq0fa3hq0q4hzz"; depends=[]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
   RCALI = derive2 { name="RCALI"; version="0.2-17"; sha256="1bic7dwxkvgxl3a26glxm6h6gmq4xad70dbrnrnb2d6n5v1dnniw"; depends=[splancs]; };
-  RCEIM = derive2 { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; };
+  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.154"; sha256="0x4jk5xv3z3nyi99rv9fh2akhyk4s1736fzsxynqxfm6br3k8mc6"; depends=[fishMod glmnet gtools MASS]; };
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
@@ -2307,7 +2372,6 @@ in with self; {
   RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
   RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
-  RCryptsy = derive2 { name="RCryptsy"; version="0.4"; sha256="01rz9wz5y1k77mjw4zs0jng3k4zwqda32m5xvw6kx7vkgzfas6q0"; depends=[RCurl RJSONIO]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-5"; sha256="08q1ixwnxx4j2nwdynswbdy6jw2r97c5a0zlwhaxr888c7hcv6ff"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
@@ -2318,7 +2382,7 @@ in with self; {
   RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
   RDocumentation = derive2 { name="RDocumentation"; version="0.8.0"; sha256="0k733c6b2ggwqry13ynnm9bmnrlf1sszya061wx2w52d3x378r2g"; depends=[githubinstall httr proto rjson]; };
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
-  REAT = derive2 { name="REAT"; version="1.3.0"; sha256="1vm4bxvvwlx1qmnss4zkbh7i29yy95macd79hrf78c7sfc8zkiqn"; depends=[]; };
+  REAT = derive2 { name="REAT"; version="1.3.1"; sha256="076afs9zlskcb1c4sva7pmflzjzwqgb4315y0xnzcd3n5a9riz9s"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="0.73"; sha256="0fv9ij71r36s6qsd0jrzcdirskvmr1bmxp1gbfvy77qm4dzxg00g"; depends=[Matrix reliaR Rmosek]; };
   RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; };
   REDCapR = derive2 { name="REDCapR"; version="0.9.7"; sha256="0b2dbmmjd4bmr48inv1gwc9353p4rhf8891mb5rs4cdqsl13dic4"; depends=[data_table dplyr httr readr]; };
@@ -2331,10 +2395,10 @@ in with self; {
   RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; };
   REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
-  REndo = derive2 { name="REndo"; version="1.1"; sha256="1n168xxjxj9353chdgsj88as0dj7ylm207xk75rbfzv7bdi7rlj9"; depends=[AER corpcor e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; };
+  REndo = derive2 { name="REndo"; version="1.2"; sha256="0ghr2iww4fiwah2aalk3fbn90wgx2r5mdkvn37kpbg2q9prvcmwd"; depends=[AER corpcor e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
-  RFOC = derive2 { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
+  RFOC = derive2 { name="RFOC"; version="3.4-3"; sha256="04nm672pfrlqywhdpw0yrylwk3gqjfhxfdghf6af27ry6m3rjpcd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
   RFc = derive2 { name="RFc"; version="0.1-2"; sha256="0zqnx9hbwp6j4y4r6mndgm95px07if93mpdmp3ls5kh4pnj2n6ff"; depends=[httr jsonlite sp]; };
   RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; };
   RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
@@ -2344,7 +2408,7 @@ in with self; {
   RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; };
   RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
   RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; };
-  RGBM = derive2 { name="RGBM"; version="1.0-4"; sha256="0z4qkwmkwf3r9lpfk5dgrphzb493wqrl7mrh58hyiz09dsy224h1"; depends=[doParallel foreach plyr]; };
+  RGBM = derive2 { name="RGBM"; version="1.0-6"; sha256="03ax6l6qn8z31185dzhs6rcapbjnirp4nsc0mcf6qndhrqi4fxd6"; depends=[doParallel foreach plyr]; };
   RGCCA = derive2 { name="RGCCA"; version="2.1"; sha256="1xpni9aj37zhpjr6k6gc82dihmzjdxjqy5dyz7lcvscgbwvbw0vl"; depends=[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]; };
@@ -2360,17 +2424,17 @@ in with self; {
   RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; };
   RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
+  RIA = derive2 { name="RIA"; version="1.0.0"; sha256="0dwrp0w612i79ybxzffb7m34jgrcz8jzz2q7v6c34wayjm7j9kpc"; depends=[oro_dicom]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RISmed = derive2 { name="RISmed"; version="2.1.6"; sha256="0gwdx2xg3n4n82cvhj61yvdlmd35ag85dglwfcwhbplk7zh4cjps"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
   RImpala = derive2 { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
   RInSp = derive2 { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
-  RInno = derive2 { name="RInno"; version="0.0.1"; sha256="15rbd757am55kr1jkm1vh3ida5h4wbfcj0brj6ddjbpfivybg8wr"; depends=[curl httr jsonlite stringr]; };
   RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
-  RJSDMX = derive2 { name="RJSDMX"; version="1.6-2"; sha256="0015r71fh2ynwvq4lzdq1h59kvsr04h82anznwz5ixrc3vz3abzj"; depends=[rJava zoo]; };
+  RJSDMX = derive2 { name="RJSDMX"; version="1.7"; sha256="13qd1ynxyyxsz11aiiqv47wlbygs5z3vsyw53fbcrcq4r34y4zx4"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
   RJafroc = derive2 { name="RJafroc"; version="0.1.1"; sha256="1630f8nmpid5pax8gqxych8bqf8a1avgrk7yqisk3lf1yx3h68rq"; depends=[ggplot2 shiny stringr xlsx]; };
@@ -2381,8 +2445,9 @@ in with self; {
   RKEELjars = derive2 { name="RKEELjars"; version="1.0.15"; sha256="06wc4x6lhk9akaghqi5bfkfs3yxg29lbga074a5nwadiz2fbnmkv"; depends=[downloader]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
+  RLT = derive2 { name="RLT"; version="3.1.0"; sha256="1aaavv6krp75wz0jp2xrm15ymq5f6sdaiz90c9ayy5q1kc7d82dk"; depends=[]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
-  RLumModel = derive2 { name="RLumModel"; version="0.2.0"; sha256="164bg9smxllwwk93g3g08v3902p5bl0i278dyal71cxycayzc8y1"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
+  RLumModel = derive2 { name="RLumModel"; version="0.2.1"; sha256="1v2a2rrk9x0s3f62jg1v919ilia4r8h3n732rid3hbpmpky1iha0"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
   RLumShiny = derive2 { name="RLumShiny"; version="0.1.1"; sha256="0wrn1lmwzigaq1w3a04mrz6ikgw2whr36718ckixphm5kcqlcnjr"; depends=[googleVis Luminescence shiny]; };
   RM_weights = derive2 { name="RM.weights"; version="1.0"; sha256="0757p4174j913k8xh90zg6fpxh25b9415zap1i7ym9ab78kn0k3i"; depends=[Hmisc psychotools]; };
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
@@ -2399,18 +2464,20 @@ in with self; {
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.6-2"; sha256="09z00ryyk3jx1s7p2d1rzvg84qhybv58d1n3cvjcmj07bv1h2dj1"; depends=[jsonlite RCurl uuid]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.9"; sha256="0hpxjvr6yh2093ci7dwrww8wv9zhclfjk3wbx86jxvn87ms9qa21"; depends=[DBI]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.11"; sha256="127a0f7hp0msiqqdjfpk3pz862rb4agrd71bdic2idwbs0w5wh6s"; depends=[DBI]; };
+  RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.0"; sha256="0qv90hczj1f2mqfzwv3fkmjhhfr8vqvdv30fpq0wgjpc799pv214"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
+  RNRCS = derive2 { name="RNRCS"; version="0.1.1"; sha256="1dmkvb63wacwnjl51si1zyx26z1p4jkrdrr7pgxp2zh3lp8gsa96"; depends=[magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
   RNeXML = derive2 { name="RNeXML"; version="2.0.7"; sha256="1q6ifqkypdj4hmm0f4mhwq8pidg4ba52c7k68527dk9rsrmiyjr6"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
   RNeo4j = derive2 { name="RNeo4j"; version="1.6.4"; sha256="197ykvcfw1160ir6m568a4ksszyv5vlis2r0aygi155iz04j0bwm"; depends=[httr jsonlite rstudioapi]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.8-2"; sha256="0pn45z1bj777nkfglvwwhpji8vz39sd51yszfa5g6rqxiw1a7y5d"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-3"; sha256="0aanp982c5xy4w4jsdcb9bmk1vyns055ad39hp206zaw3wj6vj3d"; depends=[igraph rJava]; };
   RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; };
-  RNifti = derive2 { name="RNifti"; version="0.4.0"; sha256="1gj63rhzzrlxhwcwmn5jmq512zy08zhrbibh7w7xk0fzd6j0lkra"; depends=[Rcpp]; };
+  RNifti = derive2 { name="RNifti"; version="0.5.0"; sha256="1rshryjx5chnpf9a83nysjr5f9lam8fpdmggxndwa7m4s4zjvvi4"; depends=[Rcpp]; };
   RNiftyReg = derive2 { name="RNiftyReg"; version="2.5.0"; sha256="10ksakp62d1qhl1r8lk0k9f6ng9wfli3lhyd14bxigv625429isa"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
@@ -2418,12 +2485,13 @@ in with self; {
   ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; };
   ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; };
   ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
-  RODBC = derive2 { name="RODBC"; version="1.3-14"; sha256="12zjyhfclxj7k9lxhdlwxqh7ckmh916hh3ywmhzbvzvxvzymnkgd"; depends=[]; };
+  RODBC = derive2 { name="RODBC"; version="1.3-15"; sha256="0m37b5ccdh4imbhmk7gj795fys2pcb9d0zx0xx2qanfrf54gk6kk"; depends=[]; };
   RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; };
-  RODBCext = derive2 { name="RODBCext"; version="0.2.7"; sha256="0lklafxhs9s5gwd0jd7jmz7inalxc6967vl4r2faq7d07zxmsyd8"; depends=[RODBC]; };
+  RODBCext = derive2 { name="RODBCext"; version="0.3.0"; sha256="1w9n40ilwnxa4zcz57icyw2d7b37p8icvqaby1dn0w5vgskgrd12"; depends=[RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
   ROI = derive2 { name="ROI"; version="0.2-1"; sha256="1g1qhrr62a74a8h73b75zxa5msbq5gv4cp1gmm0ihrjzzfzinvap"; depends=[registry slam]; };
   ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.0"; sha256="13ai7zkd00a03vyzfy1sm64cx8328xzwz5v8yw0shkdz5rchaq2d"; depends=[ROI]; };
+  ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.1"; sha256="14i3a8kw4zq2rcmhm6ha53ihqbmql2ydh5syzp9cdrfm0yp6n97w"; depends=[clpAPI Matrix ROI slam]; };
   ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.2-1"; sha256="0ik4mmpd5x5233pdp88w8g605fg6lh4yvzlb9ndqxfnmv2nchgwl"; depends=[Rcplex ROI slam]; };
   ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.2-4"; sha256="0lzxz9zs68y2pkkkfa8vgi4jiswbbh128idddfz3hqak5j1gg3rh"; depends=[ECOSolveR Matrix ROI slam]; };
   ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.2-1"; sha256="01y66ir5s8spv4l8qz974wfkslxkqznzlc8padgrqm8vd9wli8k2"; depends=[Rglpk ROI]; };
@@ -2443,7 +2511,7 @@ in with self; {
   ROptRegTS = derive2 { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
   ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; };
   ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; };
-  RPANDA = derive2 { name="RPANDA"; version="1.2"; sha256="0zp4zwh5gkywswrribyillgjvrp8hgbdn22c4iyl406wvbaiyy7y"; depends=[ape cluster corpcor deSolve fpc igraph phytools picante pspline pvclust TESS]; };
+  RPANDA = derive2 { name="RPANDA"; version="1.3"; sha256="0rah5l5nfjs65zxgsgsy3q3vaph6qkr7p41x3arfhjsyma96p0zn"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   RPEnsemble = derive2 { name="RPEnsemble"; version="0.3"; sha256="052c9cnsrjxbk2yxj08psy3nw0mq3mdr75fhnxpz64n4cqzxbr2q"; depends=[class distr MASS]; };
   RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; };
@@ -2452,8 +2520,8 @@ in with self; {
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.3"; sha256="0qgvr671zir8d1q5rzdy0gkljsfr7bz1aj47xpkbbpkjr5hqgihj"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.4-1"; sha256="0ydz206ir797rv435if3653fnnyihgmhr5d0n4zhlrs1m1zy74k2"; depends=[DBI]; };
   RPresto = derive2 { name="RPresto"; version="1.2.1"; sha256="1lka1p4wh1vl9bpg2q4yv72jcd6jjp09330mw68ph27jqhfzinmm"; depends=[DBI httr jsonlite RCurl stringi]; };
-  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.8"; sha256="11z0ka5zlg6kglnm4ix4rfw2wakps6js11fzx762f78945g14r1s"; depends=[Rcpp RCurl]; };
-  RPtests = derive2 { name="RPtests"; version="0.1.3"; sha256="0gprbd4m889kaklvc7ljbsl8m7l02pkfrdrzs84d92lgphg0wv9n"; depends=[glmnet randomForest Rcpp]; };
+  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.9"; sha256="0jar93xxm9sa4a4mqc93868hmk2l0hpbh7x707ilmkzjq47fi81r"; depends=[Rcpp RCurl]; };
+  RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
   RQDA = derive2 { name="RQDA"; version="0.2-8"; sha256="103mb69x70z1i7z66b2if6zycr5iwcz1p3g8vvz0npmxncr4las9"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
@@ -2464,7 +2532,7 @@ in with self; {
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
   RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; };
   RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; };
-  RRreg = derive2 { name="RRreg"; version="0.6.1"; sha256="1vf40xcg39hh9wz6hjfr2p10pzpbs4b6x5hmsf1njajcf6yfl09q"; depends=[doParallel foreach lme4]; };
+  RRreg = derive2 { name="RRreg"; version="0.6.2"; sha256="0cm1r34hqdil3d27670q6a5iixh3lg8r4rzam6mq4zf2fqiwdpb9"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.10"; sha256="0m9gd1h9ghj6gfwixwy8hhc2625f9mi473zp55zdl5w2q10qk3ij"; 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]; };
@@ -2472,7 +2540,7 @@ in with self; {
   RSAgeo = derive2 { name="RSAgeo"; version="1.2"; sha256="1lgxcf5sd7aqk213s70mvi0kc4prm1w97m4wf3xjnvs7yc7mb5yz"; depends=[]; };
   RSCABS = derive2 { name="RSCABS"; version="0.9.01"; sha256="1zx2272381i24hdpb1dks3l7szds9i0rl119ljxh9f61z4fbkrhp"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
   RSDA = derive2 { name="RSDA"; version="1.3"; sha256="0f2f6bn11p43sv8zmvqpf5w1rdisf7b2dvllhiy3pg9f6r1mc85k"; depends=[abind FactoMineR ggplot2 glmnet princurve RJSONIO scales scatterplot3d sqldf XML]; };
-  RSEIS = derive2 { name="RSEIS"; version="3.6-8"; sha256="1jhxd1aq85abll5vrdbbyz52ch8xyaxzqf5r2nzvnc6953hv6jnf"; depends=[RPMG Rwave]; };
+  RSEIS = derive2 { name="RSEIS"; version="3.7-4"; sha256="0yz1lgq79chvcz70a82pyiy7s9z0af22pcnbkw629plzrxlpfppx"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
@@ -2489,16 +2557,15 @@ in with self; {
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
   RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; };
-  RSentiment = derive2 { name="RSentiment"; version="2.1.1"; sha256="1p8bffsngk0s91y4f7prnlr7w9bxh460mf5ibi7v4md7jbbvhcsf"; depends=[NLP openNLP plyr stringr]; };
+  RSentiment = derive2 { name="RSentiment"; version="2.1.2"; sha256="1vs32ir1ss41y7zpaa014ip2rnl6090l4aff7n4rzg6r36pys3kp"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.10"; sha256="1wi2rv5wwibw8m0xd37f284b14irg2gnm31yz73c3wpic2sbf3wf"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.12"; sha256="0yxqna3vgjqpgbk6391dd3j5lvfa0n5xnjkq3i2i9i0pwzdr2knh"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.1"; sha256="1xxs5q25v3i0qf829xl8n90n2fx1anfgfrzvwzff4dm252y7b2gw"; depends=[RCurl]; };
-  RSocrata = derive2 { name="RSocrata"; version="1.7.1-24"; sha256="19myaccxxa11b92zi0ra53b6n5dx0af8ymxymqpmg7hlr3v6n82x"; depends=[httr jsonlite mime plyr]; };
+  RSocrata = derive2 { name="RSocrata"; version="1.7.2-12"; sha256="0vbac4ah2bwnd2lwaslhkkg0wlxaw2gn5ijp5rkf2q1pl3pk88ls"; depends=[httr jsonlite mime plyr]; };
   RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; };
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
-  RStars = derive2 { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; };
   RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.1.7"; sha256="122z9792bsh5afd1j9z7q8j1039hf86axw12w1r5cbrnkccnbgpj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; };
+  RStoolbox = derive2 { name="RStoolbox"; version="0.1.8"; sha256="1q2gahx8a9dgj8bxhrgl1k2ky5qba1rrrfyszx826mpnlzv72psd"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; };
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; };
@@ -2506,32 +2573,33 @@ in with self; {
   RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
   RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
-  RTOMO = derive2 { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[GEOmap RPMG RSEIS splancs]; };
+  RTOMO = derive2 { name="RTOMO"; version="1.1-5"; sha256="0wnxmzad2q5cpnqmglqh92clsk2c8fngd3gzh8f91alpj6nz69jp"; depends=[GEOmap RPMG RSEIS splancs]; };
   RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
+  RTransProb = derive2 { name="RTransProb"; version="0.1.0"; sha256="0q5fyf176pzjjdpyc5wpakpfnp48ckcpcparf6n99js2xgxc725g"; depends=[chron e1071 expm matrixStats nnet pracma zoo]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.8"; sha256="0mngwi7ybcg6lsk3f7faljwnzsfvyxln4jd2s2hiirr303ml4wzg"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-63"; sha256="0ckpwblflvz48745rp46sx14lvkqpb3csrpapk22ihryr9zn17mh"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-64"; sha256="1rsgf4aynvsah31xnxvjm3z4fcjg4sfa0k9ilszvn92l6jgx5k2g"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
   RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
   RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.4"; sha256="0g7ckda8a278zg5vpfgajpa17r4hknf5akn556afyhmigj8bdax1"; depends=[]; };
-  RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.8"; sha256="013mh8ghxccrhdcrcdfqll2jgf3z5zw7fsn0083bn3nkr19xbabz"; depends=[Rcpp]; };
+  RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.9"; sha256="1xvjl2mfknrb3jrvxxdza4l21sh76n6w6r12makvjkr9q0nal408"; depends=[Rcpp]; };
   RVsharing = derive2 { name="RVsharing"; version="1.7.0"; sha256="1z1jwj6dzyib8sxpz4p4wpiizfhxz6sp62nnig779rhnv7wfkqqf"; depends=[kinship2]; };
   RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; };
   RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; };
   RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-  RWeka = derive2 { name="RWeka"; version="0.4-31"; sha256="0g801r5whb9iw6lxkjv89w042qb3iig8qw7bpwxjnlc2i8didzy4"; depends=[rJava RWekajars]; };
-  RWekajars = derive2 { name="RWekajars"; version="3.9.1-1"; sha256="0kr9amnldnaz5vhmy0qkr3a0393wzqcl5x55qc8yqxq6g1ypzg5v"; depends=[rJava]; };
+  RWeka = derive2 { name="RWeka"; version="0.4-33"; sha256="1y05rl19q85slq20awm7zivscgbkn7rfghjxgcwndhk8fab75kcg"; depends=[rJava RWekajars]; };
+  RWekajars = derive2 { name="RWekajars"; version="3.9.1-3"; sha256="1jcp53qvj3wfaii8j18yvr4kx32hckqs2w6bzzmhx0py40zz1d01"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; };
   RWildbook = derive2 { name="RWildbook"; version="0.9.2"; sha256="1bzdj55v7g2vlffpdsxpl8gv4k1xxd3xl7h1whvq6q5x76lprw0g"; depends=[data_table jsonlite marked]; };
-  RXKCD = derive2 { name="RXKCD"; version="1.7-7"; sha256="13g5nylxh6ms57k2bhz3isfwcbxr4z0swcqja8inky25bid7jqgk"; depends=[jpeg png RJSONIO]; };
+  RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
   RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
-  RadOnc = derive2 { name="RadOnc"; version="1.1.2"; sha256="03pcv5wh1v12k6wys4n1j2gz1x0pzrxnjj7lbimcy7plv183psfi"; depends=[geometry oro_dicom ptinpoly rgl]; };
+  RadOnc = derive2 { name="RadOnc"; version="1.1.3"; sha256="15ww09dpyljph2pq0d2d0pbr3dzwkwsn0zv8f3w8jhhgc3s8hqkz"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
   RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
   Radviz = derive2 { name="Radviz"; version="0.7.0"; sha256="0x1b3s3i3f775m7ragvzpdswljry8adbkjb6aq35aqasnkvvnysq"; depends=[gridBase hexbin KernSmooth MASS]; };
@@ -2539,16 +2607,17 @@ in with self; {
   Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
   RandPro = derive2 { name="RandPro"; version="0.1.0"; sha256="10zb8xhcb54jscfnpz734c7kh43pgi3bb61yasi6rvlqd83g1zdn"; depends=[]; };
   RandVar = derive2 { name="RandVar"; version="1.0"; sha256="0iqq1hh1gl2kzgyfxp6bs31pmj5ic4y6wqwm7iaj20gk2wv923jg"; depends=[distr distrEx startupmsg]; };
-  RandomFields = derive2 { name="RandomFields"; version="3.1.36"; sha256="04pj5zl6az69xa9nr044l1rqkl4hzxdzvw99yvn0qppiqkn8grc2"; depends=[RandomFieldsUtils sp]; };
-  RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.15"; sha256="0cr8xngvc5984q4h444x05lqxqh6ml8pcgg3pigyg77jafapmy6l"; depends=[]; };
+  RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; };
+  RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; };
   RankAggreg = derive2 { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
+  RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; };
   RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; };
   Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; };
   RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
-  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.0"; sha256="0ch368wvvknm38wvjhk2ia0ihk8hikpssph9n0q4p2gzq9m4vj57"; depends=[ggplot2 pROC]; };
+  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.1"; sha256="0h9wlx87wbavx7hs3ryx88iykk0lj3lfsvrdi4w9h31y3x6cwagy"; depends=[ggplot2 pROC]; };
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   RbioRXN = derive2 { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
@@ -2558,6 +2627,7 @@ in with self; {
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
+  RchivalTag = derive2 { name="RchivalTag"; version="0.0.3"; sha256="06n3zvgq6baahm3idfm64byyrv2k70w21yd0yrvfnf731dfhy94g"; depends=[akima mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; };
   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.3-2"; sha256="07p22b6kbx2md6h911jzgiin2rds76aizn9d7nd6l4lxp8a76c09"; depends=[abind car RcmdrMisc relimp tcltk2]; };
@@ -2606,11 +2676,11 @@ in with self; {
   Rcoclust = derive2 { name="Rcoclust"; version="0.1.1"; sha256="1f4li4pr1cl0nnq21rbk1qksn44zl2p65w9zs6k9k4mb050cyjqy"; depends=[]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.9"; sha256="0pndpgmfmvkssvn9m3i4nbq2n6hxz3i4i8y2nlycn2gdipr0vggh"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.10"; sha256="108p485agxwgmnl9p54vsyy94w96lcimlk08v71ddm77gfl13y2f"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.3"; sha256="0q1iwhf1rafzr6d7pjbxs0ii0anbfrzrl1kpz1ka5yvjw39s3kr8"; depends=[Rcpp]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.8"; sha256="14hw9nrqwcqx2xwam03wfxk07qg648gp0cnk76c4knpr6pmad9sx"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.700.0.0"; sha256="03cvl2xgmvh4sylw7ff7s020y7k2wzyj34l0zngm09qs44pa9q0m"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.800.2.0"; sha256="025lh504nw7ir1f2xsqnvfkq9rg0rb2xzfn3a2s0b2a9snqdzzwr"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.1.1"; sha256="0r6mzsm2gq77i8cylcvgg7hn0399d3v11wlf89v559vslkv2b2m0"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.1"; sha256="0895cc1rzppniakvrl1r6k4c3vm45ppihv3vwvf5x062ag34yqsd"; depends=[Rcpp]; };
@@ -2619,10 +2689,10 @@ in with self; {
   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]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
-  RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.9.0"; sha256="0fy9kr03160f1ywzff3p380s8a59jz7d2d0rggb14g2y0slzpbr5"; depends=[Matrix Rcpp]; };
+  RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.9.1"; sha256="1ih940yjbc530cmpl6kx1jic7pz2ps1w5vrvy32qizh6m5s3lk7x"; depends=[Matrix Rcpp]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
-  RcppGSL = derive2 { name="RcppGSL"; version="0.3.1"; sha256="00jqn1ix0qpv1zn8ciz161pq6gxq5had1afm194k6k7hahph3bip"; depends=[Rcpp]; };
+  RcppGSL = derive2 { name="RcppGSL"; version="0.3.2"; sha256="0fg13va124shkyy6g1fwblld1r4vdgxscab64kszyjivkjsb2lw1"; depends=[Rcpp]; };
   RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.0.1"; sha256="10ssg2558s6cw6f6adzpw76qcsizbllc70y1s8vbhb2xkc26d1cn"; depends=[Rcpp]; };
   RcppHoney = derive2 { name="RcppHoney"; version="0.1.6"; sha256="1llbs6x4qcvgnlmnd391s1j9lqvybnnq3d4gjwyyc8vy2i5jr28c"; depends=[Rcpp]; };
@@ -2631,16 +2701,18 @@ in with self; {
   RcppOctave = derive2 { name="RcppOctave"; version="0.18.1"; sha256="1b2mwnsx799a86hdpkqy6l1m048g8hqz57l70siybkxnlaib3z0f"; depends=[digest pkgmaker Rcpp stringr]; };
   RcppParallel = derive2 { name="RcppParallel"; version="4.3.20"; sha256="1hc325hj214s61694iy4j3ly5zkya25h92hki29n3562qiirpb0g"; depends=[BH]; };
   RcppProgress = derive2 { name="RcppProgress"; version="0.3"; sha256="0796g11w7iv3ix1wfm3fh09qq7jki4r4cp1mjagq77igri3xrr9x"; depends=[Rcpp]; };
+  RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.1"; sha256="0c4kb6jnhsnha6139nj9kifg4yb5glj7azs0xwch5052bnl7xhyp"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.7"; sha256="0x456zrd7qv8iclhdbgl4bwa1bvpirlqx6ywsincj6y0446f13rz"; depends=[BH RApiSerialize Rcpp]; };
   RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
-  RcppSMC = derive2 { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
-  RcppShark = derive2 { name="RcppShark"; version="3.1.0"; sha256="0fyf7ffv5hhxnandrrx9xg72zwrw8cp73bwmb48iy5514gdwg77a"; depends=[BH checkmate Rcpp]; };
+  RcppSMC = derive2 { name="RcppSMC"; version="0.1.5"; sha256="0vzibl1ck0cxl9nzx2829ikxvp2bcndq7h0agzr53i089168rr8s"; depends=[Rcpp]; };
+  RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; };
-  RcppTOML = derive2 { name="RcppTOML"; version="0.1.1"; sha256="1kmhmi13666zv3zsy3wlmh13picvicjc1nrlv9dqjzwcwahpih1l"; depends=[Rcpp]; };
+  RcppTOML = derive2 { name="RcppTOML"; version="0.1.2"; sha256="05fm396frx5zlrxy7kddnwj0wv29jk33x8s01bqfjc1yhaxv17vx"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
-  Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.1"; sha256="1rvqb3lsn5br9cmj63c9ql4dkp0igdrag65sxgajpsyqkpyg17qn"; depends=[formatR roxygen2]; };
+  Rcssplot = derive2 { name="Rcssplot"; version="0.2.0.0"; sha256="0pv1yzpsc68bahfxh5h79xmh798a22nk6i88gj1s81sp7l5fbqlm"; depends=[]; };
+  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]; };
   Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
   Rdpack = derive2 { name="Rdpack"; version="0.4-20"; sha256="1b1vikh8py4lvf6w90919y8f5aq9xyhv2pprfyzfx0671k99cz6z"; depends=[bibtex gbRd]; };
@@ -2648,9 +2720,9 @@ in with self; {
   Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
   Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; };
   ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-  ReIns = derive2 { name="ReIns"; version="1.0.2"; sha256="05ipf3gvgfv3q58mdh3g9zg7z7wm0gvigb839y1nprb98wvrqj2f"; depends=[doParallel foreach Rcpp survival]; };
+  ReIns = derive2 { name="ReIns"; version="1.0.3"; sha256="16cgcacdnvfg6cbhfjh3g3dj22bdbbn7yllj1afq04lbjbplaydw"; depends=[doParallel foreach Rcpp survival]; };
   ReacTran = derive2 { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; };
-  RealVAMS = derive2 { name="RealVAMS"; version="0.3-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  RealVAMS = derive2 { name="RealVAMS"; version="0.3-3"; sha256="1isjk6mzhlhmvz8sv5wlh3w6s53yk3f41xxji4j3hwbaw5q9a73m"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
   RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-10"; sha256="09xp0ad7v2bsg1r7gf3awdqcpds0v3ygsbnkm8ysy8w14sbrrydf"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
@@ -2660,6 +2732,7 @@ in with self; {
   RefManageR = derive2 { name="RefManageR"; version="0.13.1"; sha256="1yw3fbiis1gl7ih66b4vjr299xy3w164irmmdfsqr79n9h3p5kv7"; depends=[bibtex httr lubridate plyr RCurl RJSONIO stringr XML]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
+  ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.0"; sha256="171zd62zsnahnx9chb51diqw739i4rd4jv80q1mzhxzszzp286jj"; depends=[data_table ggplot2 hash]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
   Relatedness = derive2 { name="Relatedness"; version="1.4"; sha256="0ahd053sbqwjq93l8m2gq7fqqc9vvgnndz4j8pmgswwcah8h77c8"; depends=[]; };
   Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
@@ -2681,6 +2754,7 @@ in with self; {
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
+  Rgb = derive2 { name="Rgb"; version="1.5.0"; sha256="03m74ri3lg5q8215wlwbv08l90vhjxq3al36vpkpkys9fc1c9sbz"; depends=[]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.1"; sha256="14xban9d182fhss9ppr13scih7hrbjd9s231avi4gkg79cz87s0s"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-2"; sha256="1dzcc9dwdvrs1g9mgk5z9qdxn3iq04s91ak881z3wrqvxhp42cgr"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
@@ -2696,7 +2770,8 @@ in with self; {
   Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
   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.1.133"; sha256="1lvik88zfxlipr24qdj04faknfjsaiv6q75zllgz3v6rjbxvh4jz"; depends=[fasttime Rcpp RCurl rjson]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.1.134"; sha256="1jdm3rpln4mjgs1hhl8074mnnfj376sfk7p0cz1pfd9ii0fidc88"; depends=[Rcpp RCurl rjson]; };
+  Rlda = derive2 { name="Rlda"; version="0.1.0"; sha256="1gv3zfw1cmd44d1d4p6d3jp0l860jncblivq77w4m1papa24hhz0"; depends=[gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
@@ -2733,24 +2808,23 @@ in with self; {
   RpeakChrom = derive2 { name="RpeakChrom"; version="0.1.0"; sha256="0l7lgscj2lsbm2k1lmzwc15k533hkqz5yhyzz6m2ngg6qf8fhsy3"; depends=[ggplot2 minpack_lm pracma ptw]; };
   Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
   Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
-  Rpoppler = derive2 { name="Rpoppler"; version="0.0-3"; sha256="055ldafgf0lp3g2kjlpbhsq03fwwia6a6fwk7d4w5znihah9ibbg"; depends=[]; };
+  Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
   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-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; };
-  Rsampletrees = derive2 { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[ape haplo_stats]; };
+  Rsampletrees = derive2 { name="Rsampletrees"; version="1.0"; sha256="1qq7z7wxb933wvy62zz2vxmpiz0441v01ravhkrmz70ppq5jnlpn"; 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.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[fields jpeg RANN]; };
+  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.2"; sha256="0b063b9jwnn7mansm5mbgqcfk8p596inf7l3r6fafvsjw5844b6l"; depends=[class kohonen Rcpp]; };
   Rssa = derive2 { name="Rssa"; version="0.14"; sha256="0r51jw7fl0nxmly05dj85chw804vf8gmrkfs6yi59zh7fq7jsis6"; depends=[forecast lattice svd]; };
-  Rsundials = derive2 { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; };
   Rsymphony = derive2 { name="Rsymphony"; version="0.1-26"; sha256="0v51sjhggvl8i3ysslqcc4x84874nagxq2v68izs4hpvcpzn7268"; depends=[]; };
   Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; };
   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.11"; sha256="0zi4nxgpiv1gpdmcnqdhz5kymzp8m5xj02zpf290p1yyydl76bhy"; depends=[Rcpp]; };
+  Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; };
   Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.4"; sha256="19wcjgcv871vzclgskvb7xywnzvvi9v5k0qhwxwwi3qc9yx2kpaq"; depends=[]; };
   Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; };
   RtutoR = derive2 { name="RtutoR"; version="0.3"; sha256="0knqwk44di24x8w2pf794hk2raq7gcpl6cd6s9m0sr73rxh9sf11"; depends=[dplyr DT ggplot2 ggthemes plotly rmarkdown shiny shinyBS shinydashboard shinyjs]; };
@@ -2759,12 +2833,13 @@ in with self; {
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
   Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; };
   RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
-  Rvcg = derive2 { name="Rvcg"; version="0.15"; sha256="0h0gl6s7xa96g91d0df08ssgr1hnxgc1pqrlirvjdknr7jpkq04k"; depends=[Rcpp RcppArmadillo RcppEigen]; };
+  Rvcg = derive2 { name="Rvcg"; version="0.16"; sha256="0629fl4bq15mcb9kxiqsgllqgygxx0xn50849akx0rn72y7jp5v0"; depends=[Rcpp RcppArmadillo RcppEigen]; };
   Rvmmin = derive2 { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
-  Rwave = derive2 { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; };
+  Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; };
+  Rwave = derive2 { name="Rwave"; version="2.4-5"; sha256="1q80759382yig5gmjd83qafavhbbh7bbbgil8qha91xfs27m45br"; depends=[]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.5-5"; sha256="1rh25vjy8pnaavz9df6bcmk9b8d72hxm73n1hg3ha724cyxypzpa"; depends=[]; };
+  RxODE = derive2 { name="RxODE"; version="0.5-6"; sha256="06y4cdkx93ldhdbs5iaiad7hzlbnsjnimmnmvcnfv4gbicxjq9c5"; depends=[]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; };
   Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
@@ -2782,7 +2857,7 @@ in with self; {
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; };
-  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.7"; sha256="0xs2zjr3r3a39szip53qkcja3n89vr1hq46a2zcwl6s5gdbb1vyj"; depends=[]; };
+  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
@@ -2795,11 +2870,11 @@ in with self; {
   SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
   SCGLR = derive2 { name="SCGLR"; version="2.0.3"; sha256="03v76nh6ng41hh4lm27r8ipf382sj98dyl9lh4fzl4y6ff1vwzzj"; depends=[expm Formula ggplot2 Matrix pROC scales]; };
   SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; };
-  SCMA = derive2 { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; depends=[]; };
+  SCMA = derive2 { name="SCMA"; version="1.2"; sha256="0z4f8p1d0ry35g5a13blc8w73vid7nwdn2w9d3i0nfb05fj7i5qf"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  SCRSELECT = derive2 { name="SCRSELECT"; version="1.1-0"; sha256="1mf11xxzi6g0cs91l6a0b9dic3a737ckxwrrbxk3m2cz6ymy5k9r"; depends=[mvtnorm]; };
-  SCRT = derive2 { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jhzk3cv78hp3xl222phjznjf2lzi"; depends=[]; };
-  SCVA = derive2 { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; depends=[]; };
+  SCRSELECT = derive2 { name="SCRSELECT"; version="1.1-2"; sha256="18vdiijcj4k34k3yvcxj4gv3f15lhyazyf1z8iyic2yrj6xbhnq0"; depends=[mvtnorm]; };
+  SCRT = derive2 { name="SCRT"; version="1.2"; sha256="0ihrvhpapyiyf31hqbj1yj4kwlbjnv3zqra4f57fm39jyr444jf3"; depends=[]; };
+  SCVA = derive2 { name="SCVA"; version="1.2"; sha256="0kn0v85n4lxl631sa279cfrs6q28a3hw278dcmkqbjz3qqyna1dk"; depends=[]; };
   SCperf = derive2 { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; 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]; };
@@ -2817,14 +2892,14 @@ in with self; {
   SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
   SETPath = derive2 { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; };
   SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
-  SGCS = derive2 { name="SGCS"; version="2.5"; sha256="1245xqv8im457zdgcny66jnzv8kyfi8ddic9zdk94sr6jkwx6x17"; depends=[spatstat]; };
+  SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.6-0.0"; sha256="02q9kbafnlrwyzrf5xv4lj89ifhmx1gj03jvlrhb9a4g04084w1z"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; };
-  SGPdata = derive2 { name="SGPdata"; version="15.0-0.0"; sha256="1mqvrax1sndxbn8rp1hqnkhyfr9nlkz3bl7h2gr27ka3ddz1vv1h"; depends=[data_table]; };
+  SGPdata = derive2 { name="SGPdata"; version="17.0-0.0"; sha256="1pjilyqwhgisz1iiy50l86dwc4dg3c8dzlpx7mm7n75049vzp2xq"; depends=[data_table]; };
   SHELF = derive2 { name="SHELF"; version="1.2.3"; sha256="1d52a1yci9zq9zl2mkq9ji340jfa47w47br5gpapd84yk9d61llb"; depends=[ggExtra ggplot2 MASS shiny tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SHLR = derive2 { name="SHLR"; version="1.0"; sha256="0anj2bfbax8kipn7cgjhr4ijjcipixm9lshafh19qbxag2li1891"; depends=[doParallel FactoMineR foreach geepack kinship2 MASS Matrix stringr]; };
-  SIBER = derive2 { name="SIBER"; version="2.1.0"; sha256="0vny2iy5jyffz6fh6a6y4i270c9ndkj0ixh0322lfa45cc6f4m7q"; depends=[hdrcde mnormt rjags]; };
+  SIBER = derive2 { name="SIBER"; version="2.1.2"; sha256="13ag1z15gw5y0l3r011sq3rpla3pmhamswvy3klnj0n0mpa0r4yc"; depends=[hdrcde mnormt rjags spatstat viridis]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.10"; sha256="13v4pdsaqah5v92fpc1lmsg5391igdys1l2frrw4432bvgm74rg9"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
@@ -2834,7 +2909,7 @@ in with self; {
   SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; };
   SKAT = derive2 { name="SKAT"; version="1.2.1"; sha256="0i8samw6bwzbwcpdf12b932r46yy2fkqp4dn7a5kk50mzzfphib2"; depends=[]; };
   SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
-  SLDAssay = derive2 { name="SLDAssay"; version="1.5"; sha256="1klfbvzlddblz6wgp0gb2i2c1bdp44iyl0gi87v9sg7wb3kwilld"; depends=[]; };
+  SLDAssay = derive2 { name="SLDAssay"; version="1.6"; sha256="0dzy66jlz0y7f0k4534jj4yfbrd1lyqaf6d3z3mqwl3zngyb2m1g"; depends=[]; };
   SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; };
   SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; };
   SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
@@ -2844,6 +2919,7 @@ in with self; {
   SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; };
   SML = derive2 { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet lattice Matrix]; };
   SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; };
+  SMMA = derive2 { name="SMMA"; version="1.0.1"; sha256="0ld8jjh67iw5w5cmb2gb899269apjydgqjsnn5hq5lzqjilpzzl8"; depends=[Rcpp RcppArmadillo]; };
   SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
   SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
@@ -2853,7 +2929,7 @@ in with self; {
   SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
   SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
   SNPtools = derive2 { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; };
-  SNSequate = derive2 { name="SNSequate"; version="1.2.1"; sha256="0pkf12cmbk4w7q8vn4rfz2wnb0rirn1lnn71jd3g4573lvk3fhdi"; depends=[magic]; };
+  SNSequate = derive2 { name="SNSequate"; version="1.3.0"; sha256="0j0cj6c3j1pqh67nxz3wrwr0cf4hj44zqh2k7c1jc5cbldixkhpn"; depends=[DPpackage emdbook knitr magic plyr progress statmod]; };
   SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; };
   SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
   SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; };
@@ -2869,7 +2945,7 @@ in with self; {
   SPACECAP = derive2 { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
   SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
   SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
-  SPAtest = derive2 { name="SPAtest"; version="1.0.0"; sha256="07wc5mf49d65jizx3j4cjlcil758fzi6x688jji80spsapfq9gbn"; depends=[]; };
+  SPAtest = derive2 { name="SPAtest"; version="1.1.0"; sha256="0dy63ha8d9pzqcf61inbp24nhbpb6pzhw08vsf134znirll0kgr4"; depends=[]; };
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
   SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
   SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.3"; sha256="1yzls6i0v3c44lhdb9d2ydw6abphyjnrx2idxdcp0qqj87fw92l4"; depends=[]; };
@@ -2878,7 +2954,7 @@ in with self; {
   SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; };
   SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-  SPOT = derive2 { name="SPOT"; version="1.1.0"; sha256="1f1nafp7v8k50s5x8m5bg6r9sb5ihr08f1x4643jqhxf7fcz2x10"; depends=[AlgDesign emoa MASS mco randomForest rpart rsm]; };
+  SPOT = derive2 { name="SPOT"; version="2.0.1"; sha256="0zyh0pn0mc7n150851vdqx3ixjn53id3pm3a408365h0wafcrn3g"; depends=[MASS randomForest]; };
   SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; };
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
@@ -2891,10 +2967,10 @@ in with self; {
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
   SSBtools = derive2 { name="SSBtools"; version="0.2.1"; sha256="1cqdmvh9gxyx2yciy0j54v84hl8cayifv368ip5y3k6g1cff6488"; depends=[]; };
-  SSDM = derive2 { name="SSDM"; version="0.1.1"; sha256="1kg2694l42sbd0glzhvsykfpadmzarc275n88775g03as800vq1w"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.4.14"; sha256="13xj3nq4rfi5yih7h5gp01mpjyj6090sy9835p41k89pfdd6g71p"; depends=[MASS psych TSA TTR]; };
+  SSDM = derive2 { name="SSDM"; version="0.2.2"; sha256="0xvlvmdfxbdk0xla75dgdhvka0ajh0fg80xxyn24rzi2rc830mnw"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.4.15"; sha256="0vjfzjs2bhxzavcnlz5lq5f96pp2sw5zdzlz3vivxbmvzp50kbr7"; depends=[MASS psych TSA TTR]; };
   SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; };
-  SSN = derive2 { name="SSN"; version="1.1.8"; sha256="0r5l8yw9zq8ddmyhifl27r13bab7327kwb5grlpfx4yqpp11szyp"; depends=[BH igraph lattice maptools MASS Matrix rgeos RSQLite sp]; };
+  SSN = derive2 { name="SSN"; version="1.1.10"; sha256="0fhwshl6vwf9cvbg8j284i27vayjrslk5hpyvrby390jma9klk4i"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
   SSRMST = derive2 { name="SSRMST"; version="0.1.0"; sha256="05bjc2bmsfykrddch7ynixqsq6z813wvibpwh37223q78xpb8nry"; depends=[survival survRM2]; };
   SSrat = derive2 { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
@@ -2904,7 +2980,7 @@ in with self; {
   STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; };
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
-  STMedianPolish = derive2 { name="STMedianPolish"; version="0.1"; sha256="1mysmigksrgkgzz7cng5vn8i7q4marq144dpwww30lisw2jgraiq"; depends=[maptools reshape2 sp spacetime zoo]; };
+  STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
   STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
@@ -2912,7 +2988,6 @@ in with self; {
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SWMPr = derive2 { name="SWMPr"; version="2.2.0"; sha256="1nq3wc06c7fga9v69fwk3dr348lb127wd9ikb59lgnx2w86g83mk"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
   SYNCSA = derive2 { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; };
-  Sabermetrics = derive2 { name="Sabermetrics"; version="2.0"; sha256="00axm9wxwzasjrld9nfn1wqzrm2ybm7i6xh6005m9lnkb6qwmvi3"; depends=[XML]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
   SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
   Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
@@ -2931,6 +3006,12 @@ in with self; {
   ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
   SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
   SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; };
+  SeerMapper2010East = derive2 { name="SeerMapper2010East"; version="1.2.0"; sha256="1lgjxixdgmgxy79s34pz7k4khhw5x4hs8m6yg8qiq813w4byqkls"; depends=[sp]; };
+  SeerMapper2010Regs = derive2 { name="SeerMapper2010Regs"; version="1.2.0"; sha256="0sb0l539cwh76559znvgbi1wcbs7h53pmk1m8jz853wc266f8ibx"; depends=[sp]; };
+  SeerMapper2010West = derive2 { name="SeerMapper2010West"; version="1.2.0"; sha256="0zdh3k813r4w23r2aa26bglvfv10xja2ibacnl2vairl3nzpa8vc"; depends=[sp]; };
+  SeerMapperEast = derive2 { name="SeerMapperEast"; version="1.2.0"; sha256="1bafxrfjdq4ipml6zl6ng3piz8i6izm3b2daf8k1041mlbb35k6f"; depends=[sp]; };
+  SeerMapperRegs = derive2 { name="SeerMapperRegs"; version="1.2.0"; sha256="16byqrwmjwhgsfav344m99jpl403k9ajqgv74ibwms9319xqfz59"; depends=[sp]; };
+  SeerMapperWest = derive2 { name="SeerMapperWest"; version="1.2.0"; sha256="1mq88ljz86bk4mjj6pmrd8k61rf69s7g1j8by4c0s3c6fnkwb3qg"; depends=[sp]; };
   SegCorr = derive2 { name="SegCorr"; version="1.1"; sha256="1hfkwfq4s3xm0wip82v000x5axkzkn4vkv6wima4mrnlvwi2yb9k"; depends=[cghseg]; };
   Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; };
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
@@ -2952,8 +3033,8 @@ in with self; {
   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]; };
-  Sequential = derive2 { name="Sequential"; version="2.3"; sha256="0z0ywrvc81gyk4wl810628gikaiadhbapbvkqf2ihr6n632cbr2z"; depends=[]; };
-  SetMethods = derive2 { name="SetMethods"; version="2.0"; sha256="0ya8n4pin8j54gcc2fx99xgcrmnv9rm4r9a32nnylyqk49yj41dv"; depends=[betareg lattice QCA QCAGUI]; };
+  Sequential = derive2 { name="Sequential"; version="2.3.1"; sha256="0rdcxmqysi9x8671zvjndaxp91g7h5a8qhcs0qb5zxh3pbrch0jk"; depends=[]; };
+  SetMethods = derive2 { name="SetMethods"; version="2.1"; sha256="1n6pd6cs11qahbfimqg1mskvq364gs1hvjbyygr49pv28cb3rig7"; depends=[betareg lattice QCA]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.1.0"; sha256="0b5lkdhaymi3vsx9acdn9jxvqwwsac9lbdr43c44c06gglqlvk47"; depends=[]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
@@ -2965,15 +3046,16 @@ in with self; {
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.2"; sha256="1rfmsmqd4gq27scm3f0y7p5ivsmk20cjizfycp3sj8ng0qahjmaq"; depends=[]; };
   SiMRiv = derive2 { name="SiMRiv"; version="0.9.1"; sha256="0aw2x9fgjzs8fiz5gqml333w3yi7k65jz611mbhjh26nvbgq82ls"; depends=[raster]; };
   SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
+  SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; };
   SigTree = derive2 { name="SigTree"; version="1.10.5"; sha256="1i0zhawv0dl764ciyyr3r4sbql2xhhks2r8vbya10wnzyqipxmmb"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
   SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
   SignifReg = derive2 { name="SignifReg"; version="1.0"; sha256="1360892wy0qc6dch3753s4a17l3pcijjmxd34zqvzl9534arlsxd"; depends=[]; };
-  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.6"; sha256="0hkh97yi7zpm6d87vapzlwyq7l8dra36wy3brfh6b827535wfg3k"; depends=[MASS rgl scatterplot3d]; };
+  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.7"; sha256="0g45mi7hd64h2ja215g61qa5v47vqlbfbbs15dsmlv4yygy1n2fx"; depends=[ks MASS misc3d rgl scatterplot3d]; };
   SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.2"; sha256="04qs0b7sn170m65176p7gmk03dzm2jjgqknmc8kjab8snlrr3r3k"; depends=[evd]; };
-  SimDesign = derive2 { name="SimDesign"; version="1.5"; sha256="00hyignxsy3h4qcr98rwsahahgg3p9xhz6dbpr2hn6ymdaxvddyb"; depends=[foreach pbapply plyr]; };
+  SimDesign = derive2 { name="SimDesign"; version="1.6"; sha256="1517gfrxnhj3c8jj5qiqf9yg7y8h9q1175czb2ykx2c291b2qvac"; depends=[foreach pbapply plyr]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
-  SimInf = derive2 { name="SimInf"; version="3.0.0"; sha256="0pj99jrkx898rnjijvzcw7xxz0hka767a1b2khwlk5kpja7zx5ax"; depends=[Matrix]; };
+  SimInf = derive2 { name="SimInf"; version="4.0.0"; sha256="04ap2yszy0v8kf5pclcqvr1bm5x5vwgdb4m9b3hr5iv345f5137h"; depends=[Matrix]; };
   SimPhe = derive2 { name="SimPhe"; version="0.1.1"; sha256="00qqqsf7na5c9nslnfpbyr2ysf7d7bi6vnpfiy761nhg8vgf2vjv"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
   SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; };
@@ -2987,7 +3069,7 @@ in with self; {
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
   SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
-  SixSigma = derive2 { name="SixSigma"; version="0.9-3"; sha256="04d09w1h6aq3j245gbj8cx7dsr88n4np6i751k9sx7lfx6al3w50"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
+  SixSigma = derive2 { name="SixSigma"; version="0.9-4"; sha256="01bsr98m3a7i075f2q04jjmhqb2m9120w6yg1af168s25qymfjwy"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
   SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; };
@@ -3000,8 +3082,8 @@ in with self; {
   SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; };
   Smisc = derive2 { name="Smisc"; version="0.3.6"; sha256="0knrgq6831rwr48880kvsmrl6c943nw3nkzds0sh63ljw0dp5ja7"; depends=[doParallel plyr]; };
   SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
-  SmoothHazard = derive2 { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; };
-  SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.4"; sha256="06wzyjpzqclf794lapr67g8qrk9y253gksidpcgn8fmfz5443mrp"; depends=[jsonlite Rcpp stringr]; };
+  SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.0"; sha256="122j7rr9d5pkyxlchlvs0zyfxxs1c9n4hj2kk9v9fws3gjlrrlds"; depends=[lava mvtnorm prodlim]; };
+  SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.6"; sha256="1p15k57hi31i3p6v63v9s7hi1w9kb4aqjcgz405jk4klsifzw8va"; depends=[jsonlite Rcpp stringr]; };
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
   SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.23.0"; sha256="1a62yklhyvcgsw50yg8r9cvdj54pi9ckzg0ms6v7zdbcd0k0nfbm"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
@@ -3022,10 +3104,10 @@ in with self; {
   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.74"; sha256="1fpfhld887y5lyb8jydprmv5krqm1fk6n53z942b4g4z1v4g04j7"; depends=[]; };
+  SparseM = derive2 { name="SparseM"; version="1.76"; sha256="16xnl9cacim35aawq6bmd2y6rrhnh1kg6dwsy3k5yslkfr1y9j62"; depends=[]; };
   SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; };
-  SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.1"; sha256="06l2ayjwawjp1kap76jqbnbjhx7x27z7vfn5jd0pz4g764krpfdr"; depends=[fields Rcpp RcppArmadillo RcppParallel]; };
-  SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.1"; sha256="0yk6sisl07wqrl16mzk6ch7567l87qrqlnzg976zq2s58cd6y3vh"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  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]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.1"; sha256="0bx31z91hf6vf22knf7bcn2j72jf123v8lvsfc7fjf0ssimqhpzz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
@@ -3037,33 +3119,34 @@ in with self; {
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.2"; sha256="1hwlyjpgzf2wgigbc49xcqhf6rzrjzkbriwa4i9gwpa0bnrs4wp1"; depends=[gsubfn splancs]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
-  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-1"; sha256="18l2dpyks6vay4vh24jmv81br9fblhm0rb1m6jpfj1qzpa974010"; depends=[Rcpp RcppArmadillo]; };
+  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
   SpherWave = derive2 { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.3"; sha256="195is72nj1vbhdx3yqmklmc9hqaaxvipgmcxszgvnqdv5bsiypgw"; 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.2.0"; sha256="1ijp29skqpb9c1h3a3qby9511qfnawsbz8bg6kdl9cclww7a90ij"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.3.0"; sha256="0rjfgaf08na66vjygd3pnx9qyl5q7x0w62llfw7qxb91j29z794w"; depends=[rJava]; };
   StAMPP = derive2 { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; };
-  StMoMo = derive2 { name="StMoMo"; version="0.3.1"; sha256="0ly1bznixw4qbnag56xykj8gnfrzhqh5blsii32paalk0n920mrm"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
+  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]; };
   StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; };
   StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
   StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.14.0-1"; sha256="18x23a7nmj5497g3i6a01cv5g34p0xdkb6srf9nwisbhshz25mxl"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.15.0-1"; sha256="0j3g73fm8ac9kfhb0kv4zk1j12i4klpcdlp71zwbv95v14ll38pf"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
   StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; };
   StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
-  StatMethRank = derive2 { name="StatMethRank"; version="1.3"; sha256="1jn7xg6f78lhpcd1b2bvjm90yws52klqz625lkwvwfmchwqrxi0i"; depends=[MASS pmr Rcpp rjags]; };
+  StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; };
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
-  StereoMorph = derive2 { name="StereoMorph"; version="1.6"; sha256="17c8r50i9wlvsq6gha56a4mhq84cmqm82j98zg4lb96jpydcp4dr"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
+  StereoMorph = derive2 { name="StereoMorph"; version="1.6.1"; sha256="1q0fif4azv8nd37smhmr61mr4fls1jpm1ky40aqlv6kjm336pn1c"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
+  Stickbreaker = derive2 { name="Stickbreaker"; version="1.0.0"; sha256="11g97yj61s09d1687algr9f80gcgw8fadc1vbadglxh7l9wxj6lv"; depends=[lattice nnet xtable]; };
   StockChina = derive2 { name="StockChina"; version="0.3.1"; sha256="1myxyfchnkskyqb5yciw1wfk3006f51y89ipzfjzdlfyzwy1lsp1"; depends=[]; };
   Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
   StrainRanking = derive2 { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
@@ -3073,11 +3156,11 @@ in with self; {
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
   StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; };
   StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; };
-  StructFDR = derive2 { name="StructFDR"; version="1.0"; sha256="13f9y6l7pcjmgyvhhk7qcl6k4j0krmg5m2bn3faq5ijpasw7m56x"; depends=[ape cluster nlme]; };
+  StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
   SubVis = derive2 { name="SubVis"; version="2.0.1"; sha256="1r9i27hx8xj8f3mhbm8ygcxwpq1lzxm26vay5mqk4q9swskg1vbh"; depends=[Biostrings shiny]; };
-  SubgrpID = derive2 { name="SubgrpID"; version="0.10"; sha256="1gvlvsvc9v20l24zxy9i57bzj1gjplzk14fpjrhallsnp23h8zn5"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
+  SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
   SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; };
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
@@ -3086,7 +3169,7 @@ in with self; {
   SuperLearner = derive2 { name="SuperLearner"; version="2.0-21"; sha256="0j349yv510s1qjkpks24qrfgr2bip1m70i5dh9ydlna280k43dbh"; depends=[cvAUC nnls]; };
   SuperRanker = derive2 { name="SuperRanker"; version="1.0.1"; sha256="0s5d38xaan4jznb3nlr9rj054haf6wks0229lggykj8mfz746wky"; depends=[prodlim Rcpp]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
-  Surrogate = derive2 { name="Surrogate"; version="0.1-79"; sha256="1ilh9w6v73aafsxcanhdjz2whsng2vyhkv240smmqifcl93kl208"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="0.1-801"; sha256="1ki4mqym7vgzvqxj19iksdn8fyv352hv0f91s91djdm02hkjl8ap"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
   SurvDisc = derive2 { name="SurvDisc"; version="0.1.0"; sha256="0iqjimrljh9iaw3s406v6j03xg62ysf9xdia1yxr2ray38j8148c"; depends=[cubature MASS mvtnorm nlme simex survival]; };
   SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
@@ -3098,14 +3181,15 @@ in with self; {
   SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.5"; sha256="0b975il4pfnxw709ar74w49k18b6znrjrm71vw6xl0qid8xwqpfa"; depends=[startupmsg]; };
   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=[]; };
   SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; };
   SyncRNG = derive2 { name="SyncRNG"; version="1.2.1"; sha256="0360pdx2p8a6519y3ik5xfdm2yxndyl31p3bb73nj4ihmr4w6lmj"; 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="1.99999-31"; sha256="0h2545b7hc417g5k9g482gk74mz15d0vqxviw60fqizxinxghlwv"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
-  TANDEM = derive2 { name="TANDEM"; version="1.0.0"; sha256="1zrx5zbfz0zrw46iziqnb11m75ri75dw1x88fd2dhw22am3q2940"; depends=[glmnet Matrix]; };
+  TAM = derive2 { name="TAM"; version="2.0-37"; sha256="06hm0xx01vbyp1xc22rl3wqw6i3f68qmkkrrdilrhb3kx7gzha9a"; depends=[CDM GPArotation lattice lavaan MASS mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc WrightMap]; };
+  TANDEM = derive2 { name="TANDEM"; version="1.0.1"; sha256="00k99inrb7ibg8g80ci22hnphnd7cwd078yxqlbwgacjxaqa36cj"; 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]; };
   TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
@@ -3117,7 +3201,6 @@ in with self; {
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; };
   TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; };
-  TDMR = derive2 { name="TDMR"; version="1.4"; sha256="1vaa75bazpk6fa34cahc597ifs307n4d8gq0r50q6rpm5rs0mnxx"; depends=[adabag SPOT testit twiddler]; };
   TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; };
   TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; };
   TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; };
@@ -3136,28 +3219,30 @@ in with self; {
   TInPosition = derive2 { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
   TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
-  TLMoments = derive2 { name="TLMoments"; version="0.6.3.1"; sha256="1rcix93s70lwjpmlfxqjrdphkp3p84pmxjxxchsm05qif7y6iwn1"; depends=[evd hypergeo Rcpp]; };
+  TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.8"; sha256="0dwfz6js35wb28qah85m3y2ddkfbiy567402npmyqr4wrh8l37p3"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.9"; sha256="1srjy4j3rn8arvqd7bsd9snczw6g0g5zwm18dckxddg84ld9qbqr"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
-  TOSTER = derive2 { name="TOSTER"; version="0.1.3"; sha256="15a7g1ccxk9xjcs3gysq8h4p0gd7527yq5zy6k9ara68a8f2dz1r"; depends=[]; };
+  TOSTER = derive2 { name="TOSTER"; version="0.2.3"; sha256="1wyzlil7sznf0gldnmga9qkbj4qcfrbpm8imns18dpfrz3kxaw4i"; depends=[ggplot2 jmvcore R6]; };
   TP_idm = derive2 { name="TP.idm"; version="1.2"; sha256="08n5bgc7gw1cbn9q7kd6jfxcwmb5mfjmdmhkhr35fi5ah21a57mh"; depends=[]; };
   TPEA = derive2 { name="TPEA"; version="3.0"; sha256="1ppy9jf0mb43vwnn5qd65g5dxf7wv3agf5rkldyas5y1ynsnbvlg"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
-  TR8 = derive2 { name="TR8"; version="0.9.15"; sha256="16mijxxddvnr3ii4v0djx5l844bp36pypmqn2r6gp3jwp9jn8czx"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
+  TR8 = derive2 { name="TR8"; version="0.9.16"; sha256="04zn01hqvza7pkc3pmiwiygdkawa39wc3g875mdvd5hjhi4ffkaf"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; };
   TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; };
   TROM = derive2 { name="TROM"; version="1.2"; sha256="1gfnlchaa16q9cksrgdkissy2fz481bcbac0cmxnc4vb0vbnz4h5"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
   TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
-  TSHRC = derive2 { name="TSHRC"; version="0.1-4"; sha256="04pvh3vhgx3pj3sgkbxsqdwjglqbmaaj0rsb8b4q162bh608d9zl"; depends=[]; };
+  TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; };
+  TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; };
+  TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; };
   TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; };
   TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
   TSP = derive2 { name="TSP"; version="1.1-5"; sha256="03xxfr5kk4zhzpb1q1pwncdp0dhchm9b48wzhvvxn2dxf3mnby2w"; depends=[foreach]; };
   TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; };
-  TSPred = derive2 { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
+  TSPred = derive2 { name="TSPred"; version="3.0.2"; sha256="0cbf5h3yrissng4xqrgbisarml772mg6b2ap508imf29zfks76gn"; depends=[forecast KFAS MuMIn]; };
   TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.1.02"; sha256="1rvxbzhdzjb4f3b4pk53iwv0vpw8s0z8k1fyfpcxvy333f68d59f"; depends=[bfast broom ggplot2 RcppRoll strucchange]; };
   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]; };
@@ -3187,11 +3272,12 @@ in with self; {
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
   Tariff = derive2 { name="Tariff"; version="1.0.2"; sha256="0x139hhjjc1iyx9m3h5vdjh57q5kbc6x1mzjysz0ibnqpvhanjb2"; depends=[]; };
   TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
-  TauStar = derive2 { name="TauStar"; version="1.1.0"; sha256="1z5n1wfzc9c6zlxbr1vszp492vlq105p28n8jf5gkzsjraznk9zv"; depends=[Rcpp RcppArmadillo]; };
+  TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; };
   Taxonstand = derive2 { name="Taxonstand"; version="1.8"; sha256="1lxnfzg6r0ak1c1xrgakcbqnqpg1vqni5xh6hk89xxbdl8zgaa91"; depends=[]; };
   TcGSA = derive2 { name="TcGSA"; version="0.10.1"; sha256="05cghnxn5r0ldr8cw371bz0iqx2b73b2qa77xj78xj7a950yvxhw"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
   Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; };
-  TeachBayes = derive2 { name="TeachBayes"; version="0.1.0"; sha256="0izxdgjzjclnfg01v1inkm4mb4h56nn9y0ilc54m4rrayicvs071"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
+  TeXCheckR = derive2 { name="TeXCheckR"; version="0.1.1"; sha256="13s73vq7rqf3ayfacrrd7dpb9ann5dvmcpl8flhjwnh3gxrghjgm"; depends=[clisymbols crayon data_table dplyr gmailr hunspell magrittr readr stringi twitteR zoo]; };
+  TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
   TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
@@ -3200,7 +3286,7 @@ in with self; {
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
   TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; };
   TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; };
-  Thermimage = derive2 { name="Thermimage"; version="2.2.3"; sha256="16pwykp33bwmca7dlcr4ia3sakfdazxxk501v4rcr735767fsvyh"; depends=[png tiff]; };
+  Thermimage = derive2 { name="Thermimage"; version="3.0.0"; sha256="0l098praarg5kg0m5hxs9zbwhl8w7g48ngyiry1rlwkp2rsl3cza"; depends=[png tiff]; };
   Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
@@ -3221,8 +3307,8 @@ in with self; {
   TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-5"; sha256="0n0kw90nzyh8ik09kp1lq301rhdink6dqzd6xw9qkl10z8rzq7v1"; depends=[DescTools mclust TeachingDemos]; };
   TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; };
   Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; };
-  Tmisc = derive2 { name="Tmisc"; version="0.1.12"; sha256="1awmc2gdas90hz66wiy4n7yqz3p0bl65adx0l6q7zx88w8nxn6lw"; depends=[audio dplyr]; };
-  Tnseq = derive2 { name="Tnseq"; version="0.1.1"; sha256="00pd51mmy2w5cpxrx2zh5jmpcirj8ynma3whnv1nmdy4lf10mn50"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
+  Tmisc = derive2 { name="Tmisc"; version="0.1.13"; sha256="1y3907aqr8k8qdl4pa6msjf80fwqmc63ga9hbvjvdn20h8w39a55"; depends=[audio dplyr]; };
+  Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="0.1"; sha256="1477zp8jzq1p22q8484vkrdx5nxwq4i44mxg4zhj9fixiw4shpx9"; depends=[ape]; };
   TraMineR = derive2 { name="TraMineR"; version="1.8-13"; sha256="058fj2jkr9hzpigmawzfv20c7dzdf70lwwxng46x0b1r34pdgrfr"; depends=[boot Hmisc RColorBrewer]; };
@@ -3234,15 +3320,15 @@ in with self; {
   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.0.3"; sha256="00z85vmpy7k4vi2jj9yspybc9hkwqqfnvl1x9jqayyb8xw8wk0f6"; depends=[binom ggplot2 survival]; };
-  TreeBUGS = derive2 { name="TreeBUGS"; version="1.0.1"; sha256="19nszlw5xgvd4r8rn6a4ayhx2nxxrmqw1ji4pbvn01y15cfyilfq"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.0"; sha256="1xw3wqax6d8pys2177cj6bdp92xx7pr08y6qa1g3k83hhi2frikw"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
-  TreeSim = derive2 { name="TreeSim"; version="2.2"; sha256="1c61afb49kjlfb6iy69vk2bgl20g8bhsbwnai2d2shmv1nimi5jf"; depends=[ape geiger laser]; };
+  TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.1"; sha256="1fph4sz3y7drni0mjivz82jvmfa8hp468vmqk00k51w4nkg3hyif"; depends=[]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
-  TropFishR = derive2 { name="TropFishR"; version="1.1"; sha256="0iv7v2wl899mw4c9nwgn530spc9vz0klhbrkc9ssazzrpxn3lq21"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.1.3"; sha256="114vg4jvb1k7mzz81ag1hs7zvpnq4ql68p55xbci24gi3qg5s7cj"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
   TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; };
   Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   TukeyC = derive2 { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; };
@@ -3256,7 +3342,7 @@ in with self; {
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.5"; sha256="1lag4aby81nnd7w8f68zswgm4afp24xhj72k0v7cka9hyxz0p129"; depends=[base64enc digest]; };
-  UPMASK = derive2 { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[DBI MASS RSQLite]; };
+  UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; };
   USAboundaries = derive2 { name="USAboundaries"; version="0.2.0"; sha256="1if3wf22h395iqcn1n5rfnacwhxd3mpmbvygdwbs2amk55r18vg4"; depends=[sp]; };
   USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; };
   UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
@@ -3265,18 +3351,18 @@ in with self; {
   UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
   UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; };
   UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
-  Ultimixt = derive2 { name="Ultimixt"; version="2.0"; sha256="18xg1z41nccwzn9mdzpap41ffp4cmfww8bwk10m1v96acf9kq2i5"; depends=[coda gtools]; };
+  Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
   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]; };
   Unicode = derive2 { name="Unicode"; version="9.0.0-1"; sha256="1daf4wlglqzha0p6cbmrkwn4ppkzfvpvg1aa64gphr4dg2g5jsdf"; depends=[]; };
-  UpSetR = derive2 { name="UpSetR"; version="1.3.2"; sha256="0b8nms8b3n6m2ya1ms68crya41k0kq149kxg5999fw5lykx35bjr"; depends=[ggplot2 gridExtra plyr scales]; };
+  UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; depends=[ggplot2 gridExtra plyr scales]; };
   UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; };
-  V8 = derive2 { name="V8"; version="1.2"; sha256="1sdjmg3d8m0jmfs7zmz7cpw4ffar76nia2dzymnb373alm1gwlh6"; depends=[curl jsonlite Rcpp]; };
+  V8 = derive2 { name="V8"; version="1.4"; sha256="0k97cz7hzlqpbwcmzpxd86hb8fbxqj70zshlnn4hnayjx0jaybi4"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
   VARSEDIG = derive2 { name="VARSEDIG"; version="1.3"; sha256="1qvc9lyfdc0irivi4y27hc5yn5lk05nbgqx7zcj602s0r7i7nvln"; depends=[]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
-  VBmix = derive2 { name="VBmix"; version="0.3.1"; sha256="0gicp470w6xy2z4r54ywjd4c9cck2yhhw7ismdp4jm9zsvc7nv1y"; depends=[lattice mnormt pixmap]; };
+  VBmix = derive2 { name="VBmix"; version="0.3.2"; sha256="09kgllh8wbsgx9ykv95igczy4hi8d8grvffvdkp2zygdiyvkhsxa"; depends=[lattice mnormt pixmap]; };
   VCA = derive2 { name="VCA"; version="1.3.2"; sha256="10d8vw6ihnsmqgvbfd6dwdilk9mz9wvmlxi39fpq219mqvqyzkah"; 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]; };
@@ -3286,18 +3372,19 @@ in with self; {
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
   VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; };
   VIGoR = derive2 { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; };
-  VIM = derive2 { name="VIM"; version="4.6.0"; sha256="1yl6bsdigwjfkdn5mbfrw10ip1xr7scw1mvykdwgzkyfnlb8z86w"; depends=[car colorspace data_table e1071 laeken MASS nnet Rcpp robustbase sp vcd]; };
+  VIM = derive2 { name="VIM"; version="4.7.0"; sha256="1vjcs5wvjv94ln01d94h9rs4j50d3ky4n26mm3prgh13raylrmnd"; depends=[car colorspace data_table e1071 laeken MASS nnet Rcpp robustbase sp vcd]; };
   VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
   VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
   VNM = derive2 { name="VNM"; version="4.1"; sha256="1vmdm4f7y69imsbxnd7q85q1ygcyl94pq5n7f33d0sd8rw51dmdj"; depends=[Rcpp]; };
-  VPdtw = derive2 { name="VPdtw"; version="2.1-11"; sha256="0qsw5mqv36k8mcvwj1ka41z5kc05yn79wv41ai8f5412sbngihlr"; depends=[]; };
   VRPM = derive2 { name="VRPM"; version="1.1"; sha256="19rr31w0yzy7w9k34ny2sjk9ijwgnkfzbdizdch77g9rnpzpw597"; 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]; };
   VWPre = derive2 { name="VWPre"; version="0.9.5"; sha256="1qxaq60zpb8hdpq3c17sm77jvm8r0yy88xvq1k8i52ggn8nn7gsc"; depends=[dplyr ggplot2 lazyeval mgcv shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
+  VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
+  VarReg = derive2 { name="VarReg"; version="1.0"; sha256="1xbm5l1jxcmjk38hl61bz2zyfcwa932487l03dzr8izxcain1dfi"; depends=[sn survival]; };
   VarSelLCM = derive2 { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.1.11"; sha256="1pxv6f7bz7g75hk3y7ndc9qcf49fzl82xc8f165w18wgkqk0v6a4"; depends=[RCurl RISmed stringi stringr XML XML2R]; };
@@ -3310,7 +3397,8 @@ in with self; {
   VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
   VennDiagram = derive2 { name="VennDiagram"; version="1.6.17"; sha256="14cahgxm5kq133j5wv6p7ivlmcmym5r39v4dpj69wnq6w9rjqki8"; depends=[futile_logger]; };
   VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; };
-  VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.1.0"; sha256="0k5mr9426v1b3kqnzrb1nizrsvjmm5qx6fybrnn0y1j2w7hk99jr"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
+  VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; };
+  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]; };
   VineCopula = derive2 { name="VineCopula"; version="2.1.1"; sha256="1cqfa7s3gqrbdhjy2v8yn44k6vlxpzi0bmlcpzf9kkzy36p3vz84"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
@@ -3328,28 +3416,29 @@ in with self; {
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
   WGCNA = derive2 { name="WGCNA"; version="1.51"; sha256="0hzvnhw76vwg8bl8x368f0c5szpwb8323bmrb3bir93i5bmfjsxx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore 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]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.9-1"; sha256="0w7qnqf289p5jnfr9l83bcplxg1rvbhc90iz7wwnphx7246nkdvv"; depends=[MASS mc2d plyr reshape]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.0.1"; sha256="14xi1wksyj07nch678dd4rbaa3q1in4nbsarv5bijl2b11dhfi7j"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="0.2.2"; sha256="11zbmsq2nbvb9m7wkybwcmk1lj6n8w1v355qwsp41j9pd7r3ccw8"; depends=[ggplot2 gridExtra mgcv replyr reshape2 sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="0.2.3"; sha256="1664gbhpn02qcgxvw5adqk2kdx8zrlrm5ca5f7d9c3k7a3db00ih"; depends=[ggplot2 gridExtra mgcv replyr reshape2 sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
-  WWR = derive2 { name="WWR"; version="1.0.0"; sha256="0nsgcasdgzxxlnpicmq9n9200gg2c2si3gfpwaxdy4ccwasgjq6p"; depends=[]; };
+  WWR = derive2 { name="WWR"; version="1.1.0"; sha256="19pq31ivga8yy9hxmw3birbbnhrph52hazydagz9d44az2x2877x"; depends=[inline]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
   Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; };
   Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.0"; sha256="1qfh5ca8389b3zimqfrlhjyzkrvvj3dixhbab1a0wrnbcc55dcq1"; depends=[fracdiff wmtsa]; };
   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.0.5"; sha256="17h7gq14mnwfjgiyf8gwvy7z60rwd13bqgbx6pkxqf95j48k0bsg"; depends=[data_table doParallel foreach pkgmaker rjson rPython]; };
+  WebGestaltR = derive2 { name="WebGestaltR"; version="0.0.8"; sha256="0wwxqfskrj5g50g223cdr33l8n7z3psi1gwl34261fv1v48nxxvr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
-  WhatIf = derive2 { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
-  WhiteStripe = derive2 { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
-  WhopGenome = derive2 { name="WhopGenome"; version="0.9.6"; sha256="038bg8c3y9h5hbkicikdqcjli5cf1bpmsc021zi00bgsk8z4i1iq"; depends=[]; };
+  WhatIf = derive2 { name="WhatIf"; version="1.5-8"; sha256="0vnkb16ap1aiqbmcw18cr558kyixq0rmfcwh0bp6v1djwb78adhd"; depends=[lpSolve Zelig]; };
+  WhiteStripe = derive2 { name="WhiteStripe"; version="2.2.2"; sha256="0jaxy5a4m4ir25assi2dsdgfcm88lbgjdghsh36v7zvhblrfcfap"; depends=[mgcv oro_nifti]; };
+  WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
   WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; };
   WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.0"; sha256="17vnfarnqf5cqdldgwg505vcj2l0hji409zdyncks7xcq8myvswz"; depends=[dplyr httr jsonlite]; };
@@ -3363,12 +3452,12 @@ in with self; {
   WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; };
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.6.1"; sha256="0nshs1c00f2cw7wmrphz1833gd336bckqa9h0q90hxj388kwis3y"; depends=[dplyr httr jsonlite]; };
-  XBRL = derive2 { name="XBRL"; version="0.99.17"; sha256="00dg9624hc1l8c0nw1ma4ykgkmjzk3gqf77ndnagddh65cqbiigq"; depends=[Rcpp]; };
-  XGR = derive2 { name="XGR"; version="1.0.8"; sha256="1fy203927bai86pj80m275afvcpj78nil1yi99lf1jvmmfck7riv"; depends=[BiocGenerics dnet GenomicRanges ggplot2 igraph IRanges Matrix RCircos rtracklayer S4Vectors supraHex]; };
+  XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
+  XGR = derive2 { name="XGR"; version="1.0.10"; sha256="19fgjg7cd6ax4iiwkp0r4ssr6ygfg16s3i62vr3y63an6ykmg206"; depends=[BiocGenerics dnet GenomicRanges ggplot2 igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
   XLConnect = derive2 { name="XLConnect"; version="0.2-12"; sha256="0b7nz5k3sai32fvpqzxim5ckcqrqmzd111qxm65369zvg3q281jh"; depends=[rJava XLConnectJars]; };
   XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-12"; sha256="1wkdrvm6h1kpkfvwf5xcx7v1j06dmp6qxgiy5ca5b0qixhqg8sv7"; depends=[rJava]; };
-  XML = derive2 { name="XML"; version="3.98-1.5"; sha256="0dcdj7ryn8lm7wmv4hqhh9jxa5k97l6ad8xyvb932yfkwj1g1byy"; depends=[]; };
+  XML = derive2 { name="XML"; version="3.98-1.6"; sha256="1amxx7fpik162nimrr7m5lvv6rhx9cwdyg44fxp1i5wm3y4skwnz"; depends=[]; };
   XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
   XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
   XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; };
@@ -3376,7 +3465,7 @@ in with self; {
   XRJulia = derive2 { name="XRJulia"; version="0.7"; sha256="0xcm8rkgg6l5p50x7mpzxx4ln29j8s2ngdswfmgb6vq48p7ws9gw"; depends=[XR]; };
   XRPython = derive2 { name="XRPython"; version="0.7"; sha256="1vgxby01ac8s9ldfnjdyg0yj0y0341w596pp4sx5szdrl359n0fn"; depends=[rPython XR]; };
   XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; };
-  XiMpLe = derive2 { name="XiMpLe"; version="0.03-23"; sha256="13vsf9l3s0scqvxwxj109n6vb7rx3a2hv5lbrnjk6rxjwl8iqrly"; depends=[]; };
+  XiMpLe = derive2 { name="XiMpLe"; version="0.10-1"; sha256="10163snplpw4r4902w2ws60m6wr1icnniv7y0vy7y1nq2c0i0is5"; depends=[]; };
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
@@ -3386,18 +3475,18 @@ in with self; {
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
   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.0-16"; sha256="1myj1a6y69rmjrgaax2n26qa7cprclszg1s9xdzw6s6kqaw5b969"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
+  Zelig = derive2 { name="Zelig"; version="5.0-17"; sha256="0wn99v9l49ph1150fgd5jmjvwxingdmibrw1p4cg7cqyjwvdc7n0"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-4"; sha256="02wbgzrp0jxkzz1bj5s6zk6m0w7l26jncml91mwhb2w5hzhjnbaj"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-0"; sha256="1vkni4p1b0aq63l4nqg16f6a28c6ccm8nyg67z45x0yfq7xgcsi6"; depends=[dplyr ei eiPack jsonlite MASS MCMCpack Zelig]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
-  aLFQ = derive2 { name="aLFQ"; version="1.3.3"; sha256="0ar325hwzmldviq7f8c478z95xlamvhwwmqs2fv6p3cx7l9k0kz6"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
+  aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.0"; sha256="128f3ggnqpdv12d1f1hpkq5nb1wdwihifvvb2k2ixizmhw7vn6dy"; depends=[]; };
-  aRxiv = derive2 { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
+  aRxiv = derive2 { name="aRxiv"; version="0.5.15"; sha256="1l2v66kk08awinw08xhm2xpr8d83n74fvzq4r5d2sy77vrfvgxnh"; depends=[httr XML]; };
   aSPU = derive2 { name="aSPU"; version="1.46"; sha256="01xysgyc7hj0pzidbmmg1119krcz1hvx52qbybijhjr3y0hw2mfi"; depends=[fields gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; };
   aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
   aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.0"; sha256="193289dm3nvmkx0dmclm1isz62jvvmhynnm1w1964v5nz2jc8vzd"; depends=[party randomForest rpart]; };
-  abbyyR = derive2 { name="abbyyR"; version="0.5.0"; sha256="1i0mrh25mgl8aykprihsdm3zn0nsw0cr458rqnz7djff1j0mp8rg"; depends=[curl httr progress readr XML]; };
+  abbyyR = derive2 { name="abbyyR"; version="0.5.1"; sha256="1s8zf18sh0s89vk3dl09fzrq50csmmfvmsanf5vfkv9n5lx6pklg"; depends=[curl httr plyr progress readr XML]; };
   abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
   abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
@@ -3420,7 +3509,7 @@ in with self; {
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
   acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
   acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; };
-  acnr = derive2 { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
+  acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; };
   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]; };
@@ -3440,22 +3529,22 @@ in with self; {
   adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; };
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
   addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; };
-  addhazard = derive2 { name="addhazard"; version="1.0.0"; sha256="178rn3md0pgbg9nimvypj4c3paq3bgh2h06vqj3p0n78hrwf97rl"; depends=[ahaz rootSolve survival]; };
+  addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; };
   addinslist = derive2 { name="addinslist"; version="0.2"; sha256="04jqhdy0axs1a9c0cfi3pqy9hd67jqxz79a2lj209gd27qv1q22c"; depends=[curl devtools DT miniUI rappdirs rmarkdown rvest shiny shinyjs xml2]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; };
-  ade4 = derive2 { name="ade4"; version="1.7-5"; sha256="0aaqbnydm5fb37nrvqj4bx6hxax7255j426cwh2lh88nyvznbq37"; depends=[]; };
+  ade4 = derive2 { name="ade4"; version="1.7-6"; sha256="0lnc37d6waajmagy8qvw206pyc4vgrpzl3hk3j9frh6wa0b8x140"; depends=[]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
   adegenet = derive2 { name="adegenet"; version="2.0.1"; sha256="045vc1s1n4ihw9id02c3w315pgfr004was2b0d6xb07ncipg9pby"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
-  adegraphics = derive2 { name="adegraphics"; version="1.0-6"; sha256="0qahc6ld5nz6z81jv9yhh2cd27vh9n02swdf787fr83jgig43hja"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
+  adegraphics = derive2 { name="adegraphics"; version="1.0-8"; sha256="1588n1cqgzdv4lpdgsyj47mha41n11sb36vvjdix3drncq997p9b"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitat = derive2 { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; };
   adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.14"; sha256="0ljmn4zbg2lb5b2ckddbxd7ibbib1pzv4iv0ld2k3bv1mvn2j565"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
   adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.12"; sha256="06lrg1s3l7slbff17my62ap7mn6h3p6s8jnn7j8mrs48nvim00z9"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
   adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.21"; sha256="0anyvijvlrq7c0a77dpcyq60yl1jc817rj5cb3s9iq6scicymp87"; depends=[ade4 adehabitatMA CircStats sp]; };
   adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.11"; sha256="1911zdpwyr1gqyjvnn5w3blhk0mjafy0xmr3l6l749lx4cwa08d9"; depends=[filehash sp]; };
   adephylo = derive2 { name="adephylo"; version="1.1-10"; sha256="1hj9nkl2z2xdb5yv9a7fb7zn9sd41lrhk2ff5z8s88xab3b2vhnc"; depends=[ade4 adegenet ape phylobase]; };
-  adespatial = derive2 { name="adespatial"; version="0.0-7"; sha256="0abbds2f43dcri50crlz2fbqy444zp4bhbs81zdiby5fz64m9gr5"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; };
-  adhoc = derive2 { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[ape polynom spider]; };
+  adespatial = derive2 { name="adespatial"; version="0.0-8"; sha256="0h2waffkgdns5pz47zhy0wi388hrya6s01gwgwbyp7fgxj65i9ba"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; };
+  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]; };
   adlift = derive2 { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
@@ -3463,7 +3552,9 @@ in with self; {
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
   adwave = derive2 { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; };
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
-  afex = derive2 { name="afex"; version="0.16-1"; sha256="0y0q7lbdraw8sn4l9qazvdawqpsyjzhfzddp9gii8w72a69s90dq"; depends=[car coin lme4 lsmeans Matrix pbkrtest reshape2 stringr]; };
+  afex = derive2 { name="afex"; version="0.17-8"; sha256="1ypa6np04ls2dpbdh8p7c56zcagiwnad17akhfpdmv3qxi1lkn43"; depends=[car coin lme4 lmerTest lsmeans pbkrtest reshape2 stringr]; };
+  affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
+  afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
   agRee = derive2 { name="agRee"; version="0.5-0"; sha256="16ijw02x5qvc8rppf0yn35aljd35alnvjkjyi6725nywjib2xy5x"; depends=[coda lme4 miscF R2jags]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
@@ -3479,7 +3570,7 @@ in with self; {
   akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; };
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
-  alakazam = derive2 { name="alakazam"; version="0.2.5"; sha256="1mc6riwycizbmr7mx6r4fs513ij8g14fgs5ngg2rai7cp58796cc"; depends=[data_table dplyr ggplot2 igraph lazyeval Rcpp scales seqinr stringi]; };
+  alakazam = derive2 { name="alakazam"; version="0.2.6"; sha256="18l3l2gwlsws4qc8kkg6828nvxyipqqan5y1xixh6i9xjxwhr5w4"; depends=[dplyr ggplot2 igraph lazyeval Rcpp readr scales seqinr stringi]; };
   ald = derive2 { name="ald"; version="1.1"; sha256="1ar9mrvfw2jz4js9prbp9icsync7fw6wpirpximsr4cy1klqjfpn"; depends=[]; };
   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]; };
@@ -3490,13 +3581,13 @@ in with self; {
   allelematch = derive2 { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
   allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
   alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; };
-  alm = derive2 { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 httr jsonlite lubridate plyr reshape reshape2 stringr]; };
   alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; };
   alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; };
   alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
   alphashape3d = derive2 { name="alphashape3d"; version="1.2"; sha256="1apbirffqipdj618qgqh7vjlhg9fp6ncxb0yk4dclpn7g645863x"; depends=[geometry rgl]; };
   alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
+  alterryx = derive2 { name="alterryx"; version="0.2.0"; sha256="042cbxw0s43ffmicf25mvg0na1l0x8qbf6rl63ia44r9l3v8jcyd"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
   amap = derive2 { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; };
   ameco = derive2 { name="ameco"; version="0.2.6"; sha256="1jbkw79kv6b83kv1s2id2xrljzbz25bc7yqld3p8dfpngcpmgvq8"; depends=[]; };
@@ -3510,7 +3601,6 @@ in with self; {
   analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; };
   analytics = derive2 { name="analytics"; version="1.0"; sha256="1f5jmc0j3r8y401d9j0acl83d3mp63a2n4hsmxznph2vva9y9kxc"; depends=[cluster MASS powerplus]; };
   analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
-  anametrix = derive2 { name="anametrix"; version="2.0.0"; sha256="1dnmz7mpm1rsw61a39pkby0jsiprwk0g74h09g3r4vbn4k93r375"; depends=[dplyr plyr RCurl XML]; };
   anapuce = derive2 { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; };
   anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; };
   andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
@@ -3519,13 +3609,16 @@ in with self; {
   aniDom = derive2 { name="aniDom"; version="0.1"; sha256="0nffgszifar9da8310ymhfns19xnnnjh49rlvaxxk711h0a72fc5"; depends=[rptR]; };
   anim_plots = derive2 { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
-  animation = derive2 { name="animation"; version="2.4"; sha256="092xqnnr16rdf9yx68l6qgq4gg2ghdk31s4liycx71kvn6kr3vss"; depends=[]; };
+  animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; };
   anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
+  anomalyDetection = derive2 { name="anomalyDetection"; version="0.1.1"; sha256="0446qdh8abl02f7s2rli5qh7vl1y075nwirmxhc2i59jl0jhx44f"; depends=[caret dplyr gmp gplots magrittr MASS matrixStats plyr purrr qdapTools RColorBrewer tibble tidyverse]; };
   anominate = derive2 { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.10.0"; sha256="036qjsppygszd6v8xxf94a0p28nv78zxlq5wqxrwamhahc7mafin"; depends=[antaresRead data_table]; };
+  antaresRead = derive2 { name="antaresRead"; version="1.1.1"; sha256="0bpz7h4m0q0f7mrhgf16rag7whg6s924ylkg2a9fczgc1dam197p"; depends=[data_table lubridate plyr]; };
   antitrust = derive2 { name="antitrust"; version="0.95.1"; sha256="14qz4c78lyfhgh3xyybn2sb8kl4rjzvb3dwrwxl9dzjmk5k6ab7i"; depends=[BB evd ggplot2 MASS numDeriv]; };
-  anytime = derive2 { name="anytime"; version="0.2.1"; sha256="0grz40c4wv8z174b7avrj2fcfbr3clmvbrqjgmvi6x3ww6sqfppm"; depends=[BH Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.2.2"; sha256="01m5cjk119k2v9hsmcgh9pk6sw52xx0nl4xrap5sfzvzjvy5brgm"; depends=[BH Rcpp]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[boot lme4]; };
   aoos = derive2 { name="aoos"; version="0.4.0"; sha256="16kkgbk54fqn18pm2psw6v1g71vl8xrc9mk0na5zh83ag69cjqcz"; depends=[magrittr roxygen2]; };
@@ -3533,8 +3626,8 @@ in with self; {
   aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
   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.4"; sha256="0ckxp37p1aizvs5sql54xvpimhq4m4944x18ihqffhpzb3dxw1ba"; depends=[ReporteRs]; };
-  apaTables = derive2 { name="apaTables"; version="1.0.4"; sha256="1ncs79n0jvr6m9gmaazi5d9g2c6c6hf8alrb45z8fy8sj9bj51hn"; depends=[car MBESS rockchalk]; };
+  apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; };
+  apaTables = derive2 { name="apaTables"; version="1.5.0"; sha256="18gd06syl6sylrbrdmp5mlw9q4whnxlv0w7l0yll5jk1bn440fw8"; depends=[broom car dplyr MBESS rockchalk tidyr]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcluster = derive2 { name="apcluster"; version="1.4.3"; sha256="1pqcxh83189388qqc6cngqnsygvpx4kjy0j2r8ykcgxvdwi8r58m"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
@@ -3553,6 +3646,7 @@ in with self; {
   apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
   apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
   apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; };
+  aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
   aqp = derive2 { name="aqp"; version="1.10"; sha256="1c8vj10mygsrlixx4pwfs1xk69bvhdi37hl4p1v6g3nwvsr8f7ac"; 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]; };
@@ -3570,20 +3664,20 @@ in with self; {
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
   arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; };
   arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
-  aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.0.0"; sha256="1i6swcg13sajsr2r49ga3qnkiza87ql49v96mjwaj0s5x23szknp"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
+  aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.0"; sha256="1slbmqr0qd8r9lrms7b86fhvn612g4yjbm604zahjr335q6d7h03"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
   aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
   aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; };
-  aroma_core = derive2 { name="aroma.core"; version="3.0.0"; sha256="0y0hydf2b2fp2dn2fqxbdqsf2r04rk7y1s2wwm1dg3p6nzsgnypk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
+  aroma_core = derive2 { name="aroma.core"; version="3.1.0"; sha256="1hynag8jgjbxhnihpvv3zy3z5wdfg52ca9mly9bc649yh3gpmmxk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
   ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-  arsenal = derive2 { name="arsenal"; version="0.2.0"; sha256="1rwzgza4dy1xyi0p157yfhwr1bwwk6bxbkb31752av34nvddl4cm"; depends=[broom stringr]; };
+  arsenal = derive2 { name="arsenal"; version="0.3.0"; sha256="19m6zblghdsx0phm82bb6dbjba260pa495xxwssypciyf7lrj3mc"; depends=[broom stringr]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.5-0"; sha256="0x75ggaaqnhikkpk2rhwnzbg1lakch7kykw6q9iw6wzvq8qbmnmi"; depends=[Matrix]; };
-  arulesCBA = derive2 { name="arulesCBA"; version="1.0.2"; sha256="0sckrw702ah5dphbixfinnb0g9sca7r12k91c564aigfj3yspc1s"; depends=[arules caret Matrix testthat]; };
+  arules = derive2 { name="arules"; version="1.5-2"; sha256="0i5cj2v86nmrqf4lr0jisfpvscjz6pp6d8kzaj1ry09d4j3z2siz"; depends=[Matrix]; };
+  arulesCBA = derive2 { name="arulesCBA"; version="1.1.1"; sha256="185zj7yajziadb8xhyk376gxsa4xn03jjd3kp1lqn2ck6v0cvsnj"; depends=[arules caret Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
-  arulesSequences = derive2 { name="arulesSequences"; version="0.2-17"; sha256="1ch2k70k713h5vr3g7ddzv1bsgpyiaf6i6jjf7jmvcc4m6pcg2s1"; depends=[arules]; };
-  arulesViz = derive2 { name="arulesViz"; version="1.2-0"; sha256="1vdcrqw5m4ca379y4xapz8azifnv608lna0mx3kl7zi6iy8ysn61"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; };
+  arulesSequences = derive2 { name="arulesSequences"; version="0.2-18"; sha256="1vpsq10l6zg16b03akxf57fyd8qhfcj5f3az761fmws0n6bc0vm3"; depends=[arules]; };
+  arulesViz = derive2 { name="arulesViz"; version="1.2-1"; sha256="0x4hg5nhkga6zikl5ah5g0vvqfn0xw9277c9q4hfxp4x2hzdbsyy"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; };
   as_color = derive2 { name="as.color"; version="0.1"; sha256="1y5qpm0pabfk5qvgx6s2vqqxfhp1x99g7dva24zay34nvf4bxrzn"; depends=[]; };
   asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
   asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; };
@@ -3593,14 +3687,14 @@ in with self; {
   asdreader = derive2 { name="asdreader"; version="0.1-2"; sha256="0lfm0c5nzm276zaaxxwkpkqca5xg9r6ysfpgl6wvdbbvs9s83x4a"; 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]; };
-  asht = derive2 { name="asht"; version="0.8"; sha256="0j8fabrdpnp7y8pa7crjx976hngyvm2zy0chdp4p44pgcs4dn071"; depends=[bpcp coin exact2x2 exactci ssanv]; };
+  asht = derive2 { name="asht"; version="0.9"; sha256="1sphcvwb4nqmbr3lppripk3wz8kakbi7d1kwkq3ji3yn5yvd7384"; depends=[bpcp coin exact2x2 exactci 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.3"; sha256="1kg58k52wiwcqgxgzsvrcn10j5gcl395mw4vky4k85kmcw1h63ks"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
   asremlPlus = derive2 { name="asremlPlus"; version="2.0-12"; sha256="119r7wwrz11j85idq21xdp2wq7l2jly73q3179d3bsywbmx5sr17"; depends=[dae ggplot2]; };
-  assertable = derive2 { name="assertable"; version="0.2.1"; sha256="0q204l1wlnwvlf72lzaqfxf5x88h53c8zva5vmiq0c825h2v67an"; depends=[data_table]; };
+  assertable = derive2 { name="assertable"; version="0.2.2"; sha256="0443kjr7f7icz36a2aigldg3k2iwkhn2pkvvbv8sa9d1wdjy7kjn"; depends=[data_table]; };
   assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; };
   assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; };
   assertive_code = derive2 { name="assertive.code"; version="0.0-1"; sha256="0drdrc9ljznkz52lvpwx0mvrghl0wf6dffzc3msz8lnvraxmanyw"; depends=[assertive_base assertive_properties assertive_types]; };
@@ -3617,16 +3711,16 @@ 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="1.0.2"; sha256="1l0j0jxg5dr6c1hkigwpmr04df30s0cqpy64brrkl8jkwf4c1ji1"; depends=[dplyr lazyeval MASS]; };
-  assertthat = derive2 { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
+  assertr = derive2 { name="assertr"; version="2.0.2"; sha256="19di52iwsdxzs08pm49smiwhld04528vysm1fyfdvl51zl04hwgd"; depends=[dplyr lazyeval MASS]; };
+  assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; };
   assignPOP = derive2 { name="assignPOP"; version="1.1.1"; sha256="11786lxnrwi4gb1nddk8bkz7h9wyjiav8gajss43cybhiwpcy0p1"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
-  aster = derive2 { name="aster"; version="0.8-31"; sha256="1rn9hp7dg81rd14ckmfz23aav3ywm7i3w46jx66kqbrfs7kdrslq"; depends=[trust]; };
-  aster2 = derive2 { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
+  aster = derive2 { name="aster"; version="0.9.1"; sha256="0z976r9ljawfdzvmsb1arpllgs3l2r5wimdvbpcw08r1qdyyzwj8"; depends=[trust]; };
+  aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; };
   astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
   astroFns = derive2 { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
-  astrochron = derive2 { name="astrochron"; version="0.6.5"; sha256="141nw03ggxc4p297g799kvk15sa6n5apf733kg7w9bbfgqwm4aa5"; depends=[fields IDPmisc multitaper]; };
+  astrochron = derive2 { name="astrochron"; version="0.6.6"; sha256="1ycpjxdcrvbh26ykhy5srwmd9pm88l4y550887lray4jqa4gr9f1"; depends=[fields IDPmisc multitaper]; };
   astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
   astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
   astsa = derive2 { name="astsa"; version="1.7"; sha256="1rzl1ayzv8lnn2009j4v667pp8sxdbn7qbqqyjpq00c75f4wss6x"; depends=[MASS]; };
@@ -3645,14 +3739,14 @@ in with self; {
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
   autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
-  autoimage = derive2 { name="autoimage"; version="1.2"; sha256="1dzxdz7wpmhl5p1jcab2i7k9fd7idm3dflsyj8clpp203wr4kz56"; depends=[fields ggplot2 mapproj maps viridis]; };
+  autoimage = derive2 { name="autoimage"; version="1.3"; sha256="109n23j9wx0nbbawpr28l3xsxhc3pq21b0pg6h2symgjahvw9b5n"; depends=[fields ggplot2 mapproj maps viridisLite]; };
   automagic = derive2 { name="automagic"; version="0.3"; sha256="0yzv0ianfq217jvz7rba86bcmxh09p513khvq6jk5k7isblvn0qd"; depends=[devtools dplyr formatR githubinstall knitr magrittr pacman purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
   automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
   autothresholdr = derive2 { name="autothresholdr"; version="0.2.0"; sha256="18a41nrh5ll1i4gqh58iwbyg8wl9w4969mx24knldaf6c303c8ss"; depends=[EBImage magrittr rJava RSAGA]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
-  averisk = derive2 { name="averisk"; version="1.0.2"; sha256="0k7f0l7bx76q5x8cam2z0q6akc9a6zj0pj0644v8gbr40n2y5snz"; depends=[MASS]; };
+  averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
   aws_alexa = derive2 { name="aws.alexa"; version="0.1.2"; sha256="0ddgsk8bj51dz43flkxha73m7cmqbi63bp4ascwd3yp8645jjx6h"; depends=[aws_signature httr plyr XML]; };
   aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.1"; sha256="0xzilzvrvzhna1iyhjb5r9k1wbd7545sc1yjcf69r35585gnm8rr"; depends=[curl jsonlite]; };
@@ -3667,10 +3761,10 @@ 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-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; };
-  bWGR = derive2 { name="bWGR"; version="1.3.2"; sha256="0c0fj8w6gzkcbpfw68hvdp3ihjdwpnplqgnxnj7zp5cxac996vs8"; depends=[Rcpp]; };
+  bWGR = derive2 { name="bWGR"; version="1.4"; sha256="0sj6fa4ajp7a7k8z7znqn3wkibvxmdlnj5xf1n0zmsvncmgqhkwh"; 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.2.1"; sha256="1knzr0pn77k8krinp8pmlzf07v8597g2iby4mayig91cna1m0psx"; depends=[]; };
+  babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; };
   backShift = derive2 { name="backShift"; version="0.1.4.1"; sha256="1vixr9l9zqaqy0knahijp6y9vzix4m8bz3abiprk3v2pjzg5nrvm"; depends=[clue ggplot2 igraph jointDiag MASS matrixcalc mvnmle reshape2]; };
   backblazer = derive2 { name="backblazer"; version="0.1.0"; sha256="020kdydksm0brnxsa00blf5sylxd4hz49wmngk1x1fx43kdlyc41"; depends=[httr jsonlite openssl]; };
   backpipe = derive2 { name="backpipe"; version="0.1.8.1"; sha256="1nid5rbgwiq8axkrl2gwl4vr5bjq5k5nrhq7macddvijcn3r2dz8"; depends=[]; };
@@ -3679,10 +3773,11 @@ in with self; {
   backtestGraphics = derive2 { name="backtestGraphics"; version="0.1.6"; sha256="14l9dbkbcx4kl45kpjbq4ihzf47j859khhd1db40vnp8x57g9xcx"; depends=[dplyr dygraphs scales shiny xts]; };
   bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
   badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; };
+  badger = derive2 { name="badger"; version="0.0.2"; sha256="15qnb0a6rqsf1dbb1cf9ag2z5f4zhf8b8psxbsdhh42qrg8g3mma"; depends=[dlstats rvcheck]; };
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
   baitmet = derive2 { name="baitmet"; version="1.0.0"; sha256="0qrg3a5h5c0w8awnpnn1bfvgqqm4bylkwgjwq3l58xkfji6l0d08"; depends=[erah HiClimR osd Rcpp signal XML]; };
   bamdit = derive2 { name="bamdit"; version="3.0.0"; sha256="0hph6z3id4japk9ljgmn9ygbbswlj50viqllww4qsi2a5wxjls3f"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
-  bamlss = derive2 { name="bamlss"; version="0.1-1"; sha256="1r34qgy0w0hx2q9bfc7bxzyjgnqn3wfb0r0ij3rkvdi5rzcrsw7z"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; };
+  bamlss = derive2 { name="bamlss"; version="0.1-2"; sha256="1d5pinyq16y0ljjgf23mpabzpsx4n2vh91c89qmzclcw7ns0l7xw"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
   bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; };
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
@@ -3693,7 +3788,7 @@ in with self; {
   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.1"; sha256="1f0asnf5ri55q6mhjkv7lfhr2hncs65vrykmr80r5sxsha6bqndz"; depends=[backports]; };
-  basefun = derive2 { name="basefun"; version="0.0-36"; sha256="1y2pvs5gffifvchyqahsnqg6zw00yargajvryrb96labh9c5dqyl"; depends=[Matrix orthopolynom polynom variables]; };
+  basefun = derive2 { name="basefun"; version="0.0-37"; sha256="0v1v4a1kvzyzw7zrfvnbiqdg6jwa0z58w64gmzrb0a0aygnwk8fp"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
   basicspace = derive2 { name="basicspace"; version="0.18"; sha256="1jnylqaxgmdj9ld9q7hkmi4af8yzswaqgykbw96qzzxp9cvini1y"; depends=[]; };
   bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; };
@@ -3704,17 +3799,19 @@ in with self; {
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   bayesAB = derive2 { name="bayesAB"; version="0.7.0"; sha256="1visjwxf7jc9z1m99dnplg01sbbx4w4cr6ykh3n1nzh5r9xinimm"; depends=[devtools ggplot2 plumber Rcpp reshape2]; };
+  bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
+  bayesDP = derive2 { name="bayesDP"; version="1.0.2"; sha256="1c71p20acvmbwqm1a67f9d89g0fgmw9zlg1w1sic3adz3gwcsifx"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; };
   bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; };
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; };
-  bayesImageS = derive2 { name="bayesImageS"; version="0.3-3"; sha256="08d7ffv1nr1q7syf8fxp40fczyl5i8xd2cyv3piqn40l7dlpckhj"; depends=[Rcpp RcppArmadillo]; };
+  bayesImageS = derive2 { name="bayesImageS"; version="0.4-0"; sha256="1z8jvjqz56xlj5x2ilp9m93v74qsqd7xvdld5pk7y80pxnfd6wpy"; depends=[Rcpp RcppArmadillo]; };
   bayesLife = derive2 { name="bayesLife"; version="3.0-4"; sha256="1n15df1rsyad3ij7l6ib79q7yflgwaykxq8msbkaq4ly8fvyy72x"; depends=[bayesTFR car coda hett wpp2015]; };
   bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
   bayesPop = derive2 { name="bayesPop"; version="6.0-4"; sha256="16i9h7zvym1mj1al3wzima3y4igxhwax03npgnypaxahi1sbiwha"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012 wpp2015]; };
   bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; };
   bayesSurv = derive2 { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; };
-  bayesTFR = derive2 { name="bayesTFR"; version="5.0-5"; sha256="091yzazvj66g6l9997qgnybbhvidfd9gr1wj15b7r3ji0cigywkm"; depends=[coda MASS mvtnorm wpp2015]; };
+  bayesTFR = derive2 { name="bayesTFR"; version="6.0-0"; sha256="0dyjq7s2gvwwz0yylz5g0csjnhdfbbii1sd4606r2yphfwb9v0x8"; depends=[coda MASS mvtnorm wpp2015]; };
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
   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]; };
@@ -3723,7 +3820,7 @@ in with self; {
   bayesm = derive2 { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
   bayesmeta = derive2 { name="bayesmeta"; version="1.4"; sha256="0ks0g7jdr2jqm7nwbm0p34nk8hm9746nldf0kyzgkl7vb29jb9f1"; depends=[forestplot]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
-  bayesplot = derive2 { name="bayesplot"; version="1.1.0"; sha256="0c71ma6v6b44j39x7z44wyashnpd8xdwj3hrvvjafx473pgmbx4s"; depends=[dplyr ggplot2 reshape2]; };
+  bayesplot = derive2 { name="bayesplot"; version="1.2.0"; sha256="10xk90vh9p9ifnkffh4l7icq7072zmn3cf5gdr8j4982pbb3d4w0"; depends=[dplyr ggplot2 reshape2]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesreg = derive2 { name="bayesreg"; version="1.0"; sha256="0crld04cxxqw0xq2d4rdv040iq7vchwjbzacj0z8jv245hwgr9qy"; depends=[BayesLogit]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
@@ -3731,7 +3828,7 @@ in with self; {
   bazar = derive2 { name="bazar"; version="0.1.4"; sha256="1dmxii9y61hpi7vpdm7vqdrc9lcsdazi3634k9yrdjcf6xzh4byd"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
-  bbmle = derive2 { name="bbmle"; version="1.0.18"; sha256="0gcj16msny7ni60r000mv2knb4gxbb470qn16pc6vzdhrl6c6dxj"; depends=[lattice MASS numDeriv]; };
+  bbmle = derive2 { name="bbmle"; version="1.0.19"; sha256="014h6mw16gv4acs2p78dy7lla7s428n633aybsb1mbi6250dg0p8"; depends=[lattice MASS numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
   bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; };
   bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-1"; sha256="0gikx66lwirvh037za1ipwvw6kj7n8r31zdsbsasrvksg4r3k58m"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
@@ -3742,6 +3839,7 @@ in with self; {
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive2 { name="bcrm"; version="0.4.6"; sha256="1nqa7kd83h8gh6bb5lbd17m1hgv8vjlbbq8w0i1fgmadz7y5rpji"; depends=[ggplot2 mvtnorm]; };
   bcrypt = derive2 { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; };
+  bcs = derive2 { name="bcs"; version="1.0.0"; sha256="0wv7kfcr6i36ik8v3prwp4mrwg1x6vf5nmybq9a57fz66pf1ff1x"; depends=[fda Rcpp RcppArmadillo wmtsa]; };
   bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
   bda = derive2 { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
@@ -3751,7 +3849,7 @@ in with self; {
   bdrift = derive2 { name="bdrift"; version="1.2.2"; sha256="03vwiyvxv174l0sy76gp2x8lwjf3s45zxzwrlbn97hg9c3j9adjm"; depends=[Quandl quantmod scales xts zoo]; };
   bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; };
   bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; };
-  bdvis = derive2 { name="bdvis"; version="0.2.9"; sha256="0qgxi9i2vblc219d0gn81mkqnpn9i6c84fczc5lrbcf9a2x0q88g"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; };
+  bdvis = derive2 { name="bdvis"; version="0.2.15"; sha256="0qmzy41bbv6vin0ah1skqb1sp5z66pgbi8h81cfmmffsypzwawx5"; 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.1"; sha256="15ihbw3chmwnlyh68dwdzzzbvzj909jz8d1m4gnmi71s4v5mc1v8"; 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]; };
@@ -3766,11 +3864,11 @@ in with self; {
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
   benchmarkme = derive2 { name="benchmarkme"; version="0.4.0"; sha256="1x17nhpxvz51mllml8mhn9lzx5in1mmfi1f6arqw2xhxd6rkbjdz"; depends=[benchmarkmeData httr Matrix]; };
   benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.4.0"; sha256="06nphyma03pmjynmck9mcnws6sjp32894wv8pvh9xa14ifxqf48f"; depends=[]; };
-  benchr = derive2 { name="benchr"; version="0.1.0"; sha256="1a47ambg70hl4jsr6v96z29rm3ipg1psqma792k5l2ws8422gxgw"; depends=[Rcpp]; };
-  benford_analysis = derive2 { name="benford.analysis"; version="0.1.4"; sha256="0kz55548f141ic4bvg6wbb0dqrkdnggpdsalf7pra7dj8x67wbhm"; depends=[data_table]; };
+  benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; };
+  benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; };
   bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
-  berryFunctions = derive2 { name="berryFunctions"; version="1.14.0"; sha256="16332811v3ivddklif5n3mwjp02c2hzysbj4vc6z6v6sxd1jvjq2"; depends=[abind]; };
+  berryFunctions = derive2 { name="berryFunctions"; version="1.15.0"; sha256="006q9p97mz7mc6z892680a49s2j4jcykjgkddgb69jpbj5shx1pg"; depends=[abind]; };
   bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
@@ -3781,13 +3879,12 @@ in with self; {
   betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
   betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; };
   bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
-  beyondWhittle = derive2 { name="beyondWhittle"; version="0.17"; sha256="1lmrsc85v3gjafk2pb013jr5v01jlf7y7csbzck48rmlgv6bqf89"; depends=[ltsa Rcpp]; };
+  beyondWhittle = derive2 { name="beyondWhittle"; version="0.18.1"; sha256="0aph1sshnxk7aajnm871zw9fadxbhv8l93kbydzh69b8kiz6wi6x"; depends=[ltsa Rcpp]; };
   bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
   bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
   bfork = derive2 { name="bfork"; version="0.1.2"; sha256="0gcmvxs57gkyvsx67dyg2jqs9wr3clndmmfqq5rvi5ys31g6krb8"; depends=[]; };
-  bfp = derive2 { name="bfp"; version="0.0-31"; sha256="01b6471a0vwfickj5sl4dak1y4bqysanmzlxs867j7dcsh6nqha7"; depends=[Rcpp]; };
-  bgeva = derive2 { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; };
+  bfp = derive2 { name="bfp"; version="0.0-35"; sha256="13jfbzijg087sva45bxzdnpz16l51mbszzh443nad23lym0w4bfg"; depends=[Rcpp]; };
   bglm = derive2 { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; };
   bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; };
   bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
@@ -3795,14 +3892,15 @@ in with self; {
   bhm = derive2 { name="bhm"; version="1.1"; sha256="00xnqppq95qvdbiklsz4af4f0f4p61b7c7v0l1k1isxqr3mgcgia"; depends=[coda survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
   bib2df = derive2 { name="bib2df"; version="0.1.1"; sha256="0jhl1cbd04dgr9y9qw3s1wa6cnzvgid3668kv0mmn721i30hk5q3"; depends=[dplyr plyr stringr]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="1.4"; sha256="14p5rss6maqy4d63w537lnslgdadvybg5vkscj38db16vqasvhcf"; depends=[dplyr factoextra FactoMineR ggplot2 igraph Matrix SnowballC stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="1.5"; sha256="08wn1wykxlry3y1wlhja75g6kva2gjrvslphilx6qabxq54bal0m"; depends=[dplyr factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringr]; };
   bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; };
   bibtex = derive2 { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; 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.2"; sha256="00hfnd916aya48dn9n27igljav5v9xmac3bj5mhv9vggyccrim48"; depends=[Formula Rcpp RcppArmadillo]; };
-  bigFastlm = derive2 { name="bigFastlm"; version="0.0.1"; sha256="00i5hq3i837hj5kszm9rqax86g273aklxwikrabzwnyai9ziz8qa"; depends=[BH bigmemory Rcpp RcppEigen]; };
+  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="1.5.2"; sha256="1hv8gxxdck2vnn292gq1dmhnn8q570jjx50z8bl5xyjqddk64rp0"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.2.0"; sha256="1z9a725jd9nparid0df7fyvsa5mvz92krj0q7mq75x6cprr44f29"; depends=[googleAuthR googleCloudStorageR]; };
   bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
@@ -3810,7 +3908,7 @@ in with self; {
   biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; };
   bigdata = derive2 { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet lattice Matrix]; };
   biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
-  biglasso = derive2 { name="biglasso"; version="1.3-3"; sha256="1mv9zildvkq8a5rvhr8hr1d7v3zn58j5bjc17wz75mqk0dsfwdjs"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
+  biglasso = derive2 { name="biglasso"; version="1.3-5"; sha256="09ckg2cdq0cg78ji08mg831shy8q5d949b2bi2zw7x05glx7b0mg"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
   bigmemory = derive2 { name="bigmemory"; version="4.5.19"; sha256="191gbzca557kpk7mdsg716vfyqpr7j5din6qb8hin4g1nkzzwmg6"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
@@ -3818,7 +3916,7 @@ in with self; {
   bigpca = derive2 { name="bigpca"; version="1.0.3"; sha256="0hqkaamj5fyp2jw5727pkvmnqr194ngh4hlja14qmj81nr26a88p"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; };
   bigrquery = derive2 { name="bigrquery"; version="0.3.0"; sha256="0g13fqs0x5v7nzqd0iyajw4dw9arykm3zn0wvnk0lb7c9izkk9lr"; depends=[assertthat DBI dplyr httr jsonlite R6]; };
   bigsplines = derive2 { name="bigsplines"; version="1.1-0"; sha256="0jjlv9qidn8xrz630wbyq7kz7vlxgaphv2y2siv90j01j5nj4s89"; depends=[quadprog]; };
-  bigstep = derive2 { name="bigstep"; version="0.7.1"; sha256="1x8bx0n9nplb6h54nf1s18qv2zgy79ykass08qin6l1d65qvpfwc"; depends=[bigmemory R_utils RcppEigen speedglm]; };
+  bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; };
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.0"; sha256="1wh85r6f4jd8xzinczr5g1p1acbcyn4am3v1n4blfbn447l9nx4z"; depends=[]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; };
@@ -3838,7 +3936,7 @@ in with self; {
   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]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
-  binomSamSize = derive2 { name="binomSamSize"; version="0.1-4"; sha256="0m7g4fagw44l23ancisnp41928pwkr0cwyi1015nbccqbgrw2g3n"; depends=[binom]; };
+  binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; };
   binomTools = derive2 { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; };
   binomen = derive2 { name="binomen"; version="0.1.0"; sha256="0r89xcbp0jjirr36j3i4xmdjn2wh142c0jv1whzpzjdmcsh806g6"; depends=[dplyr jsonlite lazyeval]; };
   binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
@@ -3849,22 +3947,24 @@ in with self; {
   binst = derive2 { name="binst"; version="0.2.0"; sha256="13hg9kmxlaczbkbimlqphpimzx67kncc6qvnlk9cxqyvfkb0ph47"; depends=[]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
   bio3d = derive2 { name="bio3d"; version="2.3-1"; sha256="0dm582jam4ll5q82vfxf1gjrmv1qzl60kws6vmxjx91d5jwf1fqy"; depends=[Rcpp]; };
+  bioOED = derive2 { name="bioOED"; version="0.1.1"; sha256="18b66s5dn8a67iwb0g1bmbi856ip81yfa57m40kf7phsga52ncg1"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   biogas = derive2 { name="biogas"; version="1.7.0"; sha256="1c0w78x2jjgsxffcz61lfs5m72kkds55c73z970nbxvhqk8n15j6"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
   bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; };
   bioinactivation = derive2 { name="bioinactivation"; version="1.1.5"; sha256="0m20947n2kzrfy8a592k1d9fg1xlv83vjf11pp4h5hhxd8fbm0w5"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS]; };
-  biomartr = derive2 { name="biomartr"; version="0.3.0"; sha256="15r0dx0pbb2fxgc1ai2f9rg4dd3vly1yxkh4vv698gkf1z0r6cxx"; depends=[biomaRt Biostrings data_table downloader dplyr httr jsonlite RCurl readr stringi stringr tibble XML]; };
+  biolink = derive2 { name="biolink"; version="0.1.2"; sha256="12hpd50swnij9jzc8m6bz7iwmndgwmlyj7vnd8hvnz1gc68bjs2p"; depends=[memoise rentrez xml2]; };
+  biomartr = derive2 { name="biomartr"; version="0.4.0"; sha256="0smjddxp99w79m26ywbd3ph0822v1cakvqsfgxdy1p7ak164jp21"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringi stringr tibble XML]; };
   biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; };
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; };
   biorxivr = derive2 { name="biorxivr"; version="0.1.3"; sha256="1vi035c4jld5i52xnp79dn5642308cv11vfrw0n62wlsbjfbdma4"; depends=[XML]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-  biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.0"; sha256="0avn35r567crp3z4i1fvlfirvc085cf3g6znc6wgnm7mhxp3l1ss"; depends=[signal]; };
+  biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.1"; sha256="1prdr0pa1vd190pqxr7y87sjy10icfj9wb7jc3r5q8qmk5lpnyq5"; depends=[signal]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
   biotools = derive2 { name="biotools"; version="3.0"; sha256="0k5dgaw2ris9vp370d8qhpnvnd0hllac8cv5sp52vgqskwygg7fx"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
-  bipartite = derive2 { name="bipartite"; version="2.07"; sha256="10gpmcnlnhv55ffff23xsmwbq58r2wvg54wyv1isa0jp4vh0b67x"; depends=[fields igraph MASS permute sna vegan]; };
+  bipartite = derive2 { name="bipartite"; version="2.08"; sha256="16j70ikzprjsm81w9bqbp26xxf14ckw654dy7c5hkz24x62qsx2i"; depends=[fields igraph MASS permute sna vegan]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
   birdnik = derive2 { name="birdnik"; version="0.1.0"; sha256="1ql29qbv7jw6cngd36qcgljx0zvvzp2v5rjd44v0j04gww1kb2bc"; depends=[httr]; };
   birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
@@ -3879,8 +3979,8 @@ in with self; {
   bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; };
   biwavelet = derive2 { name="biwavelet"; version="0.20.11"; sha256="0fmk4b8gzbq0l4n08zq4pl1csaxxxi3hpqd886ccbhmg6zn8dz01"; depends=[fields foreach Rcpp]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
-  bizdays = derive2 { name="bizdays"; version="1.0.1"; sha256="1nig6nfxw7vrvq20p49l2b5z8cnjihljivir3lgj99djb5w8i6lk"; depends=[]; };
-  bkmr = derive2 { name="bkmr"; version="0.1.0"; sha256="0pw82sd8x82nk5c5c6lr7yqr767nrkgk1rvbpwy5vwdpvwwj5ibl"; depends=[dplyr fields magrittr MASS nlme tidyr truncnorm]; };
+  bizdays = derive2 { name="bizdays"; version="1.0.2"; sha256="1p2jlpjfwhpqmb9ahz0dp0iwywsg62x8f5sq6aws267v6jdhnqwd"; depends=[]; };
+  bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
   blackbox = derive2 { name="blackbox"; version="1.0.18"; sha256="1sgq6i8p066li9lr3241zplygv7yc7mp7k13c6nih0289v3l7jg7"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
   blavaan = derive2 { name="blavaan"; version="0.2-3"; sha256="1hbcvjgkf0hcajg12dmf0zpyf4nhp938gbqk511vz1033iaamha2"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
@@ -3911,7 +4011,7 @@ in with self; {
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
   bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; };
-  bnlearn = derive2 { name="bnlearn"; version="4.1"; sha256="0ywj94m9jvwci3q1abld2yfpz0h48x4lbfqyqyg43pbzs3p7p6r0"; depends=[]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.1.1"; sha256="16jqkysz9s1a9hd7wki9l4ifzj88176c5p5fsa1ww2zadsa9njbd"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.4"; sha256="0rbv8vq7wlzc1mmjqaw9yxjfdgb0cwiwvhwlay24njq16fhidk9w"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
@@ -3932,14 +4032,13 @@ in with self; {
   bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
   bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
-  bootTimeInference = derive2 { name="bootTimeInference"; version="0.1.0"; sha256="0kpb0xnvyjf3z2zy1970zzmiiln232m8xykz9qylpmln91z6xnjm"; depends=[Rcpp RcppArmadillo]; };
   bootnet = derive2 { name="bootnet"; version="0.4"; sha256="1xc7ajvbsic4c881pn4k9xrbvijpjig9x8ij284ljvfbwd6ymgfd"; depends=[abind corpcor dplyr ggplot2 gtools huge IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph]; };
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
   bootsPLS = derive2 { name="bootsPLS"; version="1.0.3"; sha256="0jkpci97chbvlfkcbbj3gm2dnj5aiwfrh739kd4fa0zra4ac1adh"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
   bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-  boral = derive2 { name="boral"; version="1.2"; sha256="1xd9g3ll6ax363ip0wh5zpk8yw23pcv4wxlm2xxshmxyx0k9gqfk"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
+  boral = derive2 { name="boral"; version="1.3.1"; sha256="0kwgjfp4r8a2mph83n3ljlqr7077i4f8dvbk2kz80n5jq48v84j0"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
   boxoffice = derive2 { name="boxoffice"; version="0.1.1"; sha256="19l65nxrj0q7vr5ds6cwf7ynaqzd3ivzx673svvl6wmxlgn67cfi"; depends=[foreach lubridate rvest xml2]; };
@@ -3954,9 +4053,10 @@ in with self; {
   braQCA = derive2 { name="braQCA"; version="0.9.9.6"; sha256="1xqy0vykxdp0kr87w1sq8yjqrj0y8xh64fr2y8l79763xkyxpn0y"; depends=[bootstrap dplyr QCA QCAGUI]; };
   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="0.72.0"; sha256="1r52zyvyxd7qj46ffpvv5vjjmkk8zanvq3w1mdww1fsim94i1507"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti permute plyr RcppEigen RGtk2 scales]; };
+  brainGraph = derive2 { name="brainGraph"; version="1.0.0"; sha256="0vphir0jyf21yyrsbfdjciyi9nb1ijkrkzdgqfnv1jxpvzk4g5zn"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti permute plyr RcppEigen RGtk2 scales]; };
   brainR = derive2 { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; };
   brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
+  brant = derive2 { name="brant"; version="0.1-1"; sha256="143nlap5dl5rymlzhaqq8n2vw6y9mxmps5pm6hlrnmcbkb2mk36v"; depends=[MASS]; };
   brea = derive2 { name="brea"; version="0.1.0"; sha256="0jawpl4d7himydb9z4kqpa7s6b7ghw9yp5j6xvzilbka0agpazck"; depends=[]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
   breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
@@ -3964,18 +4064,21 @@ in with self; {
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brewdata = derive2 { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
   brglm = derive2 { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
+  brglm2 = derive2 { name="brglm2"; version="0.1.3"; sha256="073i573rsnfzdqji027l7i5icpk60x4iw8hda1d982lwdchrdg0l"; depends=[enrichwith 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]; };
+  bridgesampling = derive2 { name="bridgesampling"; version="0.1-1"; sha256="0bzni5hjclavkg7k7z65d95zjsxkvy8h4qv499h6ai091mk2ggs0"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
   briskaR = derive2 { name="briskaR"; version="0.1.0"; sha256="0fx254pc250jv53kmd6miw8blcp43c72myah9g5ns2s84pcdmx6h"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="1.5.1"; sha256="1qh72qfkpg2226ckjraca9lc5waaajnmv729w52c04b2vmxzsr0x"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; };
+  brms = derive2 { name="brms"; version="1.6.1"; sha256="1r7zpfw1r3rdf56piqdb7242lywal18xi9dhzglbindrnkrhcnpa"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.65-1"; sha256="1zfcrkky4a71zq4mgnc0xcy0m8c9srwq850s97qry9a69f6j5c42"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
   broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
-  brotli = derive2 { name="brotli"; version="0.8"; sha256="1cdc1ghvwdr64spns7x96gml9vqjd33xhk76w04nk0ldb3in4jfp"; depends=[]; };
+  brotli = derive2 { name="brotli"; version="1.0"; sha256="0sicqwri8rxqxwhj4z8ckfls2yz09jwb9c5pjk5dhxrsyh85k80m"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; };
+  brt = derive2 { name="brt"; version="1.1.0"; sha256="11a6zpdml5vz3kcdcajw5zcck1zbp4kfdkqm3y6q7qj8ym2f12q5"; depends=[ggplot2]; };
   bsam = derive2 { name="bsam"; version="1.1.1"; sha256="00ckj2pmyh7pqmbvwlgvgc3m53c807mri46jc0ivfwgf0kc8q0s0"; depends=[coda dplyr ggplot2 gridExtra msm mvtnorm rjags rworldxtra sp tibble]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
@@ -3984,13 +4087,14 @@ in with self; {
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
   bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; };
-  bsts = derive2 { name="bsts"; version="0.6.5"; sha256="1ywk73f5dnlpwz1hl1rpaxnvg9zag70fs237gw3gc8gsdydc7dlk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
-  btb = derive2 { name="btb"; version="0.1.3"; sha256="0ac6jfk66ij4av5i63gm69ry7vfp08ka6l6l3y28ycf10fzp84k8"; depends=[Rcpp sp]; };
-  btergm = derive2 { name="btergm"; version="1.8.2"; sha256="16vyxyg3nc7p65nrg46f5mh1py3i6vxk34m9645376s80gxkspcn"; depends=[boot coda ergm igraph Matrix network ROCR RSiena sna speedglm statnet statnet_common texreg xergm_common]; };
+  bsts = derive2 { name="bsts"; version="0.7.0"; sha256="1v3a8vv9mj7y74jxl6vvhi6znkz0kagc1x4r8f7c6270z37v1sbk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+  btb = derive2 { name="btb"; version="0.1.14"; sha256="0nk76ddsg8pjd35y2yqw27iammk948i29xmr0ha9l8b867693m44"; depends=[Rcpp sp]; };
+  btergm = derive2 { name="btergm"; version="1.9.0"; sha256="03xqzavq3n1zcsfagkprn30i4k11cv1145ni0i8x0jij5dwn7av9"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet statnet_common texreg xergm_common]; };
   btf = derive2 { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
   bujar = derive2 { name="bujar"; version="0.2-1"; sha256="0g6mj1x9zbxkn3kxwbs2ncjfsicicvyr92krz8yqrms042gbk9ji"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; };
   bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; };
   bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; };
+  bupaR = derive2 { name="bupaR"; version="0.1.1"; sha256="1fir2q3y8rzcx61x0gd8zqwb5japajpmhax13jlnmjkydml6npqv"; depends=[data_table dplyr magrittr]; };
   burnr = derive2 { name="burnr"; version="0.1.2"; sha256="1cmf820148wmm9m8f41r81kckhn2iv3cw6k9qdybcxy1j1m520jp"; depends=[ggplot2 plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
@@ -3999,7 +4103,7 @@ in with self; {
   bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; };
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
-  c212 = derive2 { name="c212"; version="0.90"; sha256="15s0482kl7zd2kzxcyzd7gdclv1z8yn4x70cgsdlbmd5047pcn9k"; depends=[coda]; };
+  c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
   cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.0"; sha256="1qgcga9rk4xqz1i2rzwwf11sip3s3gni44czg9d8sjd725hx1pmz"; depends=[Rcpp RcppArmadillo]; };
@@ -4021,29 +4125,30 @@ in with self; {
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
-  camtrapR = derive2 { name="camtrapR"; version="0.99.7"; sha256="0yhpxx7p02j10b2ascdf0mqhlv8gssi6v9g4pc0s4p6bi2zhs7m6"; depends=[overlap rgdal ritis secr sp taxize]; };
+  camtrapR = derive2 { name="camtrapR"; version="0.99.8"; sha256="06sl3rlzgjf3yq9y0sg664xc0xfxwlvvd5w4wr5946h6kwvnhih4"; depends=[overlap rgdal ritis secr sp taxize]; };
   cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; };
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.7-2"; sha256="0sbvngpyni4pagqb5xqjnk5yjd391rdjqq7aypnm2wd3i1am90hm"; depends=[car heplots]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="0.15.2"; sha256="0kymbm8qy132ac7jj27p2ad0vxvwydrgm56ghvrqqywnfqkhygxr"; depends=[htmlwidgets]; };
   cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
   caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
   capm = derive2 { name="capm"; version="0.9.1"; sha256="1njfw4pl6hmapdspvwabn7db2c4nqf3ja4rlv1lmpaakinzhivj2"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
   captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
-  captr = derive2 { name="captr"; version="0.2.0"; sha256="04bg1d22n2h24w4j46fg30p1n85qvy5868sllrcwybrv4j15xh1f"; depends=[curl jsonlite]; };
+  captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; };
   capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
   car = derive2 { name="car"; version="2.1-4"; sha256="0a6v7rsd1xsdyapnfqy37m7c4kx9wslkzsizc9k0lmnba0bwyfgx"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
   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]; };
-  care = derive2 { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; };
-  caret = derive2 { name="caret"; version="6.0-73"; sha256="1jzaqwv4glyqqnfbpalgajd0ag866247vvdh5i83ffqs1yhs984h"; depends=[car foreach ggplot2 lattice ModelMetrics nlme plyr reshape2]; };
+  care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
+  caret = derive2 { name="caret"; version="6.0-76"; sha256="1w31xzpmj8p6r6s7s1vwnjxainq54bbh4cqm177ba0myv69hh8cc"; depends=[car foreach ggplot2 lattice ModelMetrics nlme plyr reshape2]; };
   caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
   caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
   caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
   carpenter = derive2 { name="carpenter"; version="0.2.0"; sha256="0n2w8l9gch0zvq3k0bsqqq28vf6s0czn3ybm0sy2i1bkq85zfm82"; depends=[dplyr lazyeval magrittr pander tidyr]; };
   cartogram = derive2 { name="cartogram"; version="0.0.2"; sha256="055aq2fmbx6ypyqsj427l37px8fld4b9bmc2kcmsi6fmnncb5pxa"; depends=[rgeos sp]; };
-  cartography = derive2 { name="cartography"; version="1.4.1"; sha256="0bblhnz94rhjrrm0v9mvlvqrcqfxq4762crijk34xf9cxcpmhjx4"; depends=[classInt raster rgeos rosm sp]; };
+  cartography = derive2 { name="cartography"; version="1.4.2"; sha256="1bqadjn1h9xlmswjsylipgni2f78lld4v0y0vybi0cd68m22wxp2"; depends=[classInt raster rgeos rosm sp]; };
   carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
   caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; };
   caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
@@ -4062,6 +4167,7 @@ in with self; {
   causaleffect = derive2 { name="causaleffect"; version="1.3.3"; sha256="1nglsdnd0zb0qzyyw22fnlqzc8ds9mqdnc9anl9g3pdn9lz2wkqc"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
   cba = derive2 { name="cba"; version="0.2-18"; sha256="15fjnc9mg30fhm9rfsgz7d24hx83ra8bgyc2s1sz5gda4ppq53pr"; depends=[proxy]; };
+  cbanalysis = derive2 { name="cbanalysis"; version="0.1.0"; sha256="170rhycd78k8ivibvaa7r5hx64wpqwb067s182iwx51fb2yf01a7"; depends=[]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
@@ -4071,11 +4177,12 @@ in with self; {
   cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
   cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
   ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
-  ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.2"; sha256="1q6fcmd2byjpwsqa9a9m9w8dm9gy76g9477p9jb8q92kiv2rs6bq"; depends=[Rcpp sparsebnUtils]; };
+  ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.3"; sha256="0b5rm17zqf4w22vfjhp13wjqrds7f6mbvmd0kazxrnrnb10799a3"; depends=[Rcpp sparsebnUtils]; };
   ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
   cchs = derive2 { name="cchs"; version="0.3.0"; sha256="0163qvy1k39bwbbidr7wj6cs0nv8m8nh0as9532j8mshq14d0i8c"; depends=[survival]; };
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   cda = derive2 { name="cda"; version="2.0.0"; sha256="1vq90z6kafiz5b884hxsz3lg8a0zis1n475lmvwlymcam5rpgjrc"; depends=[randtoolbox Rcpp RcppArmadillo reshape2 statmod]; };
+  cdata = derive2 { name="cdata"; version="0.1.0"; sha256="0f27ib3klwapzk9mn757pc9a2zjh8j7k14ndq127hgv1zz7rmkgx"; depends=[dplyr replyr tibble tidyr wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.5.1"; sha256="0k63hrx3cc04xpi2sxl5g8mn7lc7rh4q33mj3filyiyppj16jixf"; depends=[dplyr httr jsonlite purrr readr V8 xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
@@ -4092,7 +4199,7 @@ in with self; {
   cem = derive2 { name="cem"; version="1.1.17"; sha256="1jnhsrc1jhax3zlw9ynla7g9z5i4w01iar7f7hmv92kp1cwh8rbd"; depends=[combinat lattice MatchIt nlme randomForest]; };
   cems = derive2 { name="cems"; version="0.4"; sha256="0mk02m702xfr1gh0l3973z1hdpncgjl2vfd1k1iss5s64k56gs4q"; depends=[plotrix rgl vegan]; };
   censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
-  censReg = derive2 { name="censReg"; version="0.5-22"; sha256="0s955gzd40nwl2qq20ss1yqjfpdrhv6bwbiksvd1smg4ip038w5q"; depends=[glmmML maxLik miscTools plm sandwich]; };
+  censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; };
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
   censusr = derive2 { name="censusr"; version="0.0.2"; sha256="1x2s0q0d30hsb5sqdgvlz8anv5vcsm0ld9p96jzsin6lfsgbb1dm"; depends=[dplyr httr]; };
@@ -4100,14 +4207,15 @@ in with self; {
   cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
-  cffdrs = derive2 { name="cffdrs"; version="1.7.5"; sha256="1v5acbp8469b2mbv3x6986f8rw6hh34jqkwdm6fp50dx1r8x9p1x"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
+  cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
   cgam = derive2 { name="cgam"; version="1.6"; sha256="04mwkij3fyamm8i1wnd87vihcg7c45872n10q9ax5f2nby95ddrc"; depends=[coneproj svDialogs]; };
-  cgdsr = derive2 { name="cgdsr"; version="1.2.5"; sha256="1w5nd4hirlw8s9a8ysr6102pq9sbz4820qni06g98ykyg7yb32hx"; depends=[R_methodsS3 R_oo]; };
+  cgdsr = derive2 { name="cgdsr"; version="1.2.6"; sha256="05q26g7gflq4hsd3xa5xkjc3mhvml7i6dzamfwm0i14kxigghqp8"; depends=[R_methodsS3 R_oo]; };
   cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
   cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
+  cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cghseg = derive2 { name="cghseg"; version="1.0.2-1"; sha256="0q9ks19r21b6p0gfd7mnsgp7pbihz3yzmbzijlrx178f1z9yjx5q"; depends=[]; };
   cgwtools = derive2 { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
@@ -4115,23 +4223,23 @@ in with self; {
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
   chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.8.2"; sha256="1zqcggl9m7slvc0q6zyhssdypb7jzf3l9byl5vxh1qdwjiw2y64g"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.3.18"; sha256="17r3hamj66hx1w050yim21b8kp1mbfkjh6rsdmd0z3s04wash7bi"; depends=[]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.0"; sha256="0ffyb681025yw7ghwbvszispm0dklxkspdafbbwk9df33mx0464k"; depends=[]; };
   cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; };
-  chemometrics = derive2 { name="chemometrics"; version="1.4.1"; sha256="019r0n4s6lzzjyp94zv12gn113p69c4s4ji0aqinfzb5fw0dlikn"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
+  chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
   cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; };
   chi = derive2 { name="chi"; version="0.0"; sha256="0mn402vwiwcjdbchk1d3pdq4ir992aa0h3xf1m7y9mfkqyzkdqpj"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
-  childsds = derive2 { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; };
-  chillR = derive2 { name="chillR"; version="0.65"; sha256="0r584h2y2w7hcrdxvf7xlw4ivbyid293li0scxwvkd4v8s78kmcm"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; };
-  chinese_misc = derive2 { name="chinese.misc"; version="0.1.1"; sha256="0gcr0lw3ns3wbjchhzb0alabs4d8fmq8gvf4ggph3m8fcyfch0cc"; depends=[jiebaR NLP Ruchardet stringi tm]; };
+  childsds = derive2 { name="childsds"; version="0.6"; sha256="1zi6gchyd087c1gx3359gpsfsciry66dxj921q6zxdzn5sg09bfn"; depends=[dplyr gamlss magrittr tidyr]; };
+  chillR = derive2 { name="chillR"; version="0.66"; sha256="1qw9l3drw3r4an1jy2bckaslwla3s5fvpqr7ahvd2m6alx05b0k6"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; };
+  chinese_misc = derive2 { name="chinese.misc"; version="0.1.5"; sha256="1grp7kyvn9wppsikyvcr5sh1wfm9w1lcffraggmlr3014kl6siaq"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
   chngpt = derive2 { name="chngpt"; version="2016.7-31"; sha256="1hjqdkqai6aij3giarbxasijipb376qm081ri9w6snd5gy6izzsi"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.1"; sha256="0sib3ic79hff5w2xmmw4z9c6bax33jczrcijs7ywdb8y3viwy5av"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
-  choroplethr = derive2 { name="choroplethr"; version="3.5.3"; sha256="1iagrm8ybr7whn77i96cnyl2kil96lb9zznlbc93kcy17jbf4yns"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; };
+  choroplethr = derive2 { name="choroplethr"; version="3.6.1"; sha256="11f529zcflbqbchnp3v5yw2vwrlhyfib5pn2j6l60x0gdfxp07bb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; };
   choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; };
   choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
@@ -4139,7 +4247,8 @@ in with self; {
   chron = derive2 { name="chron"; version="2.3-50"; sha256="1w3sl60gsirniqslb3pa75caiqbzbvc44phpd4czvwkb62xx1vx9"; depends=[]; };
   chunked = derive2 { name="chunked"; version="0.3"; sha256="1qhrq957w8nyxndvrnf3xh1p1g7f9qjyr12ybcysgrz4lk0q8xcs"; depends=[DBI dplyr LaF lazyeval]; };
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-  circlize = derive2 { name="circlize"; version="0.3.9"; sha256="0zaqisklz28y262lwh11m4fi5x6rr6hzw4fzibgsx4x34nxxavlb"; depends=[colorspace GlobalOptions shape]; };
+  cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
+  circlize = derive2 { name="circlize"; version="0.3.10"; sha256="19zkklqyyqq88njcybbafi6vbz87sivsfhg7kk9kywdijl799mxw"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
   cit = derive2 { name="cit"; version="2.1"; sha256="1kiph7znr9fiq704wfbms6hsl4shxfqijrlh4dhmik9x9m8sj538"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
@@ -4149,23 +4258,23 @@ in with self; {
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
-  clarifai = derive2 { name="clarifai"; version="0.4.0"; sha256="0qlv4aj5vlrrc0h6gyryly33rfz5jz7cahw5l6qdbba4dibrkajm"; depends=[curl jsonlite]; };
+  clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
   class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
-  classInt = derive2 { name="classInt"; version="0.1-23"; sha256="07anmwmchri4ppl01y041zh3xdqsdwzv4n5jpr3crmpk39qwwhzq"; depends=[class e1071]; };
-  classifierplots = derive2 { name="classifierplots"; version="1.3.2"; sha256="18xsjsfsr4dz791b0ap8lcbk7mnr3i0pspbal6n5ah864ngqvbvn"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
+  classInt = derive2 { name="classInt"; version="0.1-24"; sha256="18ng9y647jwb855pkmz555zdrznjgw4ynppaw43xm8qf8n291p7k"; depends=[class e1071]; };
+  classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; };
   classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
   cleanEHR = derive2 { name="cleanEHR"; version="0.1"; sha256="1ppjg72cfh9kdwl8kk7zxyr529xqcwpfcl5lisy7hgpqirma52qn"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
-  cleanNLP = derive2 { name="cleanNLP"; version="0.24"; sha256="0j4im6518sqdyfwbfabc1q3g01nqfpshznq033193g9b519792z3"; depends=[dplyr magrittr RCurl readr rJava]; };
+  cleanNLP = derive2 { name="cleanNLP"; version="1.5.2"; sha256="09zhhv1pkd28l275g6g38b5l7bpgrcj0ks66d8vhqmpqq2038q7c"; depends=[dplyr Matrix readr]; };
   cleangeo = derive2 { name="cleangeo"; version="0.2-1"; sha256="05zzp0dbkpljc9jcx05pdlkdwfbrh6h0l2zksq3cpaw5bvz5g1pl"; 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]; };
   clhs = derive2 { name="clhs"; version="0.5-6"; sha256="0m7pw655d6jidrppk1z84z35n93k1alwq43jh28lf81ydw8finma"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
   clickR = derive2 { name="clickR"; version="0.2.0"; sha256="01fsaqgc4fxf0p9ww6z3g84ybn5kgj7qyk781flhg7r4s51qmcwv"; depends=[beeswarm ClustOfVar lme4 lmerTest lqmm ordinal ReporteRs survival xtable]; };
-  clickstream = derive2 { name="clickstream"; version="1.1.9"; sha256="0hg8ywnm82r5787qal19rcg7q0jvvrw6ifaya84p6sazwqwy8m4g"; depends=[arules data_table igraph linprog plyr Rsolnp]; };
-  clifro = derive2 { name="clifro"; version="3.1-2"; sha256="0fa1r4rsl3cq8dmy0jxalga9qzhiwpdhkzmjgx2hfbkgklfdnr40"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
+  clickstream = derive2 { name="clickstream"; version="1.2.0"; sha256="0syjb7wcyf15iw6r2vg3k3nbs9rsvgvyxg61hzdavas0f2pjsyyx"; depends=[arules data_table ggplot2 igraph linprog plyr reshape2 Rsolnp]; };
+  clifro = derive2 { name="clifro"; version="3.1-3"; sha256="1y03x1d49h482nc4r4w6h3vycf16k4jzqpxhbygy8igq1lpphvn1"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
   climatol = derive2 { name="climatol"; version="3.0"; sha256="0wfqs8yk3m6wpm86yfhsg100d4x67bzz1871mxrs69r6ybrh30qx"; depends=[]; };
   climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; };
@@ -4190,22 +4299,22 @@ in with self; {
   clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; };
   clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; };
   clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.0.6"; sha256="0hmj85byw1j1b1crb7nj12wz0rddp5cg21jg1dwg7b0mn5xvy981"; depends=[]; };
-  clustMD = derive2 { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
+  clustMD = derive2 { name="clustMD"; version="1.2"; sha256="0xz4347v4z95ir9mw6hw94p0j5a3ff96dyzjs5wfnynpbc025zmh"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
   clustMixType = derive2 { name="clustMixType"; version="0.1-17"; sha256="08drby5ifv8wcww4ns2cma2gyhzwj3x6klvh7fs03wrzn6w78hr0"; depends=[]; };
   clustRcompaR = derive2 { name="clustRcompaR"; version="0.1.0"; sha256="1md1ra18q1iga01q12jyy9va4qyvzlybvbdrdfy2kxhh82w057ww"; depends=[dplyr ggplot2 ppls quanteda tidyr]; };
-  cluster = derive2 { name="cluster"; version="2.0.5"; sha256="1bkvqmv8h2c423q9ag2afb6s9j2vcdlxsf559zzbimraphrr2c2b"; depends=[]; };
+  cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
   clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; };
   clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
   clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive2 { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-  clusterSEs = derive2 { name="clusterSEs"; version="2.3.2"; sha256="1pxfvmkgx45xp7q2fdd34zd2f0snyq6mazqsd1nqrda7791a494f"; depends=[AER Formula lmtest mlogit plm sandwich]; };
-  clusterSim = derive2 { name="clusterSim"; version="0.45-1"; sha256="0wmhsz71rspg98smdp08q3jgdkldqn2l3szwdl70lz93kyls3ivv"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
+  clusterSEs = derive2 { name="clusterSEs"; version="2.3.3"; sha256="1c68zz6l4dyj77a2sfg8fj5yjn3jlpyj8pbjqjh68wlbpdm4ckvc"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+  clusterSim = derive2 { name="clusterSim"; version="0.45-2"; sha256="0mf0qy902v4aqszcapk3c0j2b6kj66krxz7s6adpqzwhwx975zfi"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
   clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
   clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; };
   clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
-  clusternomics = derive2 { name="clusternomics"; version="0.1.0"; sha256="054jbzgz53b1vbv5492zrhywjly8pwiiy4j11qsb20sfz4j951h6"; depends=[magrittr MASS plyr]; };
+  clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
   clustrd = derive2 { name="clustrd"; version="1.1.0"; sha256="0l1mllgqqlkywhhp1a24hlvsiwkk26k58c9rg9m5pagb623w73p4"; depends=[cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
@@ -4215,13 +4324,14 @@ in with self; {
   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=[]; };
-  cmna = derive2 { name="cmna"; version="0.3.0"; sha256="0ax27y1h0pz8i5ckjcrbgpav6m1srym6av94bvy02mv26ida0l8c"; depends=[]; };
+  cmna = derive2 { name="cmna"; version="0.3.1"; sha256="0aayvvzpj5cvhhzpnqdlszmf0s07ivxzl9lw3lqgipk1739wxz5n"; 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]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="1.7.1"; sha256="0q954akb9myb64p7x2zplfljkzqnakx74w93h1n2kfzx7bbh482h"; depends=[fields ncdf4 raster sp]; };
+  cmsaf = derive2 { name="cmsaf"; version="1.7.2"; sha256="12kim4nfzar7g6fv2mjqaiy6ks82pp20v4mwnk6b0hilmpvlnhsh"; depends=[fields ncdf4 raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
-  cna = derive2 { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
+  cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.0-0"; sha256="0kbq01qrmpn133v18rjphhznpnj8g6dcn1lrbsjykhxkqz086s36"; depends=[lsei]; };
   coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; };
@@ -4229,7 +4339,7 @@ in with self; {
   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="1.3.1"; sha256="00zgq2c3vkrx4q8wp43giwid4778j9wxcjfn3nkbwlgrsswm0adb"; depends=[ggplot2]; };
-  cobs = derive2 { name="cobs"; version="1.3-2"; sha256="1kqyh2c0jlb6gbpgwdk0dh5sh6ziw9wyxvxgdk4n4j8d0klb9kx1"; depends=[quantreg SparseM]; };
+  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.0"; sha256="1x6ffwh8z6nj867wxnvq8qjq7rx0j3swdnb12zv917s0y54dwncx"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
   cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; };
@@ -4238,7 +4348,7 @@ in with self; {
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
   codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
-  codingMatrices = derive2 { name="codingMatrices"; version="0.2.2"; sha256="1x1h5jdnfx6l8ry7nmn3f1qyzv96vf8axzjxcxqrlylh6z1zc068"; depends=[fractional Matrix]; };
+  codingMatrices = derive2 { name="codingMatrices"; version="0.3.0"; sha256="0xbqmcb6yzqdwhq4pcpdsjfix3vy410vd3lbsablna1hgfbbj4p7"; depends=[fractional Matrix]; };
   codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
   coefplot = derive2 { name="coefplot"; version="1.2.4"; sha256="0phpz4fvvxvpaybp4q1s69qxcpdzj8qxambivncps101mz7jj3sq"; depends=[ggplot2 plyr reshape2 useful]; };
@@ -4252,6 +4362,8 @@ in with self; {
   cold = derive2 { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; };
   colf = derive2 { name="colf"; version="0.1.2"; sha256="1xbmc32rp0xlj73krwhqn2ji5xa9kd2anaw88mvi5psdi3d2y1np"; depends=[nlmrt]; };
   collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; };
+  collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.4"; sha256="14zg5cm6qf2106jw5wsmmlkldd71wg0576raqvzzhwbsfkapsb1r"; depends=[data_tree htmlwidgets]; };
+  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]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
   colorSpec = derive2 { name="colorSpec"; version="0.5-3"; sha256="0ffn1x9763xzhfsm5vgkvgpm2a792bqx54ra2x4vda7m78lb6nqr"; depends=[MASS]; };
@@ -4266,7 +4378,7 @@ in with self; {
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
   colourlovers = derive2 { name="colourlovers"; version="0.2.2"; sha256="0fgxs73l4g1lnmc2q613ykxxrbmvq6w66zpidccqg64wa9cy5yhm"; depends=[jsonlite png XML]; };
   colourpicker = derive2 { name="colourpicker"; version="0.3"; sha256="0sxxllfwdbdc283nk9b82xrvb6xali14c6qfywm2qck0k8jh7ppy"; depends=[ggplot2 htmltools htmlwidgets miniUI shiny shinyjs]; };
-  colourvision = derive2 { name="colourvision"; version="0.1"; sha256="1v9qipx1rglga0mdw97xbdbq1mgx7avif7a6gi1xh9gvw408x25c"; depends=[rgl]; };
+  colourvision = derive2 { name="colourvision"; version="1.1"; sha256="1lygk7ak8hdpscdh80bf3p3z58a37nlrmx02wqfnyd0v6qns8azv"; depends=[rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   comato = derive2 { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
@@ -4282,19 +4394,20 @@ in with self; {
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
   compareDF = derive2 { name="compareDF"; version="1.1.0"; sha256="1597xmq857jf4b67k7y869gbflad89rxfvrq8m0gp1wd21wv8z1h"; depends=[dplyr htmlTable tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="3.2.3"; sha256="0sliphw8yxx93qaf6pk405rqbfnpixjx8yazzjqiird6bm746i9n"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
+  compareGroups = derive2 { name="compareGroups"; version="3.2.4"; sha256="0lg54vyg8jpf98bwqxzbnfiykx2l5dccdw1m48dbkncgkhm388lk"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
   compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
   compete = derive2 { name="compete"; version="0.1"; sha256="1b1320jw8pcnjkzb0lr8j6d3z7yhlq31gszd79wdcmwnpzap9k0z"; depends=[igraph sna]; };
-  complexity = derive2 { name="complexity"; version="1.0.0"; sha256="15wdlrc8ng1zxgp3gi8d1zfy366mv9m4p643ia7vdcgqv3icq7fc"; depends=[combinat]; };
+  complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
   complexplus = derive2 { name="complexplus"; version="2.0"; sha256="05b36gql6fqcairwpxvis9vllpvmpgv6rg69zd8vabl5xsgv8q44"; depends=[expm Matrix]; };
   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.2"; sha256="028mpal6gdrxgw08hxhsl4yvc9plj0bvndb48fyrzpj8kmk5dibv"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.3"; sha256="13gqc094c3sx52qx4yvk3la6qs31rgrpm8l6asysn4jp0q6hqgqq"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
+  comtradr = derive2 { name="comtradr"; version="0.0.1"; sha256="03pic8ld3bbzd415hxxsx3dq520az1byqbp7v08ks64nz5whmplw"; depends=[dplyr httr jsonlite]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
   conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; };
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
@@ -4314,14 +4427,15 @@ in with self; {
   confSAM = derive2 { name="confSAM"; version="0.1"; sha256="00l4hk0n63p3gdv6hpxqkkn3nw4rgw77rpwzn2k8fgq53ja44yfg"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; };
   config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; };
-  configr = derive2 { name="configr"; version="0.1.0"; sha256="0yajq3c9j22p3llkhla2x6mmphmpi4l1wshyyn1sv1fczldijvzc"; depends=[ini jsonlite RcppTOML yaml]; };
+  configr = derive2 { name="configr"; version="0.2.1"; sha256="0b5mkhnnlpp1m3b4gflyn4n1pdr21f10jpx8kbw2dhjd3imbdq0s"; depends=[ini jsonlite RcppTOML stringr yaml]; };
+  confinterpret = derive2 { name="confinterpret"; version="0.1.0"; sha256="1rl742pf6lz48q3sq8c57fp45zdh90kx3wx0zmq63ic18ql1hg51"; depends=[]; };
   conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; };
   confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
   connect3 = derive2 { name="connect3"; version="0.1.0"; sha256="07ih875ynrxzynj989d0h469ilq6c634z2z3igvxpkx40wr451d5"; depends=[]; };
-  conover_test = derive2 { name="conover.test"; version="1.1.2"; sha256="063a43v6f8hknaph78b92aqhwv6nfzsd029j4gqs2087lyqdk2ap"; depends=[]; };
+  conover_test = derive2 { name="conover.test"; version="1.1.4"; sha256="1dscb0rwwvl83ag4lbn13bxnn9apv3dkr37q8qr5i4diahcva17c"; depends=[]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
   contfrac = derive2 { name="contfrac"; version="1.1-10"; sha256="10mw75aznwbhi4kj8s7hyisgxnb4rv8pggcs8zdbmq22w7ql2rd7"; depends=[]; };
   conting = derive2 { name="conting"; version="1.6"; sha256="0hyg1nj89i780mf1fgmrfiv5gl5nzlar8i1zy8fsim73cw9y39fm"; depends=[BMS coda gtools mvtnorm tseries]; };
@@ -4331,14 +4445,14 @@ in with self; {
   convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; };
   convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; };
   convevol = derive2 { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; };
-  convey = derive2 { name="convey"; version="0.1.0"; sha256="0qv8v5mfnzgyyiyx2yhmkmqscnf1q8i2p2hvhhx5y1ix045an93x"; depends=[survey]; };
-  convoSPAT = derive2 { name="convoSPAT"; version="1.1.1"; sha256="17j5a5nppslx2rwg2grdz8ihhy0ryjlhrqar1yq7jknmrss3jlpv"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
+  convey = derive2 { name="convey"; version="0.2.0"; sha256="1sngpp769q13lp3ykk510di2iq06i7fc79z6mhdivmlw3pf40lcb"; depends=[survey]; };
+  convoSPAT = derive2 { name="convoSPAT"; version="1.2"; sha256="1qxn9kwxbl1qvhdn4xfky9lc7qvg9v8qgmd1wvbz2b6yc0wvhxia"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
   cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; };
   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-0"; sha256="1q38kawck0625fyxmh7a0cya5yyhv9ds53q1l0h03vrappq5amxv"; depends=[]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
   copBasic = derive2 { name="copBasic"; version="2.0.5"; sha256="0xijw9abqkljacwnblyncjkpaj178s9kq8jazxb39v4qk8pmvq6c"; depends=[lmomco randtoolbox]; };
-  copCAR = derive2 { name="copCAR"; version="2.0-1"; sha256="1mvbarzq409lkf7sd6s4adf2cgvmby7f1yg35x83bp1sc8529kz8"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
+  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]; };
   coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; };
   copula = derive2 { name="copula"; version="0.999-16"; sha256="0mnhp5jhrbynnkdf9cmxzd5kqg8zvdrwldy8pn7sdjq18xq6qawa"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; };
@@ -4354,15 +4468,17 @@ in with self; {
   corehunter = derive2 { name="corehunter"; version="3.1.0"; sha256="1q5bmzkmm8fzdnbj8s8mi0jxmrqp6ps14m1fm0c3frlqj3fy1ngm"; depends=[naturalsort rJava]; };
   corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; };
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
-  corpcor = derive2 { name="corpcor"; version="1.6.8"; sha256="0gnwqzfhxhxy7zxjzgga9l2npn588jjavqlmv9dag7ciq1kxmzk9"; depends=[]; };
+  corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
   corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
+  corpus = derive2 { name="corpus"; version="0.2-0"; sha256="1cgk3j6wsdxh310yka6r4nnvnnx15jlibnk0s7w2cw5rr2b5pwxp"; depends=[]; };
   corr2D = derive2 { name="corr2D"; version="0.1.12"; sha256="06jhcb4sr9mz06pc8jjrpl1qhxjp4bacal3hgy1k76lfbayxn7fv"; depends=[colorspace doParallel fields foreach mmand rgl]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
   corregp = derive2 { name="corregp"; version="0.1.4"; sha256="09gkxl5bmshsg8j9manvpwzy88djqqi8xrdhbmq6azk3g3lr70rp"; depends=[ellipse gplots rgl]; };
-  corrgram = derive2 { name="corrgram"; version="1.10"; sha256="065l93pdz3bms1b9qkcqhyi0j2bh4firl35rnfkajqbz5i3v8q55"; depends=[seriation]; };
+  corrgram = derive2 { name="corrgram"; version="1.11"; sha256="13znr4gqj6pnilqpw0ypc8zjk259gm06pribr3sz9bnrkpr6pcfc"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.77"; sha256="1lr873lqg4zdjccf9g8a1fbvvdbvyb30j980ygiyxwpajpwnzdjl"; depends=[]; };
   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-3"; sha256="1bx8dzxyvvi9cc2vql1whlnva8n3af8jsglyzh77jzrrqk78rkh1"; depends=[]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
@@ -4370,6 +4486,7 @@ in with self; {
   cotrend = derive2 { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
   couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; };
   countrycode = derive2 { name="countrycode"; version="0.19"; sha256="0cgv8sds01figs5dsm1gga2py2nzf3a3xrlkmblal52xxpng2jf8"; depends=[]; };
+  countyfloods = derive2 { name="countyfloods"; version="0.0.1"; sha256="0m9vhsqksr6wprxmvg0cmvyfmmv92a4icak89pv9lmsqmvy5q3ca"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; };
   countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; };
   countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; };
   covBM = derive2 { name="covBM"; version="0.1.0"; sha256="0ky1lhr8m4hy2ss1nr2xymf6cmj1rr8px8zsxna6bsisf5bq4j4w"; depends=[nlme]; };
@@ -4397,12 +4514,13 @@ in with self; {
   cplexAPI = derive2 { name="cplexAPI"; version="1.3.3"; sha256="1li5sbakkq8hrgwsa4i1qa5bdjj6vm6s9sq23ccknbb8bxp4zmwv"; depends=[]; };
   cplm = derive2 { name="cplm"; version="0.7-5"; sha256="16li79x2zyydi7gi4n8k09g9x2n1dgd9av3nqjnb0by3v31c44n0"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   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]; };
   cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
   cquad = derive2 { name="cquad"; version="1.3"; sha256="1r6g3yp3vvm8d5351lan4im1bmir38d4l9cf8bw0ay7as33ny3x9"; depends=[MASS plm]; };
   crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
   cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
-  crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.5"; sha256="113apslycwdgyx18gxbamz235267h2v9b4r2d3pakw38sh74z3qz"; depends=[]; };
+  crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.7"; sha256="1kxh5ixhwv4fm78x6kzpwyzdgs7xzcx0k321zvkg5l46k3wybg6g"; depends=[]; };
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
@@ -4412,13 +4530,14 @@ in with self; {
   crch = derive2 { name="crch"; version="1.0-0"; sha256="1wd9hwr68qlinaw23lckjizq5g67v74wc3v6ig1rxrxyssyzag68"; depends=[Formula ordinal]; };
   creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
-  cricketr = derive2 { name="cricketr"; version="0.0.13"; sha256="1nj72avz1m12nn3kyiy4msrvrwhdxl0mywc22wwc6j9dq7v7gh18"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
+  cricketr = derive2 { name="cricketr"; version="0.0.14"; sha256="0vziyagx594d0k44c53z720vwb1hflcxb7m898l5vfds8jsi6mhv"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
   crmPack = derive2 { name="crmPack"; version="0.2.0"; sha256="1bgy3bfsasjppd0gf9yxrfyc1glzqpgdfpl9kv2lv34xbywwad05"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
   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]; };
+  cronR = derive2 { name="cronR"; version="0.3.0"; sha256="0nyjgxgvasqv8g9cvkzii0jsr15x5i76waz5hzzsjar5mwq6vq8h"; 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=[]; };
@@ -4435,8 +4554,8 @@ 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.3.0"; sha256="1a59zb2ifxg59yzjyf1gq4fk0vqvc0alvifpn2rssis8jyr6g7wr"; depends=[curl httpcode mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.15.0"; sha256="0ylkp861dy8qa03pjl6znf2mgknhnf3wfyby01zjzrwak2pixi5n"; depends=[curl httpcache httr jsonlite]; };
+  crul = derive2 { name="crul"; version="0.3.4"; sha256="14dc5vs1h5rwd373ibh1dndxgx3h3i2zg5d38i43j0ffqsbiyrl2"; depends=[curl httpcode mime R6 urltools]; };
+  crunch = derive2 { name="crunch"; version="1.16.0"; sha256="19iw8vpqxlanm4z2cwpnh500zkdb3j8wc7qvppkdv2b4a5cy33lq"; depends=[curl httpcache httr jsonlite]; };
   cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
@@ -4454,12 +4573,12 @@ in with self; {
   csvy = derive2 { name="csvy"; version="0.1.3"; sha256="0vszbxqa88sdsi73wng4y8zxhrvcksqa6qs3rbh50c2nll8r8kb3"; depends=[yaml]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
   ctl = derive2 { name="ctl"; version="1.0.0-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; };
-  ctmcd = derive2 { name="ctmcd"; version="1.0"; sha256="1qv2r7myrvr0a5gcrs6bi46dm4kicyyn95rkr6qyvvdnz2i2mhqm"; depends=[expm numDeriv Rcpp RcppArmadillo]; };
-  ctmcmove = derive2 { name="ctmcmove"; version="1.2.7"; sha256="1bhzwh1hhfda49p52ixvicx2mbca28mhnhh4h6nvm2i3m72dkfrq"; depends=[fda gdistance Matrix raster sp]; };
+  ctmcd = derive2 { name="ctmcd"; version="1.1"; sha256="05r04bxd1n866rcizjgw1267ms8zdcpny3i1vycrk31ja953fs0a"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
+  ctmcmove = derive2 { name="ctmcmove"; version="1.2.8"; sha256="16qi4y3ivcys2dfixm4vzyqbqbm2j1gc1l4bjrrp46c268qja2z3"; depends=[fda gdistance Matrix raster sp]; };
   ctmm = derive2 { name="ctmm"; version="0.3.5"; sha256="0lg3mrwdsphwj1c0r4655a1glk49p0y60rd1w11jvz16y6r6j59b"; depends=[expm manipulate MASS numDeriv pbivnorm raster rgdal scales]; };
   ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; };
   cts = derive2 { name="cts"; version="1.0-20"; sha256="0bsf52b98fji85j01qv0krc7yzr8mqhvn7w1zsy2rbanjmlwmnca"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="2.2.0"; sha256="0gi2lh9wyl0bl1dhlmifciyj4f0xffxqswhhcrybff5dv7bip3nv"; depends=[Matrix OpenMx plyr rstan]; };
+  ctsem = derive2 { name="ctsem"; version="2.3.1"; sha256="0wgy0a39y7blmzynwqxq7vqi16rfrqcyy1hyzw1qwxfsgznpf1ws"; depends=[Matrix OpenMx plyr Rcpp rstan]; };
   ctv = derive2 { name="ctv"; version="0.8-2"; sha256="0xpxxkn6x26vmdkd2hkn8afyn95q2yg4kl5i989dipqzxc47fbrv"; depends=[]; };
   cubature = derive2 { name="cubature"; version="1.3-6"; sha256="0ck9lrk39pnb3piz5dpgsbkbcppx7hq61c3hpjk5mcacgxnd8jvy"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-2"; sha256="07phnpgag68ss08qyzhj2g1s084w0cc583a30i09c82ql9j3gbpk"; depends=[coda foreach]; };
@@ -4469,11 +4588,10 @@ in with self; {
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
-  curl = derive2 { name="curl"; version="2.3"; sha256="0gbw5l0wnsw26fbr08gj9vgxrzxg8axvqxfshmd8g9khpgbdl0gr"; depends=[]; };
-  curlconverter = derive2 { name="curlconverter"; version="0.7.0"; sha256="03nv3kkw171qxafy0acbfs7kxaz89i1l7jyi3n46f5fapks4vx4x"; depends=[clipr curl formatR httr jsonlite magrittr purrr stringi V8]; };
+  curl = derive2 { name="curl"; version="2.5"; sha256="09p86i5f88gx1i7cidm1ka56g0jjkghqfam96p1jhwlh2fv6nrks"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
-  curvHDR = derive2 { name="curvHDR"; version="1.1-0"; sha256="0cymz4i29sih9z5hkih86db41x39kzzm9vq1374rfxz26l2c00xy"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
+  curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; };
   cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
@@ -4497,8 +4615,9 @@ in with self; {
   cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; };
   cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
+  d3Tree = derive2 { name="d3Tree"; version="0.1.0"; sha256="10nwssxx342d2hhr1iawd8p8jd273ywl3rlp7wm2cp7m73m2azil"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; };
-  d3r = derive2 { name="d3r"; version="0.6.2"; sha256="0abxv8ld6zzkajqkiz0dv61axw3yak4arpw8ar43dypg1ar5cbmm"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.6.3"; sha256="0q0m3m97ban9aywwb37n0jbnd0sjy8132g4253nz713gawz11rav"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.0"; sha256="0b8n2kkpyqia6kpmgdi93917xf23r9aya33030iyk2wn18642qdj"; depends=[ALL Biobase genefilter MLInterfaces]; };
@@ -4526,20 +4645,20 @@ in with self; {
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.6.3"; sha256="1bgjn5j0kcd9ysi12pyqygv96vcd0ld67ika9z46lcx9n99zq35d"; depends=[curl dplyr httr lubridate readr reshape2 xml2]; };
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
-  datacheckr = derive2 { name="datacheckr"; version="0.1.2"; sha256="1z9r7f82rl6x63bl6mcvdvb0pbc6n0202vn9hh0lqf86qz30q7dp"; depends=[dplyr magrittr]; };
+  datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; };
   datadr = derive2 { name="datadr"; version="0.8.6"; sha256="0fmywnxcvw31vfb9iaxqiw19ycnd98v41pdsdknabysr7fpnygfq"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.2.1"; sha256="0hlvnnn3gs73m6gryr6ngmd9sdlamwmdmac3fawbbyna2if5b77n"; depends=[assertthat downloader dplyr httr jsonlite lubridate readr]; };
   dataone = derive2 { name="dataone"; version="2.0.1"; sha256="0n1c87wb15q7ysz0q5r69g57hk0vpd66m0w9wjbcjlyfn8whqa08"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
-  datapack = derive2 { name="datapack"; version="1.0.1"; sha256="1ka4yxggdm9yify4vdbsrnxarjx0yab4p94xyzks72xqn6kpwarg"; depends=[digest hash redland uuid XML]; };
-  datapasta = derive2 { name="datapasta"; version="1.1.0"; sha256="0cvcb074blc35kl709s6gpii353pfn1biscl5d9jma4ad9i0fi5a"; depends=[clipr readr rstudioapi]; };
-  datarobot = derive2 { name="datarobot"; version="2.4.0"; sha256="1whlzakr01v5wrzv4fmpzml5xdk1vk48mmnhnh41hycxgssvlp04"; depends=[httr jsonlite yaml]; };
+  datapack = derive2 { name="datapack"; version="1.2.0"; sha256="1pyl52r6lbwvr96k8qjnz16l1v3hw80jcbh2ciaa9sld42ds6kgq"; depends=[digest hash redland uuid XML]; };
+  datapasta = derive2 { name="datapasta"; version="2.0.0"; sha256="100nqw315xdzxpzn1gmx4881zli4lwzwckdvqjciysv4l5gvzzfm"; depends=[clipr readr rstudioapi]; };
+  datarobot = derive2 { name="datarobot"; version="2.6.0"; sha256="1dnps3hdyz468i7jx2idary2dbphyy6j178n8ba37dvjf5pnhnbw"; depends=[httr jsonlite yaml]; };
   dataseries = derive2 { name="dataseries"; version="0.1.0"; sha256="1z2hvksk9c9rnwi0r2i61sbkiwk3g2q8knxh08w6wkj9864payhw"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
-  datautils = derive2 { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; };
+  datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; };
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
   date = derive2 { name="date"; version="1.2-37"; sha256="0321kqvpy5cvl8hmm6pd0pyjpi30glm8hvw60mrql6y28sn6pqhl"; depends=[]; };
   dave = derive2 { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
@@ -4551,9 +4670,10 @@ in with self; {
   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-2"; sha256="06m1llg1il0v4v8yi62z26hglzrhzw009y81xpb9zaphcviqp2qr"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-  dbmss = derive2 { name="dbmss"; version="2.3-0"; sha256="02dmm7djm4k5c9cz0dcs5fkdnld6xmj110619yry2z307irdqamk"; depends=[cubature Rcpp RcppParallel spatstat]; };
-  dbscan = derive2 { name="dbscan"; version="1.0-0"; sha256="0yqng42d7nl4x2qnkpvv5cj426gzdx872gcwfblys73hw20v09ky"; depends=[Rcpp]; };
+  dbmss = derive2 { name="dbmss"; version="2.4-0"; sha256="0rxldlyrwfbpmvgmqzmzifflnc7hv2dv62fmhqihvac7ya1h2rx8"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
+  dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; 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-2"; sha256="0s3s46hvlsivfhrc559y0b3dc5m6g11cv3fwy4asigh8lqjc972d"; depends=[coda Matrix rjags snow]; };
@@ -4594,15 +4714,16 @@ in with self; {
   demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; };
   deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
   demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; };
+  demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; };
   demography = derive2 { name="demography"; version="1.19"; sha256="08cfvsvv6ayxy93vihavyb3lddgwfdlwrb2x4is5fxids79lpm9x"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-  dendextend = derive2 { name="dendextend"; version="1.4.0"; sha256="0piqa8jvzarkkxmrv8hz11gg1jzm75b2fbrmd3nkwv4fcjlzpa0x"; depends=[fpc ggplot2 magrittr viridis whisker]; };
-  dendextendRcpp = derive2 { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
+  dendextend = derive2 { name="dendextend"; version="1.5.2"; sha256="04jz58apibfrkjcrdmw2hmsav6qpb5cs6qdai81k1v1iznfcya42"; depends=[fpc ggplot2 magrittr viridis whisker]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
   denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; };
   denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; };
   denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
+  denseFLMM = derive2 { name="denseFLMM"; version="0.1.0"; sha256="0sckr9r2wylncpsq5yz2vww35imcc0zw8ghz8prqw2n20233gqj1"; depends=[MASS Matrix mgcv mvtnorm]; };
   densityClust = derive2 { name="densityClust"; version="0.2.1"; sha256="0blq6h6x071bcy3shr77b3bwq1im0013vbg7gckdhljm859n07bh"; depends=[Rcpp]; };
   densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
@@ -4631,18 +4752,18 @@ in with self; {
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
   detzrcr = derive2 { name="detzrcr"; version="0.1.3"; sha256="1j0x3175d0fllf0f4csgdi86p69ichk5wvhr5nbyzga3f034c87h"; depends=[ggplot2 MASS shiny]; };
-  devEMF = derive2 { name="devEMF"; version="3.3-1"; sha256="1s0rmw3gsyj28ywlkfdjr98fr7cjhmzb0fq5qn9s91dw9a3fx8zf"; depends=[]; };
+  devEMF = derive2 { name="devEMF"; version="3.4"; sha256="1h95hdjasmb3imvkcrlq48mckaq9wkcxk8gvq13sra91lrv9cgjz"; depends=[]; };
   devRate = derive2 { name="devRate"; version="0.1.1"; sha256="088i9m9ys59p2a961183ac2w6wa0idb4xvyfnxqz9rpiins8d0bg"; depends=[]; };
   devtools = derive2 { name="devtools"; version="1.12.0"; sha256="1m5g6xnq7r4s3a0nlpa88fp5x6c8nl5icnp4869y5zwdk2ijqgla"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
   dexter = derive2 { name="dexter"; version="0.1.7"; sha256="1bpj6izqgp4mi9h4kpm9xhnm8h6j9lvdizr31w51ljs8lkphzpwd"; depends=[colorspace plyr reshape2 RSQLite]; };
   df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
-  dfcomb = derive2 { name="dfcomb"; version="2.1-6"; sha256="14jyagnrsbzdwcfy0z6c9gwbv40xrnany43ylpks6qgnq4rya7a2"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  dfcomb = derive2 { name="dfcomb"; version="2.2"; sha256="1a7z7c2shmmnfgrdmwph2b3xa7r05c1x1nrhjvbl5fljcvlwg7q9"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
-  dfmta = derive2 { name="dfmta"; version="1.3-4"; sha256="18lmgpv6jhjs15difiq0jck6kf898ngr2g13wrf3y5s5xc70iwkp"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  dfmta = derive2 { name="dfmta"; version="1.4"; sha256="0ihn5hdg2drvfzf9l8ybsry466m1gym4y99217swg17jn8m6z6r0"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfoptim = derive2 { name="dfoptim"; version="2016.7-1"; sha256="1hs0ln5iz3h1x1b27jai83r3gad6698zwhr2jgpviiv9zwhic8c2"; depends=[]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
-  dfpk = derive2 { name="dfpk"; version="2.0.0"; sha256="0nn0m4kvjsyv48xribkab0jnbv0db17aan9flnkg5jh4s03pg9sc"; depends=[BH dfcrm ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
+  dfpk = derive2 { name="dfpk"; version="2.1.0"; sha256="0favm57farip4kp8ywy2ps446pkv5mp6ydiyxvn7pix7rv2ww5rl"; depends=[BH dfcrm ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
   dggridR = derive2 { name="dggridR"; version="0.1.11"; sha256="179pi20rs0mp5aqydhw34wczrkyavndaaccjr017gp456gza1a83"; depends=[dplyr ggplot2 rgdal]; };
   dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
@@ -4683,16 +4804,17 @@ in with self; {
   dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
-  directlabels = derive2 { name="directlabels"; version="2015.12.16"; sha256="0vi9zbc2sa8fpi2n2ax1ni9f8s9w1hc0f6gahk8fcrmnagj4g089"; depends=[quadprog]; };
+  directlabels = derive2 { name="directlabels"; version="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; };
   dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
-  discSurv = derive2 { name="discSurv"; version="1.1.5"; sha256="0lbzaalh1jack49px47sqsmpwmv14w4h1y2r9k294921d02zl0w5"; depends=[functional mgcv mvtnorm]; };
+  discSurv = derive2 { name="discSurv"; version="1.1.7"; sha256="0shxwxbvbbgp0qphpbih582d5psqj5n0izv7zvcw97vh82bzra4l"; depends=[functional mgcv mvtnorm]; };
   discgolf = derive2 { name="discgolf"; version="0.1.0"; sha256="15bk2k7glahcbz4kyl3fiayi7ck6z3wabl9y25fg6cnxkbyh6dbn"; depends=[httr 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]; };
   discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
   discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; };
-  discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.2"; sha256="1rdcwlp6m08fjvw54f4m07ahdx1vh1wdzxpai79kchgxp0i9np9g"; depends=[Rcpp RcppEigen sparsebnUtils]; };
+  discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.3"; sha256="05mbz5iw2234nq3agiwn25pzlq63l4jzj1dpr9h37xaryg1qscjr"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; };
   discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
   discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
   diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; };
@@ -4702,14 +4824,15 @@ in with self; {
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
-  disposables = derive2 { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; };
+  disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
+  distances = derive2 { name="distances"; version="0.1.0"; sha256="0hhjvi08bv84x5b6baiycvnl94nc0p8q6ljghzvgfrsadgbyjnf9"; depends=[]; };
   distcomp = derive2 { name="distcomp"; version="0.25.6"; sha256="0qp9lsi1mb9amcs8wfhzrsqv92lrl3k3glskmvvj75cqy5kwi3az"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.2"; sha256="1i1rkkic3kz2cs7fq4sb7zfr6s4wini8g1851yxzs9bjgqpsch1d"; depends=[]; };
   distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
   distillery = derive2 { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; };
-  distory = derive2 { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
+  distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; };
   distr = derive2 { name="distr"; version="2.6"; sha256="0f2y3ycng2chbhas0bq8zqp314lsm8c39chxpg40dcfq0f1z3rmk"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; };
   distrDoc = derive2 { name="distrDoc"; version="2.6"; sha256="19yjns5cv2jp551kbld30xmdzljxr0lj5gps0lxfv8d7mrj09kf7"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
   distrEllipse = derive2 { name="distrEllipse"; version="2.6.2"; sha256="1rhpnwsml7vs2nkn4q4203fi0qwfc4pxgva0b4z30zzhywb0p3hg"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
@@ -4721,11 +4844,11 @@ in with self; {
   distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; };
   distrom = derive2 { name="distrom"; version="0.3-3"; sha256="1kpbrsa7ml72zvmdcpbbz2rsv4lpqd5i2w3v488ji6nbi44v1gp6"; depends=[gamlr Matrix]; };
   divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
-  diveMove = derive2 { name="diveMove"; version="1.4.2"; sha256="0j761js14ip6spxm6xz9lwyc6zv094bylp1lq487pkgwwcakqs0k"; depends=[caTools geosphere KernSmooth quantreg uniReg]; };
-  diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; };
-  diverse = derive2 { name="diverse"; version="0.1.4"; sha256="0c5a2ippnygyny9bkqk8s9vywq5207nss0ikywgji8ld0zvxsmi6"; depends=[foreign proxy reshape2]; };
-  diversitree = derive2 { name="diversitree"; version="0.9-9"; sha256="00dzw9fpcdgfvf7jl3lr2a2gpfd8pr17myih04v5hkxpjmsydawp"; depends=[ape deSolve Rcpp subplex]; };
-  divest = derive2 { name="divest"; version="0.2.0"; sha256="0yhk83dmwkii1w355vqmcn4wsm3k8npm4v8wsf6knvqrszh6zh0s"; depends=[Rcpp RNifti]; };
+  diveMove = derive2 { name="diveMove"; version="1.4.3"; sha256="18420gm1cb0pinp05n08cj5qgf9rmn5ksr7bfq464s61isrhmzhy"; depends=[caTools geosphere KernSmooth quantreg uniReg]; };
+  diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; };
+  diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; };
+  diversitree = derive2 { name="diversitree"; version="0.9-10"; sha256="0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"; depends=[ape deSolve Rcpp subplex]; };
+  divest = derive2 { name="divest"; version="0.3.0"; sha256="0clk8ljhvssik29knrmbdyg0dqky74ghijfjdnk098vw7k1iyp51"; depends=[Rcpp RNifti]; };
   divo = derive2 { name="divo"; version="0.1.2"; sha256="1g3wv89zjd5x0qic39jy81kl488gila3lwdjdilm9dxh4kb4dbw5"; depends=[cluster RcppCNPy]; };
   dixon = derive2 { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[spatstat splancs]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
@@ -4745,27 +4868,30 @@ in with self; {
   dnc = derive2 { name="dnc"; version="1.2"; sha256="0a0nc1yx6vhbjsik9pidda97i7s6ndlsm8pzx29ccmxlmqncc18b"; depends=[BayesLogit igraph MCMCpack movMF plot3D plot3Drgl Rcpp RcppArmadillo skmeans vegan]; };
   dnet = derive2 { name="dnet"; version="1.0.10"; sha256="011rqvwski3jh5nmn84pg3pxznbfm37gjz7sp7n6f3x3y807q2rg"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
   doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; };
-  doFuture = derive2 { name="doFuture"; version="0.3.0"; sha256="1np7g4dqxkbfrilcbyrfdkppdv558xl9a4s4wgcxb2in6h27zzwp"; depends=[foreach future iterators]; };
+  doFuture = derive2 { name="doFuture"; version="0.5.0"; sha256="1yb483x99z7xjrxb2r4v2l0d66y15pc799dxqn62kppmr0j452bz"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
   doParallel = derive2 { name="doParallel"; version="1.0.10"; sha256="1mddx25l25pw9d0csnx2q203dbg5hbrhkr1f08kw0p02a1lln0kh"; depends=[foreach iterators]; };
-  doRNG = derive2 { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach iterators pkgmaker rngtools]; };
+  doRNG = derive2 { name="doRNG"; version="1.6.6"; sha256="0xnqrc74qncg5iv4cvq0vh3r1sd407wvzx0hfpy8j2rcqy12574k"; depends=[foreach iterators pkgmaker rngtools]; };
   doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
   doSNOW = derive2 { name="doSNOW"; version="1.0.14"; sha256="1xfk48i465sv2jqzydsaff3a656ggkrxzvhsqnrsgqh1k3423a1g"; depends=[foreach iterators snow]; };
   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]; };
+  doctr = derive2 { name="doctr"; version="0.2.0"; sha256="1ca04ysfrxclqw50m9rj25qi9i2b2gg7bxqqbk526v4hv178zryj"; depends=[dplyr magrittr purrr readr stringr tibble tidyr]; };
+  docuSignr = derive2 { name="docuSignr"; version="0.0.1"; sha256="0y61n35k3ap4xi5vh8g1nadp3b5wl301rdh8ycf9yci7zm7sagyl"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  docxtools = derive2 { name="docxtools"; version="0.1.0"; sha256="109fv2sg4dw6s10b4fx44npwvyr5yr69y7m701irqpc0bbwssh55"; depends=[dplyr ggplot2 pander stringr tibble tidyr]; };
+  docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; };
   domino = derive2 { name="domino"; version="0.3.0"; sha256="0lhrnrpyz98cl16a1xk7x0299kxkz303myyz61nw3x6f7kh1gvd6"; depends=[]; };
   dosresmeta = derive2 { name="dosresmeta"; version="1.3.3"; sha256="0j0718mlzwnnxc7rm9yqm9izsa7c2kbwfx9ai2ygj3xki9wr70jm"; depends=[aod Matrix mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
-  dotwhisker = derive2 { name="dotwhisker"; version="0.2.3"; sha256="0q5l7vkypnh1rxlh5yd8jq4kql62wqf60gdpf7cds437w8fs8c01"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
+  dotwhisker = derive2 { name="dotwhisker"; version="0.2.5"; sha256="0swldw1krrnjklmm3mifxr2h278ffvry9vf8hm6lx2bcwgx3v408"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="1.2-4"; sha256="080zlfz0yhznymr7icc2m7w5c0pqiak1qp22ywcfcb6d0mri3k8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
-  downsize = derive2 { name="downsize"; version="0.2.1"; sha256="0cl143b6rn5l7q67vd9kjj5sdqq13s2fww722vqcq7ham20k2wsp"; depends=[dplyr R_utils]; };
+  downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
   dpcR = derive2 { name="dpcR"; version="0.4"; sha256="02j7fhhfq7p2wfcnr7rdy65v6dcvdym3nfyps7717p7b429chchc"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
@@ -4777,7 +4903,7 @@ in with self; {
   dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
-  drake = derive2 { name="drake"; version="1.0.1"; sha256="14r1qa6nf1g0gixnyx7b60xga37gic99ma7mr2fzgqa7i89bz2hc"; depends=[crayon digest eply formatR igraph magrittr plyr pryr R6 storr stringi stringr]; };
+  drake = derive2 { name="drake"; version="2.1.1"; sha256="0z85q0snwqs027g52d23q2diy4ff4cmds9sm49gkc9ns3pk2gw4v"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat]; };
   drat = derive2 { name="drat"; version="0.1.2"; sha256="14nmbxy2y51bi258fmx24pkwmga791hnwzbx6jy2sl55g3vrxjpz"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
@@ -4800,12 +4926,13 @@ in with self; {
   dtplyr = derive2 { name="dtplyr"; version="0.0.1"; sha256="05p51dnvx2ldjkipbhi0ia3lq6l4xv55sqnqjhlnqc4p4hfc7wwf"; depends=[data_table dplyr lazyeval]; };
   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.1"; sha256="0w0hg0cp827mw98xlq8yqmx4cs4m7zlg6gbjlxk5pm8v2a3nhn3s"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="3.1.1"; sha256="0g3fffsvlwqb528y02fkazbll10yzcpblwxpc3519zff23vvb025"; depends=[caTools clue dtw flexclust foreach ggplot2 proxy Rcpp reshape2 rngtools]; };
+  dtwSat = derive2 { name="dtwSat"; version="0.2.2"; sha256="083jld6fd10fk2nif806m7vmckii9h9mm32vyw5z63fvnx7l0yxg"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; };
+  dtwclust = derive2 { name="dtwclust"; version="3.1.2"; sha256="18m85nfkipmvbsdknkp50d75bl6wg8zhs5ksp71n622z1lzfx132"; depends=[caTools clue dtw flexclust foreach ggplot2 proxy Rcpp reshape2 rngtools]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
+  duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
-  dunn_test = derive2 { name="dunn.test"; version="1.3.3"; sha256="1hkfv9p06gfv0j4fh299x0cm9rrvsbqv89kqddqf6fablxmqm7vh"; depends=[]; };
+  dunn_test = derive2 { name="dunn.test"; version="1.3.4"; sha256="1vnh98vqy0zy9bi3kpdzp74apy8zw8jl9r75vnqz5hjs3d6rg7lb"; depends=[]; };
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
   dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
   dvn = derive2 { name="dvn"; version="0.3.5"; sha256="04di2gpdacivvd9bi96w6145k280s8blavdhi1w3rw4c7sc3hag2"; depends=[RCurl XML]; };
@@ -4815,7 +4942,7 @@ in with self; {
   dynCorr = derive2 { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
   dynOmics = derive2 { name="dynOmics"; version="1.0"; sha256="10aw362hhwqdnjf7xxzy25fdxq2zznzvg6xwvl25a9ppj76nm1rh"; depends=[ggplot2 gplots snow]; };
   dynRB = derive2 { name="dynRB"; version="0.9"; sha256="0ysdlcchsszrgp2cizmli0l86ym2jz9addc21wxgdlz0vdfn7fn4"; depends=[caTools corrplot]; };
-  dynaTree = derive2 { name="dynaTree"; version="1.2-9"; sha256="1a94mwllk116k9al18ckzy9p6yckvifp5hwrz2na4n2r10ivhn86"; depends=[]; };
+  dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
   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.2.0"; sha256="1ikl69c4hb1b4nv0zm6n3aaw928zihxzcbnwid29zdxl5ybg3bfd"; depends=[boot Rcpp RcppArmadillo stringr survival]; };
@@ -4833,17 +4960,19 @@ in with self; {
   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]; };
   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]; };
   eRm = derive2 { name="eRm"; version="0.15-7"; sha256="0x8cqcwgn8znd9w9vkxcacf097rziyb511wzcfmhhadidiilk0x3"; depends=[lattice MASS Matrix]; };
   eVenn = derive2 { name="eVenn"; version="2.3.4"; sha256="1nwbqk2hqdi7y4ys3h6nrjv1pjzyx96w7643l8nbcdg5i4bbvvls"; depends=[]; };
   eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
   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.4.9"; sha256="1dyz2ac754scg474x9ksrwrqflmh9wi7qwgm494fpfi9ndd9ycig"; depends=[plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="4.4.9.1"; sha256="1h7rakv1qgyz6ccbrb7njdvgkplbn0bmj8r0ff0cbncgw1hkhbrm"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
-  easyDes = derive2 { name="easyDes"; version="1.0"; sha256="17wjsvy9hnrp6s50ivrvahd6p147ibcn3wrlj1hx95qckqjk2b06"; depends=[multcomp PMCMR]; };
+  easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
+  easyNCDF = derive2 { name="easyNCDF"; version="0.0.1"; sha256="0yc084ns5gnyifcll6by7lmy0jnigg66i7rmx3y0fx9fhn3xq7xr"; depends=[abind ncdf4]; };
   easyPubMed = derive2 { name="easyPubMed"; version="2.3"; sha256="148ga6flgv74sfzz5kvvnqhfdkx6zhpl6ydzcd32lz3cq24ckli9"; depends=[XML]; };
-  easySdcTable = derive2 { name="easySdcTable"; version="0.2.1"; sha256="0a7779xvsqzcsva9jxa10wz8bdbfp49r0w7c2dqwi9md04bv1qg1"; depends=[sdcTable SSBtools]; };
-  easyVerification = derive2 { name="easyVerification"; version="0.4.0"; sha256="0jllrrp0abqkij7iq4z5paca4lgxh4lbrj5ifhrakrxdpncrg9wd"; depends=[pbapply Rcpp SpecsVerification]; };
+  easySdcTable = derive2 { name="easySdcTable"; version="0.3.0"; sha256="1dyj66vd1g06s2fs6xqrf7b4sr2p55azhzdjhazvkm9h8j55ai02"; depends=[sdcTable shiny SSBtools]; };
+  easyVerification = derive2 { name="easyVerification"; version="0.4.1"; sha256="1n086cbwsayhsflisy0x4ym1232z9n4896bdw0kyvydz9fwf3sw4"; depends=[pbapply Rcpp SpecsVerification]; };
   easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
   easyformatr = derive2 { name="easyformatr"; version="0.1.2"; sha256="0mrpd21hyafn82apclxmhs2jbd87sdw0g6lwc3h6gl5cbm213nxb"; depends=[dplyr knitr lazyeval magrittr stringi tibble tidyr]; };
   easynls = derive2 { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
@@ -4863,13 +4992,12 @@ in with self; {
   echogram = derive2 { name="echogram"; version="0.1.0"; sha256="0v0fiy2fflk7pxn8wqr75wym0m6snggvvgxpa2b35alpmqch9k18"; depends=[geosphere readHAC]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
-  ecm = derive2 { name="ecm"; version="0.8.0"; sha256="0y9whfr75mc54ip1vc0zrbxsjslz86adqrqdvpbbva81c2x1b0ir"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="2.0.0"; sha256="1xfcpsnimik8a2rzsywgiw4dj3r66mfcq7l79096d3zifg2vjgxc"; depends=[car]; };
   eco = derive2 { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
   ecodist = derive2 { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
   ecoengine = derive2 { name="ecoengine"; version="1.10.0"; sha256="0k24m03qpqbcdwsf6xawrh0x43b97w2pba3h4pcwl7j2p0ls91pi"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
   ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.1"; sha256="1v3n5nbabw6qmwcq3sx759k6c8q4pxbffl227rv0lnnfbq77zlmc"; depends=[]; };
-  ecoretriever = derive2 { name="ecoretriever"; version="0.2.1"; sha256="0jg4rmxfa9k0smlkrhiqdrjk3vhhmv6w634nh9y3mrdwnq4sk466"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.1"; sha256="165vc00nhlff91dry51q9agm01b9ikqs1zgwfc7xw1rq59cqbz47"; depends=[magrittr RCurl readr rjson rvest tibble xml2]; };
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.1.3"; sha256="01nxjbx638s8pk1ybsz9zbk35cg27x35fam419b9rjj9kspxz49s"; depends=[FD]; };
@@ -4878,11 +5006,11 @@ in with self; {
   ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.0.0"; sha256="0v07ak7fbiph058rlbhmgx0f230mnpi39ib8vx9bdzhx5g5lrp0j"; depends=[Rcpp]; };
   ecr = derive2 { name="ecr"; version="1.0.1"; sha256="0vyv0ik8a9wa5cv2yd66935hn1i390lm6l6g0hnaycz07rfh8rlg"; depends=[BBmisc checkmate ggplot2 gridExtra parallelMap ParamHelpers reshape2 smoof]; };
-  edarf = derive2 { name="edarf"; version="1.1.0"; sha256="04gcki36xnaflg1szsdsdvdw5icsny6iaqmqyxmb2im1b1a0r39w"; depends=[data_table ggplot2 mmpf]; };
+  edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; };
   edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
   edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; };
   edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-  edeaR = derive2 { name="edeaR"; version="0.4.7"; sha256="1fgngqd9qi798v435cax3kvwczq536jac6fhj5nsjbach1jlmm2y"; depends=[data_table dplyr ggplot2 lubridate magrittr tidyr XML xml2]; };
+  edeaR = derive2 { name="edeaR"; version="0.5.0"; sha256="0r1k7lyc6hp2akdlbdahlxp8xa1h11hmfanki1pqxkllqzx9d1q1"; depends=[bupaR data_table dplyr XML xml2]; };
   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.1"; sha256="1si123kn66z2h8rrp5ck6hbjp11q0p3ja2h7xim4sqglbwca3fjw"; depends=[]; };
@@ -4905,15 +5033,15 @@ in with self; {
   effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; };
   effects = derive2 { name="effects"; version="3.1-2"; sha256="1fwkz6z3rya4qn476w9vni15rfvjp2ix87qk0naszn3n1k8bf0l0"; depends=[colorspace lattice lme4 nnet]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
-  effsize = derive2 { name="effsize"; version="0.7.0"; sha256="113afdf1w1q75alc4i5i8l3ljsdsfn22l8cszljrpgp420csbzhv"; depends=[]; };
+  effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; };
   efreadr = derive2 { name="efreadr"; version="0.1.1"; sha256="1fkifml8g7hgg3qb19b9ljljzx9sbbpnb9xa18mvkxgmbw41qsy7"; depends=[dplyr ensurer magrittr readr]; };
-  ega = derive2 { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
+  ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
   eggCounts = derive2 { name="eggCounts"; version="1.3"; sha256="1yak67k1c13rx6ghm78585k2rdsgg9ajr3zaihjk8widavb3m23g"; depends=[BH boot coda numbers Rcpp RcppEigen rstan StanHeaders testthat]; };
   egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
   eha = derive2 { name="eha"; version="2.4-4"; sha256="1sp1v3jmidj4ynjq7q7y28j9f483yhbzaz1jnxjc4hqk8398cxii"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
-  eiCompare = derive2 { name="eiCompare"; version="1.8"; sha256="12ga90nnxzy08ajgx9yavasbx5j4nrqkqinbi9w7yp4r5f27pqg8"; depends=[cubature data_table eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
+  eiCompare = derive2 { name="eiCompare"; version="1.9"; sha256="0y4b1w4klsx63xllq32mb7z57wldxvwv9ria5zgnrqwygvnxvk0j"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
   eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
@@ -4928,8 +5056,8 @@ in with self; {
   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]; };
   electionsBR = derive2 { name="electionsBR"; version="0.2.0"; sha256="1mcnmrnjkb9qwnbh79kfl90dqji2imq9s9jsx6h8d5ccmjfdmzl7"; depends=[dplyr magrittr]; };
-  elementR = derive2 { name="elementR"; version="1.2"; sha256="030ljdk8qbvv81bjr1pxg597mq1i22fpjzqdcrbrgl1c508ms2l2"; depends=[abind devtools gdata gnumeric lmtest R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2]; };
-  elevatr = derive2 { name="elevatr"; version="0.1.1"; sha256="0dwq748f4nfz41j6jc5v7l4gdrwkjrfqmivkiz799yq0pql9djar"; depends=[httr jsonlite prettyunits progress raster ratelimitr rgdal sp]; };
+  elementR = derive2 { name="elementR"; version="1.3.1"; sha256="0cpff04inl9jxsr1nwfsl9lidsaz3gb090hf18aab2x0x6bjr18c"; depends=[abind climtrends colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
+  elevatr = derive2 { name="elevatr"; version="0.1.3"; sha256="1fs34gaak0sdxpvbgszrwd833nd03p19m6fawaard1waylxsgscg"; depends=[httr jsonlite prettyunits progress raster ratelimitr rgdal sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
   elhmc = derive2 { name="elhmc"; version="1.0.0"; sha256="0xjl43xa0qw0hwdx73vv8cl1gyd5srdhpcpkap3wbnka4c75wpgj"; depends=[emplik plyr]; };
   elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; };
@@ -4938,7 +5066,7 @@ in with self; {
   elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
   elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="6.4"; sha256="13mh7sh30q1zz4pqg4gwqsky172c0kklypv8n0432dkhmcv14543"; depends=[deSolve HelpersMG polynom]; };
+  embryogrowth = derive2 { name="embryogrowth"; version="6.5"; sha256="1gbmrcjm8zwm01xq62wrkibmqnig904bnzrpar4d4qb98b6b3gp6"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="1.0.0"; sha256="0mldd0b8mh4q72r968kc2lyy97abkw1b7sm50za7ip3m2khzcrj8"; depends=[FNN ggmap ggplot2 gridExtra HLMdiag maptools moments MuMIn nlme openxlsx parallelMap reshape2 simFrame]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
@@ -4947,36 +5075,38 @@ in with self; {
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
-  emojifont = derive2 { name="emojifont"; version="0.4.0"; sha256="1g4bibrzjjgw3swzly590p9c1zipddzr8bgfydcqcbsqigzwvpj8"; depends=[ggplot2 proto showtext sysfonts]; };
-  emon = derive2 { name="emon"; version="1.3"; sha256="025pl4biwncwb5cfpm0mb1r7wjv6akg1qkzz0bfnbp44sl58kfsc"; depends=[MASS mgcv]; };
+  emojifont = derive2 { name="emojifont"; version="0.4.1"; sha256="1hq66sq5g7nmmakxbd2pdv62j1qsd3nq516pkz00i76fyrky8369"; depends=[ggplot2 proto showtext sysfonts]; };
+  emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
   emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; };
   empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; };
   emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
-  emuR = derive2 { name="emuR"; version="0.2.1"; sha256="0lfgv2lbzp8l6f51mdfx6y0dj26w74ych924mlbpi53vm3sqa266"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RSQLite stringr uuid wrassp]; };
+  emuR = derive2 { name="emuR"; version="0.2.2"; sha256="0g2448bx3p7brkzaj25wh96kv720ckbvqz6x6zc5vnsbg7rdl9il"; 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]; };
   enRich = derive2 { name="enRich"; version="3.0"; sha256="1ni2hkw0pq0mjjqd11qqrc3lbzyif84ljh9zrn2yil1qk2882r1n"; depends=[]; };
-  enaR = derive2 { name="enaR"; version="2.9.1"; sha256="1ryxzrdq9f88bvkyf6vdg61vfcjw1mj4dzzj8kliaf0h3ygzyaw1"; depends=[gdata MASS network sna stringr]; };
-  encode = derive2 { name="encode"; version="0.2"; sha256="0sv881rpbfq1843f6bfa54jlj8ayrznyqxa6j4ngpx7ynyj84qwx"; depends=[]; };
+  enaR = derive2 { name="enaR"; version="2.10.0"; sha256="09hzpmjbwg433b8ibrbvjzi8622cgfcq4rz194vq6qgknjr57z2j"; depends=[gdata MASS network sna stringr]; };
+  encode = derive2 { name="encode"; version="0.3"; sha256="0s2xva9yadk0s9x6kiwmh6bbq79aa1zx4gb5d1m7nbp2z8x4z77i"; depends=[]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
-  endorse = derive2 { name="endorse"; version="1.5.0"; sha256="0nyrcbrq8c5q2h45g1iz4n845kf3lvcwsj9j9ngkma17vbqf91hl"; depends=[coda]; };
+  endorse = derive2 { name="endorse"; version="1.5.2"; sha256="15yq3r3mdzyhn18b6z8lrad6flxsmwv8pl3ax26ggm4c8a5f54is"; depends=[coda]; };
   endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; };
   energy = derive2 { name="energy"; version="1.7-0"; sha256="1g4hqi6mgsnd1w4q7dd2m40ljh2jdmvad91ksbq9fscnrqpvji1x"; depends=[boot Rcpp]; };
   energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; };
-  english = derive2 { name="english"; version="1.1-1"; sha256="09g4srg9wkmr0w9yssp491g0fkripwlhp790mjwanb03wbvz8g2d"; depends=[]; };
+  english = derive2 { name="english"; version="1.1-2"; sha256="1wlqpl85rq49ndrfqlixayp4zzvpad0snln5qirr1i3y2q510dgx"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
   enigma = derive2 { name="enigma"; version="0.3.0"; sha256="0ld3jhxrpyrhjklwif4jf1rn9ykx218pqzn9bfl0qdxr6cr4hhwy"; depends=[crul jsonlite plyr tibble xml2]; };
-  enpls = derive2 { name="enpls"; version="5.7"; sha256="1c5brjddbaw4y23zpdaybkkgh4i2nsv5n5cvyv0jqi18qhx2s7rz"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
+  enpls = derive2 { name="enpls"; version="5.8"; sha256="1cgpwfv4xrnikkxxrswzvlzlr8dbwrx53wax3bdn14a3fivv1fgk"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
+  enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
-  enrichwith = derive2 { name="enrichwith"; version="0.0.2"; sha256="08kzj805mnxg23b3q5ayj8fp66qf5maiky1prv8mgxyays8yv4dl"; depends=[]; };
-  ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.3"; sha256="1iscg03v691cyfma3fs6xnj9chf5arlg61bggg2wmkczp7gnsi3g"; depends=[chron]; };
+  enrichwith = derive2 { name="enrichwith"; version="0.0.3"; sha256="161xlcsfzxf5l0wbswzc3ddl9vs13cmig90qfjrwi2f4f94v4pnb"; depends=[]; };
+  ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.4"; sha256="14zq22h8nna7j403c1x9py90fwas8fg0vq3im2zh31dyrk1j8d7k"; depends=[chron]; };
   ensembleMOS = derive2 { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; };
   ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
-  entropart = derive2 { name="entropart"; version="1.4-6"; sha256="0qvxwqg8fypc2q7a75s7ngqx5ga409p1iw1fdxp84xwdvgdcw07l"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
+  entropart = derive2 { name="entropart"; version="1.4-7"; sha256="18h8jzan7q9wkz0awpzlypvz8xzq7ak0j21jy7nk02k64v7zkpch"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
-  enveomics_R = derive2 { name="enveomics.R"; version="1.1.1"; sha256="0vz4cz52dx8r7zkgb3d8w2716g0g23rb638sf2b6asbfp2h2w5f6"; depends=[fitdistrplus investr modeest sn]; };
+  envDocument = derive2 { name="envDocument"; version="2.3.0"; sha256="151ibmkq63r7lvh5lrszy7wsmrygvr2789lhcfp11nw3d39b4rqc"; depends=[]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.1.5"; sha256="0zb7bl92n2h3hhrs7slbqizkjk0rg47lmahmrg9sk0px7ncbjhmv"; depends=[fitdistrplus investr modeest sn]; };
   enviGCMS = derive2 { name="enviGCMS"; version="0.1.1"; sha256="1wvanngizif7yx91f15v5mgs0dib01g440f4nvi0iid2hzx9ls4q"; depends=[mixtools rcdk xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
@@ -4986,7 +5116,7 @@ in with self; {
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.4.0"; sha256="0pa44wp8cq8xf2835k3gch0m40s7l7r9f0scyizk54nv6cdq88cx"; depends=[]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; };
-  epiR = derive2 { name="epiR"; version="0.9-79"; sha256="08gfy4ri4haxi82zs4xngrabimvajlrbw1s1dqwl0gfjz4zdklby"; depends=[BiasedUrn survival]; };
+  epiR = derive2 { name="epiR"; version="0.9-82"; sha256="0qsi5m39hkh1m3sk341cbd8gafr0rxy688vgkcxdk4wxfxvh3yrf"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
   epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
   epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; };
@@ -4995,21 +5125,21 @@ in with self; {
   episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; };
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
   epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; };
-  epitools = derive2 { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
+  epitools = derive2 { name="epitools"; version="0.5-9"; sha256="1lnwygbwpw0b29sxiz3wry2wf6k7kcjlb4c8bj02gyaxq7rssnzk"; depends=[]; };
   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="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; };
-  epxToR = derive2 { name="epxToR"; version="0.1-0"; sha256="1nvm9cr12lvh877xxiyii0gbfs6r0px76f5qlpn3pdlgj59msn3s"; depends=[httr XML]; };
+  epxToR = derive2 { name="epxToR"; version="0.2-0"; sha256="0rivlyvvj09ahph22aq8b7xabvagjjvwb9h908zwddzhh2hljj3h"; depends=[httr XML]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
-  equSA = derive2 { name="equSA"; version="1.0.1"; sha256="0sy1wfdr9p5m8hx0wbf4kzcfxmak2q6snaasp224agammslgyqyp"; depends=[huge igraph mvtnorm XMRF ZIM]; };
+  equSA = derive2 { name="equSA"; version="1.1.1"; sha256="101kvrna8pk1bv8zjih4f6v5chgypxc7nrwic6cwavdk49ihg8mk"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; };
   equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; };
-  equateIRT = derive2 { name="equateIRT"; version="2.0-1"; sha256="07kyy0adg42vzg26ssfwy5hiwggymbkkpvyczhzch4113lipz6pd"; depends=[mirt statmod]; };
+  equateIRT = derive2 { name="equateIRT"; version="2.0-2"; sha256="0dv7iszdmmx3hf7qhawlnx0lqf97k8y4zx8bmxyzmgj96k7db4h1"; depends=[mirt statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
   erah = derive2 { name="erah"; version="1.0.5"; sha256="00vygdrngbp53wip2x6dni3ygwax309i9si3gyqkxxbbkpv24b7i"; depends=[caTools HiClimR igraph ncdf4 nnls osd quantreg Rcpp signal XML]; };
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
   erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; };
-  ergm = derive2 { name="ergm"; version="3.6.1"; sha256="1gjl1gil4vkcwrbb1fcri3jkdqy1m3bqqinw2g3fnv69m2k38szh"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; };
+  ergm = derive2 { name="ergm"; version="3.7.1"; sha256="1hsl9fl1vzggarqk6sbfv3cjbbnxgfzblfmvhhmwngmracch3pci"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; };
   ergm_count = derive2 { name="ergm.count"; version="3.2.2"; sha256="1zg07vm5y6n6r687sbdy5hcinsircm4zzkx5w4849s9kwjlnpn0b"; depends=[ergm network statnet_common]; };
   ergm_ego = derive2 { name="ergm.ego"; version="0.3.0"; sha256="1152g9zz2wach0hbj27knxficvhf062alqa0wpj6nyqj2vsgnchh"; depends=[coda ergm network RColorBrewer statnet_common]; };
   ergm_graphlets = derive2 { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; };
@@ -5023,7 +5153,8 @@ in with self; {
   errorlocate = derive2 { name="errorlocate"; version="0.1.2"; sha256="1qlwdvy7i62hpnfrryzmqwmygxa8mjc7q92g6k5n9r2r179q7h09"; depends=[lpSolveAPI validate]; };
   esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
   esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
-  esc = derive2 { name="esc"; version="0.2.0"; sha256="0ihkmfw6h7lk3a1fzrgjpfz5dh8rfvpr1b7ijljnv7s8pa4yi5na"; depends=[readr]; };
+  esc = derive2 { name="esc"; version="0.3.0"; sha256="1wn4dy6xyxvdwfkwihq02lja6dd8wn9diypyrbkw3qvilb23hg4v"; depends=[dplyr purrr readr sjmisc tibble]; };
+  eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.2"; sha256="13b80bpnbrarazjvnpnk91ljjsqgfm2fm3gy66aj09cmmsmv199h"; depends=[]; };
@@ -5038,13 +5169,13 @@ in with self; {
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
   eulerr = derive2 { name="eulerr"; version="1.1.0"; sha256="00pblvyfhqcvbjwjkq237b7kj99vvkyclam9mpmgrd72wx6ryzr7"; depends=[assertthat lattice latticeExtra Rcpp RcppArmadillo]; };
   euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; };
-  europepmc = derive2 { name="europepmc"; version="0.1.3"; sha256="1mjrrz8xjizxvkmzidbwxs82ijaa70l39anaba8bi7vj8l2k64bm"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
+  europepmc = derive2 { name="europepmc"; version="0.1.4"; sha256="0kh61jmr2y0wjqch0jzk594anpwq56x9lhx6sx54y2pqjqw68b0i"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="2.2.43"; sha256="1h3vx0lf6kqvvhcj1ichzsvqhjmskcpvxd37hym6cwwgkkmxrzk3"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
+  eurostat = derive2 { name="eurostat"; version="3.1.1"; sha256="0k896b6q8cd9yh25czf7nswlzhrswl63qrybw27r4acp9kg91n2k"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
   eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.10"; sha256="0mwna7rjyrmc76651a1fm7c76ippdsc2wsp3sj3iwb1c73mvlqv1"; depends=[stringr]; };
   evaluator = derive2 { name="evaluator"; version="0.1.0"; sha256="00811idj3vx7x627dyw0i8qlbkscrdkxknwph4d4j8m49flh9j36"; depends=[dplyr extrafont ggalt ggplot2 magrittr mc2d pander psych purrr readr readxl scales stringi tibble tidyr viridis]; };
-  evclass = derive2 { name="evclass"; version="1.1.0"; sha256="1h0lqf6wixsbcs4hnpzsjhsj8fifh9z5r90zcwscj1vk7aqf9cwg"; depends=[FNN]; };
+  evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; };
   evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; };
   evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; };
   evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
@@ -5054,39 +5185,40 @@ in with self; {
   eventstudies = derive2 { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[boot xts zoo]; };
   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.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; };
+  evmix = derive2 { name="evmix"; version="2.7"; sha256="0x3m4lwpwcavr950q66p7bkimshnvav4842dr505g5rc9vkw9xxg"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
   evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
-  evoper = derive2 { name="evoper"; version="0.3.0"; sha256="1vbzlskb4l3mnxv8vkdqqrifldhcq053pfy927c0y7h5sfkfajra"; depends=[boot deSolve futile_logger ggplot2 plot3D reshape rrepast]; };
+  evoper = derive2 { name="evoper"; version="0.4.0"; sha256="11l55jj7f4ggwvimvl3d2sv2nyds29bl4dai6ycpgnff7wwdv43g"; depends=[boot deSolve futile_logger ggplot2 plot3D plyr reshape rrepast]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
-  evtree = derive2 { name="evtree"; version="1.0-2"; sha256="1izcv93irbi5zffyyzag2gcaf8zrhp2lkf3h68gb2jpf5x6wdw64"; depends=[partykit]; };
+  evtree = derive2 { name="evtree"; version="1.0-5"; sha256="06afqr0gsyh80f2j56vl4cbjsz5gpywri87ykfmf1wxls7jqxqac"; depends=[partykit]; };
   exCon = derive2 { name="exCon"; version="0.2.1"; sha256="0rblghg29azzbf8wq7wsypf9jprcy9a2063fhwn0lpxqqgbyzw8v"; depends=[jsonlite]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; 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-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exams = derive2 { name="exams"; version="2.2-0"; sha256="14w0m8jnnpbg153l0gq5lixw68ml3qvnnjyl4dbaiccm2as9spbn"; depends=[]; };
+  exampletestr = derive2 { name="exampletestr"; version="0.4.0"; sha256="1ywr9v7h1ghpkm51p06rlr88ihpaqj0d6j57aj95x808ykhlkkp5"; depends=[BBmisc devtools filesstrings formatR magrittr purrr roxygen2 stringr]; };
+  exams = derive2 { name="exams"; version="2.2-1"; sha256="0dz1ijdfikmxyrz33mz8qkf5kn9796c078ndqk5gfyyxl2jsj6jw"; depends=[]; };
   excursions = derive2 { name="excursions"; version="2.2.2"; sha256="1f6vvv33205lj6hsmmhx3q82mkhh0shzyk5hrwzf2nh1cn61w1x0"; depends=[Matrix sp]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.1.1"; sha256="0cxi8rcig03qwahdilawg4j3i9a8sv8sxgy0a68pxxmg556dwk0j"; depends=[foreach plyr]; };
   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="1.7.2"; sha256="1yyic21ng5wj61na3d3lw6r2y8iclfhhbkkcrkjy01mx3pp6iiac"; depends=[ape flexmix matlab mclust moments permute rJava]; };
+  expands = derive2 { name="expands"; version="2.0.0"; sha256="1ai269sic10hzw70whwv477yfgx5nhz4m06dfg373jp6i7vi5p9x"; depends=[ape flexmix matlab moments rJava]; };
   expectreg = derive2 { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[BayesX mboost quadprog]; };
   experiment = derive2 { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-3"; sha256="1gysdlr752f6caanhh1j6jhnplxb73qslink6n4fsv2qdxz0pfvf"; depends=[]; };
   explor = derive2 { name="explor"; version="0.3.1"; sha256="11qc96m0wapsmw9i1z4vgcjwnb5g8zr8mc3m1diiipb9hld4yn7x"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
-  expm = derive2 { name="expm"; version="0.999-1"; sha256="1d526dn1k9py1hiadnlp4a5dmxcfyfssh57f0v7hfy3gr9qmhn7a"; depends=[Matrix]; };
+  expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; };
   expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
   expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
   expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; };
   exprso = derive2 { name="exprso"; version="0.1.8"; sha256="1k3is8f4yfzzkcak9fmm2nk8vi85b0na5r96f3yjbc9qb0av9vb8"; depends=[affy Biobase cluster e1071 kernlab lattice MASS mRMRe nnet pathClass plyr randomForest ROCR sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.5.5"; sha256="1qpj6grmbld8q75kk8rj8l15vm4gqnpq8vbbc81415w3dw2phz84"; depends=[foreign]; };
+  expss = derive2 { name="expss"; version="0.7.1"; sha256="02033gqm2hsdjil8qf0458a4xg19bsp7pk06p3i92chdz4z534q8"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
@@ -5097,13 +5229,13 @@ in with self; {
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
   extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-  extraDistr = derive2 { name="extraDistr"; version="1.8.3"; sha256="0xrjcwvmmz5g68cm2q6imkjm3v6mb6xnkmf8svqkg1825hd18g34"; depends=[Rcpp]; };
+  extraDistr = derive2 { name="extraDistr"; version="1.8.5"; sha256="021sg4jkn817nvsi9z69pd96flk7az7qi8amgwfcpr15kjb8655n"; depends=[Rcpp]; };
   extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
   extracat = derive2 { name="extracat"; version="1.7-4"; sha256="1dply8sx9r9vshi5dycxs7bchf5g33qbq7w6i5w830glfy0lk3i5"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; };
   extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
   extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
   extremeStat = derive2 { name="extremeStat"; version="1.3.0"; sha256="1hj78ks4wfb0awkpg4qyrhy7f9rz0rxl9ddgsas3730snyfhspx6"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; };
-  extremefit = derive2 { name="extremefit"; version="0.2.0"; sha256="1zzwn6r6zmxzaiq4h5jclz4ys24j8ffzq194hkw72rzblyzj8gcz"; depends=[]; };
+  extremefit = derive2 { name="extremefit"; version="0.2.2"; sha256="1mkmb3rz0v2wm5m323xqaic628jv6xnlrx4cm2dpgsxj2mkznmg7"; depends=[]; };
   extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
   eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; };
@@ -5150,6 +5282,7 @@ in with self; {
   fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; };
   falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; };
   falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; };
+  fam2r = derive2 { name="fam2r"; version="1.2"; sha256="0pq5cmzwk3s8cz5x8dsfb2d6qfpapkrwbzvkqmqkhcwhwryy40mm"; depends=[Familias paramlink]; };
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
   fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
   fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
@@ -5177,10 +5310,11 @@ in with self; {
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
   fastcox = derive2 { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
-  fasteraster = derive2 { name="fasteraster"; version="1.0.4"; sha256="0xxfwgzf6xbk4sajchaz7wjppg6cs1vkb00wiwsqmjm2yr48yp0m"; depends=[Rcpp]; };
+  fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
   fastnet = derive2 { name="fastnet"; version="0.1.2"; sha256="124nbvxhrx2nnyzcbr602fpay1zq9fibg1k33f2pkl8pwk87s14q"; depends=[doParallel foreach igraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
+  fastqcr = derive2 { name="fastqcr"; version="0.1.0"; sha256="0hzlp66as7k0bh3biqkngacpkq1hi3y3gp6wg4c5476ywzm83gra"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
   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]; };
@@ -5192,14 +5326,14 @@ in with self; {
   fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
   fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; };
-  fcros = derive2 { name="fcros"; version="1.5.2"; sha256="0ggg8jyzdsy5ihhs4hqjjj5v0sh1ln4n7380b1z1rafjfr9j2hwv"; depends=[]; };
+  fcros = derive2 { name="fcros"; version="1.5.4"; sha256="112mgs69p3642rfk1w3dkkyn72icvda0asllanmgjym1lrzdp0lj"; depends=[]; };
   fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.3.0"; sha256="1ask7g6mqwx8r1hd9vxzdl96z0gyqprswjpfcl7l5l3611m7mzdm"; depends=[fda MASS mgcv nlme rpart]; };
-  fdaMixed = derive2 { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; };
+  fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
   fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; };
   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]; };
-  fdasrvf = derive2 { name="fdasrvf"; version="1.7.0"; sha256="0701ishhbxqjapin0c780m92pl02x4xvfvnsmydn0s6fqbxvxb1v"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo]; };
+  fdasrvf = derive2 { name="fdasrvf"; version="1.8.0"; sha256="1q38wbvpd8bp3dycvb476g92r9wdsms1h036li2c8z546f271jip"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; };
   fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
   fdcov = derive2 { name="fdcov"; version="1.0.0"; sha256="1m6yk6ngsxrz5mywp3vqhfjpkskrzgdyvqw7j8k2jgy4l0x04g5g"; depends=[corrplot matlab]; };
   fdq = derive2 { name="fdq"; version="0.2"; sha256="1iyplxm6niywfhmdnliy9nvvax1w6sijar8gpsj853cdfvn6kz5m"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
@@ -5216,31 +5350,31 @@ in with self; {
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
   feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; };
   fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; };
+  fetchR = derive2 { name="fetchR"; version="2.0-0"; sha256="1fwyv7wynchgyn7s0b4xdld5hk6clsfxhf33zk99vasgm615iizx"; depends=[plotKML rgdal rgeos sp]; };
   ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
   ffbase = derive2 { name="ffbase"; version="0.12.3"; sha256="1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5"; depends=[bit fastmatch ff]; };
   ffmanova = derive2 { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
   ffstream = derive2 { name="ffstream"; version="0.1.5"; sha256="1q07b1wdyhbvn3784lwwz3jk591cz1rv1jnf36q1piscsb3v7ayk"; depends=[Rcpp]; };
   fftw = derive2 { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; };
-  fftwtools = derive2 { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; };
+  fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; };
   fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
   fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
-  fheatmap = derive2 { name="fheatmap"; version="1.0.1"; sha256="1ir666zwlrw00c8pzm7np91n8qajc4w38pkmn2r12zpmcivqhvpk"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; };
   fields = derive2 { name="fields"; version="8.10"; sha256="1vr0iil04jcqgsm2s3cgcldg8p4jc6avwwp0zrsdixbr9rgqcz20"; depends=[maps spam]; };
   fiery = derive2 { name="fiery"; version="0.2.2"; sha256="1dinlrxal5rm16xvfripj8l3q15yfxkgj2qn2hihf03k0pj50lb2"; depends=[assertthat future httpuv R6 stringi uuid]; };
   fifer = derive2 { name="fifer"; version="1.1"; sha256="1gcv8ns4c1y3pjmixdm16raa5h6jqmc3i4m37ahj97l720j1f2ya"; depends=[fields Hmisc MASS party plotrix randomForest randomForestSRC rpart xtable]; };
   fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; };
-  filehash = derive2 { name="filehash"; version="2.3"; sha256="1nvf7qbnn6vjz68303xdm190iq0nwmmghyydcb4amx1ckbgric33"; depends=[]; };
+  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]; };
   filematrix = derive2 { name="filematrix"; version="1.1.0"; sha256="1z1nlpmckmh96zfc17gkgagagzz84ih6sjy4b8vfv1nzfipprsfy"; depends=[RSQLite]; };
   filenamer = derive2 { name="filenamer"; version="0.2.1"; sha256="0xahzjgwfpyln6i2szr985csw11w8wwk644sgclwly9l2yqzsi3i"; 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="0.3.1"; sha256="1vzvs43wzlivgyazinavxbhzca5ffz7a1q7hnbcl8mp1y9vnwski"; depends=[dplyr magrittr matrixStats ore Rcpp readr stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="0.4.0"; sha256="0n3h8ggbk44k08xnziq7rfwn0xx50izblxlhpv68bp6aaq1hs0by"; depends=[dplyr magrittr matrixStats ore Rcpp readr stringr tibble]; };
   financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
   finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; };
-  findpython = derive2 { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
+  findpython = derive2 { name="findpython"; version="1.0.2"; sha256="1x38dbxr6yvxy2z2fvv00y263g66ljbzf3a8znl2fywj462i92xk"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.4"; sha256="0raxsyni8kbq7q2sfkp4bx6mh8wdk9mxplzi4fbqcf78cxk9bla7"; depends=[]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
@@ -5248,19 +5382,19 @@ in with self; {
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
   fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; };
-  fishmethods = derive2 { name="fishmethods"; version="1.10-0"; sha256="1sr5f1yg55qirk9afamb7nq142y7l5j93c04a6xyhmkrgf5kcs0p"; depends=[boot bootstrap lme4 MASS]; };
+  fishmethods = derive2 { name="fishmethods"; version="1.10-1"; sha256="0578z2qpm3bi7wsh1f9ssvxjwc2k34rvagaxcg574rsw973pmsm5"; depends=[boot bootstrap lme4 MASS]; };
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
-  fit_models = derive2 { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
+  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=[]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-  fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.7"; sha256="1bam6hj3cqi5bw1zx4gkl62lzdy40pr3g7f6v36bwkczccasxrwr"; depends=[httr jsonlite stringr]; };
+  fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; };
   fitcoach = derive2 { name="fitcoach"; version="1.0"; sha256="1nnd7g093qjlbyrdai78gpbs0xjqlfdjn1v786v7966rzp83xfkg"; depends=[caret dplyr gbm ggplot2 httr jsonlite plyr R6 reshape2]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
-  fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-8"; sha256="0h6b5zp5z2g87vz1zv4k7b0rl8rh17vs2ca0i2v583v0b4si7hz4"; depends=[MASS survival]; };
+  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]; };
-  fitur = derive2 { name="fitur"; version="0.1.0"; sha256="1k4c6n36s324akscm0mkyw68hxmh52kh0l01kyw18mxlbr3d0rhq"; depends=[fitdistrplus]; };
-  fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.1.0"; sha256="0fcc8rq745nsghp27dk0lgih90y4zx8hrzcvsn6ih786yv7qxhvl"; depends=[]; };
+  fitur = derive2 { name="fitur"; version="0.2.0"; sha256="01jljffkfpzfhasywf1xslas5gsls5b864xjczws28ahy61jnz5b"; depends=[actuar fitdistrplus]; };
+  fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.2.0"; sha256="0w8m9g2y6282xlnais922n0jymv4zsh21z5lgqk8dzh1gpw3wbi2"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.4"; sha256="1hfh71s1qb0v7ip1v5gibgdpqq4sa3cz22kwszj1pprlfp711vvg"; depends=[BBmisc checkmate mlr]; };
@@ -5272,10 +5406,11 @@ in with self; {
   flexCWM = derive2 { name="flexCWM"; version="1.7"; sha256="0kgvj3l4cscr1p3305mnz42km5i8280wrvxp317dif3pvq7iigi4"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
   flexclust = derive2 { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
-  flexdashboard = derive2 { name="flexdashboard"; version="0.4"; sha256="0zb0k4mph4d9rqq655dj8mma51r77v716xrpwj4ypgs66ni08c1l"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
+  flexdashboard = derive2 { name="flexdashboard"; version="0.5"; sha256="1dv1h32diff7174mxw2n3l2216crnyb6c38qbrramhj5w72zf3da"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
   flexmix = derive2 { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.3.3"; sha256="0dkm2fdr76k2l6b02r9gxqm585x243cddvj14rw1gck570z6grnf"; depends=[Epi matrixcalc orthogonalsplinebasis survival]; };
-  flexsurv = derive2 { name="flexsurv"; version="1.0.0"; sha256="0lzcbfwxwvh7dm743mvmkz3d35z6gf0az4mn4x0sbv318j2bg0hr"; depends=[deSolve mstate muhaz mvtnorm quadprog survival]; };
+  flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; };
+  flextable = derive2 { name="flextable"; version="0.1.0"; sha256="05mhfpn99sn6gzrcmdx4xrrd6kwklfqvm8ckvp1zi0fxm5illw8q"; depends=[dplyr gdtools htmltools htmlwidgets lazyeval magrittr officer purrr tibble tidyr]; };
   flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; };
   flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; };
   flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; };
@@ -5294,10 +5429,12 @@ in with self; {
   fmdates = derive2 { name="fmdates"; version="0.1.2"; sha256="0j79a6dc9bxhfxki77fmvn36x73kgpqym1m46pj74jzyz32sb05h"; depends=[assertthat lubridate]; };
   fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; };
   fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; };
-  fmsb = derive2 { name="fmsb"; version="0.5.2"; sha256="0y3sx4lmn05rwaywlyckl3l8ds21p6zjbbw47zqlh0kgcbiv1q1a"; depends=[]; };
+  fmsb = derive2 { name="fmsb"; version="0.6.0"; sha256="1dn5a7pvfy0mil5f0wspaqiaq90ylhxw36cr42lk60irdgmmrsfj"; depends=[]; };
   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="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; };
+  fold = derive2 { name="fold"; version="0.1.1"; sha256="0n4wd918xbcjinf6bzjpq6afvdj1a965m17q96khr5yk0blc3qyd"; depends=[csv dplyr encode lazyeval 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]; };
   fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
@@ -5310,7 +5447,7 @@ in with self; {
   foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
   forecast = derive2 { name="forecast"; version="8.0"; sha256="0hmdas2vybv2057d33vqqsb4w9npn15a5kqcg2rvy0m2p0c66ibm"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="0.3.0"; sha256="1j5mfmdi6ky6ssai3lv2x7n09i93hpl5r1068qlm32mijf4yylbs"; depends=[forecast ggplot2 reshape2]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="0.4.0"; sha256="0gjjrq12b6r86asrawf4v7r13k1hv5q9km0g7fcjjinq3b32pn9r"; depends=[forecast ggplot2 reshape2 zoo]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.1-1"; sha256="1rmar6qfiw9hszwqp988csvwsq8q72d39a2xmr9yq36llnbg6i5p"; depends=[Rcpp]; };
   forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; };
   foreign = derive2 { name="foreign"; version="0.8-67"; sha256="1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd"; depends=[]; };
@@ -5318,7 +5455,7 @@ in with self; {
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
   forestFloor = derive2 { name="forestFloor"; version="1.9.5"; sha256="09xwk42qkwq47bpybnxbr1flraadmxp7bp9r1ii1zvmcp3zgxqcl"; depends=[kknn Rcpp rgl]; };
   forestinventory = derive2 { name="forestinventory"; version="0.1.0"; sha256="1hd56w1lzq6mfsikvcxdyh1l51fhw5wy9fy99v48i1hy87qx7p3d"; depends=[plyr]; };
-  forestmodel = derive2 { name="forestmodel"; version="0.4.0"; sha256="1csw85zmj39zk3qr0238xjxj9qvp4fda62cqiliy5qm3a68kgpk3"; depends=[broom dplyr ggplot2 lazyeval]; };
+  forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; };
   forestplot = derive2 { name="forestplot"; version="1.7"; sha256="0sxbh7chmy3aixvwks2mzzx0n6h9zkk6c4nsw3ihll213x8pph4q"; depends=[checkmate magrittr]; };
   formatR = derive2 { name="formatR"; version="1.4"; sha256="1fvynq0fj1r9grg9vvfdh5fl2riv6qki9f2rfpyvbvqq3xxpmi3f"; depends=[]; };
   formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; };
@@ -5332,6 +5469,7 @@ in with self; {
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
   fpc = derive2 { name="fpc"; version="2.1-10"; sha256="15m0p9l9w2v7sl0cnzyg81i2fmx3hrhvr3371544mwn3fpsca5sx"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
+  fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; };
   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.0"; sha256="1fpph63rzchy98v4skc396swbmmnpjmfkfidk9xs5mfibs66594b"; depends=[expsmooth fma forecast ggplot2]; };
@@ -5343,10 +5481,11 @@ in with self; {
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
   fragilityindex = derive2 { name="fragilityindex"; version="0.0.8"; sha256="07d7rx2iymp3w1rmzd9n2r8ydjldxxfpp8a56pw6srlnjj4xi80a"; depends=[pbapply stringr survival]; };
+  frailtyEM = derive2 { name="frailtyEM"; version="0.5.4"; sha256="0bc3cd5clk6mxrq8kra50bkj6wgl3q1mvbf1s5kz40xbra1kk5nn"; depends=[magrittr msm optimx Rcpp survival]; };
   frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.2"; sha256="0qsq96p29rxlfkhbmg8cfqdnpzh8wq2nadpiim9d6l0bs20r51gl"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.10.5"; sha256="1hlbbkagy1hy3yrlabq4r8rn0hzsyhabj0zfj6z37r4a3a0hp5fm"; depends=[boot MASS nlme survC1 survival]; };
-  frair = derive2 { name="frair"; version="0.5"; sha256="1fdyvv75mgdwn5csi2wgy4cadw753q941jzpycvjfln77n9nixci"; depends=[bbmle boot lamW]; };
+  frailtypack = derive2 { name="frailtypack"; version="2.11.1"; sha256="1gw0kpkf4a47j6m651nqqdrxxbcqfhy78623pfw1ag06w0kwip1p"; depends=[boot MASS nlme survC1 survival]; };
+  frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; };
   franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
   freeknotsplines = derive2 { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
@@ -5356,18 +5495,18 @@ in with self; {
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
   freqdom = derive2 { name="freqdom"; version="1.0.4"; sha256="0flx4316q8m9v5zy8bxjp18a25p1vwq6wvfs81r0g609ag54vy5b"; depends=[mvtnorm]; };
   freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; };
-  freqweights = derive2 { name="freqweights"; version="1.0.2"; sha256="183x94j727z6phayy0zy9q4x5fnww8h51ghpmc6jbwc5r40vp4px"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
+  freqweights = derive2 { name="freqweights"; version="1.0.3"; sha256="1yp1msb9mmndi0snchmbi3ssqnshjmn3sllmq7l5ipk9si6h3062"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
   frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
   frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; };
   frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; };
   frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; };
   fromo = derive2 { name="fromo"; version="0.1.3"; sha256="132i9z8zwjm8a7fw5mdqq0a3q8hd985mrifg67lddqkxwgc8lxcc"; depends=[Rcpp]; };
-  frontier = derive2 { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[Formula lmtest micEcon miscTools moments]; };
+  frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; };
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
   fscaret = derive2 { name="fscaret"; version="0.9.4.1"; sha256="19g0vcgbq3l9b9x264jg5q17lrky7xrznc8wjxkvnjqdykjmzjhp"; depends=[caret gsubfn hmeasure]; };
   fsia = derive2 { name="fsia"; version="1.1"; sha256="18pblp22rfaklv283515qrx8liaqf84mm8gw9pj70qi068nw36x8"; depends=[]; };
-  fslr = derive2 { name="fslr"; version="2.0"; sha256="010kd7h5dfqqq4vxhkyf11sg8aj5jhk92953y0jfln24z6qbkz5m"; depends=[matrixStats neurobase oro_nifti R_utils]; };
+  fslr = derive2 { name="fslr"; version="2.12"; sha256="1ivjza08qxa8dfgyvcikrggivzd1kb2anqj907hj5g8rsqfjdrrs"; depends=[matrixStats neurobase oro_nifti R_utils]; };
   fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
   fst = derive2 { name="fst"; version="0.7.2"; sha256="1y2yzx8bwn747vibi0dds1m1rwyy588nppvbgp4bars1w3h4pps5"; depends=[data_table Rcpp]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
@@ -5376,13 +5515,14 @@ in with self; {
   ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; };
   fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
-  fullfact = derive2 { name="fullfact"; version="1.1"; sha256="1pnz1gykmvxdwf1a3n1z4v9md6kjlai4fvzqjzcyshw5nq81dciw"; depends=[afex lme4]; };
+  fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; };
   fulltext = derive2 { name="fulltext"; version="0.1.8"; sha256="14gvhjc9433hnb5dh88svxyahbcv968njxjfwgc5ii9lpcpw5935"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; };
   fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
   funData = derive2 { name="funData"; version="1.0"; sha256="13f6jlw3g7glz5anlwmj7g64kia18ldm3nfj55qybjfh4b6rh7v3"; 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.1"; sha256="18lhvp0i7lfbhyg4ry24qk06nfmsqlgb8qr1ag7hwwsxxssjhmxb"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander RColorBrewer reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.6.2"; sha256="1ivsh5ilzxjsi8365cpvz72kh4vk4cg842bmc1dxazyrnwanilbv"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander RColorBrewer reshape2 ROCR scales]; };
+  funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
@@ -5391,20 +5531,21 @@ in with self; {
   funrar = derive2 { name="funrar"; version="1.0.2"; sha256="0qxhlqc1i0w91xmqawbsqk7gh8fdxq165qrjkbprsw548p5jbdbn"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="4.0"; sha256="0a0xpybalk38p3n0fd5f3g4yav99j6ck03d1pkx0w2yqqxnviqhw"; depends=[dbscan Jmisc Kendall]; };
-  furniture = derive2 { name="furniture"; version="1.4.1"; sha256="1bziqav2y7h7fkv84ci3p483zbn2rw0wr0cz6jc5a9h8g1gz80cl"; depends=[knitr]; };
+  furniture = derive2 { name="furniture"; version="1.5.0"; sha256="1x0r22hblqlbialpp9vr41ngyrcffqy86d79vhazk3lcdks5hh1s"; depends=[knitr]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
   futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; };
   futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
   futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
-  future = derive2 { name="future"; version="1.3.0"; sha256="00ys5h583s9kr415l6mv79k2s63b13jk7kjrvfmzskzvxrgqizm4"; depends=[digest globals listenv]; };
-  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.13.1"; sha256="0w3mbrqxy7w7rl2blka81djmlgj6yffxssn56f0xfwfwhbhsn1pc"; depends=[BatchJobs future R_utils]; };
+  future = derive2 { name="future"; version="1.4.0"; sha256="05lbagy57bazm991pm3p76d5w627cxhyrsjl18h001xvqv7k1hix"; depends=[digest globals listenv]; };
+  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.14.0"; sha256="155dvfrw94bki0z5aavyxahw3ks70aadw47gi9a9432dfxr2fmjg"; depends=[BatchJobs future R_utils]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
   fuzzr = derive2 { name="fuzzr"; version="0.2.0"; sha256="0m5x3khps7mk43xvk76jqylcxs9581y1ppr58bq68j4rqraq3r1s"; depends=[assertthat progress purrr]; };
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
-  fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; };
+  fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.2"; sha256="11lgv9faq1avgvb58br2dbd46k7449v3y5cv0cjmlj63a6357lqw"; depends=[doParallel doRNG foreach ggplot2 randomForest]; };
   fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.2"; sha256="1anipzcr5j5vp9p8hy16vdc7rf8kd0nm5r72j9998npad7k5xj8d"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
+  fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.0"; sha256="1ihbj0ydzy9lb79irgnfbgcnvxlhif8b02bdp5ajahg12brghvkb"; 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]; };
@@ -5423,9 +5564,9 @@ in with self; {
   gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
   gRapHD = derive2 { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[graph]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
-  gRbase = derive2 { name="gRbase"; version="1.8-1"; sha256="07b5vl55v04ycwwh92xp86c12kxvhrlbakjrlxrlq8i8drs3bpcj"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
+  gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
   gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; };
-  gRim = derive2 { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRain gRbase igraph Rcpp RcppArmadillo]; };
+  gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
   gSeg = derive2 { name="gSeg"; version="0.3"; sha256="0dcvnxldvxmmzaz4cqpr40jpmny5l012m6j7xd5954bgfg06gs7w"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.1"; sha256="19037qn7q92dykry4wrnbdg7irkzk2vwz1j0kq2r836m03bs04nc"; depends=[]; };
@@ -5465,27 +5606,27 @@ in with self; {
   gamreg = derive2 { name="gamreg"; version="0.2"; sha256="0k6npl5m1i22lgdvfjnv00pxaxh7qfd6sddy6raf4j33i6hp6ff6"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; };
   gamsel = derive2 { name="gamsel"; version="1.7-3"; sha256="02j94va7srdb2wzj4f1b63qx9mlck0harsq140ndjgf9d9c44h01"; depends=[foreach mda]; };
   gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
-  gap = derive2 { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; };
+  gap = derive2 { name="gap"; version="1.1-17"; sha256="0pkimpjrdbz04yh2z9n3hbhn4gkpwgx5w9nkj8zqv773qsdj8h5c"; depends=[]; };
   gapfill = derive2 { name="gapfill"; version="0.9.5-2"; sha256="1qmkr0yvc9akjaj30lxq2b4xrkxvdlmbkpk5zy89xvj6qnpdpb47"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
   gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
   gapminder = derive2 { name="gapminder"; version="0.2.0"; sha256="1fxjz8lr3bsj3vml4yvm8pm72wpmw7c97bgp7acjf0q7l9x0d4vq"; depends=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
-  gasfluxes = derive2 { name="gasfluxes"; version="0.2"; sha256="01mqqj49p8z1m580a9fjrifyd7q2nl2qh8p3bxi2qqw38jxaccql"; depends=[AICcmodavg data_table MASS sfsmisc]; };
+  gasfluxes = derive2 { name="gasfluxes"; version="0.2-1"; sha256="0cdqyyqb5dcn5978jmwmf06d9jcga5ma72zf3cdz72hbcil4f93k"; depends=[AICcmodavg data_table MASS sfsmisc]; };
   gaston = derive2 { name="gaston"; version="1.4.9"; sha256="13fb67lq30rv91q5ffwijm011dqflrvywlcd0s2caims6zsarbvz"; depends=[Rcpp RcppEigen RcppParallel WhopGenome]; };
-  gatepoints = derive2 { name="gatepoints"; version="0.1.2"; sha256="03m84xixsardy4yjzf67qway07hwhjpzc92xgvg9kb7npiclq5bl"; depends=[]; };
+  gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; };
   gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
   gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; };
   gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
-  gazepath = derive2 { name="gazepath"; version="1.1"; sha256="0zq7bcld41737qk94gjbcphpirrnnf8k6z3f8l3jay2n47yn4gji"; depends=[jpeg scales SDMTools shiny zoo]; };
+  gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; };
   gb = derive2 { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
-  gbm = derive2 { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[lattice survival]; };
+  gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
   gbs2ploidy = derive2 { name="gbs2ploidy"; version="1.0"; sha256="0gdjfqs9ccyaw7vi22wbyc742n1badr5ypr08g6rvi8ka5lmx836"; depends=[MASS rjags]; };
   gbts = derive2 { name="gbts"; version="1.2.0"; sha256="1v8x4dnja8va28rjznyqa6js9wazndijasb95lfj2qwhxhgf5h65"; depends=[doParallel doRNG earth foreach gbm]; };
   gbutils = derive2 { name="gbutils"; version="0.2-0"; sha256="1hi2kq4m7lrhd9yikf4qb0xccr6v1pp7kmly5j68xd3m95fi86rc"; depends=[]; };
-  gcKrig = derive2 { name="gcKrig"; version="1.0.1"; sha256="1iqbhfw4ib3lgjbaspjdh2qxif1inwly9fi8hyf4x6a153f20502"; depends=[Rcpp RcppArmadillo]; };
+  gcKrig = derive2 { name="gcKrig"; version="1.0.2"; sha256="084rxc5dmnn1gdvfdhy48fyqrbcbbrjgs9sziv55c9r85hvn086c"; 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.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
   gcerisk = derive2 { name="gcerisk"; version="16.1.3"; sha256="0bjd3paxf1jrirv2grq20rk40l7izbw2y2dnj687hwcgah5021gv"; depends=[cmprsk ggplot2 survival]; };
@@ -5497,14 +5638,15 @@ in with self; {
   gdata = derive2 { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
   gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.3.1"; sha256="10lb4lk4gx26ksr1njfqg13by1mam609ysi5k44pfj55mwna7k9r"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
+  gdm = derive2 { name="gdm"; version="1.3.2"; sha256="1fr9cgsw158zkvw5dsabyf5jhgrwp8k4qk43g9mhdp82szma759k"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; };
   gdns = derive2 { name="gdns"; version="0.2.0"; sha256="0cyyqmbdd520h8q6b9dficgh1vc8zf47bih72zdqbz2hrkjm4yc4"; depends=[httr jsonlite purrr stringi]; };
   gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; 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.3"; sha256="1prh814lw3qkgnf0760cvpic1k68jhlkpcxlksv8chjkvsrnnf09"; depends=[Rcpp withr]; };
+  gdtools = derive2 { name="gdtools"; version="0.1.4"; sha256="0l8c4bh6765x9s6rw3mfm1bgicdzdngir1kxh9pxx4sidrdndcip"; 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]; };
   geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; };
   geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
@@ -5513,7 +5655,7 @@ in with self; {
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; };
   gemlog = derive2 { name="gemlog"; version="0.20"; sha256="1f36p2ggba2rkkp7i6y9sgwjg2ygjhb01ww8adfivksgj103ww8v"; depends=[signal]; };
-  gems = derive2 { name="gems"; version="1.1.0"; sha256="1ydc0qj9xhhshgpyd4f8l7ljk6mszn2n1sg9s5l4c4y87br2rfyn"; depends=[data_table MASS msm plyr]; };
+  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]; };
   gemtc_jar = derive2 { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
   genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
@@ -5551,21 +5693,23 @@ in with self; {
   geoGAM = derive2 { name="geoGAM"; version="0.1-1"; sha256="04qgkbqjzvm9pxazj96716hf5cviy08a12r782id77l61dd9ya3s"; depends=[grpreg MASS mboost mgcv]; };
   geoR = derive2 { name="geoR"; version="1.7-5.2"; sha256="1sy968x154bsc3i3a6mxcwnyixcnmab5bc07dgibi9vzn0nkbbpb"; depends=[MASS RandomFields sp splancs]; };
   geoRglm = derive2 { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
+  geoSpectral = derive2 { name="geoSpectral"; version="0.17.3"; sha256="13638j70j30icydcb0rydmdnmswf15skk646zra5y68n46mjvl68"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
   geohash = derive2 { name="geohash"; version="0.1.2"; sha256="1vwalnf5cbpbq5b68zc6qa8mm84v5zlb8s2pwg7j2f7s43y0mgwz"; depends=[Rcpp]; };
   geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
+  geojsonR = derive2 { name="geojsonR"; version="1.0.1"; sha256="0jjn1pknvg0kkq1jw4blf4ykfps4gcmhaz9piwmrg1hzfdfvf2zm"; depends=[R6 Rcpp RcppArmadillo]; };
   geojsonio = derive2 { name="geojsonio"; version="0.3.2"; sha256="10rnp4ws3465p8jv6b15zbl662swd373nmlbxxk3n8dy7049qwpj"; depends=[httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
-  geoknife = derive2 { name="geoknife"; version="1.5.2"; sha256="19adj5v14cxi32iadi4xlbg8f94vx4ail7454i4jj61i9a426ag1"; depends=[curl httr sp XML]; };
+  geoknife = derive2 { name="geoknife"; version="1.5.4"; sha256="09b3i67x6mr6wd4wrhyn7bngjqlsp4wv27dqsb4a4xv76kfxv30j"; depends=[curl httr sp XML]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
   geomorph = derive2 { name="geomorph"; version="3.0.3"; sha256="0nxbd2gsi9nd61blslq9jdg1y7n14yhdgkrnjg9cxqsmjg9d9gf4"; depends=[ape geiger jpeg Matrix rgl]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
   geoparser = derive2 { name="geoparser"; version="0.1.0"; sha256="0gz808bab1axncccigs0ahvk3h2d3b77dwfhw2631fp6l706r839"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
-  geophys = derive2 { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
+  geophys = derive2 { name="geophys"; version="1.3-9"; sha256="05q42b1pqfihamxbh5s5kxkrslr84j5p6y1cybmcl31z9dg92ccl"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
   georob = derive2 { name="georob"; version="0.3-3"; sha256="0a4v0ik05bxzg9rxzwa1s2adm9ja9mzxh897kjxdk5qv9y5pgrkm"; depends=[constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
   geosapi = derive2 { name="geosapi"; version="0.1-0"; sha256="04qab7qs22f1havziv5ynmrmdvi8539gjyfl83x5w5l44rjrx7lb"; depends=[httr openssl R6 XML]; };
   geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
@@ -5581,7 +5725,7 @@ in with self; {
   gepaf = derive2 { name="gepaf"; version="0.1.0"; sha256="0ld7r0dkap7bpmb2fc8x0pzffvnlzp2q1bndx4l2ffiyygsq6f72"; depends=[bitops]; };
   gesca = derive2 { name="gesca"; version="1.0.3"; sha256="1xr9kls6wdd1lnk4nrwix5p0dl93rl1zd3x88c0qyxzp11m2pcsf"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.4"; sha256="1j5l4ig1cwxbl2si0kq4b7jv5r9ma4df2zbsw81z9lnkykc638g5"; depends=[curl dplyr plyr purrr raster tidyr]; };
+  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.5"; sha256="0zbazv0xy8gx3cmhi9dbm01lgw0l3snawa2x0bmmxmv2dsxym9y9"; depends=[data_table dplyr httr plyr rappdirs raster tibble tidyr]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.1-1"; sha256="14s8s3zrl5iwr7pw000b8mwxy17caf42yl0lf56b3qa71ifzxbnc"; depends=[rstudioapi]; };
   getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; };
@@ -5590,9 +5734,10 @@ 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.3"; sha256="1s6s0ng940spj1056z8jd0p3i34kzr1skzjr8w64x20kps1rvl9l"; depends=[httr jsonlite rvest stringi V8 xml2]; };
+  gfer = derive2 { name="gfer"; version="0.1.6"; sha256="1lg6r4ymiaix24vg8jz3a4yb07fib9cxmyfblmvwxgdmflbswxad"; depends=[data_table httr jsonlite rvest stringi V8 xml2]; };
   ggCompNet = derive2 { name="ggCompNet"; version="0.1.0"; sha256="1199n4s2rh5zg001l3j8wmc6fxkbkk5vzp4q5kg661k3khgx0hd5"; depends=[dplyr geomnet GGally ggmap ggnetwork ggplot2 gridExtra igraph network progress readr scales sna tidyr tnet]; };
   ggExtra = derive2 { name="ggExtra"; version="0.6"; sha256="1f91hvay4r0ikn87n6grxl0s7c542rxg2h61s3k8qzrzshy1wnkj"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; };
+  ggQC = derive2 { name="ggQC"; version="0.0.1"; sha256="0sf7hq69nzdhbrx3rhw92mxqq3cm2wqa79csp9lsvx97gwb60sfl"; depends=[ggplot2 plyr reshape2]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
   ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; };
   ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
@@ -5600,16 +5745,17 @@ in with self; {
   ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.5.3"; sha256="1jgp55rvmzc4agcrlsjn8m5lk85di9c4wj94xzikqkql4lvq3qpd"; depends=[beeswarm ggplot2 vipor]; };
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
-  ggdmc = derive2 { name="ggdmc"; version="0.1.3.5"; sha256="0idsmviv1znkgi5yzwbj7wnn7hy9jk83jwjzsh7h205gbkzqjn90"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
+  ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
   gge = derive2 { name="gge"; version="1.1"; sha256="04212spczyr2vqxki0n82ml26mgiq29i6mxyh06v42lqpg39sx19"; depends=[reshape2]; };
+  ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
   ggfortify = derive2 { name="ggfortify"; version="0.4.1"; sha256="19jwcz1z6g7l65l6cj8zspypfb86pn3x18vzdcgf932n14g646d2"; depends=[dplyr ggplot2 gridExtra scales tibble tidyr]; };
   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]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.1"; sha256="1h8qkagsfhk5gba7jgzwrvc6hrc492pp34kmzgr3n8d8bjzj45a3"; depends=[ggplot2 ggrepel]; };
-  ggimage = derive2 { name="ggimage"; version="0.0.1"; sha256="1jy4zg3ipbqsj6kj87crkb26wjlwcbipkh3yjhp8fsx4cqdcdrz7"; depends=[EBImage ggplot2]; };
-  ggiraph = derive2 { name="ggiraph"; version="0.3.2"; sha256="07r5kf2ky6b09hvd3zdahl9b9v2509k4yxf10mw6hag2bb4lmgcz"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; };
+  ggimage = derive2 { name="ggimage"; version="0.0.4"; sha256="1r9rl3sw5frncsq091924p5lk9z11inpvdk39byzabz2ybi6wzp8"; depends=[EBImage ggplot2 gridGraphics scales tibble]; };
+  ggiraph = derive2 { name="ggiraph"; version="0.3.3"; sha256="0jiz51c9pzs7q8m2gnv3dzkiakr640bg61wayfbd4rq5y9b4ghan"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; };
   ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; };
   gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
   gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; };
@@ -5624,14 +5770,16 @@ in with self; {
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggpmisc = derive2 { name="ggpmisc"; version="0.2.14"; sha256="0747jmf8zvqc6zzglbpr2vizcy905zgc9hgdabgdkg4zhhmlcqys"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
-  ggpubr = derive2 { name="ggpubr"; version="0.1.1"; sha256="1r1hhlw2zz1n1grwddd45sssdgrv43wf4dj9vjdryssz44rvxs85"; depends=[ggplot2 ggrepel ggsci plyr]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.1.2"; sha256="1zh3c2w95s7pcnrlzawm7wjk9vab3dycb1x50594q3kf3bz4jiwv"; depends=[ggplot2 ggrepel ggsci plyr]; };
   ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
   ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; };
   ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; };
-  ggsci = derive2 { name="ggsci"; version="2.0"; sha256="1045yi825lynw074cqi7r596ldbn7snj0rzdqcb5iwl5cn2s7gcw"; depends=[ggplot2 scales]; };
+  ggsci = derive2 { name="ggsci"; version="2.4"; sha256="003gnm9kbip6days1rrkv3a31xmfia8yqql0qq4fis7yfs0w30ln"; depends=[ggplot2 scales]; };
   ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; };
-  ggsn = derive2 { name="ggsn"; version="0.3.1"; sha256="1q1bba9pcr51m7hxz07d0ycbl93ln4cgkkw17acbfipmbaack5f0"; depends=[ggplot2 maptools png]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.2.0"; sha256="0x0q7sa3i4z52wifbpi5q7hwqw79cz599f3mcln8qkd8fkz7fg96"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; };
+  ggsignif = derive2 { name="ggsignif"; version="0.1.0"; sha256="0dxb6rh1i7c72lfyvcimian8pnryarh19wprxxzm3lv3812jgsyp"; depends=[ggplot2]; };
+  ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; };
+  ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.2.1"; sha256="1q8l5zfkv4jzacb8pp7b2yp99ack4by4z2iw9l4j2n689v9wjs40"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="2.2.0"; sha256="0ddcbbgp8ni3zbz4ailqx79i16aa2x4z4gvz55f0b731bilczw86"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
@@ -5641,13 +5789,14 @@ in with self; {
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
   giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
-  gimme = derive2 { name="gimme"; version="0.2-0"; sha256="0x2j4041rah6bi99z8syypg3w8zzkdkxymmdz33rgc7azx799cps"; depends=[gWidgets igraph lavaan qgraph]; };
+  gimme = derive2 { name="gimme"; version="0.2-1"; sha256="0h00hf27pbn7p1cp7n5j4nsdh8d372xkwian48xxpb1a7800afw3"; depends=[gWidgets igraph lavaan qgraph]; };
   gimms = derive2 { name="gimms"; version="1.0.0"; sha256="0f959gr4nzf9p2gpvdrzlndp24g2hhzc0wbkgpbs056wp8ij0mws"; depends=[Kendall raster RCurl zyp]; };
+  giphyr = derive2 { name="giphyr"; version="0.1.0"; sha256="0qwhsggqpd88vgifw6nab255cvkqq2bjp2ngfl0wl4ify2dxxwmh"; depends=[httr miniUI purrr rstudioapi shiny tibble]; };
   gistr = derive2 { name="gistr"; version="0.3.6"; sha256="1rajdfb8zkx444v89iapzrdad8y81rhd9q9nwcxw03jig4xm48mb"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.18.0"; sha256="0bgzdsdi9n6l8pchivs6a2g4ksa56qs8hygpyv2c0ndqmx4jxcwi"; depends=[]; };
   gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.1"; sha256="0vcc1s4ywaz8fjsg99knlxms4505wpvl08g48ndxcp3fqzvfc8i7"; depends=[curl data_table devtools httr jsonlite]; };
-  gitlabr = derive2 { name="gitlabr"; version="0.6.4"; sha256="1x1s2wcfgzxbqjrrn9f5003q5x4ri19r6gbkd55qgqxnc1cg27gb"; depends=[base64enc dplyr functional httr magrittr stringr]; };
+  gitlabr = derive2 { name="gitlabr"; version="0.7"; sha256="17l9y7ci4zl4r2j3g6m2jwl0wh5bi0w2pikrayhyda5137hf5lws"; 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.1"; sha256="12r7amkzvklj4b52199hwwxgimvqgnbnylzdkxgfql9n8zcbgx3j"; depends=[MASS RANN Rcpp RcppArmadillo]; };
@@ -5659,7 +5808,6 @@ in with self; {
   glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
   glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; };
   gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; };
-  gldist = derive2 { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.3"; sha256="1f3c4c8jjfslp5wc4mc3sc64qpin8bswz1fnv5zqg8dr4j8afq10"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
   glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
@@ -5687,11 +5835,12 @@ in with self; {
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.8.0"; sha256="0882vpjsl9f5jld3bldgl6y1kdncl9gk3m6amigmpgcd9a6v7pm2"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.10.0"; sha256="1vxp4lliihjd9p5d5yaf4dqvj0hmr8nzpxayscdckcxq6jr2p34i"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.1-2"; sha256="11y3dbi3x3idlwhzr5s2g976myci91l1qlsfyny732gb7q32c79w"; depends=[]; };
   glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; };
   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.0.0"; sha256="03xvs0xana2hwk5di3pydllw0jdvdmjgxv26rx2fm97glcgnk8hk"; 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]; };
   gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; };
@@ -5701,14 +5850,13 @@ in with self; {
   gmm = derive2 { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-1"; sha256="0pdbky9gm8s3dvyg6z7pvn7wzqlbvdg7y0py9kcwfxxjvwcp1qwh"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
-  gmp = derive2 { name="gmp"; version="0.5-13"; sha256="0gng529l8nkazrlypsmc50gd0sn8zgkw7xc2ymrwkykiv1lcwdv2"; depends=[]; };
+  gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; };
   gmt = derive2 { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
   gmum_r = derive2 { name="gmum.r"; version="0.2.1"; sha256="127h76nm99ldpaznys5y4rnrvq0kh5pcsjmw21hz79a8rjni7r16"; depends=[BH ggplot2 httr igraph Matrix Rcpp RcppArmadillo SparseM]; };
-  gmwm = derive2 { name="gmwm"; version="2.0.0"; sha256="1cjmd0758ggjkpf5mkfdhwl121yv84gm1cwg6b2c1r8pd3wcqx57"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 scales]; };
   gnlm = derive2 { name="gnlm"; version="1.1.0"; sha256="0fv89cvbnp9n3lgg6y4sqmz9jzcgwj7vd92rwg7hixwrjyqpan4z"; depends=[rmutil]; };
   gnm = derive2 { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
   gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; };
-  gnumeric = derive2 { name="gnumeric"; version="0.7-6"; sha256="0d8igplypw40kshg9skij0cymc6j5hmbmqhbfpm0v2q3kw5r9d3p"; depends=[XML]; };
+  gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
   goalprog = derive2 { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
   goeveg = derive2 { name="goeveg"; version="0.3.3"; sha256="1p66fc1vr09zxp1h81b8by2cldxn0q8vivcc5g3pggb65d9wj846"; depends=[fields mgcv vegan]; };
   gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
@@ -5716,12 +5864,11 @@ in with self; {
   gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; };
   gofastr = derive2 { name="gofastr"; version="0.2.1"; sha256="1a291bddhzk0wxrmk9dpiiv93h6si8s19v00wmypw0jfbrjhlc53"; depends=[data_table quanteda slam SnowballC tm]; };
   goft = derive2 { name="goft"; version="1.3.1"; sha256="079p0l4w630j87h0xwk3wxpnd5779by507mffkwgj4qx4ljjfnqr"; depends=[fitdistrplus]; };
-  goftest = derive2 { name="goftest"; version="1.0-4"; sha256="0rp8qlcv0az49gxplxycz4q9l66z8y69jg4kwzfn78l5z6qdvq5s"; depends=[]; };
+  goftest = derive2 { name="goftest"; version="1.1-1"; sha256="183imn6dy28ama8bywxgyh32vgakv7bsbz4k5qbhnlhqdvzv2v6v"; depends=[]; };
   gogamer = derive2 { name="gogamer"; version="0.4.3"; sha256="0p11pxwc4vnmf2hh0zxv99qlqkqiszqawh8scw4v861i8ihp84iz"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp scales stringr]; };
   gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
-  goldi = derive2 { name="goldi"; version="1.0.0"; sha256="1asn5r8klmpizmp8bfapfy5vraf7sxswm3fky6473hxajz4hyfvw"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; };
-  googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.3.0"; sha256="1zjldi93g5871dw1vdxriw08rz5hrmpx530r76s6r0rlijs9lwal"; depends=[bigQueryR dplyr googleAuthR googleCloudStorageR jsonlite magrittr shiny tidyjson]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.5.0"; sha256="0fk0rijn3529v918chpygvlkigj31dpimdfnkmhsgcznfarkc598"; depends=[devtools formatR httr jsonlite miniUI R6 shiny testthat]; };
+  googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.4.0"; sha256="01dl76ggzkcik4jq0q3fmy9jnbd6ly7npbrffph2ir7cqnpzvyl2"; depends=[bigQueryR dplyr googleAuthR httr jsonlite magrittr shiny testthat tidyjson]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.5.1"; sha256="1ba8a4yc6l3ycamcqqq7mwqi9bw4y1xb29svww9gzha3yngy3740"; depends=[devtools formatR httr jsonlite miniUI R6 shiny testthat]; };
   googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.2.0"; sha256="02l3jml2sqw4m7fralr3dzyk06h8jinn6bi54gwc02f1y84j8qfh"; depends=[googleAuthR httr jsonlite readr testthat]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.1.0"; sha256="173y7m2j6iw848djjawkiy22fg56hnpx0m0q1halzwycqx6z08vc"; depends=[future googleAuthR jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; };
@@ -5735,7 +5882,7 @@ in with self; {
   gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
   gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
-  gpg = derive2 { name="gpg"; version="0.4"; sha256="081b2s491hcy2azyqwlzr5xh5bbvinhnlqr21w6w02rxvib6p3jj"; depends=[curl]; };
+  gpg = derive2 { name="gpg"; version="0.5"; sha256="1l13wwmhayyhgl2m3r5f5p3m3y3z3pcj38liywx6a24hpxmir7pp"; depends=[curl]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
   gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; };
   gplots = derive2 { name="gplots"; version="3.0.1"; sha256="02nb8n3s7c1zxq2s7ycaq2ys72y7mzirxrwj954h6gdc4x1zhg9l"; depends=[caTools gdata gtools KernSmooth]; };
@@ -5746,18 +5893,20 @@ in with self; {
   gputools = derive2 { name="gputools"; version="1.1"; sha256="0np1lndvppdi409a1kfbbl0z5hr8wg2q473jch58zd16d2ickwkb"; depends=[]; };
   gquad = derive2 { name="gquad"; version="2.1-0"; sha256="0s7crpirscbij2y25scwzb9fyp9ych1n80fij2ajda9zaqcyyin8"; depends=[ape seqinr]; };
   grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
-  gradDescent = derive2 { name="gradDescent"; version="2.0"; sha256="0qfm9vzi8j083na5ziwjypycbw6ncwk75xsaam2vc4xhfarw8fjs"; depends=[]; };
+  gradDescent = derive2 { name="gradDescent"; version="2.0.1"; sha256="0kxyvr30hygg82s5m7nng02fvn6nak43y2v18445xbb05y6f5gmx"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; };
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
   granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
+  grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
   graphTweets = derive2 { name="graphTweets"; version="0.3.2"; sha256="13kab1nz85ghs5n882ss513di30b7lg72h676v37404ypj5a1vi1"; depends=[dplyr igraph reshape2]; };
-  graphicalVAR = derive2 { name="graphicalVAR"; version="0.1.4"; sha256="09qrndfxxjfc8l2g6p4si6w9khz0gjmr7fisbvw395bf2vxvd47i"; depends=[dplyr glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
+  graphicalVAR = derive2 { name="graphicalVAR"; version="0.2"; sha256="0z1qjvyqlalplmwz898rhbjkj6fg1dsgpxn6828qmw3is36g74xg"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
+  graphkernels = derive2 { name="graphkernels"; version="1.2"; sha256="06lh4w0xw1apz70s9qzlhlayzh6nyd6v512lc90a0g7n6xw1fqvg"; depends=[igraph Rcpp RcppEigen]; };
   graphql = derive2 { name="graphql"; version="1.2"; sha256="03rmxpd1g9r1hgv9r3mrwf5pp4013cpqvbg385ywfm8l1c3j0a3z"; 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.3.0.3"; sha256="1k8ynf6wazjhsr0m3wy39s6833cd5j906awxkr2yhy5dfwy4jfhr"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; };
+  grattan = derive2 { name="grattan"; version="1.4.1.2"; sha256="0b4sj4zz432m288jv9y6xx1isw84j23gjkdwpxxv6ny29j3xw361"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; };
   gravity = derive2 { name="gravity"; version="0.3"; sha256="0makhi5hfs2x891ss6whq49rp73j6h5x5m4dvd0d175y06n4hg3s"; depends=[lmtest multiwayvcov sandwich]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
   grex = derive2 { name="grex"; version="1.4"; sha256="0jj0473q06ym410glnma7sbqn9z0l0j0i5kw3mqynjs3blr03d7w"; depends=[]; };
@@ -5768,7 +5917,7 @@ in with self; {
   gridGraphics = derive2 { name="gridGraphics"; version="0.1-5"; sha256="1fsw699xk56iiwscrf98a1b0m2xpmvfqqsb7aja49fhv8qam6szf"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.5-0"; sha256="15d35066213hwsxsvmnqxqm4wim850645jwajw4pa190v8sapl89"; depends=[RJSONIO XML]; };
-  gridsample = derive2 { name="gridsample"; version="0.1.3"; sha256="169jsvavn46iaczf9j9zh41ila3vv7i8bapsbdy39sifwadqqw4y"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat]; };
+  gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
   groc = derive2 { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[MASS mgcv pls robust robustbase rrcov]; };
@@ -5777,6 +5926,7 @@ in with self; {
   groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
   groupdata2 = derive2 { name="groupdata2"; version="0.1.0"; sha256="1kqmwjf06bnm0fbvcsicfrkgl7kn42v5bip1m9riiqmk4wh2bkqx"; depends=[dplyr plyr]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
+  groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.0"; sha256="1w8qz2k6m2xm0n699dj69aiagxy728q66bphxbmn71kakymvkgnz"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
   growfunctions = derive2 { name="growfunctions"; version="0.13"; sha256="19ngsd326vws2f3wsrkcsyzn64fm9nnqvnbamfw6aal9xzzzz59m"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
@@ -5807,9 +5957,11 @@ in with self; {
   gsrc = derive2 { name="gsrc"; version="1.1"; sha256="12rrp9v0r5qzxcs1l29238nkc1haql1c4vva3vdm26kglpg7qj18"; depends=[Ckmeans_1d_dp dbscan DNAcopy illuminaio limma openxlsx preprocessCore R6]; };
   gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
-  gstat = derive2 { name="gstat"; version="1.1-4"; sha256="138v8accqwf95a3i980x57wd2j8vmdg1ga44rx9nbjcpyxc5x6mf"; depends=[FNN lattice sp spacetime zoo]; };
+  gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
   gsw = derive2 { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
+  gsynth = derive2 { name="gsynth"; version="1.0.3"; sha256="07cr4lnjpqzlbsv8w35iazag89n75wy1lj7db2nh5msd9qsb1a79"; depends=[abind doParallel foreach GGally ggplot2 Rcpp RcppArmadillo]; };
+  gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; };
   gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; };
   gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
   gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
@@ -5831,14 +5983,15 @@ in with self; {
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.10.3.6"; sha256="1jpliv63dpqmq635gxjar19z70ciyw76yxvcg505rgryk2nf3m1h"; depends=[jsonlite RCurl]; };
+  h2o = derive2 { name="h2o"; version="3.10.4.4"; sha256="11bbpwsx9pyf54v1w9j7sjdh8kins0kraqjmssghisp7q0gcz4dk"; depends=[jsonlite RCurl]; };
   h5 = derive2 { name="h5"; version="0.9.8"; sha256="1i7ymbqcmv8b9v8jdaqs49638m7xib5k92d62jh6h4il8l10rykx"; depends=[Rcpp]; };
   hBayesDM = derive2 { name="hBayesDM"; version="0.3.0"; sha256="0ka7x55x04656cad9gyzfr2p0xf9gjyq56vw0ja9561vvbk2dynm"; depends=[BH ggplot2 loo mail modeest Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  hNMF = derive2 { name="hNMF"; version="0.2"; sha256="1lp4qcx48maa3iql8m862x32m7zxril0jizvf4d5pinjwki9d031"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
   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"; sha256="1wnklaf46fpii10md3sp2cv7qqvrha2ihhrr1kxvpm7m8xzjfqc7"; depends=[]; };
-  hansard = derive2 { name="hansard"; version="0.3.4"; sha256="01z2v0lqm35p74hm9x874xgaqdmqa7pig3l4ah5id148s2f5bafd"; depends=[httr jsonlite plyr]; };
+  hansard = derive2 { name="hansard"; version="0.4.0"; sha256="11vs30lvs99l42qpqp6bc45frwnq6gmszkjqpcjlw26zxfd1kxps"; depends=[dplyr httr jsonlite]; };
   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]; };
@@ -5851,7 +6004,7 @@ in with self; {
   hash = derive2 { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
   hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
   hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; };
-  hashmap = derive2 { name="hashmap"; version="0.1.0"; sha256="1pp62py2n8ajv90fmv4zkga3hshk9cj1qfzagnp8jnfym0jp9rlc"; depends=[BH Rcpp]; };
+  hashmap = derive2 { name="hashmap"; version="0.2.0"; sha256="0dy5q11s5ds69yqzax7nqjjq2kfljk7m7sjh6s114bchx3wc77zg"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
   haven = derive2 { name="haven"; version="1.0.0"; sha256="15ynk1qm4g9m6ng4lc1x3hwjb2xak6b795ifh5q1k4mmx07xz6dl"; depends=[BH hms Rcpp readr tibble]; };
@@ -5866,11 +6019,12 @@ in with self; {
   hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
   hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; };
   hddplot = derive2 { name="hddplot"; version="0.57-2"; sha256="1mckgd99wvxbqvpyx231r97kysppnn1xggy8jvnc31sxq8m9gfr7"; depends=[MASS multtest]; };
+  hddtools = derive2 { name="hddtools"; version="0.7"; sha256="0acvdysyyv5i109adh1prrc9ifwadb0gk303hh3b0g69wysnmhl8"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; };
   hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
   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.0"; sha256="01zd3b44c0rnwxwxcmsgj7w0clq4h7wrlzy4yiwvxcifiv8mgp8l"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
-  hdnom = derive2 { name="hdnom"; version="4.6"; sha256="0hp8sd4xcwcmrs1a7idnhkq7fawvajg35v5mzv2dfa69xdga740h"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
+  hdnom = derive2 { name="hdnom"; version="4.8"; sha256="0z6rj8r7v1z2f8c5vgslnzl6f09ncbpzv0l2xyiy5c78j68z16l3"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
   hdr = derive2 { name="hdr"; version="0.1"; sha256="0dgp4442mfvri8vhicp02nrv55z13r6664x2nlcq6vh6xz9pqyl0"; depends=[httr]; };
   hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; };
@@ -5880,9 +6034,9 @@ in with self; {
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
-  heatmaply = derive2 { name="heatmaply"; version="0.7.0"; sha256="1s4qcwmv6la6p3vcxp67nvlbbkd92zj1jagj8vwgk46pykqwr1h5"; depends=[colorspace dendextend GGally ggplot2 magrittr plotly reshape2 scales seriation viridis]; };
-  heavy = derive2 { name="heavy"; version="0.38"; sha256="0swrn7vvs682k8yhvi49sfs1zpivhjlh7kfcjnk14i2jp1yk2slz"; depends=[]; };
-  heemod = derive2 { name="heemod"; version="0.8.0"; sha256="0wzwqb2rj578zlr3nfwmcw3m3dx9rv5v8wlqyn4x2504d3i7g4yv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast pryr rgho tibble tidyr]; };
+  heatmaply = derive2 { name="heatmaply"; version="0.9.1"; sha256="1havw3m01nc1ass48j6afz85pvklkgpbl9pip4mqzi2fp6q327y5"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis]; };
+  heavy = derive2 { name="heavy"; version="0.38.1"; sha256="12s4g0m5qi4yg26p9l3qay1gfhixma66ls0kf8lkaswzgd7761hp"; depends=[]; };
+  heemod = derive2 { name="heemod"; version="0.9.0"; sha256="184cqzj5paarswc5qbxrhh7h9g0fwwqagk9zv2rj361x8w5h2qbr"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rgho tibble tidyr]; };
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
@@ -5894,6 +6048,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.1.0"; sha256="0c0879ka30lhfiyrq91aam2r351abirwigvv287v0cc76z21ih09"; depends=[ggforce ggimage ggplot2 gridGraphics showtext sysfonts]; };
   hexView = derive2 { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
   hexbin = derive2 { name="hexbin"; version="1.27.1"; sha256="0xi6fbf1fvyn2gffr052n3viibqzpr3603sgi4xaminbzja4syjh"; depends=[lattice]; };
   hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; };
@@ -5902,7 +6057,7 @@ in with self; {
   hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; };
   hglm = derive2 { name="hglm"; version="2.1-1"; sha256="1vr1332db60fqbck0nplfw5dnxpb7sa3irh80k2hyx4aw74ckr2k"; depends=[hglm_data MASS Matrix]; };
   hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; };
-  hgm = derive2 { name="hgm"; version="1.16"; sha256="1jgci5fg5fk867qvjgdlqr20spymjqxrypyp58jkfkjjrx1jpjsa"; depends=[deSolve]; };
+  hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; };
   hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; };
   hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
   hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; };
@@ -5920,7 +6075,7 @@ in with self; {
   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"; sha256="1csyfvhll1pvqaw5g6iqm55raxlcflc2wf86g0m1gv3x5iw7qjsv"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv quantmod robustbase rugarch sandwich timeDate xts zoo]; };
-  highlight = derive2 { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; };
+  highlight = derive2 { name="highlight"; version="0.4.7.1"; sha256="02d507v599jmjggavgw94drfbk0cffj2m4zgl0hgq28n5fc9k1dm"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.1.1"; sha256="0kjs01ml4v57956rk3ch8y8kxni36gymkf830skxh4fj4nsr8hs1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
   highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; };
@@ -5929,7 +6084,7 @@ in with self; {
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
   hisemi = derive2 { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; };
-  hisse = derive2 { name="hisse"; version="1.8.1"; sha256="0vdl61ylnv4f77hrpv68xf2ssjczynpmyla4pgsxhyp1r65l6in8"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
+  hisse = derive2 { name="hisse"; version="1.8.2"; sha256="1cni5byx0187ss92ijs8j2dnswqb6dn6pva93bny3dylszqlyy96"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
   histmdl = derive2 { name="histmdl"; version="0.6-1"; sha256="0vgfy49hrjcm3f8l2hb0fbn1ydh94g4xq2s116yf2c9pd0pwsbi1"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-24"; sha256="1jihw92zi5a4dj6lzm1qvkynv9fp6j5iy83g8rzikp276x63nb62"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
@@ -5940,6 +6095,7 @@ 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.6.3"; sha256="1jvbn8azpcgmg5kc9xkn6h2jznwg462wc2s3zhq7m6pn8p8faxyc"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm pbivnorm Rcpp tmvtnorm tree]; };
   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.3"; sha256="127znf522r5mn3k6frhdd7pqh063bs3l85gn9h7cx50hpjf2as4k"; depends=[]; };
@@ -5954,6 +6110,7 @@ in with self; {
   hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; };
   horizon = derive2 { name="horizon"; version="1.0"; sha256="1wrp5qr1qql21xwcjh415q67z2ym4790zfp0n81360v6bp2b3hyy"; depends=[raster]; };
   hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
+  horserule = derive2 { name="horserule"; version="0.1.0"; sha256="1kswmzdb58fkwhm9l3v8qhkw0wkprhprkxhxzsc7c3znvcim6jni"; depends=[BayesLogit gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer]; };
   horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; };
   hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; };
   hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; };
@@ -5978,12 +6135,12 @@ in with self; {
   htmltools = derive2 { name="htmltools"; version="0.3.5"; sha256="0j9bf80grd6gwh7116m575pycv87c0wcwkxsz3gzzfs4aw3pxyr9"; depends=[digest Rcpp]; };
   htmlwidgets = derive2 { name="htmlwidgets"; version="0.8"; sha256="1df3pwl34rvdbr9sgr5h27q9bmqpckvpwq4frl3d1v614y3vfclj"; depends=[htmltools jsonlite yaml]; };
   hts = derive2 { name="hts"; version="5.0"; sha256="130kyc4ygym53gsr8r8n35wrhx2yb3slf1yjs9cdyrqzxwsggfp4"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
-  httk = derive2 { name="httk"; version="1.4"; sha256="1abjb1vg8q4va8g2bfsv537fwrsga83amc9rfsxbdbhzhf2qn0qr"; depends=[deSolve msm]; };
+  httk = derive2 { name="httk"; version="1.5"; sha256="1ndpjs4i3xiv3c3nmik8q463l01rp4ccn1yscc8g77i2fwnvpyy6"; depends=[classInt data_table deSolve EnvStats ks MASS msm mvtnorm RColorBrewer reshape2 survey TeachingDemos truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.0.0"; sha256="0p0c2n1n5nrmnii9myp9blzwg996xgm15law9f073an4xvfg2kd2"; depends=[digest httr jsonlite]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; };
-  httptest = derive2 { name="httptest"; version="1.1.0"; sha256="0fdsksxdq9y44460zpip0c3fhmlzvjbj9fp11g27k4lh85p042fa"; depends=[digest httr jsonlite testthat]; };
+  httptest = derive2 { name="httptest"; version="1.3.0"; sha256="0fvf1d44ijdi8rlhpy7d9wzfsakfjfgxwr3j82jxds0jzqdgbfkj"; depends=[digest httr jsonlite testthat]; };
   httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
   httr = derive2 { name="httr"; version="1.2.1"; sha256="03kkjlhyvvi5znwaxfm6cmdsg3q7ivwsvkzgabhjdj2jxs80pfg7"; depends=[curl jsonlite mime openssl R6]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
@@ -5993,6 +6150,7 @@ in with self; {
   humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; };
   hunspell = derive2 { name="hunspell"; version="2.3"; sha256="1sgjsa9gfq12bf2ld3yqwa18cy8njhvjd1jihbrbzki8z4xl7pjj"; depends=[digest Rcpp]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
+  huxtable = derive2 { name="huxtable"; version="0.1.1"; sha256="09x7xvnkkd9m3ycf5ia926fn4vsj6yqbzaqa3p6lzz789f1j26s7"; depends=[htmltools knitr lazyeval rmarkdown xtable]; };
   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]; };
@@ -6003,13 +6161,13 @@ in with self; {
   hydroGOF = derive2 { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; };
   hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
   hydroTSM = derive2 { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; };
-  hydrogeo = derive2 { name="hydrogeo"; version="0.5-1"; sha256="05766n82r6cvk4gnpnfrq28248awzm3y06dnybaymydjh6n1dn73"; depends=[]; };
+  hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; };
-  hyfo = derive2 { name="hyfo"; version="1.3.6"; sha256="0d8dhp15h3ajvivb6fq8q83l7nz25a2lc7zx9cwlq6vrkj8ww3ya"; depends=[ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
+  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]; };
   hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.2"; sha256="1jlcfwyqs2mfdixqik5dqb0sl3i9pjxcrwabbcr24z8wnq524zx8"; depends=[doParallel foreach iterators randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.98-20161118"; sha256="0343prdah83l45z6p2wafmipw2x3f0yshm5hm11wgkkm1cnv5905"; depends=[ggplot2 lattice latticeExtra svUnit]; };
-  hyperdirichlet = derive2 { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[abind aylmer cubature mvtnorm]; };
+  hyperdirichlet = derive2 { name="hyperdirichlet"; version="1.5-0"; sha256="01q5ri9p9nn7m1kgzyhn2d1rbwhjfz259cz2imhi9g1zpdry4kf2"; depends=[abind aylmer cubature mvtnorm]; };
   hypergea = derive2 { name="hypergea"; version="1.3.3"; sha256="0spchrbb5y3yx63acs9ns256h7k3nd5wxg8vw258kqlvyapj50l6"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
   hypervolume = derive2 { name="hypervolume"; version="1.4.1"; sha256="0gx9ing4h1sg4zzppfa386hllryf8vk1n013yv14c0k3sjjnz456"; depends=[fastcluster geometry ks MASS Rcpp RcppArmadillo rgl]; };
@@ -6032,11 +6190,15 @@ in with self; {
   iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; };
   iJRF = derive2 { name="iJRF"; version="1.1-4"; sha256="1fgbc0z647vwybffzp4iips86pxakd25dlk5jqgm049s6pa8m73v"; depends=[ggplot2]; };
   iLaplace = derive2 { name="iLaplace"; version="1.1.0"; sha256="1z752yw3nvqj1ckf23262phkw849cb5p4m14v108xf2dizyzggxg"; depends=[doParallel fastGHQuad foreach iterators Rcpp RcppArmadillo]; };
+  iMediate = derive2 { name="iMediate"; version="0.2"; sha256="06s4qbynk551y8csa2ixscrs8srlmbi2dmb7dccl9cbnywisxi05"; depends=[mediation]; };
+  iMessager = derive2 { name="iMessager"; version="1.0"; sha256="1w0l2qpcgglg13bnqdnz8xnfq2mxkk5g6cblvf2v5y03c2gpmm86"; depends=[]; };
   iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; };
+  iNextPD = derive2 { name="iNextPD"; version="0.3.2"; sha256="06wka2qr1jm3hvi8j0b19fr21v72gmqknz8dg0l5wl91m0prqns3"; depends=[ade4 ggplot2 iNEXT Rcpp]; };
   iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; };
   iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
   iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
+  iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; };
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   ibd = derive2 { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; };
@@ -6052,19 +6214,20 @@ in with self; {
   icRSF = derive2 { name="icRSF"; version="1.0"; sha256="155lgak9jqsy398q5y4fl050gas5hppb25jhc1njglq2h98w3pl2"; 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.5"; sha256="1r6rrjha8c1cy7qf682yzkw7i1qxzrcvs8g20vb77mzhzjq6d073"; depends=[Rcpp RcppArmadillo]; };
+  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.2.2"; sha256="1bs04j0xdf6b0mvczi8v3jyjdf2g99vfqr9by83a7gl9vpsar4kn"; depends=[]; };
+  icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
   icd = derive2 { name="icd"; version="2.1"; sha256="1634mpv1cgka8n1ws4lsqw8114q50rjrxcjlw16bq8igi1l4hrwq"; depends=[checkmate magrittr Rcpp testthat]; };
   icd9 = derive2 { name="icd9"; version="1.3.1"; sha256="0yrgg1vf9jf0kv4qbvc0d8n26csxx79g2196ijgq43rhprrrm1y6"; depends=[checkmate fastmatch Rcpp]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
-  icenReg = derive2 { name="icenReg"; version="1.3.6"; sha256="024iwpwbn3g2lsq9kn6p86m1qdj1ndlfakk6hsijc8akg0cmmzcg"; depends=[foreach MLEcens RcppEigen survival]; };
+  icenReg = derive2 { name="icenReg"; version="2.0.1"; sha256="16a9v461gsyhx8hf938c17zx81383kmxkbmyb97q6z6gnkdy2ck0"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
   icesAdvice = derive2 { name="icesAdvice"; version="1.3-0"; sha256="1csyw7sav56vkgwjllixjbgpy3ka9xivhr9pgb26iihgwwpnhdds"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
-  icesSAG = derive2 { name="icesSAG"; version="1.2-0"; sha256="05fj1sx9fbpyhmng7llmayc2m0gvfyak6ispjkwrx55hms17i5p9"; depends=[png]; };
+  icesSAG = derive2 { name="icesSAG"; version="1.2-1"; sha256="0qjqzqcd8hxv22jf7cw2w9vk6lazkcrnc84fz3vacbjmg3c93h1b"; depends=[png]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
+  icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; };
   icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
@@ -6072,17 +6235,16 @@ in with self; {
   idem = derive2 { name="idem"; version="1.0"; sha256="1knb5m0rczga7j3a58z7fjjn3nva7pihg2w3vh82dqpi8wwcnznj"; depends=[coda sqldf survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
-  idm = derive2 { name="idm"; version="1.7.1"; sha256="1pn8iyfwcpp3zj51jjf0dvfc0rbh8f5smnbswxf186fqs9fkjpmy"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
+  idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.0"; sha256="1wwp1phbgj1zcdgyq4fzca8hmgibcc01xmqlnm51nmm0n3ajki2v"; depends=[openssl uuid]; };
   ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; };
-  ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.1"; sha256="1jqh5x5wnfv4cx3ck9k4kxchai7vfb3i968n5nq0yqgbvfii5kli"; depends=[]; };
   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]; };
   iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; };
   iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; };
   ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
-  ifaTools = derive2 { name="ifaTools"; version="0.13"; sha256="1mffvlzm4flz7n26vllm28s1iib66gbqq7nl4yfwbdljrpp4ph23"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
+  ifaTools = derive2 { name="ifaTools"; version="0.14"; sha256="1m10j0isbaa30rd3dnvig9v9mwizmns36q8haaw07y8zw6mngzra"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
   ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; };
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
@@ -6094,14 +6256,15 @@ in with self; {
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
-  imPois = derive2 { name="imPois"; version="0.0.7.5"; sha256="15l2air707xnzxvgvzsv90m5pl8vvr9inywvmx7f7irn4syy0g3a"; depends=[geometry rgl]; };
+  imPois = derive2 { name="imPois"; version="0.1.4"; sha256="07350zly4fyx2sf9cqpfpyy8l5kn96z49kzym81p2bmhq66d408h"; depends=[geometry rgl]; };
   imageData = derive2 { name="imageData"; version="0.1-26"; sha256="0r39bp33kki2ddvds2jkpk1r6afl8d1xbl447lnz25dxpzfcajn2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
-  imager = derive2 { name="imager"; version="0.31"; sha256="1lknn7lk6g6mda2sqabxkdkv4aryfq1k4f0bmz6ym14y5j7kjlzz"; depends=[jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
-  imagine = derive2 { name="imagine"; version="1.1.0"; sha256="0xmmm38vwya0dlycky3dllr9j015fbc98bwwcp8k7xmknvvnzz83"; depends=[Rcpp]; };
-  imfr = derive2 { name="imfr"; version="0.1.3"; sha256="0i25fl8ixq1z2hv3gf1rh5ssnxxzxaxg30wi5ixngwnnwkljxbph"; depends=[dplyr httr jsonlite]; };
+  imager = derive2 { name="imager"; version="0.40.1"; sha256="05k44k05grn3vhh46inlqcy1800implvxp10rjhcliy4xlmcyrx2"; depends=[Cairo downloader jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
+  imagine = derive2 { name="imagine"; version="1.1.1"; sha256="1pry74amgib4i5m0gly58ay61snmyw8h2v12clbhxmr7gn5z9v04"; depends=[Rcpp]; };
+  imfr = derive2 { name="imfr"; version="0.1.4"; sha256="0q6iy6arq2c0gqcpnpr2safig3ki32m2gai1lmz19pwcfi9qkgf2"; depends=[dplyr httr jsonlite]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
   immer = derive2 { name="immer"; version="0.7-0"; sha256="0pf0chrx1qbri0pkiz30pc2qcdmld0ajm7fljadzlnczs3bnr1na"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
-  imp4p = derive2 { name="imp4p"; version="0.2"; sha256="1bymmfcchhmwdl0gq7x9llhykqzjw74c80x15mxs8dl9ha6fndc5"; depends=[imputeLCMD Iso truncnorm]; };
+  imp4p = derive2 { name="imp4p"; version="0.3"; sha256="189bqj886bi4mgyj013cbqciafrzvz036m3cwkszv6j23d0mrb2r"; depends=[imputeLCMD Iso Rcpp truncnorm]; };
+  implyr = derive2 { name="implyr"; version="0.1.0"; sha256="0g0zl5sp30xs9isvn8aspjicmx7wnai2b3780fjarlb5a4ng5fk0"; depends=[assertthat DBI dplyr]; };
   r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
   imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
@@ -6109,7 +6272,8 @@ in with self; {
   imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; };
   imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; };
   imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; };
-  imputeTS = derive2 { name="imputeTS"; version="1.8"; sha256="1r86fpv51jl1d5lskbx19c0njr5qdn0l8m3xj5brisvf035b7pp4"; depends=[forecast stinepack]; };
+  imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
+  imputeTS = derive2 { name="imputeTS"; version="2.1"; sha256="1sw8b3jss4h5ns4dgp0r902v1vk9iavvc84rpkhgqkjxffr1c672"; depends=[forecast Rcpp stinepack]; };
   imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.0"; sha256="082ps3r4priv3r5w8gydvkjxp8r3nsrss964hdsff2kc5dsmqn14"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
@@ -6118,8 +6282,8 @@ in with self; {
   inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; };
   inca = derive2 { name="inca"; version="0.0.2"; sha256="1wj8f1ga0km9k9zrjcd7g228kw2pp6y6pgnfwmgdd05bx4hzjhdw"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.5.3"; sha256="1mzwd9nida5spsqr5jayp3wn1h3cbv0amc5iyxx6h51gn0pwspkz"; depends=[backports decoder dplyr rccmisc sweidnumbr]; };
-  incidence = derive2 { name="incidence"; version="1.1.1"; sha256="03dlgqz6mnayc5lvaalxdhdidzgq49djkd8129ymjmmcg6qwd2h4"; depends=[ggplot2 ISOweek]; };
-  inctools = derive2 { name="inctools"; version="1.0.7"; sha256="0hw42i0zj8f156wkdc7v7njg6sgxkhhn84v2pg1qxwvlyy3daz0y"; depends=[cubature doParallel foreach ggplot2 glm2 MASS plyr pracma]; };
+  incidence = derive2 { name="incidence"; version="1.1.2"; sha256="1xyln5zndqwg57snkpj676p8wj2mbzwb3fnc9hniq529mnr95qw3"; depends=[ggplot2 ISOweek]; };
+  inctools = derive2 { name="inctools"; version="1.0.10"; sha256="0ykkxlifh9gxflbk9786xbx2i5ja3pn01z9dj8dqwvrrq83npcfw"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr MASS plyr pracma]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.7"; sha256="1pm1yl7kbxrik5ghvsvp6irmzgawxb8v03kvrqm48mnbghkdh1lv"; depends=[ape numDeriv phangorn Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; };
   inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; };
@@ -6129,20 +6293,20 @@ in with self; {
   inferr = derive2 { name="inferr"; version="0.1.0"; sha256="13wgjh5b03kyx6jvdgpavr9qjzvr7plgml2ickq2gxkxczc05r2m"; depends=[dplyr magrittr purrr Rcpp tibble tidyr]; };
   inflection = derive2 { name="inflection"; version="1.2"; sha256="13mlyfcw13z9y48ypycypp6m7s2d7yx3n13vr2br4kwwn74hqky8"; depends=[]; };
   influence_ME = derive2 { name="influence.ME"; version="0.9-8"; sha256="0fnc0hk50sh4fd5jfgs1kd61psk7mrc85s1ihmficayivvl7iklb"; depends=[lattice lme4 Matrix]; };
-  influence_SEM = derive2 { name="influence.SEM"; version="2.0"; sha256="113h4nrcik21vhfld143ivcij49vimzilq7nxn2d0821iz1dmnfg"; depends=[lavaan]; };
+  influence_SEM = derive2 { name="influence.SEM"; version="2.1"; sha256="1qhv640lngwrbdfqvw2x0x4zwv0aqzxwyfdpnivzjf5pw58nya5s"; depends=[lavaan]; };
   influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; };
-  infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
+  infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; };
   informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
   infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.5"; sha256="1bgjfhwkbd0y1iwxq3qh80kshsd9g1r1gg99lr75n2i61qnnimnf"; depends=[fields]; };
-  infuser = derive2 { name="infuser"; version="0.2.5"; sha256="0zq05i55gkwrvjs3mzh64ffwmxln3lrjqw3w87xy3ihsqjhxb2pg"; depends=[]; };
+  infuser = derive2 { name="infuser"; version="0.2.6"; sha256="1b18476k17kkj2aq5icw8rlrla8ax1h6nx08jjn9pcx02p3lm1ni"; depends=[]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
   ini = derive2 { name="ini"; version="0.2"; sha256="0dzy2zzzczs7xnnm7v6achd6qsy2wbrvsgahkgbsrpvwxpcb79bp"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.2.4"; sha256="1j2wxzm45zzykm29swvqj6hdscgxq6094s4wwj6rr7nwpp9v3qni"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.2.6"; sha256="1bgf31k3xmqmw8wsmz8z4b7d7jzivr9yxy7w9cy4vdiz05i3v96p"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.5"; sha256="161p45hj5h6yxn9w140gkcsj2y90lqc8avsj2dsg3gnzyks07as1"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
@@ -6155,10 +6319,10 @@ in with self; {
   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]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
-  interactionTest = derive2 { name="interactionTest"; version="1.0"; sha256="1ppc476glwf0bsr1wgzircvnhgn9kkbhy3rskfz671ma6fv3p67b"; depends=[]; };
+  interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
-  interflex = derive2 { name="interflex"; version="1.0.2"; sha256="0ybfk9jxfc98jd97pg469wrddllhm43hgg4lwg1i1gmz34y84yf2"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
+  interflex = derive2 { name="interflex"; version="1.0.3"; sha256="07a41rx553i6rlgcl4aa2xxkdql3y7bi84h2pgak9qbyxgw6mlmq"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; };
@@ -6188,7 +6352,7 @@ in with self; {
   ipdw = derive2 { name="ipdw"; version="0.2-5"; sha256="1a0xlhzmnc3l3fvn1v3rgxwg0va0418yq62i2dlq0l5djcfbxyc3"; depends=[gdistance raster sp]; };
   ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
-  ipft = derive2 { name="ipft"; version="0.2.8"; sha256="0jyg69bj32j1xgnwrl233s6bi85drhry94midsrjqn3g2ik6xafz"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
+  ipft = derive2 { name="ipft"; version="0.5"; sha256="1xjpvbcp040zsqgmbj67www9zl5ibh554qzpcp02h1q9yzs59ill"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
   iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
   ipred = derive2 { name="ipred"; version="0.9-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; };
   iprior = derive2 { name="iprior"; version="0.6.4"; sha256="1cpp0cp6cfdrh23wjjqvng9dszjmp5a90bgd6sbgcfckn2si0ly1"; depends=[RColorBrewer Rcpp RcppEigen]; };
@@ -6197,7 +6361,7 @@ in with self; {
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; };
   iqspr = derive2 { name="iqspr"; version="1.0"; sha256="18kld8w1qwgyvs61irk80n56lj6mcy0mlrnvsq3940hhbcpmx61k"; depends=[rcdk]; };
-  irace = derive2 { name="irace"; version="2.1"; sha256="0q3k8jd2s7m20vdx8bfjh3kwgqjyymkfwdfgmbflmlj8q1km8iqc"; depends=[]; };
+  irace = derive2 { name="irace"; version="2.2"; sha256="10bxi508qvm97kljpwlnwypvlrzjdzliv0qq92wxjxyyi8pqgfvc"; depends=[]; };
   irlba = derive2 { name="irlba"; version="2.1.2"; sha256="1qbcn0ix85pmk296jhpi419kvh06vxm5cq24yk013ps3g7fyi0si"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.2"; sha256="1kbab06lwldyp5ra71rgn4habq6yl6ggl5km1sj9bbqa6n4gqvwz"; depends=[fGarch shiny shinydashboard]; };
@@ -6217,7 +6381,8 @@ in with self; {
   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]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
-  itcSegment = derive2 { name="itcSegment"; version="0.2"; sha256="121k0j5w47c10ws0dwcl1qd3ryichx5m86mzf2w3249p6wj54y7j"; depends=[maptools raster rgeos sp]; };
+  itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
+  itcSegment = derive2 { name="itcSegment"; version="0.4"; sha256="06bdh8dw9ddmy27jnpy3x1z27kygdh32rcxjff1kx4lhfyj1bkid"; 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-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
   iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; };
@@ -6243,20 +6408,20 @@ in with self; {
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.4"; sha256="1yxk94acscq43gs3m0n0x3805dr71kn4wf3ws7rg62p2bd22b09i"; depends=[]; };
   janitor = derive2 { name="janitor"; version="0.2.1"; sha256="14jb3viyrmxc0grrkkw86z6s7c3sq0a07mhpyzw1xsy5gfda29yi"; depends=[dplyr tidyr]; };
-  jetset = derive2 { name="jetset"; version="3.3.0"; sha256="1lyjrakk8f25541v7q3zwam7xbxykh75r0czk6qvil92a9y1005r"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  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]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
   jmcm = derive2 { name="jmcm"; version="0.1.7.0"; sha256="0qq7dc6i5w5r276r7l9j29f783s41y3gp70hj5cz72wkmhdnvg4j"; depends=[Formula Rcpp RcppArmadillo]; };
   jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.2.900"; sha256="0zgj1g8vy2cj2kyschbr1xb1mb862gniva0sa8qr9p8vvb03ja4v"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="1.3"; sha256="1lzqpdy2987szihsjaq6l1iggjhji0li4cj7914myj3vzfcif8gw"; depends=[]; };
-  jmv = derive2 { name="jmv"; version="0.7.0.3"; sha256="0knrpnr2mpq2h1s6xis6wsf3k6yc142mfmrmp8s53s29zlzs6ljr"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lsmeans lsr multcomp PMCMR psych R6 vcd vcdExtra]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.4.0"; sha256="0kga95ryxvvgdlc1z9s53bmasfizyl6gvxjwp55nf2k0pm0lx6sf"; depends=[base64enc R6 rjson]; };
+  jmv = derive2 { name="jmv"; version="0.7.0.6"; sha256="0x9p984nka3a4lv5bj1lhqn8rns9rmfjsfrvcaxj3ihrbvy0sawb"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lsmeans lsr multcomp PMCMR psych R6 vcd vcdExtra]; };
+  jmvcore = derive2 { name="jmvcore"; version="0.5.1"; sha256="0sxypfcxnc31ak39rgc8ck8x1l7723qgskfmxhp1x07lcqx9b433"; depends=[base64enc R6 rjson]; };
   jocre = derive2 { name="jocre"; version="0.3.1"; sha256="01mnd2dzm3bnbdxg0grj10ashpxzgsk68lfx7ssxk7pnfxnbc39h"; depends=[boot KernSmooth plyr]; };
   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.1.0"; sha256="13b3syh20d0wrfh8gama16ajc73nzd5rq4pgyrdw8m94ybmg559v"; depends=[lattice MASS nlme statmod survival]; };
-  joineRML = derive2 { name="joineRML"; version="0.1.1"; sha256="0m8cyjrhbk0bspigpjh30g74084hdn0q4zg9364vp2dmna092m47"; depends=[lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="2.10"; sha256="1vfndask1njl01h4vqbsbhvd5vpy432wapp6vz2byddb358hg4rh"; depends=[survival]; };
+  joineRML = derive2 { name="joineRML"; version="0.2.0"; sha256="198xrls5bdslrdl7j90asm8daqls78axy486gpnq03scw81cj4qn"; depends=[ggplot2 lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="2.11"; sha256="0k1hpg0i1prxzvjfsndbgw4g2k0lli0niql8b79z91api472hjf9"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
@@ -6268,13 +6433,13 @@ in with self; {
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; };
   js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
-  jsonld = derive2 { name="jsonld"; version="1.1"; sha256="1bmfdcyjcz3cgy0vkliwvd97kww8djdib08bsq99v485gspl2x87"; depends=[curl jsonlite V8]; };
-  jsonlite = derive2 { name="jsonlite"; version="1.3"; sha256="0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw"; depends=[]; };
+  jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.4"; sha256="11rgkjp5qir79niad0aizjxvjzyvkl6l9nsrv3ikv446vllmrasn"; depends=[]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5"; sha256="01f1wrbgj7v6pzrx5vd8pgpm78fanyx59s84m5a5732q5g39shlk"; depends=[Rcpp]; };
-  jtools = derive2 { name="jtools"; version="0.4.2"; sha256="0jzp284ac43s89p9cl5f3x8jcsw09ywjwi5b72zlwbx2a6x6bbq4"; depends=[]; };
+  jtools = derive2 { name="jtools"; version="0.4.4"; sha256="17y5v24zn2sin9yxyyp42kp40fzq8967jfssi3fi4vf66vny4p2s"; depends=[]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
-  jug = derive2 { name="jug"; version="0.1.6"; sha256="19n6fi26yssid1xlixwmvqd6720rvn2jcnw7347izsmlxxyip6hv"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
+  jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
   junr = derive2 { name="junr"; version="0.1.1"; sha256="1rkr6kyf2p3rr39w0nqfvcrcd2b0r411if7812zijnn20vrmsmda"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
@@ -6287,14 +6452,15 @@ in with self; {
   kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
   karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-  kdecopula = derive2 { name="kdecopula"; version="0.8.0"; sha256="1s116d6qh4zc7gazhylhzcwiifkd2xmaqi58r4ns82d7rv54gkaf"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
+  kdecopula = derive2 { name="kdecopula"; version="0.8.1"; sha256="0rn533dzgq6c3cbmiz9f7qzp0yj9fzsmi8y1vabqzrn63dgckvkv"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.3.0"; sha256="0imi8n70xw8bmxnqw4fam6d85ib7bhaygg3q56xrml7mn2wik4gc"; depends=[doParallel foreach kdecopula ks qrng Rcpp VineCopula]; };
   kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; };
   keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; };
   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.0"; sha256="0m8l1d43gb25zdwbv0ymnazm02m2qxg5pcir37n55sl08dh0zyby"; depends=[equateIRT ltm mirt]; };
+  kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
+  kerasR = derive2 { name="kerasR"; version="0.4.1"; sha256="07xnkfp4mpgw2m3z7qzv4m3r4jnb0lwaz5li67shpr3zdvhj4m4s"; depends=[reticulate]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
   kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.1"; sha256="1ypyb6i64jskq2agbpb6wc6y3fn4i7z4fjjfpl97q8f0rif1lpfj"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
@@ -6341,10 +6507,10 @@ in with self; {
   knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
   knotR = derive2 { name="knotR"; version="1.0-1"; sha256="02mr950150m2gzagxf5yzps8fnwspagh3k8prh9zww2jss0471rm"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.0"; sha256="0vcmm4vjawmyaqpqv0g6y5dfcixn0rjhcfr3nfc2781a4w7ydnc9"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr]; };
-  koRpus = derive2 { name="koRpus"; version="0.10-1"; sha256="1f7mspq7iiahpqfj57n63i8b0qs73qgmvpgm1yxi0ax5zjdnspqb"; depends=[data_table]; };
+  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]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
-  kohonen = derive2 { name="kohonen"; version="2.0.19"; sha256="0fi94m2gpknzk31q3mjkplrq9qwac8bjc8hdlb3zxvz6rabbhxrr"; depends=[class MASS]; };
+  kohonen = derive2 { name="kohonen"; version="3.0.2"; sha256="1dg2jmdlp888bcfkpmd8w9w9dj7y9r94fgr7gl2fkhlhkid9ss78"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.2.0"; sha256="1sk7r5v3d65w126vin9gawan3f21zrd9ps974l9nxj7kv1pa3szh"; depends=[digest dplyr httr purrr rgdal shiny xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
@@ -6352,7 +6518,8 @@ in with self; {
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
   krm = derive2 { name="krm"; version="2016.7-9"; sha256="0yc8agnb4685fa00pnwsxwc4vnr2aj2dwb6zxppj62r6c59xl47f"; depends=[kyotil]; };
-  ks = derive2 { name="ks"; version="1.10.5"; sha256="12ianxlfrdzvb56y42p3mpyl01fqxrm97xym4wghvqyz59w0x51k"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; };
+  ks = derive2 { name="ks"; version="1.10.6"; sha256="07gdh95y16yy2qabl2bhlnad6ifclak81lwjza0v25nw2zklwfcf"; depends=[FNN KernSmooth misc3d multicool mvtnorm rgl]; };
+  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.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; };
@@ -6367,6 +6534,7 @@ in with self; {
   kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
   kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
   l0ara = derive2 { name="l0ara"; version="0.1.3"; sha256="0igav0wxvnnjcrh1wqzgvn91ndq9a25yxhxyddnsfvn6f45rc0wn"; depends=[Rcpp RcppArmadillo]; };
+  l1kdeconv = derive2 { name="l1kdeconv"; version="1.1.0"; sha256="0dks5y49kpbw4iryjx5ai3sa052xk6vd8j729b43qjg2x08zdp34"; depends=[]; };
   l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
   laGP = derive2 { name="laGP"; version="1.3-2"; sha256="197mp5rlrfyp9aankbi1lw40vn7m9pkkq7rpr1a6y7x4sp3spr4m"; depends=[tgp]; };
   labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; };
@@ -6393,10 +6561,9 @@ in with self; {
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.0.0"; sha256="0lca079nnqppbr7k5pfa7qfc879kws34hrxcs49y12qfv7hsk576"; depends=[httr magrittr rjson]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
-  largeList = derive2 { name="largeList"; version="0.3.0"; sha256="0lviw0rzpd7453y0swab74kg8yc2byg88ca1fmf1f8zffgrdx9ld"; depends=[]; };
-  largeVis = derive2 { name="largeVis"; version="0.1.10.2"; sha256="16qsc0jv8gbacgjal6hkqdm52yd0n973bkgab0zp1hldj9m4ykl2"; depends=[dbscan ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; };
+  largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
+  largeVis = derive2 { name="largeVis"; version="0.2"; sha256="14rbgx68d9alxxm9w29mddh211d9ywdancyzwc2bg8862bqnsnqv"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
-  laser = derive2 { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; };
   lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
   lassopv = derive2 { name="lassopv"; version="0.1.3"; sha256="07b7n74z4jvrirf0rc0sbvz9nm2s2s22mb8y973iwpf0i7fqxq2c"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
@@ -6405,13 +6572,13 @@ in with self; {
   latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; };
   latentnet = derive2 { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
-  lattice = derive2 { name="lattice"; version="0.20-34"; sha256="0615h69czr73k47whhzimf1qxv5qk0cabcrkljwhyrn6m6piq6ja"; depends=[]; };
+  lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.4.7"; sha256="1gzla8ns3n899vfz80yjx8bb2pcnrvp52c5rxxw591clba1x9jym"; depends=[numDeriv survival]; };
-  lava_tobit = derive2 { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
+  lava = derive2 { name="lava"; version="1.5"; sha256="0x6s7x111x87a4rh5nbk7vw6j4iq40i1c21w0j795h28rgyc7zc2"; depends=[numDeriv survival]; };
+  lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
   lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; };
-  lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.1"; sha256="06k9myq33p9jz7rz6ffansgi27ang4gq0s179vgsrdi10krxxg1b"; depends=[lavaan psych semPlot shiny shinyAce]; };
+  lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
   lawn = derive2 { name="lawn"; version="0.3.0"; sha256="0rws76dzpi2gpn90la663r1g9ywvpvjicjmgb6z7k5xg1gspgs5c"; depends=[jsonlite magrittr V8]; };
   lawstat = derive2 { name="lawstat"; version="3.1"; sha256="0sdsxh2h06d3maqd1pvmnnvphaxav0z2kv5wpiy7dg17cgwv35c2"; depends=[Hmisc Kendall mvtnorm VGAM]; };
@@ -6428,7 +6595,7 @@ in with self; {
   lbreg = derive2 { name="lbreg"; version="1.0"; sha256="03pr5mjk3pfnlfafx6gk9xjsy4m5m7lj4zzvsngl95rr8hnnvvlf"; depends=[MASS]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
-  lcmm = derive2 { name="lcmm"; version="1.7.6"; sha256="04vapw0iwwsx3zn5q84cildr7aprr9pyrkq4gacfi8baahpqj1w9"; depends=[survival]; };
+  lcmm = derive2 { name="lcmm"; version="1.7.7"; sha256="079673yy6ljk8nj06pcf1wh83j1dh3klp50zssvfgz1cxph8h471"; depends=[survival]; };
   lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; };
   lctools = derive2 { name="lctools"; version="0.2-5"; sha256="02xbcmdz12vxi1hjrhibavnf792lqpjraknxz6sqz7fhfqrd8qbq"; depends=[MASS pscl reshape weights]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
@@ -6436,48 +6603,51 @@ 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.1"; sha256="1c34k16d740b8xfb6b2igl12hzqll87dsgm631ksp53v7j3qg7pz"; depends=[mnormt RANN]; };
   ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
+  ldhmm = derive2 { name="ldhmm"; version="0.1.0"; sha256="19m1zdbksxx0f6zkky38kym0qba76p51zgc0i9rjn20ql41w8fdb"; depends=[ecd moments 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.0"; sha256="1phz9hwhfw7lcvz5gg0l3w3j3jig0bw4wxbx6j4z7dlr4bisyng8"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix RBGL robustbase VGAM]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
   leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
+  leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.1.0"; sha256="0y7vyv245arr286j75yap6caq3bw0k147p3p5br0kw4nd6v85jgx"; depends=[htmltools leaflet]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
-  learningCurve = derive2 { name="learningCurve"; version="1.0"; sha256="0hfd793kk1rl224y2vb51b0xf29xinix9q91nv51047lm6hkcfah"; depends=[ggplot2]; };
+  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]; };
   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]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.5.5"; sha256="05pf0l4irsv71c7ywdq92gwl58caphjxlxkls6vs89prib2bj4sf"; depends=[ellipse foreign leaps png readxl sas7bdat triangle]; };
+  lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; };
+  lessR = derive2 { name="lessR"; version="3.6.0"; sha256="0a2l1gmpfbwkxavih4h1w7rzibgf6zql7k2nzck05f0pyzd0bvvx"; depends=[ellipse foreign lattice latticeExtra leaps png readxl sas7bdat triangle]; };
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="2.6"; sha256="19gs0xlbjvx95047pzzl36x42898qkc61qgr1isavf7hph41ak46"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
   lexRankr = derive2 { name="lexRankr"; version="0.4.0"; sha256="149q96yyag375ggflrginim9phbmqaap3hpgjx02rqmbdf38dywg"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; };
-  lexicon = derive2 { name="lexicon"; version="0.1.1"; sha256="0iibyzmgmkkmw0x7n9j1hklf7ff0r0aayb7khg9wbgsa7x1z20im"; depends=[]; };
-  lfactors = derive2 { name="lfactors"; version="1.0.0"; sha256="0j2sq3kh9qgc8z7q8j6fl2n4zih8b7y1yapswsw928b1glava8p7"; depends=[]; };
+  lexicon = derive2 { name="lexicon"; version="0.3.1"; sha256="1r4sjn2490f4df7bgivani0m1ghxfn1kxyc3bp82305kwj8y70sh"; depends=[data_table syuzhet]; };
+  lfactors = derive2 { name="lfactors"; version="1.0.1"; sha256="13vjafbss0860fi4qcf23g3cjs9dlr2k5f3majbnyvhwsbfs7cla"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
   lfe = derive2 { name="lfe"; version="2.5-1998"; sha256="0i1vs9m8a9dadansczwg7jbah73bnxvidrld9inf8xyi8x15265z"; depends=[Formula Matrix sandwich xtable]; };
   lfl = derive2 { name="lfl"; version="1.3"; sha256="14x731f4gnwisd0l14l03bpmn4m2rizdfrc36bjh3lvjbv0raqhs"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
   lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
   lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; };
-  lgcp = derive2 { name="lgcp"; version="1.3-15"; sha256="16a8bg40pravg7jxnqxp74rnncgwxy5jki27038497ask5yxzpdd"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat]; };
+  lgcp = derive2 { name="lgcp"; version="1.4"; sha256="10gnfqq5vx18w6f52fliyfnrjmyns9q5q59pn2m82q2fqwaz26d8"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
   lgtdl = derive2 { name="lgtdl"; version="1.1.4"; sha256="0y519hgrm2ynbhbs61vi8gkhwqgn69wpnd391wpgf4yrg2lx064b"; depends=[]; };
   lhs = derive2 { name="lhs"; version="0.14"; sha256="1qnr3s9511nq3xqdbngllmw3mvnnpblma5dafyghxlpvydc2l481"; depends=[]; };
   libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; };
-  libcoin = derive2 { name="libcoin"; version="0.9-1"; sha256="0whxgylcrhm03yln8k11cxr3bcjkvhyqhgj0yc8wc4avaq6gl1dh"; depends=[mvtnorm]; };
+  libcoin = derive2 { name="libcoin"; version="0.9-2"; sha256="0bya71i853vjg8wdbnm70c1fzx5az7a2bsf6s41ysd020ixdg1jj"; depends=[mvtnorm]; };
   libsoc = derive2 { name="libsoc"; version="0.5"; sha256="0p01mcwnkb4g3dq0mx1gbwfbznp4b2dmhs8k8wmnh7wll16v9i6z"; depends=[]; };
-  lidR = derive2 { name="lidR"; version="1.1.0"; sha256="04skxqjcq27fbkfc274575r215iv13xhjyzdwlr2hf6ksnn54jdf"; depends=[data_table lazyeval magrittr RANN raster Rcpp rgeos rgl rlas]; };
+  lidR = derive2 { name="lidR"; version="1.2.0"; sha256="177lqglhs4fmyf7818z1klirxjm5rrpghjkzrdi19sgw137w9ljm"; depends=[data_table geometry gstat lazyeval magrittr RANN raster Rcpp RcppProgress rgeos rgl rlas]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.2.3"; sha256="1gkvrzcmcic3rzbcfp5lif4zfc94bhfm36i3ajzaczwjhg2dwivs"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
   liftLRD = derive2 { name="liftLRD"; version="1.0-5"; sha256="0v0aczf9s3vr9kk7n6z9spwc82hf418v9vjiyfri3npn3ib112b7"; depends=[adlift nlt]; };
-  liftr = derive2 { name="liftr"; version="0.4"; sha256="10r29z9p83cmvgwrcwbb3ws8ayvjmvqgvx83ppa9p01rgw6n9jwq"; depends=[knitr rmarkdown stringr yaml]; };
+  liftr = derive2 { name="liftr"; version="0.5"; sha256="0pk1w9h83ixf3ia4qxcb85i0n4jr5hfry6rc3yx3pki3r7wlqyam"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
   lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; };
-  likeLTD = derive2 { name="likeLTD"; version="6.1.1"; sha256="0yf0lnzarl6hgs21l6acjcz40dsw269pagxkfcl5fqpkb53rnqgq"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
+  likeLTD = derive2 { name="likeLTD"; version="6.2.0"; sha256="14wyh46hk98jdmpmg1br4x7pc97zkh49k2pgq6yfsigax6l9vd8i"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
   likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
   likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.45"; sha256="0sl0q6w49l89i6s80scsr5lrr8jgdd0788i4b87w985zaxjqrh03"; depends=[alabama cond nleqslv pracma Rsolnp]; };
   likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
@@ -6485,10 +6655,10 @@ in with self; {
   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.1"; sha256="0i99j7n1hxvnm2605b2xr4mxpib64abr10wp03nxii16nssvv66m"; depends=[]; };
+  linbin = derive2 { name="linbin"; version="0.1.2"; sha256="0shw976nlryjvmvnyyiycchqs7zcg5flalywm1ymnv62nw3n55xs"; depends=[]; };
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
   lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.2"; sha256="1m0szmlraqvqvqcj5nlfkpcwckiagc31qkd834m00w47kggmzlhb"; depends=[leaflet magrittr rowr stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.3"; sha256="07xm01a9xw0k2kxl08b22182wxdrm16c2qlwbq3sphbq0zznfxb1"; depends=[leaflet magrittr rowr stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 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]; };
@@ -6510,6 +6680,7 @@ in with self; {
   listviewer = derive2 { name="listviewer"; version="1.4.0"; sha256="1273vk8pk393ciwahvpmdh9z4xdlhw3a7mlm7jsqxqnsrc6jrz3x"; depends=[htmltools htmlwidgets shiny]; };
   liteq = derive2 { name="liteq"; version="1.0.0"; sha256="1r3rbn0a5nnwrhfdygn1hlvv0n3nd1ayddvkpdv5ibsp5fl5vjhy"; depends=[assertthat DBI rappdirs RSQLite]; };
   littler = derive2 { name="littler"; version="0.3.2"; sha256="0anwlxyj82xgrccb3pf6glrkqbkw1871hj4b1qrkmd5ss2f3xq9j"; depends=[]; };
+  liureg = derive2 { name="liureg"; version="1.0"; sha256="1xpk7fis8qmfc853nzqzbs6f9ibix0vrh3f6h96m33hmzyqr7pgi"; depends=[]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
@@ -6519,7 +6690,7 @@ in with self; {
   lm_br = derive2 { name="lm.br"; version="2.8"; sha256="019j0ypl4cdnl29r9x17m62jnpp1p174zmy3zdy8bvp52kz4008r"; depends=[Rcpp]; };
   lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; };
   lmSupport = derive2 { name="lmSupport"; version="2.9.8"; sha256="1g96540krrvycy7m3avhwazkmnyngk9lrjggny4wxhzn49i8p4ga"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
-  lme4 = derive2 { name="lme4"; version="1.1-12"; sha256="0j60l5kgx1wvw2wm3jwfqwi63hammaq8gfcxzwa4h552likvaxi9"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+  lme4 = derive2 { name="lme4"; version="1.1-13"; sha256="13j4a721rx0272pdxrz6nabjv56xb6srklq5w4z1abc82lyvda2z"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
   lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
@@ -6539,10 +6710,10 @@ in with self; {
   lmodel2 = derive2 { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
   lmom = derive2 { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
   lmomRFA = derive2 { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
-  lmomco = derive2 { name="lmomco"; version="2.2.5"; sha256="0xk114vc9pz0f2nfzfyh43idz0hrn0w4g1j3kidlqhnd96g576vs"; depends=[goftest Lmoments MASS]; };
+  lmomco = derive2 { name="lmomco"; version="2.2.7"; sha256="1xrw2a3iyp0i2kmcwgq0sr10v40q5c2n84xx8dxpvl3978vqidj8"; depends=[goftest Lmoments MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.0"; sha256="07zchmdcyz8agrs9q2ydcgicz3sxg893vv4rsynlpgyk2z5xnnjf"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; };
-  lmvar = derive2 { name="lmvar"; version="1.0.0"; sha256="03j7ix7f0n4jlrvffs37mrjvl1bbz2q0cqc1qaqpk1davmxc1vfi"; depends=[Matrix matrixcalc nleqslv]; };
+  lmvar = derive2 { name="lmvar"; version="1.1.0"; sha256="08m7z9mm4pk5x3a2kll9hvkxw3r7lzqpxwp0pgcyxxdygc6xgzjq"; depends=[Matrix matrixcalc maxLik]; };
   loa = derive2 { name="loa"; version="0.2.38"; sha256="1k57n3j8nh0frgabhb5gh0scmgp5gzn2zc9l206mklbw06jkdp96"; depends=[lattice MASS mgcv 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]; };
@@ -6554,7 +6725,7 @@ in with self; {
   lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
   log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
-  logbin = derive2 { name="logbin"; version="2.0.1"; sha256="13fxq3lslsmial52ih80ziagbkm00a8681dnnn3s8kykqg1m8v7f"; depends=[glm2 turboEM]; };
+  logbin = derive2 { name="logbin"; version="2.0.2"; sha256="08v8i6jlnlngvh977ndknhw2d9538nq6wy9fwnsdwp2m2ckh2w3j"; depends=[glm2 turboEM]; };
   logconPH = derive2 { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
   logconcens = derive2 { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
   logcondens = derive2 { name="logcondens"; version="2.1.5"; sha256="1sq27klnphp74hq0l0460m9bb7lrl06mpgkg4qq8iciy3yy1mrkj"; depends=[ks]; };
@@ -6564,20 +6735,20 @@ in with self; {
   logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; };
   logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; };
   logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
-  logitnorm = derive2 { name="logitnorm"; version="0.8.33"; sha256="1arsgc57vr77m9ygy0rbqkayj587k9k5k8nrr6k30v63qapc2irv"; depends=[]; };
+  logitnorm = derive2 { name="logitnorm"; version="0.8.34"; sha256="08jm49picrxbwr8d0c64z5gbslrliq674vr0h30gljf3r9w6s5jj"; depends=[]; };
   loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
-  logmult = derive2 { name="logmult"; version="0.6.3"; sha256="05vxvi9zf2araxfng7gibak9g8m6vwmp7aclddpd814lxzmsmf8a"; depends=[gnm qvcalc]; };
+  logmult = derive2 { name="logmult"; version="0.6.4"; sha256="1p40ava74qdhzysp9w8bkp7hiwr6wq61gvc0jlm4cppxa7ag2n5n"; depends=[gnm qvcalc]; };
   logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; };
   lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
-  longCatEDA = derive2 { name="longCatEDA"; version="0.30"; sha256="1xj1lfwnsl864c0wycpwg8ibns6447l5988132p79a2rpd30rw3r"; depends=[]; };
+  longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; };
   longclust = derive2 { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
   longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
   longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; };
   longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-16"; sha256="0hbv43y0fgbv1qiczy4kibqc7pk7whrz4kyxshg8730y8g9wyxdi"; depends=[lme4 nlme]; };
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
-  loo = derive2 { name="loo"; version="1.0.0"; sha256="1c4knrcfc3r2yg9623lryfbndrv3fbz2ksascmi5wgik3fz44w01"; depends=[matrixStats]; };
+  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]; };
   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]; };
@@ -6588,9 +6759,10 @@ in with self; {
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; };
   lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
   lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
+  lpdensity = derive2 { name="lpdensity"; version="0.2"; sha256="1kjh6zw2g6izhnjrnr71lccryg2s89zlvc1q73cf7p62lnnmaqnz"; depends=[ggplot2]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
   lplyr = derive2 { name="lplyr"; version="0.1.6"; sha256="1a7wry5v78z4aij7ii64340ycx30wqbm3x2wllka79gkll1fn78h"; depends=[bazar dplyr lazyeval magrittr]; };
-  lpme = derive2 { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp RcppArmadillo]; };
+  lpme = derive2 { name="lpme"; version="1.1.0"; sha256="1mq1lf4vdlbxjax9p8k17vdkc2h3xslbbs17xzy10fbkdicljc10"; depends=[decon flexmix Rcpp RcppArmadillo]; };
   lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
   lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
   lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
@@ -6604,10 +6776,11 @@ in with self; {
   lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
   lsei = derive2 { name="lsei"; version="1.1-1"; sha256="1akvkccf2cq331agcsi24x3cw73cc8vdl7kw3zjyg8q6lmvq78am"; depends=[]; };
-  lsgl = derive2 { name="lsgl"; version="1.3.5"; sha256="0afg1n03zl00b0w87j4v8afp1q6h5d8kx8xgciy52dki4yvb1c3r"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
+  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.5"; sha256="0555za3yqqdbcpxrl6vzj494784xl1wsmwp1apszaqncz2vwc9pg"; depends=[ggplot2 lavaan reshape2]; };
-  lsmeans = derive2 { name="lsmeans"; version="2.25"; sha256="0akz77f4fhkarjf3nn4y3nfh1xflxjzj4jxaw4c7l4dhia7pji30"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
+  lsmeans = derive2 { name="lsmeans"; version="2.25-5"; sha256="1kiwp9z034s182d6d1hwv8gcr263i514jvr5hkj63wmk5fbjlcvw"; 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]; };
   lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
   lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
@@ -6623,12 +6796,12 @@ in with self; {
   lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
   ludic = derive2 { name="ludic"; version="0.1.5"; sha256="03ywna9fd2ypwchwx58ccmlxjdnx7zav7pqxwrc5bh3hrfbsxl13"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
-  lulcc = derive2 { name="lulcc"; version="1.0.1"; sha256="1xq4rjsds9vwj4prkjxfcp9sv53ha9pj65ns0frpbh8grvrjwimv"; depends=[lattice raster rasterVis ROCR]; };
+  lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; };
   lumendb = derive2 { name="lumendb"; version="0.2.2"; sha256="0x1k90h6aw7fpvmgbbdmkqvgxfnn4w5xxfck7f4r7zhaxfqbzp2s"; depends=[httr xml2]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
-  lvnet = derive2 { name="lvnet"; version="0.3"; sha256="17kp1r6dxajql8b7lzr8s6wv1gqvradbxivz5gnnhdkmx290asaz"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
+  lvnet = derive2 { name="lvnet"; version="0.3.1"; sha256="1bzykd70j8xbvpxqwdac49pv7ndvjqljwywhbf6sn3yvq72n3hlj"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
   lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; };
   lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; };
   lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; };
@@ -6638,10 +6811,12 @@ in with self; {
   mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
   mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
   mHG = derive2 { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; };
+  mMPA = derive2 { name="mMPA"; version="0.1.0"; sha256="1p9rzk1x5ldb3afr53f195vb4jdj8kw50rmv961k2jsw128mrzr5"; depends=[]; };
   mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
   mRMRe = derive2 { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
+  mRchmadness = derive2 { name="mRchmadness"; version="1.0.0"; sha256="0f6cb3d5dhp6b0dd0fshplp75jjbhx3v9r53pa8gmcfd10hvbqba"; depends=[dplyr glmnet Matrix rvest shiny xml2]; };
   mRm = derive2 { name="mRm"; version="1.1.6"; sha256="1d897c5xflbkkj25hw15rd62nggv000cv2j481x0lhdgmgldjhrh"; depends=[]; };
-  maGUI = derive2 { name="maGUI"; version="2.1"; sha256="16q6hiadqwwm7viz29kn420fi5ca5hx7azgrz0vsvv3bnr0y7aq5"; depends=[affy amap annotate beadarray Biobase BiocInstaller Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
+  maGUI = derive2 { name="maGUI"; version="2.2"; sha256="0b0iprpb4mnaj4lpaismr0f1rnq4m0b61imcx8mrffw9mx45qapv"; depends=[affy amap annotate beadarray Biobase BiocInstaller Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
   maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
   maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; };
   maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
@@ -6651,7 +6826,7 @@ in with self; {
   macleish = derive2 { name="macleish"; version="0.3.0"; sha256="05zmk28yh54gnm09aps3q64s4igcb629b3zx7giinlfc4xx8qv74"; depends=[DBI dplyr etl lubridate readr]; };
   mada = derive2 { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
-  madness = derive2 { name="madness"; version="0.2.0"; sha256="02swq1hzmsdcfjhlmjykd81cyygxfx4add9caj2q2z6xhmfh3rlv"; depends=[expm matrixcalc]; };
+  madness = derive2 { name="madness"; version="0.2.1"; sha256="1as5y9gpa4pr0r2hb0mw0gf7dy2779hqp1vghl53ccd8zj50i2fz"; depends=[expm matrixcalc]; };
   madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; };
   mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; };
   madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; };
@@ -6660,7 +6835,7 @@ in with self; {
   magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.0"; sha256="0f531qlwkp043qgwv58x1b07a3v03vnz0r20hlqqsx8z16jqw6i4"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="0.3"; sha256="06ljr1avgp0ki9d15rrlcdz6n0m8v5rx07aq3xqa5zmkqgm6s0a5"; depends=[curl Rcpp]; };
+  magick = derive2 { name="magick"; version="0.4"; sha256="15w904zqbdm8051xqg1s83pmimkan0wg7z5vdzm5h96mjsqf6wap"; depends=[curl 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=[]; };
@@ -6682,30 +6857,32 @@ in with self; {
   mapmisc = derive2 { name="mapmisc"; version="1.5.0"; sha256="1f6yjr3a26nm482ldnx8rzjhc0d9hlrpd48japm0sihxvmsz0pv3"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; };
-  mapr = derive2 { name="mapr"; version="0.3.0"; sha256="0xgbc4zpjdd6lncccdd85ar909z7bv8yqrv5s1xrp2j2j1gv97z1"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; };
+  mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
   maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; };
-  maptools = derive2 { name="maptools"; version="0.9-1"; sha256="0ma1diflrkq9wa6qjli6ncjn17b3rqrgjwq984dx5djy9f5bjf3f"; depends=[foreign lattice sp]; };
+  maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
   mapview = derive2 { name="mapview"; version="1.2.0"; sha256="0785jzs3kr6rcxz5p1mwpz7maq3z2mwxskl6whyzizbrkmxj2ikw"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet png raster Rcpp rgdal satellite scales sp viridisLite webshot]; };
   mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
   march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
+  marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.6"; sha256="024gbrdby6h722j58wl8xn8027sanlpnz1l3hhxnllwzbz3mbdz4"; depends=[seacarb shape]; };
   marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
+  margins = derive2 { name="margins"; version="0.3.0"; sha256="0i6c39acyyvxsx2lkza2afjyhpdlb9fx0zssr24g0xdk3f7c2dc2"; depends=[MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
   markdown = derive2 { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
   marked = derive2 { name="marked"; version="1.1.13"; sha256="0zgfd7fdcrvvqnlgzarly16zjnipshxsa1g3j9jqc5kbqvh7fnh2"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.6.1"; sha256="167q4fwn2ssqn588wx3ig923rcr74m95na1z1wdfy67jczsk492l"; depends=[codetools httr lazyeval testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.4"; sha256="12np5rg59wjyh1mfhhfh115ziciba973fjvbrhn4qzdnry1mwbdb"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.6.6"; sha256="165zh185fjgr61ah4y763816fai6g6phj64afdlklbsj5an1mvr9"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.9"; sha256="1wvwxczz51y0cr9f04myw0p8flhh2y68fxfy2cisp8hzdxk5a3xc"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
   marmap = derive2 { name="marmap"; version="0.9.6"; sha256="1b0mpygk18ri0xs9f56j2g7zmka7krnw7fmh9m9xisbvq2g23g92"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   mason = derive2 { name="mason"; version="0.2.5"; sha256="1v2gja8kbwzx5c8y8gchh4rwwprv99ad0nhgb0hnfgjnqsbdmdv7"; depends=[assertive broom dplyr lazyeval magrittr tidyr]; };
   matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
   matchMulti = derive2 { name="matchMulti"; version="1.1.5"; sha256="186ndliw32aqbcpacd1hjsab7dm38sxmgh77iyp203swif1iv6jn"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
-  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-2"; sha256="1kajwh81l4h30szdpg8y5178cswgp89zifh5nsw5480k6n2g6asa"; depends=[partitions Rcpp RcppArmadillo RcppProgress rJava]; };
+  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-3"; sha256="0jpx4k82h0mdhbwb1jc8g18qjsr9448m6d69zii99bdinsd637rv"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
   matchingR = derive2 { name="matchingR"; version="1.2.1"; sha256="09vx3yqaq0pq341v8rm2hjxx0aza0bnh9iffrygwbhls7fi7kn7y"; 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]; };
@@ -6716,7 +6893,7 @@ in with self; {
   matlib = derive2 { name="matlib"; version="0.8.1"; sha256="080mbmr1lb5ha5ql40hv0idcnnbyaai46c42z756kdyq9pdzcabf"; depends=[car rgl]; };
   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.51.0"; sha256="0bsalx605kgb9nl7mfnq1qinkyd9s97p8plymsyfja1gmcnjrcpj"; depends=[]; };
+  matrixStats = derive2 { name="matrixStats"; version="0.52.2"; sha256="19fjf19cr0p3j9pj17myz39zpi5bh7ci72db3la9my09n6k6mnir"; depends=[]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixpls = derive2 { name="matrixpls"; version="1.0.4"; sha256="1pysvf224wpkawdvz3y38cy8s3lg34s37ip6ybzfxm4vanzj1xjc"; depends=[assertive lavaan MASS matrixcalc psych]; };
   maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; };
@@ -6725,7 +6902,7 @@ in with self; {
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
   maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; };
   maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; };
-  mazeGen = derive2 { name="mazeGen"; version="0.1.1"; sha256="1vqhcypxbw15prc77i1jl8vnb1q3lr9bb9s6ql2pcadv3i02ybnb"; depends=[igraph]; };
+  mazeGen = derive2 { name="mazeGen"; version="0.1.2"; sha256="05lsb7ldk6nzmfaklbvkcb4n5sfnimgcv5vgilblw5awzhavj5vm"; depends=[igraph]; };
   mbbefd = derive2 { name="mbbefd"; version="0.8.8"; sha256="17f2y4xi5fxc6mms519xjb9qg94qqlxv0mhdbhjyyfg3x6bj7bsq"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
   mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; };
@@ -6733,7 +6910,7 @@ in with self; {
   mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
   mboost = derive2 { name="mboost"; version="2.7-0"; sha256="1gzn80ixvdv560zl2r6gzcpbjcvhnkmdpis1l4gvidd7amrfzfp2"; depends=[lattice Matrix nnls party quadprog stabs survival]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
-  mc2d = derive2 { name="mc2d"; version="0.1-17"; sha256="07gxh9lpkrxvq7m1vbh8k4l4ka7wqf40sbj1zv99avlsvh9aicya"; depends=[mvtnorm]; };
+  mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
   mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; };
   mcPAFit = derive2 { name="mcPAFit"; version="0.1.3"; sha256="0yg79sry8jdp17mbdnfaj2phg3vdxs11si7hmfh5csfk7maax8v6"; depends=[PAFit RColorBrewer Rcpp]; };
@@ -6749,8 +6926,8 @@ in with self; {
   mclcar = derive2 { name="mclcar"; version="0.1-8"; sha256="1hrjfjbsxh8g6bw2cfxciry8hn9xxfg4bww5p1sjq98v8bsqcx23"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
   mclogit = derive2 { name="mclogit"; version="0.4.4"; sha256="1nnzds9md3drcgblzpbg39a53v4npdbi0xp3xgw8xqfyy37nia59"; depends=[Matrix memisc]; };
-  mclust = derive2 { name="mclust"; version="5.2.2"; sha256="19cbg7p5h2b6h9mvcx9rjppyd3awma18ymaljakbnclpvhwbqpwd"; depends=[]; };
-  mcmc = derive2 { name="mcmc"; version="0.9-4"; sha256="1ws80j64df8inzz0a6k8r51wf44zwjnpvp591pxwah2jbi6j6kna"; depends=[]; };
+  mclust = derive2 { name="mclust"; version="5.2.3"; sha256="0045msdw1xndfmlylbnm1ss716iiqzqwj454a97gmcq5kph86qzz"; depends=[]; };
+  mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
   mcmcse = derive2 { name="mcmcse"; version="1.2-1"; sha256="18k2cp5hpr3lzv9yva5qc379iq9aysnl872dv8jidwrj4iy2xccy"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
@@ -6767,7 +6944,7 @@ in with self; {
   mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; };
   mdmb = derive2 { name="mdmb"; version="0.2-0"; sha256="13pkz0mjvd5gph1fpz3cd2yn5mb0lsvyjr7xr9bbikh11jqx80wb"; depends=[CDM coda miceadds sirt TAM]; };
   mdpeer = derive2 { name="mdpeer"; version="0.1.0"; sha256="0z84xm189v99frnayp4vr0qr7fr495sai5mjvyqpv9cbhvqn3xkr"; depends=[ggplot2 glmgraph glmnet magic MASS nlme nloptr reshape2 scalreg]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.1-1"; sha256="1fz80nc4xxd8q9zdfa38z159n35jf9y90ys39rgdzmc7ahqpkvh1"; depends=[clusterSim smacof]; };
+  mdsOpt = derive2 { name="mdsOpt"; version="0.1-2"; sha256="0afdlaw2gxi50psglgqb1k01ccv70x180dkwm78dzw6sjlz6fcjy"; depends=[clusterSim smacof]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
   mdsr = derive2 { name="mdsr"; version="0.1.3"; sha256="19ryy7cm2ia3xi54r0176n72y7w35dqml0l7ysi6qd8zy4yavkvx"; depends=[babynames DBI dplyr ggplot2 mosaic RMySQL]; };
@@ -6781,10 +6958,9 @@ in with self; {
   medflex = derive2 { name="medflex"; version="0.6-1"; sha256="0i3808qh4ryqcgx5rl60d4xdy25wzx008abijg5fcirsrdly7j91"; depends=[boot car Matrix multcomp sandwich]; };
   mediation = derive2 { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
   medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; };
-  medicare = derive2 { name="medicare"; version="0.2.0"; sha256="1z0ch704cw43hsp97j9mf6s0w9rpiv76swk7xlbiqcmyv7wivrhy"; depends=[]; };
+  medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
   mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; };
-  megaptera = derive2 { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[ape ips RPostgreSQL seqinr snowfall XML]; };
   meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
   mem = derive2 { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[boot sm]; };
@@ -6798,7 +6974,7 @@ in with self; {
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   metRology = derive2 { name="metRology"; version="0.9-23-2"; sha256="16hdcrqa15mf2cfgl6r9awd0y2kwrdbld8sxqmwnchlvdbm6gib4"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="0.0.1"; sha256="1mhdgrh4nc14avfsf1f4rpq8qxkgsd9v65dvhvqq7swykia9vsfv"; depends=[geosphere ggmap leaflet plotly RColorBrewer rjson]; };
-  meta = derive2 { name="meta"; version="4.7-1"; sha256="1b5g0rd5bllz3g4if7j5crgavz2a5mky5gchfpxyp0yl2jar4br3"; depends=[]; };
+  meta = derive2 { name="meta"; version="4.8-1"; sha256="1zk1c9vrx23qgbhir6bzi26fa3gfky4gyhq7f0s8sk96h6g568kj"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.5"; sha256="0hwzwyzr23sqlqpx2372419167wad1q7spyzmcxhf4f5hmqv14c9"; depends=[caTools shiny shinyBS sp]; };
   metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
@@ -6807,34 +6983,35 @@ in with self; {
   metaSEM = derive2 { name="metaSEM"; version="0.9.12"; sha256="1lmsqpfb1yxdlwb2qhcsm7111w25qlz6794i2pwf5wmaixwyw0nj"; depends=[ellipse MASS Matrix OpenMx]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
   metacoder = derive2 { name="metacoder"; version="0.1.2"; sha256="0srrmmn86jpxdx463qngd1fj8ssnly18kb74csa9957n1lr0l9xf"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; };
-  metacom = derive2 { name="metacom"; version="1.4.5"; sha256="1c79sm0b00mm723g3h9llxlk33zk6f9yv6z10jx1la6kk1cgs7a2"; depends=[vegan]; };
+  metacom = derive2 { name="metacom"; version="1.4.6"; sha256="0qqjfy5cqfpyd5906d49rkc67zrj8rp28zk2ii49dwddi2nhj4yy"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="1.9-9"; sha256="14287z65ffm013787wfnyb9842zcv63i97g445xa4j8075p8sp7p"; depends=[Matrix]; };
   metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; };
-  metagear = derive2 { name="metagear"; version="0.3"; sha256="0xhaqpyhix7akk4vmb1zxi69g1j7c2h8d5fk547qfx7nqaiwzh53"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; };
+  metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; };
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
-  metamisc = derive2 { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; };
+  metamisc = derive2 { name="metamisc"; version="0.1.4"; sha256="0v2yrdvj6lm4fhfpxd8fnnrvbdph8cb1v27yhp4w8sf1d6mq2lwc"; depends=[bbmle ellipse lme4 metafor mvtnorm survival]; };
   metansue = derive2 { name="metansue"; version="1.2"; sha256="0gcysmi4lvl4496vygc7v58pd4sgz013mr8nqb870s861jwjj31v"; depends=[]; };
   metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
+  metaplot = derive2 { name="metaplot"; version="0.1.1"; sha256="00pc7ljhhlcng4dq57a7a5ppfswid1lnnxza2yjrylf6hsh37ids"; depends=[dplyr encode fold lattice lazyeval magrittr]; };
   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]; };
   metasens = derive2 { name="metasens"; version="0.3-1"; sha256="0nxvllfa2x6v2hpgind5xr0i40wi7cpdd18lwgy9s4jpgbn0n17p"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
-  metavcov = derive2 { name="metavcov"; version="1.0"; sha256="183xrrdz8agwcxgn8i4jg28f8gqskim9wcz193524fjhcm4bklxr"; depends=[corpcor]; };
+  metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.1.0"; sha256="1cl44dvd625sfz906cggrj092bxy35vsiglalsay9frsi440d82p"; depends=[ggplot2 plyr RColorBrewer]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
-  meteoForecast = derive2 { name="meteoForecast"; version="0.50"; sha256="19yzfvaj4h5l70j54nlivq5dvp5psp43y5d2l978ai6pwvmi291a"; depends=[ncdf4 raster sp XML zoo]; };
+  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.5.2"; sha256="17sfi14q5cp74cmlvhbyg6xlpiw9ssqc4kp48r41allk38dfk1zd"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
+  meteoland = derive2 { name="meteoland"; version="0.5.9"; sha256="1kjnwl1mhp5zwfgfngc48388xdppv96b9clnk7r9l714nk58mq10"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.2"; sha256="1n64l69w5skbymizm5ghq50gwhpasyk9zmywib6hkd9k5ijgayv5"; 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.1"; sha256="0wmycy87v0hry7vzyz3vjpjq8cx7nraigihwch04nfhpg6x4zal8"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.2"; sha256="1rdljq4069n7i05sqi75bcp1zpq69m13vf1nrjfg568cpwmr4m37"; 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]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
-  mexhaz = derive2 { name="mexhaz"; version="1.1"; sha256="168a8b3y17nh2dalqanph384laf2awv3jdk8dm9cl5jbkh7ah4lb"; depends=[MASS statmod survival]; };
+  mexhaz = derive2 { name="mexhaz"; version="1.3"; sha256="1sqys7k6hrs892b50cn54q2k3vnlmgz1467rdwaksailhhizpbc5"; depends=[MASS numDeriv statmod survival]; };
   mfe = derive2 { name="mfe"; version="0.1.0"; sha256="06x6csf3pr1vdmmimg6f7iffrivj8wcdfafvld7nrzbkl09cbfbn"; depends=[C50 class e1071 infotheo MASS rpart]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
@@ -6854,13 +7031,15 @@ in with self; {
   miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
   miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
   miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
-  micEcon = derive2 { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
-  micEconAids = derive2 { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon miscTools systemfit]; };
+  micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; };
+  micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; };
   micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
+  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.30"; sha256="1r673x51vs3w7kz4bkp2rih4445hcmajw86gjwz7m2piajwvs817"; depends=[lattice MASS nnet Rcpp rpart survival]; };
-  miceadds = derive2 { name="miceadds"; version="2.3-0"; sha256="0jmj5zrggbyp5yaqn96naicfm6ajir3ybs9j1028vxdj2wyapz13"; depends=[blme car CDM foreign grouped lme4 MASS MCMCglmm mice mitools multiwayvcov mvtnorm Rcpp RcppArmadillo sirt sjmisc TAM]; };
+  miceadds = derive2 { name="miceadds"; version="2.4-12"; sha256="0bav0jbawy1jnr7gms2mcr651g9azrkx2870slnzf75bjrlm054g"; depends=[blme car CDM foreign grouped lme4 MASS MCMCglmm mice mitools multiwayvcov mvtnorm Rcpp RcppArmadillo sirt sjmisc TAM]; };
   micompr = derive2 { name="micompr"; version="1.0.1"; sha256="1380x9jp5lpc6n6bjvhmkwlb59ch7q59r3bc6f0i5j2kpaairbc4"; depends=[]; };
+  microPop = derive2 { name="microPop"; version="1.1"; sha256="1ib4jiyrn4kb0llyx95byd1bi34hy1bxi9w1796c6wpa49dbxvpp"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
@@ -6876,7 +7055,6 @@ in with self; {
   migest = derive2 { name="migest"; version="1.7.3"; sha256="1g49b4fa2974w8alb97k06k3zi49q66n16cvcbqdaj9j21c9qfmy"; depends=[]; };
   migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
   migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
-  milonga = derive2 { name="milonga"; version="1.0"; sha256="1pkmh1mabqag38xzw2s86x9c6pr83wlmh4f45s7km5g0j1zllrd9"; depends=[MCMCpack]; };
   milr = derive2 { name="milr"; version="0.2.0"; sha256="1fhpnibs99045fcphydgdh7mdbpclbskbb74zlvhpbr6q8hh70hd"; depends=[assertthat glmnet numDeriv pipeR purrr Rcpp RcppArmadillo]; };
   mime = derive2 { name="mime"; version="0.5"; sha256="0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"; depends=[]; };
   minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; };
@@ -6892,7 +7070,7 @@ in with self; {
   minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; };
   minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
   minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
-  minval = derive2 { name="minval"; version="0.5"; sha256="1pbcfcaysaicppkzvnllvvx2jykc17nk3331n0rl41x56jxcjsgd"; depends=[gdata XML]; };
+  minval = derive2 { name="minval"; version="0.6-1"; sha256="0m907wff5mk533p5w2q067ji86dh7xskv43glcfbiq8bhbg4qw5h"; depends=[]; };
   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.23"; sha256="13dx1ir09lmvapjv6igya71w5yp6r41yzpcdnbdk5jqyyqidnian"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
@@ -6902,19 +7080,19 @@ in with self; {
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
   miscTools = derive2 { name="miscTools"; version="0.6-22"; sha256="1sngkl5rwg1vp2xx9a5g2nz2nhwxwv7ni21ww7hyjc8x5mhb42yh"; depends=[]; };
   misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; };
-  miscor = derive2 { name="miscor"; version="0.1-0"; sha256="0kgdsqcqdfi7976qc2f2r6z68z6znrgwgcr801cfkqql8s0wksfj"; depends=[PoisNonNor]; };
+  miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; };
   miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; };
   mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; };
   misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; };
   missDeaths = derive2 { name="missDeaths"; version="2.2"; sha256="0gkzq7jpqkfcvc40i0xdjxmwmn1mpd7p4hik4fqz22q3pvmhmmwn"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-  missMDA = derive2 { name="missMDA"; version="1.10"; sha256="1wqb5badqcs6yj2c7llbhbssdzg0irjzfcjasfrq1zg0lk82zafj"; depends=[FactoMineR mice mvtnorm]; };
+  missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; };
   mistat = derive2 { name="mistat"; version="1.0-4"; sha256="0gzng0kl3handy3k7g62c4sdcf9l6x0b69jxmfrwfd4297f57n9n"; depends=[]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
-  mitml = derive2 { name="mitml"; version="0.3-4"; sha256="0lwy87f0v43i6fpbhl85vg9x5mvll8bllcm6q2qj06nk7yy25573"; depends=[haven jomo pan]; };
+  mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; };
   mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
   mix = derive2 { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
-  mixAK = derive2 { name="mixAK"; version="4.4"; sha256="0aj1x80kxwksn7as6lfncl6ar218hnbcs8vbxwiqp1lh4il74iiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+  mixAK = derive2 { name="mixAK"; version="5.0"; sha256="1lb3ivcl64vny21gifll6sc2yaf970mvb1hwlch1k49125ybxz5q"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
   mixOmics = derive2 { name="mixOmics"; version="6.1.2"; sha256="1f5053xpp674g2dn54rl1yz3knb5i1824dj5v213y6i82m2vygc6"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
   mixR = derive2 { name="mixR"; version="0.1.0"; sha256="16rl1ggavs1qfq4i3jm85acd0w2zbiacnvnnim3vi3kqa9i09byy"; depends=[ggplot2 Rcpp]; };
@@ -6933,7 +7111,7 @@ in with self; {
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
   mixsmsn = derive2 { name="mixsmsn"; version="1.1-2"; sha256="02hincq7bflmyvdahjmkcdpr6vwxjw5hrbvld38riwv2kw4wmn4l"; depends=[mvtnorm]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
-  mixtools = derive2 { name="mixtools"; version="1.0.4"; sha256="133rr17ywmlhsc6457hs8qxi8ng443ql9ashxpwc8875gjhv1x32"; depends=[boot MASS segmented]; };
+  mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
   mixture = derive2 { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
   mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
@@ -6942,7 +7120,7 @@ in with self; {
   mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
   mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
-  mlVAR = derive2 { name="mlVAR"; version="0.3.2"; sha256="07jxggh5qds0b7by61m1xiyx3lxffpgzl3knk97q8fafw46dg1r4"; depends=[abind arm clusterGeneration corpcor dplyr lme4 mvtnorm plyr qgraph]; };
+  mlVAR = derive2 { name="mlVAR"; version="0.3.3"; sha256="1psw3kcfq23c4i1qq4vfgjwd1lgjhhhly6bwz37ky5l753lvl9yf"; depends=[abind arm clusterGeneration corpcor dplyr lme4 mvtnorm plyr qgraph]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
   mldr = derive2 { name="mldr"; version="0.3.22"; sha256="0q5dpqx6zapawjjq8rqk112w5qsk7r6sc90y63yvllk9yhdgygyw"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.15"; sha256="1xivwmv6hvl026c5ymc23fr36sk797dxn2wa9lp20dgh5s0cq10n"; depends=[]; };
@@ -6958,13 +7136,14 @@ 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.10"; sha256="1brylz7x10wyi0k4cdh9qkjv73yz8g67ib8flzw9dcd9i15ppgbv"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; };
+  mlr = derive2 { name="mlr"; version="2.11"; sha256="1fs62xzxgk75k3b4wkxh2qkij03m5i1bbmacgffwq4xak3mr64ma"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; };
+  mlrMBO = derive2 { name="mlrMBO"; version="1.0.0"; sha256="1id99p3dxs6z9wq8xwk16xg99kwv4nw0mdyfammin4nnwwbkggsd"; 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.1-2"; sha256="0z7gvg31by1xbw6yqxfs2hvfw7l0392gsrislah05bjay482b01q"; depends=[basefun BB numDeriv quadprog sandwich variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="0.1-4"; sha256="15gc27rgw728f005wriik3dixw4f38krjg0zy0fx5macij3fbc7z"; depends=[mlt numDeriv]; };
+  mlt = derive2 { name="mlt"; version="0.1-3"; sha256="0195v5hl3vljc4vwybkrw9z43pfh3n1awixryf5ysv0xc6ksm7bi"; depends=[basefun BB numDeriv quadprog sandwich variables]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="0.1-5"; sha256="0clgrrcdi0ij23nn7pzbv901paxy092pbr3g987c2ij22sh32l7n"; depends=[mlt numDeriv]; };
   mltools = derive2 { name="mltools"; version="0.2.0"; sha256="0q7k4gkvswlkvjjvjpaw72cx7wjb26yjpap1yqbdq9b3gq32w02j"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="3.1.0"; sha256="1xdv7s6li1kwn8m4dnhz18rhmhv13y128npcfmfka646l0p5g1r9"; depends=[ggplot2 Rcpp XML]; };
-  mma = derive2 { name="mma"; version="4.0-0"; sha256="1dj9z9brmqrfl4ah27cjwksh16b6nww033wwf741hiadr5jl13pn"; depends=[car gbm gplots survival]; };
+  mma = derive2 { name="mma"; version="5.0-0"; sha256="1k65ar8nhv7ya254ap94hbx91siqcwxlg3yac85xxxs9rr6b27bf"; depends=[car doParallel foreach gbm gplots survival]; };
   mmand = derive2 { name="mmand"; version="1.4.1"; sha256="1gkn0dhfffsa2bsrm6wy21l1w17x6h3znfn4a8s8yvgggwnq4030"; depends=[Rcpp reportr]; };
   mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
@@ -6972,15 +7151,15 @@ in with self; {
   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.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; };
+  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]; };
-  mmod = derive2 { name="mmod"; version="1.3.2"; sha256="1yq3cvkfsqmiiqqzyisfiyzfcd2jdp7xv19rydpqaq4qb6322ljg"; depends=[adegenet pegas]; };
-  mmpf = derive2 { name="mmpf"; version="0.0.2"; sha256="0cw45rfrcb2f3ghfkkxm3gzdms7mn7rl4gmqnr4jbxyqca263aza"; depends=[checkmate data_table]; };
+  mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
+  mmpf = derive2 { name="mmpf"; version="0.0.3"; sha256="0mwsnhz1f62l8msisz9m1aln7w24rg9844bxh07g2y7sa29ls1lp"; depends=[checkmate data_table]; };
   mmpp = derive2 { name="mmpp"; version="0.4"; sha256="120ciyd9c6zwbdvzcpasb1476d0i9h28a1a5c99z3zar8lpp184p"; depends=[]; };
   mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; };
   mmtfa = derive2 { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
-  mnis = derive2 { name="mnis"; version="0.2.1"; sha256="0jacjwz68667k5066v6lv1dhw946mjnvff53j2l8vdsxzm34hbc6"; depends=[httr jsonlite plyr]; };
+  mnis = derive2 { name="mnis"; version="0.2.3"; sha256="03ka16wmgcgzplp1gj76irbg3j7302jd1jw71dlghngx6ic337yh"; depends=[dplyr httr jsonlite Rcpp tibble]; };
   mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
   mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
@@ -6997,24 +7176,25 @@ in with self; {
   modelr = derive2 { name="modelr"; version="0.1.0"; sha256="1vrhszix1kq5p02i044vjlbpmkdgn6ifg1jk00if7bn33sb872vy"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
+  modeval = derive2 { name="modeval"; version="0.1.3"; sha256="10yjba2dlwrgd3ycw10y1sa3xdxf2spq829bbxwfissc5l9gk48x"; depends=[caret dplyr e1071 ggplot2 gridExtra knitr magrittr mlbench ModelMetrics psych purrr stringr tibble]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
   modules = derive2 { name="modules"; version="0.5.0"; sha256="1dwvwdfshhdv7fk346l8czbkq0f1im0xfci3pzzinkdlfi3m0h2a"; depends=[stringr]; };
   modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; };
-  moezipfR = derive2 { name="moezipfR"; version="1.0"; sha256="192gmn591g7fn0v2kp6i20rpziyf81mgq1gqwvwsrcc7lnbgrw04"; depends=[numDeriv tolerance VGAM]; };
+  moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; };
   mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; };
-  mokken = derive2 { name="mokken"; version="2.8.4"; sha256="1c3jjsbs8wp2z701y9qmr6v6q90achlchpbfwf31skj6bg2y85zm"; depends=[poLCA]; };
+  mokken = derive2 { name="mokken"; version="2.8.5"; sha256="1f45yacq50g0xfvipv3vxrcy20d69q2ijvnx1byxphzfkqjvrlj4"; depends=[poLCA]; };
   moko = derive2 { name="moko"; version="1.0.0"; sha256="0nsj83hn0kflsw15ghw6b5zjsd875vj9vj7i0ag67cn2n82yncb5"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; };
   molaR = derive2 { name="molaR"; version="4.2"; sha256="1xz4vfb9rkw731cxjqvh7hpcm2lly9hmxp951il536gwb665jh1j"; depends=[alphahull rgl Rvcg]; };
-  mombf = derive2 { name="mombf"; version="1.8.3"; sha256="0pbbklhvc4hlw2rpf4vg0p8c9bcq2cd5yxm6x6sbqdf3709ffy6j"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
+  mombf = derive2 { name="mombf"; version="1.9.4"; sha256="1vmi3nfhqgdck0haacdjrssqx94w11wh3wc74shlg1ma3dpik1rg"; 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=[]; };
   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.0"; sha256="02m9909wkwbyc0w1jhvlib7jmwslq16n49a22bq9pdriaq4rmb8m"; depends=[jsonlite openssl]; };
+  mongolite = derive2 { name="mongolite"; version="1.2"; sha256="19zhscsgqvzx5gqryzl82dw6impc6sacx2shanmnj4zfgs7bgwqr"; depends=[jsonlite openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.5"; sha256="1rqcdg4gha5vh3dvxqzr2albi2capm18rkgf79rd769hrk3z09l5"; depends=[tuneR]; };
   monkeylearn = derive2 { name="monkeylearn"; version="0.1.1"; sha256="1w0d4cvd1y3wal8r0hg8w08x1zqzkv7ag8nyplmkqv9vwc15qd26"; depends=[digest httr jsonlite tibble]; };
-  monmlp = derive2 { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; };
+  monmlp = derive2 { name="monmlp"; version="1.1.4"; sha256="09rjv0d1z6v1qxl0csnip53gc00y23r59xbspn8fqwrwjd1v30l1"; depends=[optimx]; };
   monogeneaGM = derive2 { name="monogeneaGM"; version="1.1"; sha256="0fbz26jx05xmna799s086khy6j8xbvv91vh544npd49isnag1v6v"; depends=[ape circular cluster geomorph gplots phytools rgl]; };
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; };
@@ -7033,7 +7213,7 @@ in with self; {
   mousetrap = derive2 { name="mousetrap"; version="3.0.0"; sha256="06xadwhcpvqji2qdg2a9xnwq5n3qnyfhziifaaargpzzaz25nvmf"; depends=[cstab diptest dplyr fastcluster ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
   movMF = derive2 { name="movMF"; version="0.2-1"; sha256="1yrjz76bwhziwdj2xdibr3lxcka4nq32b6rq3m9q0vkv9gspmw6v"; depends=[clue skmeans slam]; };
   move = derive2 { name="move"; version="2.1.0"; sha256="1dk83wdfwmxwr6zhy574h9n95kss0b0bprqd20gwwfk27mfjmc8h"; depends=[geosphere httr raster Rcpp rgdal sp]; };
-  moveHMM = derive2 { name="moveHMM"; version="1.3"; sha256="1idna90fw1i8g8cnhzxnqvb6bh8w51h426ngknrv8bh1skl09fck"; depends=[boot CircStats ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; };
+  moveHMM = derive2 { name="moveHMM"; version="1.4"; sha256="10sylvcmbbf599klmc11ayzh4r94dxl74xc5n61b8n6mbrsmmi2l"; depends=[boot CircStats ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; };
   mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; };
   mpMap = derive2 { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
@@ -7055,25 +7235,28 @@ in with self; {
   mrMLM = derive2 { name="mrMLM"; version="2.1"; sha256="0ip8xd2dj6d4hxq18pf4j6mk4yl00ajci72rr485wk94cr0zj5hy"; depends=[ggplot2 gWidgets gWidgetsRGtk2 lars MASS ncvreg openxlsx qqman RGtk2 RGtk2Extras stringr]; };
   mra = derive2 { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
+  mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; };
   mrds = derive2 { name="mrds"; version="2.1.17"; sha256="1vs9fldk9gcwvd1acwswzvblnkdm4bv3jmaamlrp3ik6vyd6xjvv"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.4"; sha256="1xlgbjm339wr2rs5i6ddyp1lmfgzjb53gw44c3cj1x5qx1jrp7b1"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
-  mrfDepth = derive2 { name="mrfDepth"; version="1.0.2"; sha256="0byfcny476zmf11h5aynwix4fshy22aymrw93kybmpvffscjvq3x"; depends=[geometry ggplot2 matrixStats Rcpp RcppEigen reshape2]; };
+  mrfDepth = derive2 { name="mrfDepth"; version="1.0.3"; sha256="0d7qz2fvqs28w3ibgfr4j1zjhhbbw78il22i7pl474rpqas3kz2r"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppEigen reshape2]; };
+  mrgsolve = derive2 { name="mrgsolve"; version="0.8.6"; sha256="0iv093j9jfpq82qs57kp7clxvsa23iipww2gd9vlqmv8pl9zc0cn"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; };
   mri = derive2 { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
   mritc = derive2 { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
+  mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; };
   ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; };
   msBP = derive2 { name="msBP"; version="1.2"; sha256="1sp8njnvv42q8fkcsjzpfg9p9dzz0hjsn2a6b9kfaymx7zvks2sq"; depends=[DPpackage]; };
   msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
   msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; };
   msaR = derive2 { name="msaR"; version="0.2.0"; sha256="1yj70wxpqbjiwfskb68nx2criz3v426b1wnc9bnsl9cr417zhn9s"; depends=[ape htmlwidgets]; };
-  msaenet = derive2 { name="msaenet"; version="2.4"; sha256="045f38fzlxsawsssyvp7122dc44hvzyha05js7xzb5zg1pq0i1qv"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
+  msaenet = derive2 { name="msaenet"; version="2.5"; sha256="0417aaqf3v5c5k3r39387maqvhky7f0wkwhdbxk8cylgkip1ls2k"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
   msarc = derive2 { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[AnnotationDbi gplots RColorBrewer wordcloud XLConnect]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
   mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
-  msgl = derive2 { name="msgl"; version="2.3.5"; sha256="0lihvgh86r3swfma6msjbsmfc14b1p1h16v6pkd53v5q3dp4asld"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
+  msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   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]; };
@@ -7085,18 +7268,21 @@ in with self; {
   msmtools = derive2 { name="msmtools"; version="1.2"; sha256="0pci771mkz9zaf5dbpd9lddpyfffimwsa3mql2z5sbx2xlrycvqj"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
   msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; };
+  mstR = derive2 { name="mstR"; version="1.0"; sha256="0c189ia2mbhn183j0vbqxhwb20ww64fj11pq7p2cd55zfih4kp4b"; depends=[]; };
   mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; };
-  mtconnectR = derive2 { name="mtconnectR"; version="1.0.1"; sha256="151gybpl7d44syk7xclyhy169na58lab7l5vynrf1ark79xidwa3"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; };
+  mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
   muRL = derive2 { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
   mudata = derive2 { name="mudata"; version="0.1"; sha256="1906g4mmv3k2pkzq0y2dr1ahlrdvprw8qyxfkmmkll22qn9pmaqa"; depends=[dplyr ggplot2 jsonlite plyr reshape2]; };
+  mudfold = derive2 { name="mudfold"; version="1.0"; sha256="1zh9qh2ja91lk2z4lpkqinn63v577qivbl0qh3xixfr63primby7"; depends=[ggplot2 gtools reshape2 zoo]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
   multcomp = derive2 { name="multcomp"; version="1.4-6"; sha256="18pd5v288g4d3kyp1wg0fv6ypyhqq9y17fdxkj0ljsj1f7kgp7py"; depends=[codetools mvtnorm sandwich survival TH_data]; };
   multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
+  multdyn = derive2 { name="multdyn"; version="1.5.1"; sha256="1rqvfgz3lcjb1lgzp2w6wzqdysj4c1qrw77nrdc14pgm59g2vvvl"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multgee = derive2 { name="multgee"; version="1.5.3"; sha256="0m7qgpygsax6f2gakrq19bkxvkl9kn8s4n3wy5lbijx01bay9jg2"; depends=[gnm VGAM]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
   multiCA = derive2 { name="multiCA"; version="1.0"; sha256="1b4m4faaq57k322m7i7y0jqgj7mz4ch39fsn1via7cnd1rrzavq1"; depends=[bitops]; };
@@ -7104,7 +7290,6 @@ in with self; {
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
   multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
   multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
-  multic = derive2 { name="multic"; version="0.4.3.1"; sha256="16nzvwnh3qjpvzljanzfcz3flvnlir269ss7pic3c6krg6j4m480"; depends=[]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
@@ -7116,7 +7301,7 @@ in with self; {
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
   multinet = derive2 { name="multinet"; version="1.0"; sha256="1ydwb86dylywj76sqsl1yy08mzgj8vqj1gkv9q683i9wc4k74281"; depends=[igraph Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
-  multipanelfigure = derive2 { name="multipanelfigure"; version="0.8.3"; sha256="1mjjy1ql8hxb4lfbbh5njly5wswrkf9d63dw24avk9kn7skfmk4h"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
+  multipanelfigure = derive2 { name="multipanelfigure"; version="0.9.0"; sha256="1vblwn15817xxixbcy2smsp51cjyfvh34c1v9ddxypj9ycx09zd3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
   multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; };
   multiplex = derive2 { name="multiplex"; version="2.5"; sha256="1yp9n2yzyjrp68fmhv8fgm5qvc4m39qfmw0lnksammmc44hlm12g"; depends=[]; };
   multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; };
@@ -7125,7 +7310,7 @@ in with self; {
   multisensi = derive2 { name="multisensi"; version="2.0"; sha256="11al13flm3ywgfpj6s6g2jc38bw6pbalf6k5xgix05bgkdd5647s"; depends=[knitr sensitivity]; };
   multisom = derive2 { name="multisom"; version="1.2"; sha256="0j993zxpj7q4am6w0w6i6r1ilk47rb5lv9ywyrz98mzm8rfpm4k0"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
-  multitaper = derive2 { name="multitaper"; version="1.0-12"; sha256="011qpkwpjclfc24y2qqigmdnikqwdnanflfhihigh5b5k7qwgm5j"; depends=[]; };
+  multitaper = derive2 { name="multitaper"; version="1.0-13"; sha256="1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5"; depends=[]; };
   multivator = derive2 { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
   multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; };
   multiway = derive2 { name="multiway"; version="1.0-2"; sha256="03cj4767xd1918vb4jkp7xk2l4gq340c0kc24h40zq4c3gsxwmbw"; depends=[]; };
@@ -7152,7 +7337,7 @@ in with self; {
   mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
   mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
   mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; };
-  mvctm = derive2 { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
+  mvctm = derive2 { name="mvctm"; version="1.1"; sha256="00lrnqnzpnvrl84b41ai33iwpyb4qzpjyqrw1d18hj6szybdfhsv"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
   mvdalab = derive2 { name="mvdalab"; version="1.2"; sha256="0jgvpspvfj4m79rn8bfb7rihh6w948b7z66qisckdmv6wyxwwr4i"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
   mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; };
@@ -7178,7 +7363,7 @@ in with self; {
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.4"; sha256="09v3cx2scp8fjcjzsdf7k2xl5y2491hbp25mnbjvm6v16hi2g180"; depends=[Rcpp shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-  myTAI = derive2 { name="myTAI"; version="0.4.0"; sha256="15ax5hwgqqyf5qmpmnjqvszwxyvvasmmxc03m53f7gdnpmv2wpg8"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp readr reshape2 taxize]; };
+  myTAI = derive2 { name="myTAI"; version="0.5.0"; sha256="1lnqpp06qvwg2qrf4ilh059gkv105zkpcz2yrhzg4xl6581mz455"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
   mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -7193,9 +7378,9 @@ in with self; {
   naivebayes = derive2 { name="naivebayes"; version="0.9.1"; sha256="051mg1idim75k181v4n8s5rji94rwy9c75yjkavjhr4brhizqy8f"; depends=[]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
-  nanotime = derive2 { name="nanotime"; version="0.1.1"; sha256="1jir0hhksa4shfn7paln9s3ccsmmyl70hlsk9q5glwi87j6mhlnn"; depends=[bit64 RcppCCTZ zoo]; };
+  nanotime = derive2 { name="nanotime"; version="0.1.2"; sha256="1faiqjbgp1qyr8wpqwwzynl8rcrkzh680j2vqczzg3d7fvcwvl34"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
-  narray = derive2 { name="narray"; version="0.1.1"; sha256="0n620wzhmlyjkbbwr0py2xfk0vj59a5zyr4d93iyplcrjg91n6zg"; depends=[abind pryr reshape2 stringr]; };
+  narray = derive2 { name="narray"; version="0.2.2"; sha256="0cxibb8lhv3in44xxln3fw6rf8c9a18bdhcdiyp3cpcm83h22nh7"; depends=[abind pryr 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=[]; };
   nat = derive2 { name="nat"; version="1.8.7"; sha256="14mfjlhf08ypbml8zqz90z80dljqk9ns7mk1h0s0fma308xwab7m"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
@@ -7208,14 +7393,14 @@ in with self; {
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
   ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; };
-  ncar = derive2 { name="ncar"; version="0.3.1"; sha256="1mlqmz4737827dl131lqg5mbn8sk4ghiazlicdp99cjq5vr8fk7h"; depends=[dplyr Hmisc lubridate measurements tidyr]; };
+  ncar = derive2 { name="ncar"; version="0.3.4"; sha256="1q9744gj0mj7w6b28mala7lzmxy8q99jkkpi3png2awwr2ilznw7"; depends=[rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
-  ncdf4 = derive2 { name="ncdf4"; version="1.15"; sha256="0kad69py4nhlsl4xmsfdisx0kzcjch91c0m786h80v3w67s9i0nm"; depends=[]; };
+  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]; };
   ncf = derive2 { name="ncf"; version="1.1-7"; sha256="0r3xhpinkcnkzc855q8ddd889v12snx4n1g8jyw9cnmrki8n2hxh"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
-  ncvreg = derive2 { name="ncvreg"; version="3.8-0"; sha256="19yir4bwinpd6rgk6ncg3x42qpx3d884f91qq9gl16y9kc4blp87"; depends=[]; };
+  ncvreg = derive2 { name="ncvreg"; version="3.9-0"; sha256="0z6zh2jhgf7yj4ajmhggbf6v522jg5cc0dd56bbxakypvl7mhzfq"; depends=[]; };
   ndjson = derive2 { name="ndjson"; version="0.2.0"; sha256="1y6hjcip18mazss7g888pydywb07hkfrk6ams0sm71yckyc865lb"; depends=[data_table dtplyr Rcpp Rcpp11]; };
   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]; };
@@ -7230,35 +7415,37 @@ in with self; {
   neotoma = derive2 { name="neotoma"; version="1.6.2"; sha256="023dpcrhhq8daa0c4viccqs9y19gi05srz4d985diaq7yxjs9vhz"; depends=[analogue httr jsonlite plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
+  net_security = derive2 { name="net.security"; version="0.1.0"; sha256="0p9hh89bp0s6v8i8zkm5s4lm5sg6p6z0q8ww2c23qb81038pak3k"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; };
   netClass = derive2 { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
-  netCoin = derive2 { name="netCoin"; version="0.2.2"; sha256="18ffpkcqhpw3b5jrlv63av8v2hhpgz8pqvg5mwc5mmqgar0cffb0"; depends=[igraph Matrix]; };
+  netCoin = derive2 { name="netCoin"; version="0.2.5"; sha256="0bhn7jhwr5jf8hmw4n86fg4994bhcjd6awcx96gm2qgf1j5r2m44"; depends=[igraph Matrix]; };
   netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; };
   netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; };
   netdiffuseR = derive2 { name="netdiffuseR"; version="1.17.0"; sha256="15yq903li51s2mbjp7bqrvk2zcf2yjmvvma2ynp325aqhwgvisf7"; depends=[boot igraph MASS Matrix network Rcpp RcppArmadillo sna SparseM]; };
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; };
-  netmeta = derive2 { name="netmeta"; version="0.9-2"; sha256="1hzmlac8kpgh27783fir27dwvzga1v00098qy8z955iy4nkpm1pq"; depends=[magic meta]; };
+  netmeta = derive2 { name="netmeta"; version="0.9-4"; sha256="04p59iwhibaqhcwr39axlhjl7h704fpckh4rfqiqfv87p7wyifwj"; depends=[magic MASS meta]; };
   nets = derive2 { name="nets"; version="0.8"; sha256="10h6sqy9jw2a909nzmzd5x9cjg3w4wpqwikp23k4q9fj71aswd5v"; depends=[igraph]; };
   nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
   network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; };
-  networkD3 = derive2 { name="networkD3"; version="0.3"; sha256="0g1l8a6qlpxylxnnavjcwdjx6v8nxkxzigilywyqhqhmpcsnp7bg"; depends=[htmlwidgets igraph magrittr]; };
+  networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
   networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; };
   networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
   networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; };
   networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
+  networktools = derive2 { name="networktools"; version="1.0.0"; sha256="00zp2mvxn3pgac6wdyhra64fk3i0h3vhf5f7y1v0pvdhhrz3wk6z"; depends=[devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; };
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; };
-  neurobase = derive2 { name="neurobase"; version="1.9.2"; sha256="048z1m8kx5g91v6hram4xchyfa28kkp8cjc8rkdvs6r1wrflp0a3"; depends=[matrixStats oro_nifti R_utils RNifti]; };
+  neurobase = derive2 { name="neurobase"; version="1.13.2"; sha256="1sv2kxahw123f6a7cl35n6dyz4ip8iifzk4dcp6jf8fnnnjyg8aq"; depends=[matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
-  neuropsychology = derive2 { name="neuropsychology"; version="0.3.0"; sha256="17jil4xsys676n73icpx5b9d1jilqq190xcdqjq7da11pvig76i9"; depends=[BayesFactor dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png prettyR tm wordcloud2]; };
-  ngram = derive2 { name="ngram"; version="3.0.2"; sha256="01ji3whn10m6z29vhi01vpjl09ci1r52arrjp73s7z3y0l6pj9r7"; depends=[]; };
+  neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; };
+  ngram = derive2 { name="ngram"; version="3.0.3"; sha256="03jfi07b7wzh2ydrrim9d9laragc9a7mri2gqmnqbf98f74s8vkn"; depends=[]; };
   ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; };
   ngspatial = derive2 { name="ngspatial"; version="1.1-3"; sha256="08g1786vxb544r6i6mccd4gzzgcq35m0af65326m82xxyffiv6gw"; depends=[batchmeans lattice Rcpp RcppArmadillo]; };
   nhanesA = derive2 { name="nhanesA"; version="0.6.4.3.3"; sha256="09mpxmk8w48hc14167jd2xifnj0kjz9h3h76bdnbb33wvhkn4jld"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
-  nhlscrapr = derive2 { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; };
+  nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; };
   nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
@@ -7266,7 +7453,7 @@ in with self; {
   nimble = derive2 { name="nimble"; version="0.6-3"; sha256="0j52kqr53lxmsc7dsv67mbqr5lg51vc2l7fqnv6qmrnzl4mn5ds0"; depends=[coda igraph]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
-  nleqslv = derive2 { name="nleqslv"; version="3.1"; sha256="0vvyyafighfck8f9imcpqlr1b5v3znsr5czgl5k4b02jymdwrhvs"; depends=[]; };
+  nleqslv = derive2 { name="nleqslv"; version="3.2"; sha256="1832p6hyg9lms570m9hjn7fngrj6br0qhrgk8k9dsvg04cyrmpqc"; depends=[]; };
   nlme = derive2 { name="nlme"; version="3.1-131"; sha256="0k2nvdzhic6bzhfsbq6la6q6a1i5nlj4pnh6lpdxiiwvxdks3nkr"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
@@ -7278,6 +7465,7 @@ in with self; {
   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.7"; sha256="1g5vnqmqq4swnid3601f1cm0q9w9k802394jd3yac95n8sm05i5g"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
+  nlshelper = derive2 { name="nlshelper"; version="0.2"; sha256="02xnx0j8p1im1hdwnia3n51dicscjf8s33y475i3dczvhmivvbmf"; depends=[broom dplyr magicaxis mgcv nlme]; };
   nlshrink = derive2 { name="nlshrink"; version="1.0.1"; sha256="0adnr7g3n3brwlvyix8wa7h59gj036l5anv8abqy80ysmfcmsp0y"; depends=[MASS nloptr]; };
   nlsmsn = derive2 { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
   nlsr = derive2 { name="nlsr"; version="2017.2.19"; sha256="0y1qfg042yk855v6i45w00mbmwic1ravlkrd0fbnr8zrvq74iy1s"; depends=[digest]; };
@@ -7287,6 +7475,7 @@ in with self; {
   nlts = derive2 { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
   nmcdr = derive2 { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
   nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
+  nmw = derive2 { name="nmw"; version="0.1.1"; sha256="0dqcix916as40h54i78g4437k8zbdlwbdfzmjyp08i9xr0gc0a80"; depends=[]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
@@ -7307,7 +7496,7 @@ in with self; {
   nonrandom = derive2 { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
   nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; };
   nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
-  nopaco = derive2 { name="nopaco"; version="0.99.8"; sha256="07pff53nzilbl0ww6jzxw0m8z6x4ssb1xajzgi8bck2bsdd8bhid"; depends=[Matrix]; };
+  nopaco = derive2 { name="nopaco"; version="1.0.3"; sha256="1sbjgzd7q2gjhs5qsy23w30cv73d9d6g08ymq18wppqpir5hikh2"; depends=[Matrix]; };
   nopp = derive2 { name="nopp"; version="1.0.8"; sha256="0yjnzxlmadh2g0frfwm7rrr0kqb5pjvrnjmzl6pikzr99yh8aags"; depends=[MASS mlogit]; };
   nor1mix = derive2 { name="nor1mix"; version="1.2-2"; sha256="14djjhhivl49jnsmnydcswmc6bzfvgjjg7pibg32a9p3y2f0lmnq"; depends=[]; };
   nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
@@ -7318,7 +7507,7 @@ in with self; {
   normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
   nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
-  nortestARMA = derive2 { name="nortestARMA"; version="1.0"; sha256="170dqxaln51snqzqjwagd16f2x4aarqg3xsim0gbvfqlv43sksb7"; depends=[astsa]; };
+  nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; };
   nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
   not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
@@ -7344,7 +7533,7 @@ in with self; {
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
   npregfast = derive2 { name="npregfast"; version="1.4.0"; sha256="1p5hp8mld05p03lrgyqwdh5wg4qh7n2bqx9w5p7z4dvvh6h67nji"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
   nprobust = derive2 { name="nprobust"; version="0.0.1"; sha256="13fc84ahv2gid3b1iyyc151v10pafaxbbym3g891ivxglyw10zy1"; depends=[Rcpp RcppArmadillo]; };
-  nproc = derive2 { name="nproc"; version="2.0.4"; sha256="1hbyf1n2s4wbd0206a69pf6akyxv6gx3dvifn26nizas3iaccp48"; depends=[ada e1071 glmnet MASS randomForest]; };
+  nproc = derive2 { name="nproc"; version="2.0.6"; sha256="07f5awjc7ds8xghvkvc0z6jna4n09syr63941n8g2q9099rvw9kc"; depends=[ada e1071 glmnet MASS randomForest ROCR tree]; };
   npsf = derive2 { name="npsf"; version="0.2.0"; sha256="0cww1fi0amgc9n1hbfy3z7xgwrbcdwvsr2d6l8lpsr1bdcpgbjzv"; depends=[Formula]; };
   npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; };
   npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; };
@@ -7360,16 +7549,16 @@ in with self; {
   nucim = derive2 { name="nucim"; version="1.0.0"; sha256="0fyapw6f5wkybr4mwmqpk9wy349j5sa4q26pci1bsy4ly2wf9wx6"; depends=[bioimagetools EBImage fields stringr]; };
   nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; };
-  numOSL = derive2 { name="numOSL"; version="2.1"; sha256="1my1pb23qafh96kk5vyjgks06g8pk9pkhk9rnqx76y5fdb5m8yy1"; depends=[]; };
+  numOSL = derive2 { name="numOSL"; version="2.2"; sha256="03dy8inwm1s4kiql7iaisvn7xyr1lz96srqi3jarsyjipvbicjfb"; depends=[]; };
   numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; };
   nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
   nycflights13 = derive2 { name="nycflights13"; version="0.2.2"; sha256="1857pwyhb5gvbdxv934nlc50n4ai7njm89js7b7ywfg7mhgha4yc"; depends=[tibble]; };
-  nzelect = derive2 { name="nzelect"; version="0.2.0"; sha256="1ijyvqm8yz3wib8wyibcxqx6p848xgxjrl84ppwq0nx0ic0vizbm"; depends=[]; };
+  nzelect = derive2 { name="nzelect"; version="0.3.3"; sha256="1y1nwcgghk64gmh1jn01gm3qqk5ja88gm59xq6bhl9pb03416n0p"; depends=[]; };
   nzpullover = derive2 { name="nzpullover"; version="0.0.2"; sha256="0c50854dhvjmhh8c34w9w0r8v8wk5j8bi6j81m5wpcd2jxrkbw4f"; depends=[]; };
-  oXim = derive2 { name="oXim"; version="1.1.2"; sha256="1270m0mng8sz8bsa8gi0pkp2znglv2sqzhq3s09mj73c0l96pzm7"; depends=[gstat imagine R_matlab sp]; };
+  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]; };
@@ -7387,32 +7576,33 @@ in with self; {
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
   oc = derive2 { name="oc"; version="0.96"; sha256="110pf3rqcab0671djx25jwwl8rbaskcd2lrcv56d786j693y2ash"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
-  oce = derive2 { name="oce"; version="0.9-20"; sha256="1pckxrkkgb22rrm1q9j2xijnbhk6j260rq8pvmi02l8mdx6l99l5"; depends=[gsw]; };
-  oceanmap = derive2 { name="oceanmap"; version="0.0.2"; sha256="0pbwja7m0ng2j2147sgc07v3q80xmj3bwidvqksigklka4zx822q"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; };
+  oce = derive2 { name="oce"; version="0.9-21"; sha256="1nwnfs75mdq0s13jz5l9zv1rjx5637yljhrc56sghwq38gi1mpal"; depends=[gsw]; };
+  oceanmap = derive2 { name="oceanmap"; version="0.0.5"; sha256="1afjkkfx2040606x2ivkppl14207d02y03i058gnkf9zdnvr15nc"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
   odbc = derive2 { name="odbc"; version="1.0.1"; sha256="0i047xpp481r5lsmrk853fcwhhvanwl6xdbddjgypd0mf0c11ng0"; depends=[BH blob DBI Rcpp]; };
   odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; };
   oddsratio = derive2 { name="oddsratio"; version="0.3.1"; sha256="0vpqhb6zady7facbrv5g3idxnzwy65237w6wfdxafsx40vc7bcig"; depends=[cowplot ggplot2 MASS mgcv]; };
-  odeintr = derive2 { name="odeintr"; version="1.7.0"; sha256="0qjgiik1vg4cp0fh07zabbmlxq12074nqczqxgf49sgvjgmasxx0"; depends=[BH Rcpp]; };
+  odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
   odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
   odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
   oec = derive2 { name="oec"; version="2.2"; sha256="11ldy303xkl7qaqvlzfwr7qxwnz06n39mkjvrj0sca6xzw12lq5d"; depends=[curl data_table jsonlite plyr servr]; };
-  oem = derive2 { name="oem"; version="2.0.4"; sha256="1n9b8zw4d3ydirrrl4n14as5x8jc10bzfza4zs4gn6ljk5p3lsci"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
-  officer = derive2 { name="officer"; version="0.1.0"; sha256="155vzgxrprsnk11m3d8wmvr40pkw1sp99p82g07d6l9d5ix1s28r"; depends=[base64enc digest dplyr gdtools lazyeval magrittr purrr R_utils R6 Rcpp tibble xml2]; };
-  oglmx = derive2 { name="oglmx"; version="2.0.0.1"; sha256="03lsgdz2pjykzcv7k9r940rgh7qh7vn651nrshx1r0b63mh9cqsj"; depends=[maxLik]; };
+  oem = derive2 { name="oem"; version="2.0.5"; sha256="1zhfq4njxsq6fq73y6nxz637h85xk3mj19y7v3b37ma3cqb2s52p"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
+  officer = derive2 { name="officer"; version="0.1.1"; sha256="0qn77x6zfkrcfmlhndfj6a4kbicr6s7wshz8r90s92vmvdzvv703"; depends=[base64enc digest dplyr gdtools ggplot2 lazyeval magrittr purrr R_utils R6 Rcpp tibble xml2]; };
+  oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; };
   oii = derive2 { name="oii"; version="1.0.1"; sha256="0w1afajkr5vly9qi1r2iz1ikbvyvy6hcbc10g8s7g6zi8db5dgf4"; 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]; };
   olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
+  ompr = derive2 { name="ompr"; version="0.6.0"; sha256="1yjzi2xg9543g0bwx95anvx2sckdmbbh7k4hmljff2lrpffwf735"; depends=[dplyr lazyeval Rcpp]; };
+  ompr_roi = derive2 { name="ompr.roi"; version="0.6.0"; sha256="0j0mbkbwb3iz00b1p8q5jsydhj3j36mjqc762mcspml1i68ip8iy"; depends=[ompr ROI]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
-  onewaytests = derive2 { name="onewaytests"; version="1.2"; sha256="1fscyffmvlasx56hxlk2b60fk0scfjbb3yk5q74ffszk4xvqbrzg"; depends=[]; };
+  onewaytests = derive2 { name="onewaytests"; version="1.4"; sha256="0p48bic8fnj4bgrlh3r7flbaj12z3ir5bigmvh8izznablq93wkk"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
-  onlineCPD = derive2 { name="onlineCPD"; version="1.0"; sha256="1hdj9wizf0b2vs481fnx80m4b7rqp0bl14xbxfcawlk9d82q2mh2"; depends=[ggplot2 gridExtra reshape2 scales]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; };
@@ -7423,47 +7613,50 @@ in with self; {
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
   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.0-0"; sha256="1cwlk0vi510065p1rb70h5rsprd55xfyb7ym8mv93iwvqgwxhx5j"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj maps MASS mgcv plyr RColorBrewer Rcpp reshape2]; };
+  openair = derive2 { name="openair"; version="2.1-0"; sha256="0ybly7xmxrlyn12al2pk1w1yjm857npj3ih3zl1p0sd744x8pm6w"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; };
   opencage = derive2 { name="opencage"; version="0.1.0"; sha256="0fx5l5rzl9c7df03bvxcykfcrqjl2ld5k49kzsc5d157gxynnh56"; depends=[dplyr httr jsonlite memoise]; };
   opencpu = derive2 { name="opencpu"; version="1.6.1"; sha256="01m9zrbyishf4qbsw6fnfihnw4470qvv6br63zbzj2c7jzpi0v6g"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl protolite]; };
   openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
   openssl = derive2 { name="openssl"; version="0.9.6"; sha256="0ffwllii8xl6sa2v66134g0fwaw1y3zn3mvaa4nrc120vv5d3mkd"; 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.0"; sha256="1jz75kxpbbdw3bf9a49fih4wlk36nki3nr8yq7v9n31qzyb5k3qy"; depends=[Rcpp]; };
+  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]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
   ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
   optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
   optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
-  optCluster = derive2 { name="optCluster"; version="1.1.0"; sha256="1p4mwnarai1kakyb0w8z46c3lwnwcndvfxspywh72mj35wfrdbc8"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
+  optCluster = derive2 { name="optCluster"; version="1.1.1"; sha256="0nb9b2lbsrl1gldy27vnqqd0z439vbvjg1h4a1rvqj01ik4xzfyn"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
   optDesignSlopeInt = derive2 { name="optDesignSlopeInt"; version="1.1"; sha256="0vpm4359rq5v231k63vgaac6iv2ybfkcpy59n86djb710b3h2qcn"; depends=[MCMCpack neldermead]; };
   optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; };
   optband = derive2 { name="optband"; version="0.2"; sha256="0a0kr8h4asziq66k1556mabwjyib84v0arn4jmb0gjzxjrg6rk2f"; depends=[LambertW]; };
   optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; };
   optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; };
   optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
-  optiSel = derive2 { name="optiSel"; version="0.3"; sha256="1b4yrijkdxd78wyjjskawahrzj1k3cgh5d7mpcyr2li1hg86k7m1"; depends=[alabama cccp data_table kinship2 MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; };
+  optiSel = derive2 { name="optiSel"; version="0.7.1"; sha256="1klf68s3c65sp8ap7f4jq1sl9aqvhjzqcd44r3lzjxpspnm8055m"; depends=[alabama cccp data_table kinship2 magic MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; };
   opticut = derive2 { name="opticut"; version="0.1-0"; sha256="0dh7zw8yrzxw3vfzfm776rdhfczmlwfs3fw568s5cc60xsn8fa93"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
+  optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; };
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimization = derive2 { name="optimization"; version="1.0-1"; sha256="1smmpv9ahv2fdfqxlpp42wzg08xhhj9niay8wsd49799xvpcw1jg"; depends=[colorspace Rcpp]; };
   optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; };
   optimsimplex = derive2 { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
+  optimus = derive2 { name="optimus"; version="0.1.0"; sha256="1dz0wczyl1awv3s01malmyrzwijxdywh0xhpfh1i0pncbb4rq3vc"; depends=[mvabund ordinal]; };
   optimx = derive2 { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
   optmatch = derive2 { name="optmatch"; version="0.9-7"; sha256="1ps3qd7kidi0n1m9nxspz03sdw7p3lcg31q3p7c13l3vb226i5yj"; depends=[digest Rcpp RItools survival]; };
   optparse = derive2 { name="optparse"; version="1.3.2"; sha256="1g8as89r91xxi5j5azsd6vrfrhg84mnfx2683j7pacdp8s33radw"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
+  optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
   opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; };
   orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
   ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
   orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; };
   orclus = derive2 { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
-  orcutt = derive2 { name="orcutt"; version="2.0"; sha256="07190v3llnpkvrgsd33bbdywlvmqqgysn0p4y8krb3wgxx2dv6kg"; depends=[lmtest]; };
+  orcutt = derive2 { name="orcutt"; version="2.1"; sha256="1ljzgi6dgawgz3rr9n7g3r4cfil3qplzjphd9bxj84ayi31vy0pk"; depends=[lmtest]; };
   ordBTL = derive2 { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; };
   ordDisp = derive2 { name="ordDisp"; version="1.0.1"; sha256="1vjki73h8933z36ikwmjn84ldz154mahp2jkd9cbj5n6xsi47fnw"; depends=[VGAM]; };
   ordPens = derive2 { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; };
@@ -7474,11 +7667,13 @@ in with self; {
   ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
   ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
   ordinalCont = derive2 { name="ordinalCont"; version="1.0.2"; sha256="0dj98ziwaka1a2bra6zzqqwmw9f0ki5iyzibslix0brk9v8lq3km"; depends=[boot]; };
+  ordinalForest = derive2 { name="ordinalForest"; version="1.0"; sha256="1hmvr94s7fwpqzziaqh01w7c7hg1z4ms03cll8v13jkbaryk3yik"; depends=[combinat ggplot2 ranger]; };
   ordinalNet = derive2 { name="ordinalNet"; version="1.5"; sha256="1iy8vgx6znnazhzx7m649hbikliwv9j5c5nrr0jrbdl28d84qapl"; depends=[]; };
   ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; };
-  ore = derive2 { name="ore"; version="1.5.0"; sha256="0bvpi4gz71qgi21byax6np0ivr2a9b9qnzywhl06rbkx9l0r2yfn"; depends=[]; };
+  ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; };
   ores = derive2 { name="ores"; version="0.2.0"; sha256="164z4r4894r8j5vigh5rsqwkslmgdwj0rsl088fq0hb40p3w1nd0"; 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=[]; };
   originr = derive2 { name="originr"; version="0.2.0"; sha256="06n5qshk4dq6ac4prnhzymz7gcmp6m2zdc8d9d13ii7n7xa0ymx2"; depends=[data_table httr jsonlite taxize xml2]; };
   orloca = derive2 { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
@@ -7496,12 +7691,14 @@ in with self; {
   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]; };
   osmplotr = derive2 { name="osmplotr"; version="0.2.3"; sha256="1gvr3plni62hrs1i4b1id863ib0d4l4gfh8h40nyvk16mgvp4a4c"; depends=[curl ggm ggplot2 httr igraph osmar rgeos sp spatstat XML]; };
-  osrm = derive2 { name="osrm"; version="3.0.0"; sha256="099k0cfkzzq5pdb17j9ian8x6s3i13f6lcyhy4ls0dnhdgk4d7l1"; depends=[bitops gepaf jsonlite raster RCurl rgeos sp]; };
+  osrm = derive2 { name="osrm"; version="3.0.1"; sha256="0sz3fbdljfakh0g8bmsx6arwz7j2sjd63c4af1sryh9c8sk8gpjp"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
+  otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otrimle = derive2 { name="otrimle"; version="0.4"; sha256="0xhsx11rpm9179jm5p00x2c125r15bhslsnll182bhw282vwx2kx"; depends=[mclust prabclus]; };
   ouch = derive2 { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; };
   outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; };
   outbreaks = derive2 { name="outbreaks"; version="1.2.0"; sha256="1snycxcllc5vq93ay7xyjw6g4130dvcmja56wvdxixvc5bbv4z1d"; 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]; };
   overlap = derive2 { name="overlap"; version="0.2.7"; sha256="1v7i3p8mmhvnxd9h1g6zprphjgs2nfh7ffkyj7vjbkhfsixp9fpz"; depends=[]; };
   overlapping = derive2 { name="overlapping"; version="1.4.0"; sha256="00rn55wvcj32qgjbjplaq32k2vxzrdlbp8dh7scyw78wyn8bdv2c"; depends=[ggplot2]; };
   owmr = derive2 { name="owmr"; version="0.7.2"; sha256="0206i5zzmfjdd43qziis6kqc0zsvn0l7v5sspjrywjxw2gyjfmwb"; depends=[httr jsonlite magrittr]; };
@@ -7526,11 +7723,11 @@ in with self; {
   packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
   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.1.1"; sha256="0xvw283gyjak3j66g8x5jy2jdrkcxwhfzck2wdq2q6a6nxbyb0i1"; depends=[Rcpp]; };
+  packcircles = derive2 { name="packcircles"; version="0.2.0"; sha256="1z0s5lnzpmipcsdk0wsjp18mm6j50yfn8qip98rx30hmyh3flwmc"; depends=[Rcpp]; };
   packrat = derive2 { name="packrat"; version="0.4.8-1"; sha256="1wvjyvb7yy6hq188msqzf8qa00lhll865jp939byc6d4zpscm0x2"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.4.1"; sha256="0qh3nxgfn26q3mwv3zyc6qq4h00mjdjrn2pfbfmdbjqjg4q75ypz"; depends=[devtools]; };
   paco = derive2 { name="paco"; version="0.3.1"; sha256="18k4ls6y9jdknx3dn2494chjigzn8hrsh332ha8a01snfzhp66m0"; depends=[plyr vegan]; };
-  pacotest = derive2 { name="pacotest"; version="0.2"; sha256="1z8jiz951jj13dmgl75yjdvahph0jhk0d6n2f8xgzaj4rwmli6i8"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
+  pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
   padr = derive2 { name="padr"; version="0.2.1"; sha256="18cv4pz8zkn2a4m85yz8k68clq1zfgb6y7f6skdsflhg05mxq2qs"; depends=[Rcpp]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
@@ -7547,7 +7744,7 @@ in with self; {
   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.1.9"; sha256="0x11g90g6hlxw5407mmb6z4w7iqmipb5f0n3czs834ji5jhxl1x8"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
-  paleomorph = derive2 { name="paleomorph"; version="0.1.3"; sha256="0s119va1j4sqmc08wrk1z1ywdvam0qcn6lgla93bavpw4q7y9zbm"; depends=[]; };
+  paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; };
   paleotree = derive2 { name="paleotree"; version="2.7"; sha256="0h2rch89p8n1i1zdy3xj5966hsz47a49r5baqvn1s9c9pr024czk"; depends=[ape phangorn phytools]; };
   palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; };
   palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; };
@@ -7563,7 +7760,7 @@ in with self; {
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
-  pangaear = derive2 { name="pangaear"; version="0.2.4"; sha256="0h504b4wnqahy3sq35yq48rafaikkidfqdx96hv8999ag7kyndl2"; depends=[httr jsonlite oai rappdirs tibble xml2]; };
+  pangaear = derive2 { name="pangaear"; version="0.3.0"; sha256="1kkjvcwdnak5rxdz5q066b1q7yx75djm5q0gbx6iqcgvvhly1kpp"; depends=[httr jsonlite oai rappdirs tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
   papeR = derive2 { name="papeR"; version="1.0-2"; sha256="1pp6zzdqg9lj61f8p90sxl30vp9knmis7154fmfpm6pynbgr46ms"; depends=[car gmodels xtable]; };
   paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; };
@@ -7573,7 +7770,7 @@ in with self; {
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
   paramGUI = derive2 { name="paramGUI"; version="2.1.2"; sha256="054l9hqsvgnwipzqrapkhsk67afz93zv1cligqhjl2wggzn9a8sc"; depends=[colorspace fields shiny shinydashboard TIMP]; };
-  paramlink = derive2 { name="paramlink"; version="0.9-9"; sha256="1d2s20ys2zbbpw38l24j57p070h5wf4rgf3gb9lxgx1ibpww1zf0"; depends=[assertthat kinship2 maxLik]; };
+  paramlink = derive2 { name="paramlink"; version="1.1-0"; sha256="1qbd80x50nnyiy0y6nnnwhj8z528gzqq7098w9md3rj0ih3523xl"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
   paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
   parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
@@ -7586,14 +7783,14 @@ in with self; {
   parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.0"; sha256="0ijnnajcr7zyh0c1k6bz9qa4fkcly1fd44x3qj7mhlx58gnq4sa4"; depends=[dplyr lazyeval RSQLite stringr tidyr]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
-  partialAR = derive2 { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
+  partialAR = derive2 { name="partialAR"; version="1.0.10"; sha256="18hw0azhvd3737wi5cy8ympwfrj6ag01w1a4csy6kl2kifldg6b7"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
   partitions = derive2 { name="partitions"; version="1.9-18"; sha256="1brzvk2zbrh0s4vbaiib6zkpcyx7ghc6ws36h3diz5nxbx3g95ik"; depends=[gmp polynom]; };
-  partools = derive2 { name="partools"; version="1.1.5"; sha256="062rnq35cbzyr6mdpq4w88bxd6c2pzbghxan6j11pipyzvv7qsj3"; depends=[data_table pdist]; };
+  partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.2-2"; sha256="0rmvscgmbligg23djyph54cz5r8xkmmrn04vd3r7pwy1qarah9fi"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+  party = derive2 { name="party"; version="1.2-3"; sha256="1rpp4qfb7igpqlz0jw12ykd7p3ri8miby6nlvyzbblz3h67lplkb"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
   partykit = derive2 { name="partykit"; version="1.1-1"; sha256="0cl3ir54pafjhk1cvyzx1a8a244x0qa5lky47m7fx1fdj0k7dx6r"; depends=[Formula survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
@@ -7607,11 +7804,13 @@ in with self; {
   patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; };
   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]; };
+  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]; };
+  patternize = derive2 { name="patternize"; version="0.0.1"; sha256="0xmz7ca555275a4x89vdmyk9x3m3sk964iwspv0dnxsmx5s1xmz7"; depends=[abind Morpho raster rgdal RNiftyReg sp]; };
   patternplot = derive2 { name="patternplot"; version="0.1"; sha256="1k167vfwizwk6m0qpq9p0wq7y2g9ib6wi9j64wmvpqjw8k77l00r"; depends=[dplyr ggplot2 gtable jpeg png Rcpp RcppParallel]; };
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
-  pavo = derive2 { name="pavo"; version="1.0.0"; sha256="0xi9sb36xc6h8j4h4b46imwy936wi8vlqsv4mfkjka34bn0q7afr"; depends=[geometry mapproj rcdd scatterplot3d]; };
+  pavo = derive2 { name="pavo"; version="1.0.1"; sha256="1kx83yxcrj2r1ahn74x5c6yadhyfqsjcj1w3idzdpqbad3vxh5wd"; depends=[geometry mapproj rcdd scatterplot3d]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pbapply = derive2 { name="pbapply"; version="1.3-2"; sha256="1sdmjlnwxb99f95g5v8k8mirrkzw99yig377v0qi9lzwjgd6fqqr"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
@@ -7625,14 +7824,14 @@ in with self; {
   pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-2"; sha256="0d7hj1rq4vmp9i4v7d3pjivqpw0pv06xjl4wlnjj42jfxdg70yvh"; depends=[pbdMPI rlecuyer]; };
   pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-5"; sha256="12qgnzhc0lkzmkg143y0wlvpsa0qqw1rmv7x8c67ixd4pbwzcym7"; depends=[R6]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
-  pbkrtest = derive2 { name="pbkrtest"; version="0.4-6"; sha256="00cw18q7wvddzjrbxz917wkix6r7672vi2wmsp4gwgzady8vha4x"; depends=[lme4 MASS Matrix]; };
+  pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
   pbmcapply = derive2 { name="pbmcapply"; version="1.2.1"; sha256="1dlpiphvl8rl08r7lml2mky137kahqij102wyjif1yk3xwdds8ca"; depends=[future]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.2"; sha256="0sf6kkcsblc758sb1gkl4ryr72w0xhkd9nr4xdns8c9dfg9qcw1h"; depends=[combinat Rcpp]; };
   pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
-  pcaL1 = derive2 { name="pcaL1"; version="1.4.1"; sha256="07qsi3k6l9ga1ixqmz8sw1hmjqg0l3rv1czwwgb6izsmjkcxfyzd"; depends=[]; };
+  pcaL1 = derive2 { name="pcaL1"; version="1.5.1"; sha256="0c5y595jyf0wz290hg06r8fxii2r3mwl9437wvs4fvv1sxi2i3r0"; depends=[]; };
   pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-61"; sha256="0afwi17grkac5yckipfsyqq1r1qgljzb3w5abc9mc6pzb7hrbhvx"; depends=[mvtnorm]; };
   pcadapt = derive2 { name="pcadapt"; version="3.0.4"; sha256="031ql3xppjkqrm17bvccj61hyf38skjb4qv6rs0l1h2ib8jql8ka"; depends=[ggplot2 MASS robust vcfR]; };
@@ -7644,26 +7843,26 @@ in with self; {
   pcnetmeta = derive2 { name="pcnetmeta"; version="2.4"; sha256="1d7cjf15blh0ysc064n8yil77yj799bsff0rdjvimaa2hbxpnk98"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
-  pcrsim = derive2 { name="pcrsim"; version="1.0.1"; sha256="004xrxnfkq1a8y27p7v4xz7jf3y3h5fkxiy2vyqdqv2yqhqdbzpg"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
+  pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
   pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
   pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.0.0"; sha256="0jd7540v7zdg4l5i6i7pdwc7bgnpkhdfpf5b9bjx2gka592swhq4"; depends=[astsa Rcpp RcppArmadillo]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-  pdfetch = derive2 { name="pdfetch"; version="0.1.8"; sha256="0yg5s7nxfbsffi3v1layi7w7y3bcyb1lkyinr0ygnjz5cmqf3df0"; depends=[httr jsonlite lubridate readr reshape2 stringr XML xml2 xts zoo]; };
+  pdfetch = derive2 { name="pdfetch"; version="0.2.1"; sha256="0d5707j4dq8ilab3ydqy3pd65mdsrwn6hf01hv4h85iv6zalm679"; depends=[httr jsonlite lubridate readr reshape2 stringr XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
-  pdftools = derive2 { name="pdftools"; version="1.0"; sha256="1ziflvvzwk3g21s67b09qx023i2chvx09b0675nskvbxssnsc5r5"; depends=[Rcpp]; };
+  pdftools = derive2 { name="pdftools"; version="1.2"; sha256="1fdw0rqz2yi2xslydb3qigv915zp16h56gw8ar792hxwwf33kyh6"; depends=[Rcpp]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
   pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; };
-  pdp = derive2 { name="pdp"; version="0.4.0"; sha256="19kijpz0davv8359a0x623zjbq1jn5agp6wfx36yi87l2dlh254y"; depends=[gridExtra lattice magrittr mgcv plyr viridis]; };
+  pdp = derive2 { name="pdp"; version="0.5.2"; sha256="1bsi8v143q4bmdzlx55q6xrhi1scm5bi7q8ky0mh1505kz09nd74"; depends=[boot dplyr ggplot2 gridExtra lattice magrittr mgcv plyr Rcpp viridis]; };
   peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; };
   peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
   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.4.9"; sha256="0r8fg4kic366606pdysyws4an3152fc8mykr7vwixhn63yjk0vpd"; depends=[foreach prodlim rms survival timereg]; };
+  pec = derive2 { name="pec"; version="2.5.3"; sha256="16ad20zagf3sbnj6jw0ay4kkywlslgc7p5ghz5zknrsby7ac0147"; depends=[foreach prodlim rms survival timereg]; };
   pedantics = derive2 { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
   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]; };
@@ -7706,7 +7905,7 @@ in with self; {
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; 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.5"; sha256="0z3yxdcgngsyy9ylga76gh0m92vfdfzg4asgx6a3g0hnixh0pri3"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
+  pgirmess = derive2 { name="pgirmess"; version="1.6.7"; sha256="1an7isajb4h04i2sfnssnxfi61v17fh803ddf8hmcfqkpig4yi6p"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
   pglm = derive2 { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
   pgmm = derive2 { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
@@ -7716,7 +7915,9 @@ in with self; {
   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.1.1"; sha256="1klc2s6crwmg30psgf1xkchyjqbksl7cdlnk3b0ypdw7pd3js5im"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
+  phangorn = derive2 { name="phangorn"; version="2.2.0"; sha256="02r1b65d1v05bi62wmq0mr99dnbg7gfq4lca81blqa14yld1mj1j"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
+  phantom = derive2 { name="phantom"; version="0.1.1"; sha256="0illb6akja10ij2pc7sfaz5yb43jkky28yclkijk3r31dv075ylk"; depends=[cluster gplots MASS Matrix NMF RColorBrewer Rcpp RcppArmadillo]; };
+  phase1RMD = derive2 { name="phase1RMD"; version="1.0.5"; sha256="0qn3zpq7r810j54718ffqg53dr776vcswjr0icdah1yacwn8zf6f"; depends=[boot coda mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
   pheatmap = derive2 { name="pheatmap"; version="1.0.8"; sha256="1ik0k69kb4n7xl3bkx4p09kw08ri93855zcsxq1c668171jqfiji"; depends=[gtable RColorBrewer scales]; };
@@ -7725,19 +7926,19 @@ in with self; {
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   pheno2geno = derive2 { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; };
-  phenology = derive2 { name="phenology"; version="5.3"; sha256="1lw4blnv06w0czliqwpz34nz7nanfihcv04l72sxma7jjmjpn4w8"; depends=[coda fields HelpersMG zoo]; };
+  phenology = derive2 { name="phenology"; version="5.4"; sha256="0i528yhmlyyinczhkymchhmmmd9x6xm94i2dnad834jcdhhhr44y"; depends=[HelpersMG lmf numDeriv optimx]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
   phmm = derive2 { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   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="0.7.4"; sha256="0s5v9w3dcscjc7snv4nlhd4zm2dhxwv9jp6xaxp5wpwys5mim1ms"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.13"; sha256="14pziwhg87gbzc3yjhb5kvbcfd8v6mqa4r8l83nnxp2gkr0kl66s"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; };
-  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.12"; sha256="02pfajd9wzbrlxsk29d5sdp2bnzjdw1g08rrl5742c6ha4dll81m"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.14"; sha256="1zh36mdm7bprl0zfyl3qaill3s1aw7p0w5zwhmx08i2imxcz60jj"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; };
+  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.2"; sha256="0m8bwpvr3g0xdcpjg0pm5qp7b941y85gdzw24vc1nhfmzwd0lxn0"; depends=[photobiology]; };
   photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.1"; sha256="19pzb12qisv5hy7rps0dp9bq8zanpyr2yn41i6rd8hk80fknjha6"; depends=[photobiology]; };
-  photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.0"; sha256="1qdd2zbkdw601p5zcamd2ly0qp0hmnd32bdlnvpv96v90iwxpj9q"; depends=[photobiology photobiologyWavebands]; };
-  photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.1"; sha256="07a2hw59k1a2knccijy82pb0f72y00s2wlc70b6snrgii45qgc23"; depends=[photobiology]; };
+  photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; };
+  photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.2"; sha256="0l1784xi9hzsxmiqipv0zkb4lq1xd9f890rzsgsjb0km6js5x3q7"; depends=[photobiology]; };
   phrasemachine = derive2 { name="phrasemachine"; version="1.0.0"; sha256="0jdz8imcry78shhbayhw7vpcx3kj8sfin3jl4fz5bb1ncdpcrpbj"; depends=[NLP openNLP quanteda stringr]; };
   phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; };
   phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
@@ -7746,7 +7947,7 @@ in with self; {
   phyclust = derive2 { name="phyclust"; version="0.1-18"; sha256="1avw6vx3fmzvk8iwc47jz014hxjn0mm8b941a9y1xyip11x0b6dd"; 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.0.0"; sha256="14bsmq62afkzcnacjd8464krk5hnh1s54r6znlknnpyphy0g8xzk"; depends=[ape igraph NHPoisson phylobase]; };
+  phyloTop = derive2 { name="phyloTop"; version="2.0.1"; sha256="1mwifnmq4zk83vj7886ndz6i3xa9dyxsz9p4b0ah53cdvbcqcspd"; depends=[ape igraph NHPoisson phylobase]; };
   phylobase = derive2 { name="phylobase"; version="0.8.2"; sha256="0wspm8fv2lps2z6zhz3qrf3icad1mgpq4379gmbi3i614h25r5gp"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.0"; sha256="0h5cp37f2jzi30zpzyvd6h16592knkyp2jnvcdhhi37yhamzhgr6"; depends=[ape htmlwidgets magrittr phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
@@ -7754,7 +7955,7 @@ in with self; {
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
-  phylopath = derive2 { name="phylopath"; version="0.2.2"; sha256="16r3m1bsfsfjvzl9k8ss197m1hvghlm62fwdrrm9zk6jc4fjc0cf"; depends=[ape DiagrammeR dplyr ggm ggplot2 igraph MuMIn nlme pbapply purrr tibble tidyr]; };
+  phylopath = derive2 { name="phylopath"; version="0.2.3"; sha256="1vspb20vwikql32nvj5vrixyz85y7zhc5sdbng1ff8r7yn1l2mrx"; depends=[ape DiagrammeR dplyr ggm ggplot2 igraph MuMIn nlme pbapply purrr tibble tidyr]; };
   phylosignal = derive2 { name="phylosignal"; version="1.1"; sha256="039sdb5cyijsrvj13xznr0j7vcp780lif62xk5x5hpzxvpg1wwgk"; depends=[adephylo ape boot igraph phylobase Rcpp RcppArmadillo RCurl]; };
   phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
   phylotate = derive2 { name="phylotate"; version="1.0"; sha256="0mpqxydz4xh7vf54szi11ckqzfmhaiwz9h8v3y1kslvarn8bvpr4"; depends=[]; };
@@ -7762,7 +7963,7 @@ in with self; {
   phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; };
   phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
   physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-  phytools = derive2 { name="phytools"; version="0.5-64"; sha256="0vamljghwxrdgncwzg0217cw65f0gzn0bx72xxlmdw69wshhrj3m"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive2 { name="phytools"; version="0.6-00"; sha256="04xf7rksii496xiih3ijywxs4j4994z1f1yllvywzvmqqyk0khdn"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
   pi0 = derive2 { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
   picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
@@ -7773,7 +7974,7 @@ in with self; {
   pinbasic = derive2 { name="pinbasic"; version="1.1.0"; sha256="0ncbgkpgzp6w856y7ab0drci92rc9mx0j900vxd8ir69c00cm348"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
-  pinnacle_API = derive2 { name="pinnacle.API"; version="1.92"; sha256="1a2s33sizg9q6iml56hbbs1c7hx5lz7v7hplhs0nv05vrh8cg9zm"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
+  pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.4"; sha256="1qdxx9mpnffb7nf8477bkc557lw7c34g0nkjspbn8mn40n5488r0"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pipe_design = derive2 { name="pipe.design"; version="0.4"; sha256="00znnjqvppvn0qmrxkksiljgd51mf1x5zkmib43myckzwp5cap3i"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.1"; sha256="0ixfj52nd9785ny78wgsyq7srygsj3yg3p95pcb4lrrammchqygk"; depends=[]; };
   pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; };
@@ -7781,13 +7982,15 @@ in with self; {
   pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; };
   pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; };
   pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
+  pivottabler = derive2 { name="pivottabler"; version="0.1.0"; sha256="1fm8g4z2d3dmljk8r3cq0fh8bnkxpxqlkcvv95vdmirfjznrwr1x"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
   pixiedust = derive2 { name="pixiedust"; version="0.7.4"; sha256="1v4biqbs18x7a8li85zqk8pwd4bxirvda6nrws8pyz0g77j74nj4"; depends=[broom checkmate dplyr Hmisc htmltools knitr lazyWeave magrittr stringr 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.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; depends=[]; };
+  pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; };
   pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
   pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; };
+  pkr = derive2 { name="pkr"; version="0.1.0"; sha256="0c8i9r1w23zldi04066pzdggxrbsqg9ydbxg3ig1z66jv17w76zq"; depends=[binr foreign forestplot]; };
   pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; };
@@ -7806,6 +8009,7 @@ in with self; {
   plfMA = derive2 { name="plfMA"; version="1.0.3"; sha256="10cb12kxzh9ymzk59d310wqn213d8syp8a4rd5ayzkp9wlf3lksn"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; };
   plfm = derive2 { name="plfm"; version="2.1"; sha256="19l5n7syp6xcj4d5qxccsard70d5q8ph1f87prj2zgpq5spyp7an"; depends=[abind sfsmisc]; };
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
+  plink = derive2 { name="plink"; version="1.5-0"; sha256="0zn5k7p14ls38rwfhr8xn18316qzmxvgqj63pf3dbf6dddnbkapl"; depends=[lattice MASS statmod]; };
   plm = derive2 { name="plm"; version="1.6-5"; sha256="00zipzxg1d8w6ih586hlqv6bkyn5d01ppik8z35by3r1q6rlkpx2"; depends=[bdsmatrix car Formula lattice lmtest MASS nlme sandwich zoo]; };
   plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
@@ -7838,7 +8042,7 @@ in with self; {
   plspm = derive2 { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[amap diagram shape tester turner]; };
   plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; };
   plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; };
-  pltesim = derive2 { name="pltesim"; version="0.1.1"; sha256="0xqvs4lax8r2avwpdpf4p49dkwghiqbqc93brz7l1qma6ih0yfrs"; depends=[coreSim ggplot2]; };
+  pltesim = derive2 { name="pltesim"; version="0.1.2"; sha256="00iyxs4r5y08ss6q0yb6b1gq100xdx6zxksw0zmqxydj0sh64q2v"; depends=[coreSim ggplot2]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
   plumber = derive2 { name="plumber"; version="0.3.1"; sha256="0li34ldwc8qi7jg37pqaa4b5ql6ybci9a3wh2a48gb8nyb380r2b"; depends=[httpuv jsonlite R6 stringi]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
@@ -7848,6 +8052,7 @@ in with self; {
   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.1-9"; sha256="1p506d3gs0i46zjdia0pc71wwfv6nrfkmk5qaan5sdz6vn24zjhj"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
+  pmfdR = derive2 { name="pmfdR"; version="1.0"; sha256="1h5dq84pm3ls4kz56l96p5h91njirkxm64jr4pc3m7mjzj9ajfdf"; depends=[curl exams stringr]; };
   pmg = derive2 { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.0.0"; sha256="0r1yw65ixm3zjpiwg800rfwr1p26i6apv4332pgfl84hj5vvp3ws"; depends=[mvtnorm Quandl]; };
   pmlr = derive2 { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
@@ -7871,25 +8076,25 @@ in with self; {
   poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
   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]; };
-  pollen = derive2 { name="pollen"; version="0.50.0"; sha256="1f6bjh7vkwyma8jzigdcijazmzr2mhnmwmaf135lx81d044xj2zr"; depends=[dplyr lubridate purrr]; };
+  pollen = derive2 { name="pollen"; version="0.52.00"; sha256="1d1rr7rzc7lppw562lrn4n9syzgff21ws32s501g85f1zllkip5y"; 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.1"; sha256="189zfqcw9w1i1z14l2rgkzqali0arkiq7k770xhzdrahw1whcsc7"; depends=[data_table DT foreach Matrix R6 slam tm]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.2"; sha256="1frfjwqkdpjk0fl1ldh8zdvk38yyx8hnwsrn0cph7y8qhy6v9sfq"; depends=[data_table DT foreach Matrix R6 slam tm]; };
   polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
   polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
-  polyapost = derive2 { name="polyapost"; version="1.4-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; depends=[boot rcdd]; };
+  polyapost = derive2 { name="polyapost"; version="1.4-3"; sha256="1bzrc06llzr36zmvm9f5czfy5rdrspamqwqc3n3m8x08v4ch3y4y"; depends=[boot rcdd]; };
   polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
-  polyclip = derive2 { name="polyclip"; version="1.5-6"; sha256="1ypwvgd5z61md539z7ndmpl8vaifsjbm231n08zsxskskj1fid7y"; depends=[]; };
+  polyclip = derive2 { name="polyclip"; version="1.6-1"; sha256="07xxw5ik30ds18kv808hynzmz3w351k6lj4ifz9kak0s7xsaqfn3"; depends=[]; };
   polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; };
   polysat = derive2 { name="polysat"; version="1.6-0"; sha256="180hf1m2pd9jcz02q0jq3s5sv5h73qc20w3b2sx1psdbyzdk9006"; depends=[]; };
   polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-  pomp = derive2 { name="pomp"; version="1.11"; sha256="1z66q3l1p7dmds0160w93q31hsxq4fj7bwfyd74d166yg0wfia8x"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
-  pooh = derive2 { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; };
+  pomp = derive2 { name="pomp"; version="1.12"; sha256="1fvzd68pc1lhxikc16f6a0lhyf66rj54if80icfvx6z3zvqc5dgw"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
   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.1"; sha256="0n4kf3h6zgr7sc2bk8bbrf5bvaybnacy6vsqck63gfdn3kkc43m2"; depends=[data_table Epi survival]; };
@@ -7900,7 +8105,7 @@ in with self; {
   popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; };
   popgraph = derive2 { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
   poplite = derive2 { name="poplite"; version="0.99.17.3"; sha256="0fqkwxlzj92rh187wns7zrygsgch1gw3l8kmnpvc59gdbk1wbbi7"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.3.0"; sha256="0zhmsx23fjjl8zy7s0gyzd0br4imdl2hfgk0g9v9p2ff72xg046d"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; };
+  poppr = derive2 { name="poppr"; version="2.4.1"; sha256="05nds9srzkmdi33xfq3lfmyjirn8x3nacpkq1jymf6kzab0sgn8v"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; };
   popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="4.0.1"; sha256="1qw6b00mz9i842askixc0288i41v8dfjwc58pa3cbgf6fhfjva9z"; depends=[class fields som]; };
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
@@ -7909,7 +8114,7 @@ in with self; {
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
   postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
-  potts = derive2 { name="potts"; version="0.5-4"; sha256="1818md2mdkf47r5vcqawnn84lanir9q6r72kf41lq4zbjkk2yazv"; depends=[]; };
+  potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.0"; sha256="1p2la3hslxq2xa8jkwvci6zcpn47cvyr9xqd5agp1riwwp2xw5gh"; depends=[VGAM]; };
   powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
   powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
@@ -7928,7 +8133,7 @@ in with self; {
   pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
   prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
   prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
-  pracma = derive2 { name="pracma"; version="1.9.9"; sha256="1g062d9lsjkqrd5m91h55pc3zcqha9drmdi4zqic4hx6qyyhy2q1"; depends=[quadprog]; };
+  pracma = derive2 { name="pracma"; version="2.0.4"; sha256="1z3i90mkzwvp9di17caf4934z2xlb2imm3hwxllcrbwvmnmhrwyc"; depends=[quadprog]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
   prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
@@ -7936,13 +8141,13 @@ in with self; {
   prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.6.2"; sha256="1dg4d5x7w368bllgblp1c9kahv9dd43vdfxvv8i3c9nz003z84bs"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
-  prcr = derive2 { name="prcr"; version="0.1.0"; sha256="0bm1jixkdz682721j78kigs6v6dyckj4va41ik4f94ikb5j2f7hh"; depends=[dplyr ggplot2 tibble tidyr]; };
+  prcr = derive2 { name="prcr"; version="0.1.1"; sha256="1c6l8szjy9rd7gyjwpfsydi493is6nn93yiq9my097lla961254i"; depends=[dplyr ggplot2 tibble tidyr]; };
   pre = derive2 { name="pre"; version="0.1"; sha256="1y9mz0rp1rf595n8b2fy6rncrw7d41d8vlxi6phclfdawv9bkn9z"; depends=[Formula glmnet MatrixModels partykit]; };
   preText = derive2 { name="preText"; version="0.4.4"; sha256="0ivzm9mcwnf9yrgvwzjiaqkpfv8fr7v8ci61gn8x09jiw8w8l5j4"; depends=[cowplot ecodist ggplot2 gridExtra proxy quanteda reshape2 topicmodels vegan]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
-  precrec = derive2 { name="precrec"; version="0.6.2"; sha256="100zr5932vm1rs359nzq4cxbx924az5d8zl9h7720fd5sgy4av7f"; depends=[assertthat ggplot2 gridExtra Rcpp]; };
+  precrec = derive2 { name="precrec"; version="0.7.1"; sha256="09b5718f3j0v3mkjq07lnyav935ggp2j1466v60b5ndn736bl3yx"; depends=[assertthat ggplot2 gridExtra Rcpp]; };
   predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; };
-  prediction = derive2 { name="prediction"; version="0.1.10"; sha256="1za32spd6qg63mi5dvkw54k24f5s4a10p2rkfgzjzqxjb9rd265h"; depends=[]; };
+  prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
@@ -7954,12 +8159,12 @@ in with self; {
   preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; };
   prereg = derive2 { name="prereg"; version="0.2.0"; sha256="098352svjdf8cfmb9qwbv71xb4irxcr70r06bvnqdv5bliq9fzin"; depends=[rmarkdown]; };
   presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; };
-  preseqR = derive2 { name="preseqR"; version="3.0.0"; sha256="07pwqn985dg5kjx65gfgcyg1nywjpxaswa7i6nsr8h0cr7a2mc9j"; depends=[polynom]; };
+  preseqR = derive2 { name="preseqR"; version="3.0.1"; sha256="1lbcczp17fc690mxfvvpn4iyrxhjh5g32x3860g3yrcyx81sayir"; depends=[polynom]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
   prettycode = derive2 { name="prettycode"; version="1.0.0"; sha256="1zba83b5sk8jyag8jz8gipn6qpxwfsfg1xcxamfvpmzjicajzhbx"; depends=[crayon withr]; };
   prettydoc = derive2 { name="prettydoc"; version="0.2.0"; sha256="1zpvi4lyjazhj2h6m3j46x93s9c2300xqylaqy6gp1yjn9im36dp"; depends=[rmarkdown]; };
-  prettymapr = derive2 { name="prettymapr"; version="0.1.5"; sha256="1mccqidbnyl31wzbf5ly8qv23v6zha1chqna59j97cc2m3rhkqdf"; depends=[digest foreach rgdal rjson sp]; };
+  prettymapr = derive2 { name="prettymapr"; version="0.2.1"; sha256="1839zhc4s9pkl6fq0jd613cbyrwj4a9h04r9c5ki3jkcwi3w80jq"; depends=[digest httr plyr rjson]; };
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
@@ -7970,6 +8175,7 @@ in with self; {
   primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
   princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
+  prioritylasso = derive2 { name="prioritylasso"; version="0.1.0"; sha256="1mn7ywn8barxka119khiv9vxz81rqcjiz09960skwnnw9mksxnak"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; };
   pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; };
   prob = derive2 { name="prob"; version="1.0-0"; sha256="0gnp3q3dm176c1n7vdgisv3p11m2jk1hiza1yi8qaqyd9mfh86bg"; depends=[combinat fAsianOptions]; };
@@ -7979,7 +8185,7 @@ in with self; {
   proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; };
   processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; };
   prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; };
-  prodlim = derive2 { name="prodlim"; version="1.5.9"; sha256="0hkv3y0j8crssvw7ck7m4vhzkwsbwl1nwsyjdmzjw42pdj448dl5"; depends=[KernSmooth lava Rcpp survival]; };
+  prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; };
   productivity = derive2 { name="productivity"; version="0.1.0"; sha256="0hbysja40yv5ssiq4c3dn5bwypjhjdf1g3x56zms2ck78sk75zxk"; depends=[doParallel foreach Rglpk]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
@@ -7995,12 +8201,12 @@ in with self; {
   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=[]; };
-  prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.1"; sha256="0zrz0rywhmb4n3my9ihf070rpmd3xni59rr4dsl1ahq9lkd97h20"; depends=[rootSolve]; };
+  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-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
   properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; };
-  prophet = derive2 { name="prophet"; version="0.1"; sha256="0bpkpl0wpvhlcrk5z0fv7ra7l7yxdkbgzlxp99h88ilnad49hh5d"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; };
-  propr = derive2 { name="propr"; version="2.1.2"; sha256="1qymykn6jgbs7pfnm1and8l87m8wyhqfnr1cx1jd1ghw8avniixl"; depends=[fastcluster ggplot2 Rcpp]; };
+  prophet = derive2 { name="prophet"; version="0.1.1"; sha256="1knkkm3ai91rcak5c5199gjqazq3db8202knk7b846w0n4f77hn3"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; };
+  propr = derive2 { name="propr"; version="2.2.0"; sha256="084p7wxgg4dlphzydgn51wrq2dik0yqb0qax0bl992r78qalak4b"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.2.28"; sha256="1jnc2picmip1681pw9g9l1p7di65mvr10dybqdl0l9gidchn5p0n"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -8009,7 +8215,7 @@ in with self; {
   proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; };
   protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
   protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
-  protolite = derive2 { name="protolite"; version="1.5"; sha256="0x25zcw3ayy0rl0sshd0iisaka25xx0sf6fjzlg26ssqjxhzv2f9"; depends=[jsonlite Rcpp]; };
+  protolite = derive2 { name="protolite"; version="1.6"; sha256="10ly0rscpmgdakzlr27h6d78d6ixvrh76xcyx68caffr3zydlfyq"; depends=[jsonlite Rcpp]; };
   proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
   prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
   protr = derive2 { name="protr"; version="1.2-1"; sha256="08431v94p6c4sw2yqm6jc2v20kdgp5gn8kbl40am875z4a9q7c76"; depends=[]; };
@@ -8034,9 +8240,9 @@ in with self; {
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="1.6.12"; sha256="0ijz9gcc52byzmrw4iz976lgayp1wmn5b9v36bras14fwlwri0ky"; depends=[foreign mnormt]; };
+  psych = derive2 { name="psych"; version="1.7.3.21"; sha256="1sncah07ms8ss2hgqqfgg1k023kgvys5hhyyhiw42zq99kapnwc9"; depends=[foreign lattice mnormt nlme]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
-  psychomix = derive2 { name="psychomix"; version="1.1-3"; sha256="15lz6rh3101pxsam07zlgiryyzmf8m16mxnh1fsgdnz8bw0li9g7"; depends=[flexmix Formula lattice modeltools psychotools]; };
+  psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; };
   psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; };
   psychotree = derive2 { name="psychotree"; version="0.15-1"; sha256="1awavyzblh4s0v15kv52sq5dpalg5p0fp7ih46jxppm1srdxsz41"; depends=[Formula partykit psychotools]; };
   psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
@@ -8044,7 +8250,7 @@ in with self; {
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
   ptstem = derive2 { name="ptstem"; version="0.0.3"; sha256="0dasfqkrd5dkqr1wbg56qrpkyjcb0lcdfcgz5mbxbhs478gf0nwj"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; };
-  ptw = derive2 { name="ptw"; version="1.9-11"; sha256="0vh5xv26l27pbx1g9xrj4vcv2bv75cjxs3zf5zcalrnga2lhbdjw"; depends=[nloptr]; };
+  ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; };
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.8"; sha256="0vr7r63i7xq6iqik4zdxjf78pfmsppnp4d9lmc6p1c19l9fcgljy"; depends=[boot R2HTML RCurl XML]; };
@@ -8061,7 +8267,7 @@ in with self; {
   pvrank = derive2 { name="pvrank"; version="1.1.1"; sha256="07pk7xvvg51i30kzf0cyj6qa38gmdf32c2c2ljbhp95ldk4j07mi"; depends=[EnvStats Rmpfr]; };
   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-0"; sha256="1zpyd8ij93w0c27v4i68y869sj8hw30prppaxq0iprgf3d72qf6r"; depends=[]; };
+  pwr = derive2 { name="pwr"; version="1.2-1"; sha256="0k3jzx7jjgzha3vkpknj9nvx4yqlc9rq0mw25shvzi0xbr1y2cdb"; depends=[]; };
   pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; };
   pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
   pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
@@ -8070,22 +8276,23 @@ in with self; {
   pxweb = derive2 { name="pxweb"; version="0.6.3"; sha256="106nb0a3v295cam8ixhdwpgjhwq8p71c2z5c49s6xnqwmf6rbd0h"; depends=[data_table httr plyr RJSONIO stringr]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
   pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
-  pystr = derive2 { name="pystr"; version="2.0.0"; sha256="08a20ii7h97qvyzqndbf3rdmnyr04g8h9lrs6qw193p1p41dl94w"; depends=[Rcpp]; };
+  qGaussian = derive2 { name="qGaussian"; version="0.1.4"; sha256="00dn6cxix1yhaz877g240i1rkk9j6f3ys5hj41l9rvwsq95ayi5h"; depends=[robustbase zipfR]; };
   qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
   qPCR_CT = derive2 { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
   qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
   qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; };
   qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
+  qboxplot = derive2 { name="qboxplot"; version="0.1"; sha256="1izihjcdwj5y90fmr97wbp2qswszjpb28cv0cf3gl57pypbq5vq2"; depends=[]; };
   qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
   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.5"; sha256="13isxmi9vknl5c71434r16j301i86zpbzcqch8hiay51x3wbf2f0"; 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=[]; };
-  qdapRegex = derive2 { name="qdapRegex"; version="0.6.0"; sha256="0k6n3zr07ccr9xlmkyg6m0pp7plh91066b61zrn7jphgs0d31c0a"; depends=[stringi]; };
+  qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.1"; sha256="0sfzqmds888r599mwm7j0qjsqfv6z59p4apmmg36hsyaxmw51233"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
   qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; };
-  qgraph = derive2 { name="qgraph"; version="1.4.2"; sha256="1pp3dwrmp7j4rv0djbypnwjb26gji5fhqw4iwqbnxyi86m47z7z7"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
+  qgraph = derive2 { name="qgraph"; version="1.4.3"; sha256="1ymgi1ls2q22rwx1hv3h6flgfjx5l2dbmzh804jlq68wh8xf496j"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
   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.4"; sha256="0lq9faksp18mgb6pa7qhbm9frd6f4675623d797snvnm67aiy8fa"; depends=[ggplot2 lattice latticeExtra scales]; };
@@ -8095,16 +8302,16 @@ in with self; {
   qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; };
   qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; };
   qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; };
-  qmethod = derive2 { name="qmethod"; version="1.5"; sha256="1j2i3m55vvs6l9fc8sdnp84a5yndcihz8sz49a7gd6sarr55ily4"; depends=[digest GPArotation knitr psych xtable]; };
+  qmethod = derive2 { name="qmethod"; version="1.5.2"; sha256="1snllw82cijl7qgmgkn2x1k3x43x0hxbvh5mx5sffrma9kkv2fii"; depends=[digest GPArotation knitr psych xtable]; };
   qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
   qpcR = derive2 { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
-  qqman = derive2 { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; };
+  qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; };
   qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; };
   qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; };
-  qrLMM = derive2 { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; };
-  qrNLMM = derive2 { name="qrNLMM"; version="1.3"; sha256="046xzzyrjaqa8sa7pxf4mhi1q5pdhvsn5z8gid0cypb0z140ia85"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+  qrLMM = derive2 { name="qrLMM"; version="1.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+  qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
-  qrcm = derive2 { name="qrcm"; version="2.0"; sha256="09awa82qvxhdif9g6w36d89wyhfm55z39dw063lasa7pp7dd3gcl"; depends=[pch survival]; };
+  qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
   qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; };
   qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
@@ -8113,7 +8320,7 @@ in with self; {
   qrmtools = derive2 { name="qrmtools"; version="0.0-6"; sha256="14127svars3f7682mmbmqy0m51xs6syzcrki1mpjf9j1qv2s3jhf"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
   qrng = derive2 { name="qrng"; version="0.0-3"; sha256="0xdhmcqvgjmrf4c72x76yz5kp0jiysy8q6f67lix1h4mvzr4q2qd"; depends=[]; };
   qrnn = derive2 { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; };
-  qtbase = derive2 { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; };
+  qtbase = derive2 { name="qtbase"; version="1.0.12"; sha256="0j3nzmh4xj0mzwlh9dsc3296yqbkhzn6qhzb8ismhi0bmx5hjydj"; depends=[]; };
   qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
   qtl = derive2 { name="qtl"; version="1.40-8"; sha256="05bj1x2ry0i7yqiydlswb3d2h4pxg70z8w1072az1mrv1m54k8sp"; depends=[]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
@@ -8128,11 +8335,11 @@ in with self; {
   quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
   quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; };
   quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
-  quadrupen = derive2 { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
+  quadrupen = derive2 { name="quadrupen"; version="0.2-5"; sha256="193hn3yf6c5i3p4n8gpg78nvsf2jdlcw40mm4p2ffxk7xzmv8xvl"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualV = derive2 { name="qualV"; version="0.3-2"; sha256="16pjn2la4da9466rafl5drlzx2rcf3vy68b5wz27aacyr15nvdcb"; depends=[KernSmooth]; };
   qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; };
-  qualpalr = derive2 { name="qualpalr"; version="0.3.1"; sha256="0qfdhzlr4l68a0pwvc58kdh0n5hj7lx7vjkqrq75nbz2b2ycksd3"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
+  qualpalr = derive2 { name="qualpalr"; version="0.4.0"; sha256="0nbgcz6d57y6w7npfl064i561j9iw3r55q9md5g4hfdhazb1hf7d"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
   qualtRics = derive2 { name="qualtRics"; version="0.3"; sha256="1w2rbp3wxxp7yazf00wdjzm4d632n5iwdfcq1fsam5h0srrn18bz"; depends=[httr jsonlite stringr XML]; };
   qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
@@ -8140,26 +8347,27 @@ in with self; {
   quanteda = derive2 { name="quanteda"; version="0.9.9-24"; sha256="0wh7b3yj8qlgygy85sl98pf0inv9vxkd32k56k97bdiajz61cbmk"; depends=[ca data_table fastmatch ggplot2 Matrix proxy Rcpp RcppArmadillo RcppParallel SnowballC stringi wordcloud 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-7"; sha256="16iqpavdslhb1fdpvnxdd3awq9b0rj16mravg9nq8brqb6z3p2x2"; depends=[TTR xts zoo]; };
-  quantreg = derive2 { name="quantreg"; version="5.29"; sha256="098gy8xv9kcl5y0cm93b8chr5sm6crrdxi20bkx9lmwmybl3himv"; depends=[Matrix MatrixModels SparseM]; };
+  quantmod = derive2 { name="quantmod"; version="0.4-8"; sha256="0jgd2i93k7pi8snqcs0lx668mq6wla3qaiv5a13m6fvb6clncp32"; depends=[TTR xts zoo]; };
+  quantoptr = derive2 { name="quantoptr"; version="0.1.2"; sha256="1hvr69ng8z7qhw3w0by95v6sckcismx8d5s69k2949rfg79z3dmh"; depends=[quantreg Rdpack rgenoud stringr]; };
+  quantreg = derive2 { name="quantreg"; version="5.33"; sha256="1dirmxa4cd05nb0yv0ga6ivw5hkr2zr2cb2lixl1nb6amqn024is"; 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-5"; sha256="0yckbz8bk7zlg787a0q70x5k1y4z1nj4difavimgs4s5ac6nbajd"; depends=[randomForest RColorBrewer]; };
   quantregGrowth = derive2 { name="quantregGrowth"; version="0.3-2"; sha256="1ga3qn8g7r465dlxl8wmvz1vlpq5639kmawancsgkm77f316wpzf"; depends=[quantreg]; };
   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]; };
-  questionr = derive2 { name="questionr"; version="0.5"; sha256="1n3qv4ynddhhh0h9n0v21y7dq7mq5rmg0qqh3spxgrj0acrnqzhp"; depends=[classInt highr htmltools miniUI rstudioapi shiny]; };
-  queuecomputer = derive2 { name="queuecomputer"; version="0.6.1"; sha256="171fgmb5xz653fh9lr3p562g5ap9072a546r8kan5b6msmnh6adk"; depends=[dplyr Rcpp RcppArmadillo]; };
-  queueing = derive2 { name="queueing"; version="0.2.8"; sha256="08wcb58rp9g85cigm0zn0ba4xgihi4283w3sr4b16lv67sgld4p6"; depends=[]; };
+  questionr = derive2 { name="questionr"; version="0.6.0"; sha256="057akqpnvpm0ss650wfjd16j5xk6vxcs1micbqfyskajs295ql8l"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
+  queuecomputer = derive2 { name="queuecomputer"; version="0.8.1"; sha256="1c4xifg0wz09bn9j0y7xyn2rdr4fz2vr2r35r8bcajnmgs9hai3x"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
+  queueing = derive2 { name="queueing"; version="0.2.9"; sha256="1k64j880jw9g28jklxf7nqnav4mpw83wp63fafx7zhzp4wq412bm"; depends=[]; };
   quhomology = derive2 { name="quhomology"; version="1.1.0"; sha256="0acglmjp4x8f81iysxp8x7v5279p8gdidj308b9spn6xbmqgbr8z"; depends=[MASS numbers]; };
   quickReg = derive2 { name="quickReg"; version="1.0.0"; sha256="0dgs0ja2srivrbzl11d3al45ncnrlx7940sk0h8c6lnnxv7nz77k"; depends=[ggplot2 nortest psych survival]; };
   quickmapr = derive2 { name="quickmapr"; version="0.2.0"; sha256="1hxcq4h1rgdmypn3kgmwppzhacyspcj7iv2sy7s2xx5y69x62hf1"; depends=[httr raster rgdal rgeos sp]; };
   quickpsy = derive2 { name="quickpsy"; version="0.1.4"; sha256="0zvi5g43dj1a3f6nysw9gc9nnhm0z5h6sfka4ggwr14fw6k0gz3l"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
   quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; };
   quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
-  qut = derive2 { name="qut"; version="1.1"; sha256="0d9gap5jp69y9r7zip4r1kp79lq2wfrxpjka225pxjgj59rj3xls"; depends=[flare glmnet lars Matrix]; };
+  qut = derive2 { name="qut"; version="1.2"; sha256="1w6zsjphzfb1gby21cq20j8cclj15xklwga821sj07x3nchgn421"; depends=[flare glmnet lars Matrix]; };
   qvcalc = derive2 { name="qvcalc"; version="0.9-0"; sha256="0gccxl6l6ibffxkjzfmh2scm8f3bnqwm1hr7ss7dqshhxw21kd5c"; depends=[]; };
   qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; };
-  r_jive = derive2 { name="r.jive"; version="1.7"; sha256="051kd6ksan4bw3z9w6p22h0sqn6y6dyadcxkibgyi8pz5xp6qypx"; depends=[gplots SpatioTemporal]; };
+  r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2glmm = derive2 { name="r2glmm"; version="0.1.1"; sha256="0b64kia06n8l88rm63hcb8h8qha5if2h8vm8m4s5fdf5hl34dv02"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
@@ -8167,9 +8375,9 @@ in with self; {
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
   r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
-  rAltmetric = derive2 { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; };
+  rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
   rAmCharts = derive2 { name="rAmCharts"; version="2.1.3"; sha256="0q02x00gvvqzrsl2m9lmmjc2xf3vf718ar0zlqnqn6rnz94lbvv3"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml]; };
-  rAverage = derive2 { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
+  rAverage = derive2 { name="rAverage"; version="0.5-3"; sha256="0mn0ngnjjcyh59q4k0lc1fpim2n81aif1b4nrkdwl5dn59zb3cw3"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
   rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
@@ -8192,6 +8400,7 @@ in with self; {
   rFerns = derive2 { name="rFerns"; version="2.0.2"; sha256="19lwvb9aa115gc6wb5vzhmmhqgq2xxf6y83hw5y6k589prbxfq8y"; depends=[]; };
   rForest = derive2 { name="rForest"; version="0.1"; sha256="1y7gqa1333nvllngy821k655glxkb9p6rbnx9cns7dy0qdqjzx50"; depends=[alphashape3d geometry rgl sp]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
+  rGoodData = derive2 { name="rGoodData"; version="0.1.0"; sha256="1yys79dgcwsbc1xv1d5qv6bvcsdyf4k50jrvbgmmwwygami257zn"; depends=[data_table httr jsonlite]; };
   rGroovy = derive2 { name="rGroovy"; version="1.0"; sha256="03kyw1hv1xmv580cf47gb3fzvjp27j0a93604h5hap981pzibdpy"; depends=[rJava]; };
   rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
   rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
@@ -8207,7 +8416,7 @@ in with self; {
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.0.4"; sha256="1md0xkl87qqylwh5zbx9awa5i4f573v4glgaf4k8h5ls4icaaav4"; depends=[biglm]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
-  rNOMADS = derive2 { name="rNOMADS"; version="2.3.3"; sha256="186pcxdfkp24aff3qldkhbcxydifg092w3jadahfrd30d6gyfvp8"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.3.5"; sha256="1p7y47dl92j284hbra6ik4bqfavnrqwdarf83k3lmqyqy89kh7yf"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
   rPlant = derive2 { name="rPlant"; version="2.16"; sha256="0bi7p8w6v8gys8rab5f0c11r0rsp14nsf4mmm2bsz8kxfprh6vdp"; depends=[RCurl rjson seqinr]; };
   rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; };
   rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
@@ -8218,7 +8427,7 @@ in with self; {
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSPACE = derive2 { name="rSPACE"; version="1.2.0"; sha256="1nmv8niqc34mipzhny1mlwc9v4kck02ixmm1i25cqdfhsng03dma"; depends=[ggplot2 plyr raster RMark sp tcltk2]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
-  rTableICC = derive2 { name="rTableICC"; version="1.0.3"; sha256="1q7xac9vfnakjp54ccqli42wi8idfb9g9crgbqyg5s726b7z50n7"; depends=[aster partitions]; };
+  rTableICC = derive2 { name="rTableICC"; version="1.0.4"; sha256="0if18is64m3ka2dxfbj7vb1lbwwhn2hgfh3kdh7d47nr3z4ak7p0"; depends=[aster partitions]; };
   rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
@@ -8235,9 +8444,10 @@ in with self; {
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.6.0"; sha256="01gzcvq5xq8ljbxkwx8qxcpd871nd03236fkv1gr5s1bw9lb0z6l"; depends=[car dplyr ggplot2 gridExtra magrittr MASS psych r_import radiant_data scales shiny wordcloud]; };
   radiomics = derive2 { name="radiomics"; version="0.1.2"; sha256="1l9ribgyk0wgr7cy4fh7qp0hwzxcmkir9r2zwb0ha3rqqggd3xj7"; depends=[Rcpp reshape2 spatstat]; };
   radir = derive2 { name="radir"; version="1.0.2"; sha256="09lcq8ax5x5yk3sqx15rvw3vyi8fyfzgs76kxjhf7hcw4qnib46d"; depends=[hermite]; };
+  radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
-  rags2ridges = derive2 { name="rags2ridges"; version="2.1.1"; sha256="1wma4yikm7aqccldqga96hl2vpagjvmv5gwglj04clcmh9i7cskp"; depends=[expm fdrtool ggplot2 Hmisc igraph Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
-  ragt2ridges = derive2 { name="ragt2ridges"; version="0.2.3"; sha256="1ws2drllynmwc4dfd90b7pafc1gpz99g129yjf511ikjzfbl3lra"; depends=[expm fdrtool graph gRbase igraph marray Matrix mvtnorm rags2ridges RBGL Rcpp RcppArmadillo]; };
+  rags2ridges = derive2 { name="rags2ridges"; version="2.2"; sha256="04f9gvwpgrx54dgbjjixlxa2056aqcz2kryn4jplwf5fc0vj1lyn"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
+  ragt2ridges = derive2 { name="ragt2ridges"; version="0.2.4"; sha256="0pygq4na4xws1s1f96a0qslgsj94r28x0sbmxl402pshwkjl0xs4"; depends=[abind expm fdrtool graph gRbase igraph marray MASS Matrix mvtnorm rags2ridges RBGL Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="0.5"; sha256="0h09h9ws9c2d9xc00w4hl000h0kbvq16lz4vgv1w93am8zmsp4wm"; depends=[futile_logger limSolve]; };
   rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
@@ -8254,15 +8464,15 @@ in with self; {
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; };
-  randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.1"; sha256="0q4xjh7qqmd4slxwd1z5mnpn4y3vx1vbn6v060zbd0afibpcw92b"; depends=[ddR Matrix randomForest]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.1"; sha256="17a59jc8h7bfgz9gpisc144fyas7da1c1lab1x8wasfilgkg08z2"; depends=[]; };
+  randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.2"; sha256="17f9dr93vbmv4b1hmx4cw5mc3phm7wnjzw70yi8nbhmzlar3qj7v"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
   randomLCA = derive2 { name="randomLCA"; version="1.0-11"; sha256="076sjq74dhdr9vqlg8kns4apvkrv9qpvkixqkrkz2l7215k79fz7"; depends=[boot fastGHQuad lattice Matrix]; };
   randomNames = derive2 { name="randomNames"; version="0.4-0"; sha256="0419kjgin5yf58765rc6m8wcbp26yggkiarprzissqaf9sp0sh4p"; depends=[data_table]; };
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomcoloR = derive2 { name="randomcoloR"; version="1.0.0"; sha256="15qgfzwc2cli2gjwzj1pf4h16qciiinihd9ib6ph74jbkpimyh11"; depends=[colorspace stringr V8]; };
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
-  randomizeBE = derive2 { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; };
+  randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; };
   randomizeR = derive2 { name="randomizeR"; version="1.3"; sha256="0s62r0fxi0f9jbwldvga2vn06cp0amxjhmqch7d892c4wa7r9fj0"; depends=[ggplot2 plotrix]; };
   randomizr = derive2 { name="randomizr"; version="0.4.1"; sha256="0shj50s88l96d0zl8iv2wdzgrszffi9hgv7hsmvcxh1jm051ipi9"; depends=[]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
@@ -8271,7 +8481,7 @@ in with self; {
   rangeBuilder = derive2 { name="rangeBuilder"; version="1.3"; sha256="08v01b0wm5r73yp2qkxxvd8jsxba22rnqsbwwrqrkrm71c68j192"; depends=[alphahull raster rgdal rgeos sp stringi]; };
   rangeMapper = derive2 { name="rangeMapper"; version="0.3-1"; sha256="005r97zwz0czsp543h1g3zrys00s6wdyk0ji9pk7jn625i02cbdk"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
   rangemodelR = derive2 { name="rangemodelR"; version="1.0.1"; sha256="04zv8a4nhin9masvbw1cmbwdkls4wgq81xfw6kg0wdh1hpqjz1z0"; depends=[]; };
-  ranger = derive2 { name="ranger"; version="0.6.0"; sha256="1fwqwbi0dnla16x6zj14rf95qr5gmilfmlrwnv7s960h4yiw4n97"; depends=[Rcpp]; };
+  ranger = derive2 { name="ranger"; version="0.7.0"; sha256="0g1rnpk4c06lmy0r5n0j7i2xna190kqalmxp42d9gnk3drnb1x43"; depends=[Rcpp]; };
   rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; };
   rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
@@ -8282,8 +8492,9 @@ in with self; {
   raptr = derive2 { name="raptr"; version="0.0.3"; sha256="1ydk83w1sd60pb0a03938hlgdw87pk40l028cxwa8kzwrzi6gh1j"; depends=[adehabitatHR BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp testthat]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
+  rarhsmm = derive2 { name="rarhsmm"; version="1.0.2"; sha256="0npj9iysl32lhplpqp5a7h7gm35jz33div8vwksd7l6jr73rcqdg"; depends=[glmnet]; };
   rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; };
-  rase = derive2 { name="rase"; version="0.2-22"; sha256="0wva7dd7zsclqxk3imkvbi98rxsvd1axr1l1msfcf9r8xrzybshf"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
+  rase = derive2 { name="rase"; version="0.3-2"; sha256="1c8navn518prz8j644bg1fzx8q1jgnl5src5kagq53ln7fs6jq73"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
   raster = derive2 { name="raster"; version="2.5-8"; sha256="1k34caqj8fab7am44zmp1szk0w15rjc04xz3phzm2l1lg2yjm6a7"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
@@ -8295,14 +8506,15 @@ in with self; {
   rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
   rattle = derive2 { name="rattle"; version="4.1.0"; sha256="0ww4bwwvivpk049lpv6k29zxkb0islhwh2qnlrvasgh2b9yig25p"; depends=[magrittr RGtk2 stringi]; };
   raw = derive2 { name="raw"; version="0.1.4"; sha256="112fw1si708qrj6r91b1i8cwhxa20amri5838rc5azn6d5b9wcks"; depends=[]; };
-  rbamtools = derive2 { name="rbamtools"; version="2.16.0"; sha256="0a3862923wn9mxpbhsq7sxd0q306xnzphsn2p0zxsx1ixw7ksy4j"; depends=[refGenome]; };
+  rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; };
+  rbcb = derive2 { name="rbcb"; version="0.1.0"; sha256="1p6fmky5ci54is5abf9bqd8xd7jqskn8gic3hih8iangx6vcp4a2"; 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.3.0"; sha256="0ig9s0xnwkri1sxqaa8fax68v22bp4vl9rv4wq1gd3gpgl2c0frc"; depends=[httr jsonlite plyr tibble xml2]; };
+  rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
   rbi = derive2 { name="rbi"; version="0.7.0"; sha256="0j5h5m4xshs5xizzb3fxlzjgp6nkyz0hbh0yhky1pj815n66ww9m"; depends=[data_table ncdf4 reshape2]; };
   rbiouml = derive2 { name="rbiouml"; version="1.7"; sha256="0bk0pvx0rfk74s7lbr8lc664yplfky94j1ym098w029045k233pi"; depends=[RCurl RJSONIO]; };
-  rbison = derive2 { name="rbison"; version="0.5.0"; sha256="01j8jnfhikaggsvcnxamchvgabp8rbpmi1q18s1bcn5vc55fi12f"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; };
+  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]; };
   rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
@@ -8316,7 +8528,7 @@ in with self; {
   rcc = derive2 { name="rcc"; version="1.0.0"; sha256="0a77d54c9qahhsjzpa0436ddsj4j44013r7rbxm0fjz04c0d2921"; depends=[]; };
   rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; };
   rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; };
-  rcdd = derive2 { name="rcdd"; version="1.1-10"; sha256="16j98x87dsjd7zj5pp9i5lc0a3ypr98zjwydpyhpl3zc0vnbbild"; depends=[]; };
+  rcdd = derive2 { name="rcdd"; version="1.1-13"; sha256="0dnijjbi79hi23rq6j9wlynbap275n4x4097x0zz52imkqfw03aj"; depends=[]; };
   rcdk = derive2 { name="rcdk"; version="3.3.8"; sha256="0gwjb6ph7v94zl3kdh24dbk8hz48gi2y3xmj35wpjvzc496ldmbf"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="1.5.13"; sha256="0ypfg4kzf07j1gi6nyifkss9s43hcb7jps9qh6990ci5qasw4z6a"; depends=[rJava]; };
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
@@ -8325,7 +8537,7 @@ in with self; {
   rclimateca = derive2 { name="rclimateca"; version="0.2"; sha256="1haczzx0hbah4vzbp10rih2yqq1x1s6w9f66xgk485sgyvkg5855"; depends=[digest httr lubridate prettymapr reshape2]; };
   rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.7"; sha256="1y9naqi2bylihkasvfndkpwslnm393709645jwvwplzaaviy0hf7"; depends=[httr plyr XML]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
-  rcompanion = derive2 { name="rcompanion"; version="1.4.0"; sha256="1brl9q421q8n5lab5wlp0hzgzdldwr2b9sa8qngkk3nfvzy1jdwx"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
+  rcompanion = derive2 { name="rcompanion"; version="1.5.0"; sha256="1dnrnpmk0gqnz45xqp5ld1slgykd6bg44n2bby5l10s7kqqli4ql"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
   rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
   rcqp = derive2 { name="rcqp"; version="0.4"; sha256="1jpzp3cs17bwfabzg7jffa3hni867mjw8yxi0igxicrbz56j33jb"; depends=[plyr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.6.0"; sha256="0fy1wkn6s5pkhcfhjydy5zvra89g1p2nf5j85czxhxbq60h1jd1b"; depends=[bibtex dplyr httr jsonlite miniUI plyr R6 rappdirs shiny stringr xml2]; };
@@ -8335,21 +8547,25 @@ in with self; {
   rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatacite = derive2 { name="rdatacite"; version="0.1.0"; sha256="1h8zrgy3ig4rsrm4j9ivff71mdyabrdp71cflxahw7c3q9iyjxhf"; depends=[oai solrium]; };
   rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
+  rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
+  rddensity = derive2 { name="rddensity"; version="0.1"; sha256="16xfdaf43dp7xh65ay9sv5s2v1149c6ahyg1y7cnp9lncy6gvkny"; depends=[]; };
   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.1"; sha256="1c5j2ja54k7pk86g7mh5wbqx1qkj8ks2ihmn774aqyky6nkgmx92"; depends=[plyr RCurl XML]; };
+  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=[]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
+  rdist = derive2 { name="rdist"; version="0.0.1"; sha256="1rdw0vpd8xc6n638cyfjq8ll5pkhvkcf14vbs3m8l75fdf7mxlbb"; depends=[Rcpp RcppArmadillo]; };
+  rdlocrand = derive2 { name="rdlocrand"; version="0.1"; sha256="1vf9f7l9cjc2zwfpqvbxapcyyzb0vv9jvnai74z34clcwcmx6yrm"; depends=[AER sandwich]; };
   rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; };
   rdomains = derive2 { name="rdomains"; version="0.1.5"; sha256="0xz6vdci2yxmc2850jlgj7c27cndwvk645kwky0whisg6cbv8wdg"; depends=[aws_alexa curl glmnet Matrix RSelenium urltools virustotal XML]; };
   rdpla = derive2 { name="rdpla"; version="0.1.0"; sha256="0h3m2f5rdyvdgb767hnmck4z1wq1y4hvbcwgfh7zfjcd9zns42h1"; depends=[data_table httr jsonlite tibble]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.95"; sha256="09dk8kgpyz3sdkvspwka9p4a6kvl7yibdppd9y06sa7grmpykvzm"; depends=[]; };
+  rdrobust = derive2 { name="rdrobust"; version="0.97"; sha256="0l4gjpmy7lv2zhwh346pjci6d5vbp4n47plchfi48m8afn4w1v6k"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
   rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; };
   rdwd = derive2 { name="rdwd"; version="0.7.0"; sha256="0mqnf88y6g25q1a7k71ldd7szl4pm5s44cid1494m4xfdk50limb"; depends=[berryFunctions]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
   reReg = derive2 { name="reReg"; version="1.0-0"; sha256="0xd78frrzykdrdwj39vv5m11s5v3xg9fym200gz7sffw8vjv3z96"; depends=[aftgee BB MASS SQUAREM survival]; };
-  reactR = derive2 { name="reactR"; version="0.1.0"; sha256="1fw6rdi231blr416hq881pc3glv7pnn3fhc496cnj0dzwg0b32v6"; depends=[htmltools]; };
+  reactR = derive2 { name="reactR"; version="0.1.2"; sha256="011ga8f72qq0ljqc7j0qvcbbr2jg167ri1yny65n55dls80flmng"; depends=[htmltools]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.3"; sha256="0yisrg2gdd053xf1w0ssw7r4wdarqzbsqzrcngb0dl7ah0y5w7vb"; depends=[]; };
   readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; };
@@ -8357,16 +8573,17 @@ in with self; {
   readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; };
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
   readODS = derive2 { name="readODS"; version="1.6.4"; sha256="1kj648phxvpg480fdhr2sj4l8q306gjdl886zqnkwxif5mw1aq7g"; depends=[cellranger readr xml2]; };
+  readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
   readability = derive2 { name="readability"; version="0.1.1"; sha256="19csrvnl1gslzamn46w5r0q4x12g56zr11m4lwp6rzwd5wcnj9ra"; depends=[data_table ggplot2 syllable tidyr]; };
   readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
   readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
-  readr = derive2 { name="readr"; version="1.0.0"; sha256="0xji0dbal6xcxnsmjj678fw29n7wrj45wrd5ng99yhqqijcm9f6g"; depends=[BH curl hms R6 Rcpp tibble]; };
+  readr = derive2 { name="readr"; version="1.1.0"; sha256="1g7g3gdmvq7nj8asw6fi13k38c420sy9696nqgkrhlvv5h13yqs7"; depends=[BH hms R6 Rcpp tibble]; };
   readstata13 = derive2 { name="readstata13"; version="0.8.5"; sha256="1hkbh7kia7bgshhlq2n683s0gs4rw4wzyfwrbp0hq1xirqnypj0a"; depends=[Rcpp]; };
-  readxl = derive2 { name="readxl"; version="0.1.1"; sha256="0ypmxp1xl2a27vlx7dj6kszbbr8fbs6lcc1ibhw1ln1p053xmlrr"; depends=[Rcpp]; };
+  readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="0.3.0"; sha256="0srny28mdd5zpk10pic5w0h0z21w2651rrdqsf87h7idm12j9zsw"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.9.0"; sha256="1kbmz969wiv2jspa2pi0lgbxsj3sd9xzn24bmks6mv5hzl8pp9xb"; depends=[mvtnorm]; };
+  rebmix = derive2 { name="rebmix"; version="2.9.1"; sha256="1qsyizjjhinm5ds3cgfl3h3vd0vf0pd0ni9nzzznvdvci7blb9jk"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-2"; sha256="18vqq535dsakchwid6k2wb6jl50yf1vsqlaryadf1j0ivgawl6av"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
   rebus_base = derive2 { name="rebus.base"; version="0.0-2"; sha256="15yxh7wxb8hfbr5mhpcpyi817b5r6g6ki60hkycvxp13ss770qwn"; depends=[]; };
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
@@ -8375,21 +8592,21 @@ in with self; {
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-  recmap = derive2 { name="recmap"; version="0.5.16"; sha256="0fq0l483mmb04n2qj2msngw6midwjrq5fjdh3sgzy5fhj5bcd288"; depends=[GA Rcpp sp]; };
+  recmap = derive2 { name="recmap"; version="0.5.20"; sha256="1ld3ifcn9rwgk4hiislmdkz73sdxagrbynq9x3mswjifx1hlqj6d"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
-  recommenderlab = derive2 { name="recommenderlab"; version="0.2-1"; sha256="03gyz6davjimrbbnjglj41hysvvd2hnxsi166san1877ibblgw4c"; depends=[arules irlba Matrix proxy registry]; };
+  recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
-  recosystem = derive2 { name="recosystem"; version="0.4"; sha256="1h8147x9caxxprxpgzk7qj9nkafbi34zhcnaksdpv95k7vnhs4ps"; depends=[Rcpp]; };
-  red = derive2 { name="red"; version="1.0.0"; sha256="07m48znd0dm2fd4jagjrn2fqx2wr1hzvx2rljlkpl0hkkljcz8lj"; depends=[BAT dismo geosphere igraph jsonlite maptools raster rgdal rgeos rJava sp]; };
+  recosystem = derive2 { name="recosystem"; version="0.4.1"; sha256="1gnq2gq47qwinack3f95d7c8877qia44zk9pnj1sx83jjs8sxk8p"; depends=[Rcpp]; };
+  red = derive2 { name="red"; version="1.0.1"; sha256="159zjqk2fns41n8vsz4x9jl6f0ln0c70894lvxm7pzsbm43n1ix3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
   reda = derive2 { name="reda"; version="0.3.1"; sha256="0313x4vm0jm0lgzspv0ldsblmjgy13dqbsafpikkh603k5pkq1js"; depends=[ggplot2 splines2]; };
   redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.3"; sha256="01dsgd28ps1f32l3ppz4fbzihs5i79zb1nqg9r3b21fsx1ly44d6"; depends=[snowfall]; };
-  redist = derive2 { name="redist"; version="1.3"; sha256="19d5m17b8rzy9fsl95r0zdr5swawdbdbg0pib85028f8pqh9g5f1"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
+  redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
   redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; };
   ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
-  refGenome = derive2 { name="refGenome"; version="1.7.0"; sha256="0xj5mqk7i4bl6ffdx346q558sn8hmqlkfpiv7ggrfhaqg02f6war"; depends=[DBI doBy RSQLite]; };
+  refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; };
   referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
   refimpact = derive2 { name="refimpact"; version="0.1.0"; sha256="03634gmfr423bjygdxcpgmnh9nm2l86rfmvkvq74qymwc2gl6l6p"; depends=[curl jsonlite tibble]; };
   refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; };
@@ -8401,6 +8618,7 @@ in with self; {
   regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; };
   regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; };
   regexr = derive2 { name="regexr"; version="1.1.0"; sha256="1gjv4wl4gjsh5rr0kz057x9j4dhikrm3zzlmxlhd1f9srjdmcdzy"; depends=[]; };
+  reghelper = derive2 { name="reghelper"; version="0.3.3"; sha256="0lsdsxi3nawqdzs7k1xma95mmywl86k517cihiv8q2s4maihsja3"; depends=[ggplot2 lme4 nlme]; };
   registry = derive2 { name="registry"; version="0.3"; sha256="0c7lscfxncwwd8zp46h2xfw9gw14dypqv6m2kx85xjhjh0xw99aq"; depends=[]; };
   reglogit = derive2 { name="reglogit"; version="1.2-4"; sha256="0ma1wddxhmja268ddkpcvskqf4lwq61brswnm600fms8ks7r78d3"; depends=[boot Matrix mvtnorm]; };
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
@@ -8414,8 +8632,8 @@ in with self; {
   rehh = derive2 { name="rehh"; version="2.0.2"; sha256="00wxx6w9ahddrg3lz14cqyg3dn0rfcxwy1z8arhdp1pn8d48pahw"; depends=[gplots rehh_data]; };
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
   reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; };
-  rel = derive2 { name="rel"; version="1.2.0"; sha256="0x68zivcydczq7rxxzjbgif8c4qbmp80nbz78f7292xlbzc39hjx"; depends=[]; };
-  relMix = derive2 { name="relMix"; version="1.2.2"; sha256="03mn7rnx2kh7v4alfvkiw3iakxi9dkfnmhgqsdfld3qrijjp1i6y"; depends=[Familias gWidgets paramlink]; };
+  rel = derive2 { name="rel"; version="1.3.0"; sha256="11wn28bjsmajvypz77iikwzwhm79pnc7kn15h996y9mxhx20izkd"; depends=[]; };
+  relMix = derive2 { name="relMix"; version="1.2.3"; sha256="07fcbvhxdfa94ixxvnrkhlm0xxz7wa1lv7xdjp97ajxxp9fy69yl"; depends=[Familias gWidgets paramlink tkrplot]; };
   relSim = derive2 { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp]; };
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
@@ -8433,6 +8651,7 @@ in with self; {
   rem = derive2 { name="rem"; version="1.1.2"; sha256="0m0lhv8hc6p0d7nmjig2678n7qrb9c15jkdqrx946f42k1f1dz6f"; depends=[flexsurv Rcpp survival]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; };
+  remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; };
   remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
   remoter = derive2 { name="remoter"; version="0.3-2"; sha256="0r7hm5cdbmkfn8lv07mn0lb1qq1g92l0hznjih1ykymjm3h6qyh0"; depends=[assertthat getPass pbdZMQ]; };
@@ -8443,15 +8662,16 @@ in with self; {
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
-  replyr = derive2 { name="replyr"; version="0.2.3"; sha256="04qjfsb7cq3x993ai4skkzj1p60y616qpmh3v94n260z0syd2gxj"; depends=[dplyr wrapr]; };
+  replyr = derive2 { name="replyr"; version="0.2.5"; sha256="084lpqjklk4b9zpcyv9w47g18w6sfxz01vn1kn510p8kzazbcdci"; depends=[dplyr wrapr]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
   repo = derive2 { name="repo"; version="2.0.2"; sha256="1rgcgl1a0sz3mnj0ny7507bkrlxbbh7ab39jwfm99ssipia12jjh"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
+  reportROC = derive2 { name="reportROC"; version="1.0"; sha256="0w570vvpwnz78kx4pfgri4lfx7l8xn6zjclimx2rskx5c2z3q5w7"; depends=[pROC]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
   reportr = derive2 { name="reportr"; version="1.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; };
   reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-  repr = derive2 { name="repr"; version="0.10"; sha256="06wnmc1xvkf6kzb396qjvn0m71lh1mp2q5p2lh4s20i1l42469cr"; depends=[]; };
+  repr = derive2 { name="repr"; version="0.12.0"; sha256="1p6a2ryb5iaf4i6nn1iav26bh83wmvncwpk25hyrzd5rxich1bq3"; depends=[]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.1.1"; sha256="0jxsnlspy12dnbpkghkmkr6p6783dhvsk3g9mj7gpn5j74qfk6li"; depends=[callr clipr knitr rmarkdown whisker]; };
@@ -8467,7 +8687,6 @@ in with self; {
   reshape2 = derive2 { name="reshape2"; version="1.4.2"; sha256="0swvjmc9f8cvkrsz463cp6snd8bncbv6q8yrfrb4rgkr0dhq6dvd"; depends=[plyr Rcpp stringr]; };
   reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
   respirometry = derive2 { name="respirometry"; version="0.3.1"; sha256="1v2i86zz2avyh0q3h2mjq6b967yi26xv7vwa66c390viiqrv4hpg"; depends=[birk lubridate marelac measurements seacarb]; };
-  restfulr = derive2 { name="restfulr"; version="0.0.8"; sha256="1dysvw757fcnmz94an8wzcq7h334f3j8lgv4j5w4lhgaa1949m94"; depends=[RCurl rjson S4Vectors XML yaml]; };
   restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
   restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
   restorepoint = derive2 { name="restorepoint"; version="0.1.7"; sha256="101lh84jsz84q0ch0j5adsjgza4ggv9xvwbq0d5wik7z5wa39pa6"; depends=[]; };
@@ -8475,20 +8694,21 @@ in with self; {
   restriktor = derive2 { name="restriktor"; version="0.1-55"; sha256="1yrzx7w14s04ppc16iw2hialx1k6k45ag9702vm8cnf31hm14kxp"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
   resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.0.0"; sha256="0a28r0rkg4m6jsrvczkkpdqrca3q5l5pgb4wyz6pvy5scjlvmpls"; depends=[rjson]; };
+  reticulate = derive2 { name="reticulate"; version="0.7"; sha256="1jzpipfhnvjcs2vj55d99y86x4y276i6ij3dlz1pngw524079971"; depends=[Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
-  revdbayes = derive2 { name="revdbayes"; version="1.0.0"; sha256="1q6fad3jpvpj0k976010i18ias540k0b2skiw7jk5z1zj9rrxi10"; depends=[rust spatstat]; };
+  revdbayes = derive2 { name="revdbayes"; version="1.1.0"; sha256="08rz1w98vm0rckxcg4f9hvpqhzyyk71grvklwl8qbqmm7319bjxz"; depends=[bayesplot rust]; };
   revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; };
-  revealjs = derive2 { name="revealjs"; version="0.8"; sha256="0cv410k7nflzkwz7g7zvc86wsmqz0kxlciz7mms7bixrwvqq2w0a"; depends=[rmarkdown]; };
+  revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.1"; sha256="0cs13hqv2wb549rhq84psky401pz8r41ia7c0pnyvhxfa2l6zrr8"; depends=[lazyeval magrittr]; };
   rexpokit = derive2 { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; };
-  rfUtilities = derive2 { name="rfUtilities"; version="2.0-0"; sha256="0jwn1rs4a8y7syyv8sgvkjpi69y5jv59xlznm5a3j4pidj5kxf10"; depends=[randomForest]; };
+  rfUtilities = derive2 { name="rfUtilities"; version="2.0-1"; sha256="1g11fr7vwdzmllgcjy7jy3vwgxa9mm18r41p2nckbjkq8yp5kmj3"; depends=[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.1"; sha256="17xkbn930vczxc8b9bljambzhc5j14b7fjswbrl8c8ygdhcd436n"; depends=[dplyr httr lazyeval tidyr]; };
+  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]; };
   rflann = derive2 { name="rflann"; version="1.3"; sha256="1y8m52vlrcl69srssd23zgg90yfhh9rryd16hk1dnqg713qhksgm"; depends=[Rcpp RcppArmadillo]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
@@ -8497,18 +8717,17 @@ in with self; {
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
-  rgbif = derive2 { name="rgbif"; version="0.9.7"; sha256="1ajwmxk8pgmgba2vv4pw424zzsjbx0z5ppsavmiy6zjxns7l5rbn"; depends=[data_table geoaxe ggplot2 httr jsonlite magrittr oai tibble V8 whisker xml2]; };
+  rgbif = derive2 { name="rgbif"; version="0.9.8"; sha256="17pixyx2wicxdwqz7mziharanqdv865hmb9lz2kfqy1gzpv29jp2"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.2-5"; sha256="03bi89n2n80lr0v99s130yl256nf3ww5hr02kpb2lawzz8d3rb7v"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.2-6"; sha256="0icg0d1ll5k894f0phjcsybp9dkkspff4f62dn9f7iw20zah78h1"; depends=[sp]; };
   rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
   rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.0"; sha256="0mac4rzgw4lp47rp9nxs7dgw0dzdxnb144an2zj8fcsnvm462vjg"; depends=[httr Rcpp]; };
-  rgeos = derive2 { name="rgeos"; version="0.3-22"; sha256="0bl5hwf0gn5dnm5v35hpkp1w7aiy3hzf2k9nrv70j33d7r8gbnif"; depends=[sp]; };
-  rgeospatialquality = derive2 { name="rgeospatialquality"; version="0.3.2"; sha256="19g685bz9x7jbn8mmz0yy6mr3qhkjdvvglhfxxh45mjvi2dz5aj8"; depends=[httr jsonlite plyr]; };
+  rgeos = derive2 { name="rgeos"; version="0.3-23"; sha256="0p04szj4bcsycj6lgnq65dgsc3w807hdqp5zrd5zxgclhqryq9nm"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   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.97.0"; sha256="0firba0rvp8kc5w2s1glzk72m2awkg4c2vsd3xhp9b247dvr1aj2"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; };
+  rgl = derive2 { name="rgl"; version="0.98.1"; sha256="11k93b3wkfasx63w0niin1ns1kgzrmjm66la7kvp5rljw3cvwjaz"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; };
   rglobi = derive2 { name="rglobi"; version="0.2.9"; sha256="15kc3gb998ryrnpw6nn87vsg63xknchs0hbl33g9napyj5wjmmiw"; depends=[RCurl rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
   rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
@@ -8526,20 +8745,21 @@ in with self; {
   ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; };
   ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; };
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
-  rinat = derive2 { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
+  rif = derive2 { name="rif"; version="0.1.0"; sha256="1y7zqxl00wp0nbldrhlqj2fyiflxxhqm7zgjncfwd6nkv1pvkkq9"; depends=[crul data_table jsonlite tibble]; };
+  rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
   rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
   rintrojs = derive2 { name="rintrojs"; version="0.1.2"; sha256="16i6s0km8l22rx2n9kn90z76himfckj387az47snhzbgnwlby3yc"; depends=[jsonlite shiny]; };
   rio = derive2 { name="rio"; version="0.4.16"; sha256="030y9hxsdapwsp9lhz013pyz2kgkrymad09bkc6rzykzqswsf61n"; depends=[csvy curl data_table foreign haven jsonlite openxlsx readODS readr readxl urltools xml2 yaml]; };
   rioja = derive2 { name="rioja"; version="0.9-9"; sha256="19b8j49qsrvcmhlwdaf1xqvwampn8b02dp876czzcgxhgkxvc6yw"; depends=[gdata lattice mgcv vegan]; };
   ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
-  riskRegression = derive2 { name="riskRegression"; version="1.1.7"; sha256="1db331s67w9i84dji05fjh8ml938w2y694gkyq00h14fkmwr9g4g"; depends=[cmprsk pec prodlim randomForestSRC rms survival]; };
+  riskRegression = derive2 { name="riskRegression"; version="1.3.7"; sha256="0zk0k0xx7d72bsrava7n7wadpkx8aaawg44fignmsh8mpzhwwhav"; depends=[cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   rite = derive2 { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
   ritis = derive2 { name="ritis"; version="0.5.4"; sha256="04vjbjqp5b9apafns2snh04hplgcfydzn52v63jgllyrn101vrjk"; depends=[data_table httr jsonlite solrium tibble]; };
   riv = derive2 { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; };
-  riverdist = derive2 { name="riverdist"; version="0.13.1"; sha256="1xpl47hhddr5xa1px8fxw8l2hicg78cnz5ak2496f0h662g8zb0w"; depends=[rgdal sp]; };
+  riverdist = derive2 { name="riverdist"; version="0.14.0"; sha256="1j9yi27zwkgx329rj7bl6284390ajwmpj6fdsh7vz5pac4q4kcds"; depends=[rgdal sp]; };
   rivernet = derive2 { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
   riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; };
   rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
@@ -8547,15 +8767,16 @@ in with self; {
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
   rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; };
   rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
+  rjmcmc = derive2 { name="rjmcmc"; version="0.2.2"; sha256="0c72nxhx57sarrpphlynrbwf2kp8cwd6bb7v39frqb1wi43ah63s"; depends=[coda madness R2jags]; };
   rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
   rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; };
   rkafka = derive2 { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava rkafkajars RUnit]; };
   rkafkajars = derive2 { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; };
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
-  rkt = derive2 { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
+  rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlas = derive2 { name="rlas"; version="1.1.0"; sha256="1hdxkjvsqyng67fyf43ykh27xfi510cdy1i8y2dcrg31mwc7r9rs"; depends=[data_table Rcpp]; };
+  rlas = derive2 { name="rlas"; version="1.1.1"; sha256="121pbapz36k7vak715dlhd4yccl0ib26zwccx3m3c3gcjv6qrvba"; 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]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
@@ -8565,12 +8786,12 @@ in with self; {
   rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.2.0"; sha256="0s5av8hic3b61ch6skvcxkpn9s2r0ylfxilxg8i2dvg4dk13qkna"; depends=[geojsonio geojsonlint readr rgdal sp V8]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.3"; sha256="1vvxyf3zhyxx6k697lia299456hryp8nh3zr0fc27f3107a8mcjf"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.4"; sha256="1dvs9cq88g61wfimifagq6y98yxavxzjan39jvpdsg98mafckq9g"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.3"; sha256="14brfil6s9hi0rnw13g8d9xvgnyblqbwvs3iwwwb38lzl8az5rqs"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.4"; sha256="0m9cs5fwqggq1cj78rwvk6nwc4ps6n8sg0rbd8wcnl3l4alb809y"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.1.0"; sha256="0hrlamr527r02vj86xsip5n7gilrb8y33fy0xi1lkc66hf714vgw"; depends=[mnormt psych pwr RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
-  rmdformats = derive2 { name="rmdformats"; version="0.3.1"; sha256="0x0vh1mdxb00k6c2m09szpbx4rqhch8p5zslb5jmbbacslicr1sq"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
+  rmdformats = derive2 { name="rmdformats"; version="0.3.2"; sha256="128xlbarph2l03b55f4gk8r5gnkjjy3fd1lnihsvz4m1pcg88q4q"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
   rmdshower = derive2 { name="rmdshower"; version="2.0.0"; sha256="0prxq0zakcm5lh1ki15d1d267yxr43295zcxigpy011lawccaglm"; depends=[rmarkdown]; };
   rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
   rmetasim = derive2 { name="rmetasim"; version="3.0.5"; sha256="0a5pn146ds4biswh59kaddzryd80l54rhcaqsryhmv6pp4ywg5a1"; depends=[ade4 adegenet gtools pegas]; };
@@ -8582,11 +8803,11 @@ in with self; {
   rms = derive2 { name="rms"; version="5.1-0"; sha256="1ibbpdclxc5vayl7hz176xc03snklx6ymiqzmpvi09y3bv92qnrx"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
-  rmumps = derive2 { name="rmumps"; version="5.0.1.11-1"; sha256="1apcn3pqv4fax784fjw2vkbqvkqh3xj3lp4sl59jsn6hbhm4zdnr"; depends=[Rcpp]; };
+  rmumps = derive2 { name="rmumps"; version="5.0.1.12-3"; sha256="1smv80kg2ra31rj5pd6lxnqzh9mp17dsdcmwhbhfd58qpsfkkgq1"; depends=[Rcpp]; };
   rmutil = derive2 { name="rmutil"; version="1.1.0"; sha256="0f30afqbzrsgbnfpniwhbw4b8hlzc5zyaixvn9giggzwczfnf29k"; depends=[]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
+  rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
-  rnbn = derive2 { name="rnbn"; version="1.1.2"; sha256="1b4fx5pi0h8hlikxqk68jk1nimlsh3hp6qr1hb6y1jwq8xa4lyiw"; depends=[httr rgdal rgeos sp]; };
   rncl = derive2 { name="rncl"; version="0.8.2"; sha256="17inkk6ajdn1x6g253k2yjyivcryjwn903cd369h1bxlr80amqc0"; depends=[progress Rcpp]; };
   rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; };
   rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; };
@@ -8598,6 +8819,7 @@ in with self; {
   rnoaa = derive2 { name="rnoaa"; version="0.6.6"; sha256="1b66jjvh6qk6xn0xfyd2prn4favhkfjmvi0qs76gdcxngy3kph2k"; depends=[dplyr ggplot2 gridExtra 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]; };
   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.1"; sha256="0y3aqzrqy31dj06clkjaxrm7b8b3y5zxmjr0pq0f39w4qvsy43ms"; depends=[dplyr httr jsonlite plyr]; };
   roahd = derive2 { name="roahd"; version="1.2"; sha256="1b38x7mrld4bnz04d2h3nlk7ksyja9pj9aa6d2k3p8i1k458aqqd"; depends=[robustbase scales]; };
   robCompositions = derive2 { name="robCompositions"; version="2.0.3"; sha256="0zm1qkrncp4k87mcbn72arr68xpif2y7f9m8smrcma4x52npfpfi"; 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=[]; };
@@ -8617,7 +8839,7 @@ in with self; {
   robustbase = derive2 { name="robustbase"; version="0.92-7"; sha256="13xz4am7y0s0kl5bmbcw3dlhl7ji8h9sjx56wsgmj6r9n35nrggw"; depends=[DEoptimR]; };
   robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
-  robustlmm = derive2 { name="robustlmm"; version="2.1-2"; sha256="0vgrbvjaix44rixmgd8ljjzvx669gdk5il0f2p8y37ak4s4d2n09"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
+  robustlmm = derive2 { name="robustlmm"; version="2.1-3"; sha256="0a5gk8n8aap14s1d6cmsla5x07cqgy6i266zd0922l93k40b60rk"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
   robustloggamma = derive2 { name="robustloggamma"; version="1.0-2"; sha256="1cifyasrik010zs8jsz0kzzmwm3qmc0y7h2dahg2ibpwxfcqfcpq"; depends=[numDeriv RobustAFT robustbase survival]; };
   robustrank = derive2 { name="robustrank"; version="2016.11-9"; sha256="11x9smfkbq4f0p2n3gxhwzs2xsd019pilxrds601yshz754ccj98"; depends=[]; };
   robustrao = derive2 { name="robustrao"; version="1.0-1"; sha256="03bigs7sc7d6ah1dp3mrkklhwih80wbr841klilwkfkajp7q97h9"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
@@ -8635,19 +8857,22 @@ in with self; {
   roll = derive2 { name="roll"; version="1.0.6"; sha256="0123ihl9b4x65azbr4hvm69q53sh753mgf0j54wq98y0f8kx757v"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
   rollply = derive2 { name="rollply"; version="0.5.0"; sha256="01rh4x9352ixdhrqdysapqx5ynksknyf8n230b340pxwaz2d7xhc"; depends=[plyr Rcpp stringr]; };
+  rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; };
+  rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; };
   rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; };
   rootWishart = derive2 { name="rootWishart"; version="0.3.0"; sha256="0jifnk6ysq0603pjjyn73gcib0yrlf8apk1isl8wm5xbqc91m859"; depends=[BH Rcpp RcppEigen]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
-  ropenaq = derive2 { name="ropenaq"; version="0.1.3"; sha256="1r3hp6y8wp397x8al5xx4ly4ydv40ln0s28db0cnnsi2arn4q4mb"; depends=[dplyr httr jsonlite lazyeval lubridate tidyr]; };
+  ropenaq = derive2 { name="ropenaq"; version="0.1.4"; sha256="011xcm65005a3hplnflpw75d1smfza8dkvdh3zh7bsdwfpcqysh4"; 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.3.0"; sha256="1c4di3cgx9b86v5fnsahf7gd1shb6klrg4mfyhf4irndn7b1r562"; depends=[httr jsonlite tibble]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.5.0"; sha256="1mwvqgfc6l1bqa8ik9nx6mk380hnrplbls8hc5yign8wqlw8rql5"; depends=[httr jsonlite]; };
-  rosm = derive2 { name="rosm"; version="0.1.4"; sha256="1p15pmhv52fg8lc0c0yiadc7s0q9s0dz9q6d8544msaxsjwfkpxp"; depends=[abind digest foreach jpeg png rgdal rjson sp]; };
-  rospca = derive2 { name="rospca"; version="1.0.1"; sha256="16kd0nr76h4h64rz402k2pqz1qvczzga72wd7f16z713cwz2s2hn"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
-  rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
+  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.2"; sha256="0cw5qwzjkg1a7597vpr1qr34f5azx61jx39g9f5yw9b9iprwwd83"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
+  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]; };
-  rotl = derive2 { name="rotl"; version="3.0.1"; sha256="18dzg3ysy6aphwbj1c4hzr1qn8q3vvr5r0qnpmidr5rwyhc78phb"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
+  rotl = derive2 { name="rotl"; version="3.0.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
   roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
   roxygen2 = derive2 { name="roxygen2"; version="6.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; };
@@ -8660,27 +8885,27 @@ in with self; {
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; };
-  rpdo = derive2 { name="rpdo"; version="0.2.1"; sha256="0n2lpnphnb5h7y9jszq4m15wymwgv7v2pw5fwbflr0ihvx3i3iac"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; };
+  rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; };
   rpf = derive2 { name="rpf"; version="0.53"; sha256="16d28i8s7f6ag1jvxw1ns8pi3s1rbxp9z9l13bxsm6cd6kq5jgrq"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.5"; sha256="0hjfzikaryr55xjfw7zjdby4ja59rxq9ikycgbpapvpy2q9py5yp"; depends=[getPass RApiSerialize Rcpp uuid]; };
-  rpgm = derive2 { name="rpgm"; version="0.1.3"; sha256="1d2q1g63w2vgq74aminllgsrzci224n1n9q0gw8230y0xgh3ih82"; depends=[]; };
+  rpgm = derive2 { name="rpgm"; version="1.0.0"; sha256="03zc87jncbdzmjrl5mfc6wk1q9mkbrs75dnxy4sgim0mryvv53ap"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
-  rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.20"; sha256="1aqk0afw2vjb7d75n9imp0dc3nq1w94n3r9fd3k1zsmia8ds8dh3"; depends=[htmlwidgets]; };
+  rpivotTable = derive2 { name="rpivotTable"; version="0.2.0"; sha256="0h7za8bmyg7b150l7a2jz6czxdh4gi0q0gv6ddpdlgk86slw9nmh"; depends=[htmlwidgets]; };
   rplos = derive2 { name="rplos"; version="0.6.4"; sha256="0jqvm212clh02g9sk239l467xg0b83c1zbnhfwgzmvbvk630na1b"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
   rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; };
   rpms = derive2 { name="rpms"; version="0.2.0"; sha256="15l7n9qddzk71s0si0mxmpzvl2h0sdb2z2x058cif4i4kgly9h7d"; depends=[Rcpp RcppArmadillo]; };
   rpn = derive2 { name="rpn"; version="1.0"; sha256="0wk8y4yk6wqzbq5bqv6zncfp9az5vn8xgwh426pk3bxm3v4xi16i"; depends=[BBmisc checkmate]; };
   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.1.1"; sha256="0bir893izyx8791m39fm9ykwdp9a6n3mgphx80i7gs0wsw5z7bv3"; depends=[DBI raster rgeos RPostgreSQL sp]; };
+  rpostgis = derive2 { name="rpostgis"; version="1.2.0"; sha256="1p77706qan77f6nw93hkgjscfiby50m581cq7mpaib5xjxw4w37g"; depends=[DBI raster rgeos RPostgreSQL sp]; };
   rpostgisLT = derive2 { name="rpostgisLT"; version="0.4.0"; sha256="108payblzqiqy4i4w5hwv2v45rmhw1lylkc8mdkfyg64cx7kl7pp"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; };
   rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; };
   rprev = derive2 { name="rprev"; version="0.2.3"; sha256="14p79f0mkvgwk8bwjnr7gvkvs8c632z7hddcyyrwldpilwyjnsgc"; 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]; };
   rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; };
   rprojroot = derive2 { name="rprojroot"; version="1.2"; sha256="1fgyxv1zv04sllcclzz089xl6hpdzac7xk61l0l4acb7rqsx5d18"; depends=[backports]; };
-  rpsftm = derive2 { name="rpsftm"; version="1.0.2"; sha256="0h539wdj255fynwhjvv7kzl8pfwfvqiji35bp3h55m5q09w77n98"; depends=[ggplot2 survival]; };
+  rpsftm = derive2 { name="rpsftm"; version="1.1.0"; sha256="028y67pri687xwxf2k32qhyfz45gv49aj3qm3y67c5znsdagj2c0"; depends=[ggplot2 survival]; };
   rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
   rptR = derive2 { name="rptR"; version="0.9.1"; sha256="0vwwdr0z1yyajisiy4ib1zksl0s1wjqf4pp9ymy8g5gnn1j2dx8i"; 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]; };
@@ -8696,7 +8921,7 @@ in with self; {
   rredlist = derive2 { name="rredlist"; version="0.3.0"; sha256="1w59rqwgx3hr9icw8pzwc95117vrqkj3mq197kp0qy8xbkf83h8v"; depends=[crul jsonlite]; };
   rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
   rrepast = derive2 { name="rrepast"; version="0.5.0"; sha256="1df6dgbfrh9ks4z22lm25m8v2baq78nq32f8v1cfkq1ygr6n2k99"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
-  rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.1"; sha256="0zr3c84248myizrf3gmwkkybzlhk65j97dhg77cv2hbr7sdbjz2b"; depends=[eha mc2d msm tkrplot]; };
+  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]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
@@ -8706,7 +8931,6 @@ in with self; {
   rsconnect = derive2 { name="rsconnect"; version="0.7"; sha256="104c83qq12kp1hzfs7k6nzlripsydwidqgdd3kakc4wy6dsr8bhn"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
   rscopus = derive2 { name="rscopus"; version="0.4.6"; sha256="0s8ahdp884yy2hpa5kq9d4kcnr0hx662wp7h0qi399pc0y1rydwm"; depends=[httr plyr]; };
   rscorecard = derive2 { name="rscorecard"; version="0.3.5"; sha256="1fhcp8xdhgjgpbfwc6bygq0z1z49w9c3bh12s8rml30597b8gc26"; depends=[dplyr jsonlite lazyeval magrittr]; };
-  rscproxy = derive2 { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-8"; sha256="0f0hc2v9g7gxqcfhx3m7fawsvlba3jx666f675263d8vhdc9f311"; depends=[plyr RCurl XML]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
@@ -8715,18 +8939,19 @@ in with self; {
   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]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
-  rslurm = derive2 { name="rslurm"; version="0.3.1"; sha256="1mvs64g9j1ml8as18na39app1n8lk3m1qgki68nhkas81bmiq24a"; depends=[whisker]; };
+  rslurm = derive2 { name="rslurm"; version="0.3.3"; sha256="1rlmimsd63y5ga0pz74936zbwlx07zqj9bwbz6i68lb4p0kca72v"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.8"; sha256="1hnlaj5jwqxki07b1kzl716qkmqwap57cch2lwsb6gqqsjir8xfx"; depends=[estimability lsmeans]; };
   rsml = derive2 { name="rsml"; version="1.3"; sha256="0a1y41jq0yzr19mb2scwhlp9gx5vngm4q12yxp1fcwk2cqhnsda6"; depends=[rgl XML]; };
   rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; };
+  rsoi = derive2 { name="rsoi"; version="0.2.1"; sha256="18hjaz26in2h6n4vx57rczzfpr5fbx9i7ph58p2gyh6j8972a04i"; depends=[lubridate]; };
   rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.1.1"; sha256="1mjlm4gv0551nz0n6qd0596jpn6yc5a4pdqn7h5087gg9cpay0sv"; depends=[h2o sparklyr]; };
-  rsq = derive2 { name="rsq"; version="0.6"; sha256="0qc5mkz7b68al3iahsbv45imkzabbsykd95w1yd7gfcrw0qk592m"; depends=[]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.2.0"; sha256="1d3p4zcff41m7qjx4j8bs0dvaal5j20sm4y8fipfnjizbdk72vb7"; depends=[h2o sparklyr]; };
+  rsq = derive2 { name="rsq"; version="1.0"; sha256="151f7pngx54wpawb5hchacj0rbymdzyki16fkj9291cfz1cqbcx9"; 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=[]; };
-  rstan = derive2 { name="rstan"; version="2.14.1"; sha256="035gph171z3ydl321a46p9rl5dbzaw5vn4qa7mj20dmvg90py99k"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.14.1"; sha256="0hwiqn4swwg3b3g4szkrc1srqiibn227sb7rcqknh9fs6b8b78s5"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; };
-  rstantools = derive2 { name="rstantools"; version="1.1.0"; sha256="14kf5faz7n7r08dxsd4dw6as63lbb2fsyqiknn48fh2kp36ykpwj"; depends=[]; };
+  rstan = derive2 { name="rstan"; version="2.15.1"; sha256="1svixidzqcdwpg6j1cfvy2xql99vw3fpvf78n4zp2r6kpynnhgrg"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
+  rstanarm = derive2 { name="rstanarm"; version="2.15.2"; sha256="0x5p7hwrdn1lpyb9lb50mw5ffb34wkc13afmpssn9xsxi88zr1lb"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; };
+  rstantools = derive2 { name="rstantools"; version="1.2.0"; sha256="1b0x0diik2zm6kfdbv3gg48mha3x7lq88f3rjmsy4ql26yvr155w"; depends=[]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.3.4"; sha256="0vm5w597lz3zzklm21avxm88lqgrn9k2hlfh4yvmqk4vmwp4qkcc"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
@@ -8735,7 +8960,7 @@ in with self; {
   rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
   rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; };
   rsvd = derive2 { name="rsvd"; version="0.6"; sha256="0vrsgxbbk5n51i1s80bixcxph2ws86zpbdqs81yfvnzghrc99nas"; depends=[]; };
-  rsvg = derive2 { name="rsvg"; version="1.0"; sha256="1584g43jx21d2di6zn4ra5j916a5bqzpni223prwn3nii5244f3x"; depends=[]; };
+  rsvg = derive2 { name="rsvg"; version="1.1"; sha256="17jfspbvlfp2cdw9s4m128rqw5kvb7i5h335569n3518spqmgi4f"; depends=[]; };
   rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; };
   rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; };
   rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
@@ -8749,8 +8974,8 @@ in with self; {
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
   rtimes = derive2 { name="rtimes"; version="0.3.0"; sha256="141i8zjsdzk7jdjf9wf3pa6d9ixjg1m4chk44iznmjpig4gbq2n9"; depends=[dplyr httr jsonlite]; };
   rtip = derive2 { name="rtip"; version="1.0.0"; sha256="1xkw0m4fnwbsqqyhvxhsia3hlpjb2qhs6y0c4g7f7qa7f0ibcbja"; depends=[boot ggplot2 mvtnorm plyr]; };
-  rtk = derive2 { name="rtk"; version="0.2.4.1"; sha256="1k1h5v0610bnxpz3fciim0ixjlrjzqlhx9h8b8zsz306l84bnxy8"; depends=[Rcpp]; };
-  rtkore = derive2 { name="rtkore"; version="1.2.0"; sha256="1kchqxjyqz5vz3kfljvjhx42yahc58m99ifv8yijlffi68k486vl"; depends=[Rcpp]; };
+  rtk = derive2 { name="rtk"; version="0.2.5.1"; sha256="17wqlplpqc9df5lg48xvqiny9wvn2h0drl8rj02iv50m14vrvpk1"; depends=[Rcpp]; };
+  rtkore = derive2 { name="rtkore"; version="1.2.2"; sha256="139an16z4aipq94vxa9mjbrwh934qp5ql9f4ii263dswrala2h5s"; depends=[Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-10"; sha256="0h35f3wpvsdvvymb2sl8g2wljzqzgis66bkf42njhxry7wavqf17"; depends=[gstat rgdal sp]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrie = derive2 { name="rtrie"; version="0.1.1"; sha256="092ir1bm193x8ah2zbyik6vfavdqwzkda5kx4m7mv1gxcy4s64vr"; depends=[]; };
@@ -8772,25 +8997,23 @@ in with self; {
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   rvalues = derive2 { name="rvalues"; version="0.6"; sha256="075lfbqjzi103wh87i78x914iyrvrmmdz8z9f6391rbpip6bjpr3"; depends=[]; };
-  rvcheck = derive2 { name="rvcheck"; version="0.0.5"; sha256="045anzzp3laavxm3sqnyfnnc13nhryv15w63qawr9y81alg91397"; depends=[devtools]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.0.8"; sha256="0n3pijlaxhvz692k56z5hx2cbffq3qmyll3dckp6jdv5pbbp4ywy"; depends=[]; };
   rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; };
   rvertnet = derive2 { name="rvertnet"; version="0.5.0"; sha256="0bvf76i11kkjdy0vvx2fbv478nbzybljsw40l9mg3i9dcdmz3gjc"; depends=[dplyr ggplot2 httr jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
-  rvg = derive2 { name="rvg"; version="0.1.2"; sha256="173fklnnizbh475qk9k7ff9zk96j1ljnbyhj8p494ys3jk4na0hw"; depends=[gdtools R_utils Rcpp xml2]; };
+  rvg = derive2 { name="rvg"; version="0.1.3"; sha256="0zf976imapnd0x2bwf8fwnaiam88a57a2afdjsy77nzmiigxsqnn"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
   rvsel = derive2 { name="rvsel"; version="0.2.1"; sha256="04whdpn0cg60y7f744qlxg60hczww7asq3c8kmf379xxf5p5zdpq"; depends=[]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
-  rwirelesscom = derive2 { name="rwirelesscom"; version="1.4.3"; sha256="1q4s9m9k6i7x2vq5dwq7950sbq03i8ff6qk8l30x77689kpflqcb"; depends=[ggplot2 Rcpp]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
   rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
   rwty = derive2 { name="rwty"; version="1.0.1"; sha256="1w66jlcbn8javlr2l0qinah3cxxadpjzvbz088saysyg277ikfxm"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; };
-  rwunderground = derive2 { name="rwunderground"; version="0.1.0"; sha256="10m0wgym6rdrgvmhh79q4jf0lh8wlrg04mvq0yvgnqfgcxn4rmir"; depends=[countrycode dplyr httr]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
-  rzmq = derive2 { name="rzmq"; version="0.9.0"; sha256="01fw6xpjq3h1ss38swivnp3rv7sh2lrdp0qcxz1ff7yln9sm5qsm"; depends=[]; };
+  rzmq = derive2 { name="rzmq"; version="0.9.1"; sha256="0k0b7dija04c9hyxpspqgz96l565b83h76lh7csfsf43da2za5bx"; depends=[]; };
   s2 = derive2 { name="s2"; version="0.1-1"; sha256="1k6329ra119ygb0z496894s4yra7f4dsg1ghpdk8k3ashd9yh6gd"; depends=[Rcpp]; };
   s20x = derive2 { name="s20x"; version="3.1-19"; sha256="1v16j3c38iak1wf887s02233g27fvwb06dyvdbg15g4dqh09sn7s"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
@@ -8802,14 +9025,14 @@ in with self; {
   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]; };
   sGPCA = derive2 { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; };
-  sNPLS = derive2 { name="sNPLS"; version="0.1.4"; sha256="04q6a7b27lmc9racc8g1f5wrz1qa322crsa7kdb4r8kdpkm9pji6"; depends=[car ks MASS Matrix pbapply plotrix rgl]; };
+  sNPLS = derive2 { name="sNPLS"; version="0.1.5"; sha256="1gkpgz57pyxhrllbb4p1w79nrzqfh6hx05nn5hj7d7ans9qsgw53"; depends=[car ks MASS Matrix pbapply plotrix rgl]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
   sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; };
   saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
-  sadists = derive2 { name="sadists"; version="0.2.2"; sha256="1w42j0g3yi3mqamkl9z3v103vv2hy2l1cy5ijbam0yddsaqqig3b"; depends=[hypergeo orthopolynom PDQutils]; };
+  sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; };
   sads = derive2 { name="sads"; version="0.3.1"; sha256="17ndy8li01qgd86l3wvmkwjs2iz982bmrkxikv6y69s8mznd82qp"; depends=[bbmle GUILDS MASS poilog VGAM]; };
   sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
   sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
@@ -8842,6 +9065,7 @@ in with self; {
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
   saws = derive2 { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
+  sbart = derive2 { name="sbart"; version="0.1.0"; sha256="0d74dmsxphsi548k81yihf7icay7fy5v6qxv3champw3j1fwkh3g"; depends=[LaplacesDemon msm Rcpp]; };
   sbfc = derive2 { name="sbfc"; version="1.0.1"; sha256="1xz8h1m5d5ahrz4wsy55amd5mxh3acjs5qmcn7gl6yh3pn0c8phf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; };
   sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
@@ -8852,6 +9076,7 @@ in with self; {
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
   scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
   scales = derive2 { name="scales"; version="0.4.1"; sha256="1lqccfmqdwrw0cjyqvw2zvgpk2jvnqrfb303l1raqyyf3zxqhav4"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; };
+  scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; };
   scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
   scam = derive2 { name="scam"; version="1.2-1"; sha256="039iym85khym5m6g712lbd5s0c6dfw9xlpvlj29rwlcl1dkr1g7v"; depends=[Matrix mgcv]; };
   scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; };
@@ -8859,8 +9084,9 @@ in with self; {
   scape = derive2 { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatterD3 = derive2 { name="scatterD3"; version="0.8.1"; sha256="1fyk2z8ari73nbah2r4c677nm3v0whfia6sh39gr674cczp6vc8q"; depends=[digest ellipse htmlwidgets]; };
-  scatterpie = derive2 { name="scatterpie"; version="0.0.6"; sha256="11ks8rarcgk8hj9vnhlj01v6z2kid0lv2nkkbqgj8gbcni9wgawr"; depends=[ggforce ggplot2 tidyr]; };
-  scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-38"; sha256="1mw1v725cdq24lfygjjmx3vmxzr2zpd332v0lham7g0p4r7lc8pb"; depends=[]; };
+  scatterpie = derive2 { name="scatterpie"; version="0.0.7"; sha256="0bfzhpakdwlps900dnsp6b5hrrmi02jcmk31afp4pixyj3r7h3c8"; depends=[ggforce ggplot2 tidyr]; };
+  scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-39"; sha256="02fjwb2832s2059iiaw3n9ka8i5s94z80gz4bzwl93vp8sjrp6sh"; depends=[]; };
+  scclust = derive2 { name="scclust"; version="0.1.0"; sha256="122i4w8hij6715p8m6yxlcigg1xaygndxfzric3b8lpbbb675v15"; depends=[distances]; };
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
   scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; };
   schoRsch = derive2 { name="schoRsch"; version="1.4"; sha256="19k34i74ira71v0r5gz9rfnbadnjzi0wpxcm4zqqn7y6jpmfbd11"; depends=[]; };
@@ -8868,7 +9094,7 @@ in with self; {
   schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
   schumaker = derive2 { name="schumaker"; version="0.3"; sha256="0y2jyy3za7xi8l9kc0z35mqc7a29lbxmaqgax8frljmqsnwkwwhp"; depends=[]; };
   schwartz97 = derive2 { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
-  scidb = derive2 { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[digest iterators Matrix RCurl zoo]; };
+  scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; };
   scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; };
   scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
   sciplot = derive2 { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
@@ -8887,18 +9113,19 @@ in with self; {
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
   scrypt = derive2 { name="scrypt"; version="0.1.1"; sha256="0lgnmag2yr5r67kqni2mpbvflqzaq8icilcxqja7c8fzw6xxzjrx"; depends=[Rcpp]; };
   scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; };
-  scuba = derive2 { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; };
+  scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
   scvxclustr = derive2 { name="scvxclustr"; version="0.1"; sha256="0d72hr9jcw513mapx1plif07b4qsi9b9pad6dwrqlh3z8kb8mn4j"; depends=[cvxclustr gglasso igraph Matrix mclust Rcpp RcppEigen]; };
   sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; };
-  sdcMicro = derive2 { name="sdcMicro"; version="5.0.0"; sha256="1ppqs47p4zha30axgwyvf0dhfrh2hjhi6cgwchikl9k9zwdh4byv"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.22.1"; sha256="0mcvymzabflhd0akczczv1cmxaakknqxjma5vdv75043rv151hqr"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
+  sdcMicro = derive2 { name="sdcMicro"; version="5.0.1"; sha256="1krl7685wpfgibf8hwf9ni483nvwgsi3pmdjlgpd2cbqsrmnlc45"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.22.4"; sha256="1pshzqns4d2kd388rf2kz1y8q3gjm2n77c2bdapbmf2v8mkw2vmd"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   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-32"; sha256="1h20ap4q7bq2y92mrggir8fq4dlw6hz0pvpaqnj2v8fxng50fpjx"; depends=[raster sp]; };
+  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.5"; sha256="0hnfhdrvn78yl4shrk4y42j4wjrfrglhnkqsa56kgki4hnq88d29"; 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=[]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; };
@@ -8916,6 +9143,7 @@ in with self; {
   secr = derive2 { name="secr"; version="2.10.4"; sha256="034ad8w9p478552ax7gr5yp3fh6r968b92rmisjnags8x1vsynda"; depends=[abind MASS mgcv nlme raster sp]; };
   secrdesign = derive2 { name="secrdesign"; version="2.4.0"; sha256="0v9d94ra614884imv29qwhr4zkx3dzssdpz8nv86k1kigx51w1xp"; depends=[abind secr]; };
   secrlinear = derive2 { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[igraph maptools MASS secr sp]; };
+  secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
   seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; };
   seeg = derive2 { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
@@ -8926,7 +9154,7 @@ in with self; {
   segmented = derive2 { name="segmented"; version="0.5-1.4"; sha256="1740cvx2q4v23g4q0zkvg50s5bv8jcrlzzhm7fac4xn0riwmzp5i"; depends=[]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
   seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; };
-  sejmRP = derive2 { name="sejmRP"; version="1.3"; sha256="0qrlzanmqqqwsb83rh2wys4jl2mz1ijwznnx32i2gk4h1nvkwxbx"; depends=[DBI dplyr RPostgreSQL rvest stringi XML xml2]; };
+  sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; };
   selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
   selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
@@ -8939,14 +9167,14 @@ in with self; {
   sem = derive2 { name="sem"; version="3.1-8"; sha256="17qid9jvkmccgnw56jwxmkc6hmanc7vp1c6acj5nv9j47f4bc3jv"; depends=[boot MASS matrixcalc mi]; };
   semGOF = derive2 { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; };
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
-  semPlot = derive2 { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[colorspace corpcor igraph lavaan lisrelToR plyr qgraph rockchalk sem XML]; };
+  semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; };
   semTools = derive2 { name="semTools"; version="0.4-14"; sha256="1j1chman14i908c009lf0jgdmrrb8avgp8nif1i9wlj6vgif890c"; depends=[lavaan]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
   semds = derive2 { name="semds"; version="0.9-2"; sha256="0ig8b7ii1c8av0il904b71lzr8lqdiibwf16yj5dp8n4xc80bryh"; depends=[minpack_lm pracma]; };
-  semiArtificial = derive2 { name="semiArtificial"; version="2.0.1"; sha256="1bjjqcm6r3hxj5752ywdzllh7wr4rwzqlrkf50wpdl05za3fbfd9"; depends=[cluster CORElearn dendextend fpc ks logspline MASS mclust nnet robustbase RSNNS timeDate]; };
+  semiArtificial = derive2 { name="semiArtificial"; version="2.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; };
   semisupKernelPCA = derive2 { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
   semsfa = derive2 { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[doParallel foreach iterators mgcv moments np]; };
-  semtree = derive2 { name="semtree"; version="0.9.9"; sha256="1a66xiy0p9q3bmppc8rhnd0lfip2vxjjqi9094zqvnclkznrc9ar"; depends=[bitops digest OpenMx rpart rpart_plot sets]; };
+  semtree = derive2 { name="semtree"; version="0.9.10"; sha256="1xx86pqzilxpd6zki7zd846vf13dcphn9d478hjjn2zlvzlxhfkz"; depends=[bitops digest OpenMx rpart rpart_plot sets]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
@@ -8955,25 +9183,26 @@ in with self; {
   sensitivity = derive2 { name="sensitivity"; version="1.14.0"; sha256="042bwjp906jmhsp09n03nf6xkzfvgad13f0bkm3nk5qf9xfjfszm"; depends=[boot]; };
   sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
-  sensitivityfull = derive2 { name="sensitivityfull"; version="1.0.0"; sha256="162gf45gby7kz93j6xbv2fhzcmjqk55897m58xf64csphgfv6ibv"; depends=[]; };
+  sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; };
   sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
+  sensors4plumes = derive2 { name="sensors4plumes"; version="0.9"; sha256="1fyf020bl6p9wdvnsfkmdlllhdwj3l4h9h2paq9dwd7hsr7av48p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
-  sentimentr = derive2 { name="sentimentr"; version="0.4.0"; sha256="0sfr1bgv8lap91bw9q7z4d1cn64kmn2iqf8mkxxcp9jcskb0qp0z"; depends=[data_table ggplot2 stringi syuzhet]; };
+  sentimentr = derive2 { name="sentimentr"; version="1.0.0"; sha256="1hniwvm2mr85hs6v9pvs04n73a13nf0qkikxkz9bcb3hfgkk8v6c"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
   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.6"; sha256="04cfii5i337g11qdrhq3sflas2vv8avy4qylxvridxqibvk70pjz"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
+  seqHMM = derive2 { name="seqHMM"; version="1.0.7"; sha256="1pap3i2zxgnxr3frw648hkzbhn4rnz20lzhhvrp89vhc77vh4ds1"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; };
   seqPERM = derive2 { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
-  seqinr = derive2 { name="seqinr"; version="3.3-3"; sha256="1n1a2zqv1s5415fz2vgqys3nm282d6lkglbd1vprx4k76lp55gfn"; depends=[ade4 segmented]; };
-  seqminer = derive2 { name="seqminer"; version="5.7"; sha256="0p75wyl70cvp36mwg5y74nv573j1gdqi15ac2a7xf61jmsq7ycpy"; depends=[]; };
+  seqinr = derive2 { name="seqinr"; version="3.3-6"; sha256="13d0qxm2244wgdl2dy2s8vnrnf5fx4n47if9gkb49dqx6c0sx8s2"; depends=[ade4 segmented]; };
+  seqminer = derive2 { name="seqminer"; version="5.9"; sha256="0sfkxrc9gy5a8fadzyzfzh7l5grasm8cj6cd2nnpv85ws6mqr6qd"; depends=[]; };
   seqmon = derive2 { name="seqmon"; version="2.1"; sha256="0p7vbrx0l59wyxhg59a8nnnk1z46inys30rpchj0v5ggadaazjkx"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
   sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; };
-  sequoia = derive2 { name="sequoia"; version="0.7.2"; sha256="0qvy9bmaai85gnhhrw1r59vzxll1r8r0h51cn88d6n7801yi9r3r"; depends=[plyr]; };
+  sequoia = derive2 { name="sequoia"; version="0.8.1"; sha256="0raznn4h0k50idvxfx74fb4df5357kgwwb9794ys6bm3lfi0jpjl"; depends=[plyr]; };
   serial = derive2 { name="serial"; version="1.2"; sha256="1zjzm5ym8z9g97sff6bg9p5dhjpj6g26wam9j9gklffiry8dd9li"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-1"; sha256="1h3zl3imrymz4kdzccnplc6w6b793csgq5r9cfjc37gbmjg3jf1j"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; };
@@ -8981,11 +9210,11 @@ in with self; {
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
-  sets = derive2 { name="sets"; version="1.0-16"; sha256="0pl0wnlgzyc2d87nkx90ficcww6lixmghhymhwi130vjjd0bqdjx"; depends=[]; };
+  sets = derive2 { name="sets"; version="1.0-17"; sha256="1ib7wyzrdadxz7d29prr0k0dpx8yqgj9b1rnjn6lankjdlw7m08p"; depends=[]; };
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.3-4"; sha256="0d5n8aw0d2ak96q4vlwmvk1g5m0acaqyr83l203wd470w4ksihqg"; depends=[DBI Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.4-1"; sha256="0qsyg7yhrhdfdcgh2z89xb2v0b1wvs7jh530bs8b2vjsaql5fkay"; depends=[DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfinx = derive2 { name="sfinx"; version="1.7.9"; sha256="0gnli24mi9zh5j9ycpraksf4z7crr27sv6j3ycww7jfq5lfhg8kp"; depends=[]; };
@@ -8996,14 +9225,14 @@ in with self; {
   sgd = derive2 { name="sgd"; version="1.1"; sha256="1kqpaxyacaq1fkmy4hsj62167gcmqng4pmafpdjdpqxwdqxz9xxf"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; };
   sgee = derive2 { name="sgee"; version="0.2-0"; sha256="1dpbkab3wzcqp9rgy9gxibjs2dcpb5ql1dlgg97rxjr1fkigwxgk"; depends=[copula mvtnorm]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; };
-  sglOptim = derive2 { name="sglOptim"; version="1.3.5"; sha256="1ys4hlpfsyc0iwhr1gpwzf47snpmmyxv0clb2vbcfm0lr272h25l"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
+  sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
   sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
   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="0.2.0"; sha256="1r2xbz1h144pg53g3ayy7n08091gv5zj52p02gv7kihir2kzxj0w"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.2.0"; sha256="1p2g0anxl6ynvq97jy7qwy9p9pjmfpii7irh6arhvybz28v4ky00"; depends=[raster rgeos sp]; };
+  shadow = derive2 { name="shadow"; version="0.3.0"; sha256="0zvdyfa0i167kpwlwcm0dkjc9c01wiygvi75sx2ai4g2v8yqw7hj"; depends=[raster rgeos sp]; };
   shape = derive2 { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
@@ -9011,20 +9240,25 @@ in with self; {
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.1.4"; sha256="0gb6nahnkhhymq0bkxgb165rr1saqri43khgqx2xgm37s0wxqfc9"; depends=[alakazam ape data_table doParallel dplyr foreach ggplot2 igraph iterators lazyeval scales SDMTools seqinr stringi tidyr]; };
-  shiny = derive2 { name="shiny"; version="1.0.0"; sha256="152v2z1cyg6893b0qd5rs12a2m9dbzk7ak04qvbcym0s9y4l0kf4"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
+  shazam = derive2 { name="shazam"; version="0.1.5"; sha256="14srkwmghpiy85wnwb50g11i5z90kxm1gv2v1rgl7c9xpwrgg68v"; depends=[alakazam ape data_table doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval scales SDMTools seqinr stringi tidyr]; };
+  shiny = derive2 { name="shiny"; version="1.0.2"; sha256="150ffkr7vjigxkkzqjn9gij9w5p44446kwm9992bwyqxsaxim5x4"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
   shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
-  shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.2"; sha256="0zqfay21nn2mrjk33g60rqb5mdac15rl53kkny7ypblmiky0mlzz"; depends=[digest shiny]; };
+  shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.3"; sha256="1ikxwa02jpkir1xxx4lvz995ggx8032vl0zknmhccb2mn1k98b4i"; depends=[digest shiny]; };
   shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; };
+  shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyLP = derive2 { name="shinyLP"; version="1.1.0"; sha256="08vc35988pv0kx0kvdl26nkdzcgmi6w4xffmyylan7x59519imkk"; depends=[shiny shinyBS shinythemes]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
+  shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.2.0"; sha256="1qsrmc89k12d09zx41fnb08y3gzsyhb1kspb7h10hcv9gk1f3m2c"; depends=[htmltools jsonlite shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.5.3"; sha256="0anw22qxbis69zm0ls6alsc3ann27hvgs5mv1wvr4ppk7q8cg4l2"; depends=[htmltools shiny]; };
+  shinyjqui = derive2 { name="shinyjqui"; version="0.1.0"; sha256="0jx0wbgw981pr60fpsd0jrhg0kj3zjp1cg1wp6201kq40mar70zg"; depends=[htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="0.9"; sha256="1hh9djpcq80srxxy6ysy3pnwiyc5mx1xmhvs0jacbr3cszq1m6kk"; depends=[digest htmltools jsonlite miniUI shiny]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="0.1.0"; sha256="0vj0hnq05mrjsr0wmgacy3dl1nsgm768ygpi9wy78cszh1kf5knh"; depends=[shiny]; };
   shinystan = derive2 { name="shinystan"; version="2.3.0"; sha256="1xianpv9s4xjv5lsnagcx7gsnba38psv9kgik9z6k7z9g7bg91rs"; 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]; };
@@ -9038,18 +9272,19 @@ in with self; {
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; };
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
+  sicegar = derive2 { name="sicegar"; version="0.1"; sha256="15l1ffggqlaywqyk6wx745yrhfxkdljycz1l8vsp15i65w03xd0q"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
   sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
-  sigmoid = derive2 { name="sigmoid"; version="0.2.0"; sha256="0cp16spja60nv6wpj0zg5b4nkj1dg0d0blhrjm4ki5pz9k7lc0g7"; depends=[]; };
+  sigmoid = derive2 { name="sigmoid"; version="0.2.1"; sha256="1myphx64irwllf3p9aifmg37mg4jg58ik7f42zilg5qsjfhj37zf"; depends=[]; };
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
   signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="0.1.4"; sha256="0lw7l0dsjv0c4fdl8x0prg91qhbi4lvqfaky38j75w9jw8h9gkq4"; depends=[]; };
+  sigr = derive2 { name="sigr"; version="0.1.5"; sha256="07684isbpqnlpi0dqrcl0a6idqxakqiwyyarhdqcks8yp67y4aqi"; depends=[]; };
   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]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
@@ -9059,19 +9294,19 @@ in with self; {
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
   simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
-  simboot = derive2 { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; };
+  simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
   simcausal = derive2 { name="simcausal"; version="0.5.3"; sha256="1k0cbnkgd8sn5vjvmpa496yir868xldhcnkynfqdcs4qsfywfrzs"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
-  simctest = derive2 { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; };
+  simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; };
   simecol = derive2 { name="simecol"; version="0.8-7"; sha256="0p6kmv65k3zy5q4v8casc2cp3c2ckblmycd1y1nnn7z7fnd57g8h"; depends=[deSolve minqa]; };
   simest = derive2 { name="simest"; version="0.3"; sha256="1bxgrr0sncsi1swmj5l4kqyd2v80py50d5xynv6544r1qnfpwk69"; depends=[nnls]; };
   simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
-  simmer = derive2 { name="simmer"; version="3.6.0"; sha256="1i7ppj7rf21i5frycmcd9pn51rc702pp3hmyv03cf9rm454v6rc2"; depends=[BH magrittr R6 Rcpp]; };
-  simmer_plot = derive2 { name="simmer.plot"; version="0.1.8"; sha256="0r1r88bq4m4qzqyzag3rr67b6cakf4446vdhxqiqc23ky16wl99l"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
+  simmer = derive2 { name="simmer"; version="3.6.1"; sha256="0hcp7bnq7shxnnxvx6qkbnhhl7mlfficn3an3d9nnz721vvd3g5v"; depends=[BH magrittr R6 Rcpp]; };
+  simmer_plot = derive2 { name="simmer.plot"; version="0.1.9"; sha256="0xgry3x94b8h5cg9p7a8f4xjrbs61wjk1pc8drlvjjs5dazq310f"; 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]; };
   simone = derive2 { name="simone"; version="1.0-3"; sha256="1l38xbcf50kjh0k4dc4xsxkjr54jz4s98az99mzcsdarqd6kz9kg"; depends=[mixer]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
-  simpleRCache = derive2 { name="simpleRCache"; version="0.2.2"; sha256="1hbiwk2am56f2vhj5qvajkqwynlch7c857vnpj99497wgy2wxg7z"; depends=[digest]; };
+  simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; };
   simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; };
   simpleboot = derive2 { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
   simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; };
@@ -9084,6 +9319,7 @@ in with self; {
   simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; };
   simstudy = derive2 { name="simstudy"; version="0.1.2"; sha256="08350rd4nd4vckd51n2k4q28p4wi3a366xr2kgrjxr7xpx12m6zw"; depends=[data_table mvnfast Rcpp]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
+  simule = derive2 { name="simule"; version="1.0.0"; sha256="0b0h85swd9kwqw53ggfm6w3pqy4an6v0qvwzprnj7lfkqiksgzxl"; depends=[lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.0.0"; sha256="1s87ykgad56f7l7janxx1x0y98dycpwk7mflyqxncq46awrd1ai0"; depends=[plyr]; };
   siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
@@ -9094,16 +9330,16 @@ in with self; {
   sitar = derive2 { name="sitar"; version="1.0.9"; sha256="1yjiqykrx0dm0zkssagv50kyp4wj9b0sjmrpgbn9wzimqdb5ijph"; depends=[nlme quantreg]; };
   sitmo = derive2 { name="sitmo"; version="1.0.0"; sha256="11az1zncpnalp1vkyxz75asqk6jd9wsn6kifjcqigm21kg8wcf7j"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
-  sitree = derive2 { name="sitree"; version="0.1-0"; sha256="00np025vj2ckyp9ikv89fm4mrxgqbgq29870dzq3i071ba7r650z"; depends=[data_table]; };
+  sitree = derive2 { name="sitree"; version="0.1-1"; sha256="1g5q8kq4sk6akzyvaa6gbj9fddzwhw13s5qhh53gk99xn658zl8j"; depends=[data_table lattice latticeExtra]; };
   sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; };
-  sizeMat = derive2 { name="sizeMat"; version="0.2.0"; sha256="10ghh7ch33jjchirsbxmj36ig44zncwcmsy7is5vj4pbmhpbz6gv"; depends=[MASS matrixStats mcmc MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.3.0"; sha256="0gljrzlz4kcfam0i79qiapj858h9h7w6asrga6812w093f6k9ivi"; depends=[broom dplyr effects ggplot2 lme4 MASS merTools modelr nlme psych purrr scales sjmisc sjstats tibble tidyr]; };
+  sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.3.1"; sha256="1alhwzqp748iffgbbbldgzgdcv1ilhx4jszqg6dlk94kw38jn4px"; depends=[broom dplyr effects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr scales sjmisc sjstats tibble tidyr]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.3.0"; sha256="06h13sqh7k7dis5b02zqq41wsr0zrwxxkcaaam9jhmbb9k0nq8s1"; depends=[broom dplyr haven psych purrr stringdist stringr tibble tidyr]; };
-  sjstats = derive2 { name="sjstats"; version="0.8.0"; sha256="0kg9g7g0d4cy75qfqa9iqs1wkbc7k4lm3sq6nmaq4x1nlc9hrl0r"; depends=[broom coin dplyr lme4 lmtest MASS Matrix modelr nlme purrr sandwich sjmisc tibble tidyr]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.4.0"; sha256="0s7w6l2na7rk2lyjz7f31m4qay8r5q39lwv8bs1288xw01n8rqk1"; depends=[broom dplyr haven magrittr psych purrr stringdist stringr tibble tidyr]; };
+  sjstats = derive2 { name="sjstats"; version="0.10.0"; sha256="097g6ggr6ydphmyx5s0aqb2bin06l51pwl5sb2r5xk8hp996ia72"; depends=[broom coin dplyr lme4 lmtest MASS Matrix modelr nlme purrr sandwich sjmisc tibble tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.5"; sha256="1m0jwr63v989dalchiv90sfpi6g19rj0x2zgp0bgmjpq3xyamykf"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
-  skeletor = derive2 { name="skeletor"; version="1.0.2"; sha256="0xnlhlxdpj1lg7balpwsz5b4d90505al389b288ac81q0wg974rf"; depends=[]; };
+  skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
@@ -9114,7 +9350,9 @@ 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.1.0"; sha256="0jk9h58v30cl64sfd5730ccv54bsw39d8d57085wrx1kqadsampy"; depends=[base64enc htmlwidgets xml2]; };
   slim = derive2 { name="slim"; version="0.1.0"; sha256="1d39hcsb6qxi36x7fkl67vy7r8n7ij275z7jnrb2n3pjnqkzjmzi"; depends=[data_table MASS]; };
+  slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
   slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; };
   sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
   smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; };
@@ -9139,9 +9377,9 @@ in with self; {
   smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
   smint = derive2 { name="smint"; version="0.4.2"; sha256="0sfk8r4jzvfs63z1vka280hdmhcbcrspr9zxwc5az9hkj65g1n0f"; depends=[lattice Matrix]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
-  smnet = derive2 { name="smnet"; version="2.1"; sha256="1jqcgm098kdsrgwrpjry0l6rg8ql7cigxk54svs3170x1fvxa3il"; depends=[DBI RSQLite spam SSN]; };
+  smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.4"; sha256="18li9l62lmpsva0whw6d5wr46w90w3z70wywiy785sla00g06sp2"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo]; };
-  smooth = derive2 { name="smooth"; version="1.7.0"; sha256="16jhg9qn6rcgd64wx6f7b9a3p9kgkbms8vlygc1gmnkifnh60a0v"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="1.9.0"; sha256="0h9g78bi07x42lfkl1yh88f7sim79i2mmv2pibrfg8kq1fa78axd"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.1"; sha256="06lpjp408ggj27yw6mw7f96kxly7r8kzikbsdp0y1gzig1qq8nbs"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
@@ -9171,7 +9409,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]; };
   sodavis = derive2 { name="sodavis"; version="0.1"; sha256="1cci7aq2yqxb97ah5nycmhvg3d47fsicdgmgnw4yz88y61b3ndll"; depends=[MASS nnet]; };
-  sodium = derive2 { name="sodium"; version="0.4"; sha256="09xfla0227dx3354nm0pgkwa6322ifnxydxwmlc25s1vb7mjkk1s"; depends=[]; };
+  sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
   sofa = derive2 { name="sofa"; version="0.2.0"; sha256="0jjc3r25qprxrhwwzx4b70i51v8gygxwx3x9d1zydx9hw1plk0mb"; depends=[httr jsonlite mime R6]; };
   softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
   softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; };
@@ -9195,7 +9433,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="2.6"; sha256="02y0iah34h9zjji0p5xllz76q3cdabkljsi6vvbdraf0rhi2x51f"; depends=[MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="2.7"; sha256="1cn173fja9w7rw169xwfv4dmfajka51d6vla72wjhyc454amqg0d"; depends=[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=[]; };
@@ -9212,20 +9450,20 @@ in with self; {
   soundecology = derive2 { name="soundecology"; version="1.3.2"; sha256="1ig04hdxwailsp4lv5y9q73x7vb6hl4dw9zlb05gbccvid5vmdsh"; depends=[ineq oce pracma seewave tuneR vegan]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.0"; sha256="118v608cimphsm5p84f1j1i3s6yv0xa7qfqrd13j59pvzbfbplka"; depends=[cluster dplyr gplots gtools hashmap R6 SPIn uuid]; };
-  sourcetools = derive2 { name="sourcetools"; version="0.1.5"; sha256="0jx6kslygfqaic3cmjwag3dy98q1a2dw20cz7z8agsknmmbk6dy2"; depends=[]; };
+  sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; };
   sp = derive2 { name="sp"; version="1.2-4"; sha256="0crba3j00mb2xv2yk60rpa57gn97xq4ql3a6p9cjzqjxzv2cknk2"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
   sp500SlidingWindow = derive2 { name="sp500SlidingWindow"; version="0.1.0"; sha256="0m4fg7vwscm1575zq7s8sycr742lbwwhcr7s4gm4vcawz9sfvhkl"; depends=[dplyr FinCal gdata lubridate magrittr]; };
   spAddins = derive2 { name="spAddins"; version="0.1.7"; sha256="1ci246770j40zzmsjwjqwkwi6b2w5qwb0n4f4wah5rjf6zjwkd5r"; depends=[rstudioapi]; };
-  spBayes = derive2 { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[abind coda Formula magic]; };
-  spBayesSurv = derive2 { name="spBayesSurv"; version="1.0.6"; sha256="1k9d8saab2isj60z5kffb7i8f1ymp7327m15gpinw0wv1m9wn11p"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
+  spBayes = derive2 { name="spBayes"; version="0.4-0"; sha256="1qnn2jpc22594zvqr99m3r8sl5cab1khbcrk8w6i2s91kbwc0qyh"; depends=[abind coda Formula magic]; };
+  spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.0"; sha256="0zxs39b5s5pz1vdfjnsdp357qx0g0r42h7wqnsrpdfh88ry82s2l"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
   spMC = derive2 { name="spMC"; version="0.3.8"; sha256="1glkyv6wmh766ssdlm4z7dck32r0284kwah0ksmmkwxkfw1qx7xb"; depends=[]; };
   spTDyn = derive2 { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
   spTest = derive2 { name="spTest"; version="0.2.4"; sha256="1pfyrim6m0pcwsxpin9z09569yzil49hsz5mndp723c9wkk8vn5h"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
   spTimer = derive2 { name="spTimer"; version="2.0-1"; sha256="15yrbxx44cqphhr71b5hiimwwjiwwpzny16xjb87nn2lc4mb53by"; depends=[coda sp]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="1.10.0"; sha256="1lr2y1pcbwpggq5fkfnbz76q0iixy9vj23akj2s9a7d6hxs01ya3"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm nlme nloptr proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.0.0"; sha256="0d453paflsbrwjpd6xh97k4fxc76ys0rrsv4kcwy2zxqxy7mzqgq"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
   spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
@@ -9244,20 +9482,20 @@ in with self; {
   spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; };
   sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="0.5.2"; sha256="0h09xjvq6sq7az5cxkac5840av2vgngp7b05gdrgc26d3x2qvpvm"; depends=[assertthat base64enc config DBI digest dplyr httr jsonlite lazyeval rappdirs readr rprojroot withr]; };
+  sparklyr = derive2 { name="sparklyr"; version="0.5.3"; sha256="1gwp1x9lgwkv8kvbywj6hafkpw93b9hiw6hims69b5krfir6d9n7"; depends=[assertthat base64enc config DBI digest dplyr httr jsonlite lazyeval rappdirs readr rprojroot withr]; };
   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="0.3-8"; sha256="1vsfk769f6227wrxfpq3qbs9h8farfnmgq94pl2ra4hgvpvygsmr"; depends=[MASS rgl spatstat]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseFLMM = derive2 { name="sparseFLMM"; version="0.1.0"; sha256="1wrpjhb20mrkg9a5302phy4hrn5qfndjl78dx1v4a811clgfid8q"; depends=[data_table MASS Matrix mgcv refund]; };
-  sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.2"; sha256="1zn0nrdlgynxhq48cx8zi8bk2ir6zvfg1pgxr6j479j88q8hcjb3"; depends=[Matrix Rcpp RcppEigen]; };
+  sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3"; sha256="13v8zia1i0k6faiz6faikqmlrp16riwv637yygjq2cq8fcm75pyf"; depends=[Matrix Rcpp RcppEigen]; };
   sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; };
   sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
   sparseMVN = derive2 { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; };
   sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
   sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; };
-  sparsebn = derive2 { name="sparsebn"; version="0.0.2"; sha256="116m32rb1m7bbvkhiwb1270h7jirp3ysck6gij054igqprm4lq74"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
-  sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.3"; sha256="1qgnqad6klhzg80hmk48bws0yabd3akw7vs2v3sfrwx4ckl3h4ii"; depends=[Matrix nnet]; };
+  sparsebn = derive2 { name="sparsebn"; version="0.0.4"; sha256="0msd12gnxijkgazg4dyfqfravsacskbshp00fa4g2vkzmsjai1y0"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
+  sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.4"; sha256="0473pxzb95ygvhwkvs97d0zmfwlmxnxn3xp125bycv3ns3rgpssy"; depends=[Matrix nnet]; };
   sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.3"; sha256="1sh6g1086l040547yajgyp4hq8yzlspdb6jmw4w1sv0zsmca25sv"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; };
   sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
   sparsepp = derive2 { name="sparsepp"; version="0.1.1"; sha256="0wzj4z333ns18a1byii601fp46dlq9q4dbprkc95yl30xpzmdx0b"; depends=[]; };
@@ -9275,16 +9513,17 @@ 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="0.1-5"; sha256="04d6dqmayfs19922s1pg1rsi5b4hdj50665qkp02p0wbbnnkhvs4"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; };
+  spatialEco = derive2 { name="spatialEco"; version="0.1-7"; sha256="0l8nshsapbgfzli1rpls3j3s8gyqy2nzsgqf2x4v1r699r419i5k"; depends=[cluster MASS RANN raster RCurl rgdal rgeos rms SDMTools 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-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; };
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
-  spatialsegregation = derive2 { name="spatialsegregation"; version="2.43"; sha256="1jwjgpyy0dpghjwallqvi20bb84ljrn2qmdb35r5l243da511n8f"; depends=[spatstat]; };
-  spatstat = derive2 { name="spatstat"; version="1.49-0"; sha256="0il36ljlql7xc00w8czydv529xjmi7c7fb30sr2k9mr7chln64bf"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart tensor]; };
-  spatstat_utils = derive2 { name="spatstat.utils"; version="1.3-2"; sha256="0hky45v7hsg1anqvv5i0s6hndms18g5y9fbgy6r59yy7mybh6j4d"; depends=[]; };
-  spatsurv = derive2 { name="spatsurv"; version="0.9-14"; sha256="1pd2dz7y64wi7bkw6nlnm6nyzkjk3pfxp2a3fmd3xrrp7fgsy7xk"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
+  spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; };
+  spatstat = derive2 { name="spatstat"; version="1.50-0"; sha256="0xlql98fplrh1rcn7y0nvbxsn84adqgdzidh3y89iyv6jcnzziwc"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; };
+  spatstat_local = derive2 { name="spatstat.local"; version="3.5-6"; sha256="0yb3k2szk2z61h2scyj4h78y13qvbd9b1hvwp9n2983w77y0k5dz"; depends=[spatstat spatstat_utils tensor]; };
+  spatstat_utils = derive2 { name="spatstat.utils"; version="1.4-1"; sha256="0f03dnf3d1p0g8qi5c3siz0lk5jya6jjdh0q9im7mpvz3gij1p4l"; depends=[]; };
+  spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spbabel = derive2 { name="spbabel"; version="0.4.5"; sha256="0qgng4w0jjm5rkq0arw4icv6xp9fhpv0b0kmy4wzh54qr3zhh2ja"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
@@ -9292,14 +9531,15 @@ in with self; {
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="0.6-11"; sha256="15pv5ygaj924fjscm7wffjxyz9krbdh6f70f2vawq2m1w7qs2kd8"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; };
+  spdep = derive2 { name="spdep"; version="0.6-12"; sha256="15376wqwiy09300rj797xy8966ljdy1m1wl8jq9yklh20213cz9f"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.1.2"; sha256="056rdnz6qj24x8gl3aigcd84rk5c06r76wkcgn1rkaacs5b20qmq"; depends=[dplyr lazyeval sp spbabel tibble]; };
-  spduration = derive2 { name="spduration"; version="0.15.1"; sha256="1kjr3vncns91ha1q3q1xp2ss12m80k5hixzccm1ggdc77ha3bjhv"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
+  spduration = derive2 { name="spduration"; version="0.16.0"; sha256="1nyv6ffrky8cwwlfq0b4w17ibni6xq61zrc1s7s2hizlp41cnscd"; depends=[corpcor 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="1.2.3"; sha256="01xihbj9qx24ql0kn1hafkgbsjl9hw16jh8vxqygmv0lvxljlzvy"; depends=[MassSpecWavelet]; };
   speaq2 = derive2 { name="speaq2"; version="0.1.0"; sha256="0rrqh90vqi7l1nbwivzvygd292nnkgk26nyh2kw71pl3gfakmnml"; depends=[cluster data_table doSNOW foreach MassSpecWavelet mQTL]; };
+  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]; };
   specificity = derive2 { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
@@ -9312,37 +9552,39 @@ in with self; {
   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]; };
   sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
-  sperrorest = derive2 { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
+  sperrorest = derive2 { name="sperrorest"; version="1.0.0"; sha256="0z5f8x9y9swnp13fph8jbd8cx0jr8d47wxr1gnnpgzj3s3kn115s"; depends=[doParallel foreach pbapply ROCR rpart]; };
   spex = derive2 { name="spex"; version="0.1.0"; sha256="1d4dbj87ka7hrl4kmxll3al58i3k3ynxkmy25g95by6v8dfn7zb5"; depends=[raster sp]; };
   spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
   spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; };
   spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; };
   spgs = derive2 { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; };
-  spgwr = derive2 { name="spgwr"; version="0.6-29"; sha256="05rw1ck2gf5c0aqpagcfijxghslppa6xdz7pnwanfclwq8ri1xqa"; depends=[sp]; };
+  spgwr = derive2 { name="spgwr"; version="0.6-30"; sha256="0kxk3layivphwg262n6xxkiwz3rcydr7r3xsj9drmml40qgwgyis"; depends=[sp]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
   sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; };
   spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
-  spider = derive2 { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
   spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; };
   spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
   spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; };
   spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
+  spind = derive2 { name="spind"; version="2.0.1"; sha256="18zxmaq1ssg48fgpmpzz1rfp7gvjqavgm9nfg2rqngm0qhqx0m0r"; depends=[gee geepack lattice MASS rje sp splancs stringr waveslim]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
-  splancs = derive2 { name="splancs"; version="2.01-39"; sha256="1lyzs7lbhw1pqmb4mr46ncm39wwrmin7qgshsr384j4023qwfqwd"; depends=[sp]; };
+  splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splines2 = derive2 { name="splines2"; version="0.2.5"; sha256="048c43dhrri0xc02897jxgqw7c5ai2nyylhx3bvwsqg0hrj3c7rv"; depends=[]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; };
+  splithalf = derive2 { name="splithalf"; version="0.1.0"; sha256="037fxw65sbmclzkkh9a2gb5w5h9nmhijpg92r1dv5pw5pf7vm0qb"; depends=[plyr]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-6"; sha256="1vclsx622zq7kdgb84dd74i6a1b27d0jnx29blzba77d24adyzmh"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
   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=[]; };
   splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; };
-  spm12r = derive2 { name="spm12r"; version="2.0"; sha256="1bwc9mygsamlzp4f6a1ahycvwxpwap1bi55rm5y6p5hhr331gckf"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
+  spm12r = derive2 { name="spm12r"; version="2.3.1"; sha256="1fkm961phkxy5rmv2vav0a7vy9j89i0gwgfi2rjg682xl473j3gk"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
+  spmoran = derive2 { name="spmoran"; version="0.1.0"; sha256="0jwnsjf165213212bg4n17jmp20jvzgrfdz0smrk0zvxhisas35g"; depends=[fields Matrix vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
   spocc = derive2 { name="spocc"; version="0.6.0"; sha256="0xrwwac2d8j4c4qy6br9l6i9bqlqbmzmq34dp25xwhw1nla6mhvs"; depends=[data_table httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble V8 whisker]; };
   spongecake = derive2 { name="spongecake"; version="0.1.1"; sha256="1bf2106ik4dp9xl68s8wzj5w6yl3syx8i39zxpp24rywb6f2i8n0"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
-  sppmix = derive2 { name="sppmix"; version="1.0.0.0"; sha256="0g0c461ab7mshhbxd5qbskk1rxzlq1rl2cgg0xfq00hv6x9nhb8y"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; };
+  sppmix = derive2 { name="sppmix"; version="1.0.1"; sha256="0l9hmjrb0yl4c6y9l39h6kggxda9qz6xspf719hjc30zq76h4k1a"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; };
   spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
   sprint = derive2 { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; };
@@ -9357,6 +9599,7 @@ in with self; {
   spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
   sptm = derive2 { name="sptm"; version="16.7-9"; sha256="0x8824zccrwdl38jbhq8skzcvxb7a3b1zggkd7gmyjd94xvxll9k"; depends=[kyotil survey survival]; };
   spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; };
+  spup = derive2 { name="spup"; version="0.1-0"; sha256="1dfdxh45db91rmdws4pq1kbsbcjczz98fbfcmm4vlr0vbvisy9bj"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
   sqldf = derive2 { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
   sqlscore = derive2 { name="sqlscore"; version="0.1.1"; sha256="140g2kgfqcw6x3lq7bs90kvdx9kj81fr86hpcbg6dn3i8xslwrad"; depends=[dplyr]; };
@@ -9366,7 +9609,7 @@ in with self; {
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srd = derive2 { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
   srvyr = derive2 { name="srvyr"; version="0.2.0"; sha256="0znhwp6111p4icrpgn22k48qlicxgripz3wslhmmkwydq00ndz9w"; depends=[dplyr lazyeval magrittr survey tibble]; };
-  ss3sim = derive2 { name="ss3sim"; version="0.9.3"; sha256="0l2xd0d4hgz0b42fz7zf5dgd71fm5dsvhys4hg8c7j2nzzzx9hdk"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
+  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=[]; };
   ssc = derive2 { name="ssc"; version="1.0"; sha256="1hhlpcm1mdwkcxrprk5nc2yi3l69lz13av50y3cyz5vj73jhsg44"; depends=[proxy]; };
@@ -9377,12 +9620,13 @@ in with self; {
   ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
   ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
   ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.9"; sha256="1916r0hmhpfa0p1s8myqk8g4i8fgjqkm4wvpb4nf3sl69kfdva95"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
+  sskm = derive2 { name="sskm"; version="1.0.0"; sha256="1qji34v66qj4k9axy5i2lf3j5zps8sjhwk3h3mqfln3pi9z6gmv8"; depends=[fpc sparcl]; };
   ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; };
   ssmrob = derive2 { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; };
   ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; };
   sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
   sspse = derive2 { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; };
-  sss = derive2 { name="sss"; version="0.0-14"; sha256="19xq1pj4lrlh68fi2vy8cjg9xhmykwibm9rcg9snfc1qc6kp062x"; depends=[XML]; };
+  sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; };
   ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
   ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
@@ -9390,19 +9634,20 @@ in with self; {
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
   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.2.3"; sha256="1amscsnsgv1jz1h2arvc5k6lrvzasb58m65lid0qw6k8pvxr9155"; depends=[ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
+  stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
   stabs = derive2 { name="stabs"; version="0.6-2"; sha256="0alzdj3lciggi9g3fj2lgdjb60dz6077nn4nb4wwd5nv7walp4sl"; depends=[]; };
   stackoverflow = derive2 { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; };
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.0"; sha256="1jq392dcv72r78iv4nd4scidn83l9wglgdzjcj8afr9d0ybdz3gk"; depends=[RODBC xtable]; };
   stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
   stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
   stampr = derive2 { name="stampr"; version="0.1"; sha256="1w7zp5n41gzahv4psdgw5a5mylcxlf12931fnjz0q2cwqj9cwql5"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
+  standardize = derive2 { name="standardize"; version="0.1.1"; sha256="18wc64fr55rb27a0h3pgqqfs360532s6gb0zgmd3wybfg5kjh5zx"; depends=[lme4 MASS stringr]; };
   stargazer = derive2 { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; 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]; };
   startup = derive2 { name="startup"; version="0.5.0"; sha256="1zhnvg47r4dgm85lvzgcacn2vlfz4pk4r1b263x9mg2ccjwpn8ld"; depends=[]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9.3"; sha256="0i7j412xhyq6pk0gb5pp53sa455fwzpjyfd331j2d5qwk8dhrbh3"; depends=[]; };
-  statar = derive2 { name="statar"; version="0.6.2"; sha256="1p1a17mc6zy5yffybf5q156yyr52mq0z4vmqss05hq3hlaygbbxz"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stringr tidyr]; };
+  statar = derive2 { name="statar"; version="0.6.4"; sha256="16jahn6skj4d1c8yg4m9iwifgl5i4bmqq7d2k9vcfnj21ih6fcvr"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stringr tidyr]; };
   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]; };
@@ -9415,9 +9660,10 @@ in with self; {
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
   statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2"; sha256="05qsffbgpgzrhk2nbyfa4a63ad06aj09bzcc11h9dl3sdz6jj7gr"; depends=[stringr tidytext wordcloud]; };
+  statsgrokse = derive2 { name="statsgrokse"; version="0.1.4"; sha256="1kxkpddmgyyg51fhmllgahnhwixwv6b95nx0viyqa9c5ngix2gd5"; depends=[httr jsonlite stringr]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
   stdReg = derive2 { name="stdReg"; version="2.1"; sha256="0h9h64vk52l7ai50f4pih0qdshsqsx5cm3fj1fjrcpbsfq7azg34"; depends=[data_table survival]; };
-  stddiff = derive2 { name="stddiff"; version="1.0"; sha256="0jzl7khnmx0809x9b9nf1n7dj7yknfcblgsf7cpslvglrdzppp42"; depends=[]; };
+  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]; };
   steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
@@ -9428,14 +9674,15 @@ in with self; {
   stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
   stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
-  sticky = derive2 { name="sticky"; version="0.4.0"; sha256="0ba7pjvavhm1jp5rk6szvi5d6fmy6z7n9z3qs2kxcraww8aa1gg8"; depends=[]; };
+  sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; };
   stilt = derive2 { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
   stima = derive2 { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
   stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
-  stm = derive2 { name="stm"; version="1.1.3"; sha256="09r95d6xw2b4q063x1j2a6wc9kyzphqc2dhfmlc9crir8fah9ayr"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; };
+  stm = derive2 { name="stm"; version="1.2.2"; sha256="1kv4plz9i446s8vdrh71lk49gvvl6v5dviym4qh63iwkipgz2fy1"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
   stmBrowser = derive2 { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; };
   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]; };
   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]; };
@@ -9447,14 +9694,14 @@ in with self; {
   storr = derive2 { name="storr"; version="1.0.1"; sha256="1yc4z151dnbhcim7gvkylss239wcc7xlpjrfdc6qv8mf2gq1bv30"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; };
   stplanr = derive2 { name="stplanr"; version="0.1.7-3"; sha256="07ap68vfksdyh29hqqhdq5mx17sppp6yqcx94swaryd51mc7rl72"; depends=[doParallel dplyr foreach geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos RgoogleMaps sp stringi stringr]; };
-  stpm = derive2 { name="stpm"; version="1.6.0"; sha256="1jfx9nkw66dhwrphqx9rpml53plzd5a831qmxz0012fkji9m0423"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
+  stpm = derive2 { name="stpm"; version="1.6.6"; sha256="0vzl405hc5y97n9ixy20js50q5a6s7laaj1w9avn5dl2rgwk6xva"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[KernSmooth spatstat splancs]; };
   stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
-  strataG = derive2 { name="strataG"; version="1.0.5"; sha256="1q3b06hkkwdbh3zvd1lbsklwl8jm743bf17fnvdr8npxgpgqci15"; depends=[adegenet ape apex copula ggplot2 Hmisc pegas phangorn RColorBrewer Rcpp reshape2 swfscMisc]; };
+  strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
-  stratification = derive2 { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
+  stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
   stratigraph = derive2 { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
   straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
   stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
@@ -9466,16 +9713,16 @@ in with self; {
   stringdist = derive2 { name="stringdist"; version="0.9.4.4"; sha256="1qngrhin1kqkjkfla7hp7ch0sfzi4nhaxgyzskmy51sz4llq5n4p"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.1"; sha256="16kkmb933v8pzc4gwz4x2nm51sj82slwpxmmn6p6p8dq5nfzmx5q"; depends=[stringr]; };
   stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt GO_db httr igraph limma org_Hs_eg_db pspearman RCurl RJSONIO simone VennDiagram]; };
-  stringi = derive2 { name="stringi"; version="1.1.2"; sha256="13i1p6j8mx31hsw2s4c2phm2llrrdakzixkm6i0axsxprri722z5"; depends=[]; };
+  stringi = derive2 { name="stringi"; version="1.1.5"; sha256="1wh20is24lmzhcd9487ckv7r19009fyz4is3ianp3ky69vy8a7k5"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.2.0"; sha256="16hj2rmv8x03lp6cp2jk0k2plibvbggf444kp05przdvd03v7l31"; depends=[magrittr stringi]; };
   strip = derive2 { name="strip"; version="0.1.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
-  striprtf = derive2 { name="striprtf"; version="0.2.2"; sha256="0y709fcdb12iwwhridbvg4xh0j9kgiz75237caax2wxf01fisahz"; depends=[magrittr Rcpp stringr]; };
+  striprtf = derive2 { name="striprtf"; version="0.3.1"; sha256="12cj0zfnyvi6bs41lhfplfhl84xjs9x9441q6x136arbs68lrlgm"; depends=[magrittr Rcpp stringr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
   structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
   structree = derive2 { name="structree"; version="1.1.3"; sha256="1apiqbmmvqmn0nv5cfflfqlyh0108fvy8sg9gg8z6d6bfqkd4rhb"; depends=[mgcv penalized]; };
   strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
-  strvalidator = derive2 { name="strvalidator"; version="1.8.0"; sha256="0c87256m6zx0m7qkkcdzfrb2x7gbl364499pj5xnfm274ib9l39x"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 MASS plyr RGtk2 scales]; };
+  strvalidator = derive2 { name="strvalidator"; version="1.9.0"; sha256="0srmld1xwvf2cki79c2mhwinal2yz6yar5k0b05a9adm70zb0swr"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 MASS plyr RGtk2 scales]; };
   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.1.0"; sha256="0x4sy808pq7nqnprqrcpss0v3r8sa1z8bbs759jmybqs1b0ihnqf"; depends=[testthat]; };
@@ -9485,7 +9732,7 @@ in with self; {
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
   subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
   sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; };
-  subniche = derive2 { name="subniche"; version="0.9.2"; sha256="05grwm3g2l8sarybrybn6010769y76m4bp5df69r94p7v10wmd29"; depends=[ade4]; };
+  subniche = derive2 { name="subniche"; version="0.9.4"; sha256="1pqw2sh20k4mw5ads2yfvdykc6hw7fwnl1mam6vq98jvvh4m5qmx"; depends=[ade4]; };
   subplex = derive2 { name="subplex"; version="1.2-2"; sha256="10g1hv41w9g0pzj0k071zb3wglk7jl5p99v5maqpkr2v75mfkyry"; depends=[]; };
   subprocess = derive2 { name="subprocess"; version="0.8.0"; sha256="0hvja2gacr84izlsvxcbw1xmm57ycx0n9k5yn62p1v40d135wk9p"; depends=[]; };
   subrank = derive2 { name="subrank"; version="0.9.7"; sha256="0f1m4zk7s49f3kg8gz8g5af8r1x00m4zybdy5fmzvgnx9cx6crkc"; depends=[]; };
@@ -9496,9 +9743,11 @@ in with self; {
   subspaceMOA = derive2 { name="subspaceMOA"; version="0.5.2"; sha256="051zlpqpxxhhryzv03bb0dz8m7ijhwahagpcwngvh0ccdpi32m7h"; depends=[fields ggplot2 gridExtra magrittr rJava shiny stream streamMOA]; };
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
-  sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-9"; sha256="1m4ggvg1nyx3l96zfg826sarfmwxcbjwpipqk5q2qsnhd12wymbd"; depends=[]; };
+  sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-10"; sha256="040ijdkjy95wd1w85g61jz7p9x2f0dm0lhcvkmy1jhmp28asb5pw"; depends=[]; };
+  summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
   summarytools = derive2 { name="summarytools"; version="0.6.5"; sha256="1ddvwn0rfyrlfar1kpwggxnpp9dpswdy8v5alcv3kanp540hnmb1"; depends=[Hmisc htmltools matrixStats pander pryr rapportools rstudioapi xtable]; };
-  sunburstR = derive2 { name="sunburstR"; version="0.6.3"; sha256="0lirf37kb0vgsd3hijhx4pcmx1v59nw3ng53k0kyhgq24r3hzvxw"; depends=[d3r htmltools htmlwidgets]; };
+  sunburstR = derive2 { name="sunburstR"; version="0.6.5"; sha256="0sq1x8rpqazgzn1c4gg13yimdmkc9nj9qr4b5z8anynr96hfjb45"; depends=[d3r htmltools htmlwidgets]; };
+  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]; };
   superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
@@ -9508,7 +9757,7 @@ in with self; {
   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.1-3"; sha256="1qlh2zgmr3b6gz3xmncjawgg08c6kgfg3d2m9x78iw95x7p3p5h8"; depends=[]; };
-  support_BWS2 = derive2 { name="support.BWS2"; version="0.1-0"; sha256="0r5b7arcab2brcq3maizcy53vbbkzcs5n0zirjj3n1id5cdb36zl"; depends=[]; };
+  support_BWS2 = derive2 { name="support.BWS2"; version="0.1-1"; sha256="1jay1ak8242vn9a0ippfdd48vdxqqz9j8frbgf5ncffdmzzn1n21"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; };
@@ -9532,13 +9781,14 @@ in with self; {
   surveydata = derive2 { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
-  surveyplanning = derive2 { name="surveyplanning"; version="2.6"; sha256="1nxxyny9bzb8p65vgrlfqq9x3r275d8vl99f6yg621hyzpbyz6gf"; depends=[data_table laeken]; };
-  survival = derive2 { name="survival"; version="2.40-1"; sha256="10pf0kq0g66k5rgizrvh29mq3r84acljw2jgrv5yp6z38xw23mci"; depends=[Matrix]; };
+  surveyplanning = derive2 { name="surveyplanning"; version="2.8"; sha256="0p4yigwypy2hl747qvm0qm0q7vp7p8af0yapqi7aadbbpwyy9z7h"; depends=[data_table laeken]; };
+  survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
-  survminer = derive2 { name="survminer"; version="0.2.4"; sha256="083hja5zid3ndfpx77vxm7vyqnjrq8c18vil8mch721fafhajrcd"; depends=[ggplot2 ggpubr gridExtra magrittr maxstat scales survival tidyr]; };
+  survminer = derive2 { name="survminer"; version="0.3.1"; sha256="03jg7lanharv32nj09xqf418aq23pwzwmm61qir0k3p5d3xxcmny"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat scales survival survMisc tidyr]; };
   survrec = derive2 { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
   survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; };
+  survutils = derive2 { name="survutils"; version="1.0.0"; sha256="1dha1i2k9dyc9m9awqiq2ypy617zmw9yflfzv182z5fpd491ghrv"; depends=[broom dplyr ggplot2 lazyeval magrittr purrr survC1 survival]; };
   svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
   svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
   svGUI = derive2 { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; };
@@ -9578,24 +9828,25 @@ in with self; {
   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=[]; };
   syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; };
   symbolicDA = derive2 { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
   symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
   symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
   synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
-  synbreed = derive2 { name="synbreed"; version="0.11-41"; sha256="077ixxfipc7msrmg0p4v5nhqwn276bj2766h6y5m9gj208xz5d91"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS regress]; };
+  synbreed = derive2 { name="synbreed"; version="0.12-4"; sha256="18mqa5iaybc0psc3cbk02sirfm3a7l9ph10yvj9w4z6ss76z004v"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
   synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
   synchronicity = derive2 { name="synchronicity"; version="1.1.9.1"; sha256="0d9skpwmsnkn4xb3f2kgyyv8bhdi0r9p1kj3cvi0s92fjjnpi00c"; depends=[BH bigmemory_sri Rcpp]; };
   synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
   synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
   synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; };
   synthpop = derive2 { name="synthpop"; version="1.3-1"; sha256="0vp79jxp4hr9wrc4dlh9ckkcpwiffdixr9jh1w6w1wkii3bjcani"; depends=[foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
-  sys = derive2 { name="sys"; version="1.1"; sha256="1wik7rbnd0a1mq52ziknil6rjyrsmwgyhkzr9pb5c7vxqydp0jnj"; depends=[]; };
+  sys = derive2 { name="sys"; version="1.2"; sha256="01spav1mr1mbpfgxjx0xvi9m5n2s41pdad0qs3kv0hrxcfmwgy6g"; depends=[]; };
   sysfonts = derive2 { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
-  systemfit = derive2 { name="systemfit"; version="1.1-18"; sha256="0sy0v0iz4qzrmazp5j63d62xvlyi9mw5ryd4msd1xmppdl7r453p"; depends=[car lmtest MASS Matrix sandwich]; };
+  systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4"; sha256="1qpimrfr75l6phr425m7av02l57yyn1n2if7h26cndf9ynmv6vz1"; depends=[lpSolve Rcpp]; };
-  syuzhet = derive2 { name="syuzhet"; version="1.0.0"; sha256="15qkjnnyf8fsiknr5jb550v34xs55x6psskbrkvr1vfwvbivkzcf"; depends=[dtt NLP openNLP zoo]; };
+  syuzhet = derive2 { name="syuzhet"; version="1.0.1"; sha256="0b0w98mx0zf28c55qmv93hfcfcjplrfk68qk2691fas23q14jn56"; depends=[dtt NLP openNLP zoo]; };
   taRifx = derive2 { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
   tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
@@ -9617,6 +9868,7 @@ in with self; {
   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]; };
   taxize = derive2 { name="taxize"; version="0.8.4"; sha256="03zfrkcpkbzqkm3w9m9g34nhrrp36l630l8rhpnsnkqnfxybb3yv"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble worrms xml2]; };
+  taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
   tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
@@ -9631,7 +9883,7 @@ in with self; {
   teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; };
   teigen = derive2 { name="teigen"; version="2.2.0"; sha256="0ljm8dz4hndnc37psr7mnl1gbxs1kghygz3cyqzld1xpjwsjc2cz"; depends=[]; };
   telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; };
-  tempR = derive2 { name="tempR"; version="0.9.9.9"; sha256="1g2rj26a9zm4qbq2k325h112bb6w8qgifhzd1zhc2vql0bk6i18k"; depends=[]; };
+  tempR = derive2 { name="tempR"; version="0.9.9.10"; sha256="1lrl3q51xy598kpak97im7r0cp61zb7lygwxkib2ryskihrcfk7b"; depends=[]; };
   tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
   tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; };
   templates = derive2 { name="templates"; version="0.1.0"; sha256="133gzc7hz0dh1myv7b0rmcz14x0n1gy7pj948gci70sikvdvbvp5"; depends=[dat magrittr modules stringr]; };
@@ -9639,30 +9891,33 @@ in with self; {
   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.2"; sha256="0bwqv5cxr5lf2p6xa2p03kwhanrzskz8k3xif1myfjhdw1vzyqib"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; };
+  tensorflow = derive2 { name="tensorflow"; version="0.7"; sha256="0hiz29r79snk4zcpprf6imi8lknn9n791h1svdajyicsd0zi458v"; depends=[reticulate 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.0"; sha256="19658k5570z8yxpklbbl87a7pd8i4yygi0ky8lgzb8qymds90v4s"; 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.3"; sha256="17rk3m4rd2qk8vhnkrnn6sffdlvg1amvawdkfp0fi2ip3p0qcrs4"; depends=[curl digest Rcpp]; };
+  tesseract = derive2 { name="tesseract"; version="1.4"; sha256="1ycrclv4njbpwrdmh390pnyaczp7xk0ivkscfbr725mavq6xpvi7"; depends=[curl digest Rcpp]; };
   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]; };
   testit = derive2 { name="testit"; version="0.6"; sha256="05ll0vg30gbb2x7pal6a5ms94nmxj86fzx4ahggrr96cpxyhy8lv"; depends=[]; };
   testthat = derive2 { name="testthat"; version="1.0.2"; sha256="0pj1r01x4ny4capr83dfa19hi5i2sjjxky99schzip8zrq5dzxqf"; depends=[crayon digest magrittr praise R6]; };
+  texPreview = derive2 { name="texPreview"; version="1.0.0"; sha256="1i34w1804p3qwmijj2lqmfjy909axfp8icllr1nilfqbsrrmssbi"; depends=[magick magrittr rstudioapi svgPanZoom xml2 xtable]; };
   texmex = derive2 { name="texmex"; version="2.3"; sha256="0hh633hlzmjrlind51kjs7s1zpx8bwcwfa93yl4swfvn501j1hy9"; depends=[ggplot2 mvtnorm]; };
   texmexseq = derive2 { name="texmexseq"; version="0.3"; sha256="08zjsb541xqqs3lj7avx5147g2d0bh3v036x615srjx2pbxzhsvg"; depends=[dplyr ggplot2 testthat]; };
-  texreg = derive2 { name="texreg"; version="1.36.18"; sha256="1lzjs651b4mmjjgzkbdzdl3nk3g3kd5bzzj7ssfqvbkk7kp6g3rq"; depends=[]; };
+  texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; };
   text2vec = derive2 { name="text2vec"; version="0.4.0"; sha256="1ipggg63s16gb72fr7kpmc4z8v6ylp4kw7kb9bk6pccg9iz54i5a"; depends=[data_table digest foreach irlba magrittr Matrix R6 Rcpp RcppParallel]; };
-  textTinyR = derive2 { name="textTinyR"; version="1.0.3"; sha256="09wiql4fiw5zzilvfa3y6cqxpgifilf52kvvc7svmjc2abh3afz3"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
+  textTinyR = derive2 { name="textTinyR"; version="1.0.5"; sha256="14jk28zydpqjpkvai3bvvaxgv0lrry0vb42l8mkqx97smfv5yq4j"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.3.1"; sha256="1k8wjzzh6nplrnyxq4cd7q4q0sn2fa5p5r2kaq2rd4j9sqrrypp0"; depends=[english qdapRegex stringi textshape]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; };
-  textmineR = derive2 { name="textmineR"; version="2.0.4"; sha256="127ngmzvzsb8pbwv6f4k76jv3aqrmpwpbx29cic39m05zxjxxm7k"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
+  textmineR = derive2 { name="textmineR"; version="2.0.5"; sha256="138qscgpxkkza0x6lbjrlqf1f1nvj369rw5rvjp5xj9bh7sd62xs"; 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=[]; };
   textreadr = derive2 { name="textreadr"; version="0.3.1"; sha256="0l8aiad16m7lgak61lwi7j03mkrzkjvp1fwi8b4xmgfn3mg797zq"; depends=[curl pdftools readxl textshape XML]; };
-  textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; depends=[NLP Rcpp tm]; };
+  textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   textshape = derive2 { name="textshape"; version="1.0.2"; sha256="0p9n003z98aqk272wcj02z0c5dzaw01iyfbd0fjyccgkidyaz49h"; depends=[data_table slam stringi]; };
   textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; };
@@ -9676,6 +9931,7 @@ in with self; {
   tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
   tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; };
   tgram = derive2 { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
+  thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; };
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
   thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; };
   thief = derive2 { name="thief"; version="0.2"; sha256="14xl5l7iw0nwbz5zzd00c8ihfclvhfcazvysr8rapsq1j2r5dfck"; depends=[forecast forecTheta ggplot2 hts]; };
@@ -9685,13 +9941,13 @@ in with self; {
   threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; };
   thregI = derive2 { name="thregI"; version="1.0.2"; sha256="1r2p4mcj1myay5qgwvdprh3qvb2gzg2lbcci24hfx5c8dmsc39fd"; depends=[Formula survival]; };
   thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
-  tibble = derive2 { name="tibble"; version="1.2"; sha256="011i352ylq9b4xfcj7h10h7qsqd9qkc1rzc0pr1gf8qjb788p2pd"; depends=[assertthat lazyeval Rcpp]; };
+  tibble = derive2 { name="tibble"; version="1.3.0"; sha256="1q25i1cv3qms6d3lw7jd3z142w188znkcbyam460gn9si8l8g2bk"; depends=[lazyeval Rcpp]; };
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.0"; sha256="1n8lbw3g9x1i6rjj3gsyzwnb0ailw9vb6vgr0s0h21c0g1z66a74"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.0.1"; sha256="0nm5kbwf8i03n2si81iwf55cmc7q9x1rvg2zlq8fw00kmp0amwzs"; depends=[dplyr httr lubridate magrittr purrr RCurl XML xml2]; };
   tidyjson = derive2 { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; };
-  tidyquant = derive2 { name="tidyquant"; version="0.3.0"; sha256="1fn78ibi9c0a14kr54yca489xjac1j58w8g77il61czqq8bn5hdv"; depends=[curl devtools dplyr ggplot2 lubridate magrittr purrr quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; };
+  tidyquant = derive2 { name="tidyquant"; version="0.5.0"; sha256="0zwwlybh07kr8j4qvsx6bbbh14lc89vswn8rgnv2pgbf4337bzv3"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; };
   tidyr = derive2 { name="tidyr"; version="0.6.1"; sha256="11hs3gqpbaw3w281as4m7j9n594ix5axfpwbyjsd0l62pwnzj217"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; };
   tidytext = derive2 { name="tidytext"; version="0.1.2"; sha256="1pmr7bajlcv2s42qmiz1c6723scqmlfky1ajb7hrp8h3bf7sv0cm"; depends=[broom dplyr hunspell janeaustenr Matrix purrr stringr tokenizers]; };
   tidyverse = derive2 { name="tidyverse"; version="1.1.1"; sha256="1ahxs7xzik27xdbzc1ccrkq5knzrn8xf82x3dhh94xi5c8p3ysqx"; depends=[broom dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl rvest stringr tibble tidyr xml2]; };
@@ -9706,22 +9962,23 @@ in with self; {
   tigris = derive2 { name="tigris"; version="0.3.3"; sha256="11wpxzh7045n9ss5rjhiz2b6cmgj7rnfwrxwnp9kqf0dcaaqx0hv"; depends=[httr magrittr maptools rappdirs rgdal rgeos sp stringr uuid]; };
   tikzDevice = derive2 { name="tikzDevice"; version="0.10-1"; sha256="1fjxzmp9wrf9bigzb4hkp2cb64sd6x4yhrjd6gryw17cqrblhicg"; depends=[filehash png]; };
   tileHMM = derive2 { name="tileHMM"; version="1.0-7"; sha256="1ks4b6h15982jh3ls9fz8hq9ac1wf5hfjsvdqcmnba8n3m5zm651"; depends=[corpcor st]; };
-  tilegramsR = derive2 { name="tilegramsR"; version="0.1.4"; sha256="1flwi9vxq5l92j47z88s50m6k3av2af43bpcmy8j1xkaygic2dlv"; depends=[sp]; };
+  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="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
   timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.2"; sha256="05ncs12afww2apa9sm71x30kjp3ns2l6c5dzrbc2inmy2bss5fy6"; depends=[doParallel foreach gss lattice pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; };
-  timedelay = derive2 { name="timedelay"; version="1.0.5"; sha256="1b3qm46xyrssla11kcxmy9j5bhy9bzcqfvalwny3cgbjmzsc0pa9"; depends=[mnormt]; };
+  timedelay = derive2 { name="timedelay"; version="1.0.6"; sha256="063pn1h8lr75bdqyxb90l2w50lq8lzmggv4x0575r3l292rbqwpr"; depends=[mnormt]; };
   timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
+  timekit = derive2 { name="timekit"; version="0.1.0"; sha256="0pjnckwwhh4kf804nnpw7w2s9g7s7illmnfxw3jmx8qgbqk2q53v"; depends=[devtools dplyr forcats forecast lazyeval lubridate purrr quantmod readr scales tibble tidyquant tidyr timeSeries tseries TTR xts zoo]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
   timeordered = derive2 { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
   timereg = derive2 { name="timereg"; version="1.9.0"; sha256="1rhnbi2gs1pc2nsqcf1qs3x6v1c83l21p1yq8invzgikwdmg4dhy"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
-  timetools = derive2 { name="timetools"; version="1.9.1"; sha256="12q3lbma8w3961apsifikngm17lw9vj2xl29rygdiizmk61ll4ha"; depends=[]; };
+  timetools = derive2 { name="timetools"; version="1.11.4"; sha256="0sny0kbadpgaa84xbh0d8blhc8gz2l8gp5f98zfc1jq7m6jm5km8"; depends=[]; };
   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]; };
@@ -9736,7 +9993,7 @@ in with self; {
   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=[]; };
-  tlm = derive2 { name="tlm"; version="0.1.4"; sha256="041ydlbsn0dxggrvfjfpg2jmns3c4z021f64cl2k1lwmxvqrp265"; depends=[boot]; };
+  tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
   tm = derive2 { name="tm"; version="0.7-1"; sha256="1z76ryka8yd9xwcqgla8v7mgh6wc14mqpmygv958nfy5sf2w4k8q"; depends=[BH NLP Rcpp slam]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
@@ -9756,14 +10013,14 @@ in with self; {
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
-  tnam = derive2 { name="tnam"; version="1.6.2"; sha256="09wqsqjssnzirx387y2mdd6qa38hlbf1d8s0dwzsz2jxx4w8xp01"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
+  tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
   tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; };
   toOrdinal = derive2 { name="toOrdinal"; version="0.0-6"; sha256="13mp6sxjbn1piw2q018nb4hznzsa2c7pkvmlv74f8qsjrvvw1h4x"; depends=[]; };
   toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
   tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
   tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
-  topicmodels = derive2 { name="topicmodels"; version="0.2-5"; sha256="1kilkwfhs7295w410xv34np1cr1wdwqxq1776mg24z4f8a56ccrw"; depends=[modeltools slam tm]; };
+  topicmodels = derive2 { name="topicmodels"; version="0.2-6"; sha256="13z04bgr6nxn5mr7891nm8ryixfp988ad9vmfjy4li9jsyr48q6d"; depends=[modeltools slam tm]; };
   topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; };
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
@@ -9773,7 +10030,7 @@ in with self; {
   tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
   toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
-  tpAUC = derive2 { name="tpAUC"; version="2.0.1"; sha256="066fzlkcdma3id56i9qm3bpq9a9lamqkq00qlz7paqxsfph1rn5k"; depends=[pROC]; };
+  tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; };
   tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
   tpr = derive2 { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; };
   tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; };
@@ -9791,9 +10048,9 @@ in with self; {
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
   translateSPSS2R = derive2 { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
-  transport = derive2 { name="transport"; version="0.8-1"; sha256="1lz5gn9rrg1lyxl6l0r2b0vj4756xq0gb41mfg2darww6b4ifx5v"; depends=[]; };
+  transport = derive2 { name="transport"; version="0.8-2"; sha256="0l6scyfw8ygzjg2b0q04k3mkrmhv8gj4hmjkkcqvpa7q1cnma10h"; depends=[]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-  treatSens = derive2 { name="treatSens"; version="2.0.1"; sha256="0gb14f9dfa9slppl2a2bchkli51rprw6wzyzrkxlfqlski0piymf"; depends=[dbarts]; };
+  treatSens = derive2 { name="treatSens"; version="2.1"; sha256="1d0nhyrnfcl0llrpslfqhgpyf9h4fp2a178v5vjy4m9rmqymmrql"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; };
   treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; };
   treeHFM = derive2 { name="treeHFM"; version="1.0.3"; sha256="10pyvyyz9ia4dpj8zkil56ipbvbks5xh0n9hkdy0hcinsyq0ba29"; depends=[mclust]; };
@@ -9806,6 +10063,7 @@ in with self; {
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
   treeplyr = derive2 { name="treeplyr"; version="0.1.2"; sha256="03bfl7pqhw2isffnfli82bw6la41rfqcshh9dhlbnlwr7yj69m4x"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
   treescape = derive2 { name="treescape"; version="1.10.18"; sha256="1vfyqap1696pz212x7jqrga94a8vs61r6fr7vh86nxiayf6fz7b3"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
+  treespace = derive2 { name="treespace"; version="1.0.0"; sha256="1dc98p5jf9qyr31xa7h7v2zrjmhd3jlzrh2cpmnmhbpfm1cviskj"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp RLumShiny scatterD3 shiny shinyBS]; };
   treethresh = derive2 { name="treethresh"; version="0.1-9"; sha256="1fmnmfgaysbnqn002zgcm1d2kpzc7is2k2z859hj0h0ll3yjp592"; depends=[EbayesThresh wavethresh]; };
   trelliscope = derive2 { name="trelliscope"; version="0.9.7"; sha256="1hczmi3hjlk1nqd4p2m2hs89a86jrg59rraxw5z5fm0pa92xnzqy"; 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]; };
@@ -9843,9 +10101,9 @@ in with self; {
   tscount = derive2 { name="tscount"; version="1.3.0"; sha256="0zbm096z8nlbk9rd5qkvw5285wpz7qx8avi1md3zv64zmqmny7qa"; depends=[ltsa]; };
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
-  tseries = derive2 { name="tseries"; version="0.10-38"; sha256="1gs6i28v1v349z7ficzyy9pfrm3aw5x8pldrihm3wg8wvs22jwv5"; depends=[quadprog zoo]; };
+  tseries = derive2 { name="tseries"; version="0.10-40"; sha256="1mbb44k428m0l7dqdw4fq63div4kic02fdlwb8vx7zl2s1614a34"; depends=[quadprog zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
-  tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.5-12"; sha256="0z9354mlj0nh829ccwwhs53q5myfp31x9n6kv1k8gmvz5xma40kh"; depends=[cubature]; };
+  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]; };
   tsiR = derive2 { name="tsiR"; version="0.1.0"; sha256="1h14qpg542zr41dr5vrd34aj6ss3z7c4lzvb5bfaha72zbca1l6s"; depends=[ggplot2 kernlab reshape2]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
@@ -9853,20 +10111,23 @@ in with self; {
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
   tsoutliers = derive2 { name="tsoutliers"; version="0.6-5"; sha256="1d2m51mlqw4npm7vmbaayj4s3rvsrf33abld947ryqvzi5zrwpim"; depends=[forecast KFKSDS stsm]; };
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
+  tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
+  tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
   ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; };
   tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; };
   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.7.0"; sha256="1fcls8q4ihz50wnar87047i8il32a1nrxw67nv9wjqfi02z74c2p"; depends=[httr plyr]; };
+  tuber = derive2 { name="tuber"; version="0.8.0"; sha256="1sqj8mrpsgc553qcnafg07i7issmjfrxgdw2ppin88d7s2axf5cn"; depends=[httr plyr]; };
+  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.2"; sha256="0yh5xdxapqpf5hgdn8c2jkk63817l2w6bxavw8457r89rnj1022p"; depends=[htmltools knitr rmarkdown]; };
   tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
   tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
   tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; };
-  tuneR = derive2 { name="tuneR"; version="1.3.1"; sha256="0m0fc8bx7645ddbcsvgwamfsd7rklz05wi8yc9p0kf2k5sbn48r3"; depends=[signal]; };
+  tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; };
   tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
   turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; };
   turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
@@ -9879,6 +10140,7 @@ in with self; {
   tweenr = derive2 { name="tweenr"; version="0.1.5"; sha256="06h0vhxlljmvxg4a62sqrq53lpbvl5w19dqcpyw1jqvrb5agidnq"; depends=[Rcpp]; };
   tweet2r = derive2 { name="tweet2r"; version="1.0"; sha256="0v7xshk389k3aws72ww9kqc2ycw6l6q9xmhps47g3bdl64jy8bay"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; };
   twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
+  twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; };
   twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
   twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
@@ -9892,9 +10154,10 @@ in with self; {
   udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.1.1"; sha256="0d1agg94z0qy6k4pbv01p1xb0zh42gkjl5i9kbqblplnk2swkzyi"; depends=[rmarkdown]; };
+  ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
-  ump = derive2 { name="ump"; version="0.5-6"; sha256="1nd6miz9scc6llckafl73pxiqh0ycfhlsmn2l0swcvjxpj3kb0zv"; depends=[]; };
-  umx = derive2 { name="umx"; version="1.5.0"; sha256="0b011ym5hai9c7r1lgr9y3yhscrwq77h6q6llkhklkz35qbz4056"; depends=[DiagrammeR knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl sfsmisc]; };
+  ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
+  umx = derive2 { name="umx"; version="1.7.5"; sha256="1pzxf2ghds4wdqky670da4ig17g9knwmckx3c3sb7pmin75k79vz"; depends=[DiagrammeR knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl sfsmisc]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
   unfoldr = derive2 { name="unfoldr"; version="0.6"; sha256="1chxd6b353s56rl78wxr8zzh2vvnj7wbjl6xnakhcchcfqr4zjqd"; depends=[]; };
@@ -9906,9 +10169,11 @@ in with self; {
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-2"; sha256="15d6s44n1cvhpjsmwjly3nqq7q2zpi2ws6cw5jrxb97gacma896n"; depends=[]; };
   unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; };
-  units = derive2 { name="units"; version="0.4-2"; sha256="0c7nys38157wimmqqz7hglar343nfqkvbaf0bl6by5lbql0kj2vq"; depends=[udunits2]; };
+  unitizer = derive2 { name="unitizer"; version="1.4.2"; sha256="19vxxzxwcmrjzg8hacqqscrljx2srznyskbdsdbq7f7xa16z7v5z"; depends=[crayon diffobj]; };
+  units = derive2 { name="units"; version="0.4-3"; sha256="0gh324k2wgwdgasvam0mzvcywl0y5s7aqxapqqzgjh4qkl341cgc"; depends=[udunits2]; };
   unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; };
-  unmarked = derive2 { name="unmarked"; version="0.11-0"; sha256="0n5cm17ns464dxd9sdma6f12x1phnvv05aiwgxsj499lk6jazf0l"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
+  unix = derive2 { name="unix"; version="1.0"; sha256="17mnlclphpvk6rbd23jda8ksaqcmr2nqbk5ndhh44y3f7f1y2g64"; depends=[]; };
+  unmarked = derive2 { name="unmarked"; version="0.12-0"; sha256="0s4m29ynrgw10hylbhq2z1zqzm44j4yy2g5inxwz3hs0blxrap6l"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
   unpivotr = derive2 { name="unpivotr"; version="0.1.0"; sha256="01pbmfm94i4z0xx7lj9pipw88d5szqgqa6j23m4i8cv8kx48r3p7"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr]; };
   unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
@@ -9917,41 +10182,42 @@ in with self; {
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
-  uqr = derive2 { name="uqr"; version="0.2.0"; sha256="03v12w1ssfpp3h2aja4wlv6f2x1rplpm3dpmrq78bpyanban2gwf"; depends=[gtools Hmisc]; };
+  uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
   urlshorteneR = derive2 { name="urlshorteneR"; version="0.9.2"; sha256="1y5n1rn2c7yj5ncxfnsrj9lvaam2j3vvx8ld1vqyjay1r8flzifd"; depends=[httr jsonlite stringr]; };
   urltools = derive2 { name="urltools"; version="1.6.0"; sha256="1vyv88x5l0hr4jhn7sics11g8j6817gn4yjpk58b40ynija42kkb"; depends=[Rcpp triebeard]; };
   uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; };
   usdm = derive2 { name="usdm"; version="1.1-15"; sha256="1638fv8if7pcnm6y44w3vbmivgcg4a577zd2jwhmp00vrwml2a9m"; depends=[raster sp]; };
   useful = derive2 { name="useful"; version="1.2.1"; sha256="08ihyvyjrdrfba7zasqkg4204nmql4xgwigzs80dks51bpqcq2mv"; depends=[dplyr ggplot2 magrittr plyr scales]; };
-  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.5-2"; sha256="0i5nrfq7hgq3rx43s6p8bxc4yqqjkvn42bbyv6hndzkagp06d2vj"; depends=[car diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra knitr lavaan MASS MBESS mosaic pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists XML xtable]; };
+  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.6-0"; sha256="167gvg6f55h99iywm463m0vx0sn7c29iyxappi24g7391y9s4aji"; depends=[car data_tree DiagrammeR diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra gtable knitr lavaan MASS MBESS mosaic pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists XML xtable]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.7.0"; sha256="116h8yfij7fkzd8va5w8v977fj2is86vlwzfnv28g3h0avdwysls"; depends=[nlmrt]; };
   usmap = derive2 { name="usmap"; version="0.1.0"; sha256="1v255hl31rhzzggilnxsy30hwwbhsmsl6wyj3qnhxkygbnax7ncd"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; };
   utility = derive2 { name="utility"; version="1.4"; sha256="088dgi0ybpcrk6g11fs500ymzwshbypikgjy6hxnx79byiwhrscp"; depends=[]; };
-  utiml = derive2 { name="utiml"; version="0.1.1"; sha256="118wa66s3cfp00yc9nngf7khaaswrrfj5pb71n66lnxwynf8mdgm"; depends=[mldr]; };
+  utiml = derive2 { name="utiml"; version="0.1.2"; sha256="0x30pgsq4j8vm6d95j7g1zc5hmbibjm9q1gphrf2bday2czmzakk"; depends=[mldr]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
   uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.3"; sha256="1m8n6bans7kkwriqky92vvv2sbdacyq2pvbv2m5p37q7qk5215c2"; depends=[Exact geepack plyr sandwich survival]; };
   vacem = derive2 { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
+  valaddin = derive2 { name="valaddin"; version="0.1.0"; sha256="19j3vwg8nrsnqhdvn6865k7pf79cchlf1vkdrlz7w26lnfyzzv7p"; depends=[dplyr lazyeval purrr]; };
   validann = derive2 { name="validann"; version="1.2.0"; sha256="1g8svbxyy56kmzm8yxwk9jqwnwsmlvxm87ss7l88arjl5kqgvasq"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.1.5"; sha256="166605h47bgcx1sf1rlvvgay00v8ykzw55zbfc5jnw9h8j8f7wsb"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.1.7"; sha256="1z29q7v5dwaa334dp8qg6h2gyiv9a3fggrxzvx4jqjjjmip303db"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
-  valr = derive2 { name="valr"; version="0.1.1"; sha256="0pzkaljlwqpk7n6z4f5lvy2f06a1bjsj6b20sxpd64rh302vn6hi"; depends=[BH broom dplyr ggplot2 lazyeval purrr Rcpp readr shiny stringr tibble tidyr]; };
+  valr = derive2 { name="valr"; version="0.1.2"; sha256="0n5a70j7hqbvlfv4886cvcdp4a83i86hw0kk5dgxisl9xrsmsrg9"; depends=[BH broom dplyr ggplot2 lazyeval Rcpp readr stringr tibble tidyr]; };
   valuer = derive2 { name="valuer"; version="1.1.1"; sha256="1pvzhx5irxww6vb8j4nsanlzgwaa4z96vw4l97h6l27h1403gdkb"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
   varComp = derive2 { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
   varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; };
   varSelRF = derive2 { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
   varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; };
-  varbvs = derive2 { name="varbvs"; version="2.0.0"; sha256="1bi11qcgnw263p1vv25nhcf9b0vf04bl6hpb9agw1rp1f7c9xsrb"; depends=[lattice latticeExtra]; };
+  varbvs = derive2 { name="varbvs"; version="2.0-8"; sha256="1bjw90lz1499ykx1q6yj7qd9bks1794s4yf4lz4c7sm0vbdx31x6"; depends=[lattice latticeExtra Rcpp]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.8.6"; sha256="0jfwrpg85w10m6y4pk06wrbmnvzjby1fiarn3i14dgglba8jcrbl"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.9.0"; sha256="139msbslzav7grjwvci97x0rmlfqgb83dj2jm9pzf3anrwg230d6"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.1"; sha256="06n13dyq41dr0gsq2bzkqqraqqkab93n7gimln4ckkdnrv0a1crx"; depends=[]; };
   variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
@@ -9968,7 +10234,7 @@ in with self; {
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.4-2"; sha256="12wf64izrpq9z3ix7mgm5421mq0xsm8dw5qblvcrz452nfhjf5w9"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan = derive2 { name="vegan"; version="2.4-3"; sha256="15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.0-1"; sha256="19xwbmnmhdvm8vsfjv17bhbjrlsr2wwgjj0nflw8kgmlz0d2f70k"; depends=[cluster rgl scatterplot3d vegan]; };
   vegclust = derive2 { name="vegclust"; version="1.6.5"; sha256="0y1lh4d2i3nxgc30wp6f14v2p14bx399y4cr5r7gv2gi76c5bhj4"; depends=[sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9"; sha256="0hk56nbzg1c1q6shz9b04d60w9gd71f4fhyy89l98mcr41g8hjbc"; depends=[foreign httr jsonlite XML]; };
@@ -9978,9 +10244,11 @@ in with self; {
   vembedr = derive2 { name="vembedr"; version="0.1.2"; sha256="0pqjf55rgylszgmzdhzr7m0lcqw3dw6c49i45r39yiq3wprc55qa"; depends=[htmltools httr magrittr stringr]; };
   venn = derive2 { name="venn"; version="1.2"; sha256="18il18i13p92dm167c6mwppzjldp2blq482l5206lp1gqvxyc7f0"; depends=[]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
+  vennplot = derive2 { name="vennplot"; version="0.9.01"; sha256="1p55sjhgi7wry2avf38i222yb52iam7nwq5g0w615hiajz3y7s2z"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
   versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; };
   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]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
@@ -9988,9 +10256,9 @@ in with self; {
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
   vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  vipor = derive2 { name="vipor"; version="0.4.4"; sha256="0p1z9a3fazl78pj8a1i2n62v8hrs8cinq82j9wpawhmfkn3dggss"; depends=[]; };
-  viridis = derive2 { name="viridis"; version="0.3.4"; sha256="1a9hqn2pccpc51vh8ghw698ni6xzdnp8v0n8kgjh51nlz5hhc87j"; depends=[ggplot2 gridExtra]; };
-  viridisLite = derive2 { name="viridisLite"; version="0.1.3"; sha256="1b0fhj8i1m9jsz91gzag60k7vy7kk5xkdg31rc3h3spq96l66psp"; depends=[]; };
+  vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
+  viridis = derive2 { name="viridis"; version="0.4.0"; sha256="03mha2935k1mw7mjjkq7mrx185hl0m3vq3967iiwbknpivbdxllk"; depends=[ggplot2 gridExtra viridisLite]; };
+  viridisLite = derive2 { name="viridisLite"; version="0.2.0"; sha256="1546h44ng4dxs130jkh6lkh990hmp90m1w45sq5p47n546gr0k9d"; depends=[]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.4-1"; sha256="02n83j10z7m8bjlavm2c6v58z1flhxn36j0h00c5xm085brzww3y"; depends=[ade4 dismo raster rworldmap]; };
   virustotal = derive2 { name="virustotal"; version="0.2.0"; sha256="0c2ig1wki08cq41ma1bawxgyzlkqv2j6kjlsapdry12vm42rz1yc"; depends=[httr plyr]; };
   visNetwork = derive2 { name="visNetwork"; version="1.0.3"; sha256="0wq37srnra6vzzw3d3c5lfvdqpd5329s73zrr9cd2saa6ski23i1"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
@@ -10002,6 +10270,9 @@ in with self; {
   vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
   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.1"; sha256="14rh8f936p8fadlinn0n9d3l7q60bp3a1mgqag9m4q310477lf36"; depends=[]; };
+  vortexR = derive2 { name="vortexR"; version="1.0.3"; sha256="1lwl61jfsf2kwmi30zwy9anc755jarji1q7qzzj4nb5jmdc395dy"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
+  vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
   vote = derive2 { name="vote"; version="1.0-0"; sha256="1fx5x5248s48n86gdclv8pjnllly89rw0l6d2is263qqndn9fsk9"; depends=[formattable knitr]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
   vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; };
@@ -10012,7 +10283,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="0.5.30"; sha256="1i61sv47y3g9hs9bkx9wcirapy30hs66013w5k7116wqsp0dy3b2"; depends=[]; };
+  vtreat = derive2 { name="vtreat"; version="0.5.31"; sha256="08mpgcd8w2znxx86bzafh6abw7rnklkhaw9cgjch7s35ij42665i"; 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]; };
@@ -10027,10 +10298,10 @@ in with self; {
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="0.6.3"; sha256="1kv1svckdgb8rl51qdrn3cc367gklr89fy2lw92992vmsimafxhd"; depends=[devtools dismo dplyr DT ENMeval leaflet magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyBS shinyjs shinythemes spocc spThin]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.5"; sha256="1m6hvvf2xji3i3fs19zf54l16wgbi7hwmjxpwfyvh9w6lb6swlnz"; depends=[doParallel dtw fftw foreach jpeg maps pbapply RCurl rjson seewave tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.6"; sha256="0wld9jshr4qj0m3l75yjy5gz725jnxwzvwwamqmdjkby6wyz823i"; depends=[doParallel dtw fftw foreach jpeg maps monitoR pbapply pbmcapply RCurl rjson seewave tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
-  water = derive2 { name="water"; version="0.5"; sha256="0g7h1xgij107l5n3551m3ql5m3hn79a7ajv6grk05xf507fy1bb3"; depends=[raster rgdal sp]; };
+  water = derive2 { name="water"; version="0.6"; sha256="0f569lcr68dk383cacgagyhkbyfh9aqgnn9w4c2y5x9bj3awjvq9"; depends=[raster rgdal sp]; };
   waterData = derive2 { name="waterData"; version="1.0.6"; sha256="1k1paifhngy97ik399dndm7m5hm6r935yipiapgpchzsvl5nwwva"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; };
   waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; };
   waterfalls = derive2 { name="waterfalls"; version="0.1.1"; sha256="0x3f6phlrismivbaf37vqnz30wvz8xzj33qwl2wyg6lijxbmg551"; depends=[ggplot2]; };
@@ -10049,8 +10320,8 @@ in with self; {
   weatherData = derive2 { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
   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]; };
-  webchem = derive2 { name="webchem"; version="0.1.1.1"; sha256="10h01a4slxcc6hllwh4wfayr9wfyaxijs0v875ncm97zb58gwl7h"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
-  webp = derive2 { name="webp"; version="0.2"; sha256="1nwb30wyff5jynn0ppmg5ybw6q2ha9smnk69fi182grm3znf85as"; depends=[]; };
+  webchem = derive2 { name="webchem"; version="0.2"; sha256="0mxikd2ls0jcal9z0byan1l78965qq8jdyym9ydb4c56g1p2iyl8"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
+  webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
   webshot = derive2 { name="webshot"; version="0.4.0"; sha256="0qh1669lkxvr98l8sj03pfn41k4kfsy9787df4rxgigfsx3vnj1h"; depends=[jsonlite magrittr]; };
   webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
@@ -10060,7 +10331,7 @@ in with self; {
   weco = derive2 { name="weco"; version="1.0"; sha256="1akn85igd6k5cfj9hzn3g8a77qzhlzwyc2p4l6y8wigyncg7wyqi"; depends=[]; };
   weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; };
   weightedScores = derive2 { name="weightedScores"; version="0.9.5.1"; sha256="118hzwaarcb8pk2zz83m6zzzndlpbbzb7gz87vc7zggpa998k1gr"; depends=[mvtnorm rootSolve]; };
-  weightr = derive2 { name="weightr"; version="1.0.0"; sha256="03f6zif3a9cnshkchi5ak7s6mcsdyrqcij80aamk8cgb4s4nhc2x"; depends=[]; };
+  weightr = derive2 { name="weightr"; version="1.1.2"; sha256="13wy7ygx7khbmymg2r0rr6mrl4lbapf5bnnq1rq8izl38sjk7csx"; depends=[]; };
   weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
   wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; };
@@ -10073,13 +10344,14 @@ in with self; {
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
   whoami = derive2 { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; };
   whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; };
-  wicket = derive2 { name="wicket"; version="0.2.0"; sha256="0wyd72w1l84kxzfy0hhrzr6ipxgzh2gfwldlmv0h79r5icjk17z3"; depends=[BH Rcpp]; };
+  wicket = derive2 { name="wicket"; version="0.3.0"; sha256="1n6ji4zx48japlfbqyz4hbk40vr58l8d3wjdagjvc2jqx36cn19k"; 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.1.0"; sha256="0v7mi7m97200dyq8n173gsyw16g75bdas12s38lvg0a09gcyn8z0"; depends=[htmltools htmlwidgets magrittr purrr]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-  wikilake = derive2 { name="wikilake"; version="0.1"; sha256="05fcdrv2splhxkr3xgp14mwn36z3sn5hjq4mjibkgh44x7av4rf8"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
+  wikilake = derive2 { name="wikilake"; version="0.2"; sha256="0z03bn4d1pllhxbyaf4knn2p8in3a3b0m32g5lxhi2lhh4sasc5h"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; };
+  wikitaxa = derive2 { name="wikitaxa"; version="0.1.0"; sha256="1m97bq80k8iy8vhrfjcgn5a50ihk72n936k282j3gn3pb6y0kn26"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
   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]; };
@@ -10093,8 +10365,8 @@ in with self; {
   wmtsa = derive2 { name="wmtsa"; version="2.0-2"; sha256="14znrylyazsj3d8nxgh3nvr94ifckan6gwy12b43zsyskzqp9zbg"; depends=[ifultools MASS splus2R]; };
   wnominate = derive2 { name="wnominate"; version="1.2"; sha256="0kkdlhliihv45hc0fd25kairxd9r71hcx04ri9l0iy8cyhjs2n12"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
-  woeBinning = derive2 { name="woeBinning"; version="0.1.1"; sha256="00fmbz8vdvf712plm2ip0jfiq3wpj7f4l6wn3i0x0d7fggkfhm1r"; depends=[]; };
-  word_alignment = derive2 { name="word.alignment"; version="1.0.4"; sha256="0riz61wib1dbm5zb087xd31vkmw73nz3g82gh59mp673ancfahpd"; depends=[data_table openxlsx quanteda]; };
+  woeBinning = derive2 { name="woeBinning"; version="0.1.3"; sha256="1hkcnv5kzjw9fjmyg5nkaww7q5snkncipsyxmrb6m9ah3pgsl1a2"; depends=[]; };
+  word_alignment = derive2 { name="word.alignment"; version="1.0.6"; sha256="02hhl8357ykbf04gr8gjb9vkhimmb3fbi5jxrwy8dr0qysnz1kzg"; depends=[data_table openxlsx quanteda]; };
   wordbankr = derive2 { name="wordbankr"; version="0.2.0"; sha256="041d5v3gm7bihx85k7kxwlqgg6vs24wzs2h59zf3l3cs39mhrhs5"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; };
   wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
   wordcloud2 = derive2 { name="wordcloud2"; version="0.2.0"; sha256="0ylsmijrym61s1vhvf8csimznd1yg497xa3yign4bgi5jx4k64ny"; depends=[base64enc htmlwidgets]; };
@@ -10109,18 +10381,17 @@ in with self; {
   wpp2015 = derive2 { name="wpp2015"; version="1.1-0"; sha256="01vsdma2fgh0vd96ly4f704hl200v0w8ksz60gjxhm44ih3qszh3"; depends=[]; };
   wppExplorer = derive2 { name="wppExplorer"; version="2.0-2"; sha256="0mja5bgw6b0dsxi3dpm87y9qbv5b9cgp81yfjkywqc5wdjpirxk7"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2015]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
-  wrangle = derive2 { name="wrangle"; version="0.3"; sha256="1xmb245ps02s43r0ysx87wqjdr174163x5cn4x1y226qbbdclmmk"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="0.1.0"; sha256="1kssir24az6l39lp26g13gacmgarmhdgmc2vlpgfjv37x5lpxk3y"; depends=[]; };
+  wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
+  wrapr = derive2 { name="wrapr"; version="0.1.2"; sha256="1zlllcjrygzpr0k3ibmli98hhqr96sn89h72g2cwb5pbvgb7pzgk"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.4"; sha256="0w1hzxwk00lk1hkdxxz6vqa6xzw5sf60y54xzfr510yd02x3r1gn"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
   wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
   wrswoR = derive2 { name="wrswoR"; version="1.0-1"; sha256="1czw3g2j6as024wwvxiizvvxjmsxmxhz86jbw2lh95nh61znb7l8"; depends=[logging Rcpp]; };
   wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.1-1"; sha256="1a2ymyf1yww43i79hc912jpyqvbx44qn5bfnjwf4hq3mp707731j"; depends=[curl lazyeval]; };
-  wru = derive2 { name="wru"; version="0.1-1"; sha256="103i3a741ik61jzp5zbhf0f6lfchlafq1gyjyy98jgw0cxc6ckcv"; depends=[devtools]; };
+  wru = derive2 { name="wru"; version="0.1-3"; sha256="02l2dfz9v0ixr7x8rjrvdrcy4x3mxicchqr1jc298jc443dnsrsf"; depends=[devtools]; };
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
-  wsrf = derive2 { name="wsrf"; version="1.7.0"; sha256="1q4slnwn690z6ham0b2vy1rc0vkbrlj9bf0wkd6v86jag7wjr4fw"; depends=[Rcpp]; };
-  wtcrsk = derive2 { name="wtcrsk"; version="1.6"; sha256="048gs469rdj85sid1gfj6yhh37w7zf9xv4fj8pd48c8ww3v7f61p"; depends=[]; };
+  wsrf = derive2 { name="wsrf"; version="1.7.13"; sha256="07dmimn58byr5dyszckazxjs2gjjk6g3si9wa5f10gbgzpc0713p"; depends=[Rcpp]; };
   wtest = derive2 { name="wtest"; version="1.0"; sha256="0rn2wp4xqd1b95asc1ppscfm21p3r85za778f88kgqax2lx7kq96"; depends=[]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
   wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; };
@@ -10131,13 +10402,15 @@ in with self; {
   xLLiM = derive2 { name="xLLiM"; version="1.0"; sha256="005y3xgfac047lga3dbckkz4ba781vd7dab867515yj18q5rllp7"; depends=[abind corpcor MASS Matrix]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
   xaringan = derive2 { name="xaringan"; version="0.2"; sha256="0nlys4gakgj73826yvzk5yy38kj7h33a3970vwls8n06fc68xksn"; depends=[htmltools knitr rmarkdown servr]; };
-  xergm = derive2 { name="xergm"; version="1.7.3"; sha256="0pr6qm8q039j9c9vibm7inb5qsvl4x54djckm7087zymvriyfmvl"; depends=[btergm GERGM rem tnam xergm_common]; };
-  xergm_common = derive2 { name="xergm.common"; version="1.7.4"; sha256="1mrd5sa6bwv5lw6q0q9xj6zacs41522r69bm1ijd14gx5k1gwn7s"; depends=[ergm network]; };
+  xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; };
+  xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; };
+  xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; };
   xgboost = derive2 { name="xgboost"; version="0.6-4"; sha256="1vfiz44prcjx2y442zc4x1b50k57qwd7sqbz6lq0kiqhp78ivicz"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
   xkcd = derive2 { name="xkcd"; version="0.0.5"; sha256="1cq4n7w4adj24qq658z15jkqvrn4pd5abxpcsdkzb2cq98m69iis"; depends=[extrafont ggplot2 Hmisc]; };
   xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; };
+  xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; };
   xlsx = derive2 { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
@@ -10153,15 +10426,15 @@ in with self; {
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xtractomatic = derive2 { name="xtractomatic"; version="3.2.0"; sha256="04gng8y7606fvyj767f9vja33fh0xcwj2v2jy3nacybjwwr9yrx0"; depends=[httr ncdf4 sp]; };
   xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
-  xxIRT = derive2 { name="xxIRT"; version="2.0.0"; sha256="140dp3chsd9mlnbysachck3547zgcpsbrgqhnrdxp348pny0l94b"; depends=[ggplot2 lpSolveAPI reshape2 shiny]; };
+  xxIRT = derive2 { name="xxIRT"; version="2.0.1"; sha256="1a31jyzc37bq3068vq18rdj0fn66jihk7d1qmqk8lq76gg72dwk6"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; };
   xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
-  xyz = derive2 { name="xyz"; version="0.1"; sha256="0hynmrbi1f0ijv2g0va8bnr84ls2d8prl32f76mmfq6a3laqrj9i"; depends=[Rcpp]; };
+  xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
   yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; 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.14"; sha256="0x88xicrf7vwp77xgan27mnpdljhpkn0pz5kphnwqi3ddy25k9a1"; depends=[]; };
-  yarrr = derive2 { name="yarrr"; version="0.1.4"; sha256="171z69jgva1afzmcjk62g9mr18z9r955rizvsp46bcljj74vfq39"; depends=[BayesFactor jpeg]; };
+  yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
   ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
   yesno = derive2 { name="yesno"; version="0.0.2"; sha256="0aa8kqcqlix9a9a2l4fnl2qv25dgdn4m7cfsh7m0kk76y8q5gbc9"; depends=[]; };
   yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
@@ -10178,13 +10451,14 @@ in with self; {
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-1"; sha256="0agm81rrn4ip6sljrwm1a9i2q9rwdwamnxm0smz757kypgyll8c2"; depends=[graph MASS PairViz]; };
   zetadiv = derive2 { name="zetadiv"; version="1.0"; sha256="1r33v97viqq6r3afszclq45rcm4sfxy86lk13ljr6bxns47xpfii"; 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"; sha256="0i39983blc46vjbb4y36rypg9q3zammxahk63p089m43gi22ycxh"; depends=[coda Rcpp RcppArmadillo]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
-  ziphsmm = derive2 { name="ziphsmm"; version="1.0.3"; sha256="0x7l4sgbixlz6x28gm3sk7x65n3p8jcm5ck3i10vy49f1fsvkf80"; depends=[Rcpp RcppArmadillo]; };
-  zoeppritz = derive2 { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; };
+  ziphsmm = derive2 { name="ziphsmm"; version="1.0.4"; sha256="119myqb9gzwg88k7csmsaqasn5zqjjp6x1x0wy2jra656l76g4kd"; depends=[Rcpp RcppArmadillo]; };
+  zoeppritz = derive2 { name="zoeppritz"; version="1.0-6"; sha256="0b16w8s26pi5h911jizwqapgwhdh60gcx0khn3kayf9fi40kyzp0"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.4.2"; sha256="0gdbcnxlm9m88c2av4zy0k3yvm2cvg24804xnsi0mwfgwmnngdh5"; depends=[abind coda Formula matrixcalc rjags]; };
-  zoo = derive2 { name="zoo"; version="1.7-14"; sha256="167m142rwwfy8b9hnfc3fi28dcsdjk61g1crqhll6sh5xmgnfn28"; depends=[lattice]; };
+  zoo = derive2 { name="zoo"; version="1.8-0"; sha256="0mqklbx92ifwa0awm7gpm4r9dvwa09p55zjxjnypiqsxy532r4h9"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
   zoocat = derive2 { name="zoocat"; version="0.2.0"; sha256="1xqi90jnpqjdf3zr4pldh1a2gjppjwjrgkq71rvdhmcrf5s8jav0"; depends=[plyr reshape2 scales zoo]; };
   zooimage = derive2 { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index b3611d14e4b..ace649719c6 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -409,7 +409,6 @@ let
     Cairo = [ pkgs.pkgconfig ];
     Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];
     qtutils = [ pkgs.qt4 ];
-    ecoretriever = [ pkgs.which ];
     tcltk2 = [ pkgs.tcl pkgs.tk ];
     tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];
     rPython = [ pkgs.which ];
@@ -630,7 +629,6 @@ let
     "rioja"
     "ripa"
     "rite"
-    "rnbn"
     "RNCEP"
     "RQDA"
     "RSDA"
@@ -662,7 +660,6 @@ let
     "SYNCSA"
     "SyNet"
     "tcltk2"
-    "TDMR"
     "TED"
     "TestScorer"
     "TIMP"
@@ -695,7 +692,6 @@ let
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [
     "acs"                             # build is broken
-    "AffyTiling"                      # build is broken
     "agRee"                           # depends on broken package BRugs-0.8-6
     "aLFQ"                            # depends on broken package bio3d-2.3-1
     "animation"                       # build is broken
@@ -762,7 +758,6 @@ let
     "csaw"                            # build is broken
     "ctsem"                           # depends on broken package OpenMx-2.7.4
     "cudaBayesreg"                    # build is broken
-    "curlconverter"                   # depends on broken package V8-1.2
     "cytofkit"                        # depends on broken package flowCore-1.38.2
     "daff"                            # depends on broken package V8-1.2
     "dagbag"                          # build is broken
@@ -787,7 +782,6 @@ let
     "DirichletMultinomial"            # build is broken
     "diveRsity"                       # build is broken
     "DmelSGI"                         # depends on broken package r-rhdf5-2.16.0
-    "DNAprofiles"                     # build is broken
     "docxtools"                       # build is broken
     "DOQTL"                           # depends on broken package r-rhdf5-2.16.0
     "DOT"                             # depends on broken package V8-1.2
@@ -862,7 +856,6 @@ let
     "gMCP"                            # build is broken
     "gmDatabase"                      # depends on broken package RMySQL-0.10.9
     "gmum_r"                          # build is broken
-    "goldi"                           # build is broken
     "googleformr"                     # build is broken
     "gpg"                             # build is broken
     "gpuR"                            # build is broken
@@ -889,7 +882,6 @@ let
     "IHWpaper"                        # depends on broken package r-lpsymphony-1.0.2
     "IlluminaHumanMethylation450k_db" # build is broken
     "immunoClust"                     # depends on broken package r-flowCore-1.38.2
-    "inSilicoMerging"                 # build is broken
     "intansv"                         # build is broken
     "interactiveDisplay"              # build is broken
     "ionicons"                        # depends on broken package rsvg-1.0
@@ -941,7 +933,6 @@ let
     "miscF"                           # depends on broken package BRugs-0.8-6
     "mixlink"                         # build is broken
     "MLSeq"                           # build is broken
-    "MMDiff"                          # depends on broken package r-DiffBind-2.0.9
     "mmnet"                           # build is broken
     "MonetDBLite"                     # build is broken
     "mongolite"                       # build is broken
@@ -1043,7 +1034,6 @@ let
     "RapidPolygonLookup"              # depends on broken package PBSmapping-2.69.76
     "RAppArmor"                       # build is broken
     "raptr"                           # depends on broken package PBSmapping-2.69.76
-    "RBerkeley"                       # build is broken
     "RbioRXN"                         # depends on broken package ChemmineR-2.24.2
     "Rblpapi"                         # build is broken
     "Rchemcpp"                        # depends on broken package ChemmineR-2.24.2
@@ -1094,7 +1084,6 @@ let
     "rnetcarto"                       # build is broken
     "ROI_plugin_cplex"                # depends on broken package Rcplex-0.3-3
     "ROI_plugin_symphony"             # depends on broken package Rsymphony-0.1-26
-    "Rolexa"                          # build is broken
     "ROracle"                         # build is broken
     "RPA"                             # depends on broken package r-rhdf5-2.16.0
     "RPANDA"                          # depends on broken package animation-2.4
@@ -1119,7 +1108,6 @@ let
     "RVideoPoker"                     # depends on broken package rpanel-1.1-3
     "rzmq"                            # build is broken
     "s2"                              # build is broken
-    "Sabermetrics"                    # build is broken
     "sapFinder"                       # build is broken
     "sbrl"                            # build is broken
     "scater"                          # depends on broken package r-rhdf5-2.16.0
@@ -1145,7 +1133,6 @@ let
     "sodium"                          # build is broken
     "soilphysics"                     # depends on broken package rpanel-1.1-3
     "sortinghat"                      # build is broken
-    "spade"                           # depends on broken package r-flowCore-1.38.2
     "spdynmod"                        # depends on broken package animation-2.4
     "spocc"                           # depends on broken package V8-1.2
     "spongecake"                      # build is broken

From 85a9e6dcdf26c96ae360bd156b3bbf919efaf239 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Apr 2017 20:00:32 +0200
Subject: [PATCH 1455/1744] R: update list of broken packages (and some
 cosmetic)

---
 pkgs/development/r-modules/README.md          |  5 +-
 pkgs/development/r-modules/default.nix        | 55 +++++++++++++++++++
 pkgs/development/r-modules/generate-shell.nix |  3 +-
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 5aa839b3b5a..fc046ed0627 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -12,7 +12,7 @@ use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix fil
     {
 
         rEnv = super.rWrapper.override {
-            packages = with self.rPackages; [ 
+            packages = with self.rPackages; [
                 devtools
                 ggplot2
                 reshape2
@@ -65,7 +65,7 @@ set `useRPackages` to `true`, like below:
     {
 
         rEnv = super.rWrapper.override {
-            packages = with self.rPackages; [ 
+            packages = with self.rPackages; [
                 devtools
                 ggplot2
                 reshape2
@@ -106,4 +106,3 @@ 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/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ace649719c6..5c0ed284e4a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -694,21 +694,27 @@ let
     "acs"                             # build is broken
     "agRee"                           # depends on broken package BRugs-0.8-6
     "aLFQ"                            # depends on broken package bio3d-2.3-1
+    "anamiR"                          # depends on broken package RMySQL-0.10.11
+    "AneuFinder"                      # depends on broken package Rhtslib-1.6.0
     "animation"                       # build is broken
     "anim_plots"                      # depends on broken package animation-2.4
     "annmap"                          # depends on broken package RMySQL-0.10.9
     "apaStyle"                        # depends on broken package gdtools-0.1.3
     "apaTables"                       # depends on broken package OpenMx-2.7.4
+    "aptg"                            # depends on broken package brranching-0.2.0
     "ArrayExpressHTS"                 # build is broken
     "arrayQualityMetrics"             # build is broken
     "auRoc"                           # depends on broken package OpenMx-2.7.4
+    "bamsignals"                      # depends on broken package Rhtslib-1.6.0
     "BatchQC"                         # build is broken
+    "bayesCL"                         # build is broken
     "bayou"                           # depends on broken package animation-2.4
     "bedr"                            # build is broken
     "BETS"                            # build is broken
     "BiGGR"                           # depends on broken package rsbml-2.30.0
     "bio3d"                           # build is broken
     "bioassayR"                       # depends on broken package ChemmineR-2.24.2
+    "bioCancer"                       # depends on broken package covr-2.2.2
     "biomformat"                      # depends on broken package r-rhdf5-2.16.0
     "biotools"                        # depends on broken package rpanel-1.1-3
     "birte"                           # build is broken
@@ -730,6 +736,8 @@ let
     "categoryCompare"                 # depends on broken package RCytoscape-1.21.1
     "Causata"                         # depends on broken package RMySQL-0.10.9
     "cdcfluview"                      # depends on broken package V8-1.2
+    "CexoR"                           # depends on broken package Rhtslib-1.6.0
+    "ChAMP"                           # depends on broken package goseq-1.26.0
     "ChemmineDrugs"                   # depends on broken package ChemmineR-2.24.2
     "ChemmineR"                       # build is broken
     "chinese_misc"                    # build is broken
@@ -759,11 +767,13 @@ let
     "ctsem"                           # depends on broken package OpenMx-2.7.4
     "cudaBayesreg"                    # build is broken
     "cytofkit"                        # depends on broken package flowCore-1.38.2
+    "CytoML"                          # depends on broken package flowCore-1.40.6
     "daff"                            # depends on broken package V8-1.2
     "dagbag"                          # build is broken
     "dagitty"                         # depends on broken package V8-1.2
     "dagLogo"                         # depends on broken package MotIV-1.28.0
     "DAISIE"                          # depends on broken package animation-2.4
+    "DataEntry"                       # build is broken
     "dataMaid"                        # build is broken
     "dataone"                         # build is broken
     "datapack"                        # build is broken
@@ -772,7 +782,9 @@ let
     "DCM"                             # build is broken
     "DDD"                             # depends on broken package animation-2.4
     "deBInfer"                        # depends on broken package PBSddesolve-1.12.2
+    "debrowser"                       # depends on broken package V8-1.4
     "DecisionCurve"                   # build is broken
+    "DeepBlueR"                       # build is broken
     "deepSNV"                         # build is broken
     "DEGraph"                         # depends on broken package RCytoscape-1.21.1
     "DEploid"                         # build is broken
@@ -795,11 +807,14 @@ let
     "euroMix"                         # build is broken
     "evobiR"                          # depends on broken package animation-2.4
     "exifr"                           # build is broken
+    "ExperimentHubData"               # build is broken
     "exprso"                          # build is broken
     "fastR"                           # build is broken
+    "fCCAC"                           # depends on broken package Rhtslib-1.6.0
     "fdq"                             # depends on broken package gdtools-0.1.3
     "Fgmutils"                        # depends on broken package gdtools-0.1.3
     "flan"                            # build is broken
+    "flextable"                       # depends on broken package gdtools-0.1.4
     "flowAI"                          # depends on broken package r-flowCore-1.38.2
     "flowBeads"                       # depends on broken package r-flowCore-1.38.2
     "flowBin"                         # depends on broken package r-flowCore-1.38.2
@@ -816,6 +831,7 @@ let
     "flowMeans"                       # depends on broken package r-flowCore-1.38.2
     "flowMerge"                       # depends on broken package r-flowCore-1.38.2
     "flowPeaks"                       # build is broken
+    "flowPloidy"                      # depends on broken package flowCore-1.40.6
     "flowQB"                          # depends on broken package r-flowCore-1.38.2
     "flowQ"                           # depends on broken package flowCore-1.38.2
     "FlowSOM"                         # depends on broken package r-flowCore-1.38.2
@@ -842,6 +858,8 @@ let
     "gazepath"                        # build is broken
     "gdtools"                         # build is broken
     "GENE_E"                          # depends on broken package r-rhdf5-2.16.0
+    "GenoGAM"                         # build is broken
+    "genomation"                      # depends on broken package Rhtslib-1.6.0
     "geojson"                         # depends on broken package r-protolite-1.5
     "geojsonio"                       # depends on broken package V8-1.2
     "geojsonlint"                     # depends on broken package V8-1.2
@@ -849,18 +867,22 @@ let
     "gfer"                            # depends on broken package V8-1.2
     "ggcyto"                          # depends on broken package r-flowCore-1.38.2
     "ggghost"                         # depends on broken package animation-2.4
+    "ggimage"                         # depends on broken package gridGraphics-0.1-5
     "ggiraph"                         # depends on broken package gdtools-0.1.3
     "ggiraphExtra"                    # depends on broken package gdtools-0.1.3
     "ggseas"                          # build is broken
+    "gmapR"                           # build is broken
     "gmatrix"                         # depends on broken package cudatoolkit-8.0.61
     "gMCP"                            # build is broken
     "gmDatabase"                      # depends on broken package RMySQL-0.10.9
     "gmum_r"                          # build is broken
     "googleformr"                     # build is broken
+    "goseq"                           # build is broken
     "gpg"                             # build is broken
     "gpuR"                            # build is broken
     "gputools"                        # depends on broken package cudatoolkit-8.0.61
     "GraphPAC"                        # build is broken
+    "greengenes13_5MgDb"              # build is broken
     "gridGraphics"                    # build is broken
     "GSCA"                            # depends on broken package r-rhdf5-2.16.0
     "GUIDE"                           # depends on broken package rpanel-1.1-3
@@ -870,11 +892,14 @@ let
     "harrietr"                        # build is broken
     "HDF5Array"                       # depends on broken package r-rhdf5-2.16.0
     "healthyFlowData"                 # depends on broken package r-flowCore-1.38.2
+    "hexSticker"                      # depends on broken package gridGraphics-0.1-5
     "HierO"                           # build is broken
     "HilbertVisGUI"                   # build is broken
     "HiPLARM"                         # build is broken
     "hisse"                           # depends on broken package animation-2.4
+    "hoardeR"                         # depends on broken package Rhtslib-1.6.0
     "homomorpheR"                     # depends on broken package sodium-0.4
+    "HTSeqGenie"                      # depends on broken package gmapR-1.16.0
     "HTSSIP"                          # depends on broken package r-rhdf5-2.16.0
     "idm"                             # depends on broken package animation-2.4
     "ifaTools"                        # depends on broken package OpenMx-2.7.4
@@ -882,6 +907,7 @@ let
     "IHWpaper"                        # depends on broken package r-lpsymphony-1.0.2
     "IlluminaHumanMethylation450k_db" # build is broken
     "immunoClust"                     # depends on broken package r-flowCore-1.38.2
+    "imputeR"                         # depends on broken package ridge-2.2
     "intansv"                         # build is broken
     "interactiveDisplay"              # build is broken
     "ionicons"                        # depends on broken package rsvg-1.0
@@ -894,8 +920,10 @@ let
     "KoNLP"                           # build is broken
     "largeList"                       # build is broken
     "largeVis"                        # build is broken
+    "lavaan_shiny"                    # depends on broken package OpenMx-2.7.10
     "lawn"                            # depends on broken package V8-1.2
     "LCMCR"                           # build is broken
+    "LeArEst"                         # depends on broken package opencpu-1.6.1
     "lefse"                           # build is broken
     "lfe"                             # build is broken
     "lgcp"                            # depends on broken package rpanel-1.1-3
@@ -918,6 +946,7 @@ let
     "MBESS"                           # depends on broken package OpenMx-2.7.4
     "mBvs"                            # build is broken
     "mcaGUI"                          # build is broken
+    "mcPAFit"                         # build is broken
     "mdsr"                            # depends on broken package RMySQL-0.10.9
     "Mediana"                         # depends on broken package gdtools-0.1.3
     "melviewr"                        # build is broken
@@ -928,12 +957,14 @@ let
     "metagear"                        # build is broken
     "MetaIntegrator"                  # depends on broken package RMySQL-0.10.9
     "metaSEM"                         # depends on broken package OpenMx-2.7.4
+    "methylKit"                       # depends on broken package Rhtslib-1.6.0
     "MigClim"                         # build is broken
     "minimist"                        # depends on broken package V8-1.2
     "miscF"                           # depends on broken package BRugs-0.8-6
     "mixlink"                         # build is broken
     "MLSeq"                           # build is broken
     "mmnet"                           # build is broken
+    "MODIStsp"                        # build is broken
     "MonetDBLite"                     # build is broken
     "mongolite"                       # build is broken
     "monogeneaGM"                     # depends on broken package animation-2.4
@@ -960,7 +991,9 @@ let
     "ndjson"                          # build is broken
     "ndtv"                            # depends on broken package animation-2.4
     "NetRep"                          # depends on broken package r-RhpcBLASctl-0.15-148
+    "networkBMA"                      # build is broken
     "nlts"                            # build is broken
+    "normr"                           # depends on broken package Rhtslib-1.6.0
     "NORRRM"                          # build is broken
     "odbc"                            # build is broken
     "officer"                         # depends on broken package gdtools-0.1.3
@@ -970,10 +1003,12 @@ let
     "OpenMx"                          # build is broken
     "optbdmaeAT"                      # build is broken
     "optBiomarker"                    # depends on broken package rpanel-1.1-3
+    "optrcdmaeAT"                     # build is broken
     "ora"                             # depends on broken package ROracle-1.3-1
     "OUwie"                           # depends on broken package animation-2.4
     "PAA"                             # build is broken
     "paleotree"                       # depends on broken package animation-2.4
+    "PathoStat"                       # depends on broken package BatchQC-1.2.1
     "PathSelectMP"                    # build is broken
     "PatternClass"                    # build is broken
     "PBD"                             # depends on broken package animation-2.4
@@ -990,6 +1025,7 @@ let
     "PGA"                             # build is broken
     "PGPC"                            # depends on broken package ChemmineR-2.24.2
     "ph2bye"                          # depends on broken package animation-2.4
+    "PharmacoGx"                      # build is broken
     "PhyInformR"                      # depends on broken package animation-2.4
     "phylocurve"                      # depends on broken package animation-2.4
     "phyloseq"                        # depends on broken package r-rhdf5-2.16.0
@@ -999,6 +1035,7 @@ let
     "PING"                            # depends on broken package PICS-2.16.0
     "plateCore"                       # depends on broken package r-flowCore-1.38.2
     "plfMA"                           # build is broken
+    "plink"                           # build is broken
     "podkat"                          # build is broken
     "PottsUtils"                      # depends on broken package BRugs-0.8-6
     "powell"                          # build is broken
@@ -1036,8 +1073,10 @@ let
     "raptr"                           # depends on broken package PBSmapping-2.69.76
     "RbioRXN"                         # depends on broken package ChemmineR-2.24.2
     "Rblpapi"                         # build is broken
+    "RCAS"                            # depends on broken package Rhtslib-1.6.0
     "Rchemcpp"                        # depends on broken package ChemmineR-2.24.2
     "rchess"                          # depends on broken package V8-1.2
+    "RchivalTag"                      # depends on broken package PBSmapping-2.69.76
     "RchyOptimyx"                     # depends on broken package r-flowCore-1.38.2
     "RcmdrPlugin_FuzzyClust"          # build is broken
     "RcmdrPlugin_PcaRobust"           # build is broken
@@ -1050,6 +1089,7 @@ let
     "rcqp"                            # build is broken
     "rcrypt"                          # build is broken
     "RCytoscape"                      # build is broken
+    "rdataretriever"                  # build is broken
     "rDEA"                            # build is broken
     "RDieHarder"                      # build is broken
     "REBayes"                         # depends on broken package Rmosek-1.2.5.1
@@ -1065,8 +1105,10 @@ let
     "Rgnuplot"                        # build is broken
     "rgp"                             # build is broken
     "rgpui"                           # depends on broken package rgp-0.4-1
+    "rgsepd"                          # depends on broken package goseq-1.26.0
     "rhdf5"                           # build is broken
     "RhpcBLASctl"                     # build is broken
+    "Rhtslib"                         # build is broken
     "ridge"                           # build is broken
     "rjade"                           # depends on broken package V8-1.2
     "rJPSGCS"                         # build is broken
@@ -1079,9 +1121,12 @@ let
     "rmapshaper"                      # depends on broken package V8-1.2
     "rMAT"                            # build is broken
     "Rmosek"                          # build is broken
+    "rmumps"                          # build is broken
     "RMySQL"                          # build is broken
+    "rnaturalearth"                   # depends on broken package sf-0.4-1
     "RnavGraph"                       # build is broken
     "rnetcarto"                       # build is broken
+    "ROI_plugin_clp"                  # depends on broken package clpAPI-1.2.7
     "ROI_plugin_cplex"                # depends on broken package Rcplex-0.3-3
     "ROI_plugin_symphony"             # depends on broken package Rsymphony-0.1-26
     "ROracle"                         # build is broken
@@ -1092,6 +1137,7 @@ let
     "Rphylopars"                      # depends on broken package animation-2.4
     "Rpoppler"                        # build is broken
     "RQuantLib"                       # build is broken
+    "Rsampletrees"                    # build is broken
     "RSAP"                            # build is broken
     "rsbml"                           # build is broken
     "RSCABS"                          # build is broken
@@ -1110,6 +1156,7 @@ let
     "s2"                              # build is broken
     "sapFinder"                       # build is broken
     "sbrl"                            # build is broken
+    "SC3"                             # depends on broken package scater-1.2.0
     "scater"                          # depends on broken package r-rhdf5-2.16.0
     "scran"                           # depends on broken package r-rhdf5-2.16.0
     "SDD"                             # depends on broken package rpanel-1.1-3
@@ -1117,6 +1164,7 @@ let
     "seasonalview"                    # build is broken
     "Sejong"                          # build is broken
     "SemiCompRisks"                   # build is broken
+    "semPlot"                         # depends on broken package OpenMx-2.7.10
     "semtree"                         # depends on broken package OpenMx-2.7.4
     "seqbias"                         # build is broken
     "SeqGrapheR"                      # build is broken
@@ -1129,6 +1177,7 @@ let
     "SimInf"                          # build is broken
     "simsalapar"                      # build is broken
     "smapr"                           # depends on broken package r-rhdf5-2.16.0
+    "SMITE"                           # depends on broken package goseq-1.26.0
     "SnakeCharmR"                     # build is broken
     "sodium"                          # build is broken
     "soilphysics"                     # depends on broken package rpanel-1.1-3
@@ -1146,20 +1195,24 @@ let
     "subspaceMOA"                     # depends on broken package animation-2.4
     "svglite"                         # depends on broken package gdtools-0.1.3
     "sybilSBML"                       # build is broken
+    "SymTS"                           # build is broken
     "synthACS"                        # depends on broken package acs-2.0
     "tcpl"                            # depends on broken package RMySQL-0.10.9
     "TDA"                             # build is broken
     "TED"                             # depends on broken package animation-2.4
     "tesseract"                       # build is broken
+    "texPreview"                      # depends on broken package magick-0.4
     "textreadr"                       # build is broken
     "textTinyR"                       # build is broken
     "TFBSTools"                       # depends on broken package CNEr-1.8.3
+    "tilegramsR"                      # depends on broken package sf-0.4-1
     "TKF"                             # depends on broken package animation-2.4
     "tmap"                            # depends on broken package V8-1.2
     "tmaptools"                       # depends on broken package V8-1.2
     "tofsims"                         # build is broken
     "toxboot"                         # depends on broken package RMySQL-0.10.9
     "TransView"                       # build is broken
+    "treatSens"                       # build is broken
     "treeplyr"                        # depends on broken package animation-2.4
     "TSMySQL"                         # depends on broken package RMySQL-0.10.9
     "uaparserjs"                      # depends on broken package V8-1.2
@@ -1168,12 +1221,14 @@ let
     "umx"                             # depends on broken package OpenMx-2.7.4
     "userfriendlyscience"             # depends on broken package OpenMx-2.7.4
     "V8"                              # build is broken
+    "VariantTools"                    # depends on broken package gmapR-1.16.0
     "VBmix"                           # build is broken
     "vcfR"                            # build is broken
     "vdiffr"                          # depends on broken package gdtools-0.1.3
     "vmsbase"                         # depends on broken package PBSmapping-2.69.76
     "wallace"                         # depends on broken package V8-1.2
     "wand"                            # build is broken
+    "WebGestaltR"                     # depends on broken package PythonInR-0.1-3
     "webp"                            # build is broken
     "wordbankr"                       # depends on broken package RMySQL-0.10.9
     "x13binary"                       # build is broken
diff --git a/pkgs/development/r-modules/generate-shell.nix b/pkgs/development/r-modules/generate-shell.nix
index 126ab742292..beb37827508 100644
--- a/pkgs/development/r-modules/generate-shell.nix
+++ b/pkgs/development/r-modules/generate-shell.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
   buildCommand = "exit 1";
 
   buildInputs = [ wget ];
-  nativeBuildInputs = [ 
+
+  nativeBuildInputs = [
     (rWrapper.override {
       packages = with rPackages; [
         data_table

From 125cf352732d8dd119b3ebb5359a82095ba2b5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 24 Apr 2017 16:36:27 +0200
Subject: [PATCH 1456/1744] knot-resolver: maintenance 1.2.5 -> 1.2.6

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

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index c58b66d42f2..f388302f4bf 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "30e24f9681e40c79a0aadbbfd78aaa72534dd3bca3347de89dfeae055b2c99e4";
+    sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c";
   };
 
   outputs = [ "out" "dev" ];

From 9f11d17ed28397e3c53c15d97537510f7f08ed39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 24 Apr 2017 17:04:32 +0200
Subject: [PATCH 1457/1744] add papertrail at 0.10.1

Thank you @grahamc <3
---
 pkgs/tools/text/papertrail/Gemfile      |  4 ++++
 pkgs/tools/text/papertrail/Gemfile.lock | 17 ++++++++++++++++
 pkgs/tools/text/papertrail/default.nix  | 21 ++++++++++++++++++++
 pkgs/tools/text/papertrail/gemset.nix   | 26 +++++++++++++++++++++++++
 pkgs/tools/text/papertrail/shell.nix    | 19 ++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 6 files changed, 89 insertions(+)
 create mode 100755 pkgs/tools/text/papertrail/Gemfile
 create mode 100644 pkgs/tools/text/papertrail/Gemfile.lock
 create mode 100644 pkgs/tools/text/papertrail/default.nix
 create mode 100644 pkgs/tools/text/papertrail/gemset.nix
 create mode 100644 pkgs/tools/text/papertrail/shell.nix

diff --git a/pkgs/tools/text/papertrail/Gemfile b/pkgs/tools/text/papertrail/Gemfile
new file mode 100755
index 00000000000..199cd1422aa
--- /dev/null
+++ b/pkgs/tools/text/papertrail/Gemfile
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "papertrail"
diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock
new file mode 100644
index 00000000000..0d1b2a6fbe6
--- /dev/null
+++ b/pkgs/tools/text/papertrail/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    chronic (0.10.2)
+    papertrail (0.10.1)
+      ansi (~> 1.5)
+      chronic (~> 0.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  papertrail
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix
new file mode 100644
index 00000000000..a02ca1cd3dd
--- /dev/null
+++ b/pkgs/tools/text/papertrail/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, bundlerEnv, ruby}:
+
+let
+  # To update, just run `nix-shell` in this directory.
+  papertrail-env = bundlerEnv rec {
+    name = "papertrail-env";
+    inherit ruby;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+in stdenv.mkDerivation {
+  name = "papertrail-${(import ./gemset.nix).papertrail.version}";
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${papertrail-env}/bin/papertrail $out/bin/papertrail
+  '';
+}
diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix
new file mode 100644
index 00000000000..91bfe319896
--- /dev/null
+++ b/pkgs/tools/text/papertrail/gemset.nix
@@ -0,0 +1,26 @@
+{
+  ansi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  chronic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  papertrail = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vb7bh7qh5hr4v3w711bl0yrr3rlhz5c3h3qx3fq31dr5y4100v7";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/text/papertrail/shell.nix b/pkgs/tools/text/papertrail/shell.nix
new file mode 100644
index 00000000000..55a7a18f57b
--- /dev/null
+++ b/pkgs/tools/text/papertrail/shell.nix
@@ -0,0 +1,19 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.stdenv.mkDerivation {
+  name = "papertrail";
+  src = ./.;
+
+  buildInputs = with pkgs; [
+    bundix
+    bundler
+    ruby
+  ];
+
+  shellHook = ''
+    truncate --size 0 Gemfile.lock
+    bundle install --path=vendor/bundle
+    rm -rf vendor .bundle
+    bundix
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3318f55a4af..4bedef3bb39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3378,6 +3378,8 @@ with pkgs;
   paper-gtk-theme = callPackage ../misc/themes/paper { };
 
   paperwork = callPackage ../applications/office/paperwork { };
+ 
+  papertrail = callPackage ../tools/text/papertrail { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
 

From 10af6b4dbf878ed1b0ac3c6c38a14c6ae67b7aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 24 Apr 2017 17:36:28 +0200
Subject: [PATCH 1458/1744] perl*, statsmodels: fix evaluation problems

The tarball job now builds again.
---
 pkgs/development/python-modules/statsmodels/default.nix | 1 +
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index d77dc6e373a..60e35d2ade4 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -1,4 +1,5 @@
 { lib
+, self
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3318f55a4af..59e8aadd4d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6008,7 +6008,7 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522;
+  inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 

From 7a6738fefcee01e9c8e73d382add43f6713163ec Mon Sep 17 00:00:00 2001
From: Kirill <elephanttalk@protonmail.com>
Date: Mon, 24 Apr 2017 18:50:40 +0300
Subject: [PATCH 1459/1744] Implement aria2 service for controlling a daemon
 via rpc.

---
 nixos/modules/misc/ids.nix                  |   4 +-
 nixos/modules/services/networking/aria2.nix | 137 ++++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/networking/aria2.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index feecee3225b..91d7e92fd50 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -289,7 +289,8 @@
       rpc = 271;
       geoip = 272;
       fcron = 273;
-
+      aria2 = 274;
+	  
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
       nixbld = 30000; # start of range of uids
@@ -547,6 +548,7 @@
       #rpc = 271; # unused
       #geoip = 272; # unused
       fcron = 273;
+	  aria2 = 274;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
new file mode 100644
index 00000000000..d436fc3e00c
--- /dev/null
+++ b/nixos/modules/services/networking/aria2.nix
@@ -0,0 +1,137 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.aria2;
+
+  homeDir = "/var/lib/aria2";
+
+  settingsDir = "${homeDir}";
+  sessionFile = "${homeDir}/aria2.session";
+  downloadDir = "${homeDir}/Downloads";
+  
+  rangesToStringList = map (x: builtins.toString x.from +"-"+ builtins.toString x.to);
+  
+  settingsFile = pkgs.writeText "aria2.conf"
+  ''
+    dir=${cfg.downloadDir}
+    listen-port=${concatStringsSep "," (rangesToStringList cfg.listenPortRange)}
+    rpc-listen-port=${toString cfg.rpcListenPort}
+    rpc-secret=${cfg.rpcSecret}
+  '';
+
+in
+{
+  options = {
+    services.aria2 = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable the headless Aria2 daemon service.
+
+          Aria2 daemon can be controlled via the RPC interface using
+          one of many WebUI (http://localhost:6800/ by default).
+
+          Targets are downloaded to ${downloadDir} by default and are
+          accessible to users in the "aria2" group.
+          '';
+      };
+      openPorts = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Open the ports in the firewall. Defaults are:
+          - UDP 6881-6999 for transfers
+          - TCP 6800 for RPC
+          '';
+      };
+      downloadDir = mkOption {
+        type = types.string;
+        default = "${downloadDir}";
+        description = ''
+          Directory to store downloaded files.
+          '';
+      };
+      listenPortRange = mkOption {
+        type = types.listOf types.attrs;
+        default = [ { from = 6881; to = 6999; } ];
+        description = ''
+          Set UDP listening port range used by DHT(IPv4, IPv6) and UDP tracker.
+          '';
+      };
+      rpcListenPort = mkOption {
+        type = types.int;
+        default = 6800;
+        description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535";
+      };
+      rpcSecret = mkOption {
+        type = types.string;
+        default = "aria2rpc";
+        description = ''
+          Set RPC secret authorization token.
+          Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used.
+          '';
+      };
+      extraArguments = mkOption {
+        type = types.string;
+        example = "--rpc-secret=12345 --enable-rpc --rpc-listen-all";
+        default = "";
+        description = ''
+          Additional arguments to be passed to Aria2.
+          '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    
+    # Need to open ports for proper functioning
+    networking.firewall = mkIf cfg.openPorts {
+      allowedUDPPortRanges = config.services.aria2.listenPortRange;
+      allowedTCPPorts = [ config.services.aria2.rpcListenPort ];
+    };
+
+    users.extraUsers.aria2 = {
+      group = "aria2";
+      uid = config.ids.uids.aria2;
+      description = "aria2 user";
+      home = homeDir;
+      createHome = false;
+    };
+
+    users.extraGroups.aria2.gid = config.ids.gids.aria2;
+
+    systemd.services.aria2 = {
+      description = "aria2 Service";
+      after = [ "local-fs.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -m 0770 -p "${homeDir}"
+				chown aria2:aria2 "${homeDir}"
+        if [[ ! -d "${config.services.aria2.downloadDir}" ]]
+				then 
+					mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
+					chown aria2:aria2 "${config.services.aria2.downloadDir}"
+				fi
+        if [[ ! -e "${sessionFile}" ]]
+				then 
+					touch "${sessionFile}"
+					chown aria2:aria2 "${sessionFile}"
+				fi
+        cp -f "${settingsFile}" "${settingsDir}/aria2.conf"
+      '';
+
+      serviceConfig = {
+        Restart = "on-abort";
+        ExecStart = "${pkgs.aria2}/bin/aria2c --enable-rpc --conf-path=${settingsDir}/aria2.conf ${config.services.aria2.extraArguments} --save-session=${sessionFile}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        User = "aria2";
+        Group = "aria2";
+				PermissionsStartOnly = true;
+      };
+    };
+  };
+}
+

From 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Sat, 15 Apr 2017 21:50:13 -0500
Subject: [PATCH 1460/1744] wrapGAppsHook: Correct `wrapProgram` invocations

This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.

Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files.  In addition, it failed to wrap files in subdirectories.

Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 3cad1838d26..5d1cce6ee04 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -36,9 +36,10 @@ wrapGAppsHook() {
   done
 
   if [ -z "$dontWrapGApps" ]; then
-    for i in $prefix/bin/* $prefix/libexec/*; do
-      echo "Wrapping app $i"
-      wrapProgram "$i" "${gappsWrapperArgs[@]}"
+    find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \
+    | while IFS= read -r -d '' file; do
+      echo "Wrapping program $file"
+      wrapProgram "$file" "${gappsWrapperArgs[@]}"
     done
   fi
 }

From 9f0de9522fd228f437e053fd360b57dd79f6da05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 24 Apr 2017 18:01:12 +0200
Subject: [PATCH 1461/1744] net-snmp: fix build by using older perl for now

The single patch from upstream doesn't fix build by itself.
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59e8aadd4d7..87748d57078 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10948,7 +10948,11 @@ with pkgs;
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 
-  net_snmp = callPackage ../servers/monitoring/net-snmp { };
+  net_snmp = callPackage ../servers/monitoring/net-snmp {
+    # https://sourceforge.net/p/net-snmp/bugs/2712/
+    # remove after net-snmp > 5.7.3
+    perl = perl522;
+  };
 
   newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
 

From 10d329a6d2edef8428d06b48cd299a8eb9bca624 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 21 Apr 2017 16:45:54 +0200
Subject: [PATCH 1462/1744] kdeApplications: 16.12.3 -> 17.04.0

---
 pkgs/applications/kde/ark/default.nix |    4 +-
 pkgs/applications/kde/fetch.sh        |    2 +-
 pkgs/applications/kde/kcachegrind.nix |    9 +-
 pkgs/applications/kde/marble.nix      |   13 +-
 pkgs/applications/kde/srcs.nix        | 2332 +++++++++++++------------
 5 files changed, 1186 insertions(+), 1174 deletions(-)

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index e1e25b2acf2..52cb403f202 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -4,7 +4,7 @@
   extra-cmake-modules, kdoctools, makeWrapper,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
-  kservice, kpty, kwidgetsaddons, libarchive,
+  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -22,7 +22,7 @@ let
       ];
       propagatedBuildInputs = [
         khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-        kpty kwidgetsaddons libarchive
+        kpty kwidgetsaddons libarchive kitemmodels
       ];
       postInstall =
         let
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c31b8a86583..7cd707092ba 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index 2f270d24224..d43de1fdc36 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,8 @@
 {
   kdeApp, lib, kdeWrapper,
-  cmake, automoc4,
-  kdelibs, perl, python, php
+  extra-cmake-modules, kdoctools,
+  kio, ki18n,
+  perl, python, php
 }:
 
 kdeWrapper {
@@ -11,8 +12,8 @@ kdeWrapper {
       license = with lib.licenses; [ gpl2 ];
       maintainers = with lib.maintainers; [ orivej ];
     };
-    nativeBuildInputs = [ cmake automoc4 ];
-    buildInputs = [ kdelibs perl python php ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+    buildInputs = [ perl python php kio ki18n ];
     enableParallelBuilding = true;
   };
 
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index c151396f247..5322c66b01d 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,6 +1,8 @@
 { kdeApp, lib, kdeWrapper
-, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
-, gpsd
+, extra-cmake-modules, kdoctools
+, qtscript, qtsvg, qtquickcontrols, qtwebkit
+, krunner, shared_mime_info, kparts, knewstuff
+, gpsd, perl
 }:
 
 let
@@ -9,9 +11,10 @@ let
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
-      nativeBuildInputs = [ extra-cmake-modules ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
       propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols
+        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
+        krunner kparts knewstuff
         gpsd
       ];
 
@@ -20,6 +23,6 @@ let
 in
 kdeWrapper {
   inherit unwrapped;
-  targets = [ "bin/marble-qt" ];
+  targets = [ "bin/marble-qt" "bin/marble" ];
   paths = [ unwrapped ];
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 445c5783b8e..95aef32cc37 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2227 +3,2235 @@
 
 {
   akonadi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-16.12.3.tar.xz";
-      sha256 = "00sbchj3yjbqdjckrciv2c7j9i7kc5yqvyvbmjlxacbkq80a4j7w";
-      name = "akonadi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-17.04.0.tar.xz";
+      sha256 = "1m0176q7g1vw2iy567xiadrpg87p58njinh7bab2pqv7zya7cbwn";
+      name = "akonadi-17.04.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-16.12.3.tar.xz";
-      sha256 = "0kv636a8x75fcagw8hjnrwnxzvqnnm42hfw68ywfics0pn0pl50g";
-      name = "akonadi-calendar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-17.04.0.tar.xz";
+      sha256 = "08ajx9iq49y1ca9gxxcczxyqhjvkq4pnhm5s6yyblgmb9cpwivh9";
+      name = "akonadi-calendar-17.04.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-tools-16.12.3.tar.xz";
-      sha256 = "157kmcl77pj32ysbwr1xw365p5pgk69w5j8397axly6dmdl71x47";
-      name = "akonadi-calendar-tools-16.12.3.tar.xz";
-    };
-  };
-  akonadiconsole = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadiconsole-16.12.3.tar.xz";
-      sha256 = "195amn610y5ydg665ag45xb0l1wyplbdlrwagzc7yvswp12rlcv3";
-      name = "akonadiconsole-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-tools-17.04.0.tar.xz";
+      sha256 = "0s34m96i4y51fdb23v12mav7q2livq77xrpx0h2ghma0nljdhy1m";
+      name = "akonadi-calendar-tools-17.04.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-contacts-16.12.3.tar.xz";
-      sha256 = "1205g4z5rz02j8swrmhncm06d8m727z63d526djygz5svz15sd2l";
-      name = "akonadi-contacts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-contacts-17.04.0.tar.xz";
+      sha256 = "01fw0qmnbsbcpy7wx14sg0kwbws4n2d63mbslb3c4hqgq6ahgz37";
+      name = "akonadi-contacts-17.04.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-import-wizard-16.12.3.tar.xz";
-      sha256 = "0dnpiqcmphm2x76f21acrwhg7ah5ih0hnhxdy1d6pm3ng2p1irfq";
-      name = "akonadi-import-wizard-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-import-wizard-17.04.0.tar.xz";
+      sha256 = "0a9k78w55wg9p22x7qwbpz7lzyijz1z3k12fv1c1g0vn1nbwcadv";
+      name = "akonadi-import-wizard-17.04.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-mime-16.12.3.tar.xz";
-      sha256 = "1xay3rlygdhf9lp356wjb92wnmxdpaxgm3prxnfxcdg5ql6xcg07";
-      name = "akonadi-mime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-mime-17.04.0.tar.xz";
+      sha256 = "1aidmb1bsx5xvppypzs2gg81jifcvc3jv2827hjkqvd021z831nv";
+      name = "akonadi-mime-17.04.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-notes-16.12.3.tar.xz";
-      sha256 = "0405nkz9ri9qlclgvwycvdx1gsms2pm1fn6xhvyrj2v4s8brb3r7";
-      name = "akonadi-notes-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-notes-17.04.0.tar.xz";
+      sha256 = "0jfcw9lh1rhydw1c14z065lv3h9xl1q3i66slmfmmamy99czczjr";
+      name = "akonadi-notes-17.04.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-search-16.12.3.tar.xz";
-      sha256 = "0wf22rmfz471iw6zxl7yz279fkks2pj5jfw4bs5185kr3xw2q7zp";
-      name = "akonadi-search-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-search-17.04.0.tar.xz";
+      sha256 = "1mgq0n5z8ar1zajwsrrs1failrrrkkv6g0pcs7grq2prfsv4z1p3";
+      name = "akonadi-search-17.04.0.tar.xz";
+    };
+  };
+  akonadiconsole = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/akonadiconsole-17.04.0.tar.xz";
+      sha256 = "01adzv1z92zyfi22psa6m30c290w37n0m01hd9wgjj8in4hzmk3d";
+      name = "akonadiconsole-17.04.0.tar.xz";
     };
   };
   akregator = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akregator-16.12.3.tar.xz";
-      sha256 = "1v6jg35ha6wrjgwfvrvy1qwl1700dmk40d0fwy1irkpdlgg79128";
-      name = "akregator-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akregator-17.04.0.tar.xz";
+      sha256 = "1dpvyx13lyl1pmphqr8mc9cxywkjcqy6aqmh7hdsi0vggafkiim5";
+      name = "akregator-17.04.0.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/analitza-16.12.3.tar.xz";
-      sha256 = "0ap3sf8bw9f58pzw3zy6w60apd4ccc47zs3v61x4kp1g81rn265w";
-      name = "analitza-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/analitza-17.04.0.tar.xz";
+      sha256 = "1mx2y0cqsj2v8pwcwpqsg5brakaw6g14acqxrx7xmpfzzi0y8mxg";
+      name = "analitza-17.04.0.tar.xz";
     };
   };
   ark = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ark-16.12.3.tar.xz";
-      sha256 = "0q1bxrsb03pwsvxqlbnzfmahlj300l336pdrm82vin89m294ird0";
-      name = "ark-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ark-17.04.0.tar.xz";
+      sha256 = "0qk829f10pjpvn3qpfbr16y6qkrgkbi510d1bqbsjnpnfz821hwk";
+      name = "ark-17.04.0.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/artikulate-16.12.3.tar.xz";
-      sha256 = "113k6c0yrir61j258gn9n6k7fifa6g9g8wxf3zq18jy3liwdl97s";
-      name = "artikulate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/artikulate-17.04.0.tar.xz";
+      sha256 = "1y6w1b17ndrplkkakskdzqws6apfa801gpqfh7lnq2r0vj48kz7m";
+      name = "artikulate-17.04.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/audiocd-kio-16.12.3.tar.xz";
-      sha256 = "0bmmi2rxx368nss8ciwj32dspc1ailc0shm06ynmhw3slrplnx1y";
-      name = "audiocd-kio-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/audiocd-kio-17.04.0.tar.xz";
+      sha256 = "1fqdgvl2rgln6zr73pgznp7bn3lhbaw03q5hd3ndh14yvlin64xw";
+      name = "audiocd-kio-17.04.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/baloo-widgets-16.12.3.tar.xz";
-      sha256 = "0h75zhdiylyjifdk9ikw9gpwla3p87knndc2svkci90ga7ynggvl";
-      name = "baloo-widgets-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/baloo-widgets-17.04.0.tar.xz";
+      sha256 = "0nkk2xj35cqg2w7795ys2lpynkcmwf4fnq53sb20vn95scnn88mw";
+      name = "baloo-widgets-17.04.0.tar.xz";
     };
   };
   blinken = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/blinken-16.12.3.tar.xz";
-      sha256 = "1z50ack1iqh194vn487nhdkrbn1camswy4a3g2ayxv3qfgmxdcga";
-      name = "blinken-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/blinken-17.04.0.tar.xz";
+      sha256 = "0mimvcy6jdx5xr46li4jc00c9yy4626p2jlzimnl1sv2fcs1f72h";
+      name = "blinken-17.04.0.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/blogilo-16.12.3.tar.xz";
-      sha256 = "14yl52m8x7b8bj2b7pkhabwg7rrmmhnkjq4z7mrxbnsndqmsi10f";
-      name = "blogilo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/blogilo-17.04.0.tar.xz";
+      sha256 = "0v9vv1jfis5bvbf9yflqkqilbpx0kp4zbwnazzcgc3hi9bgm2fdb";
+      name = "blogilo-17.04.0.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/bomber-16.12.3.tar.xz";
-      sha256 = "1h4s6amjzazr3ywcqw8d14a0fi1arzxka0g6i9ii85s904k23r41";
-      name = "bomber-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/bomber-17.04.0.tar.xz";
+      sha256 = "0kv3z2kz85mxbi99rdkz4i9xyv9xgkhayk4pq0qsy7g6lk31sv9h";
+      name = "bomber-17.04.0.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/bovo-16.12.3.tar.xz";
-      sha256 = "1pr67gf47xmw21sv1im7k0dz18bhjfpbkhd7j5gaifj66h65sfy6";
-      name = "bovo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/bovo-17.04.0.tar.xz";
+      sha256 = "0j5nf701zj1wafy08mhv094dqqyzy9y9waz0wappvxn8maqj0dk2";
+      name = "bovo-17.04.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/calendarsupport-16.12.3.tar.xz";
-      sha256 = "0r30z2wzyms7m7s8y0livsfy5pj82g988bs6amaj2571hz55d8y0";
-      name = "calendarsupport-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/calendarsupport-17.04.0.tar.xz";
+      sha256 = "1r7cai24ac857an7sgmgyyjy6m2vrjy80ba3qxszys9v3mya60ya";
+      name = "calendarsupport-17.04.0.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/cantor-16.12.3.tar.xz";
-      sha256 = "1nzg9sfnv8afpa84x51whbw1qh8gfwqnkr5zyai7817kkc97g1l8";
-      name = "cantor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/cantor-17.04.0.tar.xz";
+      sha256 = "0vy7ygiimlrqnv4nq2393hriaryr5si478kijf6q0dvqg1px59xy";
+      name = "cantor-17.04.0.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/cervisia-16.12.3.tar.xz";
-      sha256 = "14r55ngvz4rci1h3iqdwbfcyxmm2b04c5smkv9x0bqxq4zz2yfvk";
-      name = "cervisia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/cervisia-17.04.0.tar.xz";
+      sha256 = "1z9svqp42slh7fwczjv847scyjdbz9a5pzzkrfvqggi2wc85vzin";
+      name = "cervisia-17.04.0.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dolphin-16.12.3.tar.xz";
-      sha256 = "0y35ljbjib4pvyngdgbq1yx3rfmy94crpa7v1zzwfav94lm3kwb2";
-      name = "dolphin-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dolphin-17.04.0.tar.xz";
+      sha256 = "09r2pqzjq7g7322m2vb1s1909bzckh0h9fwzsxvrmyz1cfdd765y";
+      name = "dolphin-17.04.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dolphin-plugins-16.12.3.tar.xz";
-      sha256 = "18azlmzw33praz4z6lamamj79gyxbbdgz7lp1cimxyddhmacc2x9";
-      name = "dolphin-plugins-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dolphin-plugins-17.04.0.tar.xz";
+      sha256 = "0mj0p1lbdvfn46i5bry394rqpriv0w1389dw526xz6cplrzydi2q";
+      name = "dolphin-plugins-17.04.0.tar.xz";
     };
   };
   dragon = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dragon-16.12.3.tar.xz";
-      sha256 = "1652cl6sa9d71c685xpwqv5hgz3spxg2hynwcnn8xybn5hv9ar4r";
-      name = "dragon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dragon-17.04.0.tar.xz";
+      sha256 = "08mlsj4ib0s219vnrmy7g6iap8zaaha12vhqrc5950248k0rz181";
+      name = "dragon-17.04.0.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/eventviews-16.12.3.tar.xz";
-      sha256 = "0z8jznvw2nhszrlll7458gb4r0585ivkbq9dqplkw2mdrv7vxz5c";
-      name = "eventviews-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/eventviews-17.04.0.tar.xz";
+      sha256 = "1gylv5p9v96g4krcnd9xqg0nfvxzhxyc4ywy0wbqfn5zwngzpz80";
+      name = "eventviews-17.04.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ffmpegthumbs-16.12.3.tar.xz";
-      sha256 = "1scyyd85rs21rv3ghcxv7pw3aa2nl703gi4dpikbsd7wjmxixzq9";
-      name = "ffmpegthumbs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ffmpegthumbs-17.04.0.tar.xz";
+      sha256 = "0jrq940x50n9g613db254sflwpw4pa70r79hkvkf3ri11s80hmgm";
+      name = "ffmpegthumbs-17.04.0.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/filelight-16.12.3.tar.xz";
-      sha256 = "13gcx1w9zq3i9fy32m3ypjyqcd9vrkqyr0j4cbqfvhpzv2chk3is";
-      name = "filelight-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/filelight-17.04.0.tar.xz";
+      sha256 = "18dz82kdgazwv00kvbfm5ln13g28s5sqyp9cfm0c7vrdnq8spng8";
+      name = "filelight-17.04.0.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/granatier-16.12.3.tar.xz";
-      sha256 = "17vpz6jz2vvpvsrhvllglacrwg0sxy15aqnm8n6d73sk9zlv9n76";
-      name = "granatier-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/granatier-17.04.0.tar.xz";
+      sha256 = "08jlpnriq6kvsnfgjar0w3ci6mla1m4bd3qzsxbv5f0hbqj78rm8";
+      name = "granatier-17.04.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/grantlee-editor-16.12.3.tar.xz";
-      sha256 = "007q6cb5f3vzw6dwm2y2b5m3dhb5mws5b6083ssm8rydycyi9pzi";
-      name = "grantlee-editor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/grantlee-editor-17.04.0.tar.xz";
+      sha256 = "1famfm6r32m8i0mp7aiqki8k4rhl6p5dvp3905lbdm355rv2b60b";
+      name = "grantlee-editor-17.04.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/grantleetheme-16.12.3.tar.xz";
-      sha256 = "19mka62p75qnv6r9ib70y25jjj3bpziz0xqihfkb6jvafrgy8p8k";
-      name = "grantleetheme-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/grantleetheme-17.04.0.tar.xz";
+      sha256 = "1dikbf90l55d62zxmw8rw85bkpcgrdf455k33b91ldnhfb3vw3i4";
+      name = "grantleetheme-17.04.0.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/gwenview-16.12.3.tar.xz";
-      sha256 = "069fblw9g9h6r9gy05nj2n93jpnsx610jncwl6403q01rwlbrgbr";
-      name = "gwenview-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/gwenview-17.04.0.tar.xz";
+      sha256 = "0n4m1zd43g68qgpdvifj5h3ry39262qmm553w3f7yd6i2gpvy2a1";
+      name = "gwenview-17.04.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/incidenceeditor-16.12.3.tar.xz";
-      sha256 = "11jplw3fngnyvpjkhqwv1gzzwxxcm4v93h09f68hs015apncjvpp";
-      name = "incidenceeditor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/incidenceeditor-17.04.0.tar.xz";
+      sha256 = "10yi8hqf5p5nbi9rq8kzkqmbjq0c41a9mz8rjhbz1pac686b87c7";
+      name = "incidenceeditor-17.04.0.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/jovie-16.12.3.tar.xz";
-      sha256 = "190c4g587x4wxbfksf0mszq5qv1pzny6bkd3w2pwwsj222bl0fxa";
-      name = "jovie-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/jovie-17.04.0.tar.xz";
+      sha256 = "1n3d03h9mzfyrga9c78mlk5vd53xqqpz9cjj27sw35fhc9l6h5fp";
+      name = "jovie-17.04.0.tar.xz";
     };
   };
   juk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/juk-16.12.3.tar.xz";
-      sha256 = "1ssgia5sknam2hnjflzglv0khxbwyyvzm4w1wmxw04rbjzs4gi4h";
-      name = "juk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/juk-17.04.0.tar.xz";
+      sha256 = "0il7i8lbij9axm7wfgpnzmax3kz8qbdsiizmkwivvaxizvsvc1yz";
+      name = "juk-17.04.0.tar.xz";
+    };
+  };
+  k3b = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/k3b-17.04.0.tar.xz";
+      sha256 = "0wsa8s5ndcbskgd505l0nkp9ghj7dsrxwnlkq0rhqjwvfsa7law3";
+      name = "k3b-17.04.0.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccessible-16.12.3.tar.xz";
-      sha256 = "162a4pw61b3rhq5mf7zdhgyyhbrxhr9fjw7bidicw7aljiy2cwb9";
-      name = "kaccessible-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccessible-17.04.0.tar.xz";
+      sha256 = "0gkcvm0kz8kwkla3mclryisi4j0cdd6byaq8wvpnfhl68kwb8a33";
+      name = "kaccessible-17.04.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-integration-16.12.3.tar.xz";
-      sha256 = "0w8h33sysf590xyg4bvf2a2z39kzc0wn6mxv31mrf68b6ks7b9h2";
-      name = "kaccounts-integration-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-integration-17.04.0.tar.xz";
+      sha256 = "0ml1jq4dd3n2ksmw7i5vrsv4lhibdk1d2mvy3yn45w1g8gpqwl8l";
+      name = "kaccounts-integration-17.04.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-providers-16.12.3.tar.xz";
-      sha256 = "0iqqwfjadsf7nhrqvpzypazipris4ljhf6daprxwxqa2bfigr5j2";
-      name = "kaccounts-providers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-providers-17.04.0.tar.xz";
+      sha256 = "1i19q1rmjwmkd5r23w3zjyk0gf4xrw7j4f0s8q591rgqzy2lhkc3";
+      name = "kaccounts-providers-17.04.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaddressbook-16.12.3.tar.xz";
-      sha256 = "1a86asy0pw8ivyg7aaw2mais4xbplabp5aljzcyb2rykij6482rh";
-      name = "kaddressbook-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaddressbook-17.04.0.tar.xz";
+      sha256 = "1qglxn2inibqiljazsd2mc49sk8pv3jkvjn9icxhgfdjg234fl4z";
+      name = "kaddressbook-17.04.0.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kajongg-16.12.3.tar.xz";
-      sha256 = "0xwwkl2npls0aq4435xlcvssm8pmfhramjgxv70mnjapr0dlpk5c";
-      name = "kajongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kajongg-17.04.0.tar.xz";
+      sha256 = "1bzfafrslsihbldzdnl1a48wx65yrc9phxjnaiws82ig5369r3xn";
+      name = "kajongg-17.04.0.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalarm-16.12.3.tar.xz";
-      sha256 = "1n3h252cvqib1bx4ryq3xgj2mkqr38wvhiyj2vkkll4pf5lphpqz";
-      name = "kalarm-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalarm-17.04.0.tar.xz";
+      sha256 = "1zqblg5wflw0y3fdqihifh25xzm2y0ih9b0i3909wkw0j7p1z4g7";
+      name = "kalarm-17.04.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalarmcal-16.12.3.tar.xz";
-      sha256 = "064sihcsbdi1w6viv5gq6sw2m8r7x3nn1hl2aji1109pf5913vbr";
-      name = "kalarmcal-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalarmcal-17.04.0.tar.xz";
+      sha256 = "136vw2sak3z571lv9m2lmnxpgkwhy663q81j6z2gq8vday72ar44";
+      name = "kalarmcal-17.04.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalgebra-16.12.3.tar.xz";
-      sha256 = "0qhini5gm41dlyham4zzqgz6r11s2rfwwphb81xvwp1bgn8q2rqb";
-      name = "kalgebra-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalgebra-17.04.0.tar.xz";
+      sha256 = "05gkw20g7qc72lsgbhqqmxvmgkgs5bdsyw71kp1dz4h6q7gvck04";
+      name = "kalgebra-17.04.0.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalzium-16.12.3.tar.xz";
-      sha256 = "0rlfjqfb1vpr0cdcx429nvrbkr7kc1m4ps3z3pphkajq4vlrql8i";
-      name = "kalzium-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalzium-17.04.0.tar.xz";
+      sha256 = "17bpn0yqkdrsqrx08zvhxwbjh8f0wdngq375cvv2mgmkjikq375k";
+      name = "kalzium-17.04.0.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kamera-16.12.3.tar.xz";
-      sha256 = "04p19qv5ssf5wlpfqzhqsi8281pzcdjkd0jy177f9r7qgqq4lkgr";
-      name = "kamera-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kamera-17.04.0.tar.xz";
+      sha256 = "178886fbkj3fz25xddgpprmxmn0iv7ndnxygsxq434c9pv3zdxb9";
+      name = "kamera-17.04.0.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kanagram-16.12.3.tar.xz";
-      sha256 = "183hkxxwf7h335gmfvi2lppsyhpv80lvlg1fg4whq79f1d2lrw47";
-      name = "kanagram-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kanagram-17.04.0.tar.xz";
+      sha256 = "0r4k5jsc8vnj2pgpca0iyr0lrz2q683db8nsk6axgv72hkp3v07i";
+      name = "kanagram-17.04.0.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kapman-16.12.3.tar.xz";
-      sha256 = "1if3dzn1qy2pr42zcmzpq7f38spkxh492gl12vndckzah67cmz4g";
-      name = "kapman-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kapman-17.04.0.tar.xz";
+      sha256 = "18mr5i0qvix4vnmy7m721jipafwlh19paczay0ci7qpj1538vrlq";
+      name = "kapman-17.04.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kapptemplate-16.12.3.tar.xz";
-      sha256 = "036npdxyh9rx0aaiwvdjqrb39f8bqglqbl3iddb1vh7w9p1h158n";
-      name = "kapptemplate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kapptemplate-17.04.0.tar.xz";
+      sha256 = "1wf29198h6964p2bcb6p5harrsjpbdqsh8r82rn6wh755f033038";
+      name = "kapptemplate-17.04.0.tar.xz";
     };
   };
   kate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kate-16.12.3.tar.xz";
-      sha256 = "1fbrdlf64bdj71g692fkk7fiym0nm9vvbki2q105carrhl4w9s0r";
-      name = "kate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kate-17.04.0.tar.xz";
+      sha256 = "0hk03bpbxyb7jrhbjihqymsih9c3wh8xllz3f4y7qfpcl8v1k3bc";
+      name = "kate-17.04.0.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/katomic-16.12.3.tar.xz";
-      sha256 = "14dnfjww1fzgz3nbg45ck5yqbxdyvp0la9qs4n5cjy1ym52k5pjm";
-      name = "katomic-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/katomic-17.04.0.tar.xz";
+      sha256 = "0m1dymjsa0b11yqcjska84x779xb8q14igshb4cnrr3rlyr71p5f";
+      name = "katomic-17.04.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblackbox-16.12.3.tar.xz";
-      sha256 = "0i359pq65swrzsb7vdk0m00vjrj2xgvbgxin8ly2cijqlmfd3iv8";
-      name = "kblackbox-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblackbox-17.04.0.tar.xz";
+      sha256 = "1dsc5pbh3g05skw25x6fyg55cykkyjaw6abhnl947z16gbixnqrg";
+      name = "kblackbox-17.04.0.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblocks-16.12.3.tar.xz";
-      sha256 = "09kdbwya4xl84vzayhz286lmfb6a0mmp9i40hzldfl59as4d67kw";
-      name = "kblocks-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblocks-17.04.0.tar.xz";
+      sha256 = "1cn4qdk0jgw78v9ymsr353rk8h8p3mcd5r57pjnw3wmjpswc0plg";
+      name = "kblocks-17.04.0.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblog-16.12.3.tar.xz";
-      sha256 = "0q1qswg7dgy0jvk9kaz6cps6sfddsmv0lp5r3nhk751l497bbl3x";
-      name = "kblog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblog-17.04.0.tar.xz";
+      sha256 = "076225i38iqr4ml1g54nhd8mkjia8k0j7rc8ixv812ksq7xza69b";
+      name = "kblog-17.04.0.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbounce-16.12.3.tar.xz";
-      sha256 = "0cwvsbw0a60a2csxqvpkm3znbcd1whsl80v63ljyc3gyik7wxil0";
-      name = "kbounce-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbounce-17.04.0.tar.xz";
+      sha256 = "0jjmpmhqsjksvgxl92bh7xmh2wf1cz52fdk5vfa90mw08xi07d4n";
+      name = "kbounce-17.04.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbreakout-16.12.3.tar.xz";
-      sha256 = "0zszxxw7r7ggxhc47pngsi7bl57mnhbzkb0bhvy5rcyamgi90v39";
-      name = "kbreakout-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbreakout-17.04.0.tar.xz";
+      sha256 = "0n206mxxbgkynw74sry7jfvyvspyc34vzs3xilny8xiks2g4zbjm";
+      name = "kbreakout-17.04.0.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbruch-16.12.3.tar.xz";
-      sha256 = "12zmp9ix8q9mf3a4xpbsr0y9h4g1srwx48604x1phdwwdhgx0gsj";
-      name = "kbruch-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbruch-17.04.0.tar.xz";
+      sha256 = "0i9pmir83js31kzwqdw9ka93lpgnb6gbrsi96djjqv7pj93gql32";
+      name = "kbruch-17.04.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcachegrind-16.12.3.tar.xz";
-      sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
-      name = "kcachegrind-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcachegrind-17.04.0.tar.xz";
+      sha256 = "130m50lnkcqpr3c4icznlysnj9xnzy5viv95756fxnass44vi349";
+      name = "kcachegrind-17.04.0.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalc-16.12.3.tar.xz";
-      sha256 = "06kfz1d5i01h31v277y04pqnx08yv0050rlb6phv72cx6div4mgp";
-      name = "kcalc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalc-17.04.0.tar.xz";
+      sha256 = "01cmcn20hbnaph2217wam0qf42mfvwqb9s3h467qk0y3pgq7syb4";
+      name = "kcalc-17.04.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalcore-16.12.3.tar.xz";
-      sha256 = "09i43vs6jpjmmk52df6pzclh0jn8shn3wfnaivw2wlirwa60d901";
-      name = "kcalcore-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalcore-17.04.0.tar.xz";
+      sha256 = "0xmsh0fkmz0qrj4ali1d7n6jbxj0cl8s640fjvwd1sic5ib7pcj0";
+      name = "kcalcore-17.04.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalutils-16.12.3.tar.xz";
-      sha256 = "0449029fa1w496fmb81csb5amk801n11ish450drqw34lp9qla4n";
-      name = "kcalutils-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalutils-17.04.0.tar.xz";
+      sha256 = "0if4c989a846aqcn7mc0blkxwrl3zk3w2jrrigdyaafrpb6k6jch";
+      name = "kcalutils-17.04.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcharselect-16.12.3.tar.xz";
-      sha256 = "1iwqqds9fy970ykgq1xbpbrzpdacy1h4bw87h1jingi42z1jkw2n";
-      name = "kcharselect-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcharselect-17.04.0.tar.xz";
+      sha256 = "1fi6malyh357xwi8i456b6iksbx208mhsnhhl6bgwrvqpkd1h3h3";
+      name = "kcharselect-17.04.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcolorchooser-16.12.3.tar.xz";
-      sha256 = "13nkvxl3z2l3m6zs057ipxgqfgsw7gma1rs66maqhzl30k3hrcyb";
-      name = "kcolorchooser-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcolorchooser-17.04.0.tar.xz";
+      sha256 = "1jc43ric98kwknalhh7nlh1zm28g12ygvaiv3jmrqw97rra86wa0";
+      name = "kcolorchooser-17.04.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcontacts-16.12.3.tar.xz";
-      sha256 = "1479g32c9532pjgmfpy38vycii1sxk1nzv27z7wbgpxch6735szx";
-      name = "kcontacts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcontacts-17.04.0.tar.xz";
+      sha256 = "165adk2a8vyqyszp3llwm24n5ngs5l4bhhym022zynq7fh8w1grh";
+      name = "kcontacts-17.04.0.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcron-16.12.3.tar.xz";
-      sha256 = "0whxc9h7qn0fwcca9sq6qy0j4hfb8xlkdypnb6gspl687ws799xz";
-      name = "kcron-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcron-17.04.0.tar.xz";
+      sha256 = "0v6w543ns1gyr2c0lxajdd969f669si93hadahx6d3vnqk8nqa70";
+      name = "kcron-17.04.0.tar.xz";
     };
   };
-  kdebugsettings = {
-    version = "16.12.3";
+  kdav = {
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdebugsettings-16.12.3.tar.xz";
-      sha256 = "0mkhklv4dynz23w8w9yh5qspdlfp3hi6fyiijyfwj358rqgbf3p5";
-      name = "kdebugsettings-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdav-17.04.0.tar.xz";
+      sha256 = "03nibqip9ryrb56hix5aq1lihp9w06c1hdzg505wjcnvwr7rd02c";
+      name = "kdav-17.04.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-scripts-16.12.3.tar.xz";
-      sha256 = "0kiddn0wg90p98zgnpq3x2hcfw8xczn98nyd21zbkzz357v14pya";
-      name = "kde-dev-scripts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-scripts-17.04.0.tar.xz";
+      sha256 = "1s6k746hzsycwk7jb2i5blhfvg84flfgc79j1aa8kzpx4l31v3qz";
+      name = "kde-dev-scripts-17.04.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-utils-16.12.3.tar.xz";
-      sha256 = "0svbl7yd5vz285gaymxy5mz0ll6fviamrbd6fjhj7rc4qx1gjgin";
-      name = "kde-dev-utils-16.12.3.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdeedu-data-16.12.3.tar.xz";
-      sha256 = "0vqzamp5fc2d0i9qn6986f3a1s1fdbrlzrsnimpdfcas5xngbv5m";
-      name = "kdeedu-data-16.12.3.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-mobipocket-16.12.3.tar.xz";
-      sha256 = "06zqny8idaw7s85h7iprbwdp7y1qspfp7yh5klwav12p72nn54w2";
-      name = "kdegraphics-mobipocket-16.12.3.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-thumbnailers-16.12.3.tar.xz";
-      sha256 = "01q2czzqq240cbp9yg7mji2q15kmiwn1aqs6iii00i56yy2mwaxq";
-      name = "kdegraphics-thumbnailers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-utils-17.04.0.tar.xz";
+      sha256 = "03dqxaqj36bgwnn2r3dcwgqfxrqf7i5lwqr1sp6rq2799dv135j2";
+      name = "kde-dev-utils-17.04.0.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ar-16.12.3.tar.xz";
-      sha256 = "1a6in9zq0a4a1v7mijm7gdrprkb5djp4qzyrbrwwlyzpk0sjs153";
-      name = "kde-l10n-ar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ar-17.04.0.tar.xz";
+      sha256 = "1yj46m2appxwjvabsb0c1inmfkfviwqg1dfh7kcyqbg3nb11kdj6";
+      name = "kde-l10n-ar-17.04.0.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ast-16.12.3.tar.xz";
-      sha256 = "05di4xbm8viam0lz6gsyl8zip01dan5bb3h1ib7n7ri4rd49gb13";
-      name = "kde-l10n-ast-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ast-17.04.0.tar.xz";
+      sha256 = "1pxbdd464ifvxcpk5nwfnqakggaq8648cpdksp9p68ybca33iwg0";
+      name = "kde-l10n-ast-17.04.0.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bg-16.12.3.tar.xz";
-      sha256 = "1clqz50ri2zpsaqvlwq01jc44d2w4abpwaqd37jcvcpjg836kj32";
-      name = "kde-l10n-bg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bg-17.04.0.tar.xz";
+      sha256 = "128pf72srr0gypyzs7vqgxphhxqy397aaj1m35bav87r80xvqgk1";
+      name = "kde-l10n-bg-17.04.0.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bs-16.12.3.tar.xz";
-      sha256 = "1lfpq4lixamh08vmmj8ai8pzdybs1anlg8vfb6lnxj3dpplxxjdv";
-      name = "kde-l10n-bs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bs-17.04.0.tar.xz";
+      sha256 = "1k3j2ilafmzpzf5shqcjggr8j26kwjr33w1qvnxhssnsjc6adx9l";
+      name = "kde-l10n-bs-17.04.0.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca-16.12.3.tar.xz";
-      sha256 = "1h3d7gdpixiqn4gyk1z9lj5k4bhf4719w1rcfzcajrpwrmvdfvms";
-      name = "kde-l10n-ca-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca-17.04.0.tar.xz";
+      sha256 = "1zw3b967arp2vz86phj4n4y0mib6y2rqv5ak9jfxqmfpj03qlgf9";
+      name = "kde-l10n-ca-17.04.0.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.3";
+    version = "ca_valencia-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca@valencia-16.12.3.tar.xz";
-      sha256 = "00g1124n84lq380srykcr4yigqr5w9xivssj27jf1ak40vyanln0";
-      name = "kde-l10n-ca_valencia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca@valencia-17.04.0.tar.xz";
+      sha256 = "0f36rz4nnvz0k97c4wrrhy3zr6njydvib2v10smph58zfqwd233d";
+      name = "kde-l10n-ca_valencia-17.04.0.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-cs-16.12.3.tar.xz";
-      sha256 = "0nvl0lbg1pw1r73ggycfqjvlga6lg7gyin4bigyjcq41k9y6xf91";
-      name = "kde-l10n-cs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-cs-17.04.0.tar.xz";
+      sha256 = "12280xwvpz3m43arc62s4w0bfc1p10fqfi9v0d90adsgmh0zffhs";
+      name = "kde-l10n-cs-17.04.0.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-da-16.12.3.tar.xz";
-      sha256 = "1bsv0z0q5fqgn2jkgazm3aazi6s9crz23acwx9p2w7fc7h98bqpq";
-      name = "kde-l10n-da-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-da-17.04.0.tar.xz";
+      sha256 = "05icziwpysbyz7y8b6snpvf6cyrs2yzic0p1v2x1m2s392nwx0qp";
+      name = "kde-l10n-da-17.04.0.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-de-16.12.3.tar.xz";
-      sha256 = "0ym6f1n86rvbwdk0xlx2ajfv4l70kw3qir8z82d2jf5dhgz9h2k6";
-      name = "kde-l10n-de-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-de-17.04.0.tar.xz";
+      sha256 = "18fi7a5z9lnjmqabaz6q4yxcrpkmb62ri6c0zf1bff57cwvn2wbd";
+      name = "kde-l10n-de-17.04.0.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-el-16.12.3.tar.xz";
-      sha256 = "1dd51kh52rq9y3r2iz985ib2bpi109vf2xv2abkm8ddsfmb1mq6c";
-      name = "kde-l10n-el-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-el-17.04.0.tar.xz";
+      sha256 = "04nqk6par22126y6v0c343ylwy2h0ylw03gjs0pp7a7cgq1lqh13";
+      name = "kde-l10n-el-17.04.0.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.3";
+    version = "en_GB-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-en_GB-16.12.3.tar.xz";
-      sha256 = "0yc6fk5ak0442gv1gxwwz2zz13s9d1ihlfkvl8aqi6zky5b6c91n";
-      name = "kde-l10n-en_GB-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-en_GB-17.04.0.tar.xz";
+      sha256 = "0a0xwcvwv2sgjkzzy6wvyymm1l7b8xfk7lhiwh7bgm0il66shw98";
+      name = "kde-l10n-en_GB-17.04.0.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eo-16.12.3.tar.xz";
-      sha256 = "0p43p1as9s2x4145k59li39fvg77c38mjnlb16zhb5bg5c0r1401";
-      name = "kde-l10n-eo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eo-17.04.0.tar.xz";
+      sha256 = "0cbf5qwh18yd4kadkn11mh86d9zhxkwm0gnivjmd62lrz41rxr92";
+      name = "kde-l10n-eo-17.04.0.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-es-16.12.3.tar.xz";
-      sha256 = "194svk1axicbijy4ywsrn1q27pzrm3g139i63388qh3lzv8654p1";
-      name = "kde-l10n-es-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-es-17.04.0.tar.xz";
+      sha256 = "1xjjmia250w02wcw4jm7lsmixwd4qp2db5nxl1hql4ln1n2af9hk";
+      name = "kde-l10n-es-17.04.0.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-et-16.12.3.tar.xz";
-      sha256 = "1q0mrc517jr5hicklhzvs6vw5vwgvb2gj3fi93a9iqxbw1a794pk";
-      name = "kde-l10n-et-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-et-17.04.0.tar.xz";
+      sha256 = "1ivydzg39j0rv0y1vvkkh9429iyfx6mk44sswkg2gc9mccpwfa5s";
+      name = "kde-l10n-et-17.04.0.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eu-16.12.3.tar.xz";
-      sha256 = "0dgwklynwwksdm0dxk8dm53y0v92kfin6vgwpn2scc97fns16r08";
-      name = "kde-l10n-eu-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eu-17.04.0.tar.xz";
+      sha256 = "0pkj8sghzyvp20qgd6ys8znri011scrlgkx32ky3q74gn5dr4k95";
+      name = "kde-l10n-eu-17.04.0.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fa-16.12.3.tar.xz";
-      sha256 = "1ywipqg2dv3dapp3m7sfhap4izhabb4srk3gpl2kd2wx0abnwmdb";
-      name = "kde-l10n-fa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fa-17.04.0.tar.xz";
+      sha256 = "1slmhm6rl691n60xw53f9s5ibn8b9h1sb7i0rc8s2mk9cs6zqs4i";
+      name = "kde-l10n-fa-17.04.0.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fi-16.12.3.tar.xz";
-      sha256 = "11grklvacq70mq4fj0772v8xqmp1b1pl7gff8gvy692rva5qhv29";
-      name = "kde-l10n-fi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fi-17.04.0.tar.xz";
+      sha256 = "1yq7kiiqv4hhn7i14ccvh3nllv8i0xw9jv3z38r427gimi6d8p3d";
+      name = "kde-l10n-fi-17.04.0.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fr-16.12.3.tar.xz";
-      sha256 = "0qx849ilp1597nxrx6cmgnmm202all14y8pcyd19gp70wdra8wcm";
-      name = "kde-l10n-fr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fr-17.04.0.tar.xz";
+      sha256 = "0v2i6f7yf58qzd69hcb0jz0x1j3w99702wiflfags7qyzbszgan2";
+      name = "kde-l10n-fr-17.04.0.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ga-16.12.3.tar.xz";
-      sha256 = "06w92m84bxqs06gyi45x1jmzh99ip7vnnzjq7ixx7ny9k6m0as1m";
-      name = "kde-l10n-ga-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ga-17.04.0.tar.xz";
+      sha256 = "0q9y1dqk9j1fgk6fc1fdg3g26896x47cnnmbdgf037plbr0b4j5b";
+      name = "kde-l10n-ga-17.04.0.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-gl-16.12.3.tar.xz";
-      sha256 = "1k6jydmqbmxfkimxqn8qhd136zdjz4z7d5mk0n80607n91y7n3kv";
-      name = "kde-l10n-gl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-gl-17.04.0.tar.xz";
+      sha256 = "118p49vkdnmn707rf20gaycrrq3kb2qjqa9abq2ibfxdigwj20cy";
+      name = "kde-l10n-gl-17.04.0.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-he-16.12.3.tar.xz";
-      sha256 = "1ry1wd9ng5xwpi402p1rqbsrb0ma7bgkmx53yygzc5mpszarga6y";
-      name = "kde-l10n-he-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-he-17.04.0.tar.xz";
+      sha256 = "0ba1ccwkwqsdxlxfbq3fcjmbpww2sr9kx08j3nz453qdndfyp9md";
+      name = "kde-l10n-he-17.04.0.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hi-16.12.3.tar.xz";
-      sha256 = "1qwjiarqi8c3b15nc2nqrxvb6pcrb232qcx6nz0f9day2d0zxdwk";
-      name = "kde-l10n-hi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hi-17.04.0.tar.xz";
+      sha256 = "0gy7c67b9glhp0x6l8jxycp8vsdkv77025wdf9kn5l8sy1hqqhbp";
+      name = "kde-l10n-hi-17.04.0.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hr-16.12.3.tar.xz";
-      sha256 = "0y3pvdy1pkhraahsfkwhkar6004ll19gd6rhhhzgaw0irmw1yxp1";
-      name = "kde-l10n-hr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hr-17.04.0.tar.xz";
+      sha256 = "063pppyl57i241dxr68wbvh8k3ccck5589mrn5yhdcw30b0hiwr7";
+      name = "kde-l10n-hr-17.04.0.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hu-16.12.3.tar.xz";
-      sha256 = "001pl0l0cj4f2j7c6fjv9jv4wnkk2zb428y8szqm78zg85ms9wpz";
-      name = "kde-l10n-hu-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hu-17.04.0.tar.xz";
+      sha256 = "1b16xbdkh5varv650frnp9jsp8di6lnd61i04gaa3sxfy25xjzb2";
+      name = "kde-l10n-hu-17.04.0.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ia-16.12.3.tar.xz";
-      sha256 = "09p9r6xzirr6cwcjdg10db62g3d4z0ksl6caf45rz0i2k5zn4r6r";
-      name = "kde-l10n-ia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ia-17.04.0.tar.xz";
+      sha256 = "0gmzk2cac5gfa6j0m2d7lbwpi9y1dkrlk37r7iqvvzmqdsx2nzsy";
+      name = "kde-l10n-ia-17.04.0.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-id-16.12.3.tar.xz";
-      sha256 = "1kanlr401ljaaqijhdvv52lvrn90m9b0l6i2jly8mdnnnwp896ra";
-      name = "kde-l10n-id-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-id-17.04.0.tar.xz";
+      sha256 = "1cdsapfq74600n2p49fzv8lflall755kyvkpi152clb7a66vmysc";
+      name = "kde-l10n-id-17.04.0.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-is-16.12.3.tar.xz";
-      sha256 = "10a9sxjnv9xb9wy04b9pfwpj4xg22x0ami37jhwggpskl9sj736v";
-      name = "kde-l10n-is-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-is-17.04.0.tar.xz";
+      sha256 = "0g9s9ywkhdnyh76lr7j73ba7ydsvh6ki6y0qcgvhzg9jnd4rywzb";
+      name = "kde-l10n-is-17.04.0.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-it-16.12.3.tar.xz";
-      sha256 = "0f771kli3zw6dgwdxgk19kiy6gwv9yj3f2cgiyxaiak8yawa9ary";
-      name = "kde-l10n-it-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-it-17.04.0.tar.xz";
+      sha256 = "0hhq5gvlzfhz270caqh6g5k1dp740cakamn46zli5586hpmpdk8d";
+      name = "kde-l10n-it-17.04.0.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ja-16.12.3.tar.xz";
-      sha256 = "1p0arv340i34gdlkdbjw234c9a4jqy8z417f0p19pn6ic3i5i6yv";
-      name = "kde-l10n-ja-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ja-17.04.0.tar.xz";
+      sha256 = "149zazsdm89q5shfxpg5xsd51l0xrq12w8pw4nnkwpbv6vqwsf8w";
+      name = "kde-l10n-ja-17.04.0.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-kk-16.12.3.tar.xz";
-      sha256 = "1ik3abczhxkm2b8i22akz12q5lm7rsc7i4qdz6ml1sn4kd0949i5";
-      name = "kde-l10n-kk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-kk-17.04.0.tar.xz";
+      sha256 = "1n4qfkj2h03x2b9d1q1zjkz7aiqqjvy9sci3scbqqd3apf80jgn9";
+      name = "kde-l10n-kk-17.04.0.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-km-16.12.3.tar.xz";
-      sha256 = "1lwpfkv87i6km9pxrm78cqnnb1jnysaij0lmgvz2d0bs6dldaxrs";
-      name = "kde-l10n-km-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-km-17.04.0.tar.xz";
+      sha256 = "1bd0m5rkrvizvlr57wagixavk8c6449a8xl07j0hk12ha7c3livy";
+      name = "kde-l10n-km-17.04.0.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ko-16.12.3.tar.xz";
-      sha256 = "0c0hkprngxyxj2sf05s5i0y04i5f4vgqis1mgq500l03q0x16b4y";
-      name = "kde-l10n-ko-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ko-17.04.0.tar.xz";
+      sha256 = "10j0can8m0814jsch96f20625pr01ag8xqjyx4ridfssh8jry8s9";
+      name = "kde-l10n-ko-17.04.0.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lt-16.12.3.tar.xz";
-      sha256 = "04d2l2qisbpzxppxchfrxnijc8706pq3s9pgmyyy6c0v26gsgz77";
-      name = "kde-l10n-lt-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lt-17.04.0.tar.xz";
+      sha256 = "0l7w027g66dczhr8242k0fqvzjpcqi2jmna0lv1d7281kmyc0h49";
+      name = "kde-l10n-lt-17.04.0.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lv-16.12.3.tar.xz";
-      sha256 = "1af13p7ri4x3dhwlv30gf7za7dgsr1kx3khzlgdg4hcgi2s4aq12";
-      name = "kde-l10n-lv-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lv-17.04.0.tar.xz";
+      sha256 = "0ykl7wpi7x5nwy6pdp0h3fpm8ycvc4r2q0p446rz63fmp0vmax2h";
+      name = "kde-l10n-lv-17.04.0.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-mr-16.12.3.tar.xz";
-      sha256 = "16g8ln11x9qpda4wgzwvvij77bdpsdd6vsh7ysik8fc87km4qkax";
-      name = "kde-l10n-mr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-mr-17.04.0.tar.xz";
+      sha256 = "0k4dkq744ak3w7mfx4x3skkpnp2lnvj5zqihchhp2w6ik2yq3wkd";
+      name = "kde-l10n-mr-17.04.0.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nb-16.12.3.tar.xz";
-      sha256 = "091wm8z6ibw8by220j89xdf0vpk7dp341hph2dhz17ykdzck3cdf";
-      name = "kde-l10n-nb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nb-17.04.0.tar.xz";
+      sha256 = "1fqxssd12cpg9vkf2kc6f3gbivqr9xf4p489r2j6s6di7zn1na96";
+      name = "kde-l10n-nb-17.04.0.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nds-16.12.3.tar.xz";
-      sha256 = "052nw25rd3vq0fkixcwmn1iwaxnfwcg7iarf78c276w6vzrbvvcc";
-      name = "kde-l10n-nds-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nds-17.04.0.tar.xz";
+      sha256 = "0xrzy8v3a7riznb9fpjbx9zc4h47n6vpm36rbjdm93z0k8ifvqll";
+      name = "kde-l10n-nds-17.04.0.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nl-16.12.3.tar.xz";
-      sha256 = "0axlpjq70142blccsfqbh7zs7l8k31mkc30lr79d03975dp2ivzi";
-      name = "kde-l10n-nl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nl-17.04.0.tar.xz";
+      sha256 = "116kigy5agm3dpan5wk54j144fq1sf9i6njpqmjdjrgyylr6cska";
+      name = "kde-l10n-nl-17.04.0.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nn-16.12.3.tar.xz";
-      sha256 = "0ql8pvj47kwvdaj2gsjlc4rxb7mpl9nv4fraavffinv4xzrh0v18";
-      name = "kde-l10n-nn-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nn-17.04.0.tar.xz";
+      sha256 = "1i1jm30gyd1s6igv7bwckdrbzsrsahzi7ki0c9dpfhm85gv8i957";
+      name = "kde-l10n-nn-17.04.0.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pa-16.12.3.tar.xz";
-      sha256 = "0r2snb5bkvha8yj692g1y8xwdwcnav06w3qliz1v7jiyb6hv8ncm";
-      name = "kde-l10n-pa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pa-17.04.0.tar.xz";
+      sha256 = "15n37z6wglw315jd8hijbyf883kpcw5919zp4yr57srjsvkay85v";
+      name = "kde-l10n-pa-17.04.0.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pl-16.12.3.tar.xz";
-      sha256 = "1bp8br37wfn3xlxl4hzr45sv41w2i562rgjcj25ngn27y7cqvwq5";
-      name = "kde-l10n-pl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pl-17.04.0.tar.xz";
+      sha256 = "0ncaln92v5ib34zl700a61gzlc5akik3ss7pi4rygvlggfcjv4s2";
+      name = "kde-l10n-pl-17.04.0.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt-16.12.3.tar.xz";
-      sha256 = "1f3ray689q3w4yr20j0bj8vvwyb1qzi608ip0p6n4nzjkq3ycqh6";
-      name = "kde-l10n-pt-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt-17.04.0.tar.xz";
+      sha256 = "1ha6zfv9750idpw93z6hlmlypk7pgfriirfvfwbag43664ywl96n";
+      name = "kde-l10n-pt-17.04.0.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.3";
+    version = "pt_BR-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt_BR-16.12.3.tar.xz";
-      sha256 = "06h0dp54n8brv7kcfdbxy3yxk6c5b1ncbd9fzmflr8bpivifj66s";
-      name = "kde-l10n-pt_BR-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt_BR-17.04.0.tar.xz";
+      sha256 = "0n16al9pivlz3s0ard79k88cank988107jbxmzsiyrbvlwfqih8a";
+      name = "kde-l10n-pt_BR-17.04.0.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ro-16.12.3.tar.xz";
-      sha256 = "17kbkh50jf8zb9p3kl2malddvq08ybg881x1w5gmw514k3d3hwxh";
-      name = "kde-l10n-ro-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ro-17.04.0.tar.xz";
+      sha256 = "0g3svxknwdn6nsq8v3ml0p3m5lwlv34h3ikr8cdra5zigqjmgxmf";
+      name = "kde-l10n-ro-17.04.0.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ru-16.12.3.tar.xz";
-      sha256 = "12ghgwy84i6nmlgi8wmvhxn7d9mvanhyd6pqyd302r5x0zxd8rza";
-      name = "kde-l10n-ru-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ru-17.04.0.tar.xz";
+      sha256 = "0f0pzvxacik48w3r1i7svfkn5dna9qmnz1cpci8sbcirpkw0xsp1";
+      name = "kde-l10n-ru-17.04.0.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sk-16.12.3.tar.xz";
-      sha256 = "0hc1cm2npsw2w9mx09kn9jxvaqpjhv6snhwdi2mybpbs9qmgnzcn";
-      name = "kde-l10n-sk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sk-17.04.0.tar.xz";
+      sha256 = "0x3yx3hcq4ia4s0f9bv3sib6hvfws8r8b8rgsgikf6d0ghk0y5z1";
+      name = "kde-l10n-sk-17.04.0.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sl-16.12.3.tar.xz";
-      sha256 = "02d0fg40pvlr6wnxg425n3fpqpizvdppznyp8nnxbzb9ia583aw0";
-      name = "kde-l10n-sl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sl-17.04.0.tar.xz";
+      sha256 = "0gdj3710c6q6h6g5mnrslzg2qza2bnr78skiy8h3x7ihrmgyjmrl";
+      name = "kde-l10n-sl-17.04.0.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz";
-      sha256 = "1yq44dykajcz4n10zrad85lji30phr9cm5dnmx4s08404qwh68cz";
-      name = "kde-l10n-sr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sr-17.04.0.tar.xz";
+      sha256 = "1si249lwy3ansacj33agxqs2vdrmyll6g2zk1754b34nr01arbq3";
+      name = "kde-l10n-sr-17.04.0.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sv-16.12.3.tar.xz";
-      sha256 = "1q8ags96jwjrihi8ai8139c3s9nfy7v7lss9ci3xl786hyggdlrb";
-      name = "kde-l10n-sv-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sv-17.04.0.tar.xz";
+      sha256 = "1zh7ajp6f7vh098nbp501891cc68h1lwq8igzxzh2l0gd35rcpn4";
+      name = "kde-l10n-sv-17.04.0.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-tr-16.12.3.tar.xz";
-      sha256 = "1l24d0abhhlbam0wfz52495nvjy1blfid9h31233hkykb782gi0n";
-      name = "kde-l10n-tr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-tr-17.04.0.tar.xz";
+      sha256 = "0w8s5wfkaz7p209dk9a2z38as3hif5lbwfjbx8342vp2sv3s9yy2";
+      name = "kde-l10n-tr-17.04.0.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ug-16.12.3.tar.xz";
-      sha256 = "0sb4136wjyg9g1fvhcgqv97wpv82ia37aknd8xcvjnp5n2jl80nn";
-      name = "kde-l10n-ug-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ug-17.04.0.tar.xz";
+      sha256 = "00fswh5mfg7spdnqm3wfir5v0al91p8qd8cj7mb9jlmdm6ydd2wk";
+      name = "kde-l10n-ug-17.04.0.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-uk-16.12.3.tar.xz";
-      sha256 = "073pqvxbpibwd1bv0vh4rijgkhg061g2gaaaqnckaakw677g2bmz";
-      name = "kde-l10n-uk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-uk-17.04.0.tar.xz";
+      sha256 = "0zxf372yn0nsdnpylq364h0c4g2rzxxs462lh9ixwja2m8p91wsi";
+      name = "kde-l10n-uk-17.04.0.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-wa-16.12.3.tar.xz";
-      sha256 = "14qms294pz7hf4ramhscif9n6jfk5ixfwww558ypi0lwnzc17mrf";
-      name = "kde-l10n-wa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-wa-17.04.0.tar.xz";
+      sha256 = "0p44q7mki01fq15y96qibw2hap9lfaya2480vjl4f7hdqw2xjfhh";
+      name = "kde-l10n-wa-17.04.0.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.3";
+    version = "zh_CN-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_CN-16.12.3.tar.xz";
-      sha256 = "01q92gc13wjpd2gzvn1sipgl5xs86mwq8y0583glsx7s2wfp3g41";
-      name = "kde-l10n-zh_CN-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_CN-17.04.0.tar.xz";
+      sha256 = "0a3kfdkp6d3fgil3s3rd0kjc7jnqzakr46683dd108shqzb26rcs";
+      name = "kde-l10n-zh_CN-17.04.0.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.3";
+    version = "zh_TW-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_TW-16.12.3.tar.xz";
-      sha256 = "0a9xnxlbr5469k1ij7hc8wa5p38r3yqq1d9fxmmpqyj111v63g3h";
-      name = "kde-l10n-zh_TW-16.12.3.tar.xz";
-    };
-  };
-  kdelibs = {
-    version = "4.14.30";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdelibs-4.14.30.tar.xz";
-      sha256 = "0v8r70d55c4jhfhnh8lj41584qggc2lb4f6jwm4yl9qc6bpw77x3";
-      name = "kdelibs-4.14.30.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdenetwork-filesharing-16.12.3.tar.xz";
-      sha256 = "0345wq7ayahfd2jlpgfs18c7nrdp9gn9yxig2x75pspqmb5pgxh7";
-      name = "kdenetwork-filesharing-16.12.3.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdenlive-16.12.3.tar.xz";
-      sha256 = "1z7afrx00yaracf6cv9p8r14gqampabya8li6ws1ihzdgfamlkd0";
-      name = "kdenlive-16.12.3.tar.xz";
-    };
-  };
-  kdepim-addons = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-addons-16.12.3.tar.xz";
-      sha256 = "1hqm7vi7fy7s17djayq9q7l3dxdnzk2ii78mjdg90aac9cxdxgmm";
-      name = "kdepim-addons-16.12.3.tar.xz";
-    };
-  };
-  kdepim-apps-libs = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-apps-libs-16.12.3.tar.xz";
-      sha256 = "1q4ksp377piqxbs843nxafzssz80ayjii90iz86r2z2rd3lyrjzw";
-      name = "kdepim-apps-libs-16.12.3.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-runtime-16.12.3.tar.xz";
-      sha256 = "0j5c3y8bqnffcrx4g7ilq7id46h11d1hiw81l7x4mg1p0zw07bg1";
-      name = "kdepim-runtime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_TW-17.04.0.tar.xz";
+      sha256 = "0mdc8lqb5b99rkswallm5allcnp8i6xlsyv6q9k1n1jlyjkxl1xx";
+      name = "kde-l10n-zh_TW-17.04.0.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-runtime-16.12.3.tar.xz";
-      sha256 = "1sqp827l30adiqrp12djx3xk6mlz2lb46hmxnbnzv52mv2whcr3y";
-      name = "kde-runtime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-runtime-17.04.0.tar.xz";
+      sha256 = "0phdmsmlqbadxi45n19hzkzfkkcazzlkxb0rxfr6c3jny2ncg5cn";
+      name = "kde-runtime-17.04.0.tar.xz";
+    };
+  };
+  kdebugsettings = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdebugsettings-17.04.0.tar.xz";
+      sha256 = "140drnnv7573fvfs94kwk0kgqqkc5nrj8jkj3i3l6idikw0xi0qm";
+      name = "kdebugsettings-17.04.0.tar.xz";
+    };
+  };
+  kdeedu-data = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdeedu-data-17.04.0.tar.xz";
+      sha256 = "1khxi2z5qv0wrj7pn6r643829619bhymzzbdlgjr1zs5k244iajy";
+      name = "kdeedu-data-17.04.0.tar.xz";
+    };
+  };
+  kdegraphics-mobipocket = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-mobipocket-17.04.0.tar.xz";
+      sha256 = "0ja7a6p7ckw0zy6jffwm96vc5g33mqr722c77890173hsb45wy83";
+      name = "kdegraphics-mobipocket-17.04.0.tar.xz";
+    };
+  };
+  kdegraphics-thumbnailers = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-thumbnailers-17.04.0.tar.xz";
+      sha256 = "0h2ydkcj1i35qhrmcva5977ib2127186q735xh2dg60fmdcyni14";
+      name = "kdegraphics-thumbnailers-17.04.0.tar.xz";
+    };
+  };
+  kdelibs = {
+    version = "4.14.31";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdelibs-4.14.31.tar.xz";
+      sha256 = "00ai1s0wz4nyg7fhj6g7cp3p5sz8rw676dv127bpbvm5yszlz561";
+      name = "kdelibs-4.14.31.tar.xz";
+    };
+  };
+  kdenetwork-filesharing = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdenetwork-filesharing-17.04.0.tar.xz";
+      sha256 = "176n41xnz2v3wn62nip5sdv966g4rs15ah27zzr9cx32jrs52z4c";
+      name = "kdenetwork-filesharing-17.04.0.tar.xz";
+    };
+  };
+  kdenlive = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdenlive-17.04.0.tar.xz";
+      sha256 = "0kd93zxz5fch1ski9mbz2sbfda3spq9gsfgzvik2mzjwr994x574";
+      name = "kdenlive-17.04.0.tar.xz";
+    };
+  };
+  kdepim-addons = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-addons-17.04.0.tar.xz";
+      sha256 = "01qyg9p6nh2n2hsmmjfyjcd80z6cfpw509zmgs608lmbm8hskzxd";
+      name = "kdepim-addons-17.04.0.tar.xz";
+    };
+  };
+  kdepim-apps-libs = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-apps-libs-17.04.0.tar.xz";
+      sha256 = "02igc1c8zykwf5yydmk0l1s4l3z3m5c90jlhyrqjkpmkwvnkrd3n";
+      name = "kdepim-apps-libs-17.04.0.tar.xz";
+    };
+  };
+  kdepim-runtime = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-runtime-17.04.0.tar.xz";
+      sha256 = "00cjlnqq029850n2ib1r5ylass8q1f71p24sqicbfcfyd6vksvdl";
+      name = "kdepim-runtime-17.04.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-kioslaves-16.12.3.tar.xz";
-      sha256 = "17zqp43a1266616h3g6yccjmfgwni6lr8lz4rrvfda275vvwbshj";
-      name = "kdesdk-kioslaves-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-kioslaves-17.04.0.tar.xz";
+      sha256 = "1rfj2zk34i7i3289n85b57szd4154zj6r4m7zyif2cc019ax5b0q";
+      name = "kdesdk-kioslaves-17.04.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-thumbnailers-16.12.3.tar.xz";
-      sha256 = "0p2s6pyq16jmjv29r8n9ygvsh1dxgz9zk90mk138cxxhbx9nks9h";
-      name = "kdesdk-thumbnailers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-thumbnailers-17.04.0.tar.xz";
+      sha256 = "145rgk62c083g1nl7ssx9xalv0plsjdlyp4a7jqv83vqphcyd789";
+      name = "kdesdk-thumbnailers-17.04.0.tar.xz";
     };
   };
   kdf = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdf-16.12.3.tar.xz";
-      sha256 = "1502ib1hlc5xxsphspxwj8jvjm7qig0zdwckvm3nmh7hf4474sc5";
-      name = "kdf-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdf-17.04.0.tar.xz";
+      sha256 = "1bavp593622014ik1h066mdldlzlyq5f2rw93plsv5i2lpabdbfd";
+      name = "kdf-17.04.0.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdialog-16.12.3.tar.xz";
-      sha256 = "161barz5x9jrdk2p5hqc2vk1rqfwn8nlhdmc1vjqnhvww786ghmh";
-      name = "kdialog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdialog-17.04.0.tar.xz";
+      sha256 = "0vdlfnkm9949rjalmf8f9dc86jsha63lya0fgl34admrs8d530hb";
+      name = "kdialog-17.04.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdiamond-16.12.3.tar.xz";
-      sha256 = "0qdh9ngrz5ph0kly27c58sxhwamqm3wq566337yhdqjizzcin4pf";
-      name = "kdiamond-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdiamond-17.04.0.tar.xz";
+      sha256 = "021mmygp28z7vvg2gjb4p781kcg33qj4lcz9vqvyh5qmv81qh93w";
+      name = "kdiamond-17.04.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/keditbookmarks-16.12.3.tar.xz";
-      sha256 = "0dn3jb5lsjj2c6pbrbn4cik68fqqk99ljl45vbal9cc27lmrfa2n";
-      name = "keditbookmarks-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/keditbookmarks-17.04.0.tar.xz";
+      sha256 = "1daab64k5kk6krphi3k3rgprmql126bwykl8aaa93ls890xln3g8";
+      name = "keditbookmarks-17.04.0.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfilereplace-16.12.3.tar.xz";
-      sha256 = "0gym9bmkyjwg97khy6xxiaidjp6wi98fzmk7wa97wbdqc0qvswja";
-      name = "kfilereplace-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfilereplace-17.04.0.tar.xz";
+      sha256 = "0prc6v9kps1yjwccscm7skcapnzza53xh36pbdavhw81pag6wwsy";
+      name = "kfilereplace-17.04.0.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfind-16.12.3.tar.xz";
-      sha256 = "1d7rn3xri4dgv97s6jw3n4cbsg73zyrbcm3ligxgj37ziggrhgsj";
-      name = "kfind-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfind-17.04.0.tar.xz";
+      sha256 = "08hlylw13frq7frjz4rvisr0001n44nkafh2ga84mvkvlgxl0602";
+      name = "kfind-17.04.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfloppy-16.12.3.tar.xz";
-      sha256 = "07mgrpjqd2kdz5gmg8ylmvdb4mis328b7qlchszdx0l1z30kqkzp";
-      name = "kfloppy-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfloppy-17.04.0.tar.xz";
+      sha256 = "1di15ri8y3qinr40j83hrvfc1h3y8pan0mbfin1jdm4vwgjwgrqn";
+      name = "kfloppy-17.04.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfourinline-16.12.3.tar.xz";
-      sha256 = "087c00sggx5i1g8i2rjvvwlys15bisgx9fm2nl8f30h2ba3im4sg";
-      name = "kfourinline-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfourinline-17.04.0.tar.xz";
+      sha256 = "119jrs63dfbdpq7a3ng0fy0dri1jw7dbaz6n5hyz6ihzizsr9nm2";
+      name = "kfourinline-17.04.0.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgeography-16.12.3.tar.xz";
-      sha256 = "1rnk00nj29zimpw36vhm0yrwlmpmxwv9wzxnhr7n2jq5qhbqsp5g";
-      name = "kgeography-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgeography-17.04.0.tar.xz";
+      sha256 = "17kwpv352aiacghacjp0bz1ak19jh52300nmjhlj8ysl57q48n3z";
+      name = "kgeography-17.04.0.tar.xz";
     };
   };
   kget = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kget-16.12.3.tar.xz";
-      sha256 = "0h8nklsl6gddwzgjig5cwp463s96ffn5688zjlsyx4hphnvbj8kb";
-      name = "kget-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kget-17.04.0.tar.xz";
+      sha256 = "093mrv9c699s8jwrf4lxfg78ajiqhlpbi7swpgmhk2545wg1ngn7";
+      name = "kget-17.04.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgoldrunner-16.12.3.tar.xz";
-      sha256 = "028kz5x8a3jb3zp3vfxajmszrqk859hdln9175pp6zj78b278xz4";
-      name = "kgoldrunner-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgoldrunner-17.04.0.tar.xz";
+      sha256 = "1in4ddlrn1lnjdgww4saa7is6v8lj33n31bmrf2f6hmq7sg3i6h9";
+      name = "kgoldrunner-17.04.0.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgpg-16.12.3.tar.xz";
-      sha256 = "0abh15j2p0vinskd8f1yvjkyi1a70k0wf1sdldrfdwpdgq1pqsxw";
-      name = "kgpg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgpg-17.04.0.tar.xz";
+      sha256 = "1i9pyz35pzn5p3p4mvkxwxfrmmpmf7ngpj83m28zxcj654dfcl6x";
+      name = "kgpg-17.04.0.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/khangman-16.12.3.tar.xz";
-      sha256 = "03ffigr9a6n3aj1a7lxcw9wgf1pafdjwqjnwnny2ric5vn6lpq1z";
-      name = "khangman-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/khangman-17.04.0.tar.xz";
+      sha256 = "14ddaqvhmlwwb85bl5hi0r0m61akx38aabzrs9ys045z64si8b9d";
+      name = "khangman-17.04.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/khelpcenter-16.12.3.tar.xz";
-      sha256 = "100xcjjjbszhbwgydbylk9m9lrxikjyazmhaq2rvv2mfzsbijjm7";
-      name = "khelpcenter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/khelpcenter-17.04.0.tar.xz";
+      sha256 = "10x8c18vbwg7j6nfrrl7c0wj9x882ijv33mfnrhj0vpdc2bnkkxn";
+      name = "khelpcenter-17.04.0.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kholidays-16.12.3.tar.xz";
-      sha256 = "09iwkqpnmn3h7yfin4y9izb2sdk6hrm8rfq106cnz7j8i31q93ad";
-      name = "kholidays-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kholidays-17.04.0.tar.xz";
+      sha256 = "0k0dm17bvr9snxmc87gicizpqqdsr95gxypnhgyiwc0mz90l5qb7";
+      name = "kholidays-17.04.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kidentitymanagement-16.12.3.tar.xz";
-      sha256 = "1b23cwdhc7rv260kmn4akff3jfa21hk49p0kp8p0mf6nw6qahbvp";
-      name = "kidentitymanagement-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kidentitymanagement-17.04.0.tar.xz";
+      sha256 = "1vrmj0ch1zg8hh1qqjv0i7fys5nrw3g6rj5sns6ghi0kswlskwfw";
+      name = "kidentitymanagement-17.04.0.tar.xz";
     };
   };
   kig = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kig-16.12.3.tar.xz";
-      sha256 = "0fnlgxwcnspaqzv4y40xm0kq3xwwd4r5abh7ssbd6iqsbzgm6ghw";
-      name = "kig-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kig-17.04.0.tar.xz";
+      sha256 = "0bx4vzg5x4lp7k49i5a55ka1c60iy3d1xjlrcx0gjx2bj35k6893";
+      name = "kig-17.04.0.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kigo-16.12.3.tar.xz";
-      sha256 = "08rdz91jzz79884xhg87cwy57q1jk2414shyxxy9r0pb4wdcdbhn";
-      name = "kigo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kigo-17.04.0.tar.xz";
+      sha256 = "1vi07v5nnwxpm04hxspxadf0qw7qka7pajggn54frc37hq5ibxia";
+      name = "kigo-17.04.0.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/killbots-16.12.3.tar.xz";
-      sha256 = "0lwniwm8cbnwpqhfis38x5qvkz53626v9bn00amml57zj8x3hjnd";
-      name = "killbots-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/killbots-17.04.0.tar.xz";
+      sha256 = "0ccl1249x7lpkm6hpani1fyvdgs0dqlxd250f9hm7k6j8b6jwg01";
+      name = "killbots-17.04.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kimagemapeditor-16.12.3.tar.xz";
-      sha256 = "0362zcj6by3kydr5v3sr7l6k9kkyfcy16879f93d1qqkjfi11cic";
-      name = "kimagemapeditor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kimagemapeditor-17.04.0.tar.xz";
+      sha256 = "1n828j0sqvas9c3iqmbj3jl8bmhyw7bqj3s6zf0qifjdxvlxpwaq";
+      name = "kimagemapeditor-17.04.0.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kimap-16.12.3.tar.xz";
-      sha256 = "1jlva17hy500jpb5mg6m3vrcy6mqikcy8m1pgy68d2ip0m93rb5f";
-      name = "kimap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kimap-17.04.0.tar.xz";
+      sha256 = "1xgaixdplpycsdd2w09liy1vxp0lx5p2n6bmbds5dq887dwmj73i";
+      name = "kimap-17.04.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kio-extras-16.12.3.tar.xz";
-      sha256 = "1mfpllrmc88khlpg3yd4sghs8igg8dh0x568jw46vv90qgdb9xss";
-      name = "kio-extras-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kio-extras-17.04.0.tar.xz";
+      sha256 = "1kvah1qg98zlsps5qv6by7ic1mjmnhk6xs2041cf143k0kifrsi9";
+      name = "kio-extras-17.04.0.tar.xz";
     };
   };
   kiriki = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kiriki-16.12.3.tar.xz";
-      sha256 = "142p2zv1826iclaa2zrfyzfdwnflh3sq2xymca4di5anrmcwmm2m";
-      name = "kiriki-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kiriki-17.04.0.tar.xz";
+      sha256 = "1xmvamriklxhs9bwv75z2668by0w8nx95hb4l56z9yck5f7dlh6m";
+      name = "kiriki-17.04.0.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kiten-16.12.3.tar.xz";
-      sha256 = "0skwgv3v79p5z1livjbdsg7i18ky8vc49z53dmgsgbziqvs0s2y4";
-      name = "kiten-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kiten-17.04.0.tar.xz";
+      sha256 = "1h6cxp4qpzgdd67s05zr403mk5jswzz7sk38j78fapmfc9hwz7gh";
+      name = "kiten-17.04.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kjumpingcube-16.12.3.tar.xz";
-      sha256 = "1fii1arzpsdhnnb5yladhpsb0g6icald5si0fwnl47wg3gshaqiz";
-      name = "kjumpingcube-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kjumpingcube-17.04.0.tar.xz";
+      sha256 = "1las1sb01zm2vdr77fvsz3spjpjnv5fjhvdah17l4rlgdww2kqwc";
+      name = "kjumpingcube-17.04.0.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kldap-16.12.3.tar.xz";
-      sha256 = "0a7pm9dzcvyyznqs4apwdl6dpg87qhxcr3a06grjwxhqvfdl52na";
-      name = "kldap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kldap-17.04.0.tar.xz";
+      sha256 = "0b19si2nx7mimxxsdr1vp4bh3zr8ddz5k7217fa5wg190143zi9b";
+      name = "kldap-17.04.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kleopatra-16.12.3.tar.xz";
-      sha256 = "1ja26gzdj8h5f8w1061scl40p6ahba3ci4hp91n2vp3rrz9m96wa";
-      name = "kleopatra-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kleopatra-17.04.0.tar.xz";
+      sha256 = "1l823l9wlqqzkcycqzfca6l3yfpr70a76786mvajswnkwasgfwyc";
+      name = "kleopatra-17.04.0.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klettres-16.12.3.tar.xz";
-      sha256 = "0m3k3zyrw7rwm6ad75c86bap80v2y5k938mdhqjaciglqc9pk83h";
-      name = "klettres-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klettres-17.04.0.tar.xz";
+      sha256 = "0liaym1cnnysmpd3bj3ss2bgrds9xh0f0i631vpj8z3n6pdm70s9";
+      name = "klettres-17.04.0.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klickety-16.12.3.tar.xz";
-      sha256 = "0mim86wxcljs192q9y6a6i326sic350jd89m1vx3p78dwpj35q42";
-      name = "klickety-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klickety-17.04.0.tar.xz";
+      sha256 = "15rjg09xa48082va8gxz51d3wacmfivla7bhmqdcgddagkmjy9cd";
+      name = "klickety-17.04.0.tar.xz";
     };
   };
   klines = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klines-16.12.3.tar.xz";
-      sha256 = "03ran5hyl8p9vfi82m2pkzng9hn5ipx1plgq9bz25c53z5fg63di";
-      name = "klines-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klines-17.04.0.tar.xz";
+      sha256 = "0ix039d89mjm581zx1fchhj0vmjwx3da1l3indprh62664v2ihwb";
+      name = "klines-17.04.0.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klinkstatus-16.12.3.tar.xz";
-      sha256 = "0kmjh0398k6fpz6lgz6d5rb79xl6wpgd4j56zacpha9046cfnmsk";
-      name = "klinkstatus-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klinkstatus-17.04.0.tar.xz";
+      sha256 = "102djlmp8dcha1p5iacrnyjgjp1w4qi5sf04lnlq43j2k2qhvr0r";
+      name = "klinkstatus-17.04.0.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmag-16.12.3.tar.xz";
-      sha256 = "1llv9vd1557h4lz2sdd1wjlqb9wzrk9jxn4731iac2b5wdwpihii";
-      name = "kmag-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmag-17.04.0.tar.xz";
+      sha256 = "1jfs9n880yva5vi36gc25kz4d6vy7djpa05nm2niga03gbv0r0lx";
+      name = "kmag-17.04.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmahjongg-16.12.3.tar.xz";
-      sha256 = "0xy3w5kxn69l0dagly5qd9dqzkpikflmrjbv1b45psafdmj3125r";
-      name = "kmahjongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmahjongg-17.04.0.tar.xz";
+      sha256 = "1k9rmcdlrybxnccdh0w5ggy4p41l19ccv3hsc2ph0aj9cxh9svac";
+      name = "kmahjongg-17.04.0.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmail-16.12.3.tar.xz";
-      sha256 = "1kyhc952k78yg2wa9cgxvqa6qrrgc08dly7fin7as8cxfh49i0b0";
-      name = "kmail-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmail-17.04.0.tar.xz";
+      sha256 = "04cfdjsy2gnwkcjhq0ikws68rpr65ycycdnwzrvskg4whmp5h01a";
+      name = "kmail-17.04.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmail-account-wizard-16.12.3.tar.xz";
-      sha256 = "0w94v2c38sl0qnyr38yzlfj6pxixaziw5kb4fkawv26c18fi42pl";
-      name = "kmail-account-wizard-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmail-account-wizard-17.04.0.tar.xz";
+      sha256 = "03c5gg980r18rjwsdkgclyw2qd3l1vc7grwdbfm2kib5fqk61gd3";
+      name = "kmail-account-wizard-17.04.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmailtransport-16.12.3.tar.xz";
-      sha256 = "1dkw7niymhnf0jncflvqyldw28c9j0q6j598flb5ksds0n30iasy";
-      name = "kmailtransport-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmailtransport-17.04.0.tar.xz";
+      sha256 = "0683lrmadw51h1q345lsdy888dynph06ani54awx60qdc1crnx7j";
+      name = "kmailtransport-17.04.0.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmbox-16.12.3.tar.xz";
-      sha256 = "0khvf4kqf9i425fjczl1miqsz0pxbyryxy32bf9knr3k5kmwbn24";
-      name = "kmbox-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmbox-17.04.0.tar.xz";
+      sha256 = "001f32yrxhavrk2plyyl05ny6gcazj6a9h51gv0fc5mb850w1ryq";
+      name = "kmbox-17.04.0.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmime-16.12.3.tar.xz";
-      sha256 = "0gzbh0g075ml5x0qy4zd1cg1qygdsnssl5ahk9pcgc0fik4p9j20";
-      name = "kmime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmime-17.04.0.tar.xz";
+      sha256 = "1bywzanv82xpxscxpgxfj0bivx9l6vwlspgdbvzh3nnhjv2g41qp";
+      name = "kmime-17.04.0.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmines-16.12.3.tar.xz";
-      sha256 = "0dz6yx7y0jpxhmyjrfyf6rrkiayn4mpyr4n1iszs11gac1bqppvn";
-      name = "kmines-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmines-17.04.0.tar.xz";
+      sha256 = "101midljjq8ws7l3n6a8kym13n6c64xyhzv1d6py35cawyg3zfpv";
+      name = "kmines-17.04.0.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmix-16.12.3.tar.xz";
-      sha256 = "1mq4kna3z62269m43qy42knq4byrvirk0mk5yp56n51im1bmdyj4";
-      name = "kmix-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmix-17.04.0.tar.xz";
+      sha256 = "0qyml01rmf5p4qlwi7y96lc6hjdy70xbq6z4pwyy0rpk254jz754";
+      name = "kmix-17.04.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmousetool-16.12.3.tar.xz";
-      sha256 = "1678sjj96f22sn60ccyj6hqi2vghkf4facnx8l15x4xx05yq1vgg";
-      name = "kmousetool-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmousetool-17.04.0.tar.xz";
+      sha256 = "0chybr31ag087zfq47f8scvlzli2yf8l18gq965b2nl7vnz7kr0s";
+      name = "kmousetool-17.04.0.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmouth-16.12.3.tar.xz";
-      sha256 = "1afvjds1kfb8zvv3ma8c6svan6zlbd1w9a164vxwp7gl3ycjyj52";
-      name = "kmouth-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmouth-17.04.0.tar.xz";
+      sha256 = "0k05g7rhcbl7mq4sv05c8kghmrm5cpdhj46vvmz5alqdik5g06xd";
+      name = "kmouth-17.04.0.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmplot-16.12.3.tar.xz";
-      sha256 = "02vh4diqs4688p2xlia437jywx89yhpaf8ipprdq92q034glybyz";
-      name = "kmplot-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmplot-17.04.0.tar.xz";
+      sha256 = "1n3skmyrmhl8p0kypm0wfvm8whw8fhq5byv1hjj0xdpwdv9r7n1j";
+      name = "kmplot-17.04.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knavalbattle-16.12.3.tar.xz";
-      sha256 = "0164z9h1689bz600p17p8fq552g8pq73l81nj4f5csklhnsiykkg";
-      name = "knavalbattle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knavalbattle-17.04.0.tar.xz";
+      sha256 = "0m3y39lfngbc9ddnh2cifhc6qh4i1vlz983mhyz1psgamvy71djx";
+      name = "knavalbattle-17.04.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knetwalk-16.12.3.tar.xz";
-      sha256 = "1mavc0rn41y3vgzf0ikwvk3kh4fszylh7h4briw9k0kqx2cxh5vk";
-      name = "knetwalk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knetwalk-17.04.0.tar.xz";
+      sha256 = "1z5brajv2kq4c617zyphcpk5as2dibb14h9l8vym9v1j3k59jqsh";
+      name = "knetwalk-17.04.0.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knotes-16.12.3.tar.xz";
-      sha256 = "1yyx98zn7a3hbiyr16fcbylbm5v8lyg22v8gwf7xpnbx5jb4hpb8";
-      name = "knotes-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knotes-17.04.0.tar.xz";
+      sha256 = "051y5ghrjs87xhdw7mih4gmbp93s23vicpsnmawi98hcbqh16n6c";
+      name = "knotes-17.04.0.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kolf-16.12.3.tar.xz";
-      sha256 = "136iyf8clr2r8qkjcm0nqcq0sjr5xry9gbxjhz128lc0nywsxpd5";
-      name = "kolf-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kolf-17.04.0.tar.xz";
+      sha256 = "1rvvy52avlpbdgvd7qbw73kfarn77h7ka9gny6q3xsy0knhgxy3a";
+      name = "kolf-17.04.0.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kollision-16.12.3.tar.xz";
-      sha256 = "0kwnqqm9gs6ac7ags9x82ykmp3vccp3kdd3js26a1kz1zkip32il";
-      name = "kollision-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kollision-17.04.0.tar.xz";
+      sha256 = "18k88jj9vyplh3lffw86pjwy0w568ddf17xza1spam3xpmlh9fix";
+      name = "kollision-17.04.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kolourpaint-16.12.3.tar.xz";
-      sha256 = "1yg3xnbbzvhcgb7i92bya41gq4z0135njcc77848khndpgkxvczb";
-      name = "kolourpaint-16.12.3.tar.xz";
-    };
-  };
-  kommander = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kommander-16.12.3.tar.xz";
-      sha256 = "1wlks0alw82ra3g63d8k8nj9sq899hjv1r2kshk7c4vdk7arn1fg";
-      name = "kommander-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kolourpaint-17.04.0.tar.xz";
+      sha256 = "1qmwpx0ql3nl5wnbh21dfw369cb76ll7n55w6pfja8izljic67xh";
+      name = "kolourpaint-17.04.0.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kompare-16.12.3.tar.xz";
-      sha256 = "18z6424xidpx5kmbjiasvhagh2b1a9pxizc0dsvba47v9xcavsaw";
-      name = "kompare-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kompare-17.04.0.tar.xz";
+      sha256 = "06ix1x7hvryqnysg256z2b0igjqaqya33mm24p9sw75misi7ay6f";
+      name = "kompare-17.04.0.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konqueror-16.12.3.tar.xz";
-      sha256 = "1pwv2mj9xrn6aymhkqmwd89d5i3v2jixp07dz0by62rcpfhm89p5";
-      name = "konqueror-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konqueror-17.04.0.tar.xz";
+      sha256 = "0crqcnqk4bl6wg6izs34b6dgdh19rsnid0dpcsdminfglj6kb9lm";
+      name = "konqueror-17.04.0.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konquest-16.12.3.tar.xz";
-      sha256 = "1fhz9pwi2dmmcjg10vp36m8d759zikg6nqpjdp41dg95lkyf5vkf";
-      name = "konquest-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konquest-17.04.0.tar.xz";
+      sha256 = "0fgmh3z012k710c098bp02dj5v2gcmfp1dg29257zglk7qkvaa0b";
+      name = "konquest-17.04.0.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konsole-16.12.3.tar.xz";
-      sha256 = "10k7ryvsssbskpxk04iqx2mrp2a91291r8nzvg1780lrhql5rdj7";
-      name = "konsole-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konsole-17.04.0.tar.xz";
+      sha256 = "01iasaiabqnr8fsjyl250h2ha0l788gx58xizafzj2q649ijbj4h";
+      name = "konsole-17.04.0.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kontact-16.12.3.tar.xz";
-      sha256 = "0wj4w9ak6dm330s393hjb79w16gs5kij5gz9swf3pxwg21xbd4ps";
-      name = "kontact-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kontact-17.04.0.tar.xz";
+      sha256 = "0i2k3ay7n92sd8gxhqy4ld8g9qzpwy9rxzm3qj70r4v0byw8a176";
+      name = "kontact-17.04.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kontactinterface-16.12.3.tar.xz";
-      sha256 = "0n5hvx3xp01krwwd2szgh1s6nn5spfns1ivc36i1gdbhkf871k98";
-      name = "kontactinterface-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kontactinterface-17.04.0.tar.xz";
+      sha256 = "15dd5mfgrqayfs522wj4c5lhvfv474whv7r5zimi9ngp0n4zwjl6";
+      name = "kontactinterface-17.04.0.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kopete-16.12.3.tar.xz";
-      sha256 = "1dkn4d13knf0lcj4241fmjcj51ypg9frzsf0pl02mr08rd2rxgk1";
-      name = "kopete-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kopete-17.04.0.tar.xz";
+      sha256 = "1wdk5i7vj5ssw65majvl0h7sn9h5npdb3v81m0qbp4m94zlv7njh";
+      name = "kopete-17.04.0.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/korganizer-16.12.3.tar.xz";
-      sha256 = "1724l321gzjwha8yhrans4lhzs39fs98xi7wbd5msfflzyg3l6ga";
-      name = "korganizer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/korganizer-17.04.0.tar.xz";
+      sha256 = "13mdxsvimlp0rvi2by1vg4aqmpamwszy35qi4wrynnq3ndn3cd1s";
+      name = "korganizer-17.04.0.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kpat-16.12.3.tar.xz";
-      sha256 = "04qvv7q7rlsiyff2isy18h2fbz2lnljal5spq5qg9zl6v8hx6qzm";
-      name = "kpat-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kpat-17.04.0.tar.xz";
+      sha256 = "0597z2pzxplcjsynkw9igs24fbsrj317xgyc0rmkgciilv0w69vy";
+      name = "kpat-17.04.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kpimtextedit-16.12.3.tar.xz";
-      sha256 = "06iz9l8z708kdivzibqkgdrbvw7kfd2lr2grf3v9l6gfl3qs1kbw";
-      name = "kpimtextedit-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kpimtextedit-17.04.0.tar.xz";
+      sha256 = "1050kc0d81kgqh6w44nahaddgpw1big2gwyxzdyvrvipkiipp42i";
+      name = "kpimtextedit-17.04.0.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kppp-16.12.3.tar.xz";
-      sha256 = "0lqv95zfzcik8k95a39s6whjsnq6g15amnxlzy898liyxkr499bc";
-      name = "kppp-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kppp-17.04.0.tar.xz";
+      sha256 = "1kiwc8rgh6vnvkpqsw2pz4cflwnsv0j86b8idkap6zh9vbajyln1";
+      name = "kppp-17.04.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kqtquickcharts-16.12.3.tar.xz";
-      sha256 = "1xzn9vxiqam8pk4zj8qcq55v9g52d9qkddbdv25pml8s0yhlsgqf";
-      name = "kqtquickcharts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kqtquickcharts-17.04.0.tar.xz";
+      sha256 = "0sq4xs4ispb50wcyibwln1d8vlh698d0pw408z8gzwvr384gf2bk";
+      name = "kqtquickcharts-17.04.0.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/krdc-16.12.3.tar.xz";
-      sha256 = "0visx3371ym78n9aqkln2akvvf0rphyxg5hxvc2981pgpdry20zq";
-      name = "krdc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/krdc-17.04.0.tar.xz";
+      sha256 = "1ryzk0k8xm9ych562qapjwawnljxz834vvwcnx2kv1n7gilqkdqh";
+      name = "krdc-17.04.0.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kremotecontrol-16.12.3.tar.xz";
-      sha256 = "0xcs8gvb7ack0xqdp99x04lyv6hbqgxa5nq44pxl7czzc0la5nbk";
-      name = "kremotecontrol-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kremotecontrol-17.04.0.tar.xz";
+      sha256 = "07w5fpwp4rjm8sdf6wadsf82a4f2igav8yb9m04pj70mymqhr4nn";
+      name = "kremotecontrol-17.04.0.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kreversi-16.12.3.tar.xz";
-      sha256 = "1qi6y263c8qp0bv9vmjk4rxq55mc0v1kn56yvivc5sfg9p4bqs9b";
-      name = "kreversi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kreversi-17.04.0.tar.xz";
+      sha256 = "075nmgnxlw2h743zj748xr6xdfj7w05ndyi85yfarpls5qf1qrz3";
+      name = "kreversi-17.04.0.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/krfb-16.12.3.tar.xz";
-      sha256 = "1ijz0zdlkxb9mldgd5a5k7aa2ikmmg023mafmxrjwymsig7ya4hv";
-      name = "krfb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/krfb-17.04.0.tar.xz";
+      sha256 = "11kavv3h0pvwqd0y6xxb08bliclszqh7ijvjgzazqhvwnd5pmsby";
+      name = "krfb-17.04.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kross-interpreters-16.12.3.tar.xz";
-      sha256 = "0z1n42imbhsx0qmx479sklnihwvbd5l5pigbpbpm80rgwda2ib57";
-      name = "kross-interpreters-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kross-interpreters-17.04.0.tar.xz";
+      sha256 = "17wgckmz17zrc7cbjl9zif1x8nq31551hsl8psnj1wpb78pv1b56";
+      name = "kross-interpreters-17.04.0.tar.xz";
     };
   };
   kruler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kruler-16.12.3.tar.xz";
-      sha256 = "08w7pb7wyaqnhwvqczxzbrbnm8930wzkl8y4lpimp5mqzb94i8qx";
-      name = "kruler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kruler-17.04.0.tar.xz";
+      sha256 = "1rkhrzn54l8bhd37gyc3l27frxgxlyh28cq73p7id87qa62wcya9";
+      name = "kruler-17.04.0.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksaneplugin-16.12.3.tar.xz";
-      sha256 = "1z0ziapcjmi7fqfnb0zsbjgd1q05np1s7smj1k8cd8c6f169yrld";
-      name = "ksaneplugin-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksaneplugin-17.04.0.tar.xz";
+      sha256 = "10w92awf66q8mg796pva6hrx8cjzhimg70bqldb4fb3nni5figrn";
+      name = "ksaneplugin-17.04.0.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kscd-16.12.3.tar.xz";
-      sha256 = "1mpba78m4hs8541n4ydz7vswq1chi0fmmlfw2kqnrzarcandyga0";
-      name = "kscd-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kscd-17.04.0.tar.xz";
+      sha256 = "0lrdjawim18bzd2z9328gdqrjklrkr6wlx3jlmh5bd8iw52akdxa";
+      name = "kscd-17.04.0.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kshisen-16.12.3.tar.xz";
-      sha256 = "17szjblrp172rvyl98x5a0g9yg29b85bmwkzk7pqnjbn387kgy9r";
-      name = "kshisen-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kshisen-17.04.0.tar.xz";
+      sha256 = "1l4f1akiagz4yhyxvvk14papnim8jfvikypkbsw3bqy1qbxbph93";
+      name = "kshisen-17.04.0.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksirk-16.12.3.tar.xz";
-      sha256 = "1akfskyfhffh71w2hknw9vvap2a2sq0irmkxij9xcdmlvpfwnkn5";
-      name = "ksirk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksirk-17.04.0.tar.xz";
+      sha256 = "0ifqyf6plgq0n60llncc1ipdnlqhwcr3ml86k3kch5w2gmypzyj0";
+      name = "ksirk-17.04.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksnakeduel-16.12.3.tar.xz";
-      sha256 = "1797kac3prchq5254dby41k04i8i7hgf2a9cb8s71n7hrsj62dyn";
-      name = "ksnakeduel-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksnakeduel-17.04.0.tar.xz";
+      sha256 = "1zjfca5qlmsqdx09958h7l169i1pvbgny800q8v6wxhc6c8h4g0r";
+      name = "ksnakeduel-17.04.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kspaceduel-16.12.3.tar.xz";
-      sha256 = "0ipx1sxhv207nlw7rcp7155l76z39x7j1b5y3qwxcgd7s69wb82k";
-      name = "kspaceduel-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kspaceduel-17.04.0.tar.xz";
+      sha256 = "0z4ffrpmij99ybhzl2dvg89a8whandggc24fxalpf01kxz4vw3v4";
+      name = "kspaceduel-17.04.0.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksquares-16.12.3.tar.xz";
-      sha256 = "0abd19hf1rvlzkxc4kvdljs5yk39pay81n3n9n0w6qyr764r4qn9";
-      name = "ksquares-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksquares-17.04.0.tar.xz";
+      sha256 = "0mzgwvf077jpzvka1hyw2vm93v9mqng8hnr2nzk38zxbjhb3fkf4";
+      name = "ksquares-17.04.0.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kstars-16.12.3.tar.xz";
-      sha256 = "0lcrn7r1nw85c0w6dg03mwf5lnsahmww60y6vwzfh2r53nbm9c1y";
-      name = "kstars-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kstars-17.04.0.tar.xz";
+      sha256 = "1hpadx9fq3bcdzq2lh9csxnlm96q5n1fmss1lkxby7hac28942fk";
+      name = "kstars-17.04.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksudoku-16.12.3.tar.xz";
-      sha256 = "00hi8x09fj5ahj0ah9rsci2dscrdl8x9mrlcacjrwgwm503y95gk";
-      name = "ksudoku-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksudoku-17.04.0.tar.xz";
+      sha256 = "0411s9dpzb6sicb2wcg5mv9sy7vi27lkrg7ssdna9k0wp0d9aqvs";
+      name = "ksudoku-17.04.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksystemlog-16.12.3.tar.xz";
-      sha256 = "0xd6pp02k84a1r6gy10x0br33g4awpbhx45j7n69l1s96szj4aki";
-      name = "ksystemlog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksystemlog-17.04.0.tar.xz";
+      sha256 = "162lclr2zx80cwqj0r1gm0cvijciab0rkhl5fyz8bb0xk7ihrimy";
+      name = "ksystemlog-17.04.0.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kteatime-16.12.3.tar.xz";
-      sha256 = "0wqzw9sa4zkgkwndvyas47x5wc4gcya3pmdcvg7wf7wl8j5k7vdy";
-      name = "kteatime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kteatime-17.04.0.tar.xz";
+      sha256 = "0rklccjb7qi4mir44fp71aiqxb44s9mwpd7aj6yda80ic8yafvhw";
+      name = "kteatime-17.04.0.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktimer-16.12.3.tar.xz";
-      sha256 = "0hpskwa8g88fz39b0y7sjl574s82d6smla1bhs8mdjlabv0sln6z";
-      name = "ktimer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktimer-17.04.0.tar.xz";
+      sha256 = "0px3dxndyhy0xi3s3pac2baw1a5g3a9hg46aj01mk1143z0l8nfz";
+      name = "ktimer-17.04.0.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktnef-16.12.3.tar.xz";
-      sha256 = "0v38h7bwjwab1656w3c2h1by5925f616idnvflgp123v1cs6jy1n";
-      name = "ktnef-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktnef-17.04.0.tar.xz";
+      sha256 = "1azy1j045br0xdzyc7nx8h7lvxzzwcvvv223c39d5s008d1i9xp8";
+      name = "ktnef-17.04.0.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktouch-16.12.3.tar.xz";
-      sha256 = "17gkvzczfgmip18y3jbjisz4z8m5hwbgkqn4qynabp6dqihwhzgg";
-      name = "ktouch-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktouch-17.04.0.tar.xz";
+      sha256 = "0d4d7mzjm2lnisih9i94sblspkdqvphqa0irk9ps1dyykdwhbw08";
+      name = "ktouch-17.04.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-accounts-kcm-16.12.3.tar.xz";
-      sha256 = "0pr191i9fmz66wlv8krmy1pba7igd1qwa0akb4kdzkm4bx3z8wq3";
-      name = "ktp-accounts-kcm-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-accounts-kcm-17.04.0.tar.xz";
+      sha256 = "0bh8s8yiajxxvlnisjlv4mg0v7p51vy5jncmqg6lrq3y29zycbwc";
+      name = "ktp-accounts-kcm-17.04.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-approver-16.12.3.tar.xz";
-      sha256 = "08aj2j9bjdyigl4cx65v5fjsdayid07mx0mq72iy6l17d8z4b39a";
-      name = "ktp-approver-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-approver-17.04.0.tar.xz";
+      sha256 = "06vcxq72idrx24l9y5mvbbxashaqdkv78ihx7qcxq9v8b2kv9ph0";
+      name = "ktp-approver-17.04.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-auth-handler-16.12.3.tar.xz";
-      sha256 = "08ryqkba9zngjabsp1b9w13psp0n97qhjd31id007hc6r6s1nxxx";
-      name = "ktp-auth-handler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-auth-handler-17.04.0.tar.xz";
+      sha256 = "0r0yp2xhi12wxk7yaqxwnxg27ccafxlcmn2pzsjf278azymyfral";
+      name = "ktp-auth-handler-17.04.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-call-ui-16.12.3.tar.xz";
-      sha256 = "1aq0s4v972kskjnq720364y971iyr0m6pj42fw5rpkl7j8vfg1rd";
-      name = "ktp-call-ui-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-call-ui-17.04.0.tar.xz";
+      sha256 = "1bpvisfg58dvpywhvwgb8n4vlai14f7wayzbw1a30344lhca1aql";
+      name = "ktp-call-ui-17.04.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-common-internals-16.12.3.tar.xz";
-      sha256 = "0g3vmds5f7wmffp9rv915bll8ky7qf3lz172ymc6q9i1xvghp215";
-      name = "ktp-common-internals-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-common-internals-17.04.0.tar.xz";
+      sha256 = "1bp2x8f4ymav53icdfxpmdd58kms676qgj5x4jnjbjypw9iyxy9j";
+      name = "ktp-common-internals-17.04.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-list-16.12.3.tar.xz";
-      sha256 = "05asblclq6sjd3d9faaj2ya37srf4lhg8jx705aw13wd5d6pk75w";
-      name = "ktp-contact-list-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-list-17.04.0.tar.xz";
+      sha256 = "1nldhg221kf9y0fakanj1kj47jrgz820ql766f2yb276y4da31cm";
+      name = "ktp-contact-list-17.04.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-runner-16.12.3.tar.xz";
-      sha256 = "1lcx9smfv2dqrwsbdd4srcq7dqap8bclz788p6jjn04xi6wcbbiq";
-      name = "ktp-contact-runner-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-runner-17.04.0.tar.xz";
+      sha256 = "13q31cqpmafimx0nk680z0szxgzanmcqr3xay78ndc9fsg21yc83";
+      name = "ktp-contact-runner-17.04.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-desktop-applets-16.12.3.tar.xz";
-      sha256 = "1pd8vzwmxcsw6pq80r9casi07wwisr70l5ffm231v9d73k4fw7kv";
-      name = "ktp-desktop-applets-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-desktop-applets-17.04.0.tar.xz";
+      sha256 = "0fihfqn5wzcxi7kj3lsnnimaiz4k5vzzcfx81rklf75d327lnkvx";
+      name = "ktp-desktop-applets-17.04.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-filetransfer-handler-16.12.3.tar.xz";
-      sha256 = "0ddmrpnh6myl7m3drh3cxx9pp06al98g8mppnysmgswgkwafg6cq";
-      name = "ktp-filetransfer-handler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-filetransfer-handler-17.04.0.tar.xz";
+      sha256 = "0xm9znnk38xy6z3ndb8i9yjkbx5jv240j4niaagr4kpnsfcmq0yk";
+      name = "ktp-filetransfer-handler-17.04.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-kded-module-16.12.3.tar.xz";
-      sha256 = "06zw8padspbn8ydcbs69v3ggmfpqrb3axxd2v1sgg4p4kdp0jyml";
-      name = "ktp-kded-module-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-kded-module-17.04.0.tar.xz";
+      sha256 = "04mng6j3fz1glfa3c4jx9360hd6blplnba02257s3vk2kqiah64i";
+      name = "ktp-kded-module-17.04.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-send-file-16.12.3.tar.xz";
-      sha256 = "1m7cj3q4lzj8qj2cla6wm1crpjid77b3f3yywri167f1zd4p51z6";
-      name = "ktp-send-file-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-send-file-17.04.0.tar.xz";
+      sha256 = "0iz544hn8s93dxf40vcg80fngq2mxzmmyzd4iwjxk218md86k9wn";
+      name = "ktp-send-file-17.04.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-text-ui-16.12.3.tar.xz";
-      sha256 = "0ssxr35vcqjppnppyjxwzrkzvb5sx45fpnvbzsv9md5rnlf2xh1k";
-      name = "ktp-text-ui-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-text-ui-17.04.0.tar.xz";
+      sha256 = "18yl0yb3ccwykxn24gyv9i6mw3xbz46mlgygrn7iswgwnrqpckwa";
+      name = "ktp-text-ui-17.04.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktuberling-16.12.3.tar.xz";
-      sha256 = "1vn35bn0x5ykd9j78q5apg1i14v546jrqq1yn2q178d9qmx79pgv";
-      name = "ktuberling-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktuberling-17.04.0.tar.xz";
+      sha256 = "0i9f5nf1zzvw7xgwi4j3g0bilmcknihh3f1as1mhxjgwfslk5xar";
+      name = "ktuberling-17.04.0.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kturtle-16.12.3.tar.xz";
-      sha256 = "1mpdwb6999nar16mpha30cf4qzmpbsdha44aw77gn301v215rwj3";
-      name = "kturtle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kturtle-17.04.0.tar.xz";
+      sha256 = "1f8bzfwjwlhvz8y1hm4if03kbllk85gdq3ih709xikj6vs922jqj";
+      name = "kturtle-17.04.0.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kubrick-16.12.3.tar.xz";
-      sha256 = "1bwr8xi4d58k94h7lpl02iqf87nxhpls33ca654kzy353awqbp7f";
-      name = "kubrick-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kubrick-17.04.0.tar.xz";
+      sha256 = "15njanlbqf73khgk42n7sqkhsy8zhdhxn45n2bq5ak5wirf1gqs9";
+      name = "kubrick-17.04.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwalletmanager-16.12.3.tar.xz";
-      sha256 = "07miaqr0yaqb0lkssb1jfg35cvr9svn16nhvb1zffvbf9fdlim47";
-      name = "kwalletmanager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwalletmanager-17.04.0.tar.xz";
+      sha256 = "0x8l9hzwwd97k8cj6nwgb6wyzx2zgral4sx98hasvg52cn82zfb1";
+      name = "kwalletmanager-17.04.0.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwave-16.12.3.tar.xz";
-      sha256 = "1s5zwhck204m5rkrpmbghzid3dpzhqbwsilb5pfh4128d04fx9ad";
-      name = "kwave-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwave-17.04.0.tar.xz";
+      sha256 = "1232sr45qbbdkafpbnz6ddbqabc5jasp43v5lyi3lhgppfz4gz43";
+      name = "kwave-17.04.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwordquiz-16.12.3.tar.xz";
-      sha256 = "1r8q2d6j7bq8jdr4cl9maapadzg7yp0zldjxkcqg08ldwsrrsnqj";
-      name = "kwordquiz-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwordquiz-17.04.0.tar.xz";
+      sha256 = "1wp8ccsamz6b2yk85i85r8a1r10r7b4lhxg82r8z5gv8im7g1glb";
+      name = "kwordquiz-17.04.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libgravatar-16.12.3.tar.xz";
-      sha256 = "0m726ixss72rz3gwgn7q5s34xwbghi877y7gxa1ilcrk9rhyxv2f";
-      name = "libgravatar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libgravatar-17.04.0.tar.xz";
+      sha256 = "06d5c2kn2l5rvg23frj5hhr0hnfx5ncmhr8dlqdxz0x7pmyjbign";
+      name = "libgravatar-17.04.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkcddb-16.12.3.tar.xz";
-      sha256 = "0iaascv9a5g8681mjc6b7f2fd8fdi9p3dx8l9lapkpzcygy1fwpc";
-      name = "libkcddb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkcddb-17.04.0.tar.xz";
+      sha256 = "0rfvq4g4d9l85p3jcqgs54bnskq2w5bqfw2j0jgizkdffk0dzvfj";
+      name = "libkcddb-17.04.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkcompactdisc-16.12.3.tar.xz";
-      sha256 = "021yws9854w6fwwfw31b87rpz92ach5xyq427968m3mc3c430d4l";
-      name = "libkcompactdisc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkcompactdisc-17.04.0.tar.xz";
+      sha256 = "1bfli5za4rcf6ixmd3j6g9xzh6d5cp9838m6c898317sac00b957";
+      name = "libkcompactdisc-17.04.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdcraw-16.12.3.tar.xz";
-      sha256 = "03ag6vzdj5n7zbb8yb9k84ckm1zwp2i9qqrsfn2mmmhypwknpg4w";
-      name = "libkdcraw-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdcraw-17.04.0.tar.xz";
+      sha256 = "191cqv8q43zg5s9f52bwyrj1visf39i03d1d9d74sj1lfw7ghqys";
+      name = "libkdcraw-17.04.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdegames-16.12.3.tar.xz";
-      sha256 = "0w7q7x04imwrdfj5zwgv0y49k4wi7a6ghqipyc5qmrwfg9ya85b3";
-      name = "libkdegames-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdegames-17.04.0.tar.xz";
+      sha256 = "0ydja5fmyrgkxjnbcxfgyz0x5m3ymkkp436z30ikx9d5s0kyhl6k";
+      name = "libkdegames-17.04.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdepim-16.12.3.tar.xz";
-      sha256 = "07afpxhvxpf50h10vg6vla543n4rvy1grldjj4aygwh1fgl5snm0";
-      name = "libkdepim-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdepim-17.04.0.tar.xz";
+      sha256 = "00whk97jkycxg6s3n6dsb5addkwwk4bs696brsm1vj93rffhbslf";
+      name = "libkdepim-17.04.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkeduvocdocument-16.12.3.tar.xz";
-      sha256 = "05s79q269m5s78zjwxljxvprrqvpalf6h38n90m589vks82ahxx0";
-      name = "libkeduvocdocument-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkeduvocdocument-17.04.0.tar.xz";
+      sha256 = "0c1rj2rds7q779rfapn79w00qzdfhla8bngbnpa8s2qghb965lff";
+      name = "libkeduvocdocument-17.04.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkexiv2-16.12.3.tar.xz";
-      sha256 = "02fr10prqmpaqqlcj8hf5h4b3vhhiwkfsbpzlag64n5764x1hl3f";
-      name = "libkexiv2-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkexiv2-17.04.0.tar.xz";
+      sha256 = "07iwwfvj27m4m9h81jsrabyqamhh9gyqx1k265jxq4nll68nh0px";
+      name = "libkexiv2-17.04.0.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkface-16.12.3.tar.xz";
-      sha256 = "068xixlw0hfhi3c9nxik2y6xyci1ilwwfq4sjm1paqfszp0f4rq8";
-      name = "libkface-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkface-17.04.0.tar.xz";
+      sha256 = "1bazry6pmmdppmpr7fdzj61cykk9h4kwz67zay7vck0jk77n5myr";
+      name = "libkface-17.04.0.tar.xz";
+    };
+  };
+  libkgapi = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/libkgapi-17.04.0.tar.xz";
+      sha256 = "0m3walc6hw5nmsr0cjlspczjlc90jzqam8xk32if5pl8bynmgh4c";
+      name = "libkgapi-17.04.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkgeomap-16.12.3.tar.xz";
-      sha256 = "1zz2w7cbabyrvzvw2ph38mxw7khyhjzg86na2lcywla7japlbsd9";
-      name = "libkgeomap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkgeomap-17.04.0.tar.xz";
+      sha256 = "1la4pggz7kbppmhvdv4g4szh3dyw4d3kas2m00xdvfbdjmmxswp3";
+      name = "libkgeomap-17.04.0.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkipi-16.12.3.tar.xz";
-      sha256 = "0f1m0v0cm11dqwm3n9w1mwz25sj3bggx19fi0jj4ij7zqicpykz6";
-      name = "libkipi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkipi-17.04.0.tar.xz";
+      sha256 = "0yzg9dml7yjqmp1niqc003baxavvr4bprkpvahigh84r4kxbba6a";
+      name = "libkipi-17.04.0.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkleo-16.12.3.tar.xz";
-      sha256 = "0rzp2bxqij9fkdsghskd2f05vgcybdc9l7wdrjqhhcngi8qxl0nn";
-      name = "libkleo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkleo-17.04.0.tar.xz";
+      sha256 = "1bx9g4dc1h7vy3157nshlyn3m42x88dzffhcix9kw6cw5c5zfinl";
+      name = "libkleo-17.04.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkmahjongg-16.12.3.tar.xz";
-      sha256 = "0fhz7jp4wcvjcicyiwc4qq4vviwagfjdy6n5bhv7bmlccq4xfk5x";
-      name = "libkmahjongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkmahjongg-17.04.0.tar.xz";
+      sha256 = "0q6n15aa9hqh3i7fm6c7q37p38clasc2xqvyz1nha5s8rkm0dw73";
+      name = "libkmahjongg-17.04.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkomparediff2-16.12.3.tar.xz";
-      sha256 = "1hm2d6217qwxsq6nyyh7iv573zkkmcn68x188zav48kmydj45l9i";
-      name = "libkomparediff2-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkomparediff2-17.04.0.tar.xz";
+      sha256 = "0p3iys22f21fqz31dxnrrc1kkz234zrpfcv5dj9kwh114va64j5r";
+      name = "libkomparediff2-17.04.0.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libksane-16.12.3.tar.xz";
-      sha256 = "0406jdzs193scmb8rkx2fqcr2a0svz53sf1av9qi2nq9dnil9hcq";
-      name = "libksane-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libksane-17.04.0.tar.xz";
+      sha256 = "1yr21f0mvvgb2p29rfp8b6c33pfz893wk1xqdfsbiar7p1l4by46";
+      name = "libksane-17.04.0.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libksieve-16.12.3.tar.xz";
-      sha256 = "1riqsfl3x4vpwqv7398gj86hnwfzqwfj7d69wsxk3r02jp3xd9i2";
-      name = "libksieve-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libksieve-17.04.0.tar.xz";
+      sha256 = "04bb0k06p384p0a0i02kj80a1kszcg6nfjal227mmj4qdra9i0nf";
+      name = "libksieve-17.04.0.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/lokalize-16.12.3.tar.xz";
-      sha256 = "17ikk89680jjzv95gnrzah4bi3xnyp5mi64prhblhw7kz6vlf8x0";
-      name = "lokalize-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/lokalize-17.04.0.tar.xz";
+      sha256 = "1gjlidbhkx0alcydc8z7pi4m5gzhcj0bqpascj905vk72az0by8j";
+      name = "lokalize-17.04.0.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/lskat-16.12.3.tar.xz";
-      sha256 = "02mqb4c650ydy9qp3qg1avrj0m0a8yxmg0zw6hcv5pvckgfpcxki";
-      name = "lskat-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/lskat-17.04.0.tar.xz";
+      sha256 = "06nk276dsbrbw6jilh3kpjcf1nlx8vbqkl61g15m8dbhrrz833rd";
+      name = "lskat-17.04.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mailcommon-16.12.3.tar.xz";
-      sha256 = "1sx7dgy9jad6vqp1dljg9m40x57zz6xy9d2f1lgab5ibs1lrjhq5";
-      name = "mailcommon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mailcommon-17.04.0.tar.xz";
+      sha256 = "1lbvzgbsn1fh96m1ck56dafsglbq7f71w9wknwm7d3afl8jp2rr6";
+      name = "mailcommon-17.04.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mailimporter-16.12.3.tar.xz";
-      sha256 = "08yj4i6jy08hk62mxw299sh2n5pknzxanmzr96n6lf8g1jcf2l21";
-      name = "mailimporter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mailimporter-17.04.0.tar.xz";
+      sha256 = "1dpvxp704cmaj1yzp2wbib4avlwmgmbizrr19mssby467qb09j6z";
+      name = "mailimporter-17.04.0.tar.xz";
     };
   };
   marble = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/marble-16.12.3.tar.xz";
-      sha256 = "08dykrmiq1jk9yv83sjj6s3gps56bw0hxjbvb90bzd1g0kh0c82j";
-      name = "marble-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/marble-17.04.0.tar.xz";
+      sha256 = "0w47v85brj18g2s63axqmfrqz6hs5fq1vvbs7gr6gyirw9vbg2ka";
+      name = "marble-17.04.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mbox-importer-16.12.3.tar.xz";
-      sha256 = "04sxijnyr13yjqkd1wm14bxm3k7r17dv24mfb3kbf804s7g8hvq7";
-      name = "mbox-importer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mbox-importer-17.04.0.tar.xz";
+      sha256 = "1jbia6zxcammk58hlyawhwr6j9022vvw69r0vsqnczys0qw3cbyd";
+      name = "mbox-importer-17.04.0.tar.xz";
     };
   };
   messagelib = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/messagelib-16.12.3.tar.xz";
-      sha256 = "1s5r5w231lzy3csljd5qil54ibm9mjs7c9hbw1whqmn4kd0vaz15";
-      name = "messagelib-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/messagelib-17.04.0.tar.xz";
+      sha256 = "0qcrfbzx8mw88wdjzrd8ipj2pi5l14yka0bhrw1zmsm0p1f0n34h";
+      name = "messagelib-17.04.0.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/minuet-16.12.3.tar.xz";
-      sha256 = "15c0mw8qj7r6192h39lvsmiy3pqlfqzari4qjg2x44j5gq02ab3c";
-      name = "minuet-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/minuet-17.04.0.tar.xz";
+      sha256 = "02m2l7d9703j2ci386wy9vxyllxqf177d2bcdhcx5iqlq4194jks";
+      name = "minuet-17.04.0.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/okteta-16.12.3.tar.xz";
-      sha256 = "14wmacbxc5kc3y5y5lsdxgsswi1jdvlxsd0xqcims50xjpb8znpd";
-      name = "okteta-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/okteta-17.04.0.tar.xz";
+      sha256 = "12d2hr8dw6qjhcza9ly3nkglll703cq1ywz7icp4x2xdklsv2qyv";
+      name = "okteta-17.04.0.tar.xz";
     };
   };
   okular = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/okular-16.12.3.tar.xz";
-      sha256 = "1gilr9nviv51pcnmqdfw7834knvyfd11ggdjvinxvbpz61832niv";
-      name = "okular-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/okular-17.04.0.tar.xz";
+      sha256 = "00wqflixzzn0blxd0anrfs1kjhrknny18ia95wxh0zpafvi1ga74";
+      name = "okular-17.04.0.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/palapeli-16.12.3.tar.xz";
-      sha256 = "13s9ybj8a1f39z66syj88vx8rygdbb969b1d5r01msav3lk8ar3j";
-      name = "palapeli-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/palapeli-17.04.0.tar.xz";
+      sha256 = "1hjspg44py4rqzqr5w6f0lw6nz4ilwgr701s1m1pw4q0f6j80b6i";
+      name = "palapeli-17.04.0.tar.xz";
     };
   };
   parley = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/parley-16.12.3.tar.xz";
-      sha256 = "0vmbn8188brp4bysyzmkgsa8nnn9zdqb7q6x3mi1xg7ralzfjw71";
-      name = "parley-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/parley-17.04.0.tar.xz";
+      sha256 = "0i4nhwz7b7gmnlq72limp6cpsjaccc03i5qr2pdv8hb2336nabc7";
+      name = "parley-17.04.0.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/picmi-16.12.3.tar.xz";
-      sha256 = "0v44n05b6v46qmfrgq6b0q8bifnz5ax1f6sjrg6940q99kp2cxx4";
-      name = "picmi-16.12.3.tar.xz";
-    };
-  };
-  pimcommon = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pimcommon-16.12.3.tar.xz";
-      sha256 = "179ig6rwxil1ssm7k2cy7ny3vf2dbhsjn39c0ic70r03q3lzbhll";
-      name = "pimcommon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/picmi-17.04.0.tar.xz";
+      sha256 = "0289qq4f4njv6yb9hg61ap17q2fvaandyxa8kz68v3yc7jlpsvlw";
+      name = "picmi-17.04.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-data-exporter-16.12.3.tar.xz";
-      sha256 = "14xvh2gn3vc3i94fv96xbv7gxnwj8xxg3zkgfdlayajp3sz7c3yw";
-      name = "pim-data-exporter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pim-data-exporter-17.04.0.tar.xz";
+      sha256 = "1j8qdr9hdjzj6jn94hq771mnfwspqwb47nrrj25ghbl6d8b19qfd";
+      name = "pim-data-exporter-17.04.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-sieve-editor-16.12.3.tar.xz";
-      sha256 = "03gnq2hlvw92gg8rf2bwrvf83nrgcvy6xanvwn3vcrqjfg55vb1k";
-      name = "pim-sieve-editor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pim-sieve-editor-17.04.0.tar.xz";
+      sha256 = "0l7vbgzjrkpvad0q8yhcgx78xcxs0llgmqg7madv06lnxbry02yf";
+      name = "pim-sieve-editor-17.04.0.tar.xz";
     };
   };
-  pim-storage-service-manager = {
-    version = "16.12.3";
+  pimcommon = {
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-storage-service-manager-16.12.3.tar.xz";
-      sha256 = "0ii1f5gv430i8h2c4xdy35rz7w9py53xans8zwgpj6ir6x6gfkb0";
-      name = "pim-storage-service-manager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pimcommon-17.04.0.tar.xz";
+      sha256 = "1k04zfmzvjpnjwjr42p4ixkwnl1raxr9mpqb13qhr9ln4qsnsq4h";
+      name = "pimcommon-17.04.0.tar.xz";
     };
   };
   poxml = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/poxml-16.12.3.tar.xz";
-      sha256 = "1cpc49hnslc2iabgnvda7967mmrdzykjydi8py67ycr9k1gx6pm5";
-      name = "poxml-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/poxml-17.04.0.tar.xz";
+      sha256 = "1chl7mizmgvmzhi0pz111p2lkpmh4j4nbn7hfaksmvmvrlrcjj8z";
+      name = "poxml-17.04.0.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/print-manager-16.12.3.tar.xz";
-      sha256 = "1mjzqq7yhm1s4jbr6nhy1i1lm27134j6g7b04mmzk3hbgd8lkr99";
-      name = "print-manager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/print-manager-17.04.0.tar.xz";
+      sha256 = "10zkf8azgn79rq9b0amhaanngfd1pv51zr7qy10z5jd62bxxcf8n";
+      name = "print-manager-17.04.0.tar.xz";
     };
   };
   rocs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/rocs-16.12.3.tar.xz";
-      sha256 = "17iz9ql988mj1vsvywd8w5w7qmbncxal71maf3rldadwmadkvzbl";
-      name = "rocs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/rocs-17.04.0.tar.xz";
+      sha256 = "0jb7nwg73kagw0mrwhx7nph5m2nsq7220hr5bfcnndw1in5bwnbx";
+      name = "rocs-17.04.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/signon-kwallet-extension-16.12.3.tar.xz";
-      sha256 = "0fnqdcin471hlw694vb6z9ybgw31778rhnryc7zps40kjwfdxhcc";
-      name = "signon-kwallet-extension-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/signon-kwallet-extension-17.04.0.tar.xz";
+      sha256 = "1amvrrwsfh7d9c284ksvqm4x9f4d36abbq2fal4sicplqp4ag4z0";
+      name = "signon-kwallet-extension-17.04.0.tar.xz";
     };
   };
   spectacle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/spectacle-16.12.3.tar.xz";
-      sha256 = "1fca71a59sgicq9zi8d0im0xpg7iz93s96h3clxxc6p493vsjkx6";
-      name = "spectacle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/spectacle-17.04.0.tar.xz";
+      sha256 = "0vmmyvbsiffj9g49f39dar6b34rk8badpah3rzq4af0xzhlc0z0y";
+      name = "spectacle-17.04.0.tar.xz";
     };
   };
   step = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/step-16.12.3.tar.xz";
-      sha256 = "0pyvhlfrklc2xxylb0nlnpqx5xi0pp4zyb3xbzj87wmvcw7v5n6r";
-      name = "step-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/step-17.04.0.tar.xz";
+      sha256 = "0j9wlys17rdrnq2l0cprnw4pp2ks439ihyx4v1m4sdrxsvqxz4lw";
+      name = "step-17.04.0.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/svgpart-16.12.3.tar.xz";
-      sha256 = "0frzqp504dzqwqs9lh544xxa8i6sqi6qj533mqbzkqbjx310ka3w";
-      name = "svgpart-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/svgpart-17.04.0.tar.xz";
+      sha256 = "0yv9a7ndfix41f875hw9fy9snqdanchvqb87rbm09dhc0fniwnir";
+      name = "svgpart-17.04.0.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/sweeper-16.12.3.tar.xz";
-      sha256 = "1vf4840l233gji4sjkg9gz2pr98kin5sz37kj645z75vikwmk3al";
-      name = "sweeper-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/sweeper-17.04.0.tar.xz";
+      sha256 = "08jbp2kdlchvzmd9kpilypvm9466niyc4cwmya6crnn7khn03c05";
+      name = "sweeper-17.04.0.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/syndication-16.12.3.tar.xz";
-      sha256 = "11qa0jya3fjvhwsq98aag92ha20y7x758fvc4xi3800rbj8nlc58";
-      name = "syndication-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/syndication-17.04.0.tar.xz";
+      sha256 = "1irmjs40ghyx9vx1d5x30x34s8vwrqm7j6xf7m2s7s63jmmsk5w2";
+      name = "syndication-17.04.0.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/umbrello-16.12.3.tar.xz";
-      sha256 = "1a4jhfmh2p1vsx8702ham550blkjj42ibwigcink6s9cadwk90cl";
-      name = "umbrello-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/umbrello-17.04.0.tar.xz";
+      sha256 = "0dkarqk4a3y4npk2nyyydizll4kmlg1lgddwx49gsvh120fy1zfn";
+      name = "umbrello-17.04.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/zeroconf-ioslave-16.12.3.tar.xz";
-      sha256 = "0p7kfx7bg3yvd44vg608s2znzfahkihan67zgyf3gmjllbzvp55b";
-      name = "zeroconf-ioslave-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/zeroconf-ioslave-17.04.0.tar.xz";
+      sha256 = "1m149lmjfh6nxkbax2vifirwi6jsp5jqzfai7kcyvzwp60ff6y0z";
+      name = "zeroconf-ioslave-17.04.0.tar.xz";
     };
   };
 }

From 053732006231549313533319544dedcdf0abc458 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 24 Apr 2017 20:01:22 +0300
Subject: [PATCH 1463/1744] networkmanager: Temporarily disable
 -Wformat-security until next release

Reportedly this is due to GLib 2.52 which added a G_GNUC_PRINTF attribute to
g_dbus_message_new_method_error().
---
 pkgs/tools/networking/network-manager/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fd470143a3c..58e5e9343a7 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   pname   = "NetworkManager";
   major   = "1.6";
   version = "${major}.2";
+  # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^
+  hardeningDisable = [ "format" ];
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";

From 9437c36f19d39c11d0bd3f1c526d7f84265d2c04 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 24 Apr 2017 20:31:36 +0300
Subject: [PATCH 1464/1744] perlPackages.ModuleBuild: 0.4214 -> 0.4222

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bd28201bb66..4faea93ec47 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8397,10 +8397,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleBuild = buildPerlPackage rec {
-    name = "Module-Build-0.4214";
+    name = "Module-Build-0.4222";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz";
-      sha256 = "0gywap0dfr8sx4wr6wqc23sjag1b4xsw8l55ai4vhkfg324lhyf5";
+      sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7";
     };
     buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {

From bef52786646f997fb4c2997f23e33b4e720fcef3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 14 Feb 2017 21:50:36 -0500
Subject: [PATCH 1465/1744] top-level: Common subexpression elimination for
 cc-wrapper usage

 - `ccWrapperFun` can be used in a few more places instead of
   duplicating its definition.

 - `ccWrapper` parameter on `wrapCC` is always substituted with
   `ccWrapperFun` so just get rid of that parameter.
---
 pkgs/top-level/all-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689b3082c0f..91337d67bb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1636,7 +1636,7 @@ with pkgs;
   emscripten = callPackage ../development/compilers/emscripten { };
 
   emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
-  emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
+  emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc ''
     # hardening flags break WASM support
     cat > $out/nix-support/add-hardening.sh
   '' emscriptenfastcomp-unwrapped;
@@ -4885,7 +4885,7 @@ with pkgs;
 
   clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
-  clangWrapSelf = build: callPackage ../build-support/cc-wrapper {
+  clangWrapSelf = build: ccWrapperFun {
     cc = build;
     isClang = true;
     stdenv = clangStdenv;
@@ -4954,8 +4954,8 @@ with pkgs;
         extraBuildCommands = ''
           echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
         '';
-      in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override {
-        stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc);
+      in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override {
+        stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc);
         profiledCompiler = false;
         enableMultilib = true;
       }))
@@ -5713,7 +5713,7 @@ with pkgs;
 
   wla-dx = callPackage ../development/compilers/wla-dx { };
 
-  wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
+  wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun {
     nativeTools = stdenv.cc.nativeTools or false;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
@@ -5726,7 +5726,7 @@ with pkgs;
 
   ccWrapperFun = callPackage ../build-support/cc-wrapper;
 
-  wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc "";
+  wrapCC = wrapCCWith stdenv.cc.libc "";
   # legacy version, used for gnat bootstrapping
   wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
     nativeTools = stdenv.cc.nativeTools or false;

From c90998d5cf8b8d7983f5f547546ee9ef2ad11688 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 24 Apr 2017 21:23:56 +0300
Subject: [PATCH 1466/1744] Revert "rustc: don't build on i686"

This reverts commit 9f86136cefbd3e050b96a307346278fe9ad8a5bf.

Rust is nowadays required for building Firefox, so the channel updates
are blocked on this.

(It also builds fine for me.)
---
 pkgs/development/compilers/rust/rustc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index f2fe7fbca7a..a693afb8b59 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -153,6 +153,6 @@ stdenv.mkDerivation {
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
     license = [ licenses.mit licenses.asl20 ];
-    platforms = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin);
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 9fae0f3f38e0428bc16d83fd12beff10edd8a317 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 24 Apr 2017 02:39:01 +0000
Subject: [PATCH 1467/1744] google-compute-image: switch to use the common
 make-disk-image.nix

---
 .../virtualisation/google-compute-image.nix   | 100 +++---------------
 1 file changed, 16 insertions(+), 84 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 5673d55b339..d41bb71f4cb 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -2,7 +2,7 @@
 
 with lib;
 let
-  diskSize = "1G";
+  diskSize = 1024; # MB
 in
 {
   imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
@@ -10,89 +10,21 @@ in
   # https://cloud.google.com/compute/docs/tutorials/building-images
   networking.firewall.enable = mkDefault false;
 
-  system.build.googleComputeImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "google-compute-image"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/$diskImageBase
-              truncate $diskImage --size ${diskSize}
-              mv closure xchg/
-            '';
-
-          postVM =
-            ''
-              PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
-              pushd $out
-              mv $diskImageBase disk.raw
-              tar -Szcf $diskImageBase.tar.gz disk.raw
-              rm $out/disk.raw
-              popd
-            '';
-          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create partition table
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
-          ${pkgs.parted}/sbin/parted /dev/vda print
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
-
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-
-          mkdir /mnt
-          mount /dev/vda1 /mnt
-
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
-
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
-
-          mkdir -p /mnt/nix/store
-          echo "copying everything (will take a while)..."
-          ${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/
-
-          # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
-
-          # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package.out}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
-              --option build-users-group ""
-
-          # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
-
-          # `switch-to-configuration' requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          # Install a configuration.nix.
-          mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
-
-          # Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
+  system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
+    name = "google-compute-image";
+    postVM = ''
+      PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
+      pushd $out
+      mv $diskImage disk.raw
+      tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.tar.gz disk.raw
+      rm $out/disk.raw
+      popd
+    '';
+    configFile = ./google-compute-config.nix;
+    format = "raw";
+    inherit diskSize;
+    inherit config lib pkgs;
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";

From 027734526554051a1acefd0bcc2e191a9c63a091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 24 Apr 2017 20:43:16 +0200
Subject: [PATCH 1468/1744] nixos, i2pd: remove, no longer needed, extip hack

---
 nixos/modules/services/networking/i2pd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 24a3196bed4..4e176353fc2 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,8 +8,6 @@ let
 
   homeDir = "/var/lib/i2pd";
 
-  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
-
   mkEndpointOpt = name: addr: port: {
     enable = mkEnableOption name;
     name = mkOption {
@@ -152,9 +150,8 @@ let
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
-    ${if isNull cfg.extIp then extip else ""}
     ${pkgs.i2pd}/bin/i2pd \
-      --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
+      ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
       --conf=${i2pdConf} \
       --tunconf=${i2pdTunnelConf}
   '';

From afcf15bc8007a40cae4d17973889581043a7f11d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 16 Apr 2017 18:00:24 +0200
Subject: [PATCH 1469/1744] pythonPackages.pygit2: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 78c7dd68228..3222e4f1155 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19639,11 +19639,11 @@ in {
   };
 
   pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.24.0";
+    name = "pygit2-0.25.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pygit2/${name}.tar.gz";
-      sha256 = "01c155ls0h5pvpdkrk8ld6fscshmz4fchcwxrg488dbij1zdjxms";
+      sha256 = "0wf5rp0fvrw7j3j18dvwjq6xqlbm611wd55aphrfpps0v1gxh3ny";
     };
 
     preConfigure = ( if stdenv.isDarwin then ''

From e74ea4282a7922fd73655de863315854d322ea8d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Apr 2017 15:10:24 +0200
Subject: [PATCH 1470/1744] avahi service: add reflector option

---
 nixos/modules/services/networking/avahi-daemon.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 3985f8561d3..f4d0fc822de 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -33,6 +33,9 @@ let
     publish-hinfo=${yesNo publish.hinfo}
     publish-workstation=${yesNo publish.workstation}
     publish-domain=${yesNo publish.domain}
+
+    [reflector]
+    enable-reflector=${yesNo reflector}
   '';
 
 in
@@ -113,6 +116,11 @@ in
         description = ''Whether to enable wide-area service discovery.'';
       };
 
+      reflector = mkOption {
+        default = false;
+        description = ''Reflect incoming mDNS requests to all allowed network interfaces.'';
+      };
+
       publish = {
         enable = mkOption {
           default = false;

From e68c3f0b336cb387233e10b6b4a2180573ae70c7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 21:45:53 +0200
Subject: [PATCH 1471/1744] atlassian-confluence: 6.0.3 -> 6.1.1

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

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 579cd9f4a0e..aafb30441d7 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.0.3";
+  version = "6.1.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7";
+    sha256 = "0klb8hxsmgcwjcp20xa7823jm040q7wdqicc6g7s27gjzvbqj800";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];

From fee8d87d483949b3c4a2483113eb5c0ff5313a17 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 21:46:09 +0200
Subject: [PATCH 1472/1744] atlassian-jira: 7.3.0 -> 7.3.4

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

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index d0a278d2ef0..1f2601ab0d5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.3.0";
+  version = "7.3.4";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0";
+    sha256 = "0xkwf8n37hwv52rl3dbqkacr1fyxz4bd7gkcmpg0wshnxmyq4vg7";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From bede043070c8943fb9c2513b4cbea076434f5c55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 24 Apr 2017 20:23:27 +0200
Subject: [PATCH 1473/1744] libytnef: init at 1.9.2

---
 .../libraries/libytnef/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/libytnef/default.nix

diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
new file mode 100644
index 00000000000..cbf675af4da
--- /dev/null
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "libytnef-${version}";
+  version = "1.9.2";
+
+  src = fetchFromGitHub {
+    owner = "Yeraze";
+    repo = "ytnef";
+    rev = "v${version}";
+    sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
+    license = licenses.gpl2Plus;
+    platform = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cd35174ed9..2583483407d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9019,6 +9019,8 @@ with pkgs;
 
   libykneomgr = callPackage ../development/libraries/libykneomgr { };
 
+  libytnef = callPackage ../development/libraries/libytnef { };
+
   libyubikey = callPackage ../development/libraries/libyubikey { };
 
   libzen = callPackage ../development/libraries/libzen { };
@@ -13157,6 +13159,7 @@ with pkgs;
 
   claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (gnome3) gsettings_desktop_schemas;
+    inherit (xorg) libSM;
     enableNetworkManager = config.networking.networkmanager.enable or false;
   };
 

From 07cc3eb0d005938fa44a0580688400f0129efbd7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 24 Apr 2017 20:23:44 +0200
Subject: [PATCH 1474/1744] claws-mail: 3.14.1 -> 3.15.0

---
 .../networking/mailreaders/claws-mail/default.nix    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 7186917269d..af1829b8622 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -2,7 +2,7 @@
 , curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme
 , libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
 , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
-, glib_networking, gsettings_desktop_schemas
+, glib_networking, gsettings_desktop_schemas, libSM, libytnef
 
 # Build options
 # TODO: A flag to build the manual.
@@ -32,23 +32,27 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.14.1";
+  version = "3.15.0";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp";
+    sha256 = "0bnwd3l04y6j1nw3h861rdy6k6lyjzsi51j04d33vbpq8c6jskaf";
   };
 
   patches = [ ./mime.patch ];
 
+  hardeningDisable = [ "format" ];
+
   postPatch = ''
     substituteInPlace src/procmime.c \
         --subst-var-by MIMEROOTDIR ${shared_mime_info}/share
   '';
 
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
   buildInputs =
     [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme
-      libetpan perl pkgconfig python wrapGAppsHook glib_networking
+      libetpan perl python glib_networking libSM libytnef
     ]
     ++ optional enableSpellcheck enchant
     ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]

From 2165b48e4afbce5f7f70195c50c78605c6dcb100 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@tumblr.com>
Date: Wed, 22 Mar 2017 15:09:57 -0400
Subject: [PATCH 1475/1744] percona-server56: init at 5.6.35-80.0

---
 pkgs/servers/sql/percona/5.6.x.nix | 61 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  3 ++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/servers/sql/percona/5.6.x.nix

diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
new file mode 100644
index 00000000000..a394d584536
--- /dev/null
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
+
+stdenv.mkDerivation rec {
+  name = "percona-server-${version}";
+  version = "5.6.35-80.0";
+
+  src = fetchurl {
+    url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz";
+    sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5";
+  };
+
+  buildInputs = [ cmake bison ncurses openssl zlib libaio perl ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DFEATURE_SET=community"
+    "-DBUILD_CONFIG=mysql_release"
+    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    "-DWITH_SSL=yes"
+    "-DWITH_READLINE=no"
+    "-DWITH_EMBEDDED_SERVER=no"
+    "-DWITH_EDITLINE=bundled"
+    "-DWITH_ZLIB=yes"
+    "-DHAVE_IPV6=no"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_SYSCONFDIR=etc/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
+    "-DINSTALL_MANDIR=share/man"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_SCRIPTDIR=bin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
+    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
+  ];
+
+  NIX_LDFLAGS = "-lgcc_s";
+
+  prePatch = ''
+    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+  '';
+  postInstall = ''
+    sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
+    rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a
+    rm $out/share/man/man1/mysql-test-run.pl.1
+  '';
+
+  passthru.mysqlVersion = "5.6";
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.percona.com";
+    description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ grahamc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 353cbc4e375..63cefddb6d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10898,6 +10898,9 @@ with pkgs;
 
   mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
 
+  percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
+  percona-server = percona-server56;
+
   riak = callPackage ../servers/nosql/riak/2.2.0.nix {
     erlang = erlang_basho_R16B02;
   };

From 4585fdb9d462d8f91ca819f7c0b398cfc47745db Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@tumblr.com>
Date: Mon, 10 Apr 2017 10:50:05 -0400
Subject: [PATCH 1476/1744] qemu module: add virtualisation.cores option

QEMU can allow guests to access more than one host core at a time.
Previously, this had to be done via ad-hoc arguments:

    virtualisation.qemu.options = ["-smp 12"];

Now you can simply specify:

    virtualisation.cores = 12;
---
 nixos/modules/virtualisation/qemu-vm.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 1933f11d1ff..c75edfcd8cf 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -75,6 +75,7 @@ let
       exec ${qemu}/bin/qemu-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
+          -smp ${toString config.virtualisation.cores} \
           ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
           ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
           -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
@@ -244,6 +245,18 @@ in
           '';
       };
 
+    virtualisation.cores =
+      mkOption {
+        default = 1;
+        type = types.int;
+        description =
+          ''
+            Specify the number of cores the guest is permitted to use.
+            The number can be higher than the available cores on the
+            host system.
+          '';
+      };
+
     virtualisation.pathsInNixDB =
       mkOption {
         default = [];

From d4fb8cfc0998bd9c66bc384abf246c9bf303d092 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 15:25:52 -0400
Subject: [PATCH 1477/1744] linux-headers: Remove stray linux headers 3.18 nix
 file

In dced724c009a1646475373cc597ada385d46bde6 this derivation was
unexposed along (in all-packages.nix) with the removal of linux 3.18[1].
I think this file was left behind by mistake.

[1]: https://github.com/NixOS/nixpkgs/commit/dced724c009a1646475373cc597ada385d46bde6#diff-036410e9211b4336186fc613f7200b12L11174
---
 .../os-specific/linux/kernel-headers/3.18.nix | 74 -------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/3.18.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/3.18.nix b/pkgs/os-specific/linux/kernel-headers/3.18.nix
deleted file mode 100644
index 22650747ba2..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/3.18.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, fetchurl, perl, cross ? null }:
-
-assert cross == null -> stdenv.isLinux;
-
-let
-
-  version = "3.18.14";
-
-  kernelHeadersBaseConfig =
-    if cross == null
-    then stdenv.platform.kernelHeadersBaseConfig
-    else cross.platform.kernelHeadersBaseConfig;
-
-in
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i";
-  };
-
-  targetConfig = if cross != null then cross.config else null;
-
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  buildInputs = [perl];
-
-  # FIXME needs gcc 4.9 in bootstrap tools
-  hardeningDisable = [ "stackprotector" ];
-
-  extraIncludeDirs =
-    if cross != null then
-        (if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  buildPhase = ''
-    if test -n "$targetConfig"; then
-       export ARCH=$platform
-    fi
-    make ${kernelHeadersBaseConfig} SHELL=bash
-    make mrproper headers_check SHELL=bash
-  '';
-
-  installPhase = ''
-    make INSTALL_HDR_PATH=$out headers_install
-
-    # Some builds (e.g. KVM) want a kernel.release.
-    mkdir -p $out/include/config
-    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 stdenv.lib; {
-    description = "Header files and scripts for Linux kernel";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}

From 18de0c3ae56a13f41f38fb52cd899247fd4e1248 Mon Sep 17 00:00:00 2001
From: panaeon <vitalii.voloshyn@gmail.com>
Date: Sun, 23 Apr 2017 18:22:59 +0300
Subject: [PATCH 1478/1744] skypeforlinux: init at 5.1.0.1; added myself as
 maintainer

---
 lib/maintainers.nix                           |   1 +
 .../skypeforlinux/default.nix                 | 101 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 104 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bb8ca565dfd..2fa7ca882e1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -388,6 +388,7 @@
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
+  panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";
   paperdigits = "Mica Semrick <mica@silentumbrella.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   patternspandemic = "Brad Christensen <patternspandemic@live.com>";
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
new file mode 100644
index 00000000000..20abda9ea6f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchurl, dpkg, makeWrapper
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
+, libnotify, nspr, nss, systemd, xorg }:
+
+let
+
+  version = "5.1.0.1";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+
+    gnome2.GConf
+    gnome2.gdk_pixbuf
+    gnome2.gtk
+    gnome2.pango
+
+    gnome2.gnome_keyring
+    
+    libnotify
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+    xorg.libxcb
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://repo.skype.com/latest/skypeforlinux-64.deb";
+        sha256 = "18v861x0n2q2jaglap8193sia476dwkwr0ccfzl29mi5ijma24ml";
+      }
+    else
+      throw "Skype for linux is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "skypeforlinux-${version}";
+
+  system = "x86_64-linux";
+
+  inherit src;
+
+  buildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "true";
+  installPhase = ''
+    mkdir -p $out
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm -rf $out/opt $out/usr
+    rm $out/bin/skypeforlinux
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+  '';
+
+  postFixup = ''
+     patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
+
+    ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/skypeforlinux.desktop \
+      --replace /usr/bin/ $out/bin/ \
+      --replace /usr/share/ $out/share/
+
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux client for skype";
+    homepage = "https://www.skype.com";
+    license = licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ panaeon ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689b3082c0f..02f2e15aa1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15461,6 +15461,8 @@ with pkgs;
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
 
+  skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };
+
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };

From a7d89139ea74791137bfa606d109e515512c8460 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 11 Feb 2017 19:07:35 -0500
Subject: [PATCH 1479/1744] top-level: `stdenv.cross` is now only defined with
 host != build

In practice, this is a strictly stronger condition than target != build
as we never have build = target != host. Really, the attribute should
be removed altogether, but for now we make it work for plain libraries,
which do not care about the target platform. In the few cases where the
compilers use this and actually care about the target platform, I'll
manually change them to use `targetPlatform` instead.
---
 pkgs/top-level/stage.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index d8e190cfd4b..f6e7f41ed88 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -110,8 +110,8 @@ let
   in {
     stdenv = super.stdenv // {
       inherit (buildPlatform) platform;
-    } // lib.optionalAttrs (targetPlatform != buildPlatform) {
-      cross = targetPlatform;
+    } // lib.optionalAttrs (hostPlatform != buildPlatform) {
+      cross = hostPlatform;
     };
     inherit (buildPlatform) system platform;
   };

From db5a921945b9b2051077a6b7b708e3b1785cc3ea Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 13 Feb 2017 08:02:02 -0500
Subject: [PATCH 1480/1744] crossStdenv on iphone: Just get info from
 `targetPlatform`

---
 pkgs/os-specific/darwin/ios-cross/default.nix | 8 +++++++-
 pkgs/stdenv/cross/default.nix                 | 6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index 7de7d291289..e5375ef6091 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -6,6 +6,7 @@
 , stdenv
 , coreutils
 , gnugrep
+, targetPlatform
 }:
 
 /* As of this writing, known-good prefix/arch/simulator triples:
@@ -15,7 +16,12 @@
  * x86_64-apple-darwin14  | x86_64 | true
  */
 
-{ prefix, arch, simulator ? false }: let
+let
+
+  prefix = targetPlatform.config;
+  inherit (targetPlatform) arch;
+  simulator = targetPlatform.isiPhoneSimulator or false;
+
   sdkType = if simulator then "Simulator" else "OS";
 
   sdkVer = "10.2";
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index e322d465520..05910d100a8 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -35,11 +35,7 @@ in bootStages ++ [
     selfBuild = false;
     stdenv = if crossSystem.useiOSCross or false
       then let
-          inherit (buildPackages.darwin.ios-cross {
-              prefix = crossSystem.config;
-              inherit (crossSystem) arch;
-              simulator = crossSystem.isiPhoneSimulator or false; })
-            cc binutils;
+          inherit (buildPackages.darwin.ios-cross) cc binutils;
         in buildPackages.makeStdenvCross
           buildPackages.stdenv crossSystem
           binutils cc

From 84b1c0c481d4c97957252182a6273cea9062f4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?=
 <abcz2.uprola@gmail.com>
Date: Mon, 24 Apr 2017 18:31:02 +0300
Subject: [PATCH 1481/1744] Fix imperative container code examples

Since some time Nixos has firewall enabled by default, so update example.
Also, remove newline escaping (it isn't needed).

Closes https://github.com/NixOS/nixpkgs/issues/25174
---
 .../manual/administration/imperative-containers.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 258e1ea948d..9851eb08afb 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -29,8 +29,10 @@ line. For instance, to create a container that has
 <literal>root</literal>:
 
 <screen>
-# nixos-container create foo --config 'services.openssh.enable = true; \
-  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
+# nixos-container create foo --config '
+  services.openssh.enable = true;
+  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
+'
 </screen>
 
 </para>
@@ -97,8 +99,11 @@ This will build and activate the new configuration. You can also
 specify a new configuration on the command line:
 
 <screen>
-# nixos-container update foo --config 'services.httpd.enable = true; \
-  services.httpd.adminAddr = "foo@example.org";'
+# nixos-container update foo --config '
+  services.httpd.enable = true;
+  services.httpd.adminAddr = "foo@example.org";
+  networking.firewall.allowedTCPPorts = [ 80 ];
+'
 
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…

From a7068ace35c5344fc2760733d32cca8fd4f01116 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 11 Feb 2017 18:24:24 -0500
Subject: [PATCH 1482/1744] Rewrite a few `stdenv.cross` uses that *should* be
 `targetPlatform`

The previous commit redefines `stdenv.cross` for the sake of normal
libaries, the most common use-case of that attribute. Some compilers
however relied on the old definition so we have them use
`targetPlatform` instead. This special casing is fine because we
eventually want to remove `stdenv.cross` and use either `hostPlatform`
or `targetPlatform` instead.
---
 .../development/compilers/gcc/4.5/default.nix | 21 ++++-----
 .../development/compilers/gcc/4.8/default.nix | 43 ++++++++++---------
 .../development/compilers/gcc/4.9/default.nix | 43 ++++++++++---------
 pkgs/development/compilers/gcc/5/default.nix  | 43 ++++++++++---------
 pkgs/development/compilers/gcc/6/default.nix  | 43 ++++++++++---------
 .../compilers/gcc/snapshot/default.nix        | 43 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +-
 7 files changed, 123 insertions(+), 117 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 12e7e23e90b..7f5e4f8c9a2 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -26,6 +26,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -271,15 +272,15 @@ stdenv.mkDerivation ({
   targetConfig = if cross != null then cross.config else null;
 
   crossAttrs = {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -311,7 +312,7 @@ stdenv.mkDerivation ({
       ${if langAda then " --enable-libada" else ""}
       ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
       ${if cross != null then crossConfigureFlags else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
     '';
   };
  
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index e6f990113cc..72c22544d1e 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -34,6 +34,7 @@
 , stripped ? true
 , gnused ? null
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -123,12 +124,12 @@ let version = "4.8.5";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -382,26 +383,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -431,7 +432,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index eb03148a4b8..594a61fdedf 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -34,6 +34,7 @@
 , stripped ? true
 , gnused ? null
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +126,12 @@ let version = "4.9.4";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -389,26 +390,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -438,7 +439,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3e9104a82fb..f7d46deebcc 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -36,6 +36,7 @@
 , binutils ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -129,12 +130,12 @@ let version = "5.4.0";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -398,26 +399,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -446,7 +447,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b4e588f6b14..1496e910dd1 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -36,6 +36,7 @@
 , binutils ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +126,12 @@ let version = "6.3.0";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -386,26 +387,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -434,7 +435,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 12eb8b3a542..af48fdbd159 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -37,6 +37,7 @@
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
 , flex ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +126,12 @@ let version = "7-20170409";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -386,26 +387,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -434,7 +435,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91337d67bb4..5da33b38244 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4971,8 +4971,8 @@ with pkgs;
 
   gccCrossStageStatic = assert targetPlatform != buildPlatform; let
     libcCross1 =
-      if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
-      else if stdenv.cross.libc == "libSystem" then darwin.xcode
+      if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers
+      else if targetPlatform.libc == "libSystem" then darwin.xcode
       else null;
     in wrapGCCCross {
       gcc = forcedNativePackages.gcc.cc.override {

From 49c99b70cf64ccf99cd292426b3dbcaeb2e885aa Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 11 Feb 2017 18:15:12 -0500
Subject: [PATCH 1483/1744] cross-stdenv: Only prune most overrides in the
 final stage

Before all overrides were also pruned in the previous stage, now
only gcc and binutils are, because they alone care about about the
target platform. The rest of the overrides don't, so it's better to
preserve them in order to avoid spurious rebuilds.
---
 pkgs/stdenv/adapters.nix       | 4 ++++
 pkgs/stdenv/cross/default.nix  | 4 +---
 pkgs/stdenv/darwin/default.nix | 5 ++++-
 pkgs/stdenv/linux/default.nix  | 8 +++++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3ffe1ab15d9..65a0bf98456 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -58,6 +58,10 @@ rec {
   # builds.
   makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // {
 
+    # Overrides are surely not valid as packages built with this run on a
+    # different platform.
+    overrides = _: _: {};
+
     mkDerivation =
       { name ? "", buildInputs ? [], nativeBuildInputs ? []
       , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 05910d100a8..dec4b036092 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -21,9 +21,7 @@ in bootStages ++ [
     selfBuild = false;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
-    stdenv = vanillaPackages.stdenv // {
-      overrides = _: _: {};
-    };
+    inherit (vanillaPackages) stdenv;
   })
 
   # Run Packages
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e80c54e0218..8a517fddad8 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -253,7 +253,7 @@ in rec {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
-      coreutils findutils diffutils patchutils binutils binutils-raw;
+      coreutils findutils diffutils patchutils;
 
     llvmPackages = super.llvmPackages // {
       inherit (llvmPackages) llvm clang-unwrapped;
@@ -262,6 +262,9 @@ in rec {
     darwin = super.darwin // {
       inherit (darwin) dyld Libsystem cctools libiconv;
     };
+  } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+    # Need to get rid of these when cross-compiling.
+    inherit binutils binutils-raw;
   };
 
   stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec {
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index fe685a1e77c..3a244675b3a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -298,12 +298,14 @@ in
         */
 
       overrides = self: super: {
-        gcc = cc;
-
         inherit (prevStage)
-          gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+          gzip bzip2 xz bash coreutils diffutils findutils gawk
           glibc gnumake gnused gnutar gnugrep gnupatch patchelf
           attr acl paxctl zlib pcre;
+      } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+        # Need to get rid of these when cross-compiling.
+        inherit (prevStage) binutils;
+        gcc = cc;
       };
     };
   })

From 3a083218b94ca8e0367b3d31eacd1bdd43b827d4 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 22 Sep 2016 19:49:36 -0700
Subject: [PATCH 1484/1744] factorio: add name as arg to authenticatedFetch

---
 pkgs/games/factorio/fetch.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix
index 04b31ac10d3..439f2478a66 100644
--- a/pkgs/games/factorio/fetch.nix
+++ b/pkgs/games/factorio/fetch.nix
@@ -8,6 +8,8 @@
   # URL to fetch.
   url ? ""
 
+, name ? "factorio.tar.gz"
+
   # Login URL.
 , loginUrl ? "https://www.factorio.com/login"
 
@@ -16,11 +18,9 @@
 }:
 
 stdenv.mkDerivation {
-  name = "factorio.tar.gz";
-
   buildInputs = [ curl xidel ];
 
-  inherit url loginUrl username password cacert;
+  inherit name url loginUrl username password cacert;
 
   builder = ./fetch.sh;
 

From 81122d3beb1934ebd83491ff204f2fca9cb25d39 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Mon, 24 Apr 2017 17:11:02 -0700
Subject: [PATCH 1485/1744] factorio: 0.14.21 -> 0.15.1

---
 pkgs/games/factorio/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index e071edfeb81..4a10015bea8 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
 
 with stdenv.lib;
 let
-  version = "0.14.21";
+  version = "0.15.1";
   isHeadless = releaseType == "headless";
 
   arch = if stdenv.system == "x86_64-linux" then {
@@ -25,14 +25,14 @@ let
 
   fetch = rec {
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
+    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; };
+      headless = fetchurl        { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
+      alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; };
+      alpha = abort "Factorio 32-bit client is not available for this version.";
     };
   };
 

From ee2cffbdb4f0122534e39aea0cc60684950e26ef Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 25 Apr 2017 02:59:13 +0000
Subject: [PATCH 1486/1744] azure-image: switch to use the common
 make-disk-image.nix

---
 nixos/modules/virtualisation/azure-image.nix | 96 +++-----------------
 1 file changed, 11 insertions(+), 85 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 33f84986cac..cb756842f36 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -2,93 +2,19 @@
 
 with lib;
 let
-  diskSize = "30720";
+  diskSize = 30720;
 in
 {
-  system.build.azureImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "azure-image"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/$diskImageBase
-
-              cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
-              size=$(($cyl*255*63*512))              
-              roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
-              mv closure xchg/
-            '';
-
-          postVM =
-            ''
-              mkdir -p $out
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
-              rm $diskImage
-            '';
-          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create partition table
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M
-          ${pkgs.parted}/sbin/parted /dev/vda print
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
-
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-
-          mkdir /mnt
-          mount /dev/vda1 /mnt
-
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
-
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
-
-          mkdir -p /mnt/nix/store
-          echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
-
-          echo Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
-
-          echo Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package.out}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group ""
-
-          echo nixos-rebuild requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
-
-          echo switch-to-configuration requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          echo Install a configuration.nix.
-          mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix
-
-          echo Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          echo Almost done
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
+  system.build.azureImage = import ../../lib/make-disk-image.nix {
+    name = "azure-image";
+    postVM = ''
+      ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
+    '';
+    configFile = ./azure-config-user.nix;
+    format = "raw";
+    inherit diskSize;
+    inherit config lib pkgs;
+  };
 
   imports = [ ./azure-common.nix ];
 

From a8fc60745f26a2b33650821414772ad047e48b62 Mon Sep 17 00:00:00 2001
From: Rommel Martinez <ebzzry@gmail.com>
Date: Tue, 25 Apr 2017 14:36:22 +0800
Subject: [PATCH 1487/1744] Fix typo in trivial.nix

---
 lib/trivial.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 62906339e60..3e22045cb10 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -38,7 +38,7 @@ rec {
   /* Merge two attribute sets shallowly, right side trumps left
 
      Example:
-       mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }
+       mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
        => { a = 1; b = 3; c = 4; }
   */
   mergeAttrs = x: y: x // y;

From 72f2b506c73acbdfc15a076acefc793486d9683e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 25 Apr 2017 07:48:54 +0200
Subject: [PATCH 1488/1744] nixos/grub: Add another example for extraEntries

Someone on IRC wanted to boot Fedora from another disk. While I'm not
too familiar with UEFI booting in conjunction with GRUB2 it took some
time to get it to work.

So in order to safe others from frustration I'm adding this as another
example to the extraEntries option.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/loader/grub/grub.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2d6bf2d58a9..cf47aed9fa9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -239,6 +239,12 @@ in
           menuentry "Windows 7" {
             chainloader (hd0,4)+1
           }
+
+          # GRUB 2 with UEFI example, chainloading another distro
+          menuentry "Fedora" {
+            set root=(hd1,1)
+            chainloader /efi/fedora/grubx64.efi
+          }
         '';
         description = ''
           Any additional entries you want added to the GRUB boot menu.

From e514114811fd17816d221619b136b0c50c5034fb Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Tue, 25 Apr 2017 01:27:14 -0700
Subject: [PATCH 1489/1744] hugo: 0.20.2 -> 0.20.5

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 57b844de97b..e134b3d79a2 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.20.2";
+  version = "0.20.5";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy";
+    sha256 = "0gsxsxri5jivvc862a1dapij667726vs55vjqas84lsg1066q5p2";
   };
 
   goDeps = ./deps.nix;

From 10b95d762314d1eaa9a70cc02a19a2bbe580cc89 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 25 Apr 2017 11:08:20 +0200
Subject: [PATCH 1490/1744] emscripten: 1.37.9 -> 1.37.10

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 pkgs/development/compilers/emscripten/default.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index d3d7561ddfb..99e22215bc7 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
-  rev = "1.37.9";
+  rev = "1.37.10";
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx";
+    sha256 = "0zl55jaas3cibjscr5q1q6rgw63wqwyc9iffhvs4xi9g1bk5cnx9";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv";
+    sha256 = "0cdvld0lfl3cl7m6yax7f87ip9iq4rmz8icr68l2g8bl2w8qd89j";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 351e045b50a..f7e8d1be67d 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  rev = "1.37.9";
+  rev = "1.37.10";
   appdir = "share/emscripten";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp";
+    sha256 = "08f3zagxzsj96i09gjg1djd1bmy1gr1ar8n96mzg3ykaygf82d0s";
     inherit rev;
   };
 

From 9ff08d24efce42155e6ddb95f36fbb0cb0d36521 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 25 Apr 2017 11:11:22 +0200
Subject: [PATCH 1491/1744] perlPackages.version: 0.9912 -> 0.9918

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4faea93ec47..ae86edc1785 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14942,10 +14942,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   version = buildPerlPackage rec {
-    name = "version-0.9912";
+    name = "version-0.9918";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz";
-      sha256 = "03hv7slgqrmzbbjjmxgvq91bjlbjg5xbp8n4h454amyab2adzw7b";
+      sha256 = "0yr3aap5r6w9zd47w8k74228fhhyh85l90rbzg15j8jfmmz5q5sl";
     };
   };
 

From c772ecdf48d82d52cc43e72847eba773934d3ef9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 11:30:34 +0200
Subject: [PATCH 1492/1744] bean-add: 2017-01-20 -> 2017-04-06

---
 pkgs/applications/office/beancount/bean-add.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 7535b6abf3c..667c159838a 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2017-01-20";
+  name = "bean-add-2017-04-06";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "752674259fb9512e076ef2048927fb791ad21507";
-    sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61";
+    rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024";
+    sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];

From d25f7c9eed6bceaf02187b2b2b28c8d0818c325e Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 25 Apr 2017 12:05:35 +0200
Subject: [PATCH 1493/1744] yarn: 0.22.0 -> 0.23.2 (#25189)

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 770eb9cc78b..ff2d48e1a6e 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.22.0";
+  version = "0.23.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs";
+    sha256 = "06vqi78q1wsybr4nsh8xjnqmjynljmb36h21j2ffmni1adxf4syq";
   };
 
   buildInputs = [makeWrapper nodejs];

From 45470c65f517eafaa93e528fb9ad35e707caa076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 22 Apr 2017 09:44:12 +0200
Subject: [PATCH 1494/1744] nixos: static ids for jackett, radarr, sonarr

---
 nixos/modules/misc/ids.nix              | 6 ++++++
 nixos/modules/services/misc/jackett.nix | 7 +++++--
 nixos/modules/services/misc/radarr.nix  | 7 +++++--
 nixos/modules/services/misc/sonarr.nix  | 7 +++++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index feecee3225b..4232f57cb6b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -289,6 +289,9 @@
       rpc = 271;
       geoip = 272;
       fcron = 273;
+      sonarr = 274;
+      radarr = 275;
+      jackett = 276;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -547,6 +550,9 @@
       #rpc = 271; # unused
       #geoip = 272; # unused
       fcron = 273;
+      sonarr = 274;
+      radarr = 275;
+      jackett = 276;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
index e467e7ee85b..87a41ee70b5 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixos/modules/services/misc/jackett.nix
@@ -22,14 +22,14 @@ in
           echo "Creating jackett data directory in /var/lib/jackett/"
           mkdir -p /var/lib/jackett/
         }
-        chown -R jackett /var/lib/jackett/
+        chown -R jackett:jackett /var/lib/jackett/
         chmod 0700 /var/lib/jackett/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "jackett";
-        Group = "nogroup";
+        Group = "jackett";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.jackett}/bin/Jackett";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.jackett = {
+      uid = config.ids.uids.jackett;
       home = "/var/lib/jackett";
+      group = "jackett";
     };
+    users.extraGroups.jackett.gid = config.ids.gids.jackett;
 
   };
 }
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
index cc5efffca44..245ad9f9a6d 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/radarr.nix
@@ -22,14 +22,14 @@ in
           echo "Creating radarr data directory in /var/lib/radarr/"
           mkdir -p /var/lib/radarr/
         }
-        chown -R radarr /var/lib/radarr/
+        chown -R radarr:radarr /var/lib/radarr/
         chmod 0700 /var/lib/radarr/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "radarr";
-        Group = "nogroup";
+        Group = "radarr";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.radarr}/bin/Radarr";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.radarr = {
+      uid = config.ids.uids.radarr;
       home = "/var/lib/radarr";
+      group = "radarr";
     };
+    users.extraGroups.radarr.gid = config.ids.gids.radarr;
 
   };
 }
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix
index 6d96daa6c3d..ecde2c33bfa 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/sonarr.nix
@@ -22,14 +22,14 @@ in
           echo "Creating sonarr data directory in /var/lib/sonarr/"
           mkdir -p /var/lib/sonarr/
         }
-        chown -R sonarr /var/lib/sonarr/
+        chown -R sonarr:sonarr /var/lib/sonarr/
         chmod 0700 /var/lib/sonarr/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "sonarr";
-        Group = "nogroup";
+        Group = "sonarr";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.sonarr = {
+      uid = config.ids.uids.sonarr;
       home = "/var/lib/sonarr";
+      group = "sonarr";
     };
+    users.extraGroups.sonarr.gid = config.ids.gids.sonarr;
 
   };
 }

From b5530755a53eb4e22384d05f5b2fb7a0a9b1e584 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Sun, 23 Apr 2017 22:15:31 +0200
Subject: [PATCH 1495/1744] bc: 1.06 -> 1.07.1

---
 pkgs/tools/misc/bc/default.nix       | 14 ++++----------
 pkgs/tools/misc/bc/readlinefix.patch | 11 -----------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/misc/bc/readlinefix.patch

diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 164bc3d55f0..2371e91ae2f 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -1,21 +1,15 @@
-{stdenv, fetchurl, flex, readline}:
+{stdenv, fetchurl, flex, readline, ed, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "bc-1.06";
+  name = "bc-1.07.1";
   src = fetchurl {
     url = "mirror://gnu/bc/${name}.tar.gz";
-    sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf";
+    sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a";
   };
 
-  patches = [ ./readlinefix.patch ];
-
-  preConfigure = ''
-    sed -i 's/program.*save/static &/' bc/load.c
-  '';
-
   configureFlags = [ "--with-readline" ];
 
-  buildInputs = [flex readline];
+  buildInputs = [flex readline ed texinfo];
 
   doCheck = true;
 
diff --git a/pkgs/tools/misc/bc/readlinefix.patch b/pkgs/tools/misc/bc/readlinefix.patch
deleted file mode 100644
index 74a66e90615..00000000000
--- a/pkgs/tools/misc/bc/readlinefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur bc-1.06.orig/bc/scan.l bc-1.06/bc/scan.l
---- bc-1.06.orig/bc/scan.l      2000-09-13 13:25:47.000000000 -0500
-+++ bc-1.06/bc/scan.l   2002-07-09 14:36:34.000000000 -0500
-@@ -143,7 +143,6 @@
- 
- /* Definitions for readline access. */
- extern FILE *rl_instream;
--_PROTOTYPE(char *readline, (char *));
- 
- /* rl_input puts upto MAX characters into BUF with the number put in
-    BUF placed in *RESULT.  If the yy input file is the same as

From 9046e54f6da793f19874b7ffe2cf767539702f56 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 6 Apr 2017 21:00:28 -0400
Subject: [PATCH 1496/1744] qt5: fix to work on LLVM 4

(this is reapplying 6b1957d17ae687f7db09db63667fa6f2cc40990b, which got
lost in a merge)

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
---
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 0af6ed8b594..be35032785d 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation {
     AGL AppKit ApplicationServices Carbon Cocoa
     CoreAudio CoreBluetooth CoreLocation CoreServices
     DiskArbitration Foundation OpenGL
-    darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
+    darwin.cf-private darwin.libobjc libiconv
   ]);
 
   buildInputs = [ ]

From baa3b3effff51d9aea43ee524329f8bbcbdaf3ec Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 25 Apr 2017 16:00:20 +0200
Subject: [PATCH 1497/1744] programs.zsh.syntax-highlighting: refactor
 `highlighters` option for proper validation

Right now the `programs.zsh.syntax-highlighting.highlighters` option
lacks appropriate validation which can cause confusing things when
mistyping a higlighter for zsh-syntax-highlighting.
---
 .../modules/programs/zsh/zsh-syntax-highlighting.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 962c1f920a8..fde241ca3ce 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -18,7 +18,17 @@ in
 
         highlighters = mkOption {
           default = [ "main" ];
-          type = types.listOf(types.str);
+
+          # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+          type = types.listOf(types.enum([
+            "main"
+            "brackets"
+            "pattern"
+            "cursor"
+            "root"
+            "line"
+          ]));
+
           description = ''
             Specifies the highlighters to be used by zsh-syntax-highlighting.
 

From 244b575a1d88105c6cc34fe3e27e4931c9f26285 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Mon, 24 Apr 2017 17:14:24 -0400
Subject: [PATCH 1498/1744] ezdxf (Python package): init at 0.8.1

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

diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
new file mode 100644
index 00000000000..18e8e98315c
--- /dev/null
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, isPy3k, pyparsing }:
+
+buildPythonPackage rec {
+  version = "0.8.1";
+  name = "ezdxf-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/e/ezdxf/${name}.zip";
+    sha256 = "1q4la4h7840wb8l2jf39wy68gq5jwymkghb1a1mg8qblj424130k";
+  };
+
+  # Tests fail on Python 3.x, but module imports and works
+  doCheck = !(isPy3k);
+    
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    description = "Python package to read and write DXF drawings (interface to the DXF file format)";
+    homepage = https://github.com/mozman/ezdxf/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3222e4f1155..06455ecd599 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6990,6 +6990,8 @@ in {
     };
   };
 
+  ezdxf = callPackage ../development/python-modules/ezdxf {};
+  
   facebook-sdk = buildPythonPackage rec {
     name = "facebook-sdk-0.4.0";
 

From 0f104177ad7741f8b7e0ebe3d352744dc35a511e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Apr 2017 14:06:55 +0200
Subject: [PATCH 1499/1744] LTS Haskell 8.12

---
 .../configuration-hackage2nix.yaml            | 105 +++++++++---------
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4410e3c4c50..8f8097c5574 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.11
+  # LTS Haskell 8.12
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -167,7 +167,7 @@ default-package-overrides:
   - app-settings ==0.2.0.11
   - appar ==0.1.4
   - apportionment ==0.0.0.2
-  - arbtt ==0.9.0.12
+  - arbtt ==0.9.0.13
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
@@ -189,6 +189,7 @@ default-package-overrides:
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
+  - attoparsec-iso8601 ==1.0.0.0
   - audacity ==0.0.1.1
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
@@ -222,7 +223,7 @@ default-package-overrides:
   - bento ==0.1.0
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.4.1
+  - bifunctors ==5.4.2
   - bimap ==0.3.2
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
@@ -319,7 +320,7 @@ default-package-overrides:
   - camfort ==0.901
   - carray ==0.1.6.6
   - cartel ==0.18.0.2
-  - case-insensitive ==1.2.0.8
+  - case-insensitive ==1.2.0.9
   - cased ==0.1.0.0
   - cases ==0.1.3.2
   - casing ==0.1.2.1
@@ -327,7 +328,7 @@ default-package-overrides:
   - cassava-conduit ==0.3.5.1
   - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
-  - cayley-client ==0.4.0
+  - cayley-client ==0.4.1
   - cereal ==0.5.4.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -391,7 +392,7 @@ default-package-overrides:
   - colour ==2.3.3
   - comfort-graph ==0.0.2
   - commutative ==0.0.1.4
-  - comonad ==5
+  - comonad ==5.0.1
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2
@@ -402,7 +403,7 @@ default-package-overrides:
   - concurrent-output ==1.7.9
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.9.1
+  - conduit ==1.2.10
   - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
@@ -564,7 +565,7 @@ default-package-overrides:
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.1.0.2
-  - doctest ==0.11.1
+  - doctest ==0.11.2
   - doctest-discover ==0.1.0.7
   - dotenv ==0.3.1.0
   - dotnet-timespan ==0.0.1.0
@@ -595,11 +596,11 @@ default-package-overrides:
   - effin ==0.3.0.2
   - either ==4.4.1.1
   - either-unwrap ==1.1
-  - ekg ==0.4.0.12
+  - ekg ==0.4.0.13
   - ekg-core ==0.1.1.1
-  - ekg-json ==0.1.0.4
+  - ekg-json ==0.1.0.5
   - ekg-statsd ==0.2.1.0
-  - ekg-wai ==0.1.0.0
+  - ekg-wai ==0.1.0.1
   - elerea ==2.9.0
   - elm-bridge ==0.4.0
   - elm-core-sources ==1.0.0
@@ -616,7 +617,7 @@ default-package-overrides:
   - enummapset ==0.5.2.1
   - enummapset-th ==0.6.1.1
   - enumset ==0.0.4
-  - envelope ==0.2.1.0
+  - envelope ==0.2.2.0
   - envparse ==0.4
   - envy ==1.3.0.2
   - epub-metadata ==4.5
@@ -705,13 +706,13 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.6
+  - foundation ==0.0.7
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
   - freer ==0.2.4.1
-  - freer-effects ==0.3.0.0
+  - freer-effects ==0.3.0.1
   - friendly-time ==0.4
   - frisby ==0.2
   - from-sum ==0.2.1.0
@@ -730,7 +731,7 @@ default-package-overrides:
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
-  - generics-sop ==0.2.4.0
+  - generics-sop ==0.2.5.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
   - getopt-generics ==0.13
@@ -764,11 +765,11 @@ default-package-overrides:
   - gi-webkit ==3.0.11
   - ginger ==0.3.9.1
   - gio ==0.13.3.1
-  - gipeda ==0.3.3.1
+  - gipeda ==0.3.3.2
   - giphy-api ==0.5.2.0
   - git ==0.2.0
   - github ==0.15.0
-  - github-release ==1.0.1
+  - github-release ==1.0.2
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -778,7 +779,7 @@ default-package-overrides:
   - gitrev ==1.2.0
   - gitson ==0.5.2
   - gl ==0.8.0
-  - glabrous ==0.3.1
+  - glabrous ==0.3.2
   - glaze ==0.2.0.2
   - glazier ==0.7.0.0
   - glazier-pipes ==0.1.4.0
@@ -899,11 +900,11 @@ default-package-overrides:
   - graphviz ==2999.18.1.2
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
-  - groom ==0.1.2
+  - groom ==0.1.2.1
   - groundhog ==0.8
   - groundhog-inspector ==0.8
   - groundhog-mysql ==0.8
-  - groundhog-postgresql ==0.8
+  - groundhog-postgresql ==0.8.0.1
   - groundhog-sqlite ==0.8
   - groundhog-th ==0.8
   - grouped-list ==0.2.1.2
@@ -918,7 +919,7 @@ default-package-overrides:
   - hackage-security ==0.5.2.2
   - hackernews ==1.1.1.0
   - haddock-library ==1.4.3
-  - hailgun ==0.4.1.2
+  - hailgun ==0.4.1.3
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.5.1
   - half ==0.2.2.3
@@ -941,7 +942,7 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
-  - haskeline ==0.7.3.1
+  - haskeline ==0.7.4.0
   - haskell-gi ==0.20.1
   - haskell-gi-base ==0.20.2
   - haskell-import-graph ==1.0.1
@@ -1015,7 +1016,7 @@ default-package-overrides:
   - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
   - hjson ==1.3.2
-  - hjsonpointer ==1.1.0.2
+  - hjsonpointer ==1.1.1
   - hjsonschema ==1.5.0.1
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.6.0
@@ -1038,7 +1039,7 @@ default-package-overrides:
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
-  - hpc-coveralls ==1.0.8
+  - hpc-coveralls ==1.0.9
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
@@ -1065,10 +1066,10 @@ default-package-overrides:
   - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
-  - hslua-aeson ==0.1.0.3
+  - hslua-aeson ==0.1.0.4
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.6
+  - HsOpenSSL ==0.11.4.7
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.3
@@ -1101,7 +1102,7 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
   - HTTP ==4000.3.6
-  - http-api-data ==0.3.6
+  - http-api-data ==0.3.7
   - http-client ==0.5.6.1
   - http-client-openssl ==0.2.0.5
   - http-client-tls ==0.3.4.1
@@ -1110,7 +1111,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
-  - http-reverse-proxy ==0.4.3.3
+  - http-reverse-proxy ==0.4.4
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
   - http2 ==1.6.3
@@ -1180,7 +1181,7 @@ default-package-overrides:
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
   - intro ==0.1.0.10
-  - invariant ==0.4
+  - invariant ==0.4.1
   - invertible ==0.2.0.2
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
@@ -1214,8 +1215,8 @@ default-package-overrides:
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
   - jni ==0.2.3
-  - jose ==0.5.0.2
-  - jose-jwt ==0.7.5
+  - jose ==0.5.0.3
+  - jose-jwt ==0.7.6
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
@@ -1234,7 +1235,7 @@ default-package-overrides:
   - kansas-comet ==0.4
   - katip ==0.3.1.4
   - katip-elasticsearch ==0.3.0.2
-  - kawhi ==0.2.1
+  - kawhi ==0.2.2
   - kdt ==0.2.4
   - keter ==1.4.3.2
   - keycode ==0.2.2
@@ -1334,13 +1335,13 @@ default-package-overrides:
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.1.0
   - managed ==1.0.5
-  - mandrill ==0.5.3.1
+  - mandrill ==0.5.3.2
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
   - markov-chain ==0.0.3.4
   - markup ==3.1.0
   - marvin ==0.2.3
-  - marvin-interpolate ==1.1
+  - marvin-interpolate ==1.1.1
   - math-functions ==0.2.1.0
   - mathexpr ==0.3.0.0
   - matplotlib ==0.4.3
@@ -1351,7 +1352,7 @@ default-package-overrides:
   - mbox ==0.3.3
   - mbox-utility ==0.0
   - mcmc-types ==1.0.3
-  - mediabus ==0.3.2.1
+  - mediabus ==0.3.3.0
   - mediabus-rtp ==0.3.2.1
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
@@ -1368,7 +1369,7 @@ default-package-overrides:
   - microbench ==0.1
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.8.0
-  - microlens-aeson ==2.2.0
+  - microlens-aeson ==2.2.0.1
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
   - microlens-mtl ==0.1.10.0
@@ -1508,7 +1509,7 @@ default-package-overrides:
   - oanda-rest-api ==0.3.0.0
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.18.2
+  - octane ==0.18.3
   - Octree ==0.5.4.3
   - oeis ==0.3.9
   - ofx ==0.4.2.0
@@ -1593,7 +1594,7 @@ default-package-overrides:
   - pinboard ==0.9.12.4
   - pinch ==0.3.0.2
   - pinchot ==0.24.0.0
-  - pipes ==4.3.2
+  - pipes ==4.3.3
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.4
   - pipes-cacophony ==0.4.1
@@ -1718,7 +1719,7 @@ default-package-overrides:
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.2.1
-  - ratel ==0.3.2
+  - ratel ==0.3.3
   - ratel-wai ==0.2.0
   - rattletrap ==2.1.5
   - raw-strings-qq ==1.1
@@ -1872,7 +1873,7 @@ default-package-overrides:
   - SHA ==1.6.4.2
   - shake ==0.15.11
   - shake-language-c ==0.10.1
-  - shakespeare ==2.0.12.1
+  - shakespeare ==2.0.13
   - shell-conduit ==4.5.2
   - shelly ==1.6.8.3
   - shortcut-links ==0.4.2.0
@@ -1899,7 +1900,7 @@ default-package-overrides:
   - slug ==0.1.6
   - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
-  - smoothie ==0.4.2.6
+  - smoothie ==0.4.2.7
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
@@ -1942,7 +1943,7 @@ default-package-overrides:
   - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
   - stackage-curator ==0.14.5
-  - state-plus ==0.1.2
+  - state-plus ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
@@ -1993,7 +1994,7 @@ default-package-overrides:
   - stripe-haskell ==2.2.1
   - stripe-http-streams ==2.2.1
   - stripe-tests ==2.2.1
-  - strive ==3.0.2
+  - strive ==3.0.3
   - stylish-haskell ==0.7.1.0
   - success ==0.2.6
   - sundown ==0.6
@@ -2059,7 +2060,7 @@ default-package-overrides:
   - termcolor ==0.2.0.0
   - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
-  - terminfo ==0.4.0.2
+  - terminfo ==0.4.1.0
   - test-fixture ==0.5.0.0
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
@@ -2091,9 +2092,9 @@ default-package-overrides:
   - tfp ==1.0.0.2
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
-  - th-expand-syns ==0.4.2.0
+  - th-expand-syns ==0.4.3.0
   - th-extras ==0.0.0.4
-  - th-lift ==0.7.6
+  - th-lift ==0.7.7
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
   - th-reify-compat ==0.0.1.1
@@ -2140,7 +2141,7 @@ default-package-overrides:
   - true-name ==0.1.0.2
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
-  - tttool ==1.7.0.1
+  - tttool ==1.7.0.2
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
@@ -2224,7 +2225,7 @@ default-package-overrides:
   - validate-input ==0.4.0.0
   - validation ==0.5.4
   - varying ==0.7.0.3
-  - vault ==0.3.0.6
+  - vault ==0.3.0.7
   - vcswrapper ==0.1.5
   - vector ==0.11.0.0
   - vector-algorithms ==0.7.0.1
@@ -2289,7 +2290,7 @@ default-package-overrides:
   - web-routes-hsp ==0.24.6.1
   - web-routes-th ==0.22.6.1
   - web-routes-wai ==0.24.3
-  - webdriver ==0.8.4
+  - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
   - webkitgtk3 ==0.14.2.1
   - webkitgtk3-javascriptcore ==0.14.2.1
@@ -2297,7 +2298,7 @@ default-package-overrides:
   - webrtc-vad ==0.1.0.3
   - websockets ==0.10.0.0
   - websockets-rpc ==0.0.2
-  - websockets-snap ==0.10.2.0
+  - websockets-snap ==0.10.2.1
   - weigh ==0.0.3
   - wikicfp-scraper ==0.1.0.8
   - wild-bind ==0.1.0.3
@@ -2331,7 +2332,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.3
   - writer-cps-transformers ==0.1.1.2
-  - wuss ==1.1.3
+  - wuss ==1.1.4
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x509 ==1.6.5
@@ -2374,7 +2375,7 @@ default-package-overrides:
   - yesod-auth ==1.4.17
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-hashdb ==1.6.0.1
+  - yesod-auth-hashdb ==1.6.1
   - yesod-bin ==1.5.2.2
   - yesod-core ==1.4.33
   - yesod-eventsource ==1.4.1

From 2a34188f2cdfa9e95d2d0cd6c7c143525f49f86c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Apr 2017 15:06:44 +0200
Subject: [PATCH 1500/1744] hackage2nix: update list of broken packages

---
 .../configuration-hackage2nix.yaml            | 68 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8f8097c5574..d2c2e27cc65 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2470,9 +2470,7 @@ package-maintainers:
     - git-annex
     - hackage-db
     - hledger
-    - hledger-diff
     - hledger-interest
-    - hledger-irr
     - hledger-ui
     - hledger-web
     - hopenssl
@@ -2518,15 +2516,34 @@ package-maintainers:
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
+  alsa-mixer:                                   [ i686-linux, x86_64-linux ]
+  alsa-pcm:                                     [ i686-linux, x86_64-linux ]
+  alsa-seq:                                     [ i686-linux, x86_64-linux ]
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-directfb:                            [ i686-linux, x86_64-linux ]
   d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freenect:                                     [ i686-linux, x86_64-linux ]
+  FTGL:                                         [ i686-linux, x86_64-linux ]
+  gi-ostree:                                    [ i686-linux, x86_64-linux ]
+  hcwiid:                                       [ i686-linux, x86_64-linux ]
   hfsevents:                                    [ i686-linux, x86_64-linux ]
+  HFuse:                                        [ i686-linux, x86_64-linux ]
   hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio-fs:                                       [ i686-linux, x86_64-linux ]
+  midi-alsa:                                    [ i686-linux, x86_64-linux ]
+  pam:                                          [ i686-linux, x86_64-linux ]
+  PortMidi:                                     [ i686-linux, x86_64-linux ]
+  Raincat:                                      [ i686-linux, x86_64-linux ]
   reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtlsdr:                                       [ i686-linux, x86_64-linux ]
+  rubberband:                                   [ i686-linux, x86_64-linux ]
+  sdl2-mixer:                                   [ i686-linux, x86_64-linux ]
+  sdl2-ttf:                                     [ i686-linux, x86_64-linux ]
+  tokyotyrant-haskell:                          [ i686-linux, x86_64-linux ]
   Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2537,7 +2554,9 @@ dont-distribute-packages:
   Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xattr:                                        [ i686-linux, x86_64-linux ]
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmobar:                                       [ i686-linux, x86_64-linux ]
 
   # Depens on shine, which is a ghcjs project.
   shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2581,6 +2600,8 @@ dont-distribute-packages:
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm-native:                       [ 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 ]
   accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3043,6 +3064,7 @@ dont-distribute-packages:
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -3222,6 +3244,8 @@ dont-distribute-packages:
   cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef3-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef3-simple:                                  [ 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 ]
   cerberus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3339,6 +3363,7 @@ dont-distribute-packages:
   closure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3378,6 +3403,7 @@ dont-distribute-packages:
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   colonnade:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-accelerate:                            [ 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 ]
   combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3388,6 +3414,7 @@ dont-distribute-packages:
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comfort-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4000,6 +4027,10 @@ dont-distribute-packages:
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ 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-deps:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer-webui:                      [ 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 ]
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4096,6 +4127,7 @@ dont-distribute-packages:
   fficxx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ficketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4309,6 +4341,7 @@ dont-distribute-packages:
   genvalidity-containers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-aeson:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-hashable:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4474,6 +4507,7 @@ dont-distribute-packages:
   gogol-safebrowsing:                           [ 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-slides:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4501,6 +4535,7 @@ dont-distribute-packages:
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-GLFW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4545,6 +4580,7 @@ dont-distribute-packages:
   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 ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4665,6 +4701,7 @@ dont-distribute-packages:
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamilton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4789,6 +4826,7 @@ dont-distribute-packages:
   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-go-checkers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-import-graph:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4942,6 +4980,7 @@ dont-distribute-packages:
   heaps:                                        [ 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:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-pile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5098,10 +5137,12 @@ dont-distribute-packages:
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlibsass:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HList:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HListPP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5115,6 +5156,7 @@ dont-distribute-packages:
   hmatrix-glpk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5237,6 +5279,7 @@ dont-distribute-packages:
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hS3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-codespeed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5330,6 +5373,7 @@ dont-distribute-packages:
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-golden-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-hedgehog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-jenkins:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-monad-control:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5613,6 +5657,7 @@ dont-distribute-packages:
   ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IPv6DB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipython-kernel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ircbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5665,6 +5710,7 @@ dont-distribute-packages:
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalla:                                        [ 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 ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5756,6 +5802,7 @@ dont-distribute-packages:
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5911,6 +5958,7 @@ dont-distribute-packages:
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6098,6 +6146,7 @@ dont-distribute-packages:
   lui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luis-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   luka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luminance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   luminance-samples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lushtags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   luthor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6554,6 +6603,7 @@ dont-distribute-packages:
   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 ]
+  nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6595,6 +6645,8 @@ dont-distribute-packages:
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask-range:                                [ 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 ]
@@ -6788,6 +6840,7 @@ dont-distribute-packages:
   peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peregrin:                                     [ 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 ]
   period:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6879,6 +6932,7 @@ dont-distribute-packages:
   playlists:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plocketed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6925,6 +6979,7 @@ dont-distribute-packages:
   PortFusion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-acl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-pty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6936,6 +6991,7 @@ dont-distribute-packages:
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7039,6 +7095,7 @@ dont-distribute-packages:
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bridge:                            [ 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 ]
   pure-zlib:                                    [ 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 ]
@@ -7261,6 +7318,7 @@ dont-distribute-packages:
   rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reinterpret-cast:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   relapse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-record-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7381,6 +7439,7 @@ dont-distribute-packages:
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtnetlink:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rts-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7586,6 +7645,7 @@ dont-distribute-packages:
   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 ]
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7761,6 +7821,7 @@ dont-distribute-packages:
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8313,6 +8374,7 @@ dont-distribute-packages:
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typesafe-precure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   types-compat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-settheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8539,6 +8601,7 @@ dont-distribute-packages:
   webkit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                        [ 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-page:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8715,6 +8778,7 @@ dont-distribute-packages:
   yeller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yeshql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-angular-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-articles:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-account-fork:                      [ 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 ]

From 9fa927f1066929024a64511a07484549b9a84079 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Apr 2017 14:10:35 +0200
Subject: [PATCH 1501/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/14048552ae0425d148efb34df264a83e30ed2286.
---
 .../haskell-modules/hackage-packages.nix      | 1907 +++++++----------
 1 file changed, 797 insertions(+), 1110 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ee906366630..afb4b323fbd 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.1.0";
-       sha256 = "0072b6a48008d3f3ffb360d7c6ba493f44167a3f9eb5341a9ff25fc6f8dbc78a";
+       version = "1.1.1";
+       sha256 = "45120cf01965a8c3e4b8fdc1bc338ad085971fe4cd2b5f18af11d42a3c780b4f";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1824,6 +1824,7 @@ self: {
        testHaskellDepends = [ base containers MissingH parsec ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -5028,6 +5029,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5942,6 +5944,7 @@ self: {
        homepage = "https://github.com/tobbebex/GPipe-Core#readme";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6629,6 +6632,8 @@ self: {
        pname = "Graphalyze";
        version = "0.14.1.1";
        sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f";
+       revision = "1";
+       editedCabalFile = "25847f733dbed8809d4bec1b14c839a41668b997dd9d1b70572f123cb5010e3d";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
          old-locale pandoc process random text time
@@ -7160,6 +7165,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
@@ -9633,25 +9639,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
-     , time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.6";
-       sha256 = "1ad6cbb50fc1ecaa98baa6de3660a9b82a9d101f17396b0da9b6c598b1114c4c";
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_7" = callPackage
     ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
      , time
      }:
@@ -9999,6 +9986,7 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6DB";
        description = "A RESTful Web Service for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IcoGrid" = callPackage
@@ -14019,6 +14007,7 @@ self: {
        homepage = "http://github.com/ninegua/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -14781,6 +14770,7 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "Random123" = callPackage
@@ -15703,8 +15693,8 @@ self: {
      }:
      mkDerivation {
        pname = "SelectSequencesFromMSA";
-       version = "1.0.2";
-       sha256 = "e0bcbec57109cd8528e2fd511b4ca5ea17cbffad4bac4f7a71bad90e0ba2271c";
+       version = "1.0.3";
+       sha256 = "4cbff4e5e788381c57ecbc1164b762ae0489c8b165fae8fc8be17d0636ff5644";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19331,13 +19321,13 @@ self: {
 
   "accelerate-cublas" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
-     , accelerate-io, accelerate-utility, base, cublas, cuda, random
-     , utility-ht, vector
+     , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix
+     , pooled-io, random, timeit, utility-ht, vector
      }:
      mkDerivation {
        pname = "accelerate-cublas";
-       version = "0.0";
-       sha256 = "4c27f8f6dca4c6e822cc731fe89ab90712f29acb341ad856791aa97db15199b5";
+       version = "0.1";
+       sha256 = "c6a7a167ccafb7feae7f54d7a0f3cca5df1b404d19fde74abae090d54a67701a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19346,9 +19336,13 @@ self: {
        ];
        executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
-         base cublas random
+         base random
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-cublas/";
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base cuda hmatrix pooled-io random timeit utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-cublas/";
        description = "Basic Linear Algebra using native CUBLAS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19385,8 +19379,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-cufft";
-       version = "0.0.0.1";
-       sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d";
+       version = "0.0.1";
+       sha256 = "82edc068a682202ac50f07a3414d084cf3e5e50171144c14137f2966452bf270";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19514,15 +19508,15 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-fourier-benchmark";
-       version = "0.0";
-       sha256 = "ea65bce4c026c4ac47a34ed80d5901f2b14d06c94dbe7693acce58a992d5e998";
+       version = "0.0.0.1";
+       sha256 = "37ac3787e7b759a2df2e0c9d1a6a6938402a7fc25ff99266d00aba62c304f67d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          accelerate accelerate-cuda accelerate-cufft accelerate-fftw
          accelerate-fourier base criterion
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/";
+       homepage = "http://hub.darcs.net/thielema/accelerate-fourier-benchmark/";
        description = "Compare different implementations of the Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19564,6 +19558,7 @@ self: {
        ];
        description = "Accelerate backend generating LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -19583,6 +19578,7 @@ self: {
        ];
        description = "Accelerate backend generating LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -20333,6 +20329,8 @@ self: {
        pname = "active";
        version = "0.2.0.12";
        sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e";
+       revision = "1";
+       editedCabalFile = "ce9337ef3740c2b53ab2f5bec6d2019447fda7d7f2c5fe8f68d9930782fb93ff";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -21317,8 +21315,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
-       revision = "4";
-       editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e";
+       revision = "5";
+       editedCabalFile = "ae9f74efc346334bcfc1124785765d9e2c4749da7d247500a3c168b46c4ad76c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -22423,6 +22421,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -22443,6 +22442,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -22478,6 +22478,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -24710,6 +24711,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "animate" = callPackage
+    ({ mkDerivation, base, hspec, vector }:
+     mkDerivation {
+       pname = "animate";
+       version = "0.0.0";
+       sha256 = "693de5c29775d6b80dc04b9e7c0af9520efbd87632774bacb3217b85ab9ba821";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [ base hspec vector ];
+       homepage = "https://github.com/jxv/animate#readme";
+       description = "Animation for sprites";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anki-tools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, filepath, mtl, scientific, sqlite-simple, text, time
@@ -25922,36 +25936,6 @@ self: {
      }) {arbb_dev = null;};
 
   "arbtt" = callPackage
-    ({ mkDerivation, aeson, array, base, binary, bytestring
-     , bytestring-progress, containers, deepseq, directory, filepath
-     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
-     , tasty-golden, tasty-hunit, terminal-progress-bar, time
-     , transformers, unix, utf8-string, X11
-     }:
-     mkDerivation {
-       pname = "arbtt";
-       version = "0.9.0.12";
-       sha256 = "3bdd4171a6d68ff3604eb752d04fdc6e819ab90f021e65ff12f5f6c7e62e87cf";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array base binary bytestring bytestring-progress containers
-         deepseq directory filepath parsec pcre-light strict
-         terminal-progress-bar time transformers unix utf8-string X11
-       ];
-       executableSystemDepends = [ libXScrnSaver ];
-       testHaskellDepends = [
-         base binary bytestring containers deepseq directory parsec
-         pcre-light process-extras tasty tasty-golden tasty-hunit time
-         transformers unix utf8-string
-       ];
-       homepage = "http://arbtt.nomeata.de/";
-       description = "Automatic Rule-Based Time Tracker";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXScrnSaver;};
-
-  "arbtt_0_9_0_13" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
      , bytestring-progress, containers, deepseq, directory, filepath
      , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
@@ -27762,8 +27746,8 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-data";
-       version = "0.1.1.2";
-       sha256 = "65ff7d4a796ea2c1991aeda1e288f0ff931e5fb1831d6571faa3cf68a9367b58";
+       version = "1.0.2";
+       sha256 = "4b0931f86f331589344a1bb1f358683f168c2b565d4fd31cc238dfba01a27262";
        libraryHaskellDepends = [
          attoparsec attoparsec-time base base-prelude bytestring scientific
          text time
@@ -27870,13 +27854,15 @@ self: {
 
   "attoparsec-time" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
-     , filepath, text, time
+     , filepath, scientific, text, time
      }:
      mkDerivation {
        pname = "attoparsec-time";
-       version = "0.1.1.1";
-       sha256 = "8d1ae65e5798e451ca692b0492dd58cde17b33c1a1239bb635215728de7419bb";
-       libraryHaskellDepends = [ attoparsec base-prelude text time ];
+       version = "0.1.3";
+       sha256 = "2330fde1031338c51f2da12a2f09a4dbb19f7155fc00b40c76490753f054b118";
+       libraryHaskellDepends = [
+         attoparsec base-prelude scientific text time
+       ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
@@ -30103,8 +30089,8 @@ self: {
     ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
      mkDerivation {
        pname = "basic-sop";
-       version = "0.2.0.0";
-       sha256 = "8bec41c8501e9db661eea4d789ba167b6d0492c8fa69233826644c388656a891";
+       version = "0.2.0.1";
+       sha256 = "b0c6ffd05c21f7cd6c823bc4462aff90d4ae9dd2407cd7773282a3342338f73b";
        libraryHaskellDepends = [
          base deepseq generics-sop QuickCheck text
        ];
@@ -30834,29 +30820,6 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , QuickCheck, semigroups, tagged, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.4.1";
-       sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87";
-       revision = "1";
-       editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers semigroups tagged
-         template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck transformers transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/bifunctors/";
-       description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_4_2" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , QuickCheck, semigroups, tagged, template-haskell, transformers
      , transformers-compat
@@ -30876,7 +30839,6 @@ self: {
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -31860,6 +31822,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -33905,10 +33868,8 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.3.1.0";
-       sha256 = "d3ef2722c649903a26ddbc4d78bf8b7121d5f0bac84fc71ebad4c02e8f9e798c";
-       revision = "1";
-       editedCabalFile = "7ff3ee0a435f1d611c4ae67323913260a53fc3e22947c1db00bdf721bba7d45b";
+       version = "0.3.2.1";
+       sha256 = "47632eb6dfe452fc408f206643cc0060804c7b6c378c52d3d3477c765cca6f8e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36566,8 +36527,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.16";
-       sha256 = "f9f9f9c178ad486ff29186b519d6993a8429c3fa34a43d8ed42525c20df5585f";
+       version = "0.2.17";
+       sha256 = "07657d004cc43f420904881d83d35ee796116a5ef4966ebaef32a5044245cd52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38632,8 +38593,8 @@ self: {
      }:
      mkDerivation {
        pname = "case-insensitive";
-       version = "1.2.0.8";
-       sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68";
+       version = "1.2.0.9";
+       sha256 = "a7de8c4708ff47cd5d4138b74b5fae40cc271eed2635e2fe4da72066fb93d2b8";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -39260,27 +39221,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.0";
-       sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571";
-       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_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -39433,6 +39373,7 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cef = null; gtk2 = pkgs.gnome2.gtk;};
 
   "cef3-simple" = callPackage
@@ -39444,6 +39385,7 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -42295,6 +42237,7 @@ self: {
        homepage = "https://github.com/CloudI/cloudi_api_haskell";
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -42762,23 +42705,24 @@ self: {
 
   "codec" = callPackage
     ({ mkDerivation, aeson, base, binary, binary-bits, bytestring
-     , data-default-class, mtl, template-haskell, text, transformers
-     , unordered-containers
+     , generic-arbitrary, mtl, profunctors, tasty, tasty-quickcheck
+     , template-haskell, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "codec";
-       version = "0.1.1";
-       sha256 = "3351aa3747ae92db463706c527d1723c22c34dc280ccd14e530f1ca1555b6c3a";
+       version = "0.2.1";
+       sha256 = "ffc261b58108c3d90c0b0b68461857d1148208d1a9645916e63241aaa3c25b28";
        libraryHaskellDepends = [
-         aeson base binary binary-bits bytestring data-default-class mtl
-         template-haskell text transformers unordered-containers
+         aeson base binary binary-bits bytestring mtl profunctors
+         template-haskell text transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base binary binary-bits bytestring data-default-class mtl
-         template-haskell text transformers unordered-containers
+         aeson base binary bytestring generic-arbitrary tasty
+         tasty-quickcheck
        ];
        homepage = "https://github.com/chpatrick/codec";
-       description = "First-class record construction and bidirectional serialization";
+       description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -42877,12 +42821,17 @@ self: {
      }) {};
 
   "codeworld-api" = callPackage
-    ({ mkDerivation, base, blank-canvas, mtl, random, text, time }:
+    ({ mkDerivation, base, blank-canvas, cereal, cereal-text
+     , containers, hashable, mtl, random, text, time
+     }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.0.0";
-       sha256 = "b6a5d936bdc8aa1f18d949102646990eeaaa26647f81e2c58bf92cb18e2ecdb9";
-       libraryHaskellDepends = [ base blank-canvas mtl random text time ];
+       version = "0.2.1.0";
+       sha256 = "91d8cb2faab4f93e3c498a5eb6c3ba229649d6e4bc4a45fc7452b3720faf9b52";
+       libraryHaskellDepends = [
+         base blank-canvas cereal cereal-text containers hashable mtl random
+         text time
+       ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43350,6 +43299,7 @@ self: {
        homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -43538,6 +43488,7 @@ self: {
        homepage = "https://oss.xkcd.com/";
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comma" = callPackage
@@ -43676,25 +43627,6 @@ self: {
      }) {};
 
   "comonad" = callPackage
-    ({ mkDerivation, base, containers, contravariant, directory
-     , distributive, doctest, filepath, semigroups, tagged, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "comonad";
-       version = "5";
-       sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a";
-       libraryHaskellDepends = [
-         base containers contravariant distributive semigroups tagged
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/comonad/";
-       description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "comonad_5_0_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers
      , contravariant, distributive, doctest, semigroups, tagged
      , transformers, transformers-compat
@@ -43712,7 +43644,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-extras" = callPackage
@@ -44860,33 +44791,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
-     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
-     , mwc-random, QuickCheck, resourcet, safe, split, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.2.9.1";
-       sha256 = "05a4ea49a56ca27cc47b9138ed840b7aaa0176b0d917e06c1626fb940797dffe";
-       libraryHaskellDepends = [
-         base exceptions lifted-base mmorph monad-control mtl resourcet
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck resourcet safe
-         split transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_2_10" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, exceptions
      , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, split
@@ -44911,7 +44815,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -49207,17 +49110,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cubicbezier_0_6_0_0" = callPackage
+  "cubicbezier_0_6_0_1" = callPackage
     ({ mkDerivation, base, containers, fast-math, integration, matrices
      , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty
      , tasty-hunit, vector, vector-space
      }:
      mkDerivation {
        pname = "cubicbezier";
-       version = "0.6.0.0";
-       sha256 = "3265ad631316aaba8854f4fbb6cc7f680e4b6a91b58216f88b818d128bbb2b24";
-       revision = "1";
-       editedCabalFile = "4023405ed972ab01de3edd95f9cbf996d9b33be26f35efeb8a287c5fdb8503a7";
+       version = "0.6.0.1";
+       sha256 = "13966701c791e61ae75347a6c78c263da9343febac856989500a614eda0635a3";
        libraryHaskellDepends = [
          base containers fast-math integration matrices microlens
          microlens-mtl microlens-th mtl vector vector-space
@@ -50799,6 +50700,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-emoticons" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-emoticons";
+       version = "0.1.0";
+       sha256 = "016ea335c6ccf77bdf44ac25a23b77cd2f66db0976e48318b50f46783add2e2f";
+       libraryHaskellDepends = [ base ];
+       description = "Combinator emoticons: data-aviary in the flavor of emoticons";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-endian" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50956,6 +50868,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-forest" = callPackage
+    ({ mkDerivation, base, doctest, forest }:
+     mkDerivation {
+       pname = "data-forest";
+       version = "0.1.0.2";
+       sha256 = "01311f85695e8d885298a53f6f1d85ace0b47a0c27dd4eb3d772b418e7baba69";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest forest ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A simple multi-way tree data structure";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-fresh" = callPackage
     ({ mkDerivation, base, free, transformers }:
      mkDerivation {
@@ -55775,8 +55700,8 @@ self: {
     ({ mkDerivation, base, hspec, primitive, ref-tf, vector }:
      mkDerivation {
        pname = "disjoint-set-stateful";
-       version = "0.1.0.0";
-       sha256 = "addb5ab47b17356cd79fd4232db23c2ef09292cfd4c1ef04f2595416df0132f1";
+       version = "0.1.1.0";
+       sha256 = "8511e49c5ebb0467c9da86badd0d1564e02e407a3b3dec8a8781e45b62f4833a";
        libraryHaskellDepends = [ base primitive ref-tf vector ];
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        homepage = "https://github.com/clintonmead/disjoint-set-stateful";
@@ -57028,32 +56953,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck
-     , setenv, silently, stringbuilder, syb, transformers, with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.11.1";
-       sha256 = "5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit process QuickCheck setenv silently stringbuilder syb
-         transformers with-location
-       ];
-       homepage = "https://github.com/sol/doctest#readme";
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_11_2" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -57078,7 +56977,6 @@ self: {
        homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -59677,25 +59575,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.12";
-       sha256 = "f30e8c1e76410c3c76ec8cf59f0e1a381a83d302c02b5a95049238aa50eb9844";
-       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_0_4_0_13" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -59840,21 +59719,6 @@ self: {
      }) {};
 
   "ekg-json" = callPackage
-    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-json";
-       version = "0.1.0.4";
-       sha256 = "6afc7c146e4891824bb672af94ef3cade56ebf17cc51a3ca9ffdd2ce4345e479";
-       libraryHaskellDepends = [
-         aeson base ekg-core text unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg-json";
-       description = "JSON encoding of ekg metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-json_0_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
      mkDerivation {
@@ -59867,7 +59731,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-log" = callPackage
@@ -59964,24 +59827,6 @@ self: {
      }) {};
 
   "ekg-wai" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, http-types, network, text, time, transformers
-     , unordered-containers, wai, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "ekg-wai";
-       version = "0.1.0.0";
-       sha256 = "48a7e64ac613caf2eea1db79a20785d66552ea0f6943941468b0b6e44dfa7798";
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath http-types network
-         text time transformers unordered-containers wai wai-app-static warp
-       ];
-       homepage = "https://github.com/tvh/ekg-wai";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-wai_0_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, http-types, network, text, time, transformers
      , unordered-containers, wai, wai-app-static, warp
@@ -59997,7 +59842,6 @@ self: {
        homepage = "https://github.com/tvh/ekg-wai";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "electrum-mnemonic" = callPackage
@@ -61180,21 +61024,6 @@ self: {
      }) {};
 
   "envelope" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
-     , text
-     }:
-     mkDerivation {
-       pname = "envelope";
-       version = "0.2.1.0";
-       sha256 = "af8a043b4a1890e927ecc23827c2018d816071cd2cc5344543287897457276fe";
-       libraryHaskellDepends = [ aeson base http-api-data mtl text ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/envelope#readme";
-       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "envelope_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
      , text
      }:
@@ -61207,7 +61036,6 @@ self: {
        homepage = "https://github.com/cdepillabout/envelope#readme";
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -62055,8 +61883,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer";
-       version = "1.0.3";
-       sha256 = "c4144ad2572957cbd33d3c03c6eb68707b31e2e029741cbeb3b530237a6da8a1";
+       version = "1.3.0";
+       sha256 = "a163f72dad9c13ca6309f04a29f0c2ecf2b59b5c5e3f2acbd720c0ce1a4f31a3";
        libraryHaskellDepends = [
          base bimap bytestring containers ethereum-analyzer-deps extra fgl
          graphviz hexstring hoopl text
@@ -62067,50 +61895,52 @@ self: {
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit-combinators
      , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions
      , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl
-     , text, unordered-containers, vector
+     , protolude, text, tostring, unordered-containers, vector
      }:
      mkDerivation {
        pname = "ethereum-analyzer-cli";
-       version = "1.0.3";
-       sha256 = "8cd1c6e8e694147b97fcb1ed9f07442018c66dd91b736756b94ae1d5b4810b17";
+       version = "1.3.0";
+       sha256 = "cc00a9d155f683596e484f1f872923cceca2fd0236ad97a077ba113acddb782d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring conduit-combinators ethereum-analyzer-deps
-         exceptions hexstring http-conduit json-rpc text
+         aeson base bytestring conduit-combinators directory
+         ethereum-analyzer ethereum-analyzer-deps exceptions hexstring
+         http-conduit json-rpc monad-logger mtl protolude text tostring
          unordered-containers vector
        ];
        executableHaskellDepends = [
-         base directory ethereum-analyzer ethereum-analyzer-deps hflags
-         monad-logger mtl text
+         base ethereum-analyzer-deps hflags monad-logger protolude
        ];
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring
      , binary, bytestring, containers, deepseq, fast-logger, global-lock
-     , monad-logger, nibblestring, split, text
+     , monad-logger, split, text
      }:
      mkDerivation {
        pname = "ethereum-analyzer-deps";
-       version = "0.0.1";
-       sha256 = "2b83d2f3e13d2d85d6662df3c9469e834b9f02d60b737e94a94802ab0c8c7b71";
+       version = "1.3.0";
+       sha256 = "3e86a81365a8b7fd1b02cf1074a3a9a0cadfdc451513df1932b5821294495180";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base16-bytestring binary bytestring
-         containers deepseq fast-logger global-lock monad-logger
-         nibblestring split text
+         containers deepseq fast-logger global-lock monad-logger split text
        ];
        description = "Stripped dependencies of ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-webui" = callPackage
@@ -62123,8 +61953,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-webui";
-       version = "1.0.3";
-       sha256 = "487dcbd54fbc52682c51e9f52aa98a49e1cb369dad50bb29b2b9a1a94f0f900a";
+       version = "1.3.0";
+       sha256 = "a12ad88e3fad8d7763f2cca074432c543991b0fb96c1acf25f1317e1c97ad739";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62140,6 +61970,7 @@ self: {
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -62622,6 +62453,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exact-cover" = callPackage
+    ({ mkDerivation, base, containers, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "exact-cover";
+       version = "0.1.0.0";
+       sha256 = "e4e7077a009391fe2156b16651d731561c6cab9c774717dff272941473c8d662";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers tasty tasty-hunit ];
+       homepage = "https://github.com/arthurl/exact-cover";
+       description = "Efficient exact cover solver";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exact-pi" = callPackage
     ({ mkDerivation, base, numtype-dk }:
      mkDerivation {
@@ -63455,6 +63301,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible-sp" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "extensible-sp";
+       version = "0.1.0.0";
+       sha256 = "268bb4397b00d44f13095a7632447fd47a5f0c38aebb71c2acbe05f2f4cea168";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/githubuser/extensible-sp#readme";
+       description = "light-weight, extensible sums and products over types and kinds";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "external-sort" = callPackage
     ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }:
      mkDerivation {
@@ -64119,8 +63977,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "4";
-       editedCabalFile = "efe4614bc8832765c649a86b4e4a8c26122af3a5a23cad77676e062e3a85f66c";
+       revision = "5";
+       editedCabalFile = "6d7aa462319fe6e02907bf6f2d017e4bc2e9ad929ad8db4417f015972624f8c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65088,6 +64946,7 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fields" = callPackage
@@ -67400,6 +67259,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "forma" = callPackage
+    ({ mkDerivation, aeson, base, containers, data-default-class, hspec
+     , mtl, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "forma";
+       version = "0.1.0";
+       sha256 = "4ae9efb4ca4bc806e8d700ad2532d17a3002b532e5fb05fab7d3582842de5881";
+       libraryHaskellDepends = [
+         aeson base containers data-default-class mtl text
+         unordered-containers
+       ];
+       testHaskellDepends = [ aeson base hspec mtl text ];
+       homepage = "https://github.com/mrkkrp/forma";
+       description = "Process forms sent to you in JSON format like a man";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "formal" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, file-embed, HTTP, indents, interpolatedstring-perl6
@@ -67699,25 +67576,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.6";
-       sha256 = "9f0a2e9823146e7d13d1a11522446d43e110d80bde4937214107415f593c0222";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       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_0_0_7" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -68303,6 +68161,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -68329,27 +68188,6 @@ self: {
      }) {};
 
   "freer-effects" = callPackage
-    ({ mkDerivation, base, criterion, free, hlint, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "freer-effects";
-       version = "0.3.0.0";
-       sha256 = "06b67cabe8141468a0bc55d6f39918fd0a037992e760411d116a36a22586d57f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hlint QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion free mtl ];
-       homepage = "https://github.com/IxpertaSolutions/freer-effects";
-       description = "Implementation of effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-effects_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -68368,7 +68206,6 @@ self: {
        homepage = "https://github.com/IxpertaSolutions/freer-effects";
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -69238,8 +69075,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "functor-infix";
-       version = "0.0.4";
-       sha256 = "2dac64ec872867c2365dd6318388c27da561f34ab285852ffba89965d15525d7";
+       version = "0.0.5";
+       sha256 = "f62ea7341afe0f77794966d451bdd203e82efeef9e8aa9760847e05f6ea82e66";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
@@ -69542,6 +69379,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fx" = callPackage
+    ({ mkDerivation, base, base-prelude, transformers }:
+     mkDerivation {
+       pname = "fx";
+       version = "0.7";
+       sha256 = "8c7a2dbffec34d5ef827f4c2dea951260728684f3d89f90c526dcbf4bdd49784";
+       libraryHaskellDepends = [ base base-prelude transformers ];
+       homepage = "https://github.com/nikita-volkov/fx";
+       description = "Horizontally composable effects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "g-npm" = callPackage
     ({ mkDerivation, base, HTTP, json }:
      mkDerivation {
@@ -70171,6 +70020,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-aeson_0_2_0_9" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
+     , tagged, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "generic-aeson";
+       version = "0.2.0.9";
+       sha256 = "34c13f91ffa72a1f6d7f43b84fdd19b20db547045eb6164a4119f9a95dcd84cb";
+       libraryHaskellDepends = [
+         aeson attoparsec base generic-deriving mtl tagged text
+         unordered-containers vector
+       ];
+       description = "Derivation of Aeson instances using GHC generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-arbitrary" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -70460,18 +70326,6 @@ self: {
      }) {};
 
   "generics-sop" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "generics-sop";
-       version = "0.2.4.0";
-       sha256 = "481f73f122970efc24fe9dea71077e265d260834d975dd41395671d9a86a1863";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-sop_0_2_5_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
@@ -70481,7 +70335,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -70626,6 +70479,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geniplate-mirror_0_7_5" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell }:
+     mkDerivation {
+       pname = "geniplate-mirror";
+       version = "0.7.5";
+       sha256 = "519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f";
+       libraryHaskellDepends = [ base mtl template-haskell ];
+       homepage = "https://github.com/danr/geniplate";
+       description = "Use Template Haskell to generate Uniplate-like functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "geniserver" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json
      , snap-core, snap-server, text, transformers, utf8-string
@@ -70826,6 +70692,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity";
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -72874,6 +72741,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -73223,29 +73091,6 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava
-     , concurrent-output, containers, directory, extra, file-embed
-     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
-     , tagged, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "gipeda";
-       version = "0.3.3.1";
-       sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cassava concurrent-output containers
-         directory extra file-embed filepath gitlib gitlib-libgit2
-         scientific shake split tagged text transformers
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/nomeata/gipeda";
-       description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gipeda_0_3_3_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava
      , concurrent-output, containers, directory, extra, file-embed
      , filepath, gitlib, gitlib-libgit2, scientific, shake, split
@@ -73266,7 +73111,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "giphy-api" = callPackage
@@ -73852,28 +73696,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.0.1";
-       sha256 = "a0e58b9e855cdf8617ba42436c974776800573951dcf680ec3072651fc10c5b5";
-       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-release_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -74359,27 +74181,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.1";
-       sha256 = "419c5ec7c93c981ced838d6711e18565883abbb3b229d34a6fc904722e678ec8";
-       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_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -74398,7 +74199,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
@@ -77802,6 +77602,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sheets_0_2_0" = callPackage
@@ -79742,6 +79543,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greplicate" = callPackage
@@ -79868,17 +79670,6 @@ self: {
      }) {};
 
   "groom" = callPackage
-    ({ mkDerivation, base, haskell-src-exts }:
-     mkDerivation {
-       pname = "groom";
-       version = "0.1.2";
-       sha256 = "0e820122cad388f31c3ef0815d7ff93b9e95a8fdec0d6c560c379fe0ecfdb010";
-       libraryHaskellDepends = [ base haskell-src-exts ];
-       description = "Pretty printing for well-behaved Show instances";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "groom_0_1_2_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "groom";
@@ -79890,7 +79681,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pretty printing for well-behaved Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gross" = callPackage
@@ -79991,26 +79781,6 @@ self: {
      }) {};
 
   "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";
-       sha256 = "78a5acb35b9b1dae9a9076e41db2dde46198b8e8494baaac98c6fdfc64b77f8d";
-       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-postgresql_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -82716,24 +82486,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.2";
-       sha256 = "f0b8e11e2a09d0d737620ed46e8029c5679cfe392c47df4be5ee3ba63a114ff1";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -82749,7 +82501,6 @@ self: {
        ];
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -83165,6 +82916,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hakyll-favicon" = callPackage
+    ({ mkDerivation, base, filepath, hakyll }:
+     mkDerivation {
+       pname = "hakyll-favicon";
+       version = "0.1.0";
+       sha256 = "f9844e4e2f8284d2bd3da45ab787d0616c4ac04925b9310b73771f8025ad420a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base filepath hakyll ];
+       executableHaskellDepends = [ base hakyll ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/elaye/hakyll-favicon#README.md";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hakyll-filestore" = callPackage
     ({ mkDerivation, base, filestore, hakyll, time, time-locale-compat
      }:
@@ -83389,6 +83155,7 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -85552,14 +85319,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskeline_0_7_3_1" = callPackage
+  "haskeline_0_7_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , process, terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.7.3.1";
-       sha256 = "7bec719c44d03cc78eb343f7927b1fc0482380384eed506ecb1644b86c62db22";
+       version = "0.7.4.0";
+       sha256 = "9ad5f556891733171086823ad63fc1e7b6cd9d758ff3f943eadbbdfaead53978";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath process terminfo
@@ -85585,12 +85352,12 @@ self: {
      }) {};
 
   "haskeline-repl" = callPackage
-    ({ mkDerivation, base, haskeline, mtl }:
+    ({ mkDerivation, ansi-terminal, base, haskeline, mtl }:
      mkDerivation {
        pname = "haskeline-repl";
-       version = "0.1.0.0";
-       sha256 = "1f1b05d615d6e35a98aec2bf705f848ff91f2b668e982f891537c83bbb5930e7";
-       libraryHaskellDepends = [ base haskeline mtl ];
+       version = "0.3.0.0";
+       sha256 = "0de972adbe908b3a6b3b2b681f5f3de0d4bb3deaa112179c643d4736e675e961";
+       libraryHaskellDepends = [ ansi-terminal base haskeline mtl ];
        homepage = "https://github.com/githubuser/haskeline-repl#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85953,6 +85720,7 @@ self: {
        homepage = "https://github.com/prateekkumarweb/haskell-go-checkers";
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -88594,8 +88362,8 @@ self: {
        pname = "hastache";
        version = "0.6.1";
        sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
-       revision = "4";
-       editedCabalFile = "10661eb3aea897aae7d81242de0dbba4eb412ee282d3a7343ed88ce626fd6bd8";
+       revision = "5";
+       editedCabalFile = "6e645296912c401a73a346c38a6ce2446d42591b3c602f7c657a626d9a0c8d3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89564,6 +89332,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -90146,6 +89915,7 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis" = callPackage
@@ -91575,13 +91345,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hformat_0_2_0_0" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, hspec, text }:
+  "hformat_0_3_0_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
+     , text
+     }:
      mkDerivation {
        pname = "hformat";
-       version = "0.2.0.0";
-       sha256 = "a949d752095cdc21a2e48ab4adf068ba67e5e53fa394e6fae9f29fe156dccefb";
-       libraryHaskellDepends = [ base base-unicode-symbols text ];
+       version = "0.3.0.0";
+       sha256 = "daf8636c4b3ac94c7831856123d4a4f94c03d89fa8f9e7e0f56866f622938002";
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols text
+       ];
        testHaskellDepends = [ base base-unicode-symbols hspec text ];
        homepage = "http://github.com/mvoidex/hformat";
        description = "Simple Haskell formatting";
@@ -93266,27 +93040,6 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hspec, http-types
-     , QuickCheck, semigroups, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.1.0.2";
-       sha256 = "fe6826b2ede3ce7541e5c88bda78dd66cc76725f14b06533bb5ecadddcb2cc65";
-       libraryHaskellDepends = [
-         aeson base hashable QuickCheck semigroups text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-types QuickCheck text unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
-       description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonpointer_1_1_1" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
@@ -93305,7 +93058,6 @@ self: {
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsonschema" = callPackage
@@ -93564,7 +93316,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ gebner peti ];
+       maintainers = with stdenv.lib.maintainers; [ gebner ];
      }) {};
 
   "hledger-iadd" = callPackage
@@ -93631,7 +93383,7 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
@@ -93825,6 +93577,7 @@ self: {
        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
@@ -94112,6 +93865,7 @@ self: {
        homepage = "https://github.com/peddie/hmatrix-nlopt";
        description = "Interface HMatrix with the NLOPT minimizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -96253,33 +96007,6 @@ self: {
      }) {};
 
   "hpc-coveralls" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
-     , containers, curl, directory, directory-tree, hpc, HUnit, process
-     , pureMD5, regex-posix, retry, safe, split, transformers
-     }:
-     mkDerivation {
-       pname = "hpc-coveralls";
-       version = "1.0.8";
-       sha256 = "431db6ee058bf459c3e433c2d9ad89f1fcb344590745c3f62d0b744fc7d288b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 retry safe split transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 regex-posix retry safe split
-         transformers
-       ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hpc-coveralls_1_0_9" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
@@ -97533,6 +97260,7 @@ self: {
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -98829,28 +98557,6 @@ self: {
      }) {inherit (pkgs) lua5_1;};
 
   "hslua-aeson" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
-     , ieee754, QuickCheck, quickcheck-instances, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hslua-aeson";
-       version = "0.1.0.3";
-       sha256 = "f10c7fc9fdcc1c41964eb5ab170ce233be99343eb73ddaff5c175bea5bfcf1ea";
-       libraryHaskellDepends = [
-         aeson base hashable hslua scientific text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
-         quickcheck-instances scientific text unordered-containers vector
-       ];
-       homepage = "https://github.com/tarleb/hslua-aeson#readme";
-       description = "Glue between aeson and hslua";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-aeson_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
      , unordered-containers, vector
@@ -98870,7 +98576,6 @@ self: {
        homepage = "https://github.com/tarleb/hslua-aeson#readme";
        description = "Glue between aeson and hslua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsmagick" = callPackage
@@ -99447,6 +99152,7 @@ self: {
        homepage = "https://github.com/erikd/hspec-hedgehog/";
        description = "Hedgehog support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -101069,30 +100775,6 @@ self: {
      }) {};
 
   "http-api-data" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , doctest, filepath, hashable, hspec, 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.6";
-       sha256 = "46315cdf457553ac3ecaaa3bd2109cbe5bbf41bd561a22a9282b3b460b147641";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         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
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_7" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, containers, directory, doctest, filepath, hashable, hspec
      , http-types, HUnit, QuickCheck, quickcheck-instances, text, time
@@ -101116,7 +100798,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -101826,33 +101507,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.4.3.3";
-       sha256 = "eccfbd44f9f9f8a2a8d70dd4f9a347e4dbe39b38327271fcceeff25f0dd18b81";
-       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;
-     }) {};
-
-  "http-reverse-proxy_0_4_4" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -101877,7 +101531,6 @@ 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-server" = callPackage
@@ -106744,8 +106397,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "d71d126bf455898492e1d2ba18b2ad04453f8b0e4daff3926a67f0560a712298";
-       revision = "1";
-       editedCabalFile = "642acfbcacd418f194e6fd7bf6d64cbb8efaf625bb0efaaed00504f3ba54c877";
+       revision = "2";
+       editedCabalFile = "972f14c0cf96728583b054eb2b26c2555438094685b562357ef12e1dc4cfc3eb";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -107519,27 +107172,6 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.4";
-       sha256 = "dccf2790eb545d167623c0133aa0838d714004bfd158e3c9dfaca38497aef316";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         transformers transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/nfrisby/invariant-functors";
-       description = "Haskell 98 invariant functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "invariant_0_4_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, profunctors, QuickCheck
      , semigroups, StateVar, stm, tagged, template-haskell, transformers
@@ -107558,6 +107190,27 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "invariant_0_4_2" = callPackage
+    ({ mkDerivation, array, base, bifunctors, comonad, containers
+     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
+     , semigroups, StateVar, stm, tagged, template-haskell, transformers
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.4.2";
+       sha256 = "5aa744ff09f118b642bcc4910261ed57f109af42eab5d218062f6bc28f54b1d4";
+       libraryHaskellDepends = [
+         array base bifunctors comonad containers contravariant ghc-prim
+         profunctors semigroups StateVar stm tagged template-haskell
+         transformers transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell98 invariant functors";
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -109442,6 +109095,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jarify" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, process
+     , regex-tdfa, temporary, text, zip-archive
+     }:
+     mkDerivation {
+       pname = "jarify";
+       version = "1.0";
+       sha256 = "c74a5fb188916ed823cfe574e61cb36514c75aa413895674cde9fec8f6019376";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base bytestring directory filepath process regex-tdfa temporary
+         text zip-archive
+       ];
+       doHaddock = false;
+       description = "Jarification of Haskell sources";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jason" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, vector
@@ -109929,8 +109603,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.5.0.2";
-       sha256 = "25958a11561f56363bb7dcdcd1ebbc97bf231ee68ed393b117c90fff0cf07abc";
+       version = "0.5.0.3";
+       sha256 = "d1216c4d6736a802d1c28ca8c2c6fbf18e1a237f971a6d1518fc28f440212a58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109952,7 +109626,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "jose_0_6_0_0" = callPackage
+  "jose_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -109961,8 +109635,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.6.0.0";
-       sha256 = "91766bdc72d524e43d77cf008176ec2eb38fbdf09e1a457dae1faf78e1e7fe97";
+       version = "0.6.0.1";
+       sha256 = "a0e6a3c3683df0eb22a552a5a799e3b2ff3e443ca3bdd423c40251b477d72c1a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109986,30 +109660,6 @@ self: {
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.5";
-       sha256 = "53e3e9441b7d6d987920749edd61ab15e6e526856822e7d6c27cab302eedcdea";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "jose-jwt_0_7_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
      , memory, mtl, QuickCheck, text, time, unordered-containers, vector
@@ -110030,7 +109680,7 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -110107,8 +109757,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.8.3.0";
-       sha256 = "e1d9838c5481f1dad2a12eecca2d1af0933e02f8f786df6bd1968b865b24f640";
+       version = "0.8.3.1";
+       sha256 = "682ade9ea22c8f3b23a928b8da0754c697e36d6b3569590f40953d499f247bdb";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -110758,8 +110408,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "7";
-       editedCabalFile = "c3b107899b4297971b6b2cb913b3ace26f6d847844c6a7a6b6fe9f8dc2a9a6f7";
+       revision = "8";
+       editedCabalFile = "2c6fdb7778fcf1f734463094c6a0a500ce885229b1eba3c1fc0f828e99745714";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -110778,8 +110428,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-sop";
-       version = "0.2.0.1";
-       sha256 = "ca02139ca3a5041225f684080067c5ec8c5e0ce3421a5eea9d273db377d005c9";
+       version = "0.2.0.2";
+       sha256 = "2ea0c44acc50087b09b399e917780c7d5a9e7e864c29a3b6512baff523db0785";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -111741,6 +111391,7 @@ self: {
        homepage = "https://github.com/krapsh/kraps-haskell";
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karver" = callPackage
@@ -111885,8 +111536,8 @@ self: {
      }:
      mkDerivation {
        pname = "kawhi";
-       version = "0.2.1";
-       sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677";
+       version = "0.2.2";
+       sha256 = "4e97700861c2113992c656272c6b95a30968352e40199732f6122cb25dadefff";
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-client http-conduit
          http-types mtl safe scientific text
@@ -111896,20 +111547,20 @@ self: {
          scientific smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text
        ];
-       homepage = "https://github.com/hamsterdam/kawhi";
+       homepage = "https://github.com/thunky-monk/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "kawhi_0_2_2" = callPackage
+  "kawhi_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "kawhi";
-       version = "0.2.2";
-       sha256 = "4e97700861c2113992c656272c6b95a30968352e40199732f6122cb25dadefff";
+       version = "0.3.0";
+       sha256 = "2321387a3ddaa17c09db3a8e7a41a39f8e211467bd80bccd73791de8fca2a44f";
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-client http-conduit
          http-types mtl safe scientific text
@@ -115862,8 +115513,10 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.2.1";
-       sha256 = "696c33bc6dd19dbc6320a637359675bfc3090b9ad05d92fd356b4242f8832519";
+       version = "0.1.2.2";
+       sha256 = "2fd6fc409ebad2e2cea15b99da2d8f196ad2d1f773144c0587b199e8def3dcdc";
+       revision = "1";
+       editedCabalFile = "1b18202d64c6f32b490c30b4d845d3e87e0fd3b14617e94a2cdbda2c6ca8f8df";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring canteven-log conduit
          containers data-default-class data-dword directory legion network
@@ -115956,6 +115609,7 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -118359,6 +118013,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -119854,8 +119509,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.1.1";
-       sha256 = "6a9c42649e8ebaa3959bed7faccbc22c40d78f0d626ca8c41673284d3ce4ee7c";
+       version = "1.1.2";
+       sha256 = "b66a1eba34ca749932d8525750c911da4c6847ddf5420581037c13f538f52748";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121115,6 +120770,7 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luminance-samples" = callPackage
@@ -121311,6 +120967,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "af8321c3511bde3e2745093fa3bd74c642e386db7d2e7c43b3a54814f1338144";
+       revision = "1";
+       editedCabalFile = "4d6412e760b11a7a48e7558ed8468a380a313a7bc7c0a37c8872737d375d0979";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -121389,8 +121047,8 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1";
-       revision = "1";
-       editedCabalFile = "7f2c0b8a7b6134789e1e2117ba70d536a050f3cc5cc6a438ab69ffd28785046c";
+       revision = "2";
+       editedCabalFile = "6bad6ae0c18fb12ee70a5d3b430c6fda1eb1a99702196646dd7aa37c8a0f1319";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
@@ -122491,30 +122149,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.1";
-       sha256 = "a559a166232461520f4fbb0637db9f922a82fdff819e9e35ee7b0941a7c0c315";
-       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_2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -122536,7 +122170,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -123039,23 +122672,6 @@ self: {
      }) {};
 
   "marvin-interpolate" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "marvin-interpolate";
-       version = "1.1";
-       sha256 = "4ab8a4739390bf13b1612f223a671b440d959e8f70c9b2913e35cf1cb9e75656";
-       libraryHaskellDepends = [
-         base haskell-src-meta mtl parsec template-haskell text
-       ];
-       testHaskellDepends = [ base hspec text ];
-       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
-       description = "Compile time string interpolation a la Scala and CoffeeScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "marvin-interpolate_1_1_1" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
      , template-haskell, text
      }:
@@ -123070,7 +122686,6 @@ self: {
        homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -123856,8 +123471,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus";
-       version = "0.3.2.1";
-       sha256 = "ac1fc31e78c001a3cf58b7acec59c08b83e063414650f5995e1a590cc728045d";
+       version = "0.3.3.0";
+       sha256 = "c23eba51ac61fe3d8dfd2c03c0f8a6ddb2e68936f513d5d14913a241fe9238ec";
        libraryHaskellDepends = [
          array async base bytestring cereal conduit conduit-combinators
          conduit-extra containers data-default deepseq lens lifted-async
@@ -123917,8 +123532,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus-fdk-aac";
-       version = "0.3.2.1";
-       sha256 = "197213a3645fda298d0a7ff9b123445df3464e70b9f2396f093b44119cfeba15";
+       version = "0.4.0.0";
+       sha256 = "c92ccd43789558fdcc299fe1da64354906b064daf7113e46982636d4b09f3d52";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers deepseq
          inline-c lens mediabus monad-logger random resourcet spool tagged
@@ -123930,7 +123545,7 @@ self: {
        ];
        benchmarkHaskellDepends = [
          base conduit criterion deepseq ghc-prim lens mediabus monad-logger
-         vector
+         time vector
        ];
        homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
@@ -124949,29 +124564,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";
-       sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microlens-aeson_2_2_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
@@ -125202,6 +124794,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -128069,6 +127662,8 @@ self: {
        pname = "monoid-extras";
        version = "0.4.2";
        sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f";
+       revision = "1";
+       editedCabalFile = "3eb78f74ef1e80bca459e1cf187ab824486002edd0f699016d193c3aa2d8b9da";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Various extra monoid-related definitions and utilities";
@@ -131768,8 +131363,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "9a5e07efa44f4b715b110aa4f9687e2b75458fb7537a2f4f1a3582c9e2e82a86";
-       revision = "2";
-       editedCabalFile = "81e838434e1cae11b94edbcfb61fee89f847a32e5a745fe59de69e6af9207ac9";
+       revision = "3";
+       editedCabalFile = "92ec853dbc1ef103ad44b6b39c61a905cc9b60cf0514cdd44751c70f533e1ac8";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -133477,6 +133072,7 @@ self: {
        homepage = "https://github.com/peddie/nlopt-haskell";
        description = "Low-level bindings to the NLOPT optimization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nlopt;};
 
   "nlp-scores" = callPackage
@@ -134566,6 +134162,7 @@ self: {
        homepage = "https://github.com/tonyday567/numhask";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-range" = callPackage
@@ -134588,6 +134185,7 @@ self: {
        homepage = "https://github.com/tonyday567/numhask-range";
        description = "see readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nums" = callPackage
@@ -134661,24 +134259,24 @@ self: {
   "nvim-hs" = callPackage
     ({ mkDerivation, 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, messagepack
-     , monad-control, mtl, network, optparse-applicative, parsec
+     , 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 {
        pname = "nvim-hs";
-       version = "0.1.0";
-       sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0";
+       version = "0.2.1";
+       sha256 = "d10758496b4e7e51883a05df07c14f39281a87d946ff2300c05ab81a7ee1a9e4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger lifted-base messagepack
-         monad-control mtl network optparse-applicative parsec process
+         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
        ];
@@ -134687,7 +134285,7 @@ self: {
          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 messagepack mtl network optparse-applicative parsec
+         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
@@ -135012,30 +134610,6 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
-     , data-default-class, file-embed, http-client, http-client-tls
-     , overloaded-records, rattletrap, text
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.18.2";
-       sha256 = "4fcd5e5f2b01eee2e382bdf701617129500cce1d4302fa265d52c15edcfa34a0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary bytestring containers data-default-class
-         file-embed overloaded-records rattletrap text
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "octane_0_18_3" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
@@ -135056,7 +134630,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octohat" = callPackage
@@ -137753,6 +137327,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -137793,8 +137368,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
-       revision = "2";
-       editedCabalFile = "5dc6d0e5637a60e185b91d0540ba0c729ff9413bb852abd94fe9ac19fa3f1227";
+       revision = "3";
+       editedCabalFile = "0a776d292fd0ab23b9835416f8985a475550319b1d65e6bbe99265b914cefa52";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -137838,6 +137413,8 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.10.4.1";
        sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51";
+       revision = "1";
+       editedCabalFile = "12e0b66b4e3b9e74142163326b50254ed66adbeaae550d08e20cd1cb63db9b01";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138083,8 +137660,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
-       revision = "2";
-       editedCabalFile = "7a12dacfadc507c1e7992acdceeba8a1a12ca682724dd1cc4faefaf985b8c2ea";
+       revision = "3";
+       editedCabalFile = "deb49394bcb5219196ae12342ca2baeeacf50d034767e1dcd25bbd00dc55e643";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -139531,6 +139108,29 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "patat_0_5_1_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , bytestring, containers, directory, filepath, highlighting-kate
+     , mtl, optparse-applicative, pandoc, terminal-size, text, time
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "patat";
+       version = "0.5.1.1";
+       sha256 = "c04ea9a62a9bb24c12cd70f96d98517f8d1d65542a1a6ed0461fc5d00cfbe724";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-terminal ansi-wl-pprint base bytestring containers
+         directory filepath highlighting-kate mtl optparse-applicative
+         pandoc terminal-size text time unordered-containers yaml
+       ];
+       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
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139545,21 +139145,24 @@ self: {
   "patch-image" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
      , accelerate-cufft, accelerate-fourier, accelerate-io
-     , accelerate-utility, array, base, Cabal, carray, containers
-     , enumset, fft, filepath, gnuplot, hmatrix, JuicyPixels, knead
-     , llvm-extra, llvm-tf, pqueue, tfp, utility-ht, vector
+     , accelerate-utility, array, base, bytestring, Cabal, carray
+     , cassava, containers, enumset, explicit-exception, fft, filepath
+     , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf
+     , non-empty, pqueue, tfp, unordered-containers, utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.2";
-       sha256 = "23517289417a46873182c45091da803df80942758b38dca89303c0d066546450";
+       version = "0.3.0.1";
+       sha256 = "1ebfec911d2a0751d69d6ba9aa8f1c3735d664b56346a6b62aacc304753cbcc5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
          accelerate-fourier accelerate-io accelerate-utility array base
-         Cabal carray containers enumset fft filepath gnuplot hmatrix
-         JuicyPixels knead llvm-extra llvm-tf pqueue tfp utility-ht vector
+         bytestring Cabal carray cassava containers enumset
+         explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead
+         llvm-extra llvm-tf non-empty pqueue tfp unordered-containers
+         utility-ht vector
        ];
        homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
@@ -140551,20 +140154,21 @@ self: {
      }) {};
 
   "peregrin" = callPackage
-    ({ mkDerivation, base, hspec, pg-harness-client, postgresql-simple
-     , resource-pool, text, transformers
+    ({ mkDerivation, base, bytestring, hspec, pg-harness-client
+     , postgresql-simple, resource-pool, text, transformers
      }:
      mkDerivation {
        pname = "peregrin";
-       version = "0.1.0";
-       sha256 = "9cd335665b1d4e453d88c3dbe3ffb238ebca89890ac7998bc80f6968be2e1ac1";
-       libraryHaskellDepends = [ base postgresql-simple text ];
+       version = "0.2.0";
+       sha256 = "635af1f11b6518980e1aa6beff32cf98e9a14ff035f8bc47b716e95b994d6998";
+       libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        testHaskellDepends = [
          base hspec pg-harness-client postgresql-simple resource-pool text
          transformers
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perfecthash" = callPackage
@@ -142207,14 +141811,14 @@ self: {
   "pipes" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
+     , test-framework-quickcheck2, transformers, void
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.3.2";
-       sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a";
+       version = "4.3.3";
+       sha256 = "748d728bba3b00fb908c8e4f338877a33559738f791b94eae6ac1a10b9a2f669";
        libraryHaskellDepends = [
-         base exceptions mmorph mtl transformers
+         base exceptions mmorph mtl transformers void
        ];
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -143658,6 +143262,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot" = callPackage
@@ -144538,14 +144143,15 @@ self: {
 
   "pong-server" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, exceptions
-     , hspec, http-types, network, QuickCheck
+     , hspec, http-types, monad-control, network, QuickCheck
      }:
      mkDerivation {
        pname = "pong-server";
-       version = "0.0.3.0";
-       sha256 = "dd84310b20b09d2667dcc1af7b6ecab2a47f19986395049eeebb7ddc86b8c326";
+       version = "0.0.4.2";
+       sha256 = "a359d31ed2bca75ff6159b9094d901d60dcb85f291aeb35e96b9c59abca82fe8";
        libraryHaskellDepends = [
-         base bytestring classy-prelude exceptions http-types network
+         base bytestring classy-prelude exceptions http-types monad-control
+         network
        ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        homepage = "http://github.com/RobertFischer/pong-server#readme";
@@ -144945,6 +144551,7 @@ self: {
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {util = null;};
 
   "posix-realtime" = callPackage
@@ -145466,6 +145073,7 @@ self: {
        homepage = "https://gitlab.com/theunixman/postgresql-typed-lifted";
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest" = callPackage
@@ -146498,8 +146106,8 @@ self: {
     ({ mkDerivation, base, generics-sop, pretty-show }:
      mkDerivation {
        pname = "pretty-sop";
-       version = "0.2.0.0";
-       sha256 = "931e60782ff551f864b2548fcb39c2e05e502a4b2ef76108a6f66b672c88590f";
+       version = "0.2.0.1";
+       sha256 = "af2460f06064770371fe9d2762eefad3246adf4f014fe700585a9827b986b14e";
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -148828,6 +148436,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
@@ -151750,25 +151359,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-client, http-client-tls, http-types, tasty
-     , tasty-hspec, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.2";
-       sha256 = "99b838c7d85208cd49fdf733d99ca29baafbb924f9db8a0d45ae88c15fc6ba73";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_0_3_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-client, http-client-tls, http-types, tasty
      , tasty-hspec, text, uuid
@@ -151785,7 +151375,6 @@ 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
@@ -151972,6 +151561,20 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rawfilepath_0_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "rawfilepath";
+       version = "0.2.2";
+       sha256 = "b514ffc9b9b508cc82cd6ed2dce631acc0636ceb0b3be777d853feaa43df0420";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/xtendo-org/rawfilepath#readme";
+       description = "Use RawFilePath instead of FilePath";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rawr" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize
      , ghc-prim, lens, tasty, tasty-hunit, template-haskell
@@ -154913,6 +154516,7 @@ self: {
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -156138,8 +155742,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
-       revision = "6";
-       editedCabalFile = "38c82ac051ac1cda463e93d4704be00680ee24fc044eb1cabcf48789306a8635";
+       revision = "7";
+       editedCabalFile = "d678b034006e93f3407bb96b4e56bddc53d1c784714f72c06d0655b4791fe939";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -156191,8 +155795,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "7";
-       editedCabalFile = "8cd3ba2ec87976c3118b1de8d9172104e3a136f0afd9443e935130435fbc4c7d";
+       revision = "8";
+       editedCabalFile = "c2307e61b5976419cb52f3651131d07feebdfe092e2ff25e7a6c9653d4d628f4";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -156251,8 +155855,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "5";
-       editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1";
+       revision = "6";
+       editedCabalFile = "213fd569be02903225151d3c78e5d9fc1b55e590bef90f0cb80dc36a92acd68b";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -158064,8 +157668,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.9";
-       sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850";
+       version = "0.1.10";
+       sha256 = "5026d136196d57cb81cf3cb6ac41f7d73224997d75b224ba30beec3ec96c91ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158110,6 +157714,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtnetlink" = callPackage
@@ -158130,6 +157735,7 @@ self: {
        homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -158209,6 +157815,7 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -158709,8 +158316,10 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.2";
-       sha256 = "17e37e713a1dc86a50a16589ebc7e087e9896bdfe40918350b6f546a4992007b";
+       version = "0.9.3";
+       sha256 = "007a353d3f8b89affa30eb9479ab0578cf24a4a6c051828cfcc1f1859e7ff519";
+       revision = "1";
+       editedCabalFile = "7978a2a315feb629e1044e6996a765bc046e34e42baf11b5038e79a8952c8066";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
@@ -160754,6 +160363,7 @@ self: {
        executableHaskellDepends = [ base data-default-class sdl2 vector ];
        description = "Bindings to SDL2_mixer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-ttf" = callPackage
@@ -160772,6 +160382,7 @@ self: {
        executableHaskellDepends = [ base linear sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -162110,6 +161721,8 @@ self: {
        pname = "servant";
        version = "0.10";
        sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e";
+       revision = "1";
+       editedCabalFile = "b2b19327461e3836e98d59d5652fb8ef1935e1e89dd687a621a9d9a98794a272";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -162568,6 +162181,8 @@ self: {
        pname = "servant-client";
        version = "0.10";
        sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa";
+       revision = "1";
+       editedCabalFile = "9863fd0a183528cf4e4db911c074cd97b110781bb382b910089d953e4dd6a685";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions generics-sop http-api-data http-client http-client-tls
@@ -163361,6 +162976,8 @@ self: {
        pname = "servant-server";
        version = "0.10";
        sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d";
+       revision = "1";
+       editedCabalFile = "4332581ae3248c16017f88461abf6eef9fbad2ca86e86a2e8a013f9adc665973";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -163801,6 +163418,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "services" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , http-types, monad-logger, tasty, tasty-hunit, text, wai
+     }:
+     mkDerivation {
+       pname = "services";
+       version = "0.2.0";
+       sha256 = "010218ab69f6b76c05723fae4925789433a54d5503b66f84da1afc6c1043136b";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers http-types monad-logger
+         text wai
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/seanhess/services#readme";
+       description = "Tools for building services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , http-types, markdown, shakespeare, text, wai, wai-app-static
@@ -164574,32 +164209,6 @@ self: {
      }) {};
 
   "shakespeare" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, scientific, template-haskell, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
-       version = "2.0.12.1";
-       sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process scientific template-haskell text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-       description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_13" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -164622,7 +164231,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -164696,6 +164304,7 @@ self: {
        homepage = "https://github.com/brcha/shakespeare-sass";
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -165663,6 +165272,41 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "simple_0_11_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, cmdargs, directory, filepath, hspec
+     , hspec-contrib, http-types, mime-types, monad-control, mtl
+     , process, setenv, simple-templates, text, transformers
+     , transformers-base, unordered-containers, vector, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "simple";
+       version = "0.11.2";
+       sha256 = "ef53672eded47626cd125dc0759628fcfead2f2e271a0cae1092d4ff244e0614";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath http-types mime-types monad-control mtl simple-templates
+         text transformers transformers-base unordered-containers vector wai
+         wai-extra
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath process
+         setenv simple-templates text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath hspec hspec-contrib http-types mime-types monad-control
+         mtl simple-templates text transformers transformers-base
+         unordered-containers vector wai wai-extra
+       ];
+       homepage = "http://simple.cx";
+       description = "A minimalist web framework for the WAI server interface";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-actors" = callPackage
     ({ mkDerivation, base, chan-split, contravariant, mtl, transformers
      }:
@@ -165962,7 +165606,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-log_0_8_5" = callPackage
+  "simple-log_0_9_1" = callPackage
     ({ mkDerivation, async, base, base-unicode-symbols, containers
      , data-default, deepseq, directory, exceptions, filepath, hformat
      , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -165970,8 +165614,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.8.5";
-       sha256 = "f435eafb411f38ab43c09c034bb3829acbbb51adcb96ebb6436d5409a967c9a5";
+       version = "0.9.1";
+       sha256 = "44ede88d2db8e0e9d5f58f9cba379ce42dbd2bd0a6fe2053c476953586f0de7e";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -167003,7 +166647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3_2" = callPackage
+  "skylighting_0_3_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
      , bytestring, case-insensitive, containers, criterion, Diff
      , directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -167012,8 +166656,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3.2";
-       sha256 = "fe48ff596d3971cbb285a1ce677d1527285845feaed16d46fcb49b8ad50767bc";
+       version = "0.3.3";
+       sha256 = "098641785342d15eec56f17d4c782c15c5467c5bc86ba612109325ad50a7ec97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167580,18 +167224,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.6";
-       sha256 = "9225877499dd0b4504d91e26403b23f6d8517c097073abf07982fc5041836174";
-       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_7" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -167601,7 +167233,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
@@ -169581,6 +169212,7 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketio" = callPackage
@@ -169731,8 +169363,8 @@ self: {
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.4.1";
-       sha256 = "b9499555ee76c3a185384570b8d207f707a9dfa7d3529f06413d76fb164f4016";
+       version = "0.4.2";
+       sha256 = "2a7ece8b981e40b21df2ec385e7f5a5ad49a53d5553684043c9e57482399c71f";
        libraryHaskellDepends = [
          attoparsec-data base base-prelude bytestring
          bytestring-tree-builder case-insensitive contravariant http-client
@@ -172017,6 +171649,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-query" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , optparse-applicative, process, stackage-types, text, yaml
+     }:
+     mkDerivation {
+       pname = "stackage-query";
+       version = "0.1.0";
+       sha256 = "3280023d2858a244e7dccb2dd1e137972e1b5cfa7ea880613669bb3eca453b61";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal containers directory filepath optparse-applicative
+         process stackage-types text yaml
+       ];
+       homepage = "https://github.com/juhp/stackage-query";
+       description = "Stackage package query";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-sandbox" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators
      , conduit-extra, directory, filepath, optparse-applicative, process
@@ -172267,19 +171918,6 @@ self: {
      }) {};
 
   "state-plus" = callPackage
-    ({ mkDerivation, base, checkers, mtl, QuickCheck }:
-     mkDerivation {
-       pname = "state-plus";
-       version = "0.1.2";
-       sha256 = "c6ed155137d40262bf8aa38155bd93ecdc4bdbcb4ac83f5b980eeb8545ee377d";
-       libraryHaskellDepends = [ base mtl ];
-       testHaskellDepends = [ base checkers mtl QuickCheck ];
-       description = "MonadPlus for StateT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "state-plus_0_1_3" = callPackage
     ({ mkDerivation, base, checkers, mtl, QuickCheck }:
      mkDerivation {
        pname = "state-plus";
@@ -173963,8 +173601,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka";
-       version = "2";
-       sha256 = "8273953fc6d54a7e1dc2c3f23c78c8ed6f4986c5e9a46222fc7e6831b2e24432";
+       version = "2.0.1";
+       sha256 = "24f70d15067c5f7ac097b2b0a9f65160b25f1a39f75ea605699ede97f5727589";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base base-prelude base64-bytestring
          bifunctors bytestring bytestring-tree-builder hashable http-media
@@ -174533,25 +174171,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 = "3.0.2";
-       sha256 = "94f1dcef7ded8a27365d448e2db70baa5fafc91fa047dbb35164f82fd84f0b0f";
-       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_3_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -174568,7 +174187,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
@@ -174823,6 +174441,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_8_0_0" = 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.0.0";
+       sha256 = "1cb416acfbd730735627a347a09aaec16875c8abf5e0b0220db62551106ef594";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl optparse-applicative strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylized" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -178640,6 +178288,8 @@ self: {
        pname = "tdigest";
        version = "0.1";
        sha256 = "0036b3aebe6556ced3a108579846346c9123d65c9dcd09c1d44435a64e3dc54b";
+       revision = "1";
+       editedCabalFile = "175789781df0bf1f1ba9e5380fe5b61b6238e90efce173ccff0fef73b766e876";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-compat binary deepseq reducers semigroupoids semigroups
@@ -178663,6 +178313,8 @@ self: {
        pname = "tdigest-Chart";
        version = "0";
        sha256 = "74a806695cba25ebc96d80944b832d3423be4175496e319a52b6efc7c5f470a7";
+       revision = "1";
+       editedCabalFile = "592a67f5fa3ca6733298f6a359be9b85b02a33ad2ea18d5a8e317e0ee743f8ee";
        libraryHaskellDepends = [
          base base-compat Chart colour lens semigroupoids semigroups tdigest
        ];
@@ -178825,6 +178477,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tempered" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
+     , process, yaml
+     }:
+     mkDerivation {
+       pname = "tempered";
+       version = "0.1.0.0";
+       sha256 = "13ac4b688e3f377c30f28c5a7ac272c5619b104963875ae14a3634ae0418bb38";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath mtl parsec process yaml
+       ];
+       executableHaskellDepends = [ base containers directory mtl ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/ChrisPenner/tempered#readme";
+       description = "A dead-simple shell interpolation templating utility";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "template" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -179284,12 +178956,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "terminfo_0_4_0_2" = callPackage
+  "terminfo_0_4_1_0" = callPackage
     ({ mkDerivation, base, ncurses }:
      mkDerivation {
        pname = "terminfo";
-       version = "0.4.0.2";
-       sha256 = "fea88b28443f5efd316c7699685b3925c0a7613992305f11af03746139d8f856";
+       version = "0.4.1.0";
+       sha256 = "3f53d7b1ae046a3767e6254f07eb7f91ec958a5e1633682677e292e8d7e9ff5d";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        homepage = "https://github.com/judah/terminfo";
@@ -180011,6 +179683,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-all_0_3_1_0" = callPackage
+    ({ mkDerivation, base, text, text-format, text-show }:
+     mkDerivation {
+       pname = "text-all";
+       version = "0.3.1.0";
+       sha256 = "dec7bfb61c30fd263df65caa200954ea8c1947b2c67bcb023d1b071a45336284";
+       libraryHaskellDepends = [ base text text-format text-show ];
+       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
@@ -180544,6 +180229,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show_3_6" = 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, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , th-lift, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.6";
+       sha256 = "64bde3e39a2a9b8da0b4de9d53c9cec56b5307786cb6bee12f47f3fdae0b6f3f";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant generic-deriving ghc-boot-th ghc-prim
+         integer-gmp nats semigroups tagged template-haskell text th-lift
+         transformers transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers contravariant deriving-compat
+         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         text th-lift transformers transformers-compat void
+       ];
+       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
@@ -180578,6 +180300,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show-instances_3_6" = 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";
+       sha256 = "b1b6782c2dee88d2c21c587b247d8cc6394edc5d9c38b31b07f80e99b84e3a84";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
      }:
@@ -180988,19 +180744,6 @@ self: {
      }) {};
 
   "th-expand-syns" = callPackage
-    ({ mkDerivation, base, containers, syb, template-haskell }:
-     mkDerivation {
-       pname = "th-expand-syns";
-       version = "0.4.2.0";
-       sha256 = "66fed79828e9a13375f0f801f5ecc3763186667228ad91e19919219ff1654db9";
-       libraryHaskellDepends = [ base containers syb template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
-       description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-expand-syns_0_4_3_0" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
@@ -181011,7 +180754,6 @@ self: {
        homepage = "https://github.com/DanielSchuessler/th-expand-syns";
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-extras" = callPackage
@@ -181126,19 +180868,6 @@ self: {
      }) {};
 
   "th-lift" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-lift";
-       version = "0.7.6";
-       sha256 = "326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ghc-prim template-haskell ];
-       homepage = "http://github.com/mboes/th-lift";
-       description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift_0_7_7" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-lift";
@@ -181149,7 +180878,6 @@ self: {
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -181435,8 +181163,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
-       revision = "3";
-       editedCabalFile = "acf48c0c351a4d79fc468cb1293e7b4cbc403a53981518c1d578473ce813cc12";
+       revision = "4";
+       editedCabalFile = "dcb32a117a7bc27b64a3721ee35ab1ad82352f10dd5a2234d45d040eef8a70c2";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -181693,6 +181421,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "threepenny-gui_0_7_0_2" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, deepseq, 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.7.0.2";
+       sha256 = "40223fac07d288cc111ffde1674278989300e525d323c10976f5f83a56b28479";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default deepseq
+         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 {
@@ -182964,8 +182716,8 @@ self: {
     ({ mkDerivation, async, base, time }:
      mkDerivation {
        pname = "tiny-scheduler";
-       version = "0.1.4.2";
-       sha256 = "aea6a3b9773e92cccfced04626ae9da51307b33a0b9374797c9aa84c9dd52e1f";
+       version = "0.1.4.3";
+       sha256 = "5cf6ffa6ffd8e3ab32a100201b55d859adf637f3f7efafb27180e7e9a2f86c11";
        libraryHaskellDepends = [ async base time ];
        homepage = "https://github.com/functor-soup/tiny-scheduler#readme";
        description = "tiny no-brainer job scheduler";
@@ -183551,6 +183303,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -184443,6 +184196,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "traverse-with-class_1_0_0_0" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "traverse-with-class";
+       version = "1.0.0.0";
+       sha256 = "65a220f1652b68269dfe8cc283a6e9292941eb12bdbd79344e073ba766191fbb";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Generic applicative traversals";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "travis" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit
      , transformers
@@ -185102,30 +184870,6 @@ self: {
      }) {};
 
   "tttool" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, executable-path, filepath, hashable, haskeline, HPDF
-     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
-     , process, random, split, spool, template-haskell, time, vector
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "tttool";
-       version = "1.7.0.1";
-       sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
-         optparse-applicative parsec process random split spool
-         template-haskell time vector yaml zlib
-       ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
-       description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tttool_1_7_0_2" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -185147,7 +184891,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
@@ -186921,20 +186664,22 @@ self: {
      }) {};
 
   "typesafe-precure" = callPackage
-    ({ mkDerivation, base, dlist, hspec, monad-skeleton
-     , template-haskell
+    ({ mkDerivation, autoexporter, base, dlist, hspec, monad-skeleton
+     , template-haskell, th-data-compat
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.2.0.0";
-       sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e";
+       version = "0.3.0.0";
+       sha256 = "4292ba9a6e1c01602e2ebda1a239121d8cab3433205ca965e92c7f5ffd1281b2";
        libraryHaskellDepends = [
-         base dlist monad-skeleton template-haskell
+         autoexporter base dlist monad-skeleton template-haskell
+         th-data-compat
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/igrep/typesafe-precure#readme";
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typescript-docs" = callPackage
@@ -188580,8 +188325,8 @@ self: {
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.14.1.2";
-       sha256 = "8f06d68b66269385a34d59ee6b68de932e0f4ee9bfb76219d9a278260e0a9d4b";
+       version = "0.14.1.3";
+       sha256 = "43e2329f20d321abcd094e597a4ebb112491c5903051e53d12e448ec25a64ca1";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -190425,21 +190170,6 @@ self: {
      }) {};
 
   "vault" = callPackage
-    ({ mkDerivation, base, containers, hashable, unordered-containers
-     }:
-     mkDerivation {
-       pname = "vault";
-       version = "0.3.0.6";
-       sha256 = "0b433de60fa3d20e93dce6013293e18089fb3233c34211ffa3f860408866ef48";
-       libraryHaskellDepends = [
-         base containers hashable unordered-containers
-       ];
-       homepage = "https://github.com/HeinrichApfelmus/vault";
-       description = "a persistent store for values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vault_0_3_0_7" = callPackage
     ({ mkDerivation, base, containers, hashable, unordered-containers
      }:
      mkDerivation {
@@ -190452,7 +190182,6 @@ self: {
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault-tool" = callPackage
@@ -193453,6 +193182,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-slack-middleware" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-types, wai }:
+     mkDerivation {
+       pname = "wai-slack-middleware";
+       version = "0.1.0.0";
+       sha256 = "76e46b6de6feecabaad0929a7e5926ac97884749192de1c9befabf0afee646fb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base http-client http-types wai ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/psibi/wai-slack-middleware#readme";
+       description = "A Slack middleware for WAI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-static-cache" = callPackage
     ({ mkDerivation, base, bytestring, cityhash, conduit
      , conduit-combinators, containers, http-types, resourcet
@@ -194100,6 +193845,7 @@ self: {
        homepage = "https://github.com/danse/web-output";
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-page" = callPackage
@@ -194471,31 +194217,6 @@ self: {
      }) {};
 
   "webdriver" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, data-default-class, directory, directory-tree
-     , exceptions, filepath, http-client, http-types, lifted-base
-     , monad-control, network, network-uri, scientific, temporary, text
-     , time, transformers, transformers-base, unordered-containers
-     , vector, zip-archive
-     }:
-     mkDerivation {
-       pname = "webdriver";
-       version = "0.8.4";
-       sha256 = "347f2935e7b9498d1a0391f929b347e295fa8b19a3ea0ac7b81802fda4164f23";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring
-         data-default-class directory directory-tree exceptions filepath
-         http-client http-types lifted-base monad-control network
-         network-uri scientific temporary text time transformers
-         transformers-base unordered-containers vector zip-archive
-       ];
-       homepage = "https://github.com/kallisti-dev/hs-webdriver";
-       description = "a Haskell client for the Selenium WebDriver protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "webdriver_0_8_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, data-default-class, directory, directory-tree
      , exceptions, filepath, http-client, http-types, lifted-base
@@ -194884,24 +194605,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-snap" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
-     , mtl, snap-core, snap-server, websockets
+  "websockets-rpc_0_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , wai-transformers, websockets
      }:
      mkDerivation {
-       pname = "websockets-snap";
-       version = "0.10.2.0";
-       sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2";
+       pname = "websockets-rpc";
+       version = "0.1.0";
+       sha256 = "010cf07ebf06a5a9caf406dbd88e1697efbbe6f4dd43d0bdc707ac341db4ec4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bytestring-builder io-streams mtl snap-core
-         snap-server websockets
+         aeson async base bytestring containers exceptions mtl QuickCheck
+         stm text transformers unordered-containers wai-transformers
+         websockets
        ];
-       description = "Snap integration for the websockets library";
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
+       ];
+       description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "websockets-snap_0_10_2_1" = callPackage
+  "websockets-snap" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
      }:
@@ -196593,21 +196322,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.3";
-       sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0";
-       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_4" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -196620,7 +196334,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
@@ -196966,8 +196679,8 @@ self: {
      }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.4.4";
-       sha256 = "4deca451bb872b0ea29851e51c04d88af735dff454e9df38d3dc998c531bc9e2";
+       version = "0.4.5";
+       sha256 = "979d1ae996faac30b5f7e03fe5c6bb4c55f6905d714bf799cba81e95fb28f4b5";
        libraryHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
@@ -196996,6 +196709,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -197811,10 +197525,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-html-conduit-lens";
-       version = "0.3.2.2";
-       sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac";
-       revision = "1";
-       editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8";
+       version = "0.3.2.3";
+       sha256 = "2bb210fb0b3282e3640875d8b9506ce9437db275c7b2a257e3c03eccd1a75ae4";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -198329,6 +198041,7 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -199636,6 +199349,7 @@ self: {
        homepage = "https://github.com/matthew-eads/yesod-articles";
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth" = callPackage
@@ -199797,33 +199511,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, pwstore-fast, 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.0.1";
-       sha256 = "8fe73fb7e4301e02e69cac312227078fd01927c8a006224f7e3fd8a93aa9cb75";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent pwstore-fast 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-auth-hashdb_1_6_1" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, pwstore-fast, resourcet, text

From 92844240c27fd779ea3b308729afbb310c119131 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Apr 2017 15:18:15 +0200
Subject: [PATCH 1502/1744] halvm: set proper meta.platforms

64-bit Linux is the only platform that has Xen in Nixpkgs.
---
 pkgs/development/compilers/halvm/2.4.0.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 06627ce0862..5b241b31ee3 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://github.com/GaloisInc/HaLVM";
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
+    platforms = ["x86_64-linux"];       # other platforms don't have Xen
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
-    inherit (bootPkgs.ghc.meta) license platforms;
+    inherit (bootPkgs.ghc.meta) license;
   };
 }

From 9b74549c0bd8458e4eba626977852efe3f3204b4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 21 Apr 2017 07:56:49 -0400
Subject: [PATCH 1503/1744] purescript: remove overrides

It now supports recent versions of various dependencies.
---
 .../haskell-modules/configuration-common.nix           | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9d689d5394a..14619415348 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -456,16 +456,6 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # See instructions provided by Peti in https://github.com/NixOS/nixpkgs/issues/23036
-  purescript = super.purescript.overrideScope (self: super: {
-    # TODO: Re-evaluate the following overrides after the 0.11 release.
-    aeson = self.aeson_0_11_3_0;
-    http-client = self.http-client_0_4_31_2;
-    http-client-tls = self.http-client-tls_0_2_4_1;
-    pipes = self.pipes_4_2_0;
-    websockets = self.websockets_0_9_8_2;
-  });
-
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 

From 731e0fa7423ae34cf25bf967c90228ec7ea99e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Aug 2015 11:23:28 +0200
Subject: [PATCH 1504/1744] haskell: preserve overrideScope on override

We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

Fixes https://github.com/NixOS/nixpkgs/issues/7953.
Closes https://github.com/NixOS/nixpkgs/pull/9336.
---
 .../haskell-modules/make-package-set.nix      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 29b294619e6..ee584b3c2ec 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -44,9 +44,23 @@ self: let
 
   mkDerivation = makeOverridable mkDerivationImpl;
 
-  callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-    overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
-  };
+  callPackageWithScope = scope: fn: manualArgs:
+    let
+      # this code is copied from callPackage in lib/customisation.nix
+      #
+      # we cannot use `callPackage` here because we want to call `makeOverridable`
+      # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is
+      # lost on `.override`) but determine the auto-args based on `drv` (the problem here
+      # is that nix has no way to "passthrough" args while preserving the reflection
+      # info that callPackage uses to determine the arguments).
+      drv = if builtins.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;
+      drvScope = allArgs: drv allArgs // {
+        overrideScope = f:
+          let newScope = mkScope (fix' (extends f scope.__unfix__));
+          in callPackageWithScope newScope drv manualArgs;
+      };
+    in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
 
   mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
   defaultScope = mkScope self;

From 6b36d26a24308e23ee80ebfeff0b61e147fb92c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 25 Apr 2017 14:44:10 +0200
Subject: [PATCH 1505/1744] haskell: add more callPackageWithScope docs

---
 .../development/haskell-modules/make-package-set.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ee584b3c2ec..6a17762a1fe 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -44,6 +44,11 @@ self: let
 
   mkDerivation = makeOverridable mkDerivationImpl;
 
+  # manualArgs are the arguments that were explictly passed to `callPackage`, like:
+  #
+  # callPackage foo { bar = null; };
+  #
+  # here `bar` is a manual argument.
   callPackageWithScope = scope: fn: manualArgs:
     let
       # this code is copied from callPackage in lib/customisation.nix
@@ -55,9 +60,16 @@ self: let
       # info that callPackage uses to determine the arguments).
       drv = if builtins.isFunction fn then fn else import fn;
       auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;
+
+      # this wraps the `drv` function to add a `overrideScope` function to the result.
       drvScope = allArgs: drv allArgs // {
         overrideScope = f:
           let newScope = mkScope (fix' (extends f scope.__unfix__));
+          # note that we have to be careful here: `allArgs` includes the auto-arguments that
+          # weren't manually specified. If we would just pass `allArgs` to the recursive call here,
+          # then we wouldn't look up any packages in the scope in the next interation, because it
+          # appears as if all arguments were already manually passed, so the scope change would do
+          # nothing.
           in callPackageWithScope newScope drv manualArgs;
       };
     in stdenv.lib.makeOverridable drvScope (auto // manualArgs);

From 17b689c0b27e6bf1ff25744cdf9608297dec8740 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Apr 2017 16:22:38 +0200
Subject: [PATCH 1506/1744] perl-version: add meta section

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae86edc1785..7cd58e66b0c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14945,7 +14945,11 @@ let self = _self // overrides; _self = with self; {
     name = "version-0.9918";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz";
-      sha256 = "0yr3aap5r6w9zd47w8k74228fhhyh85l90rbzg15j8jfmmz5q5sl";
+      sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b";
+    };
+    meta = {
+      description = "Structured version objects";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 

From e4190943c8df207b0ef8a873a016e036eb18037f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Apr 2017 17:19:10 +0200
Subject: [PATCH 1507/1744] nix: 1.11.8 -> 1.11.9

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 0c9981470d7..83378247719 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";
-  i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";
-  x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";
+  x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9";
+  i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9";
+  x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index eaab261adef..bf6216ccc67 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -125,10 +125,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.8";
+    name = "nix-1.11.9";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
+      sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1";
     };
 
     # Until 1.11.9 is released, we do this :)

From 8fba1abeb68e799d436b669622b38b879a6ce033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Apr 2017 19:16:23 +0200
Subject: [PATCH 1508/1744] coyim: fix missing icons

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

diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index f0ca2e0bfbe..5f868fc9858 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
-  cairo, gdk_pixbuf, glib, gnome3 }:
+  cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook  }:
 
 buildGoPackage rec {
   name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
   };
 
-  nativeBuildInputs = [ pkgconfig glib cairo gdk_pixbuf gnome3.gtk ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
 
   meta = {
     description = "a safe and secure chat client";

From 50ad243f7802c09788441fb0099626387fddb2db Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 21 Apr 2017 10:55:11 +0200
Subject: [PATCH 1509/1744] openvpn service: source up/down scripts

source the up/down scripts instead of executing them to avoid loosing
access to special variables like $1
---
 nixos/modules/services/networking/openvpn.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 3fbf5a9f022..1e99a2b4450 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -28,9 +28,10 @@ let
           fi
         done
 
-        ${cfg.up}
         ${optionalString cfg.updateResolvConf
            "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}
+
+        ${optionalString (cfg.up != "") "source ${userSuppliedUpScript}"}
       '';
 
       downScript = ''
@@ -38,6 +39,15 @@ let
         export PATH=${path}
         ${optionalString cfg.updateResolvConf
            "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}
+
+        ${optionalString (cfg.down != "") "source ${userSuppliedDownScript}"}
+      '';
+
+      userSuppliedUpScript = pkgs.writeScript "openvpn-${name}-userSuppliedUpScript" ''
+        ${cfg.up}
+      '';
+
+      userSuppliedDownScript = pkgs.writeScript "openvpn-${name}-userSuppliedDownScript" ''
         ${cfg.down}
       '';
 
@@ -133,7 +143,7 @@ in
             default = "";
             type = types.lines;
             description = ''
-              Shell commands executed when the instance is starting.
+              Shell script sourced by NixOS generated script when the instance is starting.
             '';
           };
 
@@ -141,7 +151,7 @@ in
             default = "";
             type = types.lines;
             description = ''
-              Shell commands executed when the instance is shutting down.
+              Shell script sourced by NixOS generated script when the instance is shutting down.
             '';
           };
 

From fce59d47e7d62c68063e3a972e10f4cbe0782431 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Thu, 20 Apr 2017 18:38:04 -0600
Subject: [PATCH 1510/1744] jenkins: 2.53 -> 2.55

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 5a0cb4911e1..548f6feb6c3 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.53";
+  version = "2.55";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "16lgwgp4n161j4vjwkzzdz4v2d6vv62rrqmcfmb6zalyvp6wpj9r";
+    sha256 = "1ms3sns87afnbdlww93fhp25pkbxz7z4z0kr4qh94n3njfbw2zp7";
   };
 
   buildCommand = ''

From b4707f223913e0be251160b1ab82fa56a77e1345 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Apr 2017 13:31:01 -0400
Subject: [PATCH 1511/1744] elpa-packages: 2017-04-25

---
 .../editors/emacs-modes/elpa-generated.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 34472bf8637..e3129254058 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.90.1";
+        version = "11.90.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.90.1.tar";
-          sha256 = "0bn5pg6v7zgqxs080bzrsx6789nzdx4622m3020ymzl66017nf0r";
+          url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
+          sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
         };
         packageRequires = [];
         meta = {
@@ -644,10 +644,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.3.1";
+        version = "1.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.3.1.tar";
-          sha256 = "01f5pyalw60dr36w007mvvxry548zrhixzmba1sad19531bry7fc";
+          url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar";
+          sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -1769,10 +1769,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.2.3";
+        version = "2.2.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
-          sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
+          url = "https://elpa.gnu.org/packages/stream-2.2.4.tar";
+          sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij";
         };
         packageRequires = [ emacs ];
         meta = {

From 23175abd07e70988d332b5b2968e05656e9856fe Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Apr 2017 13:36:05 -0400
Subject: [PATCH 1512/1744] melpa-stable-packages: 2017-04-25

---
 .../emacs-modes/melpa-stable-generated.nix    | 490 +++++++++++++-----
 1 file changed, 370 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 818d1058ec8..df1fa4a3340 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1157,12 +1157,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "4f7c556167e42c02d2f840aec345b8f60b71c477";
-          sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0";
+          rev = "2169d831731d206902114de3fc1b075b9e6b4ed4";
+          sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1564,12 +1564,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "0.3.3";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
-          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
+          rev = "c4629201a63047f9094be0d9150f201dd5be18ad";
+          sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2680,6 +2680,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "binclock";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "binclock.el";
+          rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
+          sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
+          sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
+          name = "binclock";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/binclock";
+          license = lib.licenses.free;
+        };
+      }) {};
     bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-key";
@@ -2893,12 +2914,12 @@
     boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
-          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
+          rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
+          sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -5028,6 +5049,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-shell";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "company-shell";
+          rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
+          sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
+          sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
+          name = "company-shell";
+        };
+        packageRequires = [ cl-lib company dash ];
+        meta = {
+          homepage = "https://melpa.org/#/company-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
@@ -7890,11 +7932,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "2.1.1";
+        version = "2.1.2";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
-          sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
+          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
+          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -8390,22 +8432,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "0.0.4";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
-          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
+          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
+          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
           name = "elpa-clone";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-clone";
           license = lib.licenses.free;
@@ -9014,22 +9056,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20150711";
+        version = "20170417";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "f945cff5e784e23e0028bf0a5221f4f47a822fac";
-          sha256 = "1f6zyz5jmbrvv37mbzsvwb3ycmq105p4ryz8p65b76jz3ps8yq5w";
+          rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d";
+          sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/enh-ruby-mode";
           license = lib.licenses.free;
@@ -9381,12 +9423,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.3.1";
+        version = "19.3.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "d25ad84195ca42969fbfb017a52aab8c8effc246";
-          sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1";
+          rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
+          sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9965,22 +10007,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-colemak-basics";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-colemak-basics";
-          rev = "f976bda20098c43be1418c36520a57467c8c6c13";
-          sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws";
+          rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
+          sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
           sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
           name = "evil-colemak-basics";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs evil evil-snipe ];
         meta = {
           homepage = "https://melpa.org/#/evil-colemak-basics";
           license = lib.licenses.free;
@@ -10699,6 +10741,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "exsqlaim-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "ahmadnazir";
+          repo = "exsqlaim-mode";
+          rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9";
+          sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
+          sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
+          name = "exsqlaim-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "https://melpa.org/#/exsqlaim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extend-dnd";
@@ -10720,6 +10783,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+    melpaBuild {
+        pname = "exwm-x";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "exwm-x";
+          rev = "87715a6891b31bc19954ea9fe1c1a9bf57bdbbce";
+          sha256 = "0x9gg3fy5xw3vf8gyfa5j5k08gnnfpsyjh4dk80sbbnf0z7cwycw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
+          sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
+          name = "exwm-x";
+        };
+        packageRequires = [ cl-lib exwm swiper switch-window ];
+        meta = {
+          homepage = "https://melpa.org/#/exwm-x";
+          license = lib.licenses.free;
+        };
+      }) {};
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
@@ -10993,22 +11077,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "finalize";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "72c8eaab3deb150ee2cf7f1473114cecffb5204a";
-          sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
+          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
+          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
-        packageRequires = [ cl-lib eieio emacs ];
+        packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
           homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
@@ -11273,6 +11357,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatui-dark-theme";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "theasp";
+          repo = "flatui-dark-theme";
+          rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
+          sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
+          sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
+          name = "flatui-dark-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flatui-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
@@ -11294,24 +11399,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "flow-mode";
+        pname = "flow-minor-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "an-sh";
-          repo = "flow-mode";
+          repo = "flow-minor-mode";
           rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
           sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
-          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
-          name = "flow-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
+          sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
+          name = "flow-minor-mode";
         };
-        packageRequires = [ emacs web-mode ];
+        packageRequires = [];
         meta = {
-          homepage = "https://melpa.org/#/flow-mode";
+          homepage = "https://melpa.org/#/flow-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11696,12 +11801,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "1.0.6";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
-          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
+          rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
+          sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12725,12 +12830,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "2.2.2";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d";
-          sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq";
+          rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
+          sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -12835,6 +12940,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fuel";
+        version = "0.96";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
+          sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
     full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "full-ack";
@@ -13423,6 +13547,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "git-commit-insert-issue";
+        version = "0.3";
+        src = fetchFromGitLab {
+          owner = "emacs-stuff";
+          repo = "git-commit-insert-issue";
+          rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
+          sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
+          sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
+          name = "git-commit-insert-issue";
+        };
+        packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
+        meta = {
+          homepage = "https://melpa.org/#/git-commit-insert-issue";
+          license = lib.licenses.free;
+        };
+      }) {};
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
@@ -16311,12 +16456,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f";
-          sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3";
+          rev = "6d467b82d8c7584b7ab839bbaaac701af393209b";
+          sha256 = "1mmwms4s52537sq17zhm8sakyq1mkf4nqcxgydsg4zlmvzzxpz8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -16773,12 +16918,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.3.3";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "68d4c614830970e9eaf929882e1d395a61872bea";
-          sha256 = "0zfhdlzpy6w7prdh60nd98cwgzfqfsn87xh2kb5hi40dh8gsccfb";
+          rev = "0885339369b65bc5d06829d82af734560dc45555";
+          sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -16941,12 +17086,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "d44d60d85cbeaf81d5e02ba154f4fcdca9faf7fd";
-          sha256 = "14zww0174vwf08fl9fv23faqn2byapb80rn72z4iv54p6pqykc2f";
+          rev = "ca919a4c71c187e1fbbad7e814aac1cf662ec51a";
+          sha256 = "0rrrj44ml2ymvxmg8igpn2irdhihv3djy5dfm6p6499cm64mawai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -19539,6 +19684,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaolin-theme";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "0rdy";
+          repo = "kaolin-theme";
+          rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e";
+          sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
+          sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
+          name = "kaolin-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/kaolin-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "karma";
@@ -19899,12 +20065,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "0.6.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
-          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -19920,12 +20086,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "0.6.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
-          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -20096,8 +20262,8 @@
           sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
-          sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
+          sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
           name = "ledger-mode";
         };
         packageRequires = [];
@@ -20494,12 +20660,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.14.0";
+        version = "2.15.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f";
-          sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx";
+          rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
+          sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -20921,12 +21087,12 @@
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "a2b7b85134784317445faee13d647fb62401ea23";
-          sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p";
+          rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
+          sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -21324,6 +21490,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markup";
+        version = "2.0.1";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "markup.el";
+          rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
+          sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
+          sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
+          name = "markup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/markup";
+          license = lib.licenses.free;
+        };
+      }) {};
     markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markup-faces";
@@ -21366,6 +21553,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mastodon";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "jdenen";
+          repo = "mastodon.el";
+          rev = "9b9e0bb7c4d414ffc26a0547d1e76cd106cc58b6";
+          sha256 = "1cjx022zrn7jbcq1x7x61xayhlpik2bm6vs37hh382ad7bnqgcyb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
+          sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
+          name = "mastodon";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mastodon";
+          license = lib.licenses.free;
+        };
+      }) {};
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
@@ -21600,12 +21808,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "2.5.3";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "89f9643c08211a770454919551a7fd8605d1fca8";
-          sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63";
+          rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83";
+          sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -23317,12 +23525,12 @@
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "b5db3a612bba35c8f54f44c300ebc879db6b3288";
-          sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq";
+          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
+          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -23653,12 +23861,12 @@
     omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "omni-log";
-        version = "0.1.2";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b";
-          sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
+          rev = "e86c80065030306645e28badcb0c25c549560106";
+          sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -23674,12 +23882,12 @@
     omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
     melpaBuild {
         pname = "omni-quotes";
-        version = "0.3.0";
+        version = "0.4.22";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "be1e719c046ca468275ed844989320f48358f2cd";
-          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
+          rev = "a10eca089dd87389c99f5c5ef8e3f8779f2652d2";
+          sha256 = "0i2xnpa6jickpp2i47c5l7c6djxz2lli8lcx402sijzmn1lx44sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -24910,12 +25118,12 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "cbce5871fe267fef725631b0b7365952c35ae401";
-          sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7";
+          rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
+          sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -25330,12 +25538,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
-          sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
+          rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
+          sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -26397,12 +26605,12 @@
     pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pinyinlib";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "pinyinlib.el";
-          rev = "f1e6c86f47e16c2bd48436630286bae8d6f8cb8c";
-          sha256 = "13q95z0j1mpk2yrrq0amc2jjhajaz4884bfliy2h8adh109j4q1d";
+          rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
+          sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -27297,12 +27505,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.2.1";
+        version = "3.3.0pre1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8";
-          sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4";
+          rev = "fba2acd72e8cbf138912295df227ee2c914158c3";
+          sha256 = "1862lp6br6ngfd13gz8m1x2glkz02qxbp6vj261ricbvc7fgkyd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28830,12 +29038,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "0.1.0";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
-          sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
+          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
+          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30529,12 +30737,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "1.9.0";
+        version = "1.10.1";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1";
-          sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4";
+          rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5";
+          sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -30967,6 +31175,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
+    melpaBuild {
+        pname = "spaceline-all-the-icons";
+        version = "1.0.5";
+        src = fetchFromGitHub {
+          owner = "domtronn";
+          repo = "spaceline-all-the-icons.el";
+          rev = "be53e5bde0e855c012bc99602830984a7008604a";
+          sha256 = "19xwy2dqlp585vi2ihr85rhf609lc57l133gc3bcz09aii24lfkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
+          sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
+          name = "spaceline-all-the-icons";
+        };
+        packageRequires = [ all-the-icons emacs spaceline ];
+        meta = {
+          homepage = "https://melpa.org/#/spaceline-all-the-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
     sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparkline";
@@ -30991,12 +31220,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "33da09b3895e03e64959005678d448ab82e527b6";
-          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
+          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
+          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -32664,15 +32893,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "theme-looper";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "theme-looper";
+          rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
+          sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
+          sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
+          name = "theme-looper";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/theme-looper";
+          license = lib.licenses.free;
+        };
+      }) {};
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "370d399703d232010599d24a242b5f91e25a1b9d";
-          sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq";
+          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
+          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -33428,12 +33678,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "3.3";
+        version = "3.5";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
-          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
+          rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
+          sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -33659,12 +33909,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "5.4";
+        version = "5.5";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
-          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
+          rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527";
+          sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -34121,12 +34371,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.1.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "f6583397a4f8c9cde6b556175a6e05303d6238de";
-          sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni";
+          rev = "69f94520035282c3eb838e6f240a6db93e54b99c";
+          sha256 = "0qxcx2pns77s4mgr1cfzvlhxmfvzckx52phq63b2wmxkijkbwpba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -34541,12 +34791,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "1.0.0";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
-          sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
+          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
+          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";

From 71f18584ad1d4772c05890a545d0e4c66e5c3c95 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Apr 2017 13:45:30 -0400
Subject: [PATCH 1513/1744] melpa-packages: 2017-04-25

Removals:
 - exiftool: git repo not responsive
 - eyedropper: renamed to palette
---
 .../editors/emacs-modes/melpa-generated.nix   | 1456 ++++++++++-------
 1 file changed, 844 insertions(+), 612 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 082301e254b..d5ce5e272f7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -800,8 +800,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1090,12 +1090,12 @@
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20170219.256";
+        version = "20170421.428";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "d92320e74089cb346e172c63b02cce48a0d8cca7";
-          sha256 = "06sidq00xaw0n0gfh7akzyxfr65ma5h299yk347f1q916bqqxna5";
+          rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c";
+          sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1215,12 +1215,12 @@
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20170331.1209";
+        version = "20170424.808";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "54c4e57b000d54cedb3d791d054d293c8f45f2fe";
-          sha256 = "17g4j5yc7phnn95cya8sw13jm1219j1yrjzdcvadi5xdwlb9gxgz";
+          rev = "2e905403922d9e79f75911586163c2cb5997a2cb";
+          sha256 = "1smfn2l4b9k422dyjzklbk2n075030hmypvhs82fnzgx7zcvzr3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1299,12 +1299,12 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20161228.1641";
+        version = "20170420.1424";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "b390f212947546498a098f2ceb16033709ff32fd";
-          sha256 = "0x6p79bcn8g4r8736j977hz3qwyd9c2p4qkaq88jbfhvxyzkpdaa";
+          rev = "2718190a0202aa4ab02b1f1f3d6ba7b996b69d6d";
+          sha256 = "1j3l7p3rnlax82jrdrjld1a26gk7cg002jcaj7677fhy261vxmib";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1591,12 +1591,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170417.201";
+        version = "20170423.244";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "9c6a36842aedf9960c5fa81ffe8ba9745dd9cb86";
-          sha256 = "0kam8p4nid1rmmr5jw3l8728fd5c9s67gabyacky7qnfa0klja5s";
+          rev = "8d7cc77b174b56cba6cf2bac27fea99f918340f0";
+          sha256 = "05xfbndlk65a38ixl7m92lha0v9z3hw4zk051a7nr2bzsfvyg92g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1612,12 +1612,12 @@
     all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-dired";
-        version = "20170210.811";
+        version = "20170418.1431";
         src = fetchFromGitHub {
           owner = "jtbm37";
           repo = "all-the-icons-dired";
-          rev = "6e5152dfeb0f8be01a61d6fb0c0cb248ecdf1718";
-          sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg";
+          rev = "980b7747d6c4a7992a1ec56afad908956db0a519";
+          sha256 = "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired";
@@ -2311,12 +2311,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170412.445";
+        version = "20170419.152";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
-          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
+          rev = "5af52ef940493d3d5acb56fc6372004ca48f75ca";
+          sha256 = "1n96n45ajx12ksnn8ij44b2jbcyvcki9k834ix96cwm1fcr553vg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2558,12 +2558,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170414.1333";
+        version = "20170418.1352";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "8d79047d58bf30e01cc9851431e7ee093c6bc60a";
-          sha256 = "1ijdyd3a5hxanz1wm4fxzsnnr00dwlwivj12533n9wrx029bkg4z";
+          rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
+          sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -3680,12 +3680,12 @@
     auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
     melpaBuild {
         pname = "auto-virtualenvwrapper";
-        version = "20170309.1536";
+        version = "20170421.26";
         src = fetchFromGitHub {
           owner = "robert-zaremba";
           repo = "auto-virtualenvwrapper.el";
-          rev = "114a096561ac3a3b10165d05a6e763cb3c39a9b3";
-          sha256 = "0j392l0kb6h5ckmpvhd71blw7ad9i2r7fc6laqq6vsibnw899wy5";
+          rev = "de613a872e9f3cf59786578883177b1bd654a75c";
+          sha256 = "1y2b3i5fk3qhp90xcpdwzl2bdgjk3nrlxi78icpb81rw700qlqzq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -3722,12 +3722,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20170303.1213";
+        version = "20170417.1407";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "62a1bbf904d075e7786fe1de2df86c5088a4be2d";
-          sha256 = "156wbir32fvkwfvamp5yfw9gkz8j0cs2shgx406mhv7prcr6cnhs";
+          rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119";
+          sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -5032,6 +5032,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "binclock";
+        version = "20170418.812";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "binclock.el";
+          rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac";
+          sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
+          sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
+          name = "binclock";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/binclock";
+          license = lib.licenses.free;
+        };
+      }) {};
     bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-chord";
@@ -5638,12 +5659,12 @@
     boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "20170329.406";
+        version = "20170418.835";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
-          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
+          rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
+          sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -6343,12 +6364,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170401.703";
+        version = "20170421.245";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "f60ed2a563b3867a98ab41290b46572789c43272";
-          sha256 = "11axmbqvak8djldjp9kqcaz7q6dxkig9h193l5javgf78pfcdlki";
+          rev = "ed649d722aeb20683705a2378438833efd96e271";
+          sha256 = "1bjkfivxs0x0jlj5qh5adjxmjvj8nd0vs77l4mbm6yv2gm08shxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6536,8 +6557,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-cake-inflector";
-          rev = "a91cecd533930bacf1dc30f5209831f79847abda";
-          sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
+          rev = "a1d338ec4840b1b1bc14f7f9298c07e2c1d2d8fc";
+          sha256 = "0m8ss9aky24f5i6b8fyy8mhv9ygj158crjyddnj9xx73vsjf96bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector";
@@ -6557,8 +6578,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-cake2";
-          rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b";
-          sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
+          rev = "caffb646c86333b8747cefeba070d57ac4fbaf00";
+          sha256 = "14q5hny3bdwcaq3ls6jlk8np4hf99jksxz84dhm2rdvnm18b1wk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2";
@@ -7141,8 +7162,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "1fcf27f62b30e839020ac31145951f9abbd1c148";
-          sha256 = "0nm3mjbynqfg0vr2b5x10vak859pjxq2kgmgkv4i1y1y2cfhp3fc";
+          rev = "863111d5e625700a95679f6068f1de230dc73eb5";
+          sha256 = "0a1fvr8raqa9na41znsznikimm2q0cldrdq5xw75c2xw8glfi3q6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7181,7 +7202,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12128";
+          rev = "12149";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7492,12 +7513,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170309.2126";
+        version = "20170422.1932";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "a73397712f5a1d008330778b45b3071df5232806";
-          sha256 = "0rx9z90k6mmlgnmwn4d3az9q72rd51zv8x038ws4f6aa7zji7wnx";
+          rev = "02c996e14c0dac64a02c47b01b64dc578aedafc0";
+          sha256 = "0vjdwq7bghq2gxm5n9jgk3l7wjvq3dpmrm5a45icx2vr0m05r0jb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -8059,8 +8080,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "300461";
-          sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
+          rev = "301302";
+          sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8701,8 +8722,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "be2c45f2a98d69cc9952b592777bb506f69149a2";
-          sha256 = "1nq63k8baym6dm8s05ac81iqvy9gi60a10c962x7zlxkk5r0klbp";
+          rev = "759c6752127092447e8978a978eefde451024b28";
+          sha256 = "016473s4x0z154hbcgafzv178rxq45rvspb7ap2qm6fw32abs117";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9444,12 +9465,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170415.1248";
+        version = "20170420.1837";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "b753952d5a0ee288b6c49b2d8dfa9a223ff59715";
-          sha256 = "11725dhdyy67qynp9vld691ljfz2yb9v3ql4j75l7y5jl3gjklwr";
+          rev = "1fe263493fc3cb3551c55bb3441fd9d7eb0c0a96";
+          sha256 = "14l8p1qibhd2jx9cgfb6h2fvcl1xn8rw4l6jd5n2m5580qv7cx5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9620,12 +9641,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170327.827";
+        version = "20170424.639";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "daec3ad0f3119f04108574ce48cd77068a850392";
-          sha256 = "04fv3713sgy8c5y9blgx2xyjdg5qvg5idhvsf2p5lk9gjxbslp29";
+          rev = "2480548183935f3d2c75e64a0ecd3a57303e1913";
+          sha256 = "0q6gdbflwhdbc2pa6g1rrd63d1gr9q84w4njpvk6g9djvqdvj1vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9879,12 +9900,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20170401.345";
+        version = "20170420.515";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
-          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
+          rev = "6c2585cf0fc321a20a36b4c596fb6b80f811670a";
+          sha256 = "0wqm7jvzlwh4bz5kk4ghz63z0yjvals0x513bnzrcjd43z2p048i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10225,8 +10246,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10242,12 +10263,12 @@
     company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-shell";
-        version = "20161128.953";
+        version = "20170417.2320";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "company-shell";
-          rev = "a4a7b9ed6b81e4c9f9cb04f63b386fd76d952f11";
-          sha256 = "00bgxd66pwchpy1lnv43izgr6gk4c9nh02jab6laf5jk8s9xs2h7";
+          rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
+          sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
@@ -10393,8 +10414,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10745,12 +10766,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170416.1036";
+        version = "20170425.51";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11517,12 +11538,12 @@
     cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cubicaltt";
-        version = "20161020.1343";
+        version = "20170421.1132";
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "9ae218e0beefd3cc2c617cf6b66ac9faba1a8af7";
-          sha256 = "08d09wgi7j8qihqsxyl2lgvwcsi7gwl8kbz3c36yc0gb656m7blr";
+          rev = "a2358867957d0046f960a32660580d8b0ef22a58";
+          sha256 = "02kiy3rn87kcpjcw4l7f2qrf37bnzp7f44qwlh3905rlzs4vby4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11785,8 +11806,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "0558bdb4d1ed4da734ac7194f0bdbe7c030cc70e";
-          sha256 = "18hf07pyyxdgb1li26yf26g77xqdpmgkxqkhxsq5aa8chj6zv900";
+          rev = "e1e33240b3eeaaca5a4dd5ced7c80d481a68aca1";
+          sha256 = "0vcqn3jimrihk9awhnyir2b3csc7lg3pwwpq5p5ghcdkdgsv8f5l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11886,12 +11907,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170404.426";
+        version = "20170424.247";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "e7066a1310b2437d1b68ec5afd800d06977dd687";
-          sha256 = "116hyd5c74m713xmzsl9panvn7014r7bg4267wvla6844n1qshp8";
+          rev = "764382bdcb1056e96f31a66f7910c16de39c7801";
+          sha256 = "0gj2hqcmf88i12vlc6i8pr7r6d1hczqhg7ablnycj673hnzzc5jh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11907,12 +11928,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170410.700";
+        version = "20170420.45";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "d93001794bb505b32708d7d7b1755ef0bbe13c82";
-          sha256 = "11dpdvn3lkd2yrzbibd7xqx1pznhn6i8wrp9bzg1yagn27jsyry8";
+          rev = "b762667c372a36e631eabee02f4feca7cdeb267c";
+          sha256 = "142yw8lm57h94n8ycybbrjzgd9lm7xdraiwvmmzdv1m44h1rmf79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12033,12 +12054,12 @@
     darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkburn-theme";
-        version = "20151003.100";
+        version = "20170423.952";
         src = fetchFromGitHub {
           owner = "gorauskas";
           repo = "darkburn-theme";
-          rev = "a0151684ae4fa7c364115188422f6c3425d1594c";
-          sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
+          rev = "0af794ff7fac19778ac8a7efb92455c6f6c2158f";
+          sha256 = "0nv917r8pbj6mfncjl8d7hq4763c69q491d4iwnff1n3wzlcp42s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a04dd517e02bc4b4a62d956aa901a727354202b0/recipes/darkburn-theme";
@@ -12142,8 +12163,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
-          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
+          rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
+          sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12184,8 +12205,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
-          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
+          rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
+          sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12201,12 +12222,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20170408.1653";
+        version = "20170419.2358";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "b409028a42059c70ac3a64e5a033477f27607101";
-          sha256 = "1s5lrc1vgc9q82nyz43sg094za0ncimr67p4mhmxqqxxchfk75x7";
+          rev = "27c559952483301cc92539f68a89a047a0cc69ad";
+          sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12910,12 +12931,12 @@
     diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20161102.1726";
+        version = "20170424.303";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "c476e4080de7bea98a7a9a1173df20397d1c7671";
-          sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv";
+          rev = "3e9d26407e8767375e75757e5adcb23a6fe94985";
+          sha256 = "1bdpn00vlgzsi3w53l7k5lkw6ps1h0mb0d9ww3zmif2y801krzqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13056,12 +13077,12 @@
     diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diminish";
-        version = "20151215.915";
+        version = "20170419.1036";
         src = fetchFromGitHub {
           owner = "myrjola";
           repo = "diminish.el";
-          rev = "826e19186bef91d2241739cb8b48b8cfba14c17a";
-          sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
+          rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d";
+          sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
@@ -13144,8 +13165,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13307,8 +13328,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13328,8 +13349,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13454,8 +13475,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13475,8 +13496,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13531,12 +13552,12 @@
     dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-rainbow";
-        version = "20141214.543";
+        version = "20170417.1341";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13556,8 +13577,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13653,8 +13674,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13754,12 +13775,12 @@
     direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "direx";
-        version = "20151023.1606";
+        version = "20170422.627";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "direx-el";
-          rev = "9497231cf50767987494718db073731b05a4f970";
-          sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
+          rev = "a79bfdb5980cf6ed7bfb3b41ddc471a7b6c0ede4";
+          sha256 = "0fl9hdnrq54awx43635p6pmc8bqyppa02gs1d76nifi0q4g9v4m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx";
@@ -14493,12 +14514,12 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20170221.1317";
+        version = "20170418.1024";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "5f1e17e4e59fee4725c5b4cd9b5b49f1faaa108f";
-          sha256 = "1pw6706lnd6n866scwp35ar58y2c6jjyn82qpjdk0ma12hgv3gzf";
+          rev = "3c6bc90360a2df53caad1721ee4c8285e2e22369";
+          sha256 = "166hfzfb45f11jfhx78w6h23cyj9wr1nrwrxxqs2m5cry407gj3k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14598,12 +14619,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170411.1533";
+        version = "20170422.1853";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "1618b28f188b2ca547c2cceb16ad8e6ac9ec5a83";
-          sha256 = "1bxfx7i9gdp870x4qkqkmqqb9jszi1hn345h5xwqajik6ys7d2cj";
+          rev = "bde6fb34c735631e3995443580efe7eda65b7baf";
+          sha256 = "0lyrl7lqg0ws4xyz1h0ps6c74rfwra9p93lkip613vr7fr70pinc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15028,7 +15049,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1791699";
+          rev = "1792605";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15129,12 +15150,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170412.1246";
+        version = "20170418.1359";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "877fe466c8c60edbd9ea5602185690b1fa599a6b";
-          sha256 = "1wm9kl4sximr75pfw18wxsd3c59qp0i1vn1565f4srfgq71r23yg";
+          rev = "b164a17ed218a36f424d442810843040c50fc727";
+          sha256 = "1nww3rwimkgal7ps8ifav89rzk0whblwxg3xabvqj9ll5gc0f0bw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15506,12 +15527,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170409.2149";
+        version = "20170425.110";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "b994c79a739fad4999ddc0d2b5a152bf0a4dbc7a";
-          sha256 = "1j2b2nwa4h95s2dr879iaa6zxy9gvvljvx5ksjirgmy6vf36lb0q";
+          rev = "37ddd55bedce68643948b928e09cf6195a8dc301";
+          sha256 = "11agzmkwmij861ppgvdkqqpxs1sccvc4w5rl3956igc9c3lys008";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16133,12 +16154,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170309.2006";
+        version = "20170417.2125";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "0a6d9a3c0259aba57a332ac8db582c33e522f12f";
-          sha256 = "114zfk7p6p61mcphd1hn3r1hqj0j9ra0acmfx1k74d60npci25pj";
+          rev = "bad62d8ac750bd06e7c31d2c3e744a37129c2ccd";
+          sha256 = "1iwirdvrs7fl1qx5qwhxa8xjxsnh3dn2vvbh43bkm2an8abssx4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16214,15 +16235,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
+    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20160812.729";
+        version = "20170421.55";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "a3e4eeb5b340186f727bd06aa3d4d3fcacc16292";
-          sha256 = "0kbm11v3sfvkc821lpcv87z21pqb3pb4jzv7wyiy6mlkbnqjl289";
+          rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5";
+          sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16233,7 +16254,6 @@
           auto-complete
           auto-highlight-symbol
           dash
-          eproject
           erlang
           f
           popup
@@ -16330,11 +16350,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170407.1229";
+        version = "20170420.1251";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "d15589a117ac710b70df71cdf33a33ca05e55d13";
-          sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j";
+          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
+          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -16368,22 +16388,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170411.1509";
+        version = "20170421.1829";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "f0f0c0d2069972f71cdfb5e520f42c688465be8c";
-          sha256 = "0w6xjvpkm6cfpvbxjkjd580znjyh44mkldj1p330rda0ykarshdv";
+          rev = "5ed0b871ce40364a555eda5c6cef23529e6b6ac9";
+          sha256 = "0qi13019b980dlz18107pwsckk3x152rrf3hbcliczbprzxgy8wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
           name = "ein";
         };
-        packageRequires = [ cl-generic request websocket ];
+        packageRequires = [ cl-generic dash request websocket ];
         meta = {
           homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -16488,8 +16508,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "cdd39a51aab1ed23ac7195297eb986fc482e8c42";
-          sha256 = "0av2lpj1rij8mcf0jxdfm6pm6pwrv1wzh095z8vsfcdda8svznxc";
+          rev = "4274e2f59010150abf103cf8896db4d62e6cf08d";
+          sha256 = "1r517q4cs356bd8akvk3dh3f98ik05nylk41s5w07kb3n3n3dkg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16940,12 +16960,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170416.556";
+        version = "20170420.1828";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
-          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
+          rev = "ea702790bb2af6cd10078dc3a1d22c95009231a2";
+          sha256 = "122fas0qyws80icd9k573k66mf0jwnasxmd7c093flx5l061pipz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16986,22 +17006,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "elfeed-org";
-        version = "20160814.314";
+        version = "20170423.128";
         src = fetchFromGitHub {
           owner = "remyhonig";
           repo = "elfeed-org";
-          rev = "ccb571188b7942ec3e1f93561ed4bb8b659a78a2";
-          sha256 = "15wcwp8gfv1zsykyc59ml07g43p1w305q3mgahis37rl9bpyaadn";
+          rev = "a54649f0fd83fd536213f58ee4268c67a799293a";
+          sha256 = "05vqvkyyqbj4a886c9x53z7yv8hapmgm9c1ccfibpw0clyf0dixp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org";
           sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8";
           name = "elfeed-org";
         };
-        packageRequires = [ dash elfeed org s ];
+        packageRequires = [ cl-lib dash elfeed org s ];
         meta = {
           homepage = "https://melpa.org/#/elfeed-org";
           license = lib.licenses.free;
@@ -17014,8 +17034,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
-          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
+          rev = "ea702790bb2af6cd10078dc3a1d22c95009231a2";
+          sha256 = "122fas0qyws80icd9k573k66mf0jwnasxmd7c093flx5l061pipz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17427,22 +17447,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "20161222.1009";
+        version = "20170423.412";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
-          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
+          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
+          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
           name = "elpa-clone";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-clone";
           license = lib.licenses.free;
@@ -18066,11 +18086,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170301.1406";
+        version = "20170417.1344";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "0cd9ea411391c9049f4fbcd5d9164ba11b73fe56";
-          sha256 = "1g9jrv23bzwlafrsywdzzc4g79v2a7lm37644cfnmdma8a8ywrh5";
+          rev = "946e954e78013f19fed870b16935aa0865c5cae7";
+          sha256 = "1q3plymvvnikzyx77ya60ixb1p0isk7pyxx6j5qhv79g8xnjivj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18473,22 +18493,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20160817.1711";
+        version = "20170417.2356";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "5493f9fde48557d6aaaf38dd63adfdd8538496ff";
-          sha256 = "1nm304bg3k38s1gi21x7n6g8228fnyp91yb9p1i39hfckxjynq39";
+          rev = "6d13ecc4cbcdd712ded273f5a0f043eb76dedec4";
+          sha256 = "0f0wrvxmz591s8296gq862bphjpn9c2kkkfcanqjczfkkaapkid9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/enh-ruby-mode";
           license = lib.licenses.free;
@@ -18560,12 +18580,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170401.257";
+        version = "20170424.30";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "bb09141e7e2a25947f891008cf6036525c8ed484";
-          sha256 = "15r76hmibpyvz87mwi9qzyn63l7k4ab5bhx5g5ziaak8q3vwwibl";
+          rev = "74dc2ca769200c731f7452ddcd900612a2960390";
+          sha256 = "1rmwq0jfhakqq5q150mqsphfl30ljnp7c1n8ysa8h6pawa0942sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19201,8 +19221,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a5b52a94e67ec18f9f5c276f8387d27ab6c32c3b";
-          sha256 = "157jfq86xlq7kcbkrsvg9ybb3z3i0dh9lgif4z5kglxwr43vgrc4";
+          rev = "8ca868848600702696828d729387343d73311a50";
+          sha256 = "0shzkcgm8kxg923dxy47iqlb0mz86pifmgdlva1qiinn2sfac323";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19364,12 +19384,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170410.354";
+        version = "20170424.1036";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "25a7361365d25ad6823b99913be72d1b724083b3";
-          sha256 = "0lqxk54443x0ccxr745k5dlq6zh4kqc1dmnhh6dqcnfyc4amqs0v";
+          rev = "9e600c514018377655646a95aace8b272f8f0009";
+          sha256 = "19ralpvy7v4ki92cb89lx2m7d1birkr1mhh21hm089dhmysjbpr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19406,12 +19426,12 @@
     esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esa";
-        version = "20160430.2340";
+        version = "20170423.525";
         src = fetchFromGitHub {
           owner = "nabinno";
           repo = "esa.el";
-          rev = "b944078e190f050f8312eb7ea91dab4d049ca080";
-          sha256 = "1rxfqj46zg3xgg7miflgsb187xa9fpwcvrbkqj41g8lvmycdnm0a";
+          rev = "5313d17d57c237d7c2903ded3be61bda5512c585";
+          sha256 = "1wgk51dvhpliyak83li4hm7wcjldm3b41awf6aq8chxask0qd22j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
@@ -20156,12 +20176,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170323.1140";
+        version = "20170419.37";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "273a714e2d073257f6604d03be53c5fd784117c4";
-          sha256 = "0vrvfgrl1pdmvphscsf9zyy9yvl25xm53h5k1wiw7v3kb66x7s88";
+          rev = "f0684c1f6644a8c4e0e5fce50a1a04796555eaf1";
+          sha256 = "0q5zg7d3ml9v1hylmngvb6k45f2lakrq7xcn9z1qkbk1b003j6rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20261,12 +20281,12 @@
     evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-colemak-basics";
-        version = "20170405.1037";
+        version = "20170425.509";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-colemak-basics";
-          rev = "207fddde50e36fc3ccd926c69ef7901e938db2ff";
-          sha256 = "06r0x6yvwa811sfb9izzld4a460wip7nn6dfxw91i6x8g825h2qd";
+          rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
+          sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
@@ -20597,12 +20617,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170417.550";
+        version = "20170420.1028";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "6885d51d8124ce2f6d2a0137659911b3c7d27c8b";
-          sha256 = "0qwz9k5zcf8h3iq2ak1pqbdk4zhpr7a911a00sg2xyk83z4zdj24";
+          rev = "8a78f89c9aa11832b4a063439f726e5123f436fa";
+          sha256 = "118jlz2risrhy5d6x6lq4b1ihbpb23n9ah982w7ccwxs5xmjsl0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -21434,26 +21454,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "exiftool";
-        version = "20170301.232";
-        src = fetchgit {
-          url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "240ae7b829733d5da1d2e255a3e7f5638f83c745";
-          sha256 = "00bkwaydh4j76gpxd77m3pyxrnqhws1rg70r1g7vmgm6h5ah9ndc";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
-          sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
-          name = "exiftool";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/exiftool";
-          license = lib.licenses.free;
-        };
-      }) {};
     expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-line";
@@ -21517,6 +21517,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "exsqlaim-mode";
+        version = "20170418.124";
+        src = fetchFromGitHub {
+          owner = "ahmadnazir";
+          repo = "exsqlaim-mode";
+          rev = "3cac2ba06862a6407ce487423898af04de4996c6";
+          sha256 = "149g76rms1h183f78kzns6cy3jyllxyyhvb1x61c2823k2372wvh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
+          sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
+          name = "exsqlaim-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "https://melpa.org/#/exsqlaim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extempore-mode";
@@ -21559,22 +21580,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }:
+    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170313.1538";
+        version = "20170424.250";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "b916c87ef43b6983d76334c2321ba57f4ec102ad";
-          sha256 = "1ng7bd2gbn9ns6hhva66ibq4kqsjijxbqw30cay8xvn4m6kklmvp";
+          rev = "e5e8e572531c859e944d3607478b681e0f4a4603";
+          sha256 = "0627ysigqv25hf58rjk85xm9hmcwf5qs8sl6nvvxha4laq9cw98g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
-        packageRequires = [ cl-lib dmenu exwm start-menu switch-window ];
+        packageRequires = [ cl-lib exwm swiper switch-window ];
         meta = {
           homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
@@ -21601,25 +21622,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }:
-    melpaBuild {
-        pname = "eyedropper";
-        version = "20170221.1640";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/eyedropper.el";
-          sha256 = "1nyplgpcpbczb1lfj2x5l92ckn6f7wz28sviqiinh45fzsji5h3r";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper";
-          sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
-          name = "eyedropper";
-        };
-        packageRequires = [ hexrgb ];
-        meta = {
-          homepage = "https://melpa.org/#/eyedropper";
-          license = lib.licenses.free;
-        };
-      }) {};
     eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "eyuml";
@@ -22275,22 +22277,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "finalize";
-        version = "20140127.1046";
+        version = "20170418.1245";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "9ac589cf487f5d37163dc9e7ca8c52800710805e";
-          sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
+          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
+          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
-        packageRequires = [ cl-lib eieio emacs ];
+        packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
           homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
@@ -22608,12 +22610,12 @@
     fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fish-mode";
-        version = "20160924.1207";
+        version = "20170425.106";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "d8b3493623ad834cb18f7de957dfbd17e2fba3ba";
-          sha256 = "16x8fv8yl9wxmrxh4p7npixrh36vdwdc2n6paly0swlmj9a2j399";
+          rev = "f6c52f5863605cc227dbfada4aa46fef55f5106a";
+          sha256 = "00aa98y53864n22qca6jhkzw9xsld0nmrfz3g78fjwxkm7gl9gci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -22819,6 +22821,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatui-dark-theme";
+        version = "20170423.958";
+        src = fetchFromGitHub {
+          owner = "theasp";
+          repo = "flatui-dark-theme";
+          rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
+          sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
+          sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
+          name = "flatui-dark-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flatui-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flatui-theme";
@@ -22905,12 +22928,12 @@
     flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flimenu";
-        version = "20160821.1330";
+        version = "20170417.1847";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "flimenu";
-          rev = "ecbd47c857781b9c38035048d69415b617a75422";
-          sha256 = "0a37kjpcpkm172icd2dbb5ndi6s164rbrpvy0c7kr0gl30n1gb8c";
+          rev = "9351201d89b05cbdaec312a6ebd7fd10c38d6112";
+          sha256 = "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu";
@@ -22962,24 +22985,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "flow-mode";
-        version = "20170320.1043";
+        pname = "flow-minor-mode";
+        version = "20170418.1253";
         src = fetchFromGitHub {
           owner = "an-sh";
-          repo = "flow-mode";
-          rev = "072efa15255146cf39450dd71fd8f35e9f6fe621";
-          sha256 = "0cga2vzi82b93l8j54jx5krfcxksx64h1m6y18p9gjgqd424g014";
+          repo = "flow-minor-mode";
+          rev = "b05d59f387133249e03004b79bf16d6fe6c38217";
+          sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
-          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
-          name = "flow-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
+          sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
+          name = "flow-minor-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "https://melpa.org/#/flow-mode";
+          homepage = "https://melpa.org/#/flow-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23074,8 +23097,8 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "2d40aadedde2b4a5d0bc9094f19020128d242801";
-          sha256 = "0pwlhzfl7av9vkkbdaiky1m2djjxsl93kprigklmjz1vkg7wsza0";
+          rev = "52897d5808e17c416cfe394c638c3c7dfb9ad7c4";
+          sha256 = "1vpvs160ykqn607qy8vzf0zxgx0v7kljp3ld9f5mf0fzvm3kxyqv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23889,12 +23912,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "20161229.205";
+        version = "20170417.1807";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
-          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
+          rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
+          sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24124,8 +24147,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24313,8 +24336,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25684,6 +25707,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "frame-mode";
+        version = "20170419.1427";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "frame-mode";
+          rev = "fcdbafbda45758cd60ab3acb492fbbd692987a58";
+          sha256 = "1sdxbjxx1lk2j220794af2qz9z068bmx55drm8h0b8kih0037ydn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode";
+          sha256 = "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8";
+          name = "frame-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/frame-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-tag";
@@ -25881,12 +25925,12 @@
     fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170415.1236";
+        version = "20170424.818";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "f40c9358b1749bf413a8b30c94d14284890d16c5";
-          sha256 = "130k0aii2b5k5r54axcy9n3jsn9y8avdwdnbnl0saw7hc9ykwcpa";
+          rev = "727d7066c7b125b659a920ee08a601c15a31b00c";
+          sha256 = "0h8h7dwffmgis1ppwj7k68bsr0y5r1x00h37k52zizam9pc2gia7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
@@ -25899,6 +25943,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuel";
+        version = "20170107.626";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "717a49c365298549a5ba0588980c7fcf528c2f40";
+          sha256 = "1zib3yd3mp7a8g2mg9rl6xqm8bhyr39jfyl8388qqr1k1p2mbw8b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
     fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "fuff";
@@ -26011,8 +26075,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "dbebfec3bf64a3d74adf978d2f6a059739ac2472";
-          sha256 = "1l722z28hbqma1qgsydfjkxb0p24c80splpxx752x74qi2cid71z";
+          rev = "e1bdbff5957c0ea43bd21a7b072c8614f885c549";
+          sha256 = "1cijh09jfzfcm8nbv8pqlnaz27lh834r5qyvyhj9aj9w6991r7nr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26734,12 +26798,12 @@
     git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-annex";
-        version = "20170120.931";
+        version = "20170417.1653";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "git-annex-el";
-          rev = "d574b9d9e264167245e49bb96b000988a83af259";
-          sha256 = "0c1hqff1g1ahaqalfdp09g7qk852bj83dcwd94q3wwmnsy1mf493";
+          rev = "22b7161adcd144f88681b9b904972cea42b27fca";
+          sha256 = "038h1dnvncdjy7q1ix3xrx4yqfqfp4ll69ksipj5kawsrch75nh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex";
@@ -26822,8 +26886,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26836,22 +26900,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
+    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "20170109.734";
+        version = "20170424.326";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7";
-          sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb";
+          rev = "f73f5b4b7ce2b1696212b2cbfec4f68554e06364";
+          sha256 = "0vp5rbm0vdhdbkw4xb244q71jiaax81a5py52z0jc0kwsi4khwn9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
           sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
           name = "git-commit-insert-issue";
         };
-        packageRequires = [ github-issues gitlab helm projectile s ];
+        packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
         meta = {
           homepage = "https://melpa.org/#/git-commit-insert-issue";
           license = lib.licenses.free;
@@ -27469,12 +27533,12 @@
     gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gmail2bbdb";
-        version = "20161104.2041";
+        version = "20170423.444";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "gmail2bbdb";
-          rev = "181ef6039227bb30a02041d8cfdc435551a7d948";
-          sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn";
+          rev = "a84fa385cfaec7fc5f1518c368e52722da139f99";
+          sha256 = "1qbf3r8a66xlrbni3hv5q5b5v3izis5aid06228rfpc2hwa97hr7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb";
@@ -27785,8 +27849,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
-          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
+          rev = "6c2585cf0fc321a20a36b4c596fb6b80f811670a";
+          sha256 = "0wqm7jvzlwh4bz5kk4ghz63z0yjvals0x513bnzrcjd43z2p048i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28394,8 +28458,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "emacs-google-this";
-          rev = "6af9dcee88b9637b3bdd1900a907f7ac83113988";
-          sha256 = "1l3aklpzzn407ww2k4ncjin3n869hg4lyf050p00nig3qfgvjnbz";
+          rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b";
+          sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -28580,8 +28644,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
-          sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
+          rev = "8e61e010f3b6dd5e1302b76f23d1fa9aa56a82a6";
+          sha256 = "1pgxq0s4cap8b3chh86jx3myrraiidbn35l6lagxml313xf7qq1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28823,8 +28887,8 @@
         src = fetchFromGitHub {
           owner = "davazp";
           repo = "graphql-mode";
-          rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac";
-          sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83";
+          rev = "3ddf204de7c4d50fb11e8d8af4b15fb9987065ae";
+          sha256 = "10l9n26rsfs5za5fi3vgnl73zab1yvj067pgxg1321fbldiaqwwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
@@ -29233,12 +29297,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170415.544";
+        version = "20170417.1359";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "8c8a1616b6a7bc4c10942ee0a1b2591b98fcd493";
-          sha256 = "00hbawijr9c6hpmp7y4yh8xla7nmsi9nq071zkxwyl8yzj34s678";
+          rev = "2bc0e1f9c8947b9b5ac8d792bd7f6d2c36d294ab";
+          sha256 = "0nl9963m20cpfn3n50khbbmc1aas56q38xjjwiq01s8pmjvmcs6v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29296,12 +29360,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170413.1236";
+        version = "20170420.351";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "51405f409508cd95f6e84d2e0fc08c4c380b1791";
-          sha256 = "0ffh6ksd21g896fn4av8nh82cd3qfrczbjkp5ndhhbr16nqgkr56";
+          rev = "9343c749ebf4ffbd3961042ba0e5d0b00f688df0";
+          sha256 = "12r2rlyh8xmx0yn17yb4qpb0c50rr553p39nfj17m0ishrgb8vbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30068,12 +30132,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170416.945";
+        version = "20170425.328";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "5edb88b03f1779fe93d59401570da2555d46733b";
+          sha256 = "16y7ga4x1h1hvfq6yqn1hw9dakzlkslbq2hg9sgan5fr1fxlyqzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30656,12 +30720,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170416.945";
+        version = "20170425.234";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "5edb88b03f1779fe93d59401570da2555d46733b";
+          sha256 = "16y7ga4x1h1hvfq6yqn1hw9dakzlkslbq2hg9sgan5fr1fxlyqzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31223,12 +31287,12 @@
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20161111.2337";
+        version = "20170423.759";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17";
-          sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca";
+          rev = "605e214632644224b5b7adf2a68f265489c2a080";
+          sha256 = "03hix4vqp1krh8v3x6iqs3xqpcjzibwlafxrmn2gz3n4f9xb9j37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -31751,8 +31815,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "77f6f47277cfca5df9019165037277cafd0aac76";
-          sha256 = "1cbiqvgynnbj7cc30da2yyakik52bh9aqpr4b55pzly6mcq32qfl";
+          rev = "2ece0aaaab86c38cf8f81f165dc81f84209c28d9";
+          sha256 = "0j3km2qln3sak4mmlaajyr88w6gikh0baalhz0qb5mvnys2d6l74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31936,12 +32000,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170409.1055";
+        version = "20170420.1958";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "540d095b769980dbe5e12968a1fd7688d6bc6526";
-          sha256 = "1aqp82njc06zap4iv6jbf7iznw6knwfqi5a7m3cd4ngdcg4gl7s8";
+          rev = "918bc67e0d44e4413294aac983d1930f39a7c20f";
+          sha256 = "0l6nkwqsf0kwd5wzdp3vjf3bz1sq7d683i2678wsbhgjj3a1r5zm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32272,12 +32336,12 @@
     helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-rage";
-        version = "20170331.607";
+        version = "20170422.510";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-rage";
-          rev = "67c62eafe8af70b330895576dcb004e45c93a98a";
-          sha256 = "0rrrkz092h7cikcafwf6blkyqsb6qwq1mkw8k4mbb8vy9bp9mx0b";
+          rev = "dc51371265acea60ac0691016f6ce84597bcace1";
+          sha256 = "1asz4rq5c4w82w167li0vvmqv3zjl4rz67c2dj8i717ihcm45sip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32444,8 +32508,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -32734,12 +32798,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170412.437";
+        version = "20170419.135";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "e0fc2b0f9c3763e9c1e35cc515a29ebbbcd322e0";
-          sha256 = "06mxff0dx5l2q1ayy574gyhlslngv7ha7jc6yazw8wkhqnldp79h";
+          rev = "f88715d495b7f6d65904bd05dee549404ca250d3";
+          sha256 = "0sdhbk4vpq5vl9rz5dcfnjmkcvsfw9146f1bvjgfi0fqhb3pq8da";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -32878,6 +32942,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-xref";
+        version = "20170424.428";
+        src = fetchFromGitHub {
+          owner = "brotzeitmacher";
+          repo = "helm-xref";
+          rev = "29d1f46d3f2c7346f13e2abcdc3e8c8605265818";
+          sha256 = "0rqgbm5f402agyi2jqni9dv6gdxkm1w92a39qlhz7gya1235a9si";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
+          sha256 = "157h2h2yw8calysa7jnyz7iy8s3ppqa6m35pl7wbgnzqx425cbny";
+          name = "helm-xref";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-xref";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
     melpaBuild {
         pname = "helm-youtube";
@@ -33259,12 +33344,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "20170417.231";
+        version = "20170418.44";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "b2ce428d199967ddfb6face22ec7ec0593bd06fe";
-          sha256 = "11zzm10xivqs16msdw2p2w12zjzwy2qk8mpan08y8zm982dx2mnc";
+          rev = "1a98edfbb5c90d1cc14e222c618f302ed7a2359e";
+          sha256 = "1n378rr2vv79i9d3b01qssyjwkmspn715bzgy4dd0n61jkwynzn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33437,12 +33522,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20170106.1025";
+        version = "20170420.1557";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e";
-          sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb";
+          rev = "8298186c3b4da68d000b06c317f0572c09ba391c";
+          sha256 = "0czv1mg30rn069zddzjfy1i6kjkrrps96sp45bjbjkc66c6mvpw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -33857,8 +33942,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-historyf";
-          rev = "66590519a02816cde8f442032fb144f3c38ebc6e";
-          sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
+          rev = "196c058ceb092fdd56b0e4ce85b7e714d6f72224";
+          sha256 = "0fgm1m9mq1zn5gnrynf332hamif05qhh8haqci7gii7crzy47c0g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf";
@@ -34430,12 +34515,12 @@
     html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "html2org";
-        version = "20170416.624";
+        version = "20170417.2201";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "html2org.el";
-          rev = "89d35daea5e00bb597798800354ddd9fddcc2887";
-          sha256 = "1il0h1plwn6472r8xa312dg0zvxxwdmj7yh6zh94l9p3y4iiwy4d";
+          rev = "6904aed40259ad8afccff079ebd8a07bff319ebc";
+          sha256 = "0dryk622fz0yj939pbs0fbb9i4m8qjnmkcxjsssws8f90plk06af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org";
@@ -36072,12 +36157,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170414.156";
+        version = "20170424.1433";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "0da2825dc21d3ba14b5dea6965f79330eb7ba13e";
-          sha256 = "1hf9ls1wh5iykai454rc96gkcl4959h71akf7i5gm9kk4hsjcf5q";
+          rev = "72e8e4496758b8a590f41caaa4bf79df04496a5f";
+          sha256 = "12q9lbyi5yabls94q7rm3k3va9vx70vdf3hadzrbny97kfqh75rf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36318,6 +36403,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ini-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ini-mode";
+        version = "20170424.209";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "ini-mode";
+          rev = "2194cfa2fd13196a37350ec20b3f00dcf6162b7c";
+          sha256 = "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/000cca577d000bafe7bf5711d0bfe7593fb6975a/recipes/ini-mode";
+          sha256 = "0f6fbmg4wmlzghcibfbcx3z124b2017rhsasi5smgx9i2vkydzrm";
+          name = "ini-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ini-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "init-loader";
@@ -37176,8 +37282,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37214,12 +37320,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170411.451";
+        version = "20170424.2319";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
-          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
+          rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
+          sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37281,8 +37387,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37365,8 +37471,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38406,12 +38512,12 @@
     js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-highlight-vars";
-        version = "20161209.128";
+        version = "20170418.1129";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "js2-highlight-vars.el";
-          rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56";
-          sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm";
+          rev = "e3bb177e50f76b272e8073a94d4f46be6512a163";
+          sha256 = "0yy8sqkn6c7r377qr2id4z550vw1x70xjd4i7yg0g1rj7q1kg98l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
@@ -38427,12 +38533,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170330.639";
+        version = "20170417.1325";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "908395e3aa413b4293b35aab9d41a56f1dbe1e04";
-          sha256 = "1klwg6clx5nvj6755rakzdg62brfms1s8g9cccdkipbb8m6paffh";
+          rev = "32f9782bd95bf5d79e26b006f44a793e37771c45";
+          sha256 = "1d6w0fl01r3vl7hw4wn1npzwmk5v16gc6gndvfbz469xmz3h7c4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38532,12 +38638,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20170402.1808";
+        version = "20170418.1900";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "c528c7784f6449a35a8c90db58cb73125c69987e";
-          sha256 = "0g9zc9sbs3m92qn2jx4nyd0b8s10c1nl92z5rwq9nci5wsmpqxzg";
+          rev = "c3a7ab350533dddf6d18b4c55423bc0d1b40f3fb";
+          sha256 = "1zfzpylckna92zdx1l9ssj3xvrx5fizhypcmmpl2fsm56p97l8c5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -38949,11 +39055,11 @@
       }) {};
     kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "kanban";
-        version = "20170203.1701";
+        version = "20170418.110";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/kanban.el";
-          rev = "4481f57aee47";
-          sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1";
+          rev = "dd11d722b20a";
+          sha256 = "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban";
@@ -38990,12 +39096,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170416.1713";
+        version = "20170425.321";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "1e3a03e0b3c408913c8487cac291d163c53217e8";
-          sha256 = "0zr187f1pc4lj9kglzsh0h71k6vf8j1pkk3p02pacxs4ixs473vy";
+          rev = "a51f9118ee6b5d9dfafa0f5588917e7e2df51431";
+          sha256 = "19cfsksjhyh20d9yh2qbddaccq3pwf8gg75dm0dblvv5vlakcrhv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39498,8 +39604,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "fd01c099e9bb5a65bcd58e3a67b090bd39b1e764";
-          sha256 = "060lw75dk8ibgswq2f0yysvkkgpw5q0jmdwqpicdj6n1nc4zn99r";
+          rev = "75cf7bf7b3668b38c606089f07238b2b0da4ebc2";
+          sha256 = "04fh2wjdm09z7njh30lfgh1kvhv1v4rpm2wk3073c6fkyvflc8sg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39767,12 +39873,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "20170416.2333";
+        version = "20170422.2016";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
-          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -39788,12 +39894,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "20170416.1959";
+        version = "20170422.2016";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
-          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -39995,12 +40101,12 @@
     lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170415.1008";
+        version = "20170418.1102";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "5407aefb0135b400cd73203b92ac23b8b74050f8";
-          sha256 = "1amqs8v27037qljjrz5r5fn6fscknm3r0hwap1ia5fivg9j8fnzv";
+          rev = "ff05ae82b1073759989616caf362c85575fdfc58";
+          sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40264,22 +40370,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170413.2120";
+        version = "20170423.1748";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "61670fb0ee5ced369fb2265e096ca0b476789c8c";
-          sha256 = "0jvm0j1m5p5hkag61swgmn5zjs6wbgx5ayxs1wf0b9v6cvmjm7vp";
+          rev = "348ba97b960d045bccbd9cb5a63697704c401315";
+          sha256 = "0qcjdvzis6ws8z0laixakik26djjmcv021dbz00pjrwkcwfs5nwi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
-          sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
+          sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
           name = "ledger-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ledger-mode";
           license = lib.licenses.free;
@@ -40288,12 +40394,12 @@
     leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leerzeichen";
-        version = "20151105.2228";
+        version = "20170422.613";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "leerzeichen.el";
-          rev = "e67e59a0e15bc4a41006fdd9822c4b3e6d7da626";
-          sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
+          rev = "5acf9855ecb2b2cd5da4402bb48df149e7525cc5";
+          sha256 = "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5de7033e75bc28de6e50b2146511cdaac4542ad6/recipes/leerzeichen";
@@ -40836,12 +40942,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170415.842";
+        version = "20170424.1045";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "10a7297d6772367a9cf9cd39ee44e2ff4a04e6c3";
-          sha256 = "1bc6x4bxqlb3dpaia4cm7gvys1nlnq22nn1vqpmfy4scmlrngxc7";
+          rev = "fe138743a47bc0079c31509eda32c86e2943c91c";
+          sha256 = "1mywr9nsx1x0lsb7v0g8ak9ympiddnybm6ajg0pdlr8psh0nzzw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41174,8 +41280,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "58ccb38fdbfbc2e227c8515fea40325fba164f92";
-          sha256 = "14fkwdizn085avhjmd89z6ld8l3aanzj6sx06z3fxy407arfd01v";
+          rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
+          sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41257,8 +41363,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "82b3362feae87748cb6e5bbd997d9ce182d65329";
-          sha256 = "0g6rdfcm7wz7dq13vlrz12ldvc6xspgqlxwwwcfayb7nh9czdqbh";
+          rev = "1ef6a945eb9723326c1e7748ed1680dca46edf92";
+          sha256 = "10kxnhvfhwpdrsjgba2vlg9vaqk7r9kjq8zv7aa05x7zn06i985h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41627,19 +41733,82 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-go";
+        version = "20170419.605";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-go";
+          rev = "3ef571cc8c534e305a3ad6831a0b244a30ca57fe";
+          sha256 = "0aiyspr1wg3lwx0sy8c52h86zjs9ifycy02c2w8q2287kv61lqxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
+          sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c";
+          name = "lsp-go";
+        };
+        packageRequires = [ go-mode lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-go";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-haskell";
+        version = "20170421.328";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-haskell";
+          rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4";
+          sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
+          sha256 = "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8";
+          name = "lsp-haskell";
+        };
+        packageRequires = [ haskell-mode lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-haskell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-java";
+        version = "20170421.325";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-java";
+          rev = "a5aeccc2c8b37af13d48616aa3e96d4b1a7d20d3";
+          sha256 = "1vzvx38n57jfzarwl3hw188smn8dwjzz1x4rpsp3x6yza685s7cf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
+          sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj";
+          name = "lsp-java";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-java";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170415.848";
+        version = "20170422.954";
         src = fetchFromGitHub {
-          owner = "vibhavp";
-          repo = "emacs-lsp";
-          rev = "84c2ca12cd5934322393d764584907d664776bd9";
-          sha256 = "09xvm70np4yz0bmb3hahfrfnajh4lflx2gf27ffn8lviwwxkfkbb";
+          owner = "emacs-lsp";
+          repo = "lsp-mode";
+          rev = "fcec82c2f05d603031599d0d170c093bbd2c3a83";
+          sha256 = "0jhlijviazn0hdcrgmh1lnbywcfrb6lsf9gbv0lh56kjwf8896p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
-          sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
+          sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
           name = "lsp-mode";
         };
         packageRequires = [ emacs flycheck ];
@@ -41648,6 +41817,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-python";
+        version = "20170421.322";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-python";
+          rev = "972f1b77ac059e8a8d39f1f0b48fe2b9f146f439";
+          sha256 = "02i97m1d35pz2w50006pdpc3anpgnysxbxhkx6hl1s2m8kwrrlwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
+          sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx";
+          name = "lsp-python";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-python";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "lsp-rust";
+        version = "20170421.326";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-rust";
+          rev = "ec2a89f901726fee61a5587b09c237615ee8b25a";
+          sha256 = "16ihil3gsvlwbg9hjjl9sp6y7d7zm4k9zhrb61z5biwfxh49a6in";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
+          sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
+          name = "lsp-rust";
+        };
+        packageRequires = [ lsp-mode rust-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-rust";
+          license = lib.licenses.free;
+        };
+      }) {};
     lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lua-mode";
@@ -41942,12 +42153,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170416.1549";
+        version = "20170424.1053";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42075,12 +42286,12 @@
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "20160809.1335";
+        version = "20170425.128";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "a2b7b85134784317445faee13d647fb62401ea23";
-          sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p";
+          rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
+          sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -42138,12 +42349,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170308.146";
+        version = "20170420.544";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42453,12 +42664,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20170410.242";
+        version = "20170421.906";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "8ab9e0bcefb122ef5b931284c6cc329d8f8aaa82";
-          sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8";
+          rev = "5207995089020ff0e8ea2f1fe4628c61de7eb7d5";
+          sha256 = "1ikhy7yyl65j7aw1yyhfi8bz2p4p8s8f2cmzsa6ld0gmvjw6cl5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -42877,22 +43088,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markup";
-        version = "20130207.1309";
+        version = "20170420.429";
         src = fetchFromGitHub {
           owner = "leoc";
           repo = "markup.el";
-          rev = "5ff4874ce897db146f5fd2b3d32147a0d404e1e5";
-          sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
+          rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
+          sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/markup";
           license = lib.licenses.free;
@@ -42982,6 +43193,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mastodon";
+        version = "20170424.2154";
+        src = fetchFromGitHub {
+          owner = "jdenen";
+          repo = "mastodon.el";
+          rev = "b18b37b6807875ff1b84afa85d82be819342e7d6";
+          sha256 = "1398svw9jfvcsigchdaf8amc9c8r8fy900hsxl297hsfbm5sb79g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
+          sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
+          name = "mastodon";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mastodon";
+          license = lib.licenses.free;
+        };
+      }) {};
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
@@ -43275,12 +43507,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20170411.1921";
+        version = "20170418.1035";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "d4a00fa6873d09920d94b7c35eabe08c715b906d";
-          sha256 = "1l0pfgjv6f5rlqgn8bnc81pzzf743z7ij5qharhxh860248gy41k";
+          rev = "e1adf088e621c3446d04cb2222756edcb03eb363";
+          sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -43503,12 +43735,12 @@
     meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "meson-mode";
-        version = "20170416.247";
+        version = "20170417.2345";
         src = fetchFromGitHub {
           owner = "wentasah";
           repo = "meson-mode";
-          rev = "61d8177c3e3c195b32f7420d769a0860a873b7d9";
-          sha256 = "0qqwp5mn11fm8f13nfn72c7bmrxa49jqmacga8ipcla3gx59vhs2";
+          rev = "157f684e9ecdf03f36be2117e05c631b5eefa7e1";
+          sha256 = "0wbnlnhq432q378pwcs17643463jjizx0xac6giskw69lxypmgd9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
@@ -45178,12 +45410,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170416.1618";
+        version = "20170419.1926";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244";
-          sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20";
+          rev = "029f814d3261b02f650ff361f52d9d80611bbfbc";
+          sha256 = "05k0ssxmjp7lpj803lrcbyqxmxf1vnxa2j3wvpvlqrixjc63mjr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -45322,12 +45554,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "20161103.1715";
+        version = "20170417.1856";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35";
-          sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4";
+          rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656";
+          sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -45842,10 +46074,10 @@
       }) {};
     naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "naked";
-        version = "20170307.920";
+        version = "20170418.1822";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/naked.el";
-          sha256 = "1l6r7vdhzlbv70in16qiyac81930srakr4d14dqda5j3h4w09hbg";
+          sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
@@ -46721,8 +46953,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "f8a2e8a55203f2cc16d70ad43afcc186adaab6b3";
-          sha256 = "19m36vw8j9b4ll6llhaisa4w6w9iilj8af8vvw4bglcmd3jbn8mg";
+          rev = "9b63bb88c8873d192b8b01608e5d230817dd3375";
+          sha256 = "1w75zcq721awyyfn0v2bycmg4cgrgzmmj9hxzpwsywab2l25kjba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47029,11 +47261,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170313.1712";
+        version = "20170420.258";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "e08f5f76e406de2c6bdcf85952aaeb66ec0d37de";
-          sha256 = "0g9wryjv56xvgvflii0wilvj17hrf4ddk7vjl2bj9lg4glhyyvl0";
+          rev = "77c9ec1fddcbe145facfc3d65eee55b11ad61fb9";
+          sha256 = "08y191khn0zbjysai73rgcrgvq4y25mc870h3xrpa0lsd51fmvdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47319,12 +47551,12 @@
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "20160429.1323";
+        version = "20170423.40";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34";
-          sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj";
+          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
+          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -47847,8 +48079,8 @@
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5";
-          sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx";
+          rev = "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2";
+          sha256 = "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -48389,12 +48621,12 @@
     omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "omni-log";
-        version = "20150604.1038";
+        version = "20170420.407";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "21b81c2358e2a17a636c6494eb084241d06962b7";
-          sha256 = "1241jfckijwimm6b9xfp2rjap5va5hkphcvj3qflkprq2y33y8s3";
+          rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68";
+          sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -48410,12 +48642,12 @@
     omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
     melpaBuild {
         pname = "omni-quotes";
-        version = "20170416.1416";
+        version = "20170423.1216";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "be1e719c046ca468275ed844989320f48358f2cd";
-          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
+          rev = "3ea0853eb36fec07c8ff2da0d29fd969febaadcd";
+          sha256 = "0zbj07gi23f2g1gzf2d9d86jngxjrq91lm3dbd3rwlwpnhd8285p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -49423,12 +49655,12 @@
     org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170408.2046";
+        version = "20170420.1738";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "a3faf83fe13910596c370a0d4b9a69f9b65f6f99";
-          sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk";
+          rev = "945f4cffb501d3aa2b1c6dcaef7c18a83c090a89";
+          sha256 = "1bwa4sb6yybvl2jdbxmx84s2bivqkil1dxy1y5wypv4cnib5skn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@@ -49527,12 +49759,12 @@
     org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
     melpaBuild {
         pname = "org-gcal";
-        version = "20161115.357";
+        version = "20170420.1401";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-gcal.el";
-          rev = "d32031f7c488be0d9845c47cc1452d6d6489e561";
-          sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl";
+          rev = "bdc704842da000a1cffb8f155ef3887c5e1d0446";
+          sha256 = "0nbwxmc2arssy1ll416i6chb0rx239jh2fm1lcylhdg3af25rsbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
@@ -49657,8 +49889,8 @@
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
-          sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
+          rev = "2ec35547088c090ae1ad71bbc943953f619611e6";
+          sha256 = "1zfam31pjm8sg3j038vvd1jf3qi9jq3452vriqmzczbjfg3b7l7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -49740,8 +49972,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
-          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
+          rev = "9874458468d527a4ac0b520a8771e0b6eaed4a9b";
+          sha256 = "1rh294zhsnpicvw8jv32x52b2sxiw2bnrjn88wlvnhp51wzgwgpr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49760,8 +49992,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
-          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
+          rev = "9874458468d527a4ac0b520a8771e0b6eaed4a9b";
+          sha256 = "1rh294zhsnpicvw8jv32x52b2sxiw2bnrjn88wlvnhp51wzgwgpr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49924,12 +50156,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170416.2327";
+        version = "20170419.2242";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "58f51112d557d328d818c8b9cada5e3dab539de3";
-          sha256 = "12kk2yn5sm4jq19kiln3giq1nnljcjyd617p0ff3r9qn5dh1qnxs";
+          rev = "8aac90e1c1bf06c91430306d652fd5c40961f99f";
+          sha256 = "1vhdd2n7ynmy8gc51mga9nf0wpsk4hfnqgbihsy3i3i73k6wil0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -50168,12 +50400,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170417.17";
+        version = "20170423.1817";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "d53f97bd8c640a06eb606b35c1c269bd3089cb54";
-          sha256 = "0697nwfvkhik8i87apq2xyb4qkk10xa4s03gz6ijybxn98576hli";
+          rev = "0558fa8b6e114321f76ab6315e0a319c01213b78";
+          sha256 = "197nm66g6iljfpsy218kvqi0kan5dyacdsar5xglsz19cy2n2wkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -50210,12 +50442,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170413.1111";
+        version = "20170423.1812";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "81204eaa39d556b6628b35627e0ccbe2799a8e68";
-          sha256 = "0ppr3d7l15xwxjdhpdkczjpwhsvxm3y2jfz2ddxqpydqywhgypn4";
+          rev = "5f56a28e2ec242f5291b5f16f62af29619ecfdcd";
+          sha256 = "17gia39gi54ggbbz69w0dfk9cannjyp2jz9wn3ki0mbjgjflg3c6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50322,22 +50554,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sticky-header";
-        version = "20170413.1844";
+        version = "20170422.2135";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-sticky-header";
-          rev = "f2dbfc443e7504e0468b417ef89a68b152ec1f2d";
-          sha256 = "134ss1rrf1q73afvhj4k5ymlwhyagfab18y11v51j5xyx77ydaw6";
+          rev = "aae8dbc7f3b33c4dd35dc38d83791d7c23757060";
+          sha256 = "1vdaqi0054hgf70i1g4lxxr3ry6k855ndjysq9c8ip4x2dfzyrv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header";
           sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj";
           name = "org-sticky-header";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-sticky-header";
           license = lib.licenses.free;
@@ -50808,12 +51040,12 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "20170118.1647";
+        version = "20170403.1323";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "cbce5871fe267fef725631b0b7365952c35ae401";
-          sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7";
+          rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
+          sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -51379,8 +51611,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "f686459c02b27e6f22128c2ff4e26818fb7f4ee7";
-          sha256 = "0i8fd8jjimzp3p9l10ixdxv7ghlc3x191914wlq1znqzra09xb0p";
+          rev = "45c3d06ca2c0a651934e60a67f9e7f0dad55e98d";
+          sha256 = "1j4xl7qy51my0c4dswpmj5yyh97i4745g1a508pwq13wzngb3s3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51690,12 +51922,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20170219.2052";
+        version = "20170418.758";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "c5f300cf020e6bdd654e304e0388a0c63d4b8ea1";
-          sha256 = "1cdlqk0sbj8pa24dqxwg5kgjrghq4f7dma8d0mk33cfaxaq7jvxv";
+          rev = "70f15591715796b1d96af660481739f019c295cb";
+          sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -52136,8 +52368,8 @@
           sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette";
-          sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette";
+          sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3";
           name = "palette";
         };
         packageRequires = [ hexrgb ];
@@ -53362,12 +53594,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170401.218";
+        version = "20170419.1022";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "651fe02ff10eece65c01ac8d286174cc8ffa87fa";
-          sha256 = "1nij6mrz2fm411z97z13dyy38i482dkpj50fjsgnlc9pmggykqnx";
+          rev = "3e45de29ea6ef0431df65db18f4a73615c409dfb";
+          sha256 = "1acjxyyxl06b45clg7z1mqm6qpa0rmvnbh5rqx0wizrjp96xls99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -53845,12 +54077,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170412.514";
+        version = "20170419.1240";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "56a7e7c67b70c4aba5919317a8898157ba0b08e4";
-          sha256 = "1jdpb4f6msw4g9amp1wmbgngldy033x7lhf8y8r34n6q2c7sb68r";
+          rev = "8fd56d646985201f7a6bebb49aaaeed760cad302";
+          sha256 = "1rlj7zm19vgk9k7q1b44ckw3sabyw5jk9bqhp06fq8bpvi46hy3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -54160,12 +54392,12 @@
     pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pinyinlib";
-        version = "20160505.1248";
+        version = "20170424.1352";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "pinyinlib.el";
-          rev = "457b5ac6611d0f35ff2444e62008c798b45ae368";
-          sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r";
+          rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
+          sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -54458,8 +54690,8 @@
         src = fetchFromGitHub {
           owner = "thomasluquet";
           repo = "playerctl.el";
-          rev = "fa79b3c1223738ed89ded01fb1f4fb5fdd3aa92d";
-          sha256 = "1c5bdkr7wr803pz889dmhhlcar0jmmwg1yy2b04zwc58cqw9g1i9";
+          rev = "8354352813cd206efb60002f2af4427957bf8894";
+          sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
@@ -54616,11 +54848,11 @@
       }) {};
     po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "po-mode";
-        version = "20160827.857";
+        version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913";
-          sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d";
+          rev = "cde62682dfd40070308af1c2b484a204977e1fa6";
+          sha256 = "0rpah9ljgs15szf6ndg6nj76xx5bzh4cski4bsqa55kbv2k9kd3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -55780,8 +56012,8 @@
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "da581cdfe4f4f63137f3320ed3dbda9cf6c20e14";
-          sha256 = "1bgkx3vwn3vy796a1aq2hd7817qaznf4laqni417gzi43jqf8414";
+          rev = "56e262dd3b5998d0dc6a590d06bc11058839c588";
+          sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -56179,8 +56411,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "8aa927f08f6b92808976b0c22fa4a45850279987";
-          sha256 = "12n6i25mvb4a4yqpiyrfd9firfz2frv0zh0akpjd03qv93fmw30j";
+          rev = "4920e27a488976c9993cef686d868a846868eb56";
+          sha256 = "1abrznpxaflnvds1vfnz92jxs88sw4z3i6skwrsq0f3cii5ymiwq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56217,12 +56449,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170324.243";
+        version = "20170420.2343";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "28a3a95890243993b20c2c2bf66d6c00a2f0fd21";
-          sha256 = "0kajvmfyaxma9mh7mbrc3hiilzkdjwmgvv6zdfv39r9llwkrv80k";
+          rev = "3a5416c150a69a1420b4e94c7d130e13b42ff58a";
+          sha256 = "1yv4wdjhmh811852y4vzcbkbb0cf1j60ixp89zn2psz4ij8lvmp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -56437,12 +56669,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170415.2259";
+        version = "20170421.2255";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "1f74263f42c56c0b88e8fded540231a2d4fd9e36";
-          sha256 = "1mc6msf6hzy0fdm1gwq4f9gadspk68d1mdwbhl1j1ngx2gqbrhik";
+          rev = "e704bc790a96f5f3703b2c56e5a1b15bc4446937";
+          sha256 = "07dcrpkyf3b2kpdgfxir3mvm1c5rs2zdbgv9ajkn9y0b9zvp0cm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57506,12 +57738,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170407.858";
+        version = "20170424.1130";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "3332895078ebc5e2f547538913eccb1db63ec0ca";
-          sha256 = "09a251m0j8ican0myp96755ykg6z2bp0kgggwbdbg4af6bwz3a13";
+          rev = "471c46fa9eb9de2e0b0056814caae824986f0915";
+          sha256 = "11s25kxh0909pq00xmpyv2lhafxhz4p40hivz884rkpi0gfvggg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -58293,8 +58525,8 @@
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "ddbc2e0ceaa4849ddd284a9265211b61a8777106";
-          sha256 = "0d4yk6gkswfx7hkwgq5s9qc2bi73041fcsigpzvl2q0smb8202cr";
+          rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077";
+          sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -59553,12 +59785,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20161115.456";
+        version = "20170422.832";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "5347e3609c5ea8b767f9ec0c08969467d288c516";
-          sha256 = "1gnbphf4ldi60wdfwpcyyyhgj2scj0wmlxp10014cwz9xcdqnfl5";
+          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
+          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -59574,12 +59806,12 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20170316.511";
+        version = "20170418.314";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "53360f55df3857933a483af652aefe33187f5304";
-          sha256 = "1na2h4pxrs0l3i5bsyn2c5mf5nbpr90lyhxav57wc2jcqz24nz4l";
+          rev = "39d07da7e3fbcfbf9ab851acdeca1511974e913b";
+          sha256 = "1km8cglgqrg8gb35011jmgz86i273v6hbbna3x17828kmyh8w7wn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -59784,12 +60016,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170416.1111";
+        version = "20170421.1131";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -59850,7 +60082,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58383";
+          rev = "58479";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59930,7 +60162,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58383";
+          rev = "58479";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60329,8 +60561,8 @@
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "c10f969e06deb0cb1471ebaa4c9bef8e3aeed39c";
-          sha256 = "05g6pd125bjh4494fm65iyxjc1nn3a21amdf8cbzcyjakywajjwa";
+          rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499";
+          sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -60581,8 +60813,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "ac72fb1103c506ce8c00f1b2be37b5c5ab771a61";
-          sha256 = "19z8dwybj4bmmqlxa8g6jc87kkj2bdnlgv0k31d0kqxwswng309w";
+          rev = "0a00aecc6f3a510a8ef0c396bc04a73e5746cbeb";
+          sha256 = "1k6psvjx8l0znb4rx46q4ykw6mc6npcwiz8xhk9nm9pd66hjnw7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62702,12 +62934,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170331.2242";
+        version = "20170422.956";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "86756c37968cbbc171e52e416ef656af2a2258a8";
-          sha256 = "1vhcfmyk9swf5h7gka9fbwq2s3x4a540km6wjxqynmpw8c45q154";
+          rev = "dbda2739d49b073095bde1ededd3321c99857630";
+          sha256 = "019dzm2nxawbkk2qhqz130w4pa3i8s0w8vpmw4r7f408kz32m23y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -62765,12 +62997,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170319.1601";
+        version = "20170421.1423";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "0f3459f558bb71daab2416102b99a8ce39947d83";
-          sha256 = "0sqjsc7gbiqivi9f8y53fc3nys61dhs8lq1zz57yg24qvv3hxqi3";
+          rev = "7dc97e11f0d7efecc3adadfbc24dcc69fe0709fb";
+          sha256 = "06iij0xcs8w3j9ikffmx8c1cvfplngjnwhyfq5xbzd4vj2iqwxn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -63454,12 +63686,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170417.1126";
+        version = "20170424.505";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "72f3d2846a7fe324136b7b58d6bf3f8939551c99";
-          sha256 = "181sb5rv0li00gp67sg16g9clhcs9gbmp1cs8f29ww3m753k1nvs";
+          rev = "64813a85884c704cba185e9937c26bd4813e0e8f";
+          sha256 = "1gmqnm3rd9bhr41bqz16ij5r1jxj3srgvwhmqw4k8yprw3zaqz2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63580,12 +63812,12 @@
     smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smblog";
-        version = "20160317.430";
+        version = "20170419.321";
         src = fetchFromGitHub {
           owner = "aaptel";
           repo = "smblog-mode";
-          rev = "25bf9374f692aec845d911286f10a11aaa0945d8";
-          sha256 = "1ca8i45dj41vif2hm87ircwm9alxdm98irfi586ybrc72s24036r";
+          rev = "5245e7aeac20915121946f59bba30899305d950b";
+          sha256 = "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6469537a11972509fa2bfb10eb3f8816cc98efed/recipes/smblog";
@@ -64363,12 +64595,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170417.105";
+        version = "20170425.313";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "26a9e571122aed17318948f677827068e13cb216";
-          sha256 = "0bpy812hlnmjracnz66xb9v4xd8m1sxizls7nhhpi68i870q2449";
+          rev = "be53e5bde0e855c012bc99602830984a7008604a";
+          sha256 = "19xwy2dqlp585vi2ihr85rhf609lc57l133gc3bcz09aii24lfkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -64468,12 +64700,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170313.721";
+        version = "20170418.231";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "33da09b3895e03e64959005678d448ab82e527b6";
-          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
+          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
+          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -65116,12 +65348,12 @@
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "082219f18f34d146e3b6ced175c912f2da31220d";
-          sha256 = "1035r0msl7av5g0hkn69784zdqvpamplvzgn06yzjsnf0bfbsdl5";
+          rev = "ff82fd1e48a8fde61c845eb213584d67e754e8a1";
+          sha256 = "1p1kplnkpnhi28fj3j8f5f0v0kccgmx5knyxr2kwn1fq7s9zqbh8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
-          sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
+          sha256 = "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq";
           name = "ssh-config-mode";
         };
         packageRequires = [];
@@ -65133,12 +65365,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170315.844";
+        version = "20170423.2332";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "4c1a539e6f95e4847c13685d2b752e40d2b8aad8";
-          sha256 = "1zkxiy66d34v09krfajx6y8i2s5jdp99sxfzbvzi854s9hldl58x";
+          rev = "56da852dd3b34add0b2cce499cb07f076767a976";
+          sha256 = "14c8grlbjymdcvkpw6fv80qd9b3l3kmji4xqqh9z2hdvifn412a3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -65548,12 +65780,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "20161220.1825";
+        version = "20170419.1638";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
-          sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
+          rev = "297aaf68e666381521b02d433fcd28d8b51c48de";
+          sha256 = "1621lwda3j3pwfxqwfa2gp4fxz869bc0ib87v71mrab8p1qsdizg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -66315,8 +66547,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66458,12 +66690,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170417.116";
+        version = "20170424.907";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "3fd1607725ac8163b38f9f60142af7764afbd1e1";
-          sha256 = "02pq1gnmg87brdbhzjvb0dx4mm0m28rrnf07p11d0k9hscpg6ln4";
+          rev = "0a03aecead1c11355fe4be61d2f6339f6116bc32";
+          sha256 = "1m6d792zc82w615py9f401nl7ab21nz6k3f2sipinv27d9zkn911";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -66644,12 +66876,12 @@
     syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntactic-close";
-        version = "20161213.735";
+        version = "20170418.3";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000";
-          sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d";
+          rev = "79b0de7f93e9590700aa2226752bc99434c53b42";
+          sha256 = "0rqw7ckgcxa5m4ykvw1kgqgdyzc569j2pfj71q866drg150yq8s4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -67062,12 +67294,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170412.1916";
+        version = "20170419.1308";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "2ca07996e91636314aaf921edcba8191c03aabec";
-          sha256 = "1ljif6cpygphl5y3cra9kxq0yahv445hsi388q4zp0qgq8pqslpx";
+          rev = "9d2973b20b414cafe6df917bbe4599310d67170b";
+          sha256 = "1s5lpba1zn4f48jzbchal6wpm8jz666bmr37l0si04fi4019har1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -67356,12 +67588,12 @@
     term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-manager";
-        version = "20161110.1707";
+        version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
-          sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
+          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
+          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -67440,12 +67672,12 @@
     term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }:
     melpaBuild {
         pname = "term-projectile";
-        version = "20161106.1419";
+        version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
-          sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
+          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
+          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -67857,12 +68089,12 @@
     theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "theme-looper";
-        version = "20170330.1829";
+        version = "20170425.606";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "4c07f6f6e1c733d274e26ed8eb03cc5bb6e9149a";
-          sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j";
+          rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
+          sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
@@ -67975,12 +68207,12 @@
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "20170325.430";
+        version = "20170418.854";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "122c0dcafa79bb1d9b37dc5bf6045e9f62666e6c";
-          sha256 = "05jczr3vj7j7b83sv2w79hrd4hq8xip79yx4z9g1v8lr3j3l4gzq";
+          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
+          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -68042,8 +68274,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "2d65c2365f19f637bc732222e71d78727bf0b709";
-          sha256 = "0g347bhy6hppkl4769ahfyw2cbl0dqhv889c0xf8wbzfbsn9kaz5";
+          rev = "3311a9b2375276441234218f4351c6a8f66a6bc2";
+          sha256 = "0raiwmix51sk97g9y3d45wism9yf6f1k2kq8b7m8ypacd1vhijdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69527,12 +69759,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170324.1301";
+        version = "20170424.2231";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
-          sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
+          rev = "e0b4a6cb31750314e827bbc57de9a35558b34fd9";
+          sha256 = "0z9s1aacalc17inc6rxxmyp8ffwy4as0va96rwfmhq3lmhcbbclf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70242,12 +70474,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "20170402.143";
+        version = "20170425.331";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
-          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
+          rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
+          sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -70365,12 +70597,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "20151105.247";
+        version = "20170423.2354";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "a9696b7ea30ffe709fb11f865570595103516e91";
-          sha256 = "0wnhfhdac3qfcrim5q4cp2i2k3ich5hkkljinsbmg14qncqxcmrx";
+          rev = "d9f198899bba90bb5b38271046fde9c1af24830d";
+          sha256 = "1wj7m5f6kgh6m8sl0j6wlfaz01i960lxyam2mk1nxhf7nl6zp7bk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70869,12 +71101,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20170315.1525";
+        version = "20170424.659";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
-          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
+          rev = "9b6b9f20004dd33c5b603e09b5ca133bc864d1a4";
+          sha256 = "0blgbrbp5bkrcl0dpfwp8akcdgx9ng730kk2lr3g2rzr5v7y8dck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -71806,12 +72038,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170410.1335";
+        version = "20170419.132";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "841f253e11e3c5880b357204190996c4ad98d9dc";
-          sha256 = "009s886spm45jjk7valdk3kjb4dchc60wzqlswgylbvcmx6b3mxn";
+          rev = "a2e274403a1813dcace73759cb56acbe81deeace";
+          sha256 = "0bk6pkbg37kdbmg6lrbyklfd19xfy8mz5ir0cfw8z64qx9dzyi3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -71911,12 +72143,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170328.1448";
+        version = "20170423.22";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "382e01d787c4a0fa6bd4c58bed1810ed5b7787e2";
-          sha256 = "1nz4ri36k49gwdkc9sb886avpijijssrj4frjyrw27ff9aj9q9h0";
+          rev = "69f94520035282c3eb838e6f240a6db93e54b99c";
+          sha256 = "0qxcx2pns77s4mgr1cfzvlhxmfvzckx52phq63b2wmxkijkbwpba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72163,12 +72395,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170407.605";
+        version = "20170418.501";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "bb30f56868ae4888a8ac5a406c7c7ee2ff168f9b";
-          sha256 = "1v50qa611lqj0hjp8v6pnyqvnmljkd0p5g9aj517kv5d7b2rk1dj";
+          rev = "2e855196c78420b76f6f6cb92822255669599d7e";
+          sha256 = "1hgdanmifn97i4n73q2nv7s2g0kidrv9hf4bysb08rmn38w26ny3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -72721,12 +72953,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "20170217.110";
+        version = "20170418.631";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "3c28c0dd685ee71b073e6a336efe3bff21f65a9b";
-          sha256 = "0bxwhkshyxzq5f2jlsp6z97j2gdgz3a0hbp8bvjj71biywhn2m26";
+          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
+          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
@@ -72783,12 +73015,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170111.609";
+        version = "20170417.1458";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0";
-          sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn";
+          rev = "eb0083125eb69033d53374742fd4af7a850a97fb";
+          sha256 = "0i0cw68vv8w01jwlxvs4zjh2b72msjq358x3cv074mzv1ma3y3v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -72972,12 +73204,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170326.712";
+        version = "20170422.416";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "820fe2316d672e7bb2be7a2ead8ad5ed027f1a9a";
-          sha256 = "13d089n9y8y7ka708byg9704rq0slxvdzfhw8vk0yzzd3jrbfgs3";
+          rev = "015d2fd00a112215d370ae6d11c44f4702e2239f";
+          sha256 = "0afxqgiw3p2y3lhgny8j25fqkf0im9qqdz9fsjgddhrmq0gkllhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -74271,12 +74503,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170409.2044";
+        version = "20170418.351";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "47f37f70f4748e30010b700b5eca39d5cd063616";
-          sha256 = "0rl0hd6cwa5jvzi3aixws90hvin4p7ppylc4jn7v8cnhy2hckzjp";
+          rev = "8797a31337895fe5fb29727c5ef289168a856a1b";
+          sha256 = "0qvr7gbvjhh4n7j5hqj424v8np17x2kdcs1nx49p2zg9hm6y04ap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -74296,8 +74528,8 @@
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "b58d17e176f77ded83860d33f4f43fcb5f7d2c9c";
-          sha256 = "13as073yw6wphcs7w62zicqgva0lh4xx4f1c9sph8ip1wydkr9pg";
+          rev = "3854836489ce06bb65cf9aecbdc06aa5fc6801c5";
+          sha256 = "051wwf802f00xk5gq5js1l0dd1ax0ls2jvlybz7xfy58dl8fbijx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -74374,12 +74606,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170416.312";
+        version = "20170424.1519";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75028,11 +75260,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170413.2126";
+        version = "20170420.2233";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "08ae558834c2";
-          sha256 = "1bwjn1shnirmrqf7xcvzhnyg87jpwbcv231r28hlnyb5f2sqvr2y";
+          rev = "085e342c3b84";
+          sha256 = "1pmq15xrh2787cwj7ckn03rparknyf7qwrskmy2f8n9dqlfw7pnq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From fa8ee0d45bb323869341e60f8cb3a8ffa4b8b5b6 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Tue, 25 Apr 2017 12:52:53 -0600
Subject: [PATCH 1514/1744] jenkins: 2.55 -> 2.56

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 548f6feb6c3..b2cf8b5a0ce 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.55";
+  version = "2.56";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1ms3sns87afnbdlww93fhp25pkbxz7z4z0kr4qh94n3njfbw2zp7";
+    sha256 = "1n0rqvnqv8dsqz8nmcxifg2qqs5hjqvi4bw3a3rjchndqyc3azij";
   };
 
   buildCommand = ''

From 1e3416cc0a3454ade851ad420eca61a971327c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Apr 2017 23:22:53 +0200
Subject: [PATCH 1515/1744] pythonPackages.ezdxf: fix tests

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

diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 18e8e98315c..6b0484f2c36 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k, pyparsing }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
   version = "0.8.1";
   name = "ezdxf-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/e/ezdxf/${name}.zip";
-    sha256 = "1q4la4h7840wb8l2jf39wy68gq5jwymkghb1a1mg8qblj424130k";
+  src = fetchFromGitHub {
+    owner = "mozman";
+    repo = "ezdxf";
+    rev = "v${version}";
+    sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22";
   };
 
-  # Tests fail on Python 3.x, but module imports and works
-  doCheck = !(isPy3k);
-    
+  buildInputs = [ pytest ];
+  checkPhase = "python -m unittest discover -s tests";
+
   propagatedBuildInputs = [ pyparsing ];
 
   meta = with stdenv.lib; {

From 489fa7b723524d6c744ca018d448a921cfb1ade2 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Tue, 25 Apr 2017 17:34:45 -0400
Subject: [PATCH 1516/1744] ezdxf: Add hodapp as maintainer

---
 lib/maintainers.nix                               | 1 +
 pkgs/development/python-modules/ezdxf/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bb8ca565dfd..304978d38b5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
+  hodapp = "Chris Hodapp <hodapp87@gmail.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 6b0484f2c36..c6c6137a2d4 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -20,6 +20,7 @@ buildPythonPackage rec {
     description = "Python package to read and write DXF drawings (interface to the DXF file format)";
     homepage = https://github.com/mozman/ezdxf/;
     license = licenses.mit;
+    maintainers = with maintainers; [ hodapp ];
     platforms = platforms.unix;
   };
 }

From 91f55f4e8ac52747024bf8d63511146109bdb14b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 25 Apr 2017 17:48:26 -0400
Subject: [PATCH 1517/1744] xalanc: enable on Darwin

---
 pkgs/development/libraries/xalanc/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index 8284fd7707f..28575f4c5d5 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchurl, xercesc }:
+{ stdenv, fetchurl, xercesc, getopt }:
 
-stdenv.mkDerivation rec {
+let
+  platform = if stdenv.isLinux then "linux" else
+             if stdenv.isDarwin then "macosx" else
+             throw "Unsupported platform";
+in stdenv.mkDerivation rec {
   name = "xalan-c-${version}";
   version = "1.11";
 
@@ -9,20 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
   };
 
+  # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below
   configurePhase = ''
     export XALANCROOT=`pwd`/c
     cd `pwd`/c
     mkdir -p $out/usr
-    ./runConfigure -p linux -c gcc -x g++ -P$out/usr
+    ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr
   '';
 
-  buildInputs = [ xercesc ];
+  buildInputs = [ xercesc getopt ];
 
   meta = {
     homepage = http://xalan.apache.org/;
     description = "A XSLT processor for transforming XML documents";
     license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }

From b2ce7fd3a925127ce1549755433bb2b7cb45e0fd Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 25 Apr 2017 17:50:02 -0400
Subject: [PATCH 1518/1744] xml-security-c: should work on any unix

In practice its xalanc dependency will fail on platforms other than Linux
and Darwin, but if that gets fixed there's no reason this shouldn't work.
---
 pkgs/development/libraries/xml-security-c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 1932acbd7ed..37936caf2b9 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://santuario.apache.org/;
     description = "C++ Implementation of W3C security standards for XML";
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }

From faea8776d1a789e0b0ce71bf16ae425a3d455e04 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 25 Apr 2017 14:51:42 -0700
Subject: [PATCH 1519/1744] prometheus-alertmanager: 0.5.1 -> 0.6.0

---
 .../monitoring/prometheus/alertmanager.nix        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 8bf9eef6cd0..78cd69714e8 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq";
+    sha256 = "04969hqig0llfkvk3b0yqrywcxm6rgd7ph6nn5rx8pnq21i77sqm";
   };
 
   # Tests exist, but seem to clash with the firewall.
@@ -27,6 +27,17 @@ buildGoPackage rec {
        -X ${t}.GoVersion=${stdenv.lib.getVersion go}
   '';
 
+  postBuild = ''
+    $NIX_BUILD_TOP/go/bin/artifacts
+  '';
+
+  postInstall = ''
+    rm $bin/bin/artifacts
+    mkdir -p $bin/share/man/man1 $bin/etc/bash_completion.d
+    cp -v amtool*.1 $bin/share/man/man1
+    cp -v amtool_completion.sh $bin/etc/bash_completion.d
+  '';
+
   meta = with stdenv.lib; {
     description = "Alert dispatcher for the Prometheus monitoring system";
     homepage = https://github.com/prometheus/alertmanager;

From 6b0736b01df9079caa6a8539713016e7508a9f58 Mon Sep 17 00:00:00 2001
From: Asumu Takikawa <asumu@igalia.com>
Date: Wed, 29 Mar 2017 13:31:21 -0700
Subject: [PATCH 1520/1744] nfdump: init at 1.6.15

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

diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
new file mode 100644
index 00000000000..f7a04eff046
--- /dev/null
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, bzip2, yacc, flex }:
+
+let version = "1.6.15"; in
+
+stdenv.mkDerivation rec {
+  name = "nfdump-${version}";
+
+  src = fetchFromGitHub {
+    owner = "phaag";
+    repo = "nfdump";
+    rev = "v${version}";
+    sha256 = "07grsfkfjy05yfqfcmgp5xpavpck9ps6q7x8x8j79fym5d8gwak5";
+  };
+
+  nativeBuildInputs = [yacc flex];
+  buildInputs = [bzip2];
+
+  meta = with stdenv.lib; {
+    description = "Tools for working with netflow data";
+    longDescription = ''
+      nfdump is a set of tools for working with netflow data.
+    '';
+    homepage = https://github.com/phaag/nfdump;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.takikawa ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 266a264bac0..aaf91b7a571 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -942,6 +942,8 @@ with pkgs;
 
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
+  nfdump = callPackage ../tools/networking/nfdump { };
+
   playerctl = callPackage ../tools/audio/playerctl { };
 
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};

From 4c171319f56ab1b9fb50d8fd0afb422046adc636 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 18 Apr 2017 22:55:49 +0200
Subject: [PATCH 1521/1744] transmission-remote-gtk: fix broken tray applet
 icons

This uses `wrapGAppsHook` and `hicolor_icon_theme` to let the tray
applet find the icons.
---
 .../p2p/transmission-remote-gtk/default.nix   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 694b7541bba..20c3540b7f4 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, autoconf, automake, libtool, makeWrapper, fetchFromGitHub, pkgconfig
-, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib }:
+{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
+, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib
+, hicolor_icon_theme }:
 
 
 stdenv.mkDerivation rec {
@@ -15,18 +16,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  nativeBuildInputs= [ 
-    autoconf automake libtool makeWrapper 
-    pkgconfig intltool autoconf-archive 
+  nativeBuildInputs= [
+    autoconf automake libtool wrapGAppsHook
+    pkgconfig intltool autoconf-archive
     appstream-glib
   ];
-  buildInputs = [ gtk3 json_glib curl glib ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/transmission-remote-gtk" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
+  buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ];
 
   meta = with stdenv.lib;
     { description = "GTK remote control for the Transmission BitTorrent client";

From da0ef84c0c5b5b5ffe739939895bc1992fac7d80 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 25 Apr 2017 17:26:52 -0400
Subject: [PATCH 1522/1744] mysql test: use OpenPort check over blind sleep

---
 nixos/tests/mysql-replication.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index b20bce8edce..82ee76f6b3a 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -56,11 +56,13 @@ in
   testScript = ''
     $master->start;
     $master->waitForUnit("mysql");
+    $master->waitForOpenPort(3306);
     $slave1->start;
     $slave2->start;
     $slave1->waitForUnit("mysql");
+    $slave1->waitForOpenPort(3306);
     $slave2->waitForUnit("mysql");
-    $slave2->sleep(100); # Hopefully this is long enough!!
+    $slave2->waitForOpenPort(3306);
     $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
 })

From 5dd731b801ac6a0203204a7eed19afddee93fe85 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 25 Apr 2017 17:53:48 -0400
Subject: [PATCH 1523/1744] mysql test: test replication persists between slave
 stop / start cycle

---
 nixos/tests/mysql-replication.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 82ee76f6b3a..75c6d793feb 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -64,5 +64,11 @@ in
     $slave2->waitForUnit("mysql");
     $slave2->waitForOpenPort(3306);
     $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+    $slave2->succeed("systemctl stop mysql");
+    $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
+    $slave2->succeed("systemctl start mysql");
+    $slave2->waitForUnit("mysql");
+    $slave2->waitForOpenPort(3306);
+    $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
   '';
 })

From 78bb5f5f3775e220e5d4bbe30851dd7fec072bf8 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 19:54:25 -0400
Subject: [PATCH 1524/1744] linux cross stdenv: Pull platforms from lib to cut
 eval time

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 613edfafd95..8b166fb5b49 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -3,8 +3,8 @@
 let buildFor = toolsArch: (
 
 let
+  lib = import ../../../lib;
   pkgsFun = import ../../..;
-  pkgsNoParams = pkgsFun {};
 
   sheevaplugCrossSystem = {
     crossSystem = rec {
@@ -14,7 +14,7 @@ let
       float = "soft";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.sheevaplug;
+      platform = lib.systems.platforms.sheevaplug;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -29,7 +29,7 @@ let
       fpu = "vfp";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.raspberrypi;
+      platform = lib.systems.platforms.raspberrypi;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -44,7 +44,7 @@ let
       fpu = "vfpv3-d16";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
+      platform = lib.systems.platforms.armv7l-hf-multiplatform;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -57,7 +57,7 @@ let
       arch = "aarch64";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.aarch64-multiplatform;
+      platform = lib.systems.platforms.aarch64-multiplatform;
       inherit (platform) gcc;
     };
   };

From 23cc0c4420d3b2d5fb023f2368ba7d11412c1fba Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 19:37:22 -0400
Subject: [PATCH 1525/1744] lib: Whitelist two ABIs used on Arm

---
 lib/systems/parse.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index f6315b8ad2a..26744322e9e 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -89,6 +89,8 @@ rec {
     msvc = {};
     eabi = {};
     androideabi = {};
+    gnueabi = {};
+    gnueabihf = {};
     unknown = {};
   };
 

From 88be2f7080f972320a6f17fc0ccb910a57c6539a Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 26 Apr 2017 01:44:06 +1000
Subject: [PATCH 1526/1744] facetimehd: disable aarch64-linux builds

---
 pkgs/os-specific/linux/facetimehd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index a9cea506c97..720bc34c419 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
     license = licenses.gpl2;
     maintainers = with maintainers; [ womfoo grahamc ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

From e57bcc710667a76a1d17f3eee0d022b1159e9106 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 26 Apr 2017 01:44:27 +1000
Subject: [PATCH 1527/1744] facetimehd-firmware: disable aarch64-linux builds

---
 pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 69abaf26197..5f8f6c54252 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
     homepage = https://support.apple.com/downloads/DL1877;
     license = licenses.unfree;
     maintainers = with maintainers; [ womfoo grahamc ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }

From 5aa936d0ee494c3e2e33e3f1790bf9703f7f710a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Apr 2017 20:36:04 -0400
Subject: [PATCH 1528/1744] nix perl-bindings: Fix Config.pm

---
 pkgs/tools/package-management/nix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index bf6216ccc67..4074229ecf7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -118,6 +118,8 @@ let
         "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
         "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
       ];
+
+    preBuild = "unset NIX_INDENT_MAKE";
   };
 
 in rec {

From 85b4d30c0b464f6431eac6c50687111cfc69eb22 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 11 Feb 2017 19:28:13 -0500
Subject: [PATCH 1529/1744] binutils: Respect the targetPlatform

Use `buildPackages.binutils` to get build = host != target binutils,
i.e. the old `binutilsCross`, and use
`buildPackages.buildPackages.binutils` to get build = host = target
binutils, i.e. the old `binutils`.

`buildPackages` chains like this are supposed to remove the need for
all such `*Cross` derivations. We start with binutils because it's
comparatively easy.

No hashes of cross-tests should be changed
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                  |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 8b166fb5b49..47c61aaad81 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -70,8 +70,6 @@ let
 
   pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
 
-  inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross;
-
   glibc = pkgs.buildPackages.libcCross;
   bash = pkgs.bash;
   findutils = pkgs.findutils;
@@ -126,11 +124,15 @@ rec {
 
   build =
 
-    stdenv.mkDerivation {
+    pkgs.buildPackages.stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
       crossConfig = pkgs.hostPlatform.config;
 
-      buildInputs = [nukeReferences cpio binutilsCross];
+      buildInputs = [
+        pkgs.buildPackages.nukeReferences
+        pkgs.buildPackages.cpio
+        pkgs.buildPackages.binutils
+      ];
 
       buildCommand = ''
         set -x
@@ -261,7 +263,7 @@ rec {
       allowedReferences = [];
     };
 
-  dist = stdenv.mkDerivation {
+  dist = pkgs.buildPackages.stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools-cross";
 
     buildCommand = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5da33b38244..a351284632b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6336,10 +6336,13 @@ with pkgs;
 
   binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw;
 
-  binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; };
+  binutils-raw = callPackage ../development/tools/misc/binutils {
+    # FHS sys dirs presumably only have stuff for the build platform
+    noSysDirs = (targetPlatform != buildPlatform) || noSysDirs;
+    cross = if targetPlatform != hostPlatform then targetPlatform else null;
+  };
 
-  binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
+  binutils_nogold = lowPrio (binutils-raw.override {
     gold = false;
   });
 

From 295315cc87acd13caa39ea87c1d8d010e7a587df Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 21:18:29 -0400
Subject: [PATCH 1530/1744] binutilsCross: Remove and use `binutils` instead
 always

See previous commit for what was done to `binutils` to make this
possible.

There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:

  "Move along, nothing to see here!"

No hashes should be changed with this commit
---
 .../development/compilers/gcc/4.5/default.nix |  3 +--
 .../development/compilers/gcc/4.8/default.nix |  7 +++---
 .../development/compilers/gcc/4.9/default.nix |  7 +++---
 pkgs/development/compilers/gcc/5/default.nix  |  7 +++---
 pkgs/development/compilers/gcc/6/default.nix  |  7 +++---
 .../compilers/gcc/snapshot/default.nix        |  7 +++---
 pkgs/development/compilers/ghc/head.nix       | 12 +++++-----
 .../os-specific/windows/mingw-w64/default.nix |  4 ++--
 pkgs/os-specific/windows/mingwrt/default.nix  |  4 ++--
 pkgs/os-specific/windows/w32api/default.nix   |  4 ++--
 pkgs/stdenv/adapters.nix                      |  6 ++---
 pkgs/stdenv/cross/default.nix                 |  2 +-
 pkgs/top-level/all-packages.nix               | 23 +++++++------------
 13 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 7f5e4f8c9a2..19a538e613e 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -20,7 +20,6 @@
 , enableMultilib ? false
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -225,7 +224,7 @@ stdenv.mkDerivation ({
     ++ (optional langJava boehmgc)
     ++ (optionals langJava [zip unzip])
     ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
     ;
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 72c22544d1e..714554019e4 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -171,8 +170,8 @@ let version = "4.8.5";
            else                " --with-headers=${libcCross.dev}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -294,7 +293,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 594a61fdedf..3bf279635aa 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -172,8 +171,8 @@ let version = "4.9.4";
            else                " --with-headers=${libcCross.dev}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -299,7 +298,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f7d46deebcc..25053542678 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -176,8 +175,8 @@ let version = "5.4.0";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -309,7 +308,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 1496e910dd1..57bb336ccbf 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -172,8 +171,8 @@ let version = "6.3.0";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -297,7 +296,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index af48fdbd159..6b08f279790 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -172,8 +171,8 @@ let version = "7-20170409";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -297,7 +296,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index ed6f4717446..006a9f8fbc4 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -99,17 +99,17 @@ in stdenv.mkDerivation (rec {
 
   configureFlags = [
     "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
-    "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld"
-    "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar"
-    "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm"
-    "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
+    "LD=${stdenv.binutils}/bin/${cross.config}-ld"
+    "AR=${stdenv.binutils}/bin/${cross.config}-ar"
+    "NM=${stdenv.binutils}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
     "--enable-bootstrap-with-devel-snapshot"
   ] ++
     # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
     lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
 
-  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
+  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
 
   dontSetConfigureCross = true;
 
@@ -118,6 +118,6 @@ in stdenv.mkDerivation (rec {
 
     cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
 
-    ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld";
+    ld = "${stdenv.binutils}/bin/${cross.config}-ld";
   };
 })
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a9df0d29e09..49612b0b461 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null
+{ stdenv, fetchurl, binutils ? null, gccCross ? null
 , onlyHeaders ? false
 , onlyPthreads ? false
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
     cd mingw-w64-libraries/winpthreads
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 286c63d0163..98461d690d9 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}:
 
 let
   name = "mingwrt-3.20";
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 2a5af71b5ec..3443fff9668 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz, binutilsCross ? null
+{ stdenv, fetchurl, xz, binutils ? null
 , gccCross ? null, onlyHeaders ? false }:
 
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 65a0bf98456..7eab7ddb072 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -56,7 +56,7 @@ rec {
 
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
-  makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // {
+  makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // {
 
     # Overrides are surely not valid as packages built with this run on a
     # different platform.
@@ -91,7 +91,7 @@ rec {
           name = name + "-" + cross.config;
           nativeBuildInputs = nativeBuildInputs
             ++ nativeInputsFromBuildInputs
-            ++ [ gccCross binutilsCross ]
+            ++ [ gccCross binutils ]
             ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
@@ -110,7 +110,7 @@ rec {
           crossConfig = cross.config;
         } // args.crossAttrs or {});
 
-    inherit gccCross binutilsCross;
+    inherit gccCross binutils;
     ccCross = gccCross;
 
   };
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index dec4b036092..7fe56725170 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -39,7 +39,7 @@ in bootStages ++ [
           binutils cc
       else buildPackages.makeStdenvCross
         buildPackages.stdenv crossSystem
-        buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
+        buildPackages.binutils buildPackages.gccCrossStageFinal;
   })
 
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a351284632b..00243e82b9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4982,10 +4982,10 @@ with pkgs;
         libcCross = libcCross1;
         enableShared = false;
         # Why is this needed?
-        inherit (forcedNativePackages) binutilsCross;
+        inherit (forcedNativePackages) binutils;
       };
       libc = libcCross1;
-      binutils = binutilsCross;
+      inherit (forcedNativePackages) binutils;
       cross = targetPlatform;
   };
 
@@ -4993,7 +4993,7 @@ with pkgs;
   gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross {
     gcc = gccCrossStageStatic.gcc;
     libc = windows.mingw_headers2;
-    binutils = binutilsCross;
+    inherit (forcedNativePackages) binutils;
     cross = targetPlatform;
   };
 
@@ -5006,10 +5006,10 @@ with pkgs;
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
       langCC = targetPlatform.config != "i686-pc-mingw32";
       # Why is this needed?
-      inherit (forcedNativePackages) binutilsCross;
+      inherit (forcedNativePackages) binutils;
     };
     libc = libcCross;
-    binutils = binutilsCross;
+    inherit (forcedNativePackages) binutils;
     cross = targetPlatform;
   };
 
@@ -6346,13 +6346,6 @@ with pkgs;
     gold = false;
   });
 
-  binutilsCross = assert targetPlatform != buildPlatform; lowPrio (
-    if targetPlatform.libc == "libSystem" then darwin.cctools_cross
-    else forcedNativePackages.binutils.override {
-      noSysDirs = true;
-      cross = targetPlatform;
-    });
-
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
@@ -12305,7 +12298,7 @@ with pkgs;
 
     w32api = callPackage ../os-specific/windows/w32api {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     w32api_headers = w32api.override {
@@ -12314,7 +12307,7 @@ with pkgs;
 
     mingw_runtime = callPackage ../os-specific/windows/mingwrt {
       gccCross = gccCrossMingw2;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     mingw_runtime_headers = mingw_runtime.override {
@@ -12338,7 +12331,7 @@ with pkgs;
 
     mingw_w64 = callPackage ../os-specific/windows/mingw-w64 {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 {

From 9e764af72f86a9aff00e977947eeccf445e8bcf3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 25 Apr 2017 22:01:18 -0400
Subject: [PATCH 1531/1744] fetchs3: init simple S3 downloader

---
 pkgs/build-support/fetchs3/default.nix | 29 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/build-support/fetchs3/default.nix

diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
new file mode 100644
index 00000000000..a5cdbd150b8
--- /dev/null
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, runCommand, awscli }:
+
+{ s3url
+, sha256
+, region ? "us-east-1"
+, credentials ? null # Default to looking at local EC2 metadata service
+, executable ? false
+, recursiveHash ? false
+, postFetch ? null
+}:
+
+let
+  credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) {
+    AWS_ACCESS_KEY_ID = credentials.access_key_id;
+    AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
+    AWS_SESSION_TOKEN = credentials.session_token ? null;
+  };
+in runCommand "foo" ({
+  buildInputs = [ awscli ];
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = if recursiveHash then "recursive" else "flat";
+} // credentialAttrs) (if postFetch != null then ''
+  downloadedFile="$(mktemp)"
+  aws s3 cp ${s3url} $downloadedFile
+  ${postFetch}
+'' else  ''
+  aws s3 cp ${s3url} $out
+'')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab9b8c2f3a1..9c7c652fac8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -153,6 +153,8 @@ with pkgs;
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
 
+  fetchs3 = callPackage ../build-support/fetchs3 { };
+
   fetchsvn = callPackage ../build-support/fetchsvn {
     sshSupport = true;
   };

From 30ea4f08075f655fa6baaff717d5ece05d3db6ed Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 26 Apr 2017 01:53:40 -0500
Subject: [PATCH 1532/1744] nix-bundle: init at 0.1.1

Adds the nix-bundle derivation from https://github.com/matthewbauer/nix-bundle
---
 .../package-management/nix-bundle/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-bundle/default.nix

diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
new file mode 100644
index 00000000000..b01836e1eb8
--- /dev/null
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, fetchFromGitHub, nix, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "nix-bundle";
+  name = "${pname}-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "13730rfnqjv1m2mky2g0cq77yzp2j215zrvy3lhpiwgmh97vviih";
+  };
+
+  buildInputs = [ nix makeWrapper ];
+
+  binPath = lib.makeBinPath [ nix ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    mkdir -p $out/bin
+    makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \
+      --prefix PATH : ${binPath}
+  '';
+
+  meta = with lib; {
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.all;
+    description = "Create bundles from Nixpkgs attributes";
+    license = licenses.mit;
+    homepage = https://github.com/matthewbauer/nix-bundle;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab9b8c2f3a1..c532a9e02a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18085,6 +18085,8 @@ with pkgs;
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
+  nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixStable; };
+
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr
     nix-prefetch-cvs

From 3759dc5a762ae78e18dbca85222e7aa88e2fb682 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 11:34:28 +0200
Subject: [PATCH 1533/1744] cortex: Remove package

I removed cortex it is rather unmaintained. The last update (as of
writing) was 8 months ago, there was no release ever.

For a better alternative, have a look at `rtv`.
---
 pkgs/applications/misc/cortex/default.nix | 32 -----------------------
 pkgs/top-level/all-packages.nix           |  2 --
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/applications/misc/cortex/default.nix

diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
deleted file mode 100644
index 42565ae7fa8..00000000000
--- a/pkgs/applications/misc/cortex/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchgit, python3 }:
-
-stdenv.mkDerivation {
-  name = "cortex-2015-08-23";
-
-  src = fetchgit {
-    url = "https://github.com/gglucas/cortex";
-    rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
-    sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
-  };
-
-  buildInputs = [ stdenv python3 ];
-
-  prePatch = ''
-    substituteInPlace cortex --replace "/usr/bin/env python3" "${python3}/bin/python3"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp cortex $out/bin/
-    chmod +x $out/bin/cortex
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://cortex.glacicle.org";
-    description = "An ncurses reddit browser and monitor";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer ];
-    platforms = with platforms; unix;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e04319607ef..97e0b8a4b5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13191,8 +13191,6 @@ with pkgs;
     inherit (gnome2) libgnomeui GConf;
   };
 
-  cortex = callPackage ../applications/misc/cortex { };
-
   csound = callPackage ../applications/audio/csound { };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {

From 12244f51f98ebf203a034cbe1364167f02749798 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 11:38:04 +0200
Subject: [PATCH 1534/1744] haxor-news: 0.4.1 -> 0.4.2

---
 pkgs/applications/misc/haxor-news/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index e925885f05f..d2acbbfea5b 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "haxor-news-${version}";
 
   src = fetchurl {
     url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
-    sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
+    sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
     colorama
     requests2
     pygments
-    prompt_toolkit_52
+    prompt_toolkit
     six
   ];
 

From 7c8c7139dd08264634800810f3c5bdd68f0efc5a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 11:39:11 +0200
Subject: [PATCH 1535/1744] khal: 0.9.2 -> 0.9.5

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 8d7eeffad31..98dbb0cbf91 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -3,12 +3,12 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  version = "0.9.2";
+  version = "0.9.5";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
-    sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp";
+    sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr";
   };
 
   LC_ALL = "en_US.UTF-8";

From 24e16e61c90345aa4953716927783c7a469b79c3 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 11:41:37 +0200
Subject: [PATCH 1536/1744] mwic: 0.7.2 -> 0.7.3

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

diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 7b9b04c66c8..2faf082197c 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.2";
+  version = "0.7.3";
   name = "mwic-${version}";
 
   src = fetchurl {
     url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy";
+    sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn";
   };
 
   makeFlags=["PREFIX=\${out}"];

From add585af11cad926c64e13f33556eed4606a2a1d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 12:28:49 +0200
Subject: [PATCH 1537/1744] sc-im: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 6d9e1c9fcf2..19fc62d1238 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.6.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61";
+    sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
   };
 
   buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];

From cca20a711452fef85fea09d0edaa1c35ea4d00aa Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 12:30:54 +0200
Subject: [PATCH 1538/1744] vdirsyncer: 0.14.1 -> 0.15.0

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index a5abc8bef83..d1fa9d5bea6 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -6,12 +6,12 @@ let
   pythonPackages = python3Packages;
 in
 pythonPackages.buildPythonApplication rec {
-  version = "0.14.1";
+  version = "0.15.0";
   name = "vdirsyncer-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5";
+    sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From b3a6d1f99059ff4d00d2c993559b20be48714d55 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 26 Apr 2017 20:25:20 +1000
Subject: [PATCH 1539/1744] asterisk: patch to remove unresolved symbol
 warnings

---
 pkgs/servers/asterisk/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 581dbc3b1f7..e20cbce9c66 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn,
+{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, binutils, newt,
   lua, speex,
@@ -18,6 +18,10 @@ let
       # This patch changes the runtime behavior to look for state
       # directories in /var rather than ${out}/var.
       ./runtime-vardirs.patch
+      (fetchpatch {
+         url = "http://sources.debian.net/data/main/a/asterisk/1:13.14.1~dfsg-1/debian/patches/pjsip_unresolved_symbol.patch";
+         sha256 = "0i6a6zplvzbjcvxqlmr87jmrfza7c3qx0rlym2nlmzzp2m7qpnfp";
+      })
     ];
 
     src = fetchurl {

From 718c3e8d97e230bdbcc4143ecaebef03905fc0eb Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 26 Apr 2017 20:31:56 +1000
Subject: [PATCH 1540/1744] asterisk-stable: 14.2.1 -> 14.4.0

---
 pkgs/servers/asterisk/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index e20cbce9c66..bca7aea94bf 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -24,6 +24,11 @@ let
       })
     ];
 
+    # Disable MD5 verification for pjsip
+    postPatch = ''
+      sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile
+    '';
+
     src = fetchurl {
       url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
       inherit sha256;
@@ -73,6 +78,11 @@ let
     sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb";
   };
 
+  pjproject-26 = fetchurl {
+    url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2;
+    sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
+  };
+
   mp3-202 = fetchsvn {
     url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
     rev = 202;
@@ -92,10 +102,10 @@ in
   };
 
   asterisk-stable = common {
-    version = "14.2.1";
-    sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj";
+    version = "14.4.0";
+    sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w";
     externals = {
-      "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
       "addons/mp3" = mp3-202;
     };
   };

From 03fde7a34d517993bfbaf12da7e5264a2836a754 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 26 Apr 2017 20:35:45 +1000
Subject: [PATCH 1541/1744] asterisk-lts: 13.13.1 -> 13.15.0

---
 pkgs/servers/asterisk/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index bca7aea94bf..e6102c84f13 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -73,11 +73,6 @@ let
     };
   };
 
-  pjproject-255 = fetchurl {
-    url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2;
-    sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb";
-  };
-
   pjproject-26 = fetchurl {
     url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2;
     sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
@@ -93,10 +88,10 @@ in
 {
 
   asterisk-lts = common {
-    version = "13.13.1";
-    sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd";
+    version = "13.15.0";
+    sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb";
     externals = {
-      "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
       "addons/mp3" = mp3-202;
     };
   };

From 9d3c1183203fc8494fb68bb77193bf85c4c7a874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Apr 2017 08:02:35 +0200
Subject: [PATCH 1542/1744] google-compute-image: append .raw.tar.gz suffix

This restores behavior of image generation before f1708a9d7d79e2bf2961fc648625578b23b3460f
---
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index d41bb71f4cb..ff39f1bf8da 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -16,7 +16,7 @@ in
       PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
       pushd $out
       mv $diskImage disk.raw
-      tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.tar.gz disk.raw
+      tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw.tar.gz disk.raw
       rm $out/disk.raw
       popd
     '';

From 0ee8160aa457507c89b1f42a763d3c16c9373970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Apr 2017 16:35:11 +0200
Subject: [PATCH 1543/1744] meson: 0.35.0 -> 0.40.0

In configured builds other tools tries to call meson by directly
passing meson tools directly to python. Since they were shell scripts
due wrapping this failed
---
 .../tools/build-managers/meson/default.nix    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 558b8acf70f..d4dbc6b46d2 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,13 +1,23 @@
-{ lib, python3Packages, fetchurl }:
-python3Packages.buildPythonPackage rec {
-  version = "0.35.0";
-  name = "meson-${version}";
+{ lib, python3Packages }:
+python3Packages.buildPythonApplication rec {
+  version = "0.40.0";
+  pname = "meson";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/meson/${name}.tar.gz";
-    sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw";
   };
 
+  postFixup = ''
+    pushd $out/bin
+    # undo shell wrapper as meson tools are called with python
+    for i in *; do
+      mv ".$i-wrapped" "$i"
+    done
+    popd
+  '';
+
   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";

From 4639e68fd1fcc3f4fa63e3b67f659ac1607a90fe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 26 Apr 2017 22:44:57 +0800
Subject: [PATCH 1544/1744] grc: 1.10.1 -> 1.11

---
 pkgs/tools/misc/grc/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 5fcde9bdaeb..aafb865cfac 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -2,18 +2,20 @@
 
 stdenv.mkDerivation rec {
   name    = "grc-${version}";
-  version = "1.10.1";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner  = "garabik";
     repo   = "grc";
     rev    = "v${version}";
-    sha256 = "1c2ndnbyznb608h3s99fbcyh4qb1ccipxm15lyszrrks0w2llbah";
+    sha256 = "0slxkjg8xf5rg5pqgh4g2p1qxr5m9f6ds7zg7vh2xqzkmwqv18kp";
   };
 
   buildInputs = with python3Packages; [ wrapPython makeWrapper ];
 
   installPhase = ''
+    runHook preInstall
+
     ./install.sh "$out" "$out"
 
     for f in $out/bin/* ; do
@@ -25,13 +27,15 @@ stdenv.mkDerivation rec {
       wrapProgram $f \
         --prefix PATH : $out/bin
     done
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "Yet another colouriser for beautifying your logfiles or output of commands";
     homepage    = http://korpus.juls.savba.sk/~garabik/software/grc.html;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ lovek323 AndersonTorres ];
+    maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
     platforms   = platforms.unix;
 
     longDescription = ''

From 846f36203c99090c3f455dcf07aba64825f7c4b8 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 26 Apr 2017 16:55:36 +0200
Subject: [PATCH 1545/1744] docker: pass all proxy variables to docker daemon

This makes things as noProxy work too.
---
 nixos/modules/virtualisation/docker.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index f1101d7ea66..c26cae06cd1 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -7,8 +7,7 @@ with lib;
 let
 
   cfg = config.virtualisation.docker;
-  pro = config.networking.proxy.default;
-  proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; };
+  proxy_env = config.networking.proxy.envVars;
 
 in
 
@@ -106,6 +105,7 @@ in
 
       systemd.services.docker = {
         wantedBy = optional cfg.enableOnBoot "multi-user.target";
+        environment = proxy_env;
         serviceConfig = {
           ExecStart = [
             ""
@@ -122,7 +122,7 @@ in
             ""
             "${pkgs.procps}/bin/kill -s HUP $MAINPID"
           ];
-        } // proxy_env;
+        };
 
         path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
       };

From a4fc2eed593b4186509de469b3a987da1157ef86 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Apr 2017 11:54:06 -0400
Subject: [PATCH 1546/1744] python2Packages.packet-python: 1.31 -> 1.33

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4665fdee6ea..318a3af78cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13198,9 +13198,9 @@ in {
       license = with licenses; [ lgpl21 ];
     };
   };
-  
+
   iso-639 = callPackage ../development/python-modules/iso-639 {};
-  
+
   iso3166 = callPackage ../development/python-modules/iso3166 {};
 
   iso8601 = buildPythonPackage rec {
@@ -15610,7 +15610,7 @@ in {
 
     patches = [
       (pkgs.fetchpatch {
-        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; 
+        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
         sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7";
       })
     ];
@@ -31673,10 +31673,10 @@ EOF
   packet-python = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "packet-python";
-    version = "1.31";
+    version = "1.33";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/c3/1b/ea71ec9d6eeab92b783d23dd62e71e9296f9699bc7d457450859803929f0/${name}.tar.gz";
-      sha256 = "1z1zmrajfw01jr3mafimq7dvsb1rs978zln9xfd6fbqkp3vm9hc0";
+      url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz";
+      sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3";
     };
     propagatedBuildInputs = with self; [ requests ];
 

From 7deb425286c74837946917888ed74a23de1f9f68 Mon Sep 17 00:00:00 2001
From: David McFarland <mcfarland@hotmail.com>
Date: Wed, 26 Apr 2017 13:20:38 -0300
Subject: [PATCH 1547/1744] nixos: use pkgsi686Linux for pkgs_i686 (#24772)

---
 nixos/modules/misc/extra-arguments.nix | 10 ----------
 nixos/modules/misc/nixpkgs.nix         |  7 ++++++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index 19002b17dac..f4ee94ecc0d 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -2,16 +2,6 @@
 
 {
   _module.args = {
-    pkgs_i686 = import ../../.. {
-      system = "i686-linux";
-      # FIXME: we enable config.allowUnfree to make packages like
-      # nvidia-x11 available. This isn't a problem because if the user has
-      # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
-      # the 64-bit package anyway. However, it would be cleaner to respect
-      # nixpkgs.config here.
-      config.allowUnfree = true;
-    };
-
     utils = import ../../lib/utils.nix pkgs;
   };
 }
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index b8824e6374b..1793c1447d6 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -42,6 +42,8 @@ let
     merge = lib.mergeOneOption;
   };
 
+  _pkgs = import ../../.. config.nixpkgs;
+
 in
 
 {
@@ -97,6 +99,9 @@ in
   };
 
   config = {
-    _module.args.pkgs = import ../../.. config.nixpkgs;
+    _module.args = {
+      pkgs = _pkgs;
+      pkgs_i686 = _pkgs.pkgsi686Linux;
+    };
   };
 }

From bdd89faebb2c3d7c291776643de65efbc5172b44 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Apr 2017 12:32:59 -0400
Subject: [PATCH 1548/1744] Revert "openvpn service: source up/down scripts"

This reverts commit 50ad243f7802c09788441fb0099626387fddb2db.
---
 nixos/modules/services/networking/openvpn.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 1e99a2b4450..3fbf5a9f022 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -28,10 +28,9 @@ let
           fi
         done
 
+        ${cfg.up}
         ${optionalString cfg.updateResolvConf
            "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}
-
-        ${optionalString (cfg.up != "") "source ${userSuppliedUpScript}"}
       '';
 
       downScript = ''
@@ -39,15 +38,6 @@ let
         export PATH=${path}
         ${optionalString cfg.updateResolvConf
            "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}
-
-        ${optionalString (cfg.down != "") "source ${userSuppliedDownScript}"}
-      '';
-
-      userSuppliedUpScript = pkgs.writeScript "openvpn-${name}-userSuppliedUpScript" ''
-        ${cfg.up}
-      '';
-
-      userSuppliedDownScript = pkgs.writeScript "openvpn-${name}-userSuppliedDownScript" ''
         ${cfg.down}
       '';
 
@@ -143,7 +133,7 @@ in
             default = "";
             type = types.lines;
             description = ''
-              Shell script sourced by NixOS generated script when the instance is starting.
+              Shell commands executed when the instance is starting.
             '';
           };
 
@@ -151,7 +141,7 @@ in
             default = "";
             type = types.lines;
             description = ''
-              Shell script sourced by NixOS generated script when the instance is shutting down.
+              Shell commands executed when the instance is shutting down.
             '';
           };
 

From 47403cf3866c1bb5498b7fe9f1758f379d9d58ab Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 26 Apr 2017 19:02:17 +0200
Subject: [PATCH 1549/1744] pytest-httpbin: init at 0.2.3

---
 .../python-modules/pytest-httpbin/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-httpbin/default.nix

diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
new file mode 100644
index 00000000000..8818fd04fa1
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, lib
+, fetchurl
+, pythonPackages
+}:
+
+let
+  pname = "pytest-httpbin";
+  version = "0.2.3";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "1y0v2v7xpzpyd4djwp7ad8ifnlxp8r1y6dfbxg5ckzvllkgridn5";
+  };
+
+  buildInputs = with pythonPackages; [ pytest httpbin ];
+  propagatedBuildInputs = [];
+
+  # Tests in neither the archive nor the repo
+  doCheck = false;
+
+  meta = {
+    description = "py.test plugin to store test expectations and mark tests based on them";
+    homepage = https://github.com/gsnedders/pytest-expect;
+    license = lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75635111049..4ab2229ab7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5191,6 +5191,8 @@ in {
     };
   };
 
+  pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
+
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
     src = pkgs.fetchurl {

From 87ce1e73a5e032b1b6874266fb4086f9809a97b9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 26 Apr 2017 19:35:22 +0200
Subject: [PATCH 1550/1744] pythonPackages.coveralls: init at 1.1

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

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
new file mode 100644
index 00000000000..d2c621de43c
--- /dev/null
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, lib
+, fetchurl
+, pythonPackages
+}:
+
+let
+  pname = "coveralls";
+  version = "1.1";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+  };
+
+  buildInputs = with pythonPackages; [
+    coverage
+    docopt
+    requests
+  ];
+  propagatedBuildInputs = [];
+
+  # Tests in neither the archive nor the repo
+  doCheck = false;
+
+  meta = {
+    description = "py.test plugin to store test expectations and mark tests based on them";
+    homepage = https://github.com/gsnedders/pytest-expect;
+    license = lib.licenses.mit;
+  };
+}
+
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ab2229ab7e..c9a3da94894 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4388,6 +4388,8 @@ in {
     };
   };
 
+  coveralls = callPackage ../development/python-modules/coveralls { };
+
   coverage = buildPythonPackage rec {
     name = "coverage-4.0.1";
 

From 7735348d77a004e752bb26100117d5c4920f31d0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 12:41:28 +0200
Subject: [PATCH 1551/1744] pythonPackages.vcrpy: init at 1.10.5

---
 .../python-modules/vcrpy/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  8 ++++--
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/vcrpy/default.nix

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
new file mode 100644
index 00000000000..a5a17cb7dd9
--- /dev/null
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -0,0 +1,28 @@
+{ lib, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  version = "1.10.5";
+  name = "vcrpy-${version}";
+
+  src = pkgs.fetchurl {
+    url = "mirror://pypi/v/vcrpy/vcrpy-${version}.tar.gz";
+    sha256 = "12kncg6jyvj15mi8ca74514f2x1ih753nhyz769nwvh39r468167";
+  };
+
+  buildInputs = with pythonPackages; [
+    pyyaml
+    mock
+    contextlib2
+    wrapt
+    pytest_27
+    httpbin
+    pytest-httpbin
+  ];
+
+  meta = with lib; {
+    description = "Automatically mock your HTTP interactions to simplify and speed up testing";
+    homepage = https://github.com/kevin1024/vcrpy;
+    license = licenses.mit;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9a3da94894..f09dd8a67bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10231,6 +10231,8 @@ in {
     };
   };
 
+  vcrpy = callPackage ../development/python-modules/vcrpy { };
+
   venusian = buildPythonPackage rec {
     name = "venusian-1.0";
 
@@ -13200,9 +13202,9 @@ in {
       license = with licenses; [ lgpl21 ];
     };
   };
-  
+
   iso-639 = callPackage ../development/python-modules/iso-639 {};
-  
+
   iso3166 = callPackage ../development/python-modules/iso3166 {};
 
   iso8601 = buildPythonPackage rec {
@@ -15612,7 +15614,7 @@ in {
 
     patches = [
       (pkgs.fetchpatch {
-        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; 
+        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
         sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7";
       })
     ];

From 7213b3bbdf5f9c5a1c5708787074ed12f51999ad Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Apr 2017 12:41:51 +0200
Subject: [PATCH 1552/1744] rtv: 1.14.1 -> 1.15.1

---
 pkgs/applications/misc/rtv/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 20f8df8da48..289dedf35aa 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.14.1";
+  version = "1.15.1";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a";
+    sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -20,6 +20,15 @@ pythonPackages.buildPythonApplication rec {
     praw
     kitchen
     praw
+    vcrpy
+    pylint
+    coverage
+    pytest
+    coveralls
+    contextlib2
+    backports_functools_lru_cache
+    pyyaml
+    docopt
   ] ++ lib.optional (!pythonPackages.isPy3k) futures;
 
   meta = with lib; {

From 139b1377d4f9a8c943af79dd245ea9ecf6536567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 26 Apr 2017 20:20:36 +0200
Subject: [PATCH 1553/1744] generic Haskell builder: Don't call `stack setup`.

`stack setup` should not be called inside `nix-build` because
that makes stack download a GHC instead of using nix's one
(the one provided `generic-stack-builder.nix` as the `ghc` argument),
which will not work.
Further evidence for this is that the `stack --nix` support
intentionally uses `--system-ghc` for the same purpose.
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 1a16cf3683f..53772b90dfb 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (args // {
 
   configurePhase = args.configurePhase or ''
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
-    stack setup
   '';
 
   buildPhase = args.buildPhase or "stack build";

From d3bf2afc5425127170dc7b71d4aee9cda544f83b Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Wed, 26 Apr 2017 21:54:15 +0200
Subject: [PATCH 1554/1744] fetchdarcs: add SSL_CERT_FILE environment variable

---
 pkgs/build-support/fetchdarcs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 2644a20d0a5..c28cc35219c 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,10 +1,13 @@
-{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
+{stdenv, darcs, nix, cacert}:
+
+{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
 
 if md5 != "" then
   throw "fetchdarcs does not support md5 anymore, please use sha256"
 else
 stdenv.mkDerivation {
   name = "fetchdarcs";
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   builder = ./builder.sh;
   buildInputs = [darcs];
 

From da6c83aa3b5be3225b262b3c8117d5e0d619a152 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Wed, 26 Apr 2017 16:32:15 -0400
Subject: [PATCH 1555/1744] log4shib: init at 1.0.9

Required by the Shibboleth Service Provider Package
---
 .../development/libraries/log4shib/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  8 +++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/log4shib/default.nix

diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
new file mode 100644
index 00000000000..f9b68e1a0cf
--- /dev/null
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchgit, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "log4shib-${version}";
+  version = "1.0.9";
+
+  src = fetchgit {
+    url = "https://git.shibboleth.net/git/cpp-log4shib.git";
+    rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85";
+    sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    description = "A forked version of log4cpp that has been created for the Shibboleth project";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f7d6ea92b5..c77d29e225c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3380,7 +3380,7 @@ with pkgs;
   paper-gtk-theme = callPackage ../misc/themes/paper { };
 
   paperwork = callPackage ../applications/office/paperwork { };
- 
+
   papertrail = callPackage ../tools/text/papertrail { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
@@ -9051,6 +9051,8 @@ with pkgs;
 
   log4cplus = callPackage ../development/libraries/log4cplus { };
 
+  log4shib = callPackage ../development/libraries/log4shib { };
+
   loudmouth = callPackage ../development/libraries/loudmouth { };
 
   luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
@@ -9607,8 +9609,8 @@ with pkgs;
 
     libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
 
-    libqtav = callPackage ../development/libraries/libqtav { 
-      libva = libva-full; # also wants libva-x11 
+    libqtav = callPackage ../development/libraries/libqtav {
+      libva = libva-full; # also wants libva-x11
     };
 
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {

From 7267ae5e1dbf3b6077ebf9be2a269c9d6efa8529 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Wed, 26 Apr 2017 16:42:39 -0400
Subject: [PATCH 1556/1744] xml-tooling-c: init at 1.6.0

Required by the Shibboleth Service Provider
---
 .../libraries/xml-tooling-c/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/xml-tooling-c/default.nix

diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
new file mode 100644
index 00000000000..cc9b479a89c
--- /dev/null
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, autoreconfHook, boost, curl, openssl, log4shib, xercesc, xml-security-c }:
+
+stdenv.mkDerivation rec {
+  name = "xml-tooling-c-${version}";
+  version = "1.6.0";
+
+  src = fetchgit {
+    url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
+    rev = "db08101c3854518a59096be95ed6564838381744";
+    sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq";
+  };
+
+  buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c77d29e225c..c4200bb6137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10286,6 +10286,8 @@ with pkgs;
 
   xml-security-c = callPackage ../development/libraries/xml-security-c { };
 
+  xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { };
+
   xlslib = callPackage ../development/libraries/xlslib { };
 
   xvidcore = callPackage ../development/libraries/xvidcore { };

From d169a9c6192f154b0c0fec11f85af344544b6b24 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Wed, 26 Apr 2017 16:52:13 -0400
Subject: [PATCH 1557/1744] opensaml-cpp: init at 2.6.0

Required by the Shibboleth Service Provider
---
 .../libraries/opensaml-cpp/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/opensaml-cpp/default.nix

diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
new file mode 100644
index 00000000000..7a154c74239
--- /dev/null
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "opensaml-cpp-${version}";
+  version = "2.6.0";
+
+  src = fetchgit {
+    url = "https://git.shibboleth.net/git/cpp-opensaml.git";
+    rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77";
+    sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr";
+  };
+
+  buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
+
+  meta = {
+    home = https://shibboleth.net/products/opensaml-cpp.html;
+    description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4200bb6137..610e85a7334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9312,6 +9312,8 @@ with pkgs;
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
   openjpeg = openjpeg_2_1;
 
+  opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
+
   openscenegraph = callPackage ../development/libraries/openscenegraph { };
 
   openslp = callPackage ../development/libraries/openslp {};

From e89343dc08ca27cbfc94ef964a2004d5db825411 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Apr 2017 12:06:26 +0800
Subject: [PATCH 1558/1744] qsyncthingtray: allow building with qt 5.8

---
 pkgs/applications/misc/qsyncthingtray/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 4f95879d5eb..c314a226b26 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -36,9 +36,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = let qst = "qsyncthingtray"; in ''
+    runHook preInstall
+
     mkdir -p $out/bin
     install -m755 QSyncthingTray $out/bin/${qst}
     ln -s $out/bin/${qst} $out/bin/QSyncthingTray
+    wrapQtProgram $out/bin/qsyncthingtray
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -52,6 +57,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ zraexy peterhoeg ];
     platforms = platforms.all;
-    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
+    # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
+    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f7d6ea92b5..3be611430f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15251,8 +15251,8 @@ with pkgs;
     qt = qt4;
   };
 
-  # 0.5.7 segfaults when opening the main panel with qt 5.7
-  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
+  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 

From 268e88830c06846a2aa614697593bc018c1d1dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 07:39:32 +0200
Subject: [PATCH 1559/1744] rtv: enable tests; split of test dependencies

---
 pkgs/applications/misc/rtv/default.nix | 44 ++++++++++++++++----------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 289dedf35aa..e8b3eeda01a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, pkgs, pythonPackages }:
 
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+buildPythonApplication rec {
   version = "1.15.1";
   name = "rtv-${version}";
 
@@ -11,27 +12,36 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  checkPhase = ''
+    py.test
+  '';
+
+  buildInputs = [
+    coverage
+    coveralls
+    docopt
+    mock
+    pylint
+    pytest
+    vcrpy
+  ];
+
+  propagatedBuildInputs = [
+    backports_functools_lru_cache
     beautifulsoup4
+    configparser
+    contextlib2
+    decorator
+    kitchen
     mailcap-fix
-    tornado
+    mccabe
     requests2
     six
-    praw
-    kitchen
-    praw
-    vcrpy
-    pylint
-    coverage
-    pytest
-    coveralls
-    contextlib2
-    backports_functools_lru_cache
+    tornado
     pyyaml
-    docopt
-  ] ++ lib.optional (!pythonPackages.isPy3k) futures;
+  ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
     license = licenses.mit;

From dbed1169894285790fed68cbab16e2bf852ecf2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 07:40:38 +0200
Subject: [PATCH 1560/1744] pythonPackages.kitchen: 1.1.1 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
new file mode 100644
index 00000000000..6464696ff8f
--- /dev/null
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "kitchen";
+  version = "1.2.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Kitchen contains a cornucopia of useful code";
+    license = license.lgpl;
+    maintainers = with maintainers; [ mornfall ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f09dd8a67bf..5ce43568364 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13593,17 +13593,7 @@ in {
     };
   };
 
-  kitchen = buildPythonPackage (rec {
-    name = "kitchen-1.1.1";
-    disabled = isPy3k;
-
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/kitchen/kitchen-1.1.1.tar.gz";
-      sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5";
-    };
-  });
+  kitchen = callPackage ../development/python-modules/kitchen/default.nix { };
 
   pylast = buildPythonPackage rec {
     name = "pylast-${version}";

From e66c9221d6ebea2e79c9a3a27643dc32429f2c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 08:24:07 +0200
Subject: [PATCH 1561/1744] pythonPackages.httpbin: 0.2.0 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
new file mode 100644
index 00000000000..72917fdd771
--- /dev/null
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, flask
+, markupsafe
+, decorator
+, itsdangerous
+, six }:
+
+buildPythonPackage rec {
+  pname = "httpbin";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
+  };
+
+  propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kennethreitz/httpbin;
+    description = "HTTP Request & Response Service";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ce43568364..6406606e38d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12721,23 +12721,7 @@ in {
     };
   });
 
-  httpbin = buildPythonPackage rec {
-    name = "httpbin-0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/httpbin/${name}.tar.gz";
-      sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
-    };
-
-    propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ];
-
-    meta = {
-      homepage = https://github.com/kennethreitz/httpbin;
-      description = "HTTP Request & Response Service";
-      license = licenses.mit;
-    };
-
-  };
+  httpbin = callPackage ../development/python-modules/httpbin { };
 
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.9.2";

From c7975509573a75e579a09bf6460a8a7e98217ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 08:24:55 +0200
Subject: [PATCH 1562/1744] pythonPackages.pytest-httpbin: correct `meta`;
 tests

---
 .../python-modules/pytest-httpbin/default.nix | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 8818fd04fa1..a31c9ba35bb 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -1,29 +1,35 @@
 { buildPythonPackage
 , lib
-, fetchurl
-, pythonPackages
+, fetchFromGitHub
+, pytest
+, flask
+, decorator
+, httpbin
+, six
+, requests2
 }:
 
-let
-  pname = "pytest-httpbin";
+buildPythonPackage rec {
+  name = "pytest-httpbin-${version}";
   version = "0.2.3";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "1y0v2v7xpzpyd4djwp7ad8ifnlxp8r1y6dfbxg5ckzvllkgridn5";
+  src = fetchFromGitHub {
+    owner = "kevin1024";
+    repo = "pytest-httpbin";
+    rev = "v${version}";
+    sha256 = "0j3n12jjy8cm0va8859wqra6abfyajrgh2qj8bhcngf3a72zl9ks";
   };
 
-  buildInputs = with pythonPackages; [ pytest httpbin ];
-  propagatedBuildInputs = [];
+  checkPhase = ''
+    py.test -k "not test_chunked_encoding"
+  '';
 
-  # Tests in neither the archive nor the repo
-  doCheck = false;
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ flask decorator httpbin six requests2 ];
 
   meta = {
-    description = "py.test plugin to store test expectations and mark tests based on them";
-    homepage = https://github.com/gsnedders/pytest-expect;
+    description = "Easily test your HTTP library against a local copy of httpbin.org";
+    homepage = https://github.com/kevin1024/pytest-httpbin;
     license = lib.licenses.mit;
   };
 }

From 237d61939de60d114356d3fa7fc61019dc0ce1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 08:29:59 +0200
Subject: [PATCH 1563/1744] pythonPackages.vcrpy: enable tests

---
 .../python-modules/vcrpy/default.nix          | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index a5a17cb7dd9..c925649b8b2 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -1,6 +1,17 @@
-{ lib, pkgs, pythonPackages }:
+{ buildPythonPackage
+, lib
+, pkgs
+, pyyaml
+, mock
+, contextlib2
+, wrapt
+, pytest_27
+, httpbin
+, pytest-httpbin
+, yarl
+}:
 
-pythonPackages.buildPythonPackage rec {
+buildPythonPackage rec {
   version = "1.10.5";
   name = "vcrpy-${version}";
 
@@ -9,7 +20,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "12kncg6jyvj15mi8ca74514f2x1ih753nhyz769nwvh39r468167";
   };
 
-  buildInputs = with pythonPackages; [
+  buildInputs = [
     pyyaml
     mock
     contextlib2
@@ -17,8 +28,13 @@ pythonPackages.buildPythonPackage rec {
     pytest_27
     httpbin
     pytest-httpbin
+    yarl
   ];
 
+  checkPhase = ''
+    py.test --ignore=tests/integration -k "TestVCRConnection.testing_connect"
+  '';
+
   meta = with lib; {
     description = "Automatically mock your HTTP interactions to simplify and speed up testing";
     homepage = https://github.com/kevin1024/vcrpy;

From 3d10db7bc80e2ebd985b0bc0046dd264a42c45b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 09:01:58 +0200
Subject: [PATCH 1564/1744] pythonPackages.coveralls: correct description

---
 .../python-modules/coveralls/default.nix      | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index d2c621de43c..59f66f36d87 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -1,33 +1,49 @@
 { buildPythonPackage
 , lib
-, fetchurl
-, pythonPackages
+, fetchPypi
+, mock
+, pytest_27
+, sh
+, coverage
+, docopt
+, requests2
+, git
 }:
 
-let
+buildPythonPackage rec {
   pname = "coveralls";
+  name = "${pname}-python-${version}";
   version = "1.1";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  # wanted by tests
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
   };
 
-  buildInputs = with pythonPackages; [
-    coverage
-    docopt
-    requests
+  buildInputs = [
+    mock
+    sh
+    pytest_27
+    git
   ];
-  propagatedBuildInputs = [];
 
-  # Tests in neither the archive nor the repo
+  # FIXME: tests requires .git directory to be present
   doCheck = false;
 
+  checkPhase = ''
+    python setup.py test
+  '';
+
+  propagatedBuildInputs = [
+    coverage
+    docopt
+    requests2
+  ];
+
   meta = {
-    description = "py.test plugin to store test expectations and mark tests based on them";
-    homepage = https://github.com/gsnedders/pytest-expect;
+    description = "Show coverage stats online via coveralls.io";
+    homepage = https://github.com/coveralls-clients/coveralls-python;
     license = lib.licenses.mit;
   };
 }

From 9079676fe1dda3624b77536200653fb25b541cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 09:07:38 +0200
Subject: [PATCH 1565/1744] pythonPackages.kitchen: fix evaluation error

---
 pkgs/development/python-modules/kitchen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index 6464696ff8f..895cdedcb6e 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Kitchen contains a cornucopia of useful code";
-    license = license.lgpl;
+    license = licenses.lgpl2;
     maintainers = with maintainers; [ mornfall ];
   };
 }

From 7c918ff7d47f5cadfb3946745a876f6f4778060d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Thu, 27 Apr 2017 07:55:34 +0000
Subject: [PATCH 1566/1744] virtualisation-xen: Fix xendomains startup * Revert
 to using bash, not sh for the xendomains script to avoid syntax error *
 Rewrite /bin/ls to ls in the xendomains script

---
 pkgs/applications/virtualization/xen/generic.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 953368b7e3b..bfce2cd6ae4 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -107,7 +107,8 @@ stdenv.mkDerivation (rec {
     # We want to do this before getting prefetched stuff to speed things up
     # (prefetched stuff has lots of files)
     find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g'
-    find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g'
+    find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \
+      | xargs sed -i 's@/bin/bash@/bin/sh@g'
 
     # Get prefetched stuff
     ${withXenfiles (name: x: ''
@@ -171,6 +172,11 @@ stdenv.mkDerivation (rec {
     ${config.postPatch or ""}
   '';
 
+  postConfigure = ''
+    substituteInPlace tools/hotplug/Linux/xendomains \
+      --replace /bin/ls ls
+  '';
+
   # TODO: Flask needs more testing before enabling it by default.
   #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
   makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]

From 39788cecba525840dcee924799bdfa0bb321c603 Mon Sep 17 00:00:00 2001
From: Azul <mail@azulinho.com>
Date: Thu, 27 Apr 2017 10:14:56 +0100
Subject: [PATCH 1567/1744] marathon: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 914ca259675..6bceeefc37a 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
+    sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];

From 785d008511e7812ddc133ae1a7191f9402f9de33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Apr 2017 13:16:18 +0200
Subject: [PATCH 1568/1744] libhttpseverywhere: 0.2.10 -> 0.4.2

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 1e60a63fe06..961b8a77670 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
 
 stdenv.mkDerivation rec {
-  major = "0.2";
-  minor = "10";
+  major = "0.4";
+  minor = "2";
   version = "${major}.${minor}";
 
   name = "libhttpseverywhere-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa";
+    sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     mkdir build
     cd build
-    meson.py --prefix "$out" ..
+    meson --prefix "$out" ..
   '';
 
   buildPhase = ''

From cd2b04484761aee1418013e274af7b137bc2c078 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Apr 2017 08:30:30 -0400
Subject: [PATCH 1569/1744] kotlin: 1.1.1 -> 1.1.2

---
 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 508ac254f0a..ca788a57c7c 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
+  version = "1.1.2";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc";
+    sha256 = "0kngyv5qjjpd93i1b8gn1vw6r8p52lfjrqa2f13nf06v9aqk0vfb";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 31c4498a471f1336736d56fce1ecce74ed77b86c Mon Sep 17 00:00:00 2001
From: Kirill <elephanttalk@protonmail.com>
Date: Thu, 27 Apr 2017 17:13:27 +0300
Subject: [PATCH 1570/1744] Fix indentation. Fix openPorts option default to
 false.

---
 nixos/modules/misc/ids.nix                  |  4 +-
 nixos/modules/services/networking/aria2.nix | 46 ++++++++++-----------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 91d7e92fd50..dafc923b000 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -290,7 +290,7 @@
       geoip = 272;
       fcron = 273;
       aria2 = 274;
-	  
+
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
       nixbld = 30000; # start of range of uids
@@ -548,7 +548,7 @@
       #rpc = 271; # unused
       #geoip = 272; # unused
       fcron = 273;
-	  aria2 = 274;
+      aria2 = 274;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index d436fc3e00c..ad4ac9bf45e 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -36,30 +36,29 @@ in
 
           Targets are downloaded to ${downloadDir} by default and are
           accessible to users in the "aria2" group.
-          '';
+        '';
       };
       openPorts = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
-          Open the ports in the firewall. Defaults are:
-          - UDP 6881-6999 for transfers
-          - TCP 6800 for RPC
-          '';
+          Open listen and RPC ports found in listenPortRange and rpcListenPort
+          options in the firewall.
+        '';
       };
       downloadDir = mkOption {
         type = types.string;
         default = "${downloadDir}";
         description = ''
           Directory to store downloaded files.
-          '';
+        '';
       };
       listenPortRange = mkOption {
         type = types.listOf types.attrs;
         default = [ { from = 6881; to = 6999; } ];
         description = ''
           Set UDP listening port range used by DHT(IPv4, IPv6) and UDP tracker.
-          '';
+        '';
       };
       rpcListenPort = mkOption {
         type = types.int;
@@ -72,21 +71,21 @@ in
         description = ''
           Set RPC secret authorization token.
           Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used.
-          '';
+        '';
       };
       extraArguments = mkOption {
         type = types.string;
-        example = "--rpc-secret=12345 --enable-rpc --rpc-listen-all";
+        example = "--rpc-listen-all --remote-time=true";
         default = "";
         description = ''
           Additional arguments to be passed to Aria2.
-          '';
+        '';
       };
     };
   };
 
   config = mkIf cfg.enable {
-    
+
     # Need to open ports for proper functioning
     networking.firewall = mkIf cfg.openPorts {
       allowedUDPPortRanges = config.services.aria2.listenPortRange;
@@ -109,17 +108,17 @@ in
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         mkdir -m 0770 -p "${homeDir}"
-				chown aria2:aria2 "${homeDir}"
+        chown aria2:aria2 "${homeDir}"
         if [[ ! -d "${config.services.aria2.downloadDir}" ]]
-				then 
-					mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
-					chown aria2:aria2 "${config.services.aria2.downloadDir}"
-				fi
+        then 
+          mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
+          chown aria2:aria2 "${config.services.aria2.downloadDir}"
+        fi
         if [[ ! -e "${sessionFile}" ]]
-				then 
-					touch "${sessionFile}"
-					chown aria2:aria2 "${sessionFile}"
-				fi
+        then 
+          touch "${sessionFile}"
+          chown aria2:aria2 "${sessionFile}"
+        fi
         cp -f "${settingsFile}" "${settingsDir}/aria2.conf"
       '';
 
@@ -129,9 +128,8 @@ in
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = "aria2";
         Group = "aria2";
-				PermissionsStartOnly = true;
+        PermissionsStartOnly = true;
       };
     };
   };
-}
-
+}
\ No newline at end of file

From 41e04f43dcb556d8c6abb350e3b0761ae4202635 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 27 Apr 2017 09:22:31 -0500
Subject: [PATCH 1571/1744] dropbox: 24.4.16 -> 24.4.17

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 2d0d194206d..a4bbe15544a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "24.4.16";
+  version = "24.4.17";
   sha256 =
     {
-      "x86_64-linux" = "01hnx52ag7wfclxnqzs9m09pnmisz9lczxgg3wm47qmwhagnb8la";
-      "i686-linux"   = "1cr0vfjwn60xdv2kh6kmmgf6g0s2y9mqklbfah59pm7k2yr2pvnf";
+      "x86_64-linux" = "1wjr92vrbxyjbwyqf134h8fp1zi4d5wyyirii545wqadbgg9grh9";
+      "i686-linux"   = "1qsdidpy251irzkv0hx0ch0xnrwq6wq6b22g0n8b9d0a7xi08k7h";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From dfcc8dd48c06ec130bcc9d46be461513ad687d66 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Wed, 26 Apr 2017 17:08:46 -0400
Subject: [PATCH 1572/1744] shibboleth-sp: init at 2.6.0

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

diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
new file mode 100644
index 00000000000..05b12c31769
--- /dev/null
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
+
+stdenv.mkDerivation rec {
+  name = "shibboleth-sp-${version}";
+  version = "2.6.0";
+
+  src = fetchgit {
+    url = "https://git.shibboleth.net/git/cpp-sp.git";
+    rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509";
+    sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj";
+  };
+
+  # Needs pkgconfig to find systemd
+  buildInputs = [ boost fcgi openssl opensaml-cpp log4shib pkgconfig xercesc xml-security-c xml-tooling-c ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = [
+    "--without-apxs"
+    "--with-xmltooling=${xml-tooling-c}"
+    "--with-saml=${opensaml-cpp}"
+    "--with-fastcgi"
+  ];
+
+  meta = {
+    home = https://shibboleth.net/products/service-provider.html;
+    description = "Enables SSO and Federation web applications written with any programming language or framework";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 610e85a7334..7616e0b4ac2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9839,6 +9839,8 @@ with pkgs;
 
   shapelib = callPackage ../development/libraries/shapelib { };
 
+  shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
+
   skalibs = callPackage ../development/libraries/skalibs { };
 
   slang = callPackage ../development/libraries/slang { };

From e46fee977728a56a800c0d4532b055b59e6ddec1 Mon Sep 17 00:00:00 2001
From: Dmitry Tsygankov <dmitry.tsygankov@gmail.com>
Date: Thu, 27 Apr 2017 08:16:38 -0700
Subject: [PATCH 1573/1744] bitcoin-unlimited: 1.0.1.3 -> 1.0.1.4 (security)

Bump up the version, so that the fix for the latest vulnerability is included.

https://github.com/BitcoinUnlimited/BitcoinUnlimited/blob/v1.0.1.4/doc/release-notes/release-notes-1.0.1.4.md
---
 pkgs/applications/altcoins/bitcoin-unlimited.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index b6d0739c6bf..597e74a34d0 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.1.3";
+  version = "1.0.1.4";
 
   src = fetchFromGitHub {
     owner = "bitcoinunlimited";
     repo = "bitcoinunlimited";
-    rev = "${version}";
-    sha256 = "177l2jf2yqxh3sgf80dhgyk3wgjdnqszy3hb83clk8q1wyjkfz7y";
+    rev = "v${version}";
+    sha256 = "1awsgkgqvb57grrsq6k99009rzhpfaplh2lbf5sy36v3bh7p5mw5";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From b9371e83e40ee833b25fc8855f003c2cc3508d86 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 27 Apr 2017 17:11:17 +0200
Subject: [PATCH 1574/1744] wordpress: 4.7.3 -> 4.7.4

See: https://wordpress.org/news/2017/04/wordpress-4-7-4/
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 2d247148aee..878e8480bb9 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,8 +2,8 @@
 { fetchFromGitHub, lib } : fetchFromGitHub {
   owner = "WordPress";
   repo = "WordPress";
-  rev = "4.7.3";
-  sha256 = "05gggm40065abylp6bdc0zn0q6ahcggyh4q6rk0ak242q8v5fm5b";
+  rev = "4.7.4";
+  sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri";
   meta = {
     homepage = https://wordpress.org;
     description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";

From e289b94fbe771ad9afdd43750087108330745b53 Mon Sep 17 00:00:00 2001
From: Andrew Martin <andrew.thaddeus@gmail.com>
Date: Thu, 27 Apr 2017 11:33:42 -0400
Subject: [PATCH 1575/1744] graphite service: no recursive chown when starting
 (#24442)

Fixes #24444
---
 nixos/modules/services/monitoring/graphite.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 98931e65bb5..6b24ac2c7c6 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -400,7 +400,8 @@ in {
 
           mkdir -p ${cfg.dataDir}/whisper
           chmod 0700 ${cfg.dataDir}/whisper
-          chown -R graphite:graphite ${cfg.dataDir}
+          chown graphite:graphite ${cfg.dataDir}
+          chown graphite:graphite ${cfg.dataDir}/whisper
         '';
       };
     })
@@ -487,9 +488,11 @@ in {
             # create index
             ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
 
-            touch ${dataDir}/db-created
+            chown graphite:graphite ${cfg.dataDir}
+            chown graphite:graphite ${cfg.dataDir}/whisper
+            chown -R graphite:graphite ${cfg.dataDir}/log
 
-            chown -R graphite:graphite ${cfg.dataDir}
+            touch ${dataDir}/db-created
           fi
         '';
       };
@@ -526,9 +529,10 @@ in {
             mkdir -p ${dataDir}/cache/
             chmod 0700 ${dataDir}/cache/
 
-            touch ${dataDir}/db-created
+            chown graphite:graphite ${cfg.dataDir}
+            chown -R graphite:graphite ${cfg.dataDir}/cache
 
-            chown -R graphite:graphite ${cfg.dataDir}
+            touch ${dataDir}/db-created
           fi
         '';
       };
@@ -549,7 +553,7 @@ in {
         preStart = ''
           if ! test -e ${dataDir}/db-created; then
             mkdir -p ${dataDir}
-            chown -R graphite:graphite ${dataDir}
+            chown graphite:graphite ${dataDir}
           fi
         '';
       };

From e61b4bbd0cb4ee0cd3d44db0dd5c8edc10ca8aab Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 27 Apr 2017 10:41:53 -0500
Subject: [PATCH 1576/1744] terraform: 0.9.3 => 0.9.4

---
 .../networking/cluster/terraform/default.nix          | 11 ++++-------
 pkgs/top-level/all-packages.nix                       |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 76984fed340..c89f871b1c5 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -37,7 +37,6 @@ let
         maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
       };
     } // attrs');
-
 in {
   terraform_0_8_5 = generic {
     version = "0.8.5";
@@ -49,15 +48,13 @@ in {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_3 = generic {
-    version = "0.9.3";
-    sha256 = "00z72lwv0cprz1jjy0cr8dicl00zwc1zwsxzjssqnq0187sswkxw";
-
+  terraform_0_9_4 = generic {
+    version   = "0.9.4";
+    sha256    = "07vcmjyl0y48hm5lqqzdd51hmrxapvywzbdkg5f3rcqd7dn9c2xs";
     postPatch = ''
       rm builtin/providers/dns/data_dns_cname_record_set_test.go
       rm builtin/providers/vsphere/resource_vsphere_file_test.go
     '';
-
-    doCheck = true;
+    doCheck   = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3be611430f6..1125ec02b4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18268,10 +18268,10 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_3;
+    terraform_0_9_4;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_3;
+  terraform_0_9 = terraform_0_9_4;
   terraform = terraform_0_9;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {

From de688d90ba981497fb5a8d208351115c5ef7adef Mon Sep 17 00:00:00 2001
From: Azul <mail@azulinho.com>
Date: Thu, 27 Apr 2017 10:13:15 +0100
Subject: [PATCH 1577/1744] mesos: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 651d00e5710..a7cc5d78938 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -22,7 +22,7 @@ let
   });
 
 in stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.1.1";
   name = "mesos-${version}";
 
   enableParallelBuilding = true;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "1hdjd4syyp88l0bnh88bhzvn9466ad2ysfp9pq3kwj3qzwg5jv8g";
+    sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115";
   };
 
   patches = [

From 0d726295703537c074b5a19d9b463ceca9a5cecc Mon Sep 17 00:00:00 2001
From: Judson Lester <nyarly@users.noreply.github.com>
Date: Thu, 27 Apr 2017 09:01:48 -0700
Subject: [PATCH 1578/1744] nixos/display-managers: Quote "$vars" (#25199)

---
 nixos/modules/services/x11/display-managers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 4e2c0e01ca0..a7dfe7ee154 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -33,7 +33,7 @@ let
       #! ${pkgs.bash}/bin/bash
 
       # Handle being called by SDDM.
-      if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
+      if test "''${1:0:1}" = / ; then eval exec "$1" "$2" ; fi
 
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then
@@ -115,7 +115,7 @@ let
       : ''${desktopManager:=${cfg.desktopManager.default}}
 
       # Start the window manager.
-      case $windowManager in
+      case "$windowManager" in
         ${concatMapStrings (s: ''
           (${s.name})
             ${s.start}
@@ -125,7 +125,7 @@ let
       esac
 
       # Start the desktop manager.
-      case $desktopManager in
+      case "$desktopManager" in
         ${concatMapStrings (s: ''
           (${s.name})
             ${s.start}

From e6c76af4803f4fb86b0c9543d70f8b64e02581a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 27 Apr 2017 10:40:26 -0500
Subject: [PATCH 1579/1744] plasma5: 5.9.4 -> 5.9.5

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index cf9327d7a60..3553d0f01ea 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.4/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index c156de40cae..8a19b561e2c 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/bluedevil-5.9.4.tar.xz";
-      sha256 = "1a31vsaiy7kzbw79kjiia5a966xc9ba3phxhyqmdzvllf9jw5xdc";
-      name = "bluedevil-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/bluedevil-5.9.5.tar.xz";
+      sha256 = "0szdfim94c9zjq6jl7n6xpnxf7c4b62wk5b6vv1yfday51gi643r";
+      name = "bluedevil-5.9.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/breeze-5.9.4.tar.xz";
-      sha256 = "07i13g9iyq9j2vx22z7krnkahil3qljxpzgmqai8m67gwhgvn1zj";
-      name = "breeze-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/breeze-5.9.5.tar.xz";
+      sha256 = "0g9y0lsx5c3r7qzrdxbanya86lqkbaf5f7has736nqw28a2jncc3";
+      name = "breeze-5.9.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/breeze-grub-5.9.4.tar.xz";
-      sha256 = "0rn7dgmw495575lcsnlgvx8r8sjjaaw3b1s0l43d2r186zay0nkr";
-      name = "breeze-grub-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/breeze-grub-5.9.5.tar.xz";
+      sha256 = "02ml0v3srim4vdw1bwycb3wi6ijdvmf1ph0my3w5ci1k5fj402s4";
+      name = "breeze-grub-5.9.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/breeze-gtk-5.9.4.tar.xz";
-      sha256 = "1xjrhi6cq5dd5qslphdjrg018ni1z9xdac7cg33wl8bsvzcl0xgl";
-      name = "breeze-gtk-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/breeze-gtk-5.9.5.tar.xz";
+      sha256 = "0na40qrgyml0fc3p8lgxls4zy7ifigns0594q9i3jwfz1izsiprj";
+      name = "breeze-gtk-5.9.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/breeze-plymouth-5.9.4.tar.xz";
-      sha256 = "1vwlvnbsc67xzqvrpgkva1rlim075x9ffjlsxfk38gmq00b7s88g";
-      name = "breeze-plymouth-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/breeze-plymouth-5.9.5.tar.xz";
+      sha256 = "1fnqq4f7pr7bwfgrgk1d2qjai178lxsfsxr1jjdx61wrn1fnc3yk";
+      name = "breeze-plymouth-5.9.5.tar.xz";
     };
   };
   discover = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/discover-5.9.4.tar.xz";
-      sha256 = "1pf2qawa32x94ljqscfbpmkbxk5awlqbf9jw9w7rfqwd5z9cgzzf";
-      name = "discover-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/discover-5.9.5.tar.xz";
+      sha256 = "0846xskdy0sv9p76i78cbj7qy2xcq90lir78haiy6s8pfnxc27i3";
+      name = "discover-5.9.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kactivitymanagerd-5.9.4.tar.xz";
-      sha256 = "04i4zmbblsx3xz3vq4m88qd3ky0r5v26ivjchzpcpgkczqv85x1j";
-      name = "kactivitymanagerd-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kactivitymanagerd-5.9.5.tar.xz";
+      sha256 = "0jf0kxwgyc0b3fkr05mz678p99fkr42rljqw57sjq7qhypknzd07";
+      name = "kactivitymanagerd-5.9.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kde-cli-tools-5.9.4.tar.xz";
-      sha256 = "1a2ssv7mphqnzwphd8nkh0g0g4w9b2r0ah0a9wd5ssnr5xg3izm8";
-      name = "kde-cli-tools-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kde-cli-tools-5.9.5.tar.xz";
+      sha256 = "196h4gsfqx1338jps1rkvaabi6zmsncv7ywylqvirn6mxrfq7r2n";
+      name = "kde-cli-tools-5.9.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kdecoration-5.9.4.tar.xz";
-      sha256 = "12cfp4svhxfygbjhymnmwyryx6r117mkdy2iq9adbq5af3gak972";
-      name = "kdecoration-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kdecoration-5.9.5.tar.xz";
+      sha256 = "1vjj8gjh8ig0bxbfjjmyga7rl497yzqdprgpqfkg92g9pxhr2lnl";
+      name = "kdecoration-5.9.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kde-gtk-config-5.9.4.tar.xz";
-      sha256 = "0cg3myr3jr9i4vxpqbd8gs7yrscxn15a96zqvgsbjczlfmxanq86";
-      name = "kde-gtk-config-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kde-gtk-config-5.9.5.tar.xz";
+      sha256 = "1aafc9zrraqz9x830v9fgyygsqy17iwr2hf2vrcn2ffhw6ix47cy";
+      name = "kde-gtk-config-5.9.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kdeplasma-addons-5.9.4.tar.xz";
-      sha256 = "019d3d3pkw1c6l7dggasr7g7yj9kl3xd2hsawch1s9ba420fd6fp";
-      name = "kdeplasma-addons-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kdeplasma-addons-5.9.5.tar.xz";
+      sha256 = "107j3szxslc4cqin2f32y25lbwyi0a6lqsp9739113zr0jjrwlll";
+      name = "kdeplasma-addons-5.9.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kgamma5-5.9.4.tar.xz";
-      sha256 = "0qwgjdrjfc48d8j62iwz6d61nxd7ddcsxn7wmxgbgl3l36p5j0jv";
-      name = "kgamma5-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kgamma5-5.9.5.tar.xz";
+      sha256 = "1kzqix97qh17lfz9ksqywmas630aw0z4y44mcwp34w9gp79i5dj5";
+      name = "kgamma5-5.9.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/khotkeys-5.9.4.tar.xz";
-      sha256 = "0lhgkvnrzsxpw6vpn0xam1a4dgkfb0k9h3nchaf93fyl8745j4q0";
-      name = "khotkeys-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/khotkeys-5.9.5.tar.xz";
+      sha256 = "05y6kbcbalvlrldm9kfkj9aj0r6nbyj1gbj28g37jv58l6qc75d9";
+      name = "khotkeys-5.9.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kinfocenter-5.9.4.tar.xz";
-      sha256 = "14vf27s501r6ac2gxashwi3ynlcncjp03rahz61wry1dsm9wsc4x";
-      name = "kinfocenter-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kinfocenter-5.9.5.tar.xz";
+      sha256 = "0jbi3qavqwvx691biy8gbq4m2c3ksy6p1hpyi41qaaczksr3fvsg";
+      name = "kinfocenter-5.9.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kmenuedit-5.9.4.tar.xz";
-      sha256 = "1lx7g67qc7amx8jsna7b13hhq85pv4969d9824qfciwywj19sx4x";
-      name = "kmenuedit-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kmenuedit-5.9.5.tar.xz";
+      sha256 = "1mfy1z70zfw3x40h8qjp49i7pp5c5fprh7znwwj4hk2qkn1zrn0j";
+      name = "kmenuedit-5.9.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kscreen-5.9.4.tar.xz";
-      sha256 = "1g4i4rwnmni3q3crbywkp0s199bp0bl8cx97d37cp9qh6drsgrxx";
-      name = "kscreen-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kscreen-5.9.5.tar.xz";
+      sha256 = "1df0h1js6b6060cxm27sp70lvk8fak14ibzzrm6f3yv32wlzxwfi";
+      name = "kscreen-5.9.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kscreenlocker-5.9.4.tar.xz";
-      sha256 = "0cn194bmab7qgv1x7gg81l0mj3k9x1is9whn8h7g02pzn5c6gqlj";
-      name = "kscreenlocker-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kscreenlocker-5.9.5.tar.xz";
+      sha256 = "1hf0zgfdgd7vinmbk2k73w6mpfbfv830kqfvw23qk4nrrap131bi";
+      name = "kscreenlocker-5.9.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/ksshaskpass-5.9.4.tar.xz";
-      sha256 = "1w1m55i8i9f3npcczqiy1knarbh2j4cp8ispif1s4j6k3vixqnka";
-      name = "ksshaskpass-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/ksshaskpass-5.9.5.tar.xz";
+      sha256 = "1ilydfc64s2yc5xrqcc0k2s9ijnppql32dkb9cpmwfqi608digi1";
+      name = "ksshaskpass-5.9.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/ksysguard-5.9.4.tar.xz";
-      sha256 = "04hzqkna22vsa12z04cy50s2jzglllfhd5vz33vk2wj6zgghwd0h";
-      name = "ksysguard-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/ksysguard-5.9.5.tar.xz";
+      sha256 = "1dhzkm3rc8rl92ym0mampf49p8ippbpfbwcvwzg6rakhxxifd4q6";
+      name = "ksysguard-5.9.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kwallet-pam-5.9.4.tar.xz";
-      sha256 = "0l6ganmp2ml0icfkrqcq4vngm8f4pl76p6w13a3m8x2k2wrsbynw";
-      name = "kwallet-pam-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kwallet-pam-5.9.5.tar.xz";
+      sha256 = "0nchpbw5yxy7vsz3mx1mx5hk36yvwqarnzzigssh1kz1r19jn6rn";
+      name = "kwallet-pam-5.9.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kwayland-integration-5.9.4.tar.xz";
-      sha256 = "11vqi293azv5cpz2rrngxsqqaj7swcmxivgm688yz6wzbm8gyd1x";
-      name = "kwayland-integration-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kwayland-integration-5.9.5.tar.xz";
+      sha256 = "07la7q6dvmysdv6clk2siq1c3b9jbx5kblgc5qf3233bg57hqw7r";
+      name = "kwayland-integration-5.9.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kwin-5.9.4.tar.xz";
-      sha256 = "0qckhk6vd31mwhawb0i636l4vx99v0v84nam2dhpd0rcdk2b0dm1";
-      name = "kwin-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kwin-5.9.5.tar.xz";
+      sha256 = "13f9drny8lxpxmgqmirk7k0zapx6bp74jyxxzh7ii36davlhckjd";
+      name = "kwin-5.9.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/kwrited-5.9.4.tar.xz";
-      sha256 = "1prbn0f6a1cywn2ivzv39bxfc5nxmgxp7gqlxqg87ajig43gvdb7";
-      name = "kwrited-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/kwrited-5.9.5.tar.xz";
+      sha256 = "1spcsixpcn4g4dm5c1hfqfpkkmma3fgdx0bkm2zzh5q72jzl3bda";
+      name = "kwrited-5.9.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/libkscreen-5.9.4.tar.xz";
-      sha256 = "1h39910ry59wd179fk02ck10ydaby3il4q3rnxlnn9qph0kiy3pv";
-      name = "libkscreen-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/libkscreen-5.9.5.tar.xz";
+      sha256 = "1sq078ri8vz3s4r606n3i9j9cb4drga2mwwa5glkirnazps32004";
+      name = "libkscreen-5.9.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/libksysguard-5.9.4.tar.xz";
-      sha256 = "1gpfqr8prk96vwy9dkxlgf4lc3ck04a31src9mix8a6wrr01ppqm";
-      name = "libksysguard-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/libksysguard-5.9.5.tar.xz";
+      sha256 = "0b0lvpss5sdjnxbrwaa5w7x87mzpbk23n2ly5vyg6imcycnxh7kw";
+      name = "libksysguard-5.9.5.tar.xz";
     };
   };
   milou = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/milou-5.9.4.tar.xz";
-      sha256 = "18xzx99ml6gcglly9p98rscs6dxhdgn9pkc5mn7apwnp7865kbfw";
-      name = "milou-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/milou-5.9.5.tar.xz";
+      sha256 = "1qzqa26sxggpqw4jkrjasf20xfijpjyjg7x96bvbjs1gcp1fi9gw";
+      name = "milou-5.9.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/oxygen-5.9.4.tar.xz";
-      sha256 = "0fmysq3j0v18hz6hfp7qgrj3ghmaf3c1gam9c9263sf9q1dghk0q";
-      name = "oxygen-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/oxygen-5.9.5.tar.xz";
+      sha256 = "0p73dyyg887by1yi8gjaj366l7vm0p19z10m5fkmhylhmzihv4z3";
+      name = "oxygen-5.9.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-desktop-5.9.4.tar.xz";
-      sha256 = "1p3iq5rmfznsi4174zjavs945wysf763ha46vd83mz0w7583j6cd";
-      name = "plasma-desktop-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-desktop-5.9.5.tar.xz";
+      sha256 = "1f9mq7q05abj6xgpchzkhghs0mwf7qycjvg3l4c7y7p9hsn3gx71";
+      name = "plasma-desktop-5.9.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-integration-5.9.4.tar.xz";
-      sha256 = "1mk59p214184m2q8wfik8gkfxxikrvric0v8c09lamybg15pas8m";
-      name = "plasma-integration-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-integration-5.9.5.tar.xz";
+      sha256 = "05qxrrrfhq0m2xq9ig0cgxrl692hmv9lhckhs22m8a1dppsgv10w";
+      name = "plasma-integration-5.9.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-nm-5.9.4.tar.xz";
-      sha256 = "0sbvyyhx7gxg1li5y1h7jv1s3krp2ch6zzhm9ad1l17w589kij9x";
-      name = "plasma-nm-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-nm-5.9.5.tar.xz";
+      sha256 = "1bdg7mnfxffzwp7s4hbmk8zj17408fnwj5z4j68l64lbn1lmwq0w";
+      name = "plasma-nm-5.9.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-pa-5.9.4.tar.xz";
-      sha256 = "0hincgm6x613sw3mywq64i27laahqzy7qjiv24g8h3ppw75a32i8";
-      name = "plasma-pa-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-pa-5.9.5.tar.xz";
+      sha256 = "0xam3rnd36mvn7021zzs9y5i02ac8c15alnpag8shrsbdv2cbyry";
+      name = "plasma-pa-5.9.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-sdk-5.9.4.tar.xz";
-      sha256 = "0nw49kaw7323dmaq8hh4zrhvy6ga6svg2g0zhxj0cjjwgbk31pfw";
-      name = "plasma-sdk-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-sdk-5.9.5.tar.xz";
+      sha256 = "0dvxw7b65pn86qzf9j30c4pw0vi12kasgf7idbgmhzwl17k4i1mx";
+      name = "plasma-sdk-5.9.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-tests-5.9.4.tar.xz";
-      sha256 = "0m6dlx29785kh1pxm0xyym85k475s8gdjds6ywgpblj9lh5rm4v5";
-      name = "plasma-tests-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-tests-5.9.5.tar.xz";
+      sha256 = "06sn7gz5psmnsilhaprqag2ma03kzj24m7r0gf8wdaqgsla05vwg";
+      name = "plasma-tests-5.9.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-5.9.4.tar.xz";
-      sha256 = "0pazgn45a445wknd3xp7jnsg6k5ddqv4pjrz2ggkbaz9mrllgbqm";
-      name = "plasma-workspace-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-5.9.5.tar.xz";
+      sha256 = "0mbbddz8hlhxqm5z2a9iilrj44gr7bk5n4zab1x3df2msh0lxqxb";
+      name = "plasma-workspace-5.9.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-wallpapers-5.9.4.tar.xz";
-      sha256 = "0jngl7a86xr09g87iydw8fi4ggh6hmz5vaznx4xqh403xf9pl281";
-      name = "plasma-workspace-wallpapers-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-wallpapers-5.9.5.tar.xz";
+      sha256 = "05k56vsmhxh0wdz9msk1x3lq2dblladl4002111fi9s92hg4dmsn";
+      name = "plasma-workspace-wallpapers-5.9.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.9.4";
+    version = "1-5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/polkit-kde-agent-1-5.9.4.tar.xz";
-      sha256 = "10x3vgdjkvzmnv5zl65q0mj6gxlcl620kyva1cx3qhq93w68jfjc";
-      name = "polkit-kde-agent-1-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/polkit-kde-agent-1-5.9.5.tar.xz";
+      sha256 = "05qzq07g7wb6942p6yyrah37vyadbfyz7akk87zrxwiahiighy42";
+      name = "polkit-kde-agent-1-5.9.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/powerdevil-5.9.4.tar.xz";
-      sha256 = "1fpp06criw51lpg21f3xm4gd9yzjj08lr5j8908qz2dywqlp91rv";
-      name = "powerdevil-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/powerdevil-5.9.5.tar.xz";
+      sha256 = "0i8rri9ndm9ins4ii4qmdsmjkxqf69xpz85lwcdsv0sci6imxhcz";
+      name = "powerdevil-5.9.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/sddm-kcm-5.9.4.tar.xz";
-      sha256 = "1zrda4vzvqh6vs93yl2g4b63siqb5cqhrp4kknzm571djiar26ll";
-      name = "sddm-kcm-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/sddm-kcm-5.9.5.tar.xz";
+      sha256 = "0q0q3c439dbrvb4snfjfymgf8pld26gdqbak4gyp3j7nc2gjisk6";
+      name = "sddm-kcm-5.9.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/systemsettings-5.9.4.tar.xz";
-      sha256 = "03h5dagghjg6qhjbf0fnlhwh2v1nh7w22g00g1qzi8yrads1icy1";
-      name = "systemsettings-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/systemsettings-5.9.5.tar.xz";
+      sha256 = "0xg8y8hpm0v2bflsh6l85yx969jn1nqlszwydp3ryvdwliv5hgg9";
+      name = "systemsettings-5.9.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.9.4";
+    version = "5.9.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.4/user-manager-5.9.4.tar.xz";
-      sha256 = "1cjwkxb5qzj8sbkhcyyzw1axzddb2pwbd16wmaqpiz9qh2k4mr64";
-      name = "user-manager-5.9.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/user-manager-5.9.5.tar.xz";
+      sha256 = "056rnca3v6vs7sjqz9drndir3csz457qkzf30rp0dh5dl9k9cxxn";
+      name = "user-manager-5.9.5.tar.xz";
     };
   };
 }

From 32401d17c69116795ad308c6bfd67701ced7633e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 27 Apr 2017 16:36:07 +0200
Subject: [PATCH 1580/1744] nginxMainline: 1.11.13 -> 1.13.0

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

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 388c355c3f7..348aba5338c 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.11.13";
-  sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn";
+  version = "1.13.0";
+  sha256 = "1mq56rl3rq3bhnrqsywxfrwh0y5m0n0q0sck8ca4x18ganv2mxbr";
 })

From a3b9dbd0bed5a81af46b4c48a8ee9f93a0b14cf7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 27 Apr 2017 12:42:57 -0400
Subject: [PATCH 1581/1744] sysbench: 2015-04-22 -> 1.0.6

---
 .../tools/misc/sysbench/default.nix           | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index b6223230c1c..540db210eb4 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchgit, libmysql, libxslt, zlib, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql,
+  libaio }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-2015-04-22";
+  name = "sysbench-1.0.6";
 
-  buildInputs = [ autoreconfHook libmysql libxslt zlib ];
+  buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ];
 
-  src = fetchgit {
-    url = git://github.com/akopytov/sysbench.git;
-    rev = "2b3042883090c9cf8cb9be2b24d3590cdcee112f";
-    sha256 = "1xlb3fracha3wva3dmmjk36b262vblynkmiz8n0mn1vkc78bssaw";
+  src = fetchFromGitHub {
+    owner = "akopytov";
+    repo = "sysbench";
+    rev = "1.0.6";
+    sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l";
   };
 
-  preAutoreconf = ''
-    touch NEWS AUTHORS
-  '';
-
   meta = {
     description = "Modular, cross-platform and multi-threaded benchmark tool";
     license = stdenv.lib.licenses.gpl2;

From 7d546d777109a448bb3bd80b67923326586fef31 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Apr 2017 12:55:52 -0400
Subject: [PATCH 1582/1744] lib platform parsing: Turn assertion back on

---
 lib/systems/parse.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 26744322e9e..39e2177ae73 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -9,7 +9,7 @@ let
   lib = import ../default.nix;
   setTypesAssert = type: pred:
     mapAttrs (name: value:
-      #assert pred value;
+      assert pred value;
       setType type ({ inherit name; } // value));
   setTypes = type: setTypesAssert type (_: true);
 

From 96b83f66a2182261ecd68d9c978b60b634cba45f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 27 Apr 2017 17:45:40 +0100
Subject: [PATCH 1583/1744] weechat: fix guile plugin

Fixes #25270
---
 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 867190d3845..0a86f240983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16100,6 +16100,7 @@ with pkgs;
   weechat = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
     inherit (darwin) libresolv;
+    guile = guile_2_0;
   };
 
   westonLite = callPackage ../applications/window-managers/weston {

From 878b3500ee38cafd73ce6142222e43edd6d5913c Mon Sep 17 00:00:00 2001
From: Jon Banafato <jonathan.banafato@gmail.com>
Date: Thu, 27 Apr 2017 13:24:59 -0400
Subject: [PATCH 1584/1744] clutter: Add gtk3 to buildInputs (#24815)

This is similar to the same change made in PR #12996. Fixes #21509
(makes `gnome3.sushi` work again).
---
 pkgs/development/libraries/clutter/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index af7acb35aac..a0479d9d73c 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
+gobjectIntrospection, gtk3
 }:
 
 let
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
   };
 
+  buildInputs = [ gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango

From b85893cb9c36cc5c15dc46a100ba51769ae6ac7c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Mon, 24 Apr 2017 15:51:09 +0200
Subject: [PATCH 1585/1744] acct: 6.6.2 -> 6.6.3

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

diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index 4263709fe9a..6ec9cc62744 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "acct-6.6.2";
+  name = "acct-6.6.3";
 
   src = fetchurl {
     url = "mirror://gnu/acct/${name}.tar.gz";
-    sha256 = "0081hzkcxw9aslpsakridj15m0wbnkdhm210fzbg021vi4pppm4f";
+    sha256 = "14x0zklwlg7cc7amlyzffqr8az3fqj1h9dyj0hvl1kpi7cr7kbjy";
   };
 
   doCheck = true;

From 7301bf8581d3a821b9c62ff7f869ce624aa7bd6b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Apr 2017 18:55:38 +0200
Subject: [PATCH 1586/1744] tor: 0.2.9.10 -> 0.3.0.6

First stable release in the 0.3 series.

https://blog.torproject.org/blog/tor-0306-released-new-series-stable
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 8128b58155c..4a6095a0a54 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.9.10";
+  name = "tor-0.3.0.6";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn";
+    sha256 = "057vq8wagppmrlg85dgbsrk1v67yqpbi9n87s8gn0mdm7kli5rd3";
   };
 
   outputs = [ "out" "geoip" ];

From 14d8ce79ee9ffe31986c88f897427f137ff13d58 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 27 Apr 2017 14:05:51 -0400
Subject: [PATCH 1587/1744] log4cpp: minor fixes to meta fields

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

diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
index b5a6ecac9cf..96cbbb770b4 100644
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "log4cpp-1.1.1";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
     sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm";
   };
 
-  meta = {
-    homepage = http://log4cpp.sourceforge.net/;
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage    = "http://log4cpp.sourceforge.net/";
     description = "A logging framework for C++ patterned after Apache log4j";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.unix;
   };
 }

From 61f0c5e05ec555d8337efde5ec75c29a76f4f9f5 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 27 Apr 2017 14:06:11 -0400
Subject: [PATCH 1588/1744] xml-tooling-c: minor fixes to meta fields

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

diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index cc9b479a89c..139a4c8cccd 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -13,8 +13,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
-    description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
-  };
+  enableParallelBuilding = true;
 
+  meta = with stdenv.lib; {
+    description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
+    platforms   = platforms.unix;
+    license     = licenses.asl20;
+  };
 }

From 5d5c1ac8e58491bc2c297a85be01b3785919820f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 27 Apr 2017 14:06:28 -0400
Subject: [PATCH 1589/1744] opensaml-cpp: minor fixes to meta fields and
 parallel building

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

diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 7a154c74239..9e3fbd15306 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -15,9 +15,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
 
-  meta = {
-    home = https://shibboleth.net/products/opensaml-cpp.html;
-    description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
-  };
+  enableParallelBuilding = true;
 
+  meta = with stdenv.lib; {
+    homepage    = "https://shibboleth.net/products/opensaml-cpp.html";
+    description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
+    platforms   = platforms.unix;
+    license     = licenses.asl20;
+  };
 }

From 7c2419df764cf22613bbb7d1aa6b9ea38efa4f2e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 27 Apr 2017 14:06:41 -0400
Subject: [PATCH 1590/1744] shibboleth-sp: minor fixes

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

diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index 05b12c31769..de6d6544c13 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj";
   };
 
-  # Needs pkgconfig to find systemd
   buildInputs = [ boost fcgi openssl opensaml-cpp log4shib pkgconfig xercesc xml-security-c xml-tooling-c ];
   nativeBuildInputs = [ autoreconfHook ];
 
@@ -21,9 +20,12 @@ stdenv.mkDerivation rec {
     "--with-fastcgi"
   ];
 
-  meta = {
-    home = https://shibboleth.net/products/service-provider.html;
-    description = "Enables SSO and Federation web applications written with any programming language or framework";
-  };
+  enableParallelBuilding = true;
 
+  meta = with stdenv.lib; {
+    homepage    = "https://shibboleth.net/products/service-provider.html";
+    description = "Enables SSO and Federation web applications written with any programming language or framework";
+    platforms   = platforms.unix;
+    license     = licenses.asl20;
+  };
 }

From fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Apr 2017 13:29:41 -0400
Subject: [PATCH 1591/1744] lib platform parsing: Fix windows

There is no more `cygwin` OS, but instead a `cygnus` abi. "win32"
and "mingw32" parse as `windows`. Add a 3-part hack because autotools
breaks on explicit abi with windows-like (e.g. "i686-pc-windows-gnu").

Also change cross triples to conform
---
 lib/systems/doubles.nix          |  2 +-
 lib/systems/parse.nix            | 56 ++++++++++++++++++--------------
 pkgs/top-level/all-packages.nix  |  3 +-
 pkgs/top-level/release-cross.nix | 41 +++++++++++------------
 4 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 2622ddf4be1..9b17a51531a 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -30,7 +30,7 @@ in rec {
   mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; });
   x86_64 = filterDoubles parse.isx86_64;
 
-  cygwin = filterDoubles (matchAttrs { kernel = parse.kernels.cygwin; });
+  cygwin = filterDoubles parse.isCygwin;
   darwin = filterDoubles parse.isDarwin;
   freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; });
   gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 39e2177ae73..8f65a69b17a 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -1,5 +1,9 @@
-# Define the list of system with their properties.  Only systems tested for
-# Nixpkgs are listed below
+# Define the list of system with their properties.
+#
+# See https://clang.llvm.org/docs/CrossCompilation.html and
+# http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially
+# Triple::normalize. Parsing should essentially act as a more conservative
+# version of that last function.
 
 with import ../lists.nix;
 with import ../types.nix;
@@ -23,7 +27,6 @@ rec {
     littleEndian = {};
   };
 
-
   isCpuType = isType "cpu-type";
   cpuTypes = with significantBytes; setTypesAssert "cpu-type"
     (x: elem x.bits [8 16 32 64 128]
@@ -47,6 +50,7 @@ rec {
   vendors = setTypes "vendor" {
     apple = {};
     pc = {};
+
     unknown = {};
   };
 
@@ -56,6 +60,7 @@ rec {
     elf = {};
     macho = {};
     pe = {};
+
     unknown = {};
   };
 
@@ -63,15 +68,12 @@ rec {
   kernelFamilies = setTypes "kernel-family" {
     bsd = {};
     unix = {};
-    windows-nt = {};
-    dos = {};
   };
 
   isKernel = x: isType "kernel" x;
   kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
     (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
   {
-    cygwin  = { execFormat = pe;      families = { inherit /*unix*/ windows-nt; }; };
     darwin  = { execFormat = macho;   families = { inherit unix; }; };
     freebsd = { execFormat = elf;     families = { inherit unix bsd; }; };
     linux   = { execFormat = elf;     families = { inherit unix; }; };
@@ -79,18 +81,21 @@ rec {
     none    = { execFormat = unknown; families = { inherit unix; }; };
     openbsd = { execFormat = elf;     families = { inherit unix bsd; }; };
     solaris = { execFormat = elf;     families = { inherit unix; }; };
-    win32   = { execFormat = pe;      families = { inherit dos; }; };
+    windows = { execFormat = pe;      families = { }; };
+  } // { # aliases
+    win32 = kernels.windows;
   };
 
-
   isAbi = isType "abi";
   abis = setTypes "abi" {
+    cygnus = {};
     gnu = {};
     msvc = {};
     eabi = {};
     androideabi = {};
     gnueabi = {};
     gnueabihf = {};
+
     unknown = {};
   };
 
@@ -109,19 +114,25 @@ rec {
   isDarwin = matchAttrs { kernel = kernels.darwin; };
   isLinux = matchAttrs { kernel = kernels.linux; };
   isUnix = matchAttrs { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
-  isWindows = s: matchAttrs { kernel = { families = { inherit (kernelFamilies) windows-nt; }; }; } s
-              || matchAttrs { kernel = { families = { inherit (kernelFamilies) dos; }; }; } s;
+  isWindows = matchAttrs { kernel = kernels.windows; };
+  isCygwin = matchAttrs { kernel = kernels.windows; abi = abis.cygnus; };
+  isMinGW = matchAttrs { kernel = kernels.windows; abi = abis.gnu; };
 
 
   mkSkeletonFromList = l: {
-    "2" =    { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
-    "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
+    "2" = # We only do 2-part hacks for things Nix already supports
+      if elemAt l 1 == "cygwin"
+        then { cpu = elemAt l 0;                      kernel = "windows"; abi = "cygnus";    }
+      else   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
         then { cpu = elemAt l 0; vendor = "apple";    kernel = elemAt l 2;                   }
       else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
         then { cpu = elemAt l 0;                      kernel = elemAt l 1; abi = elemAt l 2; }
+      else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows";  abi = "gnu"; }
       else throw "Target specification with 3 components is ambiguous";
+    "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
   }.${toString (length l)}
     or (throw "system string has invalid number of hyphen-separated components");
 
@@ -134,18 +145,10 @@ rec {
                          , # Also inferred below
                            abi    ? assert false; null
                          } @ args: let
-    getCpu = name:
-      attrByPath [name] (throw "Unknown CPU type: ${name}")
-        cpuTypes;
-    getVendor = name:
-      attrByPath [name] (throw "Unknown vendor: ${name}")
-        vendors;
-    getKernel = name:
-      attrByPath [name] (throw "Unknown kernel: ${name}")
-        kernels;
-    getAbi = name:
-      attrByPath [name] (throw "Unknown ABI: ${name}")
-        abis;
+    getCpu    = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}");
+    getVendor = name:  vendors.${name} or (throw "Unknown vendor: ${name}");
+    getKernel = name:  kernels.${name} or (throw "Unknown kernel: ${name}");
+    getAbi    = name:     abis.${name} or (throw "Unknown ABI: ${name}");
 
     system = rec {
       cpu = getCpu args.cpu;
@@ -166,7 +169,10 @@ rec {
 
   mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
 
-  doubleFromSystem = { cpu, vendor, kernel, abi, ... }: "${cpu.name}-${kernel.name}";
+  doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
+    if vendor == kernels.windows && abi == abis.cygnus
+    then "${cpu.name}-cygwin"
+    else "${cpu.name}-${kernel.name}";
 
   tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
     optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3be611430f6..6021ab67b09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5010,7 +5010,8 @@ with pkgs;
 
       # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = targetPlatform.config != "i686-pc-mingw32";
+      langCC = !(lib.systems.parse.isi686  targetPlatform.parsed &&
+                 lib.systems.parse.isMinGW targetPlatform.parsed);
       # Why is this needed?
       inherit (forcedNativePackages) binutils;
     };
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 82428972699..e199c232aba 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -20,12 +20,27 @@ let
   /* Basic list of packages to be natively built,
      but need a crossSystem defined to get meaning */
   basicNativeDrv = {
+    buildPackages.binutils = nativePlatforms;
     buildPackages.gccCrossStageFinal = nativePlatforms;
     buildPackages.gdbCross = nativePlatforms;
   };
 
   basic = basicCrossDrv // basicNativeDrv;
 
+  windows = {
+    buildPackages.binutils = nativePlatforms;
+    buildPackages.gccCrossStageFinal = nativePlatforms;
+
+    coreutils = nativePlatforms;
+    boehmgc = nativePlatforms;
+    gmp = nativePlatforms;
+    guile_1_8 = nativePlatforms;
+    libffi = nativePlatforms;
+    libtool = nativePlatforms;
+    libunistring = nativePlatforms;
+    windows.wxMSW = nativePlatforms;
+  };
+
 in
 
 {
@@ -89,42 +104,24 @@ in
   /* Test some cross builds on 32 bit mingw-w64 */
   crossMingw32 = let
     crossSystem = {
-      config = "i686-w64-mingw32";
+      config = "i686-pc-mingw32";
       arch = "x86"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    boehmgc = nativePlatforms;
-    gmp = nativePlatforms;
-    guile_1_8 = nativePlatforms;
-    libffi = nativePlatforms;
-    libtool = nativePlatforms;
-    libunistring = nativePlatforms;
-    windows.wxMSW = nativePlatforms;
-  };
+  in mapTestOnCross crossSystem windows;
 
 
   /* Test some cross builds on 64 bit mingw-w64 */
   crossMingwW64 = let
     crossSystem = {
       # That's the triplet they use in the mingw-w64 docs.
-      config = "x86_64-w64-mingw32";
+      config = "x86_64-pc-mingw32";
       arch = "x86_64"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    boehmgc = nativePlatforms;
-    gmp = nativePlatforms;
-    guile_1_8 = nativePlatforms;
-    libffi = nativePlatforms;
-    libtool = nativePlatforms;
-    libunistring = nativePlatforms;
-    windows.wxMSW = nativePlatforms;
-  };
+  in mapTestOnCross crossSystem windows;
 
 
   /* Linux on the fuloong */

From 92887cb46636d91eb5cfc1afbc3536b5c757f6ab Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Apr 2017 14:46:32 -0400
Subject: [PATCH 1592/1744] release-cross: Add final "-gnu" to fuloong triple

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index e199c232aba..b22eff33dc0 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -127,7 +127,7 @@ in
   /* Linux on the fuloong */
   fuloongminipc = let
     crossSystem = {
-      config = "mips64el-unknown-linux";
+      config = "mips64el-unknown-linux-gnu";
       bigEndian = false;
       arch = "mips";
       float = "hard";

From 2bd39ab0136e967ff32af0616f651798630c5682 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 25 Apr 2017 20:11:48 +0200
Subject: [PATCH 1593/1744] csdp: fix darwin build

the build sets CC=clang causing it to essentially ignore the cc wrapper
---
 pkgs/applications/science/math/csdp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
index 7aafe9da41e..796e8b7264f 100644
--- a/pkgs/applications/science/math/csdp/default.nix
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
   };
 
-  buildInputs = [ blas gfortran liblapack ];
+  buildInputs = [ blas gfortran.cc.lib liblapack ];
 
   postPatch = ''
     substituteInPlace Makefile --replace /usr/local/bin $out/bin

From ab298085d4e13f0ba9009616775bf5a8ac7a13bc Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Apr 2017 15:37:39 -0400
Subject: [PATCH 1594/1744] cross mingw: Enable C++ on i686

Actually the old check wasn't being hit because a slightly different
target triple was being used.
---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6021ab67b09..48bc89633dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5008,10 +5008,6 @@ with pkgs;
       cross = targetPlatform;
       crossStageStatic = false;
 
-      # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
-      # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = !(lib.systems.parse.isi686  targetPlatform.parsed &&
-                 lib.systems.parse.isMinGW targetPlatform.parsed);
       # Why is this needed?
       inherit (forcedNativePackages) binutils;
     };

From f240276000a03fe91c840ce8a48c0ca7f56b17ec Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 27 Apr 2017 23:25:07 +0200
Subject: [PATCH 1595/1744] blas: fix darwin library id

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

diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index ce35743e8bc..6f729e8a0b2 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
     ln -s libblas.so.${version} "$out/lib/libblas.so"
   '';
 
+  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    for fn in $(find $out/lib -name "*.so*"); do
+      if [ -L "$fn" ]; then continue; fi
+      install_name_tool -id "$fn" "$fn"
+    done
+  '';
+
   meta = {
     description = "Basic Linear Algebra Subprograms";
     license = stdenv.lib.licenses.publicDomain;

From 3e06c96f507e4cf458fb07a529a1c6e7741c0dd5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Apr 2017 08:32:24 +0800
Subject: [PATCH 1596/1744] xca: now works with qt 5.8

---
 pkgs/applications/misc/xca/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 60af439e94b..09da875e236 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
   };
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs = [ libtool openssl qtbase qttools ];
 
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     license = licenses.bsd3;
     maintainers = with maintainers; [ offline peterhoeg ];
-    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a8c9b16f4d..e743a15ee31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16279,7 +16279,7 @@ with pkgs;
   xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
 
   # v1.3.2 segfaults with qt 5.7
-  xca = libsForQt56.callPackage ../applications/misc/xca { };
+  xca = libsForQt5.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 

From 8d27aad6c36d4999ef723d3a556bdd265f1816da Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Apr 2017 08:35:36 +0800
Subject: [PATCH 1597/1744] fix annoying line endings


From bf4710fa80808204bb3966f08b1a972439538a0c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Apr 2017 08:41:40 +0800
Subject: [PATCH 1598/1744] speedcrunch: allow building with qt 5.8

---
 .../science/math/speedcrunch/default.nix          | 15 +++++++++++----
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 33de9cd0d97..861deaff741 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, qtbase, qttools }:
+{ stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "speedcrunch-${version}";
@@ -11,14 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [ qtbase qttools ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeQtWrapper ];
 
   preConfigure = ''
     cd src
   '';
 
+  postFixup = ''
+    wrapQtProgram $out/bin/speedcrunch
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://speedcrunch.org;
     license     = licenses.gpl2Plus;
@@ -30,7 +36,8 @@ stdenv.mkDerivation rec {
       full keyboard-friendly and more than 15 built-in math function.
     '';
     maintainers = with maintainers; [ gebner ];
-    platforms = platforms.all;
-    broken = builtins.compareVersions qtbase.version "5.8.0" >= 0;
+    inherit (qtbase.meta) platforms;
+    # works with qt 5.6 and qt 5.8
+    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e743a15ee31..0d38e0e0db2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17765,7 +17765,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { };
+  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC
 

From 903fec99227a8b40de1370fbcfe96937f380d013 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Apr 2017 22:07:34 -0400
Subject: [PATCH 1599/1744] linux: 4.9.24 -> 4.9.25

---
 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 706f31ea6c5..34884e41f28 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.24";
+  version = "4.9.25";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01ig3hmalzkn783d5pppw1x473y0mma54rx7dfnany15n62w9csh";
+    sha256 = "0drfz75k0zj2prawqmxaqgk27zk2vdj2pwip2n7hb9r1b9ly9bc2";
   };
 
   kernelPatches = args.kernelPatches;

From 08c44a5cac9280fc67b470d8680a0a08de88a382 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Apr 2017 22:10:06 -0400
Subject: [PATCH 1600/1744] linux: 4.10.12 -> 4.10.13

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index cf68997c2fb..e258b3bf978 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.12";
+  version = "4.10.13";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1i1vzv9y9pdkpyir04pnlsacnlahp15bqqgrl68hn3ni20macx7q";
+    sha256 = "1vylg3zv0n0hx9y5ngshz65hkpfm2686mvdcarhdg2mnxqd2kc6s";
   };
 
   kernelPatches = args.kernelPatches;

From 7f3b857d0d08c5e7d8d0ecdb2a53f06cc48a9cdf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Apr 2017 22:12:35 -0400
Subject: [PATCH 1601/1744] linux: 4.4.63 -> 4.4.64

---
 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 c5b52890c60..79018caae5c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.63";
+  version = "4.4.64";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1v2pilwzkdcxvda96g1yy62abqz6w2zhcymgj73maz9836xsjxbv";
+    sha256 = "0rfx3018chv4a486f03yas7fjr5vpqzhfjaa99rs069qid2smhn7";
   };
 
   kernelPatches = args.kernelPatches;

From 32b8512e54b864ecf8c2b1e115c1a3f18e90a8c3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Apr 2017 20:42:23 +0200
Subject: [PATCH 1602/1744] grsecurity: discontinue support

Upstream has decided to make -testing patches private, effectively ceasing
free support for grsecurity/PaX [1].  Consequently, we can no longer
responsibly support grsecurity on NixOS.

This patch turns the kernel and patch expressions into build errors and
adds a warning to the manual, but retains most of the infrastructure, in
an effort to make the transition smoother.  For 17.09 all of it should
probably be pruned.

[1]: https://grsecurity.net/passing_the_baton.php
---
 nixos/modules/security/grsecurity.nix     |  2 +-
 nixos/modules/security/grsecurity.xml     |  8 +++++---
 nixos/release.nix                         |  1 -
 pkgs/os-specific/linux/kernel/patches.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix           | 17 +----------------
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 657b059faf2..d23c7f2e86d 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    maintainers = with maintainers; [ joachifm ];
+    maintainers = with maintainers; [ ];
     doc = ./grsecurity.xml;
   };
 
diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index 620e8f653f9..0a884b3f9b5 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -26,9 +26,11 @@
     <link xlink:href="https://wiki.archlinux.org/index.php/Grsecurity">Arch
     Linux wiki page on grsecurity</link>.
 
-    <note><para>grsecurity/PaX is only available for the latest linux -stable
-    kernel; patches against older kernels are available from upstream only for
-    a fee.</para></note>
+    <warning><para>Upstream has ceased free support for grsecurity/PaX.  See
+    <link xlink:href="https://grsecurity.net/passing_the_baton.php">
+    the announcement</link> for more information.  Consequently, NixOS
+    support for grsecurity/PaX also must cease.  Enabling this module will
+    result in a build error.</para></warning>
     <note><para>We standardise on a desktop oriented configuration primarily due
     to lack of resources.  The grsecurity/PaX configuration state space is huge
     and each configuration requires quite a bit of testing to ensure that the
diff --git a/nixos/release.nix b/nixos/release.nix
index 0fec97b9c27..1c282bfea4f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -248,7 +248,6 @@ in rec {
   tests.gocd-server = callTest tests/gocd-server.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
-  tests.grsecurity = callTest tests/grsecurity.nix {};
   tests.hibernate = callTest tests/hibernate.nix {};
   tests.hound = callTest tests/hound.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 22bdc3594ef..ffc193efbf1 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -99,11 +99,13 @@ rec {
     sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j";
   };
 
-  grsecurity_testing = grsecPatch
-    { kver   = "4.9.24";
-      grrev  = "201704220732";
-      sha512 = "0n9v066z3qh296fyvsg1gnygy7jd0cy0pnywxzglh58dnibl28q2ywjnp4ff30andzzq7rvjkk4n151xvs1n04pf2azkgz6igwfisg7";
-    };
+  grsecurity_testing = throw ''
+    Upstream has ceased free support for grsecurity/PaX.
+
+    See https://grsecurity.net/passing_the_baton.php
+    and https://grsecurity.net/passing_the_baton_faq.php
+    for more information.
+  '';
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
   # e.g., modprobe, to allow calling into the Nix store.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d38e0e0db2..70c7de19d43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11893,22 +11893,7 @@ with pkgs;
 
   # Grsecurity packages
 
-  linux_grsec_nixos = callPackage ../build-support/grsecurity {
-    inherit (lib) overrideDerivation;
-    kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {
-      kernelPatches = with self.kernelPatches; [
-        bridge_stp_helper
-        modinst_arg_list_too_long
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
-        [ kernelPatches.mips_fpureg_emu
-          kernelPatches.mips_fpu_sigill
-          kernelPatches.mips_ext3_n32
-        ];
-    };
-    grsecPatch = self.kernelPatches.grsecurity_testing;
-    kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ];
-    extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { };
-  };
+  linux_grsec_nixos = kernelPatches.grsecurity_testing;
 
   linuxPackages_grsec_nixos =
     recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos);

From a53f129c45d32752502faef2f649e95ec0f77a56 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 14 Apr 2017 06:31:19 -0500
Subject: [PATCH 1603/1744] kwin: install service type aliases for broken
 packages

Some package(s) refer to kwin service types by the wrong names. I would prefer
to patch those packages, but I cannot find them!
---
 pkgs/desktops/plasma-5/kwin/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 01f90664276..a14b6433a76 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -30,4 +30,12 @@ plasmaPackage {
         --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland
   '';
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
+  postInstall = ''
+    # Some package(s) refer to these service types by the wrong name.
+    # I would prefer to patch those packages, but I cannot find them!
+    ln -s $out/share/kservicetypes5/kwineffect.desktop \
+          $out/share/kservicetypes5/kwin-effect.desktop
+    ln -s $out/share/kservicetypes5/kwinscript.desktop \
+          $out/share/kservicetypes5/kwin-script.desktop
+  '';
 }

From c4c614c23247a301bd1936faaaca38a38bfcc074 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 14 Apr 2017 05:39:38 -0500
Subject: [PATCH 1604/1744] libkscreen: hardcode backends path

libkscreen provides all available kscreen backends, so there is no reason to
search the environment for plugins.
---
 pkgs/desktops/plasma-5/default.nix            |  2 +-
 pkgs/desktops/plasma-5/libkscreen.nix         | 15 -----------
 pkgs/desktops/plasma-5/libkscreen/default.nix | 19 +++++++++++++
 .../libkscreen/libkscreen-backends-path.patch | 27 +++++++++++++++++++
 pkgs/desktops/plasma-5/libkscreen/series      |  1 +
 5 files changed, 48 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/libkscreen.nix
 create mode 100644 pkgs/desktops/plasma-5/libkscreen/default.nix
 create mode 100644 pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
 create mode 100644 pkgs/desktops/plasma-5/libkscreen/series

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 0cb25a315d6..1a8f1ed064b 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -62,7 +62,7 @@ let
       kwayland-integration = callPackage ./kwayland-integration.nix {};
       kwin = callPackage ./kwin {};
       kwrited = callPackage ./kwrited.nix {};
-      libkscreen = callPackage ./libkscreen.nix {};
+      libkscreen = callPackage ./libkscreen {};
       libksysguard = callPackage ./libksysguard {};
       milou = callPackage ./milou.nix {};
       oxygen = callPackage ./oxygen.nix {};
diff --git a/pkgs/desktops/plasma-5/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix
deleted file mode 100644
index 4e04fd5ed1d..00000000000
--- a/pkgs/desktops/plasma-5/libkscreen.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kwayland, libXrandr
-, qtx11extras
-}:
-
-plasmaPackage {
-  name = "libkscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kwayland libXrandr qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
new file mode 100644
index 00000000000..afb2c20e90c
--- /dev/null
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -0,0 +1,19 @@
+{ plasmaPackage, lib, copyPathsToStore
+, extra-cmake-modules
+, kwayland, libXrandr
+, qtx11extras
+}:
+
+plasmaPackage {
+  name = "libkscreen";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kwayland libXrandr qtx11extras
+  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/lib/qt5/plugins/kf5/kscreen\""
+  '';
+}
diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
new file mode 100644
index 00000000000..9d3cf49b9cd
--- /dev/null
+++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
@@ -0,0 +1,27 @@
+Index: libkscreen-5.9.4/src/backendmanager.cpp
+===================================================================
+--- libkscreen-5.9.4.orig/src/backendmanager.cpp
++++ libkscreen-5.9.4/src/backendmanager.cpp
+@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke
+ QFileInfoList BackendManager::listBackends()
+ {
+     // Compile a list of installed backends first
+-    const QString backendFilter = QStringLiteral("KSC_*");
+-    const QStringList paths = QCoreApplication::libraryPaths();
+-    QFileInfoList finfos;
+-    for (const QString &path : paths) {
+-        const QDir dir(path + QLatin1String("/kf5/kscreen/"),
+-                       backendFilter,
+-                       QDir::SortFlags(QDir::QDir::Name),
+-                       QDir::NoDotAndDotDot | QDir::Files);
+-        finfos.append(dir.entryInfoList());
+-    }
+-    return finfos;
++    const QDir dir(QStringLiteral(NIXPKGS_LIBKSCREEN_BACKENDS),
++                   QStringLiteral("KSC_*"),
++                   QDir::SortFlags(QDir::QDir::Name),
++                   QDir::NoDotAndDotDot | QDir::Files);
++    return dir.entryInfoList();
+ }
+ 
+ KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name,
diff --git a/pkgs/desktops/plasma-5/libkscreen/series b/pkgs/desktops/plasma-5/libkscreen/series
new file mode 100644
index 00000000000..86bf4ab1060
--- /dev/null
+++ b/pkgs/desktops/plasma-5/libkscreen/series
@@ -0,0 +1 @@
+libkscreen-backends-path.patch

From 44eb84feb66d0ea52fb31796917c30f8f8d154bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:11:32 -0500
Subject: [PATCH 1605/1744] qt58.qtbase: Update patch offsets

---
 .../qt-5/5.8/qtbase/compose-search-path.patch      | 10 +++++-----
 .../libraries/qt-5/5.8/qtbase/dlopen-openssl.patch | 10 +++++-----
 .../libraries/qt-5/5.8/qtbase/dlopen-resolv.patch  | 14 +++++++-------
 .../libraries/qt-5/5.8/qtbase/libressl.patch       | 10 +++++-----
 .../5.8/qtbase/nix-profiles-library-paths.patch    |  8 ++++----
 .../libraries/qt-5/5.8/qtbase/tzdir.patch          | 10 +++++-----
 .../qt-5/5.8/qtbase/xdg-config-dirs.patch          | 14 +++++++-------
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
index a0e344a7bc6..5b212c09965 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
@@ -1,9 +1,9 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio
-     // the QTCOMPOSE environment variable
+--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
++++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+@@ -258,10 +258,7 @@ void TableGenerator::initPossibleLocatio
+     m_possibleLocations.reserve(7);
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
 -    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
index 9891bfeac5b..46600e7f426 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
+Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -681,8 +681,8 @@ static QPair<QLibrary*, QLibrary*> loadO
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -13,7 +13,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cp
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
-@@ -676,8 +676,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+@@ -699,8 +699,8 @@ static QPair<QLibrary*, QLibrary*> loadO
      //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
      //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
      //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
index 98a3610f5fb..1df27377658 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
+Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
-@@ -85,7 +85,7 @@ static bool resolveLibraryInternal()
+--- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qdnslookup_unix.cpp
++++ qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
+@@ -90,7 +90,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
      {
@@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
          if (!lib.load())
              return false;
      }
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
+Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
+--- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qhostinfo_unix.cpp
++++ qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
 @@ -100,7 +100,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
index 4390db977a7..e9c60e7ab07 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
@@ -9,11 +9,11 @@ is defined in openssl, but not in libressl.
  src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
+Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
-@@ -347,7 +347,7 @@ init_context:
+--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslcontext_openssl.cpp
++++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp
+@@ -351,7 +351,7 @@ init_context:
  
      const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
      if (!qcurves.isEmpty()) {
@@ -22,7 +22,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
          // Set the curves to be used
          if (q_SSLeay() >= 0x10002000L) {
              // SSL_CTX_ctrl wants a non-const pointer as last argument,
-@@ -360,7 +360,7 @@ init_context:
+@@ -364,7 +364,7 @@ init_context:
                  sslContext->errorCode = QSslError::UnspecifiedError;
              }
          } else
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
index ebaf3651a6d..c5d91066d8f 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
+Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
++++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
+@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
index f4056dd9cc9..f48ac761ccf 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+@@ -70,7 +70,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
@@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt
+@@ -642,12 +645,18 @@ void QTzTimeZonePrivate::init(const QByt
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
index 1f2f316c5b2..b5c21f064a4 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
+Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
-@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings.cpp
++++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp
+@@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti
          confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
      confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
  
@@ -26,10 +26,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
      for (i = 0; i < NumConfFiles; ++i) {
          if (confFiles[i]) {
              spec = i;
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
+Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings_p.h
++++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h
 @@ -246,7 +246,7 @@ public:
          F_Organization = 0x1,
          F_User = 0x0,

From 2ce3fe0a7143737f0f42ddda92676a6169101ae8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:12:11 -0500
Subject: [PATCH 1606/1744] qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH

The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 19 ++++++++++++++-----
 .../qt-5/5.8/qtbase/qpa-plugin-path.patch     | 15 +++++++++++++++
 .../libraries/qt-5/5.8/qtbase/series          |  1 +
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index be35032785d..570d61b4420 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -106,6 +106,8 @@ stdenv.mkDerivation {
         -importdir $out/lib/qt5/imports \
         -qmldir $out/lib/qt5/qml \
         -docdir $out/share/doc/qt5"
+
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins\""
   '';
 
   prefixKey = "-prefix ";
@@ -227,11 +229,18 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
 
   # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
-    + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
-  # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
-  # 10.9 which necessitates the above macro definition that mentions
-  # 10.10
+  NIX_CFLAGS_COMPILE =
+    [
+      "-Wno-error=sign-compare"
+    ]
+    ++ lib.optionals stdenv.isDarwin
+    [
+      "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
+      "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"
+      # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
+      # 10.9 which necessitates the above macro definition that mentions
+      # 10.10
+    ];
 
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
new file mode 100644
index 00000000000..6d40ed19c00
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
@@ -0,0 +1,15 @@
+Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qguiapplication.cpp
++++ qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp
+@@ -1217,6 +1217,10 @@ void QGuiApplicationPrivate::createPlatf
+ 
+     // Load the platform integration
+     QString platformPluginPath = QString::fromLocal8Bit(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH"));
++    if (!platformPluginPath.isEmpty()) {
++        platformPluginPath.append(QStringLiteral(":"));
++    }
++    platformPluginPath.append(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
+ 
+ 
+     QByteArray platformName;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 2196d838375..72882a47942 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -7,3 +7,4 @@ xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
+qpa-plugin-path.patch

From 12c981d4b7486147f8c00a504409ac957b9511ed Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:23:48 -0500
Subject: [PATCH 1607/1744] qt58.qtbase: Fix QTCOMPOSE search patch

---
 .../libraries/qt-5/5.8/qtbase/compose-search-path.patch     | 6 ++++--
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix      | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
index 5b212c09965..d0bea4afaa3 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
@@ -2,7 +2,7 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
 ===================================================================
 --- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 +++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -258,10 +258,7 @@ void TableGenerator::initPossibleLocatio
+@@ -258,12 +258,9 @@ void TableGenerator::initPossibleLocatio
      m_possibleLocations.reserve(7);
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
@@ -10,7 +10,9 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
 -    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
 -    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
 -    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
++    m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
  }
+ 
+ QString TableGenerator::findComposeFile()
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 570d61b4420..11e5119ce13 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -66,10 +66,6 @@ stdenv.mkDerivation {
 
       substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
-
-      substituteInPlace \
-        src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
@@ -232,6 +228,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE =
     [
       "-Wno-error=sign-compare"
+      ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
     ]
     ++ lib.optionals stdenv.isDarwin
     [

From 6169bd98f51429d7da4f2fc296357d8e6d828751 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 8 Apr 2017 19:54:06 -0500
Subject: [PATCH 1608/1744] qt58: ignore NIX_PROFILES environment variable

---
 .../qtbase/nix-profiles-library-paths.patch   | 22 -------------------
 .../libraries/qt-5/5.6/qtbase/series          |  1 -
 .../qtbase/nix-profiles-library-paths.patch   | 22 -------------------
 .../libraries/qt-5/5.8/qtbase/series          |  1 -
 4 files changed, 46 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index d454a74109a..00000000000
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat
-         QStringList *app_libpaths = new QStringList;
-         coreappdata()->app_libpaths.reset(app_libpaths);
- 
-+        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        Q_FOREACH (const QByteArray &profile, profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+            }
-+        }
-+
-         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-+        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
-         if (!libPathEnv.isEmpty()) {
-             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 2196d838375..9ef8c998c66 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -4,6 +4,5 @@ dlopen-libXcursor.patch
 dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index c5d91066d8f..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
-         QStringList *app_libpaths = new QStringList;
-         coreappdata()->app_libpaths.reset(app_libpaths);
- 
-+        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        for (const QByteArray &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+            }
-+        }
-+
-         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-+        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
-         if (!libPathEnv.isEmpty()) {
-             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 72882a47942..f0b1bfa674d 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -4,7 +4,6 @@ dlopen-libXcursor.patch
 dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
 qpa-plugin-path.patch

From 40aa757898cba35090bdece5cb1949315a366232 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:33:47 -0500
Subject: [PATCH 1609/1744] qt58.qtbase: Fix path to libresolv

---
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix      | 6 +-----
 .../libraries/qt-5/5.8/qtbase/dlopen-resolv.patch           | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 11e5119ce13..3e667d5cc40 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -53,11 +53,6 @@ stdenv.mkDerivation {
       sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
-      substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-      substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-
       substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
         --replace "@openssl@" "${openssl.out}"
     '' + lib.optionalString stdenv.isLinux ''
@@ -229,6 +224,7 @@ stdenv.mkDerivation {
     [
       "-Wno-error=sign-compare"
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+      ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
     ]
     ++ lib.optionals stdenv.isDarwin
     [
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
index 1df27377658..ef7cd4a910a 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
++        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
          if (!lib.load())
              return false;
      }
@@ -20,7 +20,7 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
++        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
          if (!lib.load())
              return false;
      }

From ff8fa7e397a92faaeb60e78fdc1bcef5a3eab8bf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:34:00 -0500
Subject: [PATCH 1610/1744] qt58.qtbase: Fix path to libXcursor

---
 .../libraries/qt-5/5.8/qtbase/default.nix         |  4 +---
 .../qt-5/5.8/qtbase/dlopen-libXcursor.patch       | 15 +++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 3e667d5cc40..3bcbf0caf40 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -56,9 +56,6 @@ stdenv.mkDerivation {
       substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
         --replace "@openssl@" "${openssl.out}"
     '' + lib.optionalString stdenv.isLinux ''
-      substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor.out}"
-
       substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
     ''
@@ -225,6 +222,7 @@ stdenv.mkDerivation {
       "-Wno-error=sign-compare"
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
       ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
+      ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
     ]
     ++ lib.optionals stdenv.isDarwin
     [
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
index 02b7efb73d2..d0e82cf122a 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
@@ -1,17 +1,20 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
+Index: qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/qxcbcursor.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
+--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
++++ qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/qxcbcursor.cpp
+@@ -309,13 +309,13 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
  #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
 -        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
++        QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
          bool xcursorFound = xcursorLib.load();
          if (!xcursorFound) { // try without the version number
 -            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
++            xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
              xcursorFound = xcursorLib.load();
          }
          if (xcursorFound) {
+             ptrXcursorLibraryLoadCursor =
+                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
+             ptrXcursorLibraryGetTheme =

From f45f2635e15e49172a3d73a5ba99d2935492e5c2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:37:04 -0500
Subject: [PATCH 1611/1744] qt58.qtbase: Fix path to libssl and libcrypto

---
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix    | 5 ++---
 .../libraries/qt-5/5.8/qtbase/dlopen-openssl.patch        | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 3bcbf0caf40..f137984862a 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -52,9 +52,6 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
       sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
-      substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl.out}"
     '' + lib.optionalString stdenv.isLinux ''
       substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
@@ -223,6 +220,8 @@ stdenv.mkDerivation {
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
       ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+      ''-DNIXPKGS_LIBSSL="${openssl.out}/lib/libssl"''
+      ''-DNIXPKGS_LIBCRYPTO="${openssl.out}/lib/libcrypto"''
     ]
     ++ lib.optionals stdenv.isDarwin
     [
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
index 46600e7f426..943b1c569fd 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
@@ -8,8 +8,8 @@ Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cp
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
 -    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
 -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
++    libssl->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBSSL), QLatin1String(SHLIB_VERSION_NUMBER));
++    libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), QLatin1String(SHLIB_VERSION_NUMBER));
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
@@ -19,8 +19,8 @@ Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cp
      //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
 -    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
 -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
++    libssl->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBSSL), -1);
++    libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), -1);
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.0 and libcrypto.so.0 found
          return pair;

From 8e2b6a90c09d39de5f43eb94376000f1776e0657 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Apr 2017 11:39:50 -0500
Subject: [PATCH 1612/1744] qt58.qtbase: Fix path to libdbus

---
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix      | 6 +++---
 .../development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index f137984862a..62ff9c2ea51 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -52,9 +52,6 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
       sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-    '' + lib.optionalString stdenv.isLinux ''
-      substituteInPlace src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus.lib}"
     ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
@@ -222,6 +219,9 @@ stdenv.mkDerivation {
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
       ''-DNIXPKGS_LIBSSL="${openssl.out}/lib/libssl"''
       ''-DNIXPKGS_LIBCRYPTO="${openssl.out}/lib/libcrypto"''
+      (if stdenv.isLinux
+        then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
+        else ''-DNIXPKGS_LIBDBUS=""'')
     ]
     ++ lib.optionals stdenv.isDarwin
     [
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
index 10b0b6701dd..067d898cda4 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
@@ -1,7 +1,7 @@
-Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
+Index: qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbus_symbols.cpp
++++ qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
 @@ -97,7 +97,7 @@ bool qdbus_loadLibDBus()
  #ifdef Q_OS_WIN
          QLatin1String("dbus-1"),

From 1f62bf01d340967ec2a1600108d6686a3804c114 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Apr 2017 09:45:27 -0500
Subject: [PATCH 1613/1744] qt58.qtbase: Fix path to fallback libGL

---
 .../libraries/qt-5/5.8/qtbase/default.nix        |  7 +++----
 .../libraries/qt-5/5.8/qtbase/dlopen-gl.patch    | 16 +++++++++-------
 .../development/libraries/qt-5/5.8/qtbase/series |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 62ff9c2ea51..6d11927d6ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
     ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+    ++ lib.optionals mesaSupported [ ./mkspecs-libgl.patch ];
 
   postPatch =
     ''
@@ -54,9 +54,6 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
     ''
     + lib.optionalString mesaSupported ''
-      substituteInPlace \
-        src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
-        --replace "@mesa_lib@" "${mesa.out}"
       substituteInPlace mkspecs/common/linux.conf \
         --replace "@mesa_lib@" "${mesa.out}" \
         --replace "@mesa_inc@" "${mesa.dev or mesa}"
@@ -223,6 +220,8 @@ stdenv.mkDerivation {
         then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
         else ''-DNIXPKGS_LIBDBUS=""'')
     ]
+    ++ lib.optional mesaSupported
+       ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
     ++ lib.optionals stdenv.isDarwin
     [
       "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
index ea3073ced50..c835f2bfe44 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
@@ -1,17 +1,19 @@
-Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+Index: qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 ===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
-             {
+--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -576,7 +576,14 @@ QFunctionPointer QGLXContext::getProcAdd
+ #ifndef QT_NO_LIBRARY
                  extern const QString qt_gl_library_name();
  //                QLibrary lib(qt_gl_library_name());
 +                // Check system library paths first
                  QLibrary lib(QLatin1String("GL"));
++#ifdef NIXPKGS_MESA_GL
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
++                    lib.setFileName(QLatin1String(NIXPKGS_MESA_GL));
 +                }
++#endif // NIXPKGS_MESA_GL
                  glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+ #endif
              }
-         }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index f0b1bfa674d..9939aea7400 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -7,3 +7,4 @@ xdg-config-dirs.patch
 compose-search-path.patch
 libressl.patch
 qpa-plugin-path.patch
+dlopen-gl.patch

From 9d9ab3de98b31a234185261e22d45cec0e92fb36 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Apr 2017 09:58:27 -0500
Subject: [PATCH 1614/1744] qt58.qtbase: replace mkspecs patch with sed script

---
 .../libraries/qt-5/5.8/qtbase/default.nix         | 14 ++++++++------
 .../libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch | 15 ---------------
 2 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 6d11927d6ce..0ad353d9681 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -39,8 +39,7 @@ stdenv.mkDerivation {
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
     ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
-    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optionals mesaSupported [ ./mkspecs-libgl.patch ];
+    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch;
 
   postPatch =
     ''
@@ -53,11 +52,14 @@ stdenv.mkDerivation {
       sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
     ''
+
     + lib.optionalString mesaSupported ''
-      substituteInPlace mkspecs/common/linux.conf \
-        --replace "@mesa_lib@" "${mesa.out}" \
-        --replace "@mesa_inc@" "${mesa.dev or mesa}"
-    ''+ lib.optionalString stdenv.isDarwin ''
+      sed -i mkspecs/common/linux.conf \
+          -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \
+          -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|"
+    ''
+
+    + lib.optionalString stdenv.isDarwin ''
       sed -i \
           -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
           -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index fda3d3e3653..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf
-+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR            =
- QMAKE_LIBDIR            =
- QMAKE_INCDIR_X11        =
- QMAKE_LIBDIR_X11        =
--QMAKE_INCDIR_OPENGL     =
--QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =

From e4fb41cc5bf7c9685466a13dfcbeaba7e3030287 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Apr 2017 09:58:55 -0500
Subject: [PATCH 1615/1744] qt58.qtbase: clean up CMake path sed scripts

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

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 0ad353d9681..b0f79af0d09 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -47,10 +47,10 @@ stdenv.mkDerivation {
       substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
       sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
 
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
-      sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
+      sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in
+      sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
+      sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
+      sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
     ''
 
     + lib.optionalString mesaSupported ''

From a579e0129c56c822afca2b201c22b00917d02915 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Apr 2017 12:31:05 -0500
Subject: [PATCH 1616/1744] qt58.qtbase: clean up configuration

---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 192 ++++++++++--------
 1 file changed, 106 insertions(+), 86 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index b0f79af0d09..a7d4cab86c3 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -95,110 +95,124 @@ stdenv.mkDerivation {
 
   # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
   # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
+  configureFlags =
+    [
+      "-verbose"
+      "-confirm-license"
+      "-opensource"
 
-    -release
-    -shared
-    ${lib.optionalString developerBuild "-developer-build"}
-    -accessibility
-    -optimized-qmake
-    -strip
-    -no-reduce-relocations
-    -system-proxies
-    -pkg-config
+      "-release"
+      "-shared"
+      "-accessibility"
+      "-optimized-qmake"
+      "-strip"
+      "-no-reduce-relocations"
+      "-system-proxies"
+      "-pkg-config"
+    ]
+    ++ lib.optional developerBuild "-developer-build"
 
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -icu
-    -pch
+    ++ [
+      "-gui"
+      "-widgets"
+      "-opengl desktop"
+      "-qml-debug"
+      "-icu"
+      "-pch"
+    ]
 
-    ${lib.optionalString (!system-x86_64) "-no-sse2"}
-    -no-sse3
-    -no-ssse3
-    -no-sse4.1
-    -no-sse4.2
-    -no-avx
-    -no-avx2
-    -no-mips_dsp
-    -no-mips_dspr2
+    ++ [
+      ''${lib.optionalString (!system-x86_64) "-no"}-sse2''
+      "-no-sse3"
+      "-no-ssse3"
+      "-no-sse4.1"
+      "-no-sse4.2"
+      "-no-avx"
+      "-no-avx2"
+      "-no-mips_dsp"
+      "-no-mips_dspr2"
+    ]
 
-    -system-zlib
-    -system-libjpeg
-    -system-harfbuzz
-    -system-pcre
-    -openssl-linked
+    ++ [
+      "-system-zlib"
+      "-system-libjpeg"
+      "-system-harfbuzz"
+      "-system-pcre"
+      "-openssl-linked"
+      "-system-sqlite"
+      ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
+      ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
 
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
+      "-make libs"
+      "-make tools"
+      ''-${lib.optionalString (buildExamples == false) "no"}make examples''
+      ''-${lib.optionalString (buildTests == false) "no"}make tests''
+      "-v"
+    ]
 
-    -make libs
-    -make tools
-    -${lib.optionalString (buildExamples == false) "no"}make examples
-    -${lib.optionalString (buildTests == false) "no"}make tests
-    -v
-  '' + lib.optionalString (!stdenv.isDarwin) ''
-    -rpath
-    -glib
-    -xcb
-    -qpa xcb
+    ++ lib.optionals (!stdenv.isDarwin) [
+      "-rpath"
+      "-glib"
+      "-xcb"
+      "-qpa xcb"
+      ''-${lib.optionalString (cups == null) "no-"}cups''
 
-    -${lib.optionalString (cups == null) "no-"}cups
+      "-no-eglfs"
+      "-no-directfb"
+      "-no-linuxfb"
+      "-no-kms"
 
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
+      "-libinput"
+      "-gtk"
+      "-system-libpng"
+      "-system-xcb"
+      "-system-xkbcommon"
+      "-dbus-linked"
+    ]
 
-    -libinput
-    -gtk
-    -system-libpng
-    -system-xcb
-    -system-xkbcommon
-    -dbus-linked
-  '' + lib.optionalString stdenv.isDarwin ''
-    -platform macx-clang
-    -no-use-gold-linker
-    -no-fontconfig
-    -qt-freetype
-    -qt-libpng
-  '';
+    ++ lib.optionals stdenv.isDarwin [
+      "-platform macx-clang"
+      "-no-use-gold-linker"
+      "-no-fontconfig"
+      "-qt-freetype"
+      "-qt-libpng"
+    ];
 
   # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
   # if dependency paths contain the string "pq", which can occur in the hash.
   # To prevent these failures, we need to override PostgreSQL detection.
   PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
-  propagatedBuildInputs = [
-    libxml2 libxslt openssl pcre16 sqlite zlib
+  propagatedBuildInputs =
+    [
+      libxml2 libxslt openssl pcre16 sqlite zlib
 
-    # Text rendering
-    harfbuzz icu
+      # Text rendering
+      harfbuzz icu
 
-    # Image formats
-    libjpeg libpng libtiff
-  ]
-  ++ lib.optional mesaSupported mesa
-  ++ lib.optionals (!stdenv.isDarwin) [
-    dbus glib udev
+      # Image formats
+      libjpeg libpng libtiff
+    ]
 
-    # Text rendering
-    fontconfig freetype
+    ++ lib.optional mesaSupported mesa
 
-    # X11 libs
-    libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
-    xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
-  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    AGL AppKit ApplicationServices Carbon Cocoa
-    CoreAudio CoreBluetooth CoreLocation CoreServices
-    DiskArbitration Foundation OpenGL
-    darwin.cf-private darwin.libobjc libiconv
-  ]);
+    ++ lib.optionals (!stdenv.isDarwin) [
+      dbus glib udev
+
+      # Text rendering
+      fontconfig freetype
+
+      # X11 libs
+      libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
+      xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
+    ]
+
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      AGL AppKit ApplicationServices Carbon Cocoa
+      CoreAudio CoreBluetooth CoreLocation CoreServices
+      DiskArbitration Foundation OpenGL
+      darwin.cf-private darwin.libobjc libiconv
+    ]);
 
   buildInputs = [ ]
     ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
@@ -207,7 +221,9 @@ stdenv.mkDerivation {
     ++ lib.optional (mysql != null) mysql.lib
     ++ lib.optional (postgresql != null) postgresql;
 
-  nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
+  nativeBuildInputs =
+    [ bison flex gperf lndir perl pkgconfig python2 ]
+    ++ lib.optional (!stdenv.isDarwin) patchelf;
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE =
@@ -222,8 +238,10 @@ stdenv.mkDerivation {
         then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
         else ''-DNIXPKGS_LIBDBUS=""'')
     ]
+
     ++ lib.optional mesaSupported
        ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
+
     ++ lib.optionals stdenv.isDarwin
     [
       "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
@@ -269,11 +287,13 @@ stdenv.mkDerivation {
           popd
       fi
     ''
+
     # fixup .pc file (where to find 'moc' etc.)
     + lib.optionalString (!stdenv.isDarwin) ''
       sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
           -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
+
     # Don' move .prl files on darwin because they end up in
     # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
     # use of lndir in the qtbase setup-hook. On Linux, the .prl files

From 30620805725b3afb817d34c94a3e0c079a2ebc2f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Apr 2017 12:32:20 -0500
Subject: [PATCH 1617/1744] qt58.qtbase: remove SSL decryption patch

This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
---
 .../qt-5/5.8/qtbase/decrypt-ssl-traffic.patch       | 13 -------------
 .../libraries/qt-5/5.8/qtbase/default.nix           |  7 ++++---
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 495db07cfbb..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-@@ -48,7 +48,7 @@
- ****************************************************************************/
- 
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
- 
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index a7d4cab86c3..8c666c95bec 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -38,8 +38,7 @@ stdenv.mkDerivation {
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
-    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch;
+    ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)];
 
   postPatch =
     ''
@@ -249,7 +248,9 @@ stdenv.mkDerivation {
       # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
       # 10.9 which necessitates the above macro definition that mentions
       # 10.10
-    ];
+    ]
+
+    ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC";
 
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do

From 4bd911dcd68bdb5747beea47f4e962239438244e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 17 Apr 2017 08:02:48 -0500
Subject: [PATCH 1618/1744] qtbase: fill in configure flags

---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 8c666c95bec..719afe75a53 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -105,7 +105,6 @@ stdenv.mkDerivation {
       "-accessibility"
       "-optimized-qmake"
       "-strip"
-      "-no-reduce-relocations"
       "-system-proxies"
       "-pkg-config"
     ]
@@ -151,22 +150,27 @@ stdenv.mkDerivation {
 
     ++ lib.optionals (!stdenv.isDarwin) [
       "-rpath"
-      "-glib"
+
+      "-system-xcb"
       "-xcb"
       "-qpa xcb"
-      ''-${lib.optionalString (cups == null) "no-"}cups''
+
+      "-system-xkbcommon"
+      "-libinput"
+      "-xkbcommon-evdev"
 
       "-no-eglfs"
-      "-no-directfb"
-      "-no-linuxfb"
+      "-no-gbm"
       "-no-kms"
+      "-no-linuxfb"
 
-      "-libinput"
-      "-gtk"
-      "-system-libpng"
-      "-system-xcb"
-      "-system-xkbcommon"
+      ''-${lib.optionalString (cups == null) "no-"}cups''
       "-dbus-linked"
+      "-glib"
+      "-gtk"
+      "-inotify"
+      "-system-libjpeg"
+      "-system-libpng"
     ]
 
     ++ lib.optionals stdenv.isDarwin [

From 0d0858202c4bd202eac4623c023a8764ee7a0149 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 17 Apr 2017 08:04:19 -0500
Subject: [PATCH 1619/1744] qtbase: unify Linux and Darwin patchsets

---
 .../qt-5/5.8/qtbase/cmake-paths-darwin.patch  | 384 ------------------
 .../qt-5/5.8/qtbase/cmake-paths.patch         | 180 ++++----
 .../libraries/qt-5/5.8/qtbase/default.nix     |  38 +-
 .../libraries/qt-5/5.8/qtbase/series          |   1 +
 4 files changed, 103 insertions(+), 500 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
deleted file mode 100644
index da7f36542ef..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
-
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
--    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(NOT EXISTS \"${imported_location}\")
-+        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-     )
-
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
--    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
--    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
--    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
--        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
--        )
--    endif()
--!!ENDIF
- endmacro()
- !!ENDIF
-
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
--      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
--    )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
--    )
--!!ELSE
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+        \"\"
-     )
- !!ELSE
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
-     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
-
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
--!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
--        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ELSE
--        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ENDIF
-+        set(imported_location \"${PLUGIN_LOCATION}\")
-         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
-         set_target_properties(Qt5::${Plugin} PROPERTIES
-             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
-     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
-     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
-     add_executable(Qt5::uic IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
-     add_executable(Qt5::qmake IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
-     add_executable(Qt5::moc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
-     add_executable(Qt5::rcc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
-     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
-     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
-     add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
-     add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
-     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
-@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
-
-     win32 {
-         isEmpty(CMAKE_STATIC_TYPE) {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
-         } else:mingw {
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
-         } else {                         # MSVC static
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
-         }
-     } else {
-         mac {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
-             else: CMAKE_PlUGIN_EXT = .a
-
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         } else {
-             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
-             else: CMAKE_PlUGIN_EXT = .a
-
--            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
--            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-         }
-     }
-     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
-
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
-
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
index 0d5c2d51092..c43653558e3 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
@@ -1,7 +1,7 @@
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
  endif()
  !!ENDIF
@@ -45,7 +45,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE
      set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  !!ENDIF
-@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+@@ -74,19 +53,6 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
          \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
      )
  
@@ -65,23 +65,26 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  endmacro()
  !!ENDIF
  
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
+@@ -95,24 +61,24 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
--    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
+ !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
 -      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
 -      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
--    )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
++      \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
++      \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+     )
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
--    )
--!!ELSE
--    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
++        \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
++        \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
  !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
 -    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
 +    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
@@ -94,27 +97,17 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
-     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+@@ -255,7 +221,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+ !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
++    if (EXISTS \"@NIX_OUT@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+     if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+@@ -263,13 +229,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
@@ -129,31 +122,17 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
- 
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- 
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+@@ -292,7 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+ !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
--    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
--        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
++    if (EXISTS \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+     if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+@@ -300,13 +266,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
@@ -168,12 +147,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -328,11 +294,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -186,10 +160,10 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
          _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
          set_target_properties(Qt5::${Plugin} PROPERTIES
              \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,7 +2,7 @@
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
@@ -215,10 +189,10 @@ Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
      add_executable(Qt5::uic IMPORTED)
  
@@ -228,10 +202,10 @@ Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
      add_executable(Qt5::qmake IMPORTED)
  
@@ -277,10 +251,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
@@ -289,10 +263,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForIn
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
@@ -301,10 +275,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmak
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
      add_executable(Qt5::qdbuscpp2xml IMPORTED)
  
@@ -323,10 +297,27 @@ Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+ 
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+ 
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf
++++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
 @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
  
      win32 {
@@ -338,7 +329,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
          } else:mingw {
 -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
 -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
-+            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
++            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}.a
 +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
          } else {                         # MSVC static
 -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
@@ -366,20 +357,3 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
          }
      }
      cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
- 
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
- 
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 719afe75a53..52e24eceea9 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -37,8 +37,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)];
+    copyPathsToStore (lib.readPathsFromFile ./. ./series);
 
   postPatch =
     ''
@@ -280,15 +279,33 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
+    ''
 
-      # Move libtool archives and qmake projects
+    # Move libtool archives into $dev
+    + ''
       if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
           pushd "''${!outputLib}"
-          find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
-              while read -r file; do
-                  mkdir -p "''${!outputDev}/$(dirname "$file")"
-                  mv "''${!outputLib}/$file" "''${!outputDev}/$file"
-              done
+          find lib -name '*.a' -o -name '*.la' | while read -r file; do
+              mkdir -p "''${!outputDev}/$(dirname "$file")"
+              mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+          done
+          popd
+      fi
+    ''
+
+    # Move qmake project files into $dev.
+    # Don't move .prl files on darwin because they end up in
+    # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
+    # use of lndir in the qtbase setup-hook. On Linux, the .prl files
+    # are in lib, and so do not cause a subsequent recreation of deep
+    # framework directory trees.
+    + lib.optionalString (!stdenv.isDarwin) ''
+      if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+          pushd "''${!outputLib}"
+          find lib -name '*.prl' | while read -r file; do
+              mkdir -p "''${!outputDev}/$(dirname "$file")"
+              mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+          done
           popd
       fi
     ''
@@ -299,11 +316,6 @@ stdenv.mkDerivation {
           -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
 
-    # Don' move .prl files on darwin because they end up in
-    # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
-    # use of lndir in the qtbase setup-hook. On Linux, the .prl files
-    # are in lib, and so do not cause a subsequent recreation of deep
-    # framework directory trees.
     + lib.optionalString stdenv.isDarwin ''
       fixDarwinDylibNames_rpath() {
         local flags=()
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 9939aea7400..afce06826c6 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -8,3 +8,4 @@ compose-search-path.patch
 libressl.patch
 qpa-plugin-path.patch
 dlopen-gl.patch
+cmake-paths.patch

From bd92780b4c8b1803b570491eb40e4d4d8dbfaad5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 18 Apr 2017 05:47:39 -0500
Subject: [PATCH 1620/1744] sddm: include dependency on Qt5::Test module

---
 pkgs/applications/display-managers/sddm/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index f675febafb5..d1f487b37ac 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -25,6 +25,12 @@ let
       })
     ];
 
+    postPatch =
+      # Module Qt5::Test must be included in `find_package` before it is used.
+      ''
+        sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
+      '';
+
     nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
     buildInputs = [

From c37220fcf92f590be66bfc7289e498044d429640 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 18 Apr 2017 08:11:17 -0500
Subject: [PATCH 1621/1744] kwindowsystem: purify platform plugin detection

---
 .../libraries/kde-frameworks/default.nix      |  2 +-
 .../default.nix}                              |  6 ++++-
 .../kwindowsystem/platform-plugins-path.patch | 22 +++++++++++++++++++
 .../kde-frameworks/kwindowsystem/series       |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/kde-frameworks/{kwindowsystem.nix => kwindowsystem/default.nix} (61%)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/series

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 2906dc78886..221fba628ba 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -96,7 +96,7 @@ let
       kwallet = callPackage ./kwallet.nix {};
       kwayland = callPackage ./kwayland.nix {};
       kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-      kwindowsystem = callPackage ./kwindowsystem.nix {};
+      kwindowsystem = callPackage ./kwindowsystem {};
       kxmlgui = callPackage ./kxmlgui.nix {};
       kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
       modemmanager-qt = callPackage ./modemmanager-qt.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
similarity index 61%
rename from pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
rename to pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 4bfd813ff93..8a91bdbac52 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeFramework, lib,
+  kdeFramework, lib, copyPathsToStore,
   extra-cmake-modules,
   qtbase, qttools, qtx11extras
 }:
@@ -12,4 +12,8 @@ kdeFramework {
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/lib/qt5/plugins\""
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
new file mode 100644
index 00000000000..ed24897d342
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
@@ -0,0 +1,22 @@
+Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp
+===================================================================
+--- kwindowsystem-5.32.0.orig/src/pluginwrapper.cpp
++++ kwindowsystem-5.32.0/src/pluginwrapper.cpp
+@@ -37,14 +37,9 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
+ static QStringList pluginCandidates()
+ {
+     QStringList ret;
+-    foreach (const QString &path, QCoreApplication::libraryPaths()) {
+-        QDir pluginDir(path + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
+-        if (!pluginDir.exists()) {
+-            continue;
+-        }
+-        foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
+-            ret << pluginDir.absoluteFilePath(entry);
+-        }
++    QDir pluginDir(QStringLiteral(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
++    foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
++        ret << pluginDir.absoluteFilePath(entry);
+     }
+     return ret;
+ }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series
new file mode 100644
index 00000000000..2cd02056ff8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series
@@ -0,0 +1 @@
+platform-plugins-path.patch

From b70837e054e61c77c7238e04641a83eade50017d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Apr 2017 12:24:32 -0500
Subject: [PATCH 1622/1744] nixos/plasma5: set system-wide QT_PLUGIN_PATH

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d981cd5328e..2216104be31 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -183,6 +183,7 @@ in
       environment.variables = {
         # Enable GTK applications to load SVG icons
         GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+        QT_PLUGIN_PATH = "/run/current-system/sw/lib/qt5/plugins";
       };
 
       fonts.fonts = with pkgs; [ noto-fonts hack-font ];

From 5735edb894396f80d6703cf181fd0e05f2b9a69c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Apr 2017 12:29:14 -0500
Subject: [PATCH 1623/1744] qt58.qtbase: remove OpenSSL library paths patch

Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
---
 .../libraries/qt-5/5.8/qtbase/default.nix     |  2 --
 .../qt-5/5.8/qtbase/dlopen-openssl.patch      | 26 -------------------
 .../libraries/qt-5/5.8/qtbase/series          |  1 -
 3 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 52e24eceea9..ab696d28021 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -234,8 +234,6 @@ stdenv.mkDerivation {
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
       ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-      ''-DNIXPKGS_LIBSSL="${openssl.out}/lib/libssl"''
-      ''-DNIXPKGS_LIBCRYPTO="${openssl.out}/lib/libcrypto"''
       (if stdenv.isLinux
         then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
         else ''-DNIXPKGS_LIBDBUS=""'')
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
deleted file mode 100644
index 943b1c569fd..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -681,8 +681,8 @@ static QPair<QLibrary*, QLibrary*> loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBSSL), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -699,8 +699,8 @@ static QPair<QLibrary*, QLibrary*> loadO
-     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBSSL), -1);
-+    libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index afce06826c6..37278bd5dba 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -1,7 +1,6 @@
 dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
-dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
 compose-search-path.patch

From 577c4f543b53bb921a61e54e73c95436db2a29cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Apr 2017 12:30:41 -0500
Subject: [PATCH 1624/1744] qt58.qtbase: remove D-Bus library paths patch

Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
---
 .../libraries/qt-5/5.8/qtbase/default.nix           |  3 ---
 .../libraries/qt-5/5.8/qtbase/dlopen-dbus.patch     | 13 -------------
 pkgs/development/libraries/qt-5/5.8/qtbase/series   |  1 -
 3 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index ab696d28021..c0454e91add 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -234,9 +234,6 @@ stdenv.mkDerivation {
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
       ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-      (if stdenv.isLinux
-        then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
-        else ''-DNIXPKGS_LIBDBUS=""'')
     ]
 
     ++ lib.optional mesaSupported
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 067d898cda4..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/dbus/qdbus_symbols.cpp
-+++ qtbase-opensource-src-5.8.0/src/dbus/qdbus_symbols.cpp
-@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
-         QLatin1String("dbus-1"),
- #endif
--        QLatin1String("libdbus-1")
-+        QLatin1String("@dbus_libs@/lib/libdbus-1")
-     };
- 
-     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 37278bd5dba..dfe9575d8b2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -1,7 +1,6 @@
 dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
-dlopen-dbus.patch
 xdg-config-dirs.patch
 compose-search-path.patch
 libressl.patch

From be6a7da8e74d56f334400b92b41a4753bb9e721f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Apr 2017 16:29:32 -0500
Subject: [PATCH 1625/1744] kdeDerivation: make overridable

---
 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 70c7de19d43..bad55455b23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -273,7 +273,8 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; };
+  kdeDerivation = makeOverridable (import ../build-support/kde/derivation.nix)
+    { inherit stdenv lib; };
 
   kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
     inherit (gnome3) dconf;

From 394885daec4d9bb4e189a4a4042e442067573bba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 23 Apr 2017 08:55:01 -0500
Subject: [PATCH 1626/1744] kdeWrapper: prefix Qt search paths

---
 pkgs/build-support/kde/wrapper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix
index 228eb696bd9..4442b111d79 100644
--- a/pkgs/build-support/kde/wrapper.nix
+++ b/pkgs/build-support/kde/wrapper.nix
@@ -48,9 +48,9 @@ stdenv.mkDerivation {
                     --suffix PATH : "$env/bin" \
                     --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
                     --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-                    --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
-                    --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
-                    --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" \
+                    --prefix QML_IMPORT_PATH : "$env/lib/qt5/imports" \
+                    --prefix QML2_IMPORT_PATH : "$env/lib/qt5/qml" \
+                    --prefix QT_PLUGIN_PATH : "$env/lib/qt5/plugins" \
                     --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
                 good="1"
                 break

From 594ee6d570f1962eb7cdd66862e001373bfa440e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 23 Apr 2017 10:27:31 -0500
Subject: [PATCH 1627/1744] kinit: set absolute path to extra libraries

---
 .../kde-frameworks/kinit/default.nix          | 10 +++-
 .../kinit/kdeinit-extra_libs.patch            | 49 +++++++++++++++++++
 .../libraries/kde-frameworks/kinit/series     |  1 +
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index b965f761e92..f5cfa166e91 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,9 +1,12 @@
 {
   kdeFramework, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  kconfig, kcrash, ki18n, kio, kservice, kwindowsystem
+  kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
 
+let
+  inherit (lib) getLib;
+in
 kdeFramework {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
@@ -12,4 +15,9 @@ kdeFramework {
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_KF5_KIOCORE="${getLib kio}/lib/libKF5KIOCore.so.5"''
+    ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
+    ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
+  ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
new file mode 100644
index 00000000000..75e632d4129
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
@@ -0,0 +1,49 @@
+Index: kinit-5.32.0/src/kdeinit/kinit.cpp
+===================================================================
+--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
++++ kinit-5.32.0/src/kdeinit/kinit.cpp
+@@ -96,11 +96,9 @@ static const char *extra_libs[] = {
+     "libKF5Parts.5.dylib",
+     "libKF5Plasma.5.dylib"
+ #else
+-    "libKF5KIOCore.so.5",
+-    "libKF5Parts.so.5",
+-//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see.
+-    "libKF5Plasma.so.5"
+-//#endif
++    NIXPKGS_KF5_KIOCORE,
++    NIXPKGS_KF5_PARTS,
++    NIXPKGS_KF5_PLASMA
+ #endif
+ };
+ #endif
+@@ -1533,20 +1531,6 @@ static int initXconnection()
+ }
+ #endif
+ 
+-#ifndef Q_OS_OSX
+-// Find a shared lib in the lib dir, e.g. libkio.so.
+-// Completely unrelated to plugins.
+-static QString findSharedLib(const QString &lib)
+-{
+-    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib;
+-    if (QFile::exists(path)) {
+-        return path;
+-    }
+-    // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes?
+-    return QString();
+-}
+-#endif
+-
+ extern "C" {
+ 
+     static void secondary_child_handler(int)
+@@ -1692,7 +1676,7 @@ int main(int argc, char **argv)
+     if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
+         const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);
+         for (int i = 0; i < extrasCount; i++) {
+-            const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));
++            const QString extra = QString::fromLatin1(extra_libs[i]);
+             if (!extra.isEmpty()) {
+                 QLibrary l(extra);
+                 l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series
index 576b8a935bf..9195a4e8e6b 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/series
+++ b/pkgs/development/libraries/kde-frameworks/kinit/series
@@ -1,2 +1,3 @@
 kinit-libpath.patch
 start_kdeinit-path.patch
+kdeinit-extra_libs.patch

From 52ac15953e77cb2b1bff48789d1eb73411d7107b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 23 Apr 2017 10:28:03 -0500
Subject: [PATCH 1628/1744] makeQtWrapper: prefix Qt search paths

---
 pkgs/development/libraries/qt-5/make-qt-wrapper.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index 8f42682fa23..4a5651f74c9 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -2,9 +2,9 @@ wrapQtProgram() {
     local prog="$1"
     shift
     wrapProgram "$prog" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
+        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
         --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
@@ -17,9 +17,9 @@ makeQtWrapper() {
     shift
     shift
     makeWrapper "$old" "$new" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
+        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
         --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \

From 64418af8c524888377ec8e94ba7a7c18b82cb3d5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 23 Apr 2017 17:52:48 -0500
Subject: [PATCH 1629/1744] qt58.qtbase: fix developer build

---
 .../libraries/qt-5/5.8/qtbase/default.nix          |  6 ++++--
 .../5.8/qtbase/qnativesocketengine-type-pun.patch  | 14 ++++++++++++++
 pkgs/development/libraries/qt-5/5.8/qtbase/series  |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index c0454e91add..855db57688b 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -107,8 +107,10 @@ stdenv.mkDerivation {
       "-system-proxies"
       "-pkg-config"
     ]
-    ++ lib.optional developerBuild "-developer-build"
-
+    ++ lib.optionals developerBuild [
+      "-developer-build"
+      "-no-warnings-are-errors"
+    ]
     ++ [
       "-gui"
       "-widgets"
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch
new file mode 100644
index 00000000000..ad40dfab2f7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch
@@ -0,0 +1,14 @@
+Index: qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/network/socket/qnativesocketengine_unix.cpp
++++ qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp
+@@ -979,7 +979,8 @@ qint64 QNativeSocketEnginePrivate::nativ
+             if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int))
+                     && ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT)
+                         || (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) {
+-                header->hopLimit = *reinterpret_cast<int *>(CMSG_DATA(cmsgptr));
++                int *ttl = reinterpret_cast<int *>(CMSG_DATA(cmsgptr));
++                header->hopLimit = *ttl;
+             }
+ 
+ #ifndef QT_NO_SCTP
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index dfe9575d8b2..0378ca1f503 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -2,8 +2,8 @@ dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
 xdg-config-dirs.patch
-compose-search-path.patch
 libressl.patch
 qpa-plugin-path.patch
 dlopen-gl.patch
+compose-search-path.patch
 cmake-paths.patch

From 9f00e2be1805e8940e950cf144351f53bbd364ed Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 25 Apr 2017 06:05:45 -0500
Subject: [PATCH 1630/1744] qt58.qtbase: fix warnings in TZDIR patch

---
 .../libraries/qt-5/5.8/qtbase/tzdir.patch         | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
index f48ac761ccf..b8c05815a78 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
@@ -2,28 +2,27 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
 --- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
 +++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -70,7 +70,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
+@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> Q
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
 -    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+    QString path = qgetenv("TZDIR");
-+    path += "/zone.tab";
++    // Try TZDIR first, in case we're running on NixOS.
++    QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
++    // Fallback to traditional paths in case we are not on NixOS.
 +    if (!QFile::exists(path))
 +        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -642,12 +645,18 @@ void QTzTimeZonePrivate::init(const QByt
+@@ -642,12 +646,16 @@ void QTzTimeZonePrivate::init(const QByt
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
 -        // Open named tz, try modern path first, if fails try legacy path
 -        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+        // Try TZDIR first
-+        QString zoneinfoDir = qgetenv("TZDIR");
-+        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+        tzif.setFileName(zoneinfoDir);
++        // Try TZDIR first, in case we're running on NixOS
++        tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
          if (!tzif.open(QIODevice::ReadOnly)) {
 -            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
 -            if (!tzif.open(QIODevice::ReadOnly))

From 18f95ce5d94919c4c3d17b1b9537daa0505f9b40 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 25 Apr 2017 06:06:05 -0500
Subject: [PATCH 1631/1744] kinit: don't use obsolete macros in library paths
 patch

---
 .../kde-frameworks/kinit/kinit-libpath.patch        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
index a5c76fca248..b949723fb54 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
@@ -1,8 +1,8 @@
-Index: kinit-5.24.0/src/kdeinit/kinit.cpp
+Index: kinit-5.32.0/src/kdeinit/kinit.cpp
 ===================================================================
---- kinit-5.24.0.orig/src/kdeinit/kinit.cpp
-+++ kinit-5.24.0/src/kdeinit/kinit.cpp
-@@ -672,19 +672,16 @@ static pid_t launch(int argc, const char
+--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
++++ kinit-5.32.0/src/kdeinit/kinit.cpp
+@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char
  
          if (!libpath.isEmpty()) {
              if (libpath_relative) {
@@ -23,10 +23,9 @@ Index: kinit-5.24.0/src/kdeinit/kinit.cpp
 +                QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
 +                // Reverse the profile list.
 +                std::reverse(profiles.begin(), profiles.end());
-+                const QString libdir = QString::fromLatin1("/lib/");
-+                Q_FOREACH (const QByteArray &profile, profiles) {
++                for (const QByteArray &profile: profiles) {
 +                    if (!profile.isEmpty()) {
-+                        l.setFileName(QFile::decodeName(profile) + libdir + libpath);
++                        l.setFileName(QFile::decodeName(profile) + QStringLiteral("/lib/") + libpath);
 +                        if (l.load()) break;
 +                    }
                  }

From 2716e5bd80878cb5c4cf47ed2424e644dc8a62cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 25 Apr 2017 07:12:11 -0500
Subject: [PATCH 1632/1744] qt58.qtbase: cleanup: sort attributes

---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 142 +++++++++---------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 855db57688b..e11d9dd1f29 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -34,6 +34,48 @@ stdenv.mkDerivation {
   name = "qtbase-${version}";
   inherit src version;
 
+  propagatedBuildInputs =
+    [
+      libxml2 libxslt openssl pcre16 sqlite zlib
+
+      # Text rendering
+      harfbuzz icu
+
+      # Image formats
+      libjpeg libpng libtiff
+    ]
+
+    ++ lib.optional mesaSupported mesa
+
+    ++ lib.optionals (!stdenv.isDarwin) [
+      dbus glib udev
+
+      # Text rendering
+      fontconfig freetype
+
+      # X11 libs
+      libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
+      xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
+    ]
+
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      AGL AppKit ApplicationServices Carbon Cocoa
+      CoreAudio CoreBluetooth CoreLocation CoreServices
+      DiskArbitration Foundation OpenGL
+      darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
+    ]);
+
+  buildInputs = [ ]
+    ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql;
+
+  nativeBuildInputs =
+    [ bison flex gperf lndir perl pkgconfig python2 ]
+    ++ lib.optional (!stdenv.isDarwin) patchelf;
+
   outputs = [ "out" "dev" ];
 
   patches =
@@ -89,8 +131,36 @@ stdenv.mkDerivation {
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins\""
   '';
 
+
+  NIX_CFLAGS_COMPILE =
+    [
+      "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
+      ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+      ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
+      ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+    ]
+
+    ++ lib.optional mesaSupported
+       ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
+
+    ++ lib.optionals stdenv.isDarwin
+    [
+      "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
+      "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"
+      # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
+      # 10.9 which necessitates the above macro definition that mentions
+      # 10.10
+    ]
+
+    ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC";
+
   prefixKey = "-prefix ";
 
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
+
   # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
   # TODO Remove obsolete and useless flags once the build will be totally mastered
   configureFlags =
@@ -182,75 +252,7 @@ stdenv.mkDerivation {
       "-qt-libpng"
     ];
 
-  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-  # if dependency paths contain the string "pq", which can occur in the hash.
-  # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
-  propagatedBuildInputs =
-    [
-      libxml2 libxslt openssl pcre16 sqlite zlib
-
-      # Text rendering
-      harfbuzz icu
-
-      # Image formats
-      libjpeg libpng libtiff
-    ]
-
-    ++ lib.optional mesaSupported mesa
-
-    ++ lib.optionals (!stdenv.isDarwin) [
-      dbus glib udev
-
-      # Text rendering
-      fontconfig freetype
-
-      # X11 libs
-      libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
-      xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
-    ]
-
-    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      AGL AppKit ApplicationServices Carbon Cocoa
-      CoreAudio CoreBluetooth CoreLocation CoreServices
-      DiskArbitration Foundation OpenGL
-      darwin.cf-private darwin.libobjc libiconv
-    ]);
-
-  buildInputs = [ ]
-    ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
-    ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
-
-  nativeBuildInputs =
-    [ bison flex gperf lndir perl pkgconfig python2 ]
-    ++ lib.optional (!stdenv.isDarwin) patchelf;
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE =
-    [
-      "-Wno-error=sign-compare"
-      ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
-      ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
-      ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-    ]
-
-    ++ lib.optional mesaSupported
-       ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
-
-    ++ lib.optionals stdenv.isDarwin
-    [
-      "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
-      "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"
-      # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
-      # 10.9 which necessitates the above macro definition that mentions
-      # 10.10
-    ]
-
-    ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC";
+  enableParallelBuilding = true;
 
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
@@ -334,8 +336,6 @@ stdenv.mkDerivation {
               then ../../qtbase-setup-hook-darwin.sh
               else ../../qtbase-setup-hook.sh;
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";

From 901a778c7744b25013168dde1a2a548ad531fd78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 25 Apr 2017 07:30:15 -0500
Subject: [PATCH 1633/1744] makeScope: prevent name collision with
 makeOverridable

---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 4853290db54..cf28137cb8a 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -177,7 +177,7 @@ rec {
     let self = f self // {
           newScope = scope: newScope (self // scope);
           callPackage = self.newScope {};
-          override = g:
+          overrideScope = g:
             makeScope newScope
             (self_: let super = f self_; in super // g super self_);
           packages = f;

From 6fa2979ebcaa98be0d978474cfbaa68d8d19a896 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 25 Apr 2017 07:32:51 -0500
Subject: [PATCH 1634/1744] qt5: make package sets overridable

---
 pkgs/top-level/all-packages.nix | 44 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bad55455b23..0e79ff1d862 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9526,30 +9526,32 @@ with pkgs;
     developerBuild = true;
   });
 
-  qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 {
-    inherit newScope;
-    inherit stdenv fetchurl makeSetupHook makeWrapper;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-    inherit cups;
-    harfbuzz = harfbuzz-icu;
-    mesa = mesa_noglu;
-    inherit perl;
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-  });
+  qt56 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.6) {
+      inherit newScope;
+      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      bison = bison2; # error: too few arguments to function 'int yylex(...
+      inherit cups;
+      harfbuzz = harfbuzz-icu;
+      mesa = mesa_noglu;
+      inherit perl;
+      inherit (gst_all_1) gstreamer gst-plugins-base;
+    });
 
   libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5);
 
-  qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 {
-    inherit newScope;
-    inherit stdenv fetchurl makeSetupHook makeWrapper;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-    inherit cups;
-    harfbuzz = harfbuzz-icu;
-    mesa = mesa_noglu;
-    inherit perl;
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-    inherit (gnome3) gtk3 dconf;
-  });
+  qt58 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.8) {
+      inherit newScope;
+      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      bison = bison2; # error: too few arguments to function 'int yylex(...
+      inherit cups;
+      harfbuzz = harfbuzz-icu;
+      mesa = mesa_noglu;
+      inherit perl;
+      inherit (gst_all_1) gstreamer gst-plugins-base;
+      inherit (gnome3) gtk3 dconf;
+    });
 
   libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);
 

From 951b6b8a7f7657339a832db5cca86892b7a1a958 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 28 Apr 2017 06:27:19 -0500
Subject: [PATCH 1635/1744] plasma-workspace: 5.9.5 -> 5.9.5.1

---
 pkgs/desktops/plasma-5/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 8a19b561e2c..678c44d6e69 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -267,11 +267,11 @@
     };
   };
   plasma-workspace = {
-    version = "5.9.5";
+    version = "5.9.5.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-5.9.5.tar.xz";
-      sha256 = "0mbbddz8hlhxqm5z2a9iilrj44gr7bk5n4zab1x3df2msh0lxqxb";
-      name = "plasma-workspace-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz";
+      sha256 = "07lbq3b3h0ibf4xbk4mxyi3kx17wrqv0s1bqf01azm1wgni70xw5";
+      name = "plasma-workspace-5.9.5.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {

From 959fadb86ec9a523767c6da71fa0df544bae8844 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Fri, 28 Apr 2017 14:40:06 +0200
Subject: [PATCH 1636/1744] yesod-auth-oauth2: jailbreak because of outdated
 dependencies

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

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 8eb87279c79..d91d25b8d31 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -52,4 +52,8 @@ self: super: {
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
+  # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
+  yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
+
+
 }

From 330e8004967a19c5040dedb63636d79463deffed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Apr 2017 14:51:25 +0200
Subject: [PATCH 1637/1744] nixos: hydra: sync with upstream hydra module

---
 nixos/modules/services/continuous-integration/hydra/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 57f592a2e55..c515622d11a 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -233,6 +233,7 @@ in
           hydra_logo ${cfg.logo}
         ''}
         gc_roots_dir ${cfg.gcRootsDir}
+        use-substitutes = ${if cfg.useSubstitutes then "1" else "0"}
       '';
 
     environment.systemPackages = [ cfg.package ];

From 6adc79d72b1a962e446ba6df03998720c92c9174 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+github@schneefux.xyz>
Date: Fri, 28 Apr 2017 15:27:44 +0200
Subject: [PATCH 1638/1744] wallabag: 2.1.6 -> 2.2.2 (#25120)

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

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 4efb1ca9de6..c7067ffbd53 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.1.6";
+  version = "2.2.2";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
-    url = "https://framabag.org/wallabag-release-${version}.tar.gz";
-    sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx";
+    url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
+    sha256 = "0l8zba2risi8lsmff0fbgplfqdiqp7jz0f93z4lbqv8iavaqpna0";
   };
 
   outputs = [ "out" "doc" ];

From e042db5e415f8b820d91d767fcf6a7c89fcce305 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Apr 2017 17:55:53 +0200
Subject: [PATCH 1639/1744] nixUnstable: 1.12pre5152_915f62fa ->
 1.12pre5308_2f21d522

---
 pkgs/tools/package-management/nix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4074229ecf7..ffac378eaf7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
+, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
@@ -22,7 +22,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optional fromGit brotli # Since 1.12
+      ++ lib.optionals fromGit [ brotli readline ] # Since 1.12
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -145,12 +145,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5152_915f62fa";
+    suffix = "pre5308_2f21d522";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9";
-      sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
+      rev = "2f21d522c28b1e902bd7f0b5b9e7523975102d81";
+      sha256 = "1r3jxz0ydnlxp4b3ggxjgx1q9dv7jyfjm8w1srqjanzn944wnmi9";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };

From 8ab3a2a232b5347502fb4947f745933d488d3535 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Apr 2017 16:15:50 +0000
Subject: [PATCH 1640/1744] Revert "ocamlPackages.llvm: fix hash"

This reverts commit 0c8cf2809155b8a74df8feccbaa4b272a86b06ed.
---
 pkgs/development/ocaml-modules/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index b06760a6e00..3bced92cc3e 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   patches = [ (fetchpatch {
     url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
-    sha256 = "0vjap0xifgm59rwhjc48wi7jpbbif4dllsy4xs45sg95qq5qanp6";
+    sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
   })];
 
   cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];

From 2e75b4b4793c999c8a5ee79eccb359199d5631fe Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Apr 2017 16:10:11 +0000
Subject: [PATCH 1641/1744] ocamlPackages.ocurl: propagate its curl dependency

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

diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 974779e473f..94c2e120883 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr";
   };
 
-  buildInputs = [ocaml findlib curl ncurses];
+  buildInputs = [ ocaml findlib ncurses ];
+  propagatedBuildInputs = [ curl ];
   createFindlibDestdir = true;
   meta = {
     description = "OCaml bindings to libcurl";

From 1bacfb463766630dd83153cbd8fbf0f46734ed4b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Apr 2017 16:10:41 +0000
Subject: [PATCH 1642/1744] ocamlPackages.cppo: 1.3.2 -> 1.5.0

---
 pkgs/development/tools/ocaml/cppo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 59130bec50e..e778337ca5c 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 let
   pname = "cppo";
-  version = "1.3.2";
+  version = "1.5.0";
   webpage = "http://mjambon.com/${pname}.html";
 in
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "mjambon";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1";
+    sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

From 752351e889ebdf458eddcf22d31ffcecb39c75e5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Apr 2017 16:13:54 +0000
Subject: [PATCH 1643/1744] ocamlPackages: make explicit some version
 requirements

---
 pkgs/development/ocaml-modules/base/default.nix          | 3 +++
 pkgs/development/ocaml-modules/functoria/default.nix     | 3 +++
 pkgs/development/ocaml-modules/spacetime_lib/default.nix | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix
index 4c92c7f1ca1..f7627567f9c 100644
--- a/pkgs/development/ocaml-modules/base/default.nix
+++ b/pkgs/development/ocaml-modules/base/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, ocaml, jbuilder, findlib }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "base is not available for OCaml ${ocaml.version}" else
+
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-base-0.9.0";
 
diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix
index bfcdd4168ca..2d8c00c7238 100644
--- a/pkgs/development/ocaml-modules/functoria/default.nix
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@@ -2,6 +2,9 @@
 , bos, cmdliner, ocamlgraph
 }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "functoria is not available for OCaml ${ocaml.version}" else
+
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-functoria-${version}";
 	version = "2.0.2";
diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index c12e47968ef..1eb789ec269 100644
--- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix
+++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, owee }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else
+
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-spacetime_lib-${version}";
   version = "0.1.0";

From db6ba4dee7eccb3c7c9a493243eb1fb196bd6c2f Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Fri, 28 Apr 2017 18:54:34 +0200
Subject: [PATCH 1644/1744] emscripten: fix closure-compiler path

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

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f7e8d1be67d..ad1cd437ffa 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
     echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
     echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
-    echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/compiler.jar'" >> $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
   '';
 

From 5c25c33a05720f6bf947970f142b72e991e05366 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Apr 2017 20:01:33 +0200
Subject: [PATCH 1645/1744] wrapGAppsHook: Revert "Correct `wrapProgram`
 invocations"

This reverts commit 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 of
https://github.com/NixOS/nixpkgs/pull/25183 because it breaks builds of
packages that don't install both a "bin" and a "libexec" directory. See
https://github.com/NixOS/nixpkgs/pull/25183#issuecomment-298064769 for more
details.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 5d1cce6ee04..3cad1838d26 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -36,10 +36,9 @@ wrapGAppsHook() {
   done
 
   if [ -z "$dontWrapGApps" ]; then
-    find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \
-    | while IFS= read -r -d '' file; do
-      echo "Wrapping program $file"
-      wrapProgram "$file" "${gappsWrapperArgs[@]}"
+    for i in $prefix/bin/* $prefix/libexec/*; do
+      echo "Wrapping app $i"
+      wrapProgram "$i" "${gappsWrapperArgs[@]}"
     done
   fi
 }

From 76d8811d8a397a8d8f48ca67b938c2336f0e3da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 28 Apr 2017 20:05:40 +0200
Subject: [PATCH 1646/1744] youtube-dl: 2017.04.17 -> 2017.04.28

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 998f2969925..88750f6e0e1 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.04.17";
+  version = "2017.04.28";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0bihcjghrpj8skh216wwb7i2r990f6b7x63m8vdamq5bw317wvrj";
+    sha256 = "0d3mgf8qxb07b7bjf79ppaxhcl4f47q0zjpshp6y2q0lalfskh3j";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 87a4615e27bf14ab5d3949fce47aa05a81ece47c Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 18 Apr 2017 13:45:30 +0200
Subject: [PATCH 1647/1744] nixos/stage1: add copytoram support

---
 .../manual/installation/installing-usb.xml    |  5 +++++
 nixos/modules/system/boot/stage-1-init.sh     | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index dae73306056..4a74e406b14 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -34,6 +34,11 @@ ISO, copy its contents verbatim to your drive, then either:
     in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt">
     the kernel documentation</link> for more details).</para>
   </listitem>
+  <listitem>
+    <para>If you want to load the contents of the ISO to ram after bootin
+    (So you can remove the stick after bootup) you can append the parameter
+    <literal>copytoram</literal>to the <literal>options</literal> field.</para>
+  </listitem>
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index c75e637124a..9a125dcb0ae 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -154,6 +154,9 @@ for o in $(cat /proc/cmdline); do
             fi
             ln -s "$root" /dev/root
             ;;
+        copytoram)
+            copytoram=1
+            ;;
     esac
 done
 
@@ -474,6 +477,22 @@ while read -u 3 mountPoint; do
     # doing something with $device right now.
     udevadm settle
 
+    # If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs.
+    if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then
+      fsType=$(blkid -o value -s TYPE "$device")
+      fsSize=$(blockdev --getsize64 "$device")
+
+      mkdir -p /tmp-iso
+      mount -t "$fsType" /dev/root /tmp-iso
+      mountFS tmpfs /iso size="$fsSize" tmpfs
+
+      cp -r /tmp-iso/* /mnt-root/iso/
+
+      umount /tmp-iso
+      rmdir /tmp-iso
+      continue
+    fi
+
     mountFS "$device" "$mountPoint" "$options" "$fsType"
 done
 

From b8ee0d54aa11e9f23d4c7858b990374012ad2b2e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 28 Apr 2017 21:38:12 +0200
Subject: [PATCH 1648/1744] libidn2: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 9a736a38e3f..61926dad24d 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "1lzi4wng22gyzlgkr8jk75d03f2bnnch5yhmiwb0hram2la6a8qd";
+    sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];

From 1273f414a784af87363ac440af2ce948b6a656b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 23 Apr 2017 05:00:08 +0200
Subject: [PATCH 1649/1744] display-managers: Fix the xsession parameters

The xsession script was called with inconsistent (depending on the
display managers) and wrong parameters. The main reason for this where
the spaces the parameter syntax. In order to fix this the old syntax:
$1 = '<desktop-manager> + <window-manager>'
Will be replaced with a new syntax:
$1 = "<desktop-manager>+<window-manager>"

This assumes that neither "<desktop-manager>" nor "<window-manager>"
contain the "+" character but this shouldn't be a problem.

This patch also fixes the quoting by using double quotes (") instead of
single quotes (') [0].

Last but not least this'll add some comments for the better
understanding of the script.

[0]: https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
---
 .../services/x11/display-managers/default.nix | 44 +++++++++++++++----
 .../services/x11/display-managers/lightdm.nix |  2 +-
 .../services/x11/display-managers/sddm.nix    |  2 +-
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index a7dfe7ee154..cf6efb7dae7 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -32,8 +32,32 @@ let
     ''
       #! ${pkgs.bash}/bin/bash
 
-      # Handle being called by SDDM.
-      if test "''${1:0:1}" = / ; then eval exec "$1" "$2" ; fi
+      # Expected parameters:
+      #   $1 = <desktop-manager>+<window-manager>
+
+      # Actual parameters (FIXME):
+      # SDDM is calling this script like the following:
+      #   $1 = /nix/store/xxx-xsession (= $0)
+      #   $2 = <desktop-manager>+<window-manager>
+      # SLiM is using the following parameter:
+      #   $1 = /nix/store/xxx-xsession <desktop-manager>+<window-manager>
+      # LightDM keeps the double quotes:
+      #   $1 = /nix/store/xxx-xsession "<desktop-manager>+<window-manager>"
+      # The fake/auto display manager doesn't use any parameters and GDM is
+      # broken.
+      # If you want to "debug" this script don't print the parameters to stdout
+      # or stderr because this script will be executed multiple times and the
+      # output won't be visible in the log when the script is executed for the
+      # first time (e.g. append them to a file instead)!
+
+      # All of the above cases are handled by the following hack (FIXME).
+      # Since this line is *very important* for *all display managers* it is
+      # very important to test changes to the following line with all display
+      # managers:
+      if [ "''${1:0:1}" = "/" ]; then eval exec "$1" "$2" ; fi
+
+      # Now it should be safe to assume that the script was called with the
+      # expected parameters.
 
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then
@@ -107,11 +131,12 @@ let
           fi
       fi
 
-      # The session type is "<desktop-manager> + <window-manager>", so
-      # extract those.
-      windowManager="''${sessionType##* + }"
+      # The session type is "<desktop-manager>+<window-manager>", so
+      # extract those (see:
+      # http://wiki.bash-hackers.org/syntax/pe#substring_removal).
+      windowManager="''${sessionType##*+}"
       : ''${windowManager:=${cfg.windowManager.default}}
-      desktopManager="''${sessionType% + *}"
+      desktopManager="''${sessionType%%+*}"
       : ''${desktopManager:=${cfg.desktopManager.default}}
 
       # Start the window manager.
@@ -142,6 +167,9 @@ let
       exit 0
     '';
 
+  # Desktop Entry Specification:
+  # - https://standards.freedesktop.org/desktop-entry-spec/latest/
+  # - https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
   mkDesktops = names: pkgs.runCommand "desktops"
     { # trivial derivation
       preferLocalBuild = true;
@@ -155,7 +183,7 @@ let
         Version=1.0
         Type=XSession
         TryExec=${cfg.displayManager.session.script}
-        Exec=${cfg.displayManager.session.script} '${n}'
+        Exec=${cfg.displayManager.session.script} "${n}"
         X-GDM-BypassXsession=true
         Name=${n}
         Comment=
@@ -238,7 +266,7 @@ in
           wm = filter (s: s.manage == "window") list;
           dm = filter (s: s.manage == "desktop") list;
           names = flip concatMap dm
-            (d: map (w: d.name + optionalString (w.name != "none") (" + " + w.name))
+            (d: map (w: d.name + optionalString (w.name != "none") ("+" + w.name))
               (filter (w: d.name != "none" || w.name != "none") wm));
           desktops = mkDesktops names;
           script = xsession wm dm;
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 82b9a2fce5a..256bfb9ce3f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -61,7 +61,7 @@ let
     let
       dm = xcfg.desktopManager.default;
       wm = xcfg.windowManager.default;
-    in dm + optionalString (wm != "none") (" + " + wm);
+    in dm + optionalString (wm != "none") ("+" + wm);
 in
 {
   # Note: the order in which lightdm greeter modules are imported
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 99c03ca81c2..2eb7ddcb1ec 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -69,7 +69,7 @@ let
     let
       dm = xcfg.desktopManager.default;
       wm = xcfg.windowManager.default;
-    in dm + optionalString (wm != "none") (" + " + wm);
+    in dm + optionalString (wm != "none") ("+" + wm);
 
 in
 {

From 2cd342cfb361cfa6413e6612028997079c2fa9ed Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Sat, 15 Apr 2017 21:50:13 -0500
Subject: [PATCH 1650/1744] wrapGAppsHook: Correct `wrapProgram` invocations

This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.

Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files.  In addition, it failed to wrap files in subdirectories.

Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 3cad1838d26..9891128a623 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -35,10 +35,16 @@ wrapGAppsHook() {
     gappsWrapperArgs+=(--prefix $v : "$dummy")
   done
 
-  if [ -z "$dontWrapGApps" ]; then
-    for i in $prefix/bin/* $prefix/libexec/*; do
-      echo "Wrapping app $i"
-      wrapProgram "$i" "${gappsWrapperArgs[@]}"
+  if [[ -z "$dontWrapGApps" ]]; then
+    targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
+    for targetDir in "${targetDirs[@]}"; do
+      if [[ -d "${targetDir}" ]]; then
+        find "${targetDir}" -type f -executable -print0 \
+          | while IFS= read -r -d '' file; do
+          echo "Wrapping program ${file}"
+          wrapProgram "${file}" "${gappsWrapperArgs[@]}"
+        done
+      fi
     done
   fi
 }

From 7e29ead375b59ae18733e1e9320407b350bae342 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 28 Apr 2017 21:28:42 +0100
Subject: [PATCH 1651/1744] krita: 3.1.2.1 -> 3.1.3

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index dcd5c28172e..8493ceb7b9f 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   name = "krita-${version}";
-  ver_min = "3.1.2";
-  version = "${ver_min}.1";
+  ver_min = "3.1.3";
+  version = "${ver_min}";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz";
-    sha256 = "934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d";
+    sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];

From ce6eb0cbbe5398329a490b54dc2d259d9d48007b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Thu, 27 Apr 2017 18:48:56 +0000
Subject: [PATCH 1652/1744] udiskie: 1.5.1 -> 1.7.0

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

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 6a326dba39c..84ecf18c5ae 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "udiskie-${version}";
-  version = "1.5.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
     rev = version;
-    sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd";
+    sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv";
   };
 
   buildInputs = [

From 6e53534c2f46713d722c7fd8f376c868dff897d8 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 28 Apr 2017 23:41:05 +0200
Subject: [PATCH 1653/1744] sbcl: 1.3.16 -> 1.3.17

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a50c71b6209..a139ca4a779 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.16";
+  version = "1.3.17";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0qw8kcn66sr1k7ilm6i66dk3ybym722ccxa4xi8w7bkhgc0ripdp";
+    sha256 = "1bqd39cqcv129zxvp3w3z1x46m9g9nmgslnlrvcsbqwd69vgbfcl";
   };
 
   patchPhase = ''

From f1cf8125f095414c158c1f22313cc9f0c697751f Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 28 Apr 2017 23:42:40 +0200
Subject: [PATCH 1654/1744] sbcl: enable threadSupport also on aarch64-linux

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a139ca4a779..dcd110954c1 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
-, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
+, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
   # Note that the created binaries still need `patchelf --set-interpreter ...`
   # to get rid of ${glibc} dependency.

From 32ae4bfc20af932972ac914df8cc7f1c9d57fe55 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 28 Apr 2017 18:01:52 -0400
Subject: [PATCH 1655/1744] stdenv-generic: add meta attribute checking

This is turned off by default but I think we should fix all packages to
respect it and then turn it on by default
---
 pkgs/stdenv/generic/default.nix | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 69bcd649059..4bcd7b3260d 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -18,6 +18,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 let
 
+  shouldCheckMeta = config.checkMeta or false;
+
   allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
   whitelist = config.whitelistedLicenses or [];
@@ -151,6 +153,7 @@ let
         broken = remediate_whitelist "Broken";
         blacklisted = x: "";
         insecure = remediate_insecure;
+        unknown-meta = x: "";
       };
       remediate_whitelist = allow_attr: attrs:
         ''
@@ -202,6 +205,32 @@ let
 
           '' + ((builtins.getAttr reason remediation) attrs));
 
+      metaTypes = with lib.types; {
+        # These keys are documented
+        description = str;
+        longDescription = str;
+        branch = str;
+        homepage = str;
+        downloadPage = str;
+        license = either (listOf lib.types.attrs) lib.types.attrs;
+        maintainers = listOf str;
+        priority = int;
+        platforms = listOf str;
+        hydraPlatforms = listOf str;
+        broken = bool;
+
+        # Weirder stuff that doesn't appear in the documentation?
+        version = str;
+        updateWalker = bool;
+        executables = listOf str;
+      };
+
+      checkMetaAttr = k: v:
+        if metaTypes?${k} then
+          if metaTypes.${k}.check v then null else "key '${k}' has a value of an invalid type; expected ${metaTypes.${k}.description}"
+        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 [];
+
       # Check if a derivation is valid, that is whether it passes checks for
       # e.g brokenness or license.
       #
@@ -219,6 +248,8 @@ let
           { valid = false; reason = "broken"; errormsg = "is not supported on ‘${result.system}’"; }
         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
+          { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
         else { valid = true; };
 
       outputs' =

From 90c5bf8c58224d7e1213bb965d892019395042f4 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sat, 29 Apr 2017 00:29:18 +0100
Subject: [PATCH 1656/1744] teamviewer: 12.0.71510 -> 12.0.76279

---
 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 5c9e96c6527..b28a9040532 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.71510";
+  version = "12.0.76279";
 
   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 = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
-    sha256 = "0f2qc2rpxk7zsyfxlsfr5gwbs9vhnzc3z7ib677pnr99bz06hbqp";
+    sha256 = "15yhx66zxbjk0x3dpfg39gb1f2ajcp9kbp4zi58bfnvby277jl00";
   };
 
   unpackPhase = ''

From 1a4ca220e15480818b78041d46bf0ca438671d33 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 28 Apr 2017 23:02:37 -0400
Subject: [PATCH 1657/1744] treewide: fix assorted issues revealed by the meta
 checker

Turns out a couple of the licenses were wrong, as well as being strings.
---
 pkgs/development/libraries/libxml2/default.nix   | 2 +-
 pkgs/development/libraries/libxslt/default.nix   | 2 +-
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 pkgs/stdenv/generic/default.nix                  | 8 ++++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index d44a8c973fd..fb397ace794 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = "bsd";
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.eelco ];
   };
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 7798c806982..4647eecf87d 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://xmlsoft.org/XSLT/;
     description = "A C library and tools to do XSL transformations";
-    license = "bsd";
+    license = licenses.mit;
     platforms = platforms.unix;
     maintainers = [ maintainers.eelco ];
   };
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 7b71a8e95d9..b0819f6133b 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
 
     /* Give binutils a lower priority than gcc-wrapper to prevent a
        collision due to the ld/as wrappers/symlinks in the latter. */
-    priority = "10";
+    priority = 10;
   };
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 4bcd7b3260d..177eeee9383 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -205,14 +205,14 @@ let
 
           '' + ((builtins.getAttr reason remediation) attrs));
 
-      metaTypes = with lib.types; {
+      metaTypes = with lib.types; rec {
         # These keys are documented
         description = str;
         longDescription = str;
         branch = str;
         homepage = str;
         downloadPage = str;
-        license = either (listOf lib.types.attrs) lib.types.attrs;
+        license = either (listOf lib.types.attrs) (either lib.types.attrs str);
         maintainers = listOf str;
         priority = int;
         platforms = listOf str;
@@ -223,6 +223,10 @@ let
         version = str;
         updateWalker = bool;
         executables = listOf str;
+        outputsToInstall = listOf str;
+        position = str;
+        repositories = attrsOf str;
+        isBuildPythonPackage = platforms;
       };
 
       checkMetaAttr = k: v:

From 48a3e1a88d0ab4e154a7b0a649136605eaefd32c Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 28 Apr 2017 23:10:44 -0400
Subject: [PATCH 1658/1744] fix 'command-not-found: is a directory' error

---
 .../modules/programs/command-not-found/command-not-found.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 6fb926fe1d5..55529d73cb6 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -44,7 +44,7 @@ in
       ''
         # This function is called whenever a command is not found.
         command_not_found_handle() {
-          local p=${commandNotFound}
+          local p=${commandNotFound}/bin/command-not-found
           if [ -x $p -a -f ${cfg.dbPath} ]; then
             # Run the helper program.
             $p "$@"
@@ -65,7 +65,7 @@ in
       ''
         # This function is called whenever a command is not found.
         command_not_found_handler() {
-          local p=${commandNotFound}
+          local p=${commandNotFound}/bin/command-not-found
           if [ -x $p -a -f ${cfg.dbPath} ]; then
             # Run the helper program.
             $p "$@"

From 5539f8acfa502d44a6718ab47a195a42e47dca19 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Fri, 28 Apr 2017 23:39:19 -0400
Subject: [PATCH 1659/1744] xpra: 2.0.1 -> 2.0.2

---
 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 15feb30743b..dcdb06c215b 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -11,11 +11,11 @@ with lib;
 let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
-  name = "xpra-2.0.1";
+  name = "xpra-2.0.2";
   namePrefix = "";
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8";
+    sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3";
   };
 
   buildInputs = [

From 90b9719f4fc95e54400a66bffcc8044c568cfa4b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 29 Apr 2017 04:24:34 +0000
Subject: [PATCH 1660/1744] treewide: fix the remaining issues with meta
 attributes

---
 pkgs/applications/kde/kdelibs/default.nix     |  2 +-
 .../gnome-2/bindings/gnome-python/default.nix |  2 +-
 pkgs/development/libraries/ctpp2/default.nix  |  2 +-
 .../libraries/libsamplerate/default.nix       |  2 +-
 .../libraries/libtiger/default.nix            |  1 -
 .../libraries/libytnef/default.nix            |  2 +-
 .../libraries/physics/fastnlo/default.nix     |  2 +-
 pkgs/development/libraries/speex/default.nix  |  2 +-
 .../libraries/speexdsp/default.nix            |  2 +-
 .../misc/avr-gcc-with-avr-libc/default.nix    |  1 -
 .../python-modules/astroid/default.nix        |  2 +-
 .../python-modules/pylint/default.nix         |  2 +-
 .../linux/bridge-utils/default.nix            |  2 +-
 pkgs/os-specific/linux/kbd/default.nix        |  2 +-
 pkgs/os-specific/linux/lvm2/default.nix       |  2 +-
 pkgs/servers/pulseaudio/default.nix           |  2 +-
 pkgs/stdenv/generic/default.nix               |  5 ++-
 pkgs/tools/inputmethods/anthy/default.nix     |  2 +-
 .../package-management/gx/go/default.nix      |  2 +-
 pkgs/tools/typesetting/tex/tetex/default.nix  |  2 +-
 pkgs/top-level/python-packages.nix            | 36 +++++++++----------
 21 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index 8adcd4d1b47..cae1b9b7e7f 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -43,7 +43,7 @@ kdeApp {
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
-    licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
+    license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index d7861285cb1..9e099a17d27 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     homepage = "http://pygtk.org/";
     description = "Python wrapper for GNOME libraries";
     platforms = platforms.linux;
-    licenses = licenses.lgpl2;
+    license = licenses.lgpl2;
     maintainers = with maintainers; [ qknight ];
   };
 }
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 905121286c8..bb1d4458f50 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A high performance templating engine";
     homepage = http://ctpp.havoc.ru;
-    maintiainers = with stdenv.lib.maintainers; [ robbinch ];
+    maintainers = with stdenv.lib.maintainers; [ robbinch ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index faeeb34d65d..612dc72cdaf 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     # you can choose one of the following licenses:
     # GPL or a commercial-use license (available at
     # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
-    licenses    = with licenses; [ gpl3.shortName unfree ];
+    license     = with licenses; [ gpl3.shortName unfree ];
     maintainers = with maintainers; [ lovek323 wkennington ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix
index 58e92f11018..deab3043035 100644
--- a/pkgs/development/libraries/libtiger/default.nix
+++ b/pkgs/development/libraries/libtiger/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://code.google.com/p/libtiger/;
-    authors = [ "Vincent Penquerc'h" ];
     description = "A rendering library for Kate streams using Pango and Cairo";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
index cbf675af4da..8af7d5d8797 100644
--- a/pkgs/development/libraries/libytnef/default.nix
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
     license = licenses.gpl2Plus;
-    platform = platforms.all;
+    platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 307bf1b27db..e07583fccb5 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
+    description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
     license      = stdenv.lib.licenses.gpl3;
     homepage     = http://fastnlo.hepforge.org;
     platforms    = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 199c0d00734..602359965f1 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    hompage = http://www.speex.org/;
+    homepage = http://www.speex.org/;
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 9ec7d651ccb..a96e808a97e 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon";
 
   meta = with stdenv.lib; {
-    hompage = http://www.speex.org/;
+    homepage = http://www.speex.org/;
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 237c4e4027f..1035757fb80 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation {
     description = "AVR development environment including binutils, avr-gcc and avr-libc";
     # I've tried compiling the packages separately.. too much hassle. This just works. Fine.
     license =  ["GPL" "LGPL"]; # see single packages ..
-    homepage = []; # dito
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 76f58e695f2..a690399118d 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -28,7 +28,7 @@
       description = "A abstract syntax tree for Python with inference support";
       homepage = http://bitbucket.org/logilab/astroid;
       license = licenses.lgpl2;
-      platform = platforms.all;
+      platforms = platforms.all;
       maintainers = with maintainers; [ nand0p ]; 
     };
   }
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 844d2e22954..67604c3f253 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -35,7 +35,7 @@
     meta = with stdenv.lib; {
       homepage = http://www.logilab.org/project/pylint;
       description = "A bug and style checker for Python";
-      platform = platforms.all;
+      platforms = platforms.all;
       license = licenses.gpl1Plus;
       maintainers = with maintainers; [ nand0p ];
     };
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index 2fdf728ef4e..4d4a51b984a 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "http://sourceforge.net/projects/bridge/";
-    homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
+    homepage = "http://www.linux-foundation.org/en/Net:Bridge/";
     license = "GPL";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index a3f21b51b06..6e8893cc37d 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/;
     description = "Linux keyboard utilities and keyboard maps";
     platforms = platforms.linux;
-    licenses = licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 9645a2d16b5..eb4d1ab0423 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://sourceware.org/lvm2/;
-    descriptions = "Tools to support Logical Volume Management (LVM) on Linux";
+    description = "Tools to support Logical Volume Management (LVM) on Linux";
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     inherit version;
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 680c9dfcb60..ba514ccdbcb 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
-    licenses    = lib.licenses.lgpl2Plus;
+    license     = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ lovek323 wkennington ];
     platforms   = lib.platforms.unix;
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 177eeee9383..abb08dfb98c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -18,7 +18,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 let
 
-  shouldCheckMeta = config.checkMeta or false;
+  shouldCheckMeta = config.checkMeta or true;
 
   allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
@@ -221,12 +221,15 @@ let
 
         # Weirder stuff that doesn't appear in the documentation?
         version = str;
+        tag = str;
         updateWalker = bool;
         executables = listOf str;
         outputsToInstall = listOf str;
         position = str;
         repositories = attrsOf str;
         isBuildPythonPackage = platforms;
+        schedulingPriority = str;
+        downloadURLRegexp = str;
       };
 
       checkMetaAttr = k: v:
diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix
index 4fbd0965c78..c11fae3888e 100644
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
-    homepace    = http://sourceforge.jp/projects/anthy/;
+    homepage    = http://sourceforge.jp/projects/anthy/;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ ericsagnes ];
     platforms   = platforms.linux;
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index 877d5c6540a..aa5acfa22d5 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -29,6 +29,6 @@ buildGoPackage rec {
     description = "A tool for importing go packages into gx";
     homepage = https://github.com/whyrusleeping/gx-go;
     license = licenses.mit;
-    maintainer = with maintainers; [ zimbatm ];
+    maintainers = with maintainers; [ zimbatm ];
   };
 }
diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index 83bead83ea3..313474745d1 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description  = "A full-featured (La)TeX distribution";
     homepage     = http://www.tug.org/tetex/;
-    matintainers = with maintainers; [ lovek323 ];
+    maintainers  = with maintainers; [ lovek323 ];
     platforms    = platforms.unix;
     hydraPlatforms = [];
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 389e11e1d25..ec648397268 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1176,7 +1176,7 @@ in {
     };
 
     meta = with pkgs.stdenv.lib; {
-      descriptions = "Library for reading, writing and rewriting python AST";
+      description = "Library for reading, writing and rewriting python AST";
       homepage = https://github.com/berkerpeksag/astor;
       license = licenses.bsd3;
       maintainers = with maintainers; [ nixy ];
@@ -5214,7 +5214,7 @@ in {
 
     meta = {
       license = licenses.mit;
-      website = "https://pypi.python.org/pypi/pytest-cache/";
+      homepage = "https://pypi.python.org/pypi/pytest-cache/";
       description = "pytest plugin with mechanisms for caching across test runs";
     };
   };
@@ -5232,7 +5232,7 @@ in {
 
     meta = {
       license = licenses.mit;
-      website = https://pypi.python.org/pypi/pytest-catchlog/;
+      homepage = https://pypi.python.org/pypi/pytest-catchlog/;
       description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog.";
     };
   };
@@ -5308,7 +5308,7 @@ in {
 
     meta = {
       license = licenses.mit;
-      website = "https://pypi.python.org/pypi/pytest-flakes";
+      homepage = "https://pypi.python.org/pypi/pytest-flakes";
       description = "pytest plugin to check source code with pyflakes";
     };
   };
@@ -5354,7 +5354,7 @@ in {
 
     meta = {
       license = licenses.mit;
-      website = "https://pypi.python.org/pypi/pytest-pep8";
+      homepage = "https://pypi.python.org/pypi/pytest-pep8";
       description = "pytest plugin to check PEP8 requirements";
     };
   };
@@ -5419,7 +5419,7 @@ in {
 
     meta = {
       license = licenses.asl20;
-      website = "https://pypi.python.org/pypi/pytest-quickcheck";
+      homepage = "https://pypi.python.org/pypi/pytest-quickcheck";
       description = "pytest plugin to generate random data inspired by QuickCheck";
     };
   };
@@ -8164,7 +8164,7 @@ in {
       description = "Cross-platform Bluetooth API for Python";
       maintainers = with maintainers; [ leenaars ];
       license = licenses.gpl3;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -8799,7 +8799,7 @@ in {
     meta = {
       description = "A Python-based build/distribution/deployment scripting tool";
       homepage    = http://github.com/paver/paver;
-      matinainers = with maintainers; [ lovek323 ];
+      maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
   };
@@ -9089,7 +9089,7 @@ in {
       description = "Call graph visualizations for Python applications";
       maintainers = with maintainers; [ auntie ];
       license = licenses.gpl2;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -9225,7 +9225,7 @@ in {
       description = "Python port of libaxolotl-android";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.gpl3;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -9243,7 +9243,7 @@ in {
       description = "Curve25519 with ed25519 signatures";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.gpl3;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -9268,7 +9268,7 @@ in {
       description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.asl20;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -9473,7 +9473,7 @@ in {
       description = "Python API for Sendmail Milters (SPF)";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.gpl2;
-      platform = platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -9674,7 +9674,7 @@ in {
       homepage = "http://sarge.readthedocs.org/";
       description = "A wrapper for subprocess which provides command pipeline functionality";
       license = licenses.bsd3;
-      platform = platforms.all;
+      platforms = platforms.all;
       maintainers = with maintainers; [ abbradar ];
     };
   };
@@ -14590,7 +14590,7 @@ in {
     buildInputs = with self; [nose];
 
     meta = {
-      decription = "The fastest markdown parser in pure Python";
+      description = "The fastest markdown parser in pure Python";
       homepage = https://github.com/lepture/mistune;
       license = licenses.bsd3;
     };
@@ -15565,7 +15565,7 @@ in {
     propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules];
 
     meta = {
-      meta = "Elegant Python library for XMPP";
+      description = "Elegant Python library for XMPP";
       license = licenses.mit;
       homepage = https://dev.louiz.org/projects/slixmpp;
     };
@@ -22821,7 +22821,7 @@ in {
     buildInputs = with self; [ appdirs ];
 
     meta = with pkgs.stdenv.lib; {
-      descriptions = "A python Lex/Yacc that works with RPython";
+      description = "A python Lex/Yacc that works with RPython";
       homepage = https://github.com/alex/rply;
       license = licenses.bsd3;
       maintainers = with maintainers; [ nixy ];
@@ -25666,7 +25666,7 @@ in {
 
     meta = {
       description = "Quick Response code generation for Python";
-      home = "https://pypi.python.org/pypi/qrcode";
+      homepage = "https://pypi.python.org/pypi/qrcode";
       license = licenses.bsd3;
     };
   };

From 424f175546d7ee36677c80514669685a250a97c4 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 29 Apr 2017 15:26:22 +0900
Subject: [PATCH 1661/1744] ibus-engines.mozc:  2.17.2313.102 -> 2.20.2673.102

---
 .../ibus-engines/ibus-mozc/default.nix        | 72 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index aa346f45274..2e32075992c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,14 +1,16 @@
-{ clangStdenv, fetchFromGitHub, fetchsvn, which, ninja, python2, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
+{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
+, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }:
 
 let
-  japanese_usage_dictionary = fetchsvn {
-    url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk";
-    rev = "10";
+  japanese_usage_dictionary = fetchFromGitHub {
+    owner  = "hiroyuki-komatsu";
+    repo   = "japanese-usage-dictionary";
+    rev    = "e5b3425575734c323e1d947009dd74709437b684";
     sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
   };
 in clangStdenv.mkDerivation rec {
   name = "ibus-mozc-${version}";
-  version = "2.17.2313.102";
+  version = "2.20.2673.102";
 
   meta = with clangStdenv.lib; {
     isIbusEngine = true;
@@ -19,14 +21,14 @@ in clangStdenv.mkDerivation rec {
     maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
-  nativeBuildInputs = [ which ninja python2 python2.pkgs.gyp pkgconfig ];
-  buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ];
+  nativeBuildInputs = [ which ninja python gyp pkgconfig ];
+  buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
 
   src = fetchFromGitHub {
     owner  = "google";
     repo   = "mozc";
-    rev    = "3306d3314499a54a4064b8b80bbc1bce3f6cfac4";
-    sha256 = "0l7mjlnbm6i1ipni8pg9ym5bjg3rzkaxi9xwmsz2lddv348sqii2";
+    rev    = "280e38fe3d9db4df52f0713acf2ca65898cd697a";
+    sha256 = "0s599f817gjgqynm4n1yll1ipd25ai2c55y8k6wvhg9s7qaxnyhs";
   };
 
   postUnpack = ''
@@ -36,16 +38,11 @@ in clangStdenv.mkDerivation rec {
 
   configurePhase = ''
     export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc"
-    python src/build_mozc.py gyp --gypdir=${python2.pkgs.gyp}/bin --server_dir=$out/lib/mozc \
-    python src/unix/fcitx/fcitx.gyp gyp --gypdir=${python2.pkgs.gyp}/bin
-  '';
-
-  preBuildPhase = ''
-    head -n 29 src/server/mozc_server.cc > LICENSE
+    cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
   '';
 
   buildPhase = ''
-    python src/build_mozc.py build -c Release \
+    PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \
       unix/ibus/ibus.gyp:ibus_mozc \
       unix/emacs/emacs.gyp:mozc_emacs_helper \
       server/server.gyp:mozc_server \
@@ -53,32 +50,29 @@ in clangStdenv.mkDerivation rec {
       renderer/renderer.gyp:mozc_renderer
   '';
 
-  checkPhase = ''
-    python src/build_mozc.py runtests -c Release
-  '';
-
   installPhase = ''
-    install -d        $out/share/licenses/mozc/
-    install -m 644    LICENSE src/data/installer/*.html     $out/share/licenses/mozc/
+    install -d        $out/share/licenses/mozc
+    head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE
+    install -m 644    data/installer/*.html     $out/share/licenses/mozc/
 
-    install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server
-    install    -m 755 src/out_linux/Release/mozc_tool   $out/lib/mozc/mozc_tool
+    install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
+    install    -m 755 out_linux/Release/mozc_tool   $out/lib/mozc/mozc_tool
 
-    install -d $out/share/doc/mozc
-    install -m 644 src/data/installer/*.html $out/share/doc/mozc/
+    install -d        $out/share/doc/mozc
+    install -m 644    data/installer/*.html         $out/share/doc/mozc/
 
-    install -D -m 755 src/out_linux/Release/ibus_mozc       $out/lib/ibus-mozc/ibus-engine-mozc
-    install -D -m 644 src/out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml
-    install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png
-    install    -m 644 src/data/images/unix/ui-tool.png          $out/share/ibus-mozc/tool.png
-    install    -m 644 src/data/images/unix/ui-properties.png    $out/share/ibus-mozc/properties.png
-    install    -m 644 src/data/images/unix/ui-dictionary.png    $out/share/ibus-mozc/dictionary.png
-    install    -m 644 src/data/images/unix/ui-direct.png        $out/share/ibus-mozc/direct.png
-    install    -m 644 src/data/images/unix/ui-hiragana.png      $out/share/ibus-mozc/hiragana.png
-    install    -m 644 src/data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png
-    install    -m 644 src/data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png
-    install    -m 644 src/data/images/unix/ui-alpha_half.png    $out/share/ibus-mozc/alpha_half.png
-    install    -m 644 src/data/images/unix/ui-alpha_full.png    $out/share/ibus-mozc/alpha_full.png
-    install -D -m 755 src/out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer
+    install -D -m 755 out_linux/Release/ibus_mozc           $out/lib/ibus-mozc/ibus-engine-mozc
+    install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml
+    install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png
+    install    -m 644 data/images/unix/ui-tool.png          $out/share/ibus-mozc/tool.png
+    install    -m 644 data/images/unix/ui-properties.png    $out/share/ibus-mozc/properties.png
+    install    -m 644 data/images/unix/ui-dictionary.png    $out/share/ibus-mozc/dictionary.png
+    install    -m 644 data/images/unix/ui-direct.png        $out/share/ibus-mozc/direct.png
+    install    -m 644 data/images/unix/ui-hiragana.png      $out/share/ibus-mozc/hiragana.png
+    install    -m 644 data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png
+    install    -m 644 data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png
+    install    -m 644 data/images/unix/ui-alpha_half.png    $out/share/ibus-mozc/alpha_half.png
+    install    -m 644 data/images/unix/ui-alpha_full.png    $out/share/ibus-mozc/alpha_full.png
+    install -D -m 755 out_linux/Release/mozc_renderer       $out/lib/mozc/mozc_renderer
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a8c9b16f4d..ac071c1f9cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1303,7 +1303,9 @@ with pkgs;
     m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
-      protobuf = protobuf.override { stdenv = clangStdenv; };
+      python = python2;
+      inherit (python2Packages) gyp;
+      protobuf = protobuf3_2.override { stdenv = clangStdenv; };
     };
 
     table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {

From 70049192432c9ecb42b91ee2730e4239048deeae Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 29 Apr 2017 17:07:01 +0900
Subject: [PATCH 1662/1744] stdenv-generic: add meta attributes checks

---
 pkgs/stdenv/generic/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index abb08dfb98c..0f9223f6da5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -230,6 +230,8 @@ let
         isBuildPythonPackage = platforms;
         schedulingPriority = str;
         downloadURLRegexp = str;
+        isFcitxEngine = bool;
+        isIbusEngine = bool;
       };
 
       checkMetaAttr = k: v:

From 6af952fac80a15de4b7006aa8c2a4c03918f233f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 29 Apr 2017 10:45:20 +0200
Subject: [PATCH 1663/1744] rtkit: fix meta attr

---
 pkgs/os-specific/linux/rtkit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index dd6f9ec42af..fa3c2fc4c7e 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://0pointer.de/blog/projects/rtkit;
-    descriptions = "A daemon that hands out real-time priority to processes";
+    description = "A daemon that hands out real-time priority to processes";
     platforms = stdenv.lib.platforms.linux;
   };
 }

From edb1ea055e6fc4848baeadb0fe2d216a0734b138 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 24 Apr 2017 15:43:49 +0200
Subject: [PATCH 1664/1744] confluence module: needs bash for health checks

---
 nixos/modules/services/web-apps/atlassian/confluence.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 2d9287577de..c1d7d4ea06d 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -103,7 +103,7 @@ in
       requires = [ "postgresql.service" ];
       after = [ "postgresql.service" ];
 
-      path = [ cfg.jrePackage ];
+      path = [ cfg.jrePackage pkgs.bash ];
 
       environment = {
         CONF_USER = cfg.user;

From 154dacde20f81ec3c20978586c64274d8139a94a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 3 Apr 2017 18:57:04 +0200
Subject: [PATCH 1665/1744] grafana: 4.1.2 -> 4.2.0

---
 pkgs/servers/monitoring/grafana/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 6c7b7ff001a..dbcebf84239 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.1.2";
-  ts = "1486989747";
+  version = "4.2.0";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -10,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0x2knb2lrs6sbj3svcjn70p46fzdy71gh8fgi801g1l0yp9s5yrg";
+    sha256 = "0zzvdzakswqidxbsss98nfa8rw80r36f45yviai12xsns9jzmj7z";
   };
 
   srcStatic = fetchurl {
-    url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";
-    sha256 = "1i7n1a2xn65flwy2zqs3kqg1ch51653r52qn3gfh5hp92k81q4dq";
+    url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz";
+    sha256 = "1cs7ghkp13znz9yxv108770xjfsp8vks6xkzpqqhsjis5h5y0g9w";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From bd27594bc6218cf77b4e5905b1e0a38e339b395a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 7 Apr 2017 15:19:51 +0200
Subject: [PATCH 1666/1744] promtheus-node-exporter: 0.13.0 -> 0.14.0

---
 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 1115ca85f23..2d2fb26324c 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.13.0";
+  version = "0.14.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q";
+    sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4";
   };
 
   # FIXME: megacli test fails

From adadf7e5cea97a05f798d701506477df03631782 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 29 Apr 2017 12:26:16 +0200
Subject: [PATCH 1667/1744] androidsdk: meta.url to meta.homepage

---
 .../mobile/androidenv/platforms-linux.nix     | 48 +++++++++----------
 .../mobile/androidenv/platforms-macosx.nix    | 48 +++++++++----------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index 4f3f45f4cc9..bdf3f545480 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -24,7 +24,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 2";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -36,7 +36,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 3";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -48,7 +48,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 4";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -60,7 +60,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 5";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -72,7 +72,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 6";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -84,7 +84,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 7";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -96,7 +96,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 8";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -108,7 +108,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 9";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -120,7 +120,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 10";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -132,7 +132,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 11";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -144,7 +144,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 12";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -156,7 +156,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 13";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -168,7 +168,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 14";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -180,7 +180,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 15";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -192,7 +192,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 16";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -204,7 +204,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 17";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -216,7 +216,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 18";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -228,7 +228,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 19";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -240,7 +240,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 20";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -252,7 +252,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 21";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -264,7 +264,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 22";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -276,7 +276,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 23";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -288,7 +288,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 24";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -300,7 +300,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 25";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index d8619b7c0f5..7bcc5f40769 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -24,7 +24,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 2";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -36,7 +36,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 3";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -48,7 +48,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 4";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -60,7 +60,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 5";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -72,7 +72,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 6";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -84,7 +84,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 7";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -96,7 +96,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 8";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -108,7 +108,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 9";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -120,7 +120,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 10";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -132,7 +132,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 11";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -144,7 +144,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 12";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -156,7 +156,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 13";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -168,7 +168,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 14";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -180,7 +180,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 15";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -192,7 +192,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 16";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -204,7 +204,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 17";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -216,7 +216,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 18";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -228,7 +228,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 19";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -240,7 +240,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 20";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -252,7 +252,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 21";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -264,7 +264,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 22";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -276,7 +276,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 23";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -288,7 +288,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 24";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 
@@ -300,7 +300,7 @@ in
     };
     meta = {
       description = "Android SDK Platform 25";
-      url = http://developer.android.com/sdk/;
+      homepage = http://developer.android.com/sdk/;
     };
   };
 

From 316d0ff7c7711849aee3b10a8d45d21f0cba9c57 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 29 Apr 2017 12:34:11 +0200
Subject: [PATCH 1668/1744] libsamplerate: update license information (in
 effect since 0.1.9)

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

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 612dc72cdaf..6dff8ebc8a1 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -30,10 +30,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Sample Rate Converter for audio";
     homepage    = http://www.mega-nerd.com/SRC/index.html;
-    # you can choose one of the following licenses:
-    # GPL or a commercial-use license (available at
-    # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
-    license     = with licenses; [ gpl3.shortName unfree ];
+    license     = licenses.bsd2;
     maintainers = with maintainers; [ lovek323 wkennington ];
     platforms   = platforms.all;
   };

From 4a207b1dd8a7b96ad0203b499bbff54ed7a829ff Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 29 Apr 2017 12:41:31 +0200
Subject: [PATCH 1669/1744] gimpPlugins.resynthesizer: fix build

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 20a9648e839..d7af3382ef2 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -105,7 +105,7 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-0.16";
-    buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs;
+    buildInputs = [ gimp pkgs.fftw pkgs.pkgconfig pkgs.gtk2 ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
       url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
       sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";

From b12f76ddd3620ed9cfe169fb1918740f7a99ffcc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 29 Apr 2017 15:34:57 +0200
Subject: [PATCH 1670/1744] geogebra: 5-0-350-0 -> 5-0-355-0 (#25324)

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index d37d5c16091..bc766b96bca 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-350-0";
+  version = "5-0-355-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "0lr2calglad5d17p5sl1jbjdfsdsmn4dxgy8s89lyh0d4aihy54d";
+    sha256 = "0gm6jqlc3kgnbwnqlz6i9rahdy802jq7xc9gw1q5ynk63smm3ngk";
   };
 
   srcIcon = fetchurl {

From f1c7d5a6ba8200d1ac463f1f796f6f359f1423c7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 29 Apr 2017 16:51:25 +0200
Subject: [PATCH 1671/1744] gimpPlugins.resynthesizer2: fix build

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index d7af3382ef2..cf36ac4a382 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -125,7 +125,9 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-2.0.1";
-    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ]
+    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook pkgs.pkgconfig pkgs.gtk2
+      pkgs.intltool
+    ]
       ++ gimp.nativeBuildInputs;
     makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
     src = fetchFromGitHub {

From 63433537ce3f52f9bc460961b2b73e40db027447 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 29 Apr 2017 17:27:08 +0200
Subject: [PATCH 1672/1744] nixos/hardened profile: disable legacy virtual
 syscalls

This eliminates a theoretical risk of ASLR bypass due to the fixed address
mapping used by the legacy vsyscall mechanism.  Modern glibc use vdso(7)
instead so there is no loss of functionality, but some programs may fail
to run in this configuration.  Programs that fail to run because vsyscall
has been disabled will be logged to dmesg.

For background on virtual syscalls see https://lwn.net/Articles/446528/

Closes https://github.com/NixOS/nixpkgs/pull/25289
---
 nixos/modules/profiles/hardened.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 9933f8b25f5..a01d974446b 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -10,6 +10,11 @@ with lib;
 
   security.apparmor.enable = mkDefault true;
 
+  boot.kernelParams = [
+    # Disable legacy virtual syscalls
+    "vsyscall=none"
+  ];
+
   # Restrict ptrace() usage to processes with a pre-defined relationship
   # (e.g., parent/child)
   boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;

From 852813689a335399e30f83e0659666f3e312716e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 16 Apr 2017 18:59:44 +0200
Subject: [PATCH 1673/1744] desktop-managers: Use a black BG as fallback

Use a solid black background when no background image (via
~/.background-image) is provided. In my case this fixes the really
strange behaviour when i3 without a desktop manager starts with the SDDM
login screen as background image.
---
 nixos/modules/services/x11/desktop-managers/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index af01f6acad1..d56050c3626 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -8,7 +8,7 @@ let
   cfg = xcfg.desktopManager;
 
   # If desktop manager `d' isn't capable of setting a background and
-  # the xserver is enabled, the `feh' program is used as a fallback.
+  # the xserver is enabled, `feh' or `xsetroot' are used as a fallback.
   needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable;
 
 in
@@ -44,8 +44,11 @@ in
             manage = "desktop";
             start = d.start
             + optionalString (needBGCond d) ''
-              if test -e $HOME/.background-image; then
+              if [ -e $HOME/.background-image ]; then
                 ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+              else
+                # Use a solid black background as fallback
+                ${pkgs.xorg.xsetroot}/bin/xsetroot -solid black
               fi
             '';
           }) list;
@@ -80,6 +83,6 @@ in
   config = {
     services.xserver.displayManager.session = cfg.session.list;
     environment.systemPackages =
-      mkIf cfg.session.needBGPackages [ pkgs.feh ];
+      mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
   };
 }

From dad760061eebae26c33415a1b38704ff1b1a88d2 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 23:14:35 +0000
Subject: [PATCH 1674/1744] xrdp: init at 0.9.1

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/xrdp.nix    | 150 ++++++++++++++++++
 nixos/tests/xrdp.nix                          |  45 ++++++
 .../networking/remote/xrdp/default.nix        | 111 +++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 309 insertions(+)
 create mode 100644 nixos/modules/services/networking/xrdp.nix
 create mode 100644 nixos/tests/xrdp.nix
 create mode 100644 pkgs/applications/networking/remote/xrdp/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ff069f48ab..59fd7325095 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -504,6 +504,7 @@
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
   ./services/networking/xl2tpd.nix
+  ./services/networking/xrdp.nix
   ./services/networking/zerobin.nix
   ./services/networking/zerotierone.nix
   ./services/networking/znc.nix
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
new file mode 100644
index 00000000000..5923e436d64
--- /dev/null
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -0,0 +1,150 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xrdp;
+  confDir = pkgs.runCommand "xrdp.conf" { } ''
+    mkdir $out
+
+    cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out
+
+    ${cfg.package}/bin/xrdp-keygen xrdp $out/rsakeys.ini
+
+    cat > $out/startwm.sh <<EOF
+    #!/bin/sh
+    . /etc/profile
+    ${cfg.defaultWindowManager}
+    EOF
+    chmod +x $out/startwm.sh
+    
+    substituteInPlace $out/xrdp.ini \
+      --replace "certificate=" "certificate=${cfg.sslCert}" \
+      --replace "key_file=" "key_file=${cfg.sslKey}" \
+      --replace LogFile=xrdp.log LogFile=/dev/null \
+      --replace EnableSyslog=true EnableSyslog=false
+
+    substituteInPlace $out/sesman.ini \
+      --replace LogFile=xrdp-sesman.log LogFile=/dev/null \
+      --replace EnableSyslog=1 EnableSyslog=0
+  '';
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.xrdp = {
+
+      enable = mkEnableOption "Whether xrdp should be run on startup.";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.xrdp;
+        defaultText = "pkgs.xrdp";
+        description = ''
+          The package to use for the xrdp daemon's binary.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 3389;
+        description = ''
+          Specifies on which port the xrdp daemon listens.
+        '';
+      };
+
+      sslKey = mkOption {
+        type = types.str;
+        default = "/etc/xrdp/key.pem";
+        example = "/path/to/your/key.pem";
+        description = ''
+          ssl private key path
+          A self-signed certificate will be generated if file not exists.
+        '';
+      };
+
+      sslCert = mkOption {
+        type = types.str;
+        default = "/etc/xrdp/cert.pem";
+        example = "/path/to/your/cert.pem";
+        description = ''
+          ssl certificate path
+          A self-signed certificate will be generated if file not exists.
+        '';
+      };
+
+      defaultWindowManager = mkOption {
+        type = types.str;
+        default = "xterm";
+        example = "xfce4-session";
+        description = ''
+          The script to run when user log in, usually a window manager, e.g. "icewm", "xfce4-session"
+          This is per-user overridable, if file ~/startwm.sh exists it will be used instead.
+        '';
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd = {
+      services.xrdp = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        description = "xrdp daemon";
+        requires = [ "xrdp-sesman.service" ];
+        preStart = ''
+          # prepare directory for unix sockets (the sockets will be owned by loggedinuser:xrdp)
+          mkdir -p /tmp/.xrdp || true
+          chown xrdp:xrdp /tmp/.xrdp
+          chmod 3777 /tmp/.xrdp
+
+          # generate a self-signed certificate
+          if [ ! -s ${cfg.sslCert} -o ! -s ${cfg.sslKey} ]; then
+            mkdir -p $(dirname ${cfg.sslCert}) || true
+            mkdir -p $(dirname ${cfg.sslKey}) || true
+            ${pkgs.openssl.bin}/bin/openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 365 \
+              -subj /C=US/ST=CA/L=Sunnyvale/O=xrdp/CN=www.xrdp.org \
+              -config ${cfg.package}/share/xrdp/openssl.conf \
+              -keyout ${cfg.sslKey} -out ${cfg.sslCert}
+            chown root:xrdp ${cfg.sslKey} ${cfg.sslCert}
+            chmod 440 ${cfg.sslKey} ${cfg.sslCert}
+          fi
+        '';
+        serviceConfig = {
+          User = "xrdp";
+          Group = "xrdp";
+          PermissionsStartOnly = true;
+          ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
+        };
+      };
+
+      services.xrdp-sesman = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        description = "xrdp session manager";
+        serviceConfig = {
+          ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
+        };
+      };
+
+    };
+
+    users.users.xrdp = {
+      description   = "xrdp daemon user";
+      isSystemUser  = true;
+      group         = "xrdp";
+    };
+    users.groups.xrdp = {};
+
+    security.pam.services.xrdp-sesman = { allowNullPassword = true; startSession = true; };
+  };
+
+}
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
new file mode 100644
index 00000000000..c997e36cc44
--- /dev/null
+++ b/nixos/tests/xrdp.nix
@@ -0,0 +1,45 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "xrdp";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ volth ];
+  };
+
+  nodes = {
+    server = { lib, pkgs, ... }: {
+      imports = [ ./common/user-account.nix ];
+      services.xrdp.enable = true;
+      services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
+      networking.firewall.allowedTCPPorts = [ 3389 ];
+    };
+
+    client = { lib, pkgs, ... }: {
+      imports = [ ./common/x11.nix ./common/user-account.nix ];
+      services.xserver.displayManager.auto.user = "alice";
+      environment.systemPackages = [ pkgs.freerdp ];
+      services.xrdp.enable = true;
+      services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";
+    };
+  };
+
+  testScript = { nodes, ... }: ''
+    startAll;
+
+    $client->waitForX;
+    $client->waitForFile("/home/alice/.Xauthority");
+    $client->succeed("xauth merge ~alice/.Xauthority");
+
+    $client->sleep(5);
+
+    $client->execute("xterm &");
+    $client->sleep(1);
+    $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:alice /p:foobar\n");
+    $client->sleep(5);
+    $client->screenshot("localrdp");
+
+    $client->execute("xterm &");
+    $client->sleep(1);
+    $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:alice /p:foobar\n");
+    $client->sleep(5);
+    $client->screenshot("remoterdp");
+  '';
+})
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
new file mode 100644
index 00000000000..647e6b6dcb9
--- /dev/null
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -0,0 +1,111 @@
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
+
+let
+  xorgxrdp = stdenv.mkDerivation rec {
+    name = "xorgxrdp-${version}";
+    version = "0.2.0";
+  
+    src = fetchFromGitHub {
+      owner = "neutrinolabs";
+      repo = "xorgxrdp";
+      rev = "v${version}";
+      sha256 = "125mv7lm2ns1gdgz6zf647d3pay8if8506rclb3312wwa5qfd2hn";
+    };
+
+    nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
+
+    buildInputs = [ xorg.xorgserver ];
+
+    postPatch = ''
+      # patch from Debian, allows to run xrdp daemon under unprivileged user
+      substituteInPlace module/rdpClientCon.c \
+        --replace 'g_sck_listen(dev->listen_sck);' 'g_sck_listen(dev->listen_sck); g_chmod_hex(dev->uds_data, 0x0660);'
+
+      substituteInPlace configure.ac \
+        --replace 'moduledir=`pkg-config xorg-server --variable=moduledir`' "moduledir=$out/lib/xorg/modules" \
+        --replace 'sysconfdir="/etc"' "sysconfdir=$out/etc"
+    '';
+
+    preConfigure = "./bootstrap";
+
+    configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common"  ];
+
+    enableParallelBuilding = true;
+  };
+
+  xrdp = stdenv.mkDerivation rec {
+    version = "0.9.1";
+    rev = "0920933"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already
+    name = "xrdp-${version}.${rev}";
+  
+    src = fetchFromGitHub {
+      owner = "volth";
+      repo = "xrdp";
+      rev = rev;
+      fetchSubmodules = true;
+      sha256 = "0a000h82728vp0abvjk2m03nqqiw2lky7kqk41b70cyd3bp0vdnz";
+    };
+
+    nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
+
+    buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ];
+
+    postPatch = ''
+      substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q"
+      substituteInPlace common/file_loc.h --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out
+      substituteInPlace instfiles/xrdp.sh --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out
+    '';
+
+    preConfigure = ''
+      (cd librfxcodec && ./bootstrap && ./configure --prefix=$out --enable-static --disable-shared)
+      ./bootstrap
+    '';
+    dontDisableStatic = true;
+    configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];
+
+    installFlags = [ "DESTDIR=$(out)" "prefix=" ];
+
+    postInstall = ''
+      # remove generated keys as non-determenistic
+      rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem}
+
+      cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf
+
+      substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse
+
+      # remove all session types except Xorg (they are not supported by this setup)
+      ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini
+   
+      # remove all session types and then add Xorg
+      ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini
+   
+      cat >> $out/etc/xrdp/sesman.ini <<EOF
+   
+      [Xorg]
+      param=${xorg.xorgserver}/bin/Xorg
+      param=-modulepath
+      param=${xorgxrdp}/lib/xorg/modules,${xorg.xorgserver}/lib/xorg/modules
+      ; the following two lines are needless after https://github.com/NixOS/nixpkgs/pull/21653
+      param=-xkbdir
+      param=${xorg.xkeyboardconfig}/share/X11/xkb
+      param=-config
+      param=${xorgxrdp}/etc/X11/xrdp/xorg.conf
+      param=-noreset
+      param=-nolisten
+      param=tcp
+      param=-logfile
+      param=.xorgxrdp.%s.log
+      EOF
+    '';
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      description = "An open source RDP server";
+      homepage = https://github.com/neutrinolabs/xrdp;
+      license = licenses.asl20;
+      maintainers = [ maintainers.volth ];
+      platforms = platforms.linux;
+    };
+  };
+in xrdp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c72c79cc..26db51fef84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13854,6 +13854,8 @@ with pkgs;
   xfontsel = callPackage ../applications/misc/xfontsel { };
   inherit (xorg) xlsfonts;
 
+  xrdp = callPackage ../applications/networking/remote/xrdp { };
+
   freerdp = callPackage ../applications/networking/remote/freerdp {
     inherit libpulseaudio;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;

From 965d0dab7848fb1bf2ee03d9a29afc614a998bfd Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 31 Mar 2017 01:37:06 +0000
Subject: [PATCH 1675/1744] xrdp: 0.9.1 -> 0.9.2

---
 .../networking/remote/xrdp/default.nix        | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 647e6b6dcb9..8079a0aabe6 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@
 let
   xorgxrdp = stdenv.mkDerivation rec {
     name = "xorgxrdp-${version}";
-    version = "0.2.0";
+    version = "0.2.1";
   
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
       rev = "v${version}";
-      sha256 = "125mv7lm2ns1gdgz6zf647d3pay8if8506rclb3312wwa5qfd2hn";
+      sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -34,8 +34,8 @@ let
   };
 
   xrdp = stdenv.mkDerivation rec {
-    version = "0.9.1";
-    rev = "0920933"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already
+    version = "0.9.2";
+    rev = "48c26a3"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already
     name = "xrdp-${version}.${rev}";
   
     src = fetchFromGitHub {
@@ -43,7 +43,7 @@ let
       repo = "xrdp";
       rev = rev;
       fetchSubmodules = true;
-      sha256 = "0a000h82728vp0abvjk2m03nqqiw2lky7kqk41b70cyd3bp0vdnz";
+      sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -52,8 +52,6 @@ let
 
     postPatch = ''
       substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q"
-      substituteInPlace common/file_loc.h --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out
-      substituteInPlace instfiles/xrdp.sh --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out
     '';
 
     preConfigure = ''
@@ -66,8 +64,8 @@ let
     installFlags = [ "DESTDIR=$(out)" "prefix=" ];
 
     postInstall = ''
-      # remove generated keys as non-determenistic
-      rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem}
+      # remove generated keys (as non-determenistic) and upstart script
+      rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh}
 
       cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf
 
@@ -85,9 +83,6 @@ let
       param=${xorg.xorgserver}/bin/Xorg
       param=-modulepath
       param=${xorgxrdp}/lib/xorg/modules,${xorg.xorgserver}/lib/xorg/modules
-      ; the following two lines are needless after https://github.com/NixOS/nixpkgs/pull/21653
-      param=-xkbdir
-      param=${xorg.xkeyboardconfig}/share/X11/xkb
       param=-config
       param=${xorgxrdp}/etc/X11/xrdp/xorg.conf
       param=-noreset

From 5e8ad49de81c023663912a078db88c351771e977 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 29 Apr 2017 17:23:21 +0000
Subject: [PATCH 1676/1744] do not create non-deterministic file (rsakeys.ini)
 in nixstore

---
 nixos/modules/services/networking/xrdp.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index 5923e436d64..bf59130ce5b 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -9,16 +9,15 @@ let
 
     cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out
 
-    ${cfg.package}/bin/xrdp-keygen xrdp $out/rsakeys.ini
-
     cat > $out/startwm.sh <<EOF
     #!/bin/sh
     . /etc/profile
     ${cfg.defaultWindowManager}
     EOF
     chmod +x $out/startwm.sh
-    
+
     substituteInPlace $out/xrdp.ini \
+      --replace "#rsakeys_ini=" "rsakeys_ini=/var/run/xrdp/rsakeys.ini" \
       --replace "certificate=" "certificate=${cfg.sslCert}" \
       --replace "key_file=" "key_file=${cfg.sslKey}" \
       --replace LogFile=xrdp.log LogFile=/dev/null \
@@ -117,6 +116,10 @@ in
             chown root:xrdp ${cfg.sslKey} ${cfg.sslCert}
             chmod 440 ${cfg.sslKey} ${cfg.sslCert}
           fi
+          if [ ! -s /var/run/xrdp/rsakeys.ini ]; then
+            mkdir -p /var/run/xrdp
+            ${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini
+          fi
         '';
         serviceConfig = {
           User = "xrdp";

From 5c7815a3887508b8ba5fd35393a856aa20406a24 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 25 Apr 2017 19:55:11 -0500
Subject: [PATCH 1677/1744] impure.nix: add crossSystem as arg

---
 pkgs/top-level/impure.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index c0f4e0fa089..c0cf8fb0911 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -22,6 +22,7 @@ in
   # with unnamed parameters allowed by ...
   system ? localSystem.system
 , platform ? localSystem.platform
+, crossSystem ? null
 
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.config/nixpkgs/config.nix.
@@ -61,7 +62,7 @@ in
 assert args ? localSystem -> !(args ? system || args ? platform);
 
 import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
-  inherit config overlays;
+  inherit config overlays crossSystem;
   # Fallback: Assume we are building packages on the current (build, in GNU
   # Autotools parlance) system.
   localSystem = { system = builtins.currentSystem; } // localSystem;

From 8c9b60a8307b4dafffb894b3d652389f6079b68a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Apr 2017 22:57:15 +0200
Subject: [PATCH 1678/1744] pykde4: Remove kde4.pykde4

This package is broken since 0a3b7f994e5995f414b1db3e1d7ca2244220b4e1
(python-sip: 4.18.1 -> 4.19.1). Removing it seems reasonable since we're
dropping KDE4 anyway.

Fixes #24548.
---
 pkgs/desktops/kde-4.14/kde-package/4.14.3.nix |  9 -----
 .../kde-4.14/kdebindings/pykde4-gcc-5.patch   | 27 --------------
 pkgs/desktops/kde-4.14/kdebindings/pykde4.nix | 35 -------------------
 3 files changed, 71 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/pykde4.nix

diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
index a05e6d0c62a..40106978576 100644
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
@@ -10,7 +10,6 @@ hashes=builtins.listToAttrs[
   {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
   {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
   {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";}
   {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
 ];
 versions=builtins.listToAttrs[
@@ -26,7 +25,6 @@ versions=builtins.listToAttrs[
   {name="libkexiv2";value="4.14.3";}
   {name="marble";value="4.14.3";}
   {name="okular";value="4.14.3";}
-  {name="pykde4";value="4.14.3";}
   {name="svgpart";value="4.14.3";}
 ];
 modules=[
@@ -62,13 +60,6 @@ modules=[
     { name="marble";  }
   ];
 }
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="pykde4";  }
-  ];
-}
 {
   module="kde-baseapps";
 sane="kde_baseapps";  split=true;
diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch b/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
deleted file mode 100644
index 27925a3e354..00000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0ed8c85dd15fb18a902b22a7555ba4f7cf01cb
-
-Patch created by: Erik Zeek
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=567022
-
---- a/CMakeLists.txt
-+++ a/CMakeLists.txt
-@@ -166,7 +166,7 @@ add_sip_python_module(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${Q
- 
- file(GLOB kio_files_sip sip/kio/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip})
--add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
-+add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
- 
- file(GLOB kutils_files_sip sip/kutils/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip})
-@@ -190,7 +190,7 @@ add_sip_python_module(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNE
- 
- file(GLOB dnssd_files_sip sip/dnssd/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${dnssd_files_sip})
--add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY})
-+add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
- 
- file(GLOB phonon_files_sip sip/phonon/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip})
-
diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
deleted file mode 100644
index 48d457e10a7..00000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies,
-  polkit_qt4, boost, lndir, pkgconfig }:
-
-let
-  inherit (pythonPackages) python pyqt4;
-  pydir = "lib/python${python.majorVersion}";
-in kde {
-
-  patches = [ ./pykde4-gcc-5.patch ];
-
-  # todo: polkit isn't found by the build system
-
-  buildInputs = [
-    python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt4
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ pyqt4 ];
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-  };
-}

From 563fa2c034866d1c951fab2fdb88bcaff35e4ca4 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Sat, 29 Apr 2017 13:19:04 -0800
Subject: [PATCH 1679/1744] nvidia-x11: switch download urls to https

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix      | 4 ++--
 pkgs/os-specific/linux/nvidia-x11/legacy173.nix    | 4 ++--
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +-
 pkgs/os-specific/linux/nvidia-x11/settings.nix     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 9441ce772c8..cb88a55a134 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -32,12 +32,12 @@ let
     src =
       if stdenv.system == "i686-linux" then
         fetchurl {
-          url = "http://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
+          url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
           sha256 = sha256_32bit;
         }
       else if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = "http://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
+          url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
           sha256 = sha256_64bit;
         }
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 6e5b412a9b8..51a230974c8 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -14,12 +14,12 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
+        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 = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
+        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}";
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index bc79e0efe63..98d557261fa 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   inherit (nvidia_x11) version;
 
   src = fetchurl {
-    url = "ftp://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2";
+    url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2";
     inherit sha256;
   };
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index f8999744164..aed0cfab436 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   inherit (nvidia_x11) version;
 
   src = fetchurl {
-    url = "ftp://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2";
+    url = "https://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2";
     inherit sha256;
   };
 

From 1d407173b0ddcf995d0dfbf98c936c5f046f8532 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 27 Mar 2017 12:31:21 +0000
Subject: [PATCH 1680/1744] firefox: rename default.nix -> common.nix

---
 .../networking/browsers/firefox/{default.nix => common.nix}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/applications/networking/browsers/firefox/{default.nix => common.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/common.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/default.nix
rename to pkgs/applications/networking/browsers/firefox/common.nix

From f0f572ff4635ff58e2ebbccf1b60617911308b16 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 27 Mar 2017 12:33:00 +0000
Subject: [PATCH 1681/1744] firefox: refactor into firefoxPackages, add more
 options

---
 .../networking/browsers/firefox/common.nix    | 278 +++++++++---------
 .../networking/browsers/firefox/packages.nix  |  43 +++
 pkgs/top-level/all-packages.nix               |  18 +-
 3 files changed, 189 insertions(+), 150 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages.nix

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 3193490b639..adf04c424aa 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,175 +1,167 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
+{ pname, version, updateScript ? null
+, src, patches ? [], meta }:
+
+{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
 , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
-, autoconf213, which, cargo, rustc
-, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, enableGTK3 ? false, gtk3, wrapGAppsHook
+, cairo, icu, libpng, jemalloc
+, autoconf213, which, gnused, cargo, rustc
+
 , debugBuild ? false
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Nightly" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
+
+### optionals
+
+, alsaSupport ? true, alsaLib
+, pulseaudioSupport ? true, libpulseaudio
+, ffmpegSupport ? true, gstreamer, gst-plugins-base
+, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
+
+, webrtcSupport ? true
+, geolocationSupport ? true
+, googleAPISupport ? geolocationSupport
+, crashreporterSupport ? false
+
+, safeBrowsingSupport ? false
+, drmSupport ? false
+
+# If you want the resulting program to call itself "Firefox" instead
+# of "Nightly" or whatever, enable this option.  However, those
+# binaries may not be distributed without permission from the
+# Mozilla Foundation, see
+# http://www.mozilla.org/foundation/trademarks/.
+, enableOfficialBranding ? false
 }:
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
 let
+  flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
+in
 
-common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "${pname}-unwrapped-${version}";
 
-  src = fetchurl {
-    url =
-      let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
-      in "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
-    inherit sha512;
-  };
+  inherit src patches meta;
 
-  # this patch should no longer be needed in 53
-  # from https://bugzilla.mozilla.org/show_bug.cgi?id=1013882
-  patches = lib.optional debugBuild ./fix-debug.patch;
-
-  buildInputs =
-    [ gtk2 zip libIDL libjpeg zlib bzip2
-      dbus dbus_glib pango freetype fontconfig xorg.libXi
-      xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
-      alsaLib nspr nss libnotify xorg.pixman yasm mesa
-      xorg.libXScrnSaver xorg.scrnsaverproto
-      xorg.libXext xorg.xextproto sqlite unzip
-      hunspell libevent libstartup_notification libvpx /* cairo */
-      icu libpng jemalloc
-      libpulseaudio # only headers are needed
-    ]
-    ++ lib.optional enableGTK3 gtk3
-    ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
+  buildInputs = [
+    gtk2 perl zip libIDL libjpeg zlib bzip2
+    dbus dbus_glib pango freetype fontconfig xorg.libXi
+    xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
+    nss nspr libnotify xorg.pixman yasm mesa
+    xorg.libXScrnSaver xorg.scrnsaverproto
+    xorg.libXext xorg.xextproto sqlite unzip makeWrapper
+    hunspell libevent libstartup_notification libvpx /* cairo */
+    icu libpng jemalloc
+  ]
+  ++ lib.optional  alsaSupport alsaLib
+  ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
+  ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
+  ++ lib.optional  gtk3Support gtk3;
 
   nativeBuildInputs =
     [ autoconf213 which gnused pkgconfig perl python cargo rustc ]
-    ++ lib.optional enableGTK3 wrapGAppsHook;
+    ++ lib.optional gtk3Support wrapGAppsHook;
 
-  configureFlags =
-    [ "--enable-application=browser"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--with-system-nss"
-      "--with-system-libevent"
-      "--with-system-libvpx"
-      "--with-system-png" # needs APNG support
-      "--with-system-icu"
-      "--enable-alsa"
-      "--enable-system-ffi"
-      "--enable-system-hunspell"
-      "--enable-system-pixman"
-      "--enable-system-sqlite"
-      #"--enable-system-cairo"
-      "--enable-startup-notification"
-      "--enable-content-sandbox"            # available since 26.0, but not much info available
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-updater"
-      "--enable-jemalloc"
-      "--disable-gconf"
-      "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
-      "--with-google-api-keyfile=ga"
-    ]
-    ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
-                      else [ "--disable-debug" "--enable-release"
-                             "--enable-optimize"
-                             "--enable-strip" ])
-    ++ lib.optional enableOfficialBranding "--enable-official-branding";
+  preConfigure = ''
+    # remove distributed configuration files
+    rm -f configure
+    rm -f js/src/configure
+    rm -f .mozconfig*
+
+    # this will run autoconf213
+    make -f client.mk configure-files
+
+    configureScript="$(realpath ./configure)"
+    cd obj-*
+  '' + lib.optionalString googleAPISupport ''
+    # Google API key used by Chromium and Firefox.
+    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+    # please get your own set of keys.
+    echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
+  '';
+
+  configureFlags = [
+    "--enable-application=browser"
+    "--with-system-jpeg"
+    "--with-system-zlib"
+    "--with-system-bz2"
+    "--with-system-nspr"
+    "--with-system-nss"
+    "--with-system-libevent"
+    "--with-system-libvpx"
+    "--with-system-png" # needs APNG support
+    "--with-system-icu"
+    "--enable-system-ffi"
+    "--enable-system-hunspell"
+    "--enable-system-pixman"
+    "--enable-system-sqlite"
+    #"--enable-system-cairo"
+    "--enable-startup-notification"
+    "--enable-content-sandbox" # available since 26.0, but not much info available
+    "--disable-tests"
+    "--disable-necko-wifi" # maybe we want to enable this at some point
+    "--disable-updater"
+    "--enable-jemalloc"
+    "--disable-maintenance-service"
+    "--disable-gconf"
+    "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
+  ]
+  ++ flag alsaSupport "alsa"
+  ++ flag pulseaudioSupport "pulseaudio"
+  ++ flag ffmpegSupport "ffmpeg"
+  ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
+  ++ flag webrtcSupport "webrtc"
+  ++ flag geolocationSupport "mozril-geoloc"
+  ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
+  ++ flag crashreporterSupport "crashreporter"
+  ++ flag safeBrowsingSupport "safe-browsing"
+  ++ flag drmSupport "eme"
+
+  ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
+                    else [ "--disable-debug" "--enable-release"
+                           "--enable-optimize"
+                           "--enable-strip" ])
+  ++ lib.optional enableOfficialBranding "--enable-official-branding";
 
   enableParallelBuilding = true;
 
-  preConfigure =
-    ''
-      configureScript="$(realpath ./configure)"
-      mkdir ../objdir
-      cd ../objdir
+  preInstall = ''
+    # The following is needed for startup cache creation on grsecurity kernels.
+    paxmark m dist/bin/xpcshell
+  '';
 
-      # Google API key used by Chromium and Firefox.
-      # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
-      # please get your own set of keys.
-      echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
-    '';
+  postInstall = ''
+    # For grsecurity kernels
+    paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
 
-  preInstall =
-    ''
-      # The following is needed for startup cache creation on grsecurity kernels.
-      paxmark m ../objdir/dist/bin/xpcshell
-    '';
+    # Remove SDK cruft. FIXME: move to a separate output?
+    rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
 
-  postInstall =
-    ''
-      # For grsecurity kernels
-      paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
+    # Needed to find Mozilla runtime
+    gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
+  '';
 
-      # Remove SDK cruft. FIXME: move to a separate output?
-      rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
-
-      # Needed to find Mozilla runtime
-      gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
-    '';
-
-  postFixup =
+  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
-    '';
+    patchelf --set-rpath "${lib.getLib libnotify
+      }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \
+        "$out"/lib/firefox-*/libxul.so
+  '';
 
   doInstallCheck = true;
-  installCheckPhase =
-    ''
-      # Some basic testing
-      "$out/bin/firefox" --version
-    '';
-
-  meta = {
-    description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
-    homepage = http://www.mozilla.com/en-US/firefox/;
-    maintainers = with lib.maintainers; [ eelco ];
-    platforms = lib.platforms.linux;
-  };
+  installCheckPhase = ''
+    # Some basic testing
+    "$out/bin/firefox" --version
+  '';
 
   passthru = {
-    inherit nspr version updateScript;
-    gtk = gtk2;
-    isFirefox3Like = true;
     browserName = "firefox";
-    ffmpegSupport = lib.versionAtLeast version "46.0";
+    inherit version updateScript;
+    isFirefox3Like = true;
+    gtk = gtk2;
+    inherit nspr;
+    inherit ffmpegSupport;
   };
-};
-
-in {
-
-  firefox-unwrapped = common {
-    pname = "firefox";
-    version = "53.0";
-    sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
-    updateScript = import ./update.nix {
-      attrPath = "firefox-unwrapped";
-      inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
-    };
-  };
-
-  firefox-esr-unwrapped = common {
-    pname = "firefox-esr";
-    version = "52.1.0esr";
-    sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
-    updateScript = import ./update.nix {
-      attrPath = "firefox-esr-unwrapped";
-      versionSuffix = "esr";
-      inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
-    };
-  };
-
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
new file mode 100644
index 00000000000..ad9cfa2ca5d
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -0,0 +1,43 @@
+{ lib, callPackage, fetchurl }:
+
+let common = opts: callPackage (import ./common.nix opts); in
+
+rec {
+
+  firefox = common rec {
+    pname = "firefox";
+    version = "53.0";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
+    };
+
+    meta = {
+      description = "A web browser built from Firefox source tree";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = with lib.maintainers; [ eelco ];
+      platforms = lib.platforms.linux;
+    };
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-unwrapped";
+    };
+  } {};
+
+  firefox-esr = common rec {
+    pname = "firefox-esr";
+    version = "52.1.0esr";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
+    };
+
+    meta = firefox.meta // {
+      description = "A web browser built from Firefox Extended Support Release source tree";
+    };
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-esr-unwrapped";
+      versionSuffix = "esr";
+    };
+  } {};
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c72c79cc..be36356d90e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13776,13 +13776,17 @@ with pkgs;
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  inherit (callPackages ../applications/networking/browsers/firefox {
-    inherit (gnome2) libIDL;
-    libpng = libpng_apng;
-    enableGTK3 = true;
-    python = python2;
-    gnused = gnused_422;
-  }) firefox-unwrapped firefox-esr-unwrapped;
+  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
+    callPackage = pkgs.newScope {
+      inherit (gnome2) libIDL;
+      libpng = libpng_apng;
+      python = python2;
+      gnused = gnused_422;
+    };
+  });
+
+  firefox-unwrapped = firefoxPackages.firefox;
+  firefox-esr-unwrapped = firefoxPackages.firefox-esr;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-esr = wrapFirefox firefox-esr-unwrapped { };

From 2f35ab59603ceaf693040b1713efba294126d1d8 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 27 Mar 2017 12:35:34 +0000
Subject: [PATCH 1682/1744] firefoxPackages: implement privacySupport option

---
 .../networking/browsers/firefox/common.nix        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index adf04c424aa..51307272db2 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -13,19 +13,30 @@
 
 ### optionals
 
+## optional libraries
+
 , alsaSupport ? true, alsaLib
 , pulseaudioSupport ? true, libpulseaudio
 , ffmpegSupport ? true, gstreamer, gst-plugins-base
 , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
 
-, webrtcSupport ? true
-, geolocationSupport ? true
+## privacy-related options
+
+, privacySupport ? false
+
+# WARNING: NEVER set any of the options below to `true` by default.
+# Set to `privacySupport` or `false`.
+
+, webrtcSupport ? !privacySupport
+, geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false
 
 , safeBrowsingSupport ? false
 , drmSupport ? false
 
+## other
+
 # If you want the resulting program to call itself "Firefox" instead
 # of "Nightly" or whatever, enable this option.  However, those
 # binaries may not be distributed without permission from the

From 00a0b8a5741eb78391932a26dad0881bc01cef30 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 1 Apr 2017 00:00:00 +0000
Subject: [PATCH 1683/1744] firefoxPackages: tor-browser: init at 6.5.2

---
 .../networking/browsers/firefox/common.nix    | 49 +++++++++++----
 .../networking/browsers/firefox/packages.nix  | 62 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 51307272db2..e926822b42a 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,5 +1,6 @@
 { pname, version, updateScript ? null
-, src, patches ? [], meta }:
+, src, patches ? [], overrides ? {}, meta
+, isTorBrowserLike ? false }:
 
 { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
 , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
@@ -22,12 +23,13 @@
 
 ## privacy-related options
 
-, privacySupport ? false
+, privacySupport ? isTorBrowserLike
 
 # WARNING: NEVER set any of the options below to `true` by default.
 # Set to `privacySupport` or `false`.
 
 , webrtcSupport ? !privacySupport
+, loopSupport ? !privacySupport || !isTorBrowserLike
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false
@@ -37,21 +39,22 @@
 
 ## other
 
-# If you want the resulting program to call itself "Firefox" instead
-# of "Nightly" or whatever, enable this option.  However, those
-# binaries may not be distributed without permission from the
-# Mozilla Foundation, see
+# If you want the resulting program to call itself
+# "Firefox"/"Torbrowser" instead of "Nightly" or whatever, enable this
+# option. However, in Firefox's case, those binaries may not be
+# distributed without permission from the Mozilla Foundation, see
 # http://www.mozilla.org/foundation/trademarks/.
 , enableOfficialBranding ? false
 }:
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
+assert !isTorBrowserLike -> loopSupport; # can't be disabled on firefox :(
 
 let
   flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "${pname}-unwrapped-${version}";
 
   inherit src patches meta;
@@ -60,12 +63,14 @@ stdenv.mkDerivation rec {
     gtk2 perl zip libIDL libjpeg zlib bzip2
     dbus dbus_glib pango freetype fontconfig xorg.libXi
     xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
-    nss nspr libnotify xorg.pixman yasm mesa
+    nspr libnotify xorg.pixman yasm mesa
     xorg.libXScrnSaver xorg.scrnsaverproto
     xorg.libXext xorg.xextproto sqlite unzip makeWrapper
     hunspell libevent libstartup_notification libvpx /* cairo */
     icu libpng jemalloc
   ]
+  ++ lib.optionals (!isTorBrowserLike) [ nss ]
+
   ++ lib.optional  alsaSupport alsaLib
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
   ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
@@ -98,8 +103,6 @@ stdenv.mkDerivation rec {
     "--with-system-jpeg"
     "--with-system-zlib"
     "--with-system-bz2"
-    "--with-system-nspr"
-    "--with-system-nss"
     "--with-system-libevent"
     "--with-system-libvpx"
     "--with-system-png" # needs APNG support
@@ -119,11 +122,33 @@ stdenv.mkDerivation rec {
     "--disable-gconf"
     "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
   ]
+
+  # TorBrowser patches these
+  ++ lib.optionals (!isTorBrowserLike) [
+    "--with-system-nss"
+    "--with-system-nspr"
+  ]
+
+  # and wants these
+  ++ lib.optionals isTorBrowserLike [
+    "--with-tor-browser-version=${version}"
+    "--enable-signmar"
+    "--enable-verify-mar"
+
+    # We opt out of TorBrowser's nspr because that patch is useless on
+    # anything but Windows and produces zero fingerprinting
+    # possibilities on other platforms.
+    # Lets save some space instead.
+    "--with-system-nspr"
+  ]
+
   ++ flag alsaSupport "alsa"
   ++ flag pulseaudioSupport "pulseaudio"
   ++ flag ffmpegSupport "ffmpeg"
   ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
   ++ flag webrtcSupport "webrtc"
+  ++ lib.optionals isTorBrowserLike
+       (flag loopSupport "loop")
   ++ flag geolocationSupport "mozril-geoloc"
   ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
   ++ flag crashreporterSupport "crashreporter"
@@ -171,8 +196,10 @@ stdenv.mkDerivation rec {
     browserName = "firefox";
     inherit version updateScript;
     isFirefox3Like = true;
+    inherit isTorBrowserLike;
     gtk = gtk2;
     inherit nspr;
     inherit ffmpegSupport;
   };
-}
+
+} // overrides)
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index ad9cfa2ca5d..5bc020909f9 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl }:
+{ lib, callPackage, fetchurl, fetchFromGitHub }:
 
 let common = opts: callPackage (import ./common.nix opts); in
 
@@ -40,4 +40,64 @@ rec {
     };
   } {};
 
+  tor-browser = common rec {
+    pname = "tor-browser";
+    version = "6.5.2";
+    isTorBrowserLike = true;
+
+    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+    src = fetchFromGitHub {
+      owner = "SLNOS";
+      repo  = "tor-browser";
+      rev   = "tor-browser-45.8.0esr-6.5-2";
+      sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
+    };
+
+    overrides = {
+      unpackPhase = ''
+        # fetchFromGitHub produces ro sources, root dir gets a name that
+        # is too long for shebangs. fixing
+        cp -a $src .
+        mv *-src tor-browser
+        chmod -R +w tor-browser
+        cd tor-browser
+
+        # set times for xpi archives
+        find . -exec touch -d'2010-01-01 00:00' {} \;
+      '';
+    };
+
+    meta = {
+      description = "A web browser built from TorBrowser source tree";
+      longDescription = ''
+        This is a version of TorBrowser with bundle-related patches
+        reverted.
+
+        I.e. it's a variant of Firefox with less fingerprinting and
+        some isolation features you can't get with any extensions.
+
+        Or, alternatively, a variant of TorBrowser that works like any
+        other UNIX program and doesn't expect you to run it from a
+        bundle.
+
+        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.
+
+        Create new profile by starting it as
+
+        $ firefox -ProfileManager
+
+        and then configure it to use your tor instance.
+      '';
+      homepage = https://www.torproject.org/projects/torbrowser.html;
+      platforms = lib.platforms.linux;
+    };
+  } {
+    ffmpegSupport = false;
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be36356d90e..024d658560d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13787,6 +13787,7 @@ with pkgs;
 
   firefox-unwrapped = firefoxPackages.firefox;
   firefox-esr-unwrapped = firefoxPackages.firefox-esr;
+  tor-browser-unwrapped = firefoxPackages.tor-browser;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-esr = wrapFirefox firefox-esr-unwrapped { };

From 48ec680ddb04b62203e8bb9225dab8fdfc30f6f1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 7 Apr 2017 23:02:13 +0000
Subject: [PATCH 1684/1744] torbrowser: rename to tor-browser-bundle-bin

---
 .../{torbrowser => tor-browser-bundle-bin}/default.nix   | 2 +-
 pkgs/top-level/all-packages.nix                          | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
 rename pkgs/applications/networking/browsers/{torbrowser => tor-browser-bundle-bin}/default.nix (99%)

diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
similarity index 99%
rename from pkgs/applications/networking/browsers/torbrowser/default.nix
rename to pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 9bf8a184e72..4443c848066 100644
--- a/pkgs/applications/networking/browsers/torbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -99,7 +99,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "tor-browser-${version}";
+  name = "tor-browser-bundle-bin-${version}";
   inherit version;
 
   src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 024d658560d..ba7eaa5009a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4225,7 +4225,14 @@ with pkgs;
 
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
-  torbrowser = callPackage ../applications/networking/browsers/torbrowser { };
+  # added 2017-04-05
+  torbrowser = builtins.trace ''
+    WARNING: torbrowser package was renamed to tor-browser-bundle-bin.
+
+    Also, consider using nix-built tor-browser-unwrapped package instead. Read its longDescription.
+  '' tor-browser-bundle-bin;
+
+  tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 

From f17a0fcdba31e59050d47b133c2cd4a519665a46 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 29 Apr 2017 22:11:01 +0000
Subject: [PATCH 1685/1744] xfce4-dockbarx-plugin: init at 0.5

---
 pkgs/applications/misc/dockbarx/default.nix   | 38 +++++++++++++++++
 pkgs/desktops/xfce/default.nix                |  1 +
 .../panel-plugins/xfce4-dockbarx-plugin.nix   | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 83 insertions(+)
 create mode 100644 pkgs/applications/misc/dockbarx/default.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix

diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
new file mode 100644
index 00000000000..60bd5134e8a
--- /dev/null
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }:
+
+pythonPackages.buildPythonApplication rec {
+  ver = "0.92";
+  name = "dockbarx-${ver}";
+
+  src = fetchFromGitHub {
+    owner = "M7S";
+    repo = "dockbarx";
+    rev = ver;
+    sha256 = "17n7jc3bk3f2i0i1ddpp05bakifc8y5xppads7ihpkj3qw9g35vl";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py                                --replace /usr/                   ""
+    substituteInPlace setup.py                                --replace '"/", "usr", "share",'  '"share",'
+    substituteInPlace dockbarx/applets.py                     --replace /usr/share/             $out/share/
+    substituteInPlace dockbarx/dockbar.py                     --replace /usr/share/             $out/share/
+    substituteInPlace dockbarx/iconfactory.py                 --replace /usr/share/             $out/share/
+    substituteInPlace dockbarx/theme.py                       --replace /usr/share/             $out/share/
+    substituteInPlace dockx_applets/battery_status.py         --replace /usr/share/             $out/share/
+    substituteInPlace dockx_applets/namebar.py                --replace /usr/share/             $out/share/
+    substituteInPlace dockx_applets/namebar_window_buttons.py --replace /usr/share/             $out/share/
+    substituteInPlace dockx_applets/volume-control.py         --replace /usr/share/             $out/share/
+  '';
+
+  propagatedBuildInputs = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ])
+    ++ (with gnome2; [ gnome_python gnome_python_desktop ])
+    ++ [ keybinder ];
+
+  meta = with stdenv.lib; {
+    homepage = http://launchpad.net/dockbar/;
+    description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index c6ac8973404..8dae4190237 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -83,6 +83,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_cpugraph_plugin         = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix         { };
   xfce4_datetime_plugin         = callPackage ./panel-plugins/xfce4-datetime-plugin.nix         { };
   xfce4_dict_plugin             = callPackage ./panel-plugins/xfce4-dict-plugin.nix             { };
+  xfce4_dockbarx_plugin         = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix         { };
   xfce4_embed_plugin            = callPackage ./panel-plugins/xfce4-embed-plugin.nix            { };
   xfce4_eyes_plugin             = callPackage ./panel-plugins/xfce4-eyes-plugin.nix             { };
   xfce4_fsguard_plugin          = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix          { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
new file mode 100644
index 00000000000..42f155f39e2
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
@@ -0,0 +1,42 @@
+{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala, dockbarx, gtk2, xfce, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  ver = "0.5";
+  rev = "a2dcb66";
+  name = "xfce4-dockbarx-plugin-${ver}-${rev}";
+
+  src = fetchFromGitHub {
+    owner = "TiZ-EX1";
+    repo = "xfce4-dockbarx-plugin";
+    rev = rev;
+    sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx";
+  };
+
+  pythonPath = [ dockbarx ];
+
+  buildInputs = [ pkgconfig python2 vala gtk2 pythonPackages.wrapPython ]
+    ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ])
+    ++ pythonPath;
+
+  postPatch = ''
+    substituteInPlace wscript           --replace /usr/share/            "\''${PREFIX}/share/"
+    substituteInPlace src/dockbarx.vala --replace /usr/share/            $out/share/
+    substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
+  '';
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf build";
+
+  installPhase = "python waf install";
+
+  postFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin;
+    description = "A plugins to embed DockbarX into xfce4-panel";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c72c79cc..3995337acb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1552,6 +1552,8 @@ with pkgs;
 
   docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
 
+  dockbarx = callPackage ../applications/misc/dockbarx { };
+
   dog = callPackage ../tools/system/dog { };
 
   dosfstools = callPackage ../tools/filesystems/dosfstools { };

From 9031c35b6cadf71f3049fb98b73eb5eee416d623 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Apr 2017 01:13:32 +0200
Subject: [PATCH 1686/1744] julia_05: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 32d98b1ce13..1ee4dea51e3 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -54,12 +54,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.5.0";
+  version = "0.5.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv";
+    sha256 = "1a9m7hzzrwk71gvwwrd1p45s64yid61i41n95gm5pzbry6p9fpl0";
   };
   prePatch = ''
     mkdir deps/srccache

From 99c28df9e568599d0c9eb651e742da0d71c5f063 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Apr 2017 21:31:34 -0400
Subject: [PATCH 1687/1744] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3fcb79c182fa57199242eec7e95db2b9f3f71113.
---
 .../haskell-modules/hackage-packages.nix      | 2572 ++++++++++++++---
 1 file changed, 2195 insertions(+), 377 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index afb4b323fbd..8f7e704d3aa 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5894,6 +5894,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_12" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.12";
+       sha256 = "66f516bd9f836e5252fe0186e447b68a61b594d9247466c502b74994d3e9f1b5";
+       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
@@ -5935,8 +5954,8 @@ self: {
      }:
      mkDerivation {
        pname = "GPipe";
-       version = "2.1.8";
-       sha256 = "236735a9ed98628d70c66f153378ff8a8b6e84c6e3d9ede1c1d0c2cc66e1fbca";
+       version = "2.2";
+       sha256 = "960ef739287f3e3078a3257adbb9c74c22df6ea69ab269f5a365da0133c6245c";
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -5981,19 +6000,12 @@ self: {
      }) {};
 
   "GPipe-GLFW" = callPackage
-    ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe
-     , transformers
-     }:
+    ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
      mkDerivation {
        pname = "GPipe-GLFW";
-       version = "1.3.0";
-       sha256 = "f929bfa320a76ca8c9769bf38b9de6b8928b9ef63f9b09c31a9dfe209f8826b6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
-       executableHaskellDepends = [
-         base exception-transformers GPipe transformers
-       ];
+       version = "1.4.0";
+       sha256 = "5409922cc181e2f7d943afe63b6154a65799ee6eba318a6201f303987c1eb529";
+       libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
@@ -9091,6 +9103,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Hastodon" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , MissingH, text
+     }:
+     mkDerivation {
+       pname = "Hastodon";
+       version = "0.0.1";
+       sha256 = "9aca8c337c989cb593b1deb1008968858b15f509606f2f80241c01c0b09a7277";
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types MissingH text
+       ];
+       homepage = "https://github.com/syucream/hastodon";
+       description = "mastodon client module for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Hate" = callPackage
     ({ mkDerivation, base, bytestring, GLFW-b, GLUtil, hpp, JuicyPixels
      , JuicyPixels-util, lens, mtl, multimap, OpenGL, random, stm
@@ -9639,13 +9667,36 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
-     , time
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
      }:
      mkDerivation {
        pname = "HsOpenSSL";
        version = "0.11.4.7";
        sha256 = "d37bc6ce6e9a36d725a91763bafdb492a61d18630968aab5ee7f2493e89d5f64";
+       revision = "1";
+       editedCabalFile = "38ee8f3bec45cc7b181a066e15ab7a1eb629cb4dd71514a17af7332638cba503";
+       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_0_11_4_8" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.8";
+       sha256 = "cc4d050827788ed1e36c314af8951c589b602febd819df43f12c5b671548211f";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -10401,6 +10452,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "JuicyPixels-extra_0_2_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
+     mkDerivation {
+       pname = "JuicyPixels-extra";
+       version = "0.2.0";
+       sha256 = "f599ea9986ba7d38fd33214786c4d2a2f28b4039f21efa39115100930b64279d";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-repa" = callPackage
     ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }:
      mkDerivation {
@@ -11863,10 +11929,10 @@ self: {
     ({ mkDerivation, base, glib, template-haskell }:
      mkDerivation {
        pname = "MissingK";
-       version = "0.0.0.2";
-       sha256 = "0360502acec1fbd91ca0ee5a7ed92d0a7f025b3a6e9a53647924f878cbfbd633";
+       version = "0.0.1";
+       sha256 = "dfc6a6e9dca10b2b67957381cec11cc5169e0f946237fe459299854dcc7c1ef5";
        libraryHaskellDepends = [ base glib template-haskell ];
-       homepage = "http://www.keera.es/blog/community/";
+       homepage = "http://www.keera.co.uk/blog/";
        description = "Useful types and definitions missing from other libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13256,6 +13322,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OpenGL_3_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
+     , OpenGLRaw, StateVar, text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGL";
+       version = "3.0.2.0";
+       sha256 = "faa99459724d614d2cf2d2b83c7bda4898ee71752a253bf4699c096822450efb";
+       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 {
@@ -16225,8 +16309,8 @@ self: {
     ({ mkDerivation, array, base, HGL, random, Yampa }:
      mkDerivation {
        pname = "SpaceInvaders";
-       version = "0.4.2";
-       sha256 = "03993ad20fb5142605b7b94208825ee7b847934435efcd720acc8c517d49bec5";
+       version = "0.4.4";
+       sha256 = "e9639e3a5e8376dc6a404cb238b83fc2550fadd62808450cbfe6651696812a4a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base HGL random Yampa ];
@@ -16555,8 +16639,8 @@ self: {
      }:
      mkDerivation {
        pname = "StockholmAlignment";
-       version = "1.0.2";
-       sha256 = "4267e5eeb5bf0f962c557ac84cf7dfec748e442d091fd12e687d033993213abb";
+       version = "1.0.3";
+       sha256 = "fc4bf2899c38d1e483801293ffa95e31e7fb49d61192f6aace1d4f1fd465ef70";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools SVGFonts text vector
@@ -18816,6 +18900,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Yampa_0_10_5_1" = callPackage
+    ({ mkDerivation, base, deepseq, random }:
+     mkDerivation {
+       pname = "Yampa";
+       version = "0.10.5.1";
+       sha256 = "cb9d8fe10b49489a04f1dd5117351e7ba82da6702fd103390cf21ae4f3ed40e3";
+       libraryHaskellDepends = [ base deepseq random ];
+       testHaskellDepends = [ base ];
+       homepage = "http://www.haskell.org/haskellwiki/Yampa";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Yampa-core" = callPackage
     ({ mkDerivation, base, deepseq, random, vector-space }:
      mkDerivation {
@@ -20329,8 +20427,8 @@ self: {
        pname = "active";
        version = "0.2.0.12";
        sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e";
-       revision = "1";
-       editedCabalFile = "ce9337ef3740c2b53ab2f5bec6d2019447fda7d7f2c5fe8f68d9930782fb93ff";
+       revision = "2";
+       editedCabalFile = "58b6749d9d67ccbe610228fa9a3e1d511205c60895def6249d560b09778ea19f";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -20427,6 +20525,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ad_4_3_3" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
+     , containers, criterion, data-reify, directory, doctest, erf
+     , filepath, free, nats, reflection, transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.3";
+       sha256 = "72b88c1703d57cbe41636d379f4e0ced50c65dd1e540a4b25c95eaf60767db2a";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion erf ];
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "adaptive-containers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21553,12 +21673,17 @@ self: {
      }) {};
 
   "aig" = callPackage
-    ({ mkDerivation, base, base-compat, mtl, QuickCheck, vector }:
+    ({ mkDerivation, base, base-compat, mtl, QuickCheck, tasty
+     , tasty-ant-xml, tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "aig";
-       version = "0.2.4";
-       sha256 = "ac0e06a707b7488de7e1f9d7b123703e2df14763f9e6448d67c4dd20ffdc88eb";
+       version = "0.2.5";
+       sha256 = "392f047901f63ed229b6987f2ceccb5d8980d86e33ddea9369dbf2ea23b8b984";
        libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-ant-xml tasty-quickcheck
+       ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21929,15 +22054,18 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, containers, directory, happy, process
-     , QuickCheck
+    ({ mkDerivation, array, base, Cabal, containers, directory
+     , filepath, happy, process, QuickCheck
      }:
      mkDerivation {
        pname = "alex";
        version = "3.2.1";
        sha256 = "a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c";
+       revision = "1";
+       editedCabalFile = "3a68e66a9cca5d3c2574bbb6e1a137178200d4444874977a8a28aad9002d80da";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [
          array base containers directory QuickCheck
        ];
@@ -26987,6 +27115,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) assimp;};
 
+  "ast-monad" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ast-monad";
+       version = "0.1.0.0";
+       sha256 = "11c05f4b95c92c67bc4cb210d987a66a734ab0118b65d162da9a5108e9da0c0d";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/mkdag/ast-monad#readme";
+       description = "A library for constructing AST by using do-notation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ast-monad-json" = callPackage
+    ({ mkDerivation, ast-monad, base, hspec, text }:
+     mkDerivation {
+       pname = "ast-monad-json";
+       version = "0.1.0.1";
+       sha256 = "e6bb46a3104a0c5e7e1eacd020397d423c6bbc09f3393a4dcf999ca22afb1728";
+       libraryHaskellDepends = [ ast-monad base text ];
+       testHaskellDepends = [ ast-monad base hspec text ];
+       homepage = "https://github.com/mkdag/ast-monad-json#readme";
+       description = "A library for writing JSON";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "astar" = callPackage
     ({ mkDerivation, base, hashable, psqueues, unordered-containers }:
      mkDerivation {
@@ -27858,10 +28012,10 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-time";
-       version = "0.1.3";
-       sha256 = "2330fde1031338c51f2da12a2f09a4dbb19f7155fc00b40c76490753f054b118";
+       version = "0.1.3.2";
+       sha256 = "e02e05c58fe7d8d44c5fde8a11ab3a5aabd0f97a1e1d81d27d04e8982cfef45c";
        libraryHaskellDepends = [
-         attoparsec base-prelude scientific text time
+         attoparsec base base-prelude scientific text time
        ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
@@ -28341,8 +28495,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "9";
-       editedCabalFile = "3037f35d45d512a965f96b9f3d707c6ebed6b8096c579b055b62e62de9ed801c";
+       revision = "10";
+       editedCabalFile = "92f2a3994aad55e07b6627314f2ab13f7fcdab47ac76df45a1f4fcc64480ec3a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -30089,8 +30243,8 @@ self: {
     ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
      mkDerivation {
        pname = "basic-sop";
-       version = "0.2.0.1";
-       sha256 = "b0c6ffd05c21f7cd6c823bc4462aff90d4ae9dd2407cd7773282a3342338f73b";
+       version = "0.2.0.2";
+       sha256 = "c743fed1ec725786b1238d3c23fa4e1634abee9d837c56264b290f3e36fda531";
        libraryHaskellDepends = [
          base deepseq generics-sop QuickCheck text
        ];
@@ -30991,6 +31145,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bimap_0_3_3" = callPackage
+    ({ mkDerivation, base, containers, exceptions, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "bimap";
+       version = "0.3.3";
+       sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1";
+       libraryHaskellDepends = [ base containers exceptions ];
+       testHaskellDepends = [
+         base containers exceptions QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/joelwilliamson/bimap";
+       description = "Bidirectional mapping between two key types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bimap-server" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, directory, http-types
      , unix, wai, warp
@@ -31496,8 +31668,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
-       revision = "4";
-       editedCabalFile = "76530b6075b691eed9d1986d7487a03470a30abc3b92c7bb32abdcbe1a60b963";
+       revision = "5";
+       editedCabalFile = "39affff3f143ba26ab239ac04876f0a96f98a42fc4e19d55077532e20c9b34ab";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -33001,6 +33173,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bits_0_5_1" = callPackage
+    ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "bits";
+       version = "0.5.1";
+       sha256 = "657e557bb913b53fb3b3fc7eda820cf3c85a5b89692d242275d3e8e8d9479c93";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base bytes mtl transformers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/bits";
+       description = "Various bit twiddling and bitwise serialization primitives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bits-atomic" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33868,8 +34057,8 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.3.2.1";
-       sha256 = "47632eb6dfe452fc408f206643cc0060804c7b6c378c52d3d3477c765cca6f8e";
+       version = "0.3.3.0";
+       sha256 = "763849dc7e8f3189cb293f6ed53f966140bf4265128e9a8eeb6b0f681181d676";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35019,19 +35208,20 @@ self: {
      }) {};
 
   "brainheck" = callPackage
-    ({ mkDerivation, base, containers, lens, megaparsec, mtl
+    ({ mkDerivation, base, containers, criterion, lens, megaparsec, mtl
      , optparse-applicative, recursion-schemes, text, vector
      }:
      mkDerivation {
        pname = "brainheck";
-       version = "0.1.0.1";
-       sha256 = "50f9f8aa9b2b31ab7bb85151ed986d6de4aa1a334bd8eea6dafdbd56d7c30a40";
+       version = "0.1.0.2";
+       sha256 = "1ee2d38c6cdd0d26805a98ec5b08402fe9ed8a3879cf60f0e5f198ec4d2d84ff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers lens megaparsec mtl recursion-schemes text vector
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/vmchale/brainheck#readme";
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -35854,6 +36044,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytes_0_15_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
+     , cereal, containers, directory, doctest, filepath, hashable, mtl
+     , scientific, text, time, transformers, transformers-compat
+     , unordered-containers, void
+     }:
+     mkDerivation {
+       pname = "bytes";
+       version = "0.15.3";
+       sha256 = "d8dcd6b66492db37e48b95535cf3bf91b1b0f356fedba403eb73f81158e0cd4d";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary bytestring cereal containers hashable mtl scientific
+         text time transformers transformers-compat unordered-containers
+         void
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/ekmett/bytes";
+       description = "Sharing code for serialization between binary and cereal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "byteset" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -37504,6 +37717,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabalish" = callPackage
+    ({ mkDerivation, base, Cabal, classy-prelude, directory, filepath
+     , optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "cabalish";
+       version = "0.1.0.2";
+       sha256 = "f1eec66796d8a909c7ae613fe5d40ea82087961b9bb05c24652479f82438a179";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal classy-prelude directory filepath optparse-applicative
+         text
+       ];
+       homepage = "https://github.com/RobertFischer/cabalish#readme";
+       description = "Provides access to the cabal file data for shell scripts";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabalmdvrpm" = callPackage
     ({ mkDerivation, base, Cabal, cabalrpmdeps, haskell98 }:
      mkDerivation {
@@ -38689,22 +38921,15 @@ self: {
      }) {};
 
   "casr-logbook" = callPackage
-    ({ mkDerivation, base, casr-logbook-html, casr-logbook-meta
-     , casr-logbook-meta-html, casr-logbook-reports
-     , casr-logbook-reports-html, casr-logbook-reports-meta
-     , casr-logbook-reports-meta-html, casr-logbook-types, digit
-     , directory, doctest, filepath, lucid, QuickCheck, template-haskell
-     , time
+    ({ mkDerivation, base, containers, digit, directory, doctest
+     , filepath, lens, lucid, QuickCheck, template-haskell, text, time
      }:
      mkDerivation {
        pname = "casr-logbook";
-       version = "0.2.2";
-       sha256 = "2eeb37db62ead7f718d4ef252e6492f4d2ff827fc24cc58f8da6f3205fe37fb6";
+       version = "0.3.0";
+       sha256 = "d0fe58cded95a230025580bc36bc2bfee68438bb22a6a839b639b3922fdf79c1";
        libraryHaskellDepends = [
-         base casr-logbook-html casr-logbook-meta casr-logbook-meta-html
-         casr-logbook-reports casr-logbook-reports-html
-         casr-logbook-reports-meta casr-logbook-reports-meta-html
-         casr-logbook-types digit lucid time
+         base containers digit lens lucid text time
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -39823,8 +40048,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.16";
-       sha256 = "7161e331f409ee95abfab14f720ad300ce4c9bd37a9fae74de6643c0f30b134b";
+       version = "6.6.17";
+       sha256 = "029103cbdd3e312a5bc80f9e25b8fa8f0b9910f9948ed272f2f3bbf9ea4351a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41267,6 +41492,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-ghc_0_7_2" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, deepseq, directory, filepath, ghc, ghc-boot
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl
+     , process, text, time, transformers, unbound-generics, uniplate
+     , unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.7.2";
+       sha256 = "d08f8673cc720c74d5337f8d72851134b2ed5d4c54a7683e6a88d503e4ae51ba";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers deepseq
+         directory filepath ghc ghc-boot ghc-typelits-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
+         haskeline lens mtl process text time transformers unbound-generics
+         uniplate unix unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, data-binary-ieee754, deepseq
@@ -41331,6 +41586,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-prelude_0_11_2" = callPackage
+    ({ mkDerivation, array, base, constraints, criterion
+     , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck
+     , reflection, singletons, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.11.2";
+       sha256 = "947134269d198bf4b4e35a4a893d61504740bed071deeda4f3b3608627668bb1";
+       libraryHaskellDepends = [
+         array base constraints data-binary-ieee754 data-default deepseq
+         ghc-prim ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise half integer-gmp lens QuickCheck
+         reflection singletons template-haskell vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-prelude-quickcheck" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -41361,6 +41643,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-systemverilog_0_7_2" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.7.2";
+       sha256 = "3eaad8b635695e90faa468ee33c6a8a2daaa769dd3a63ee70fc10fccad47d514";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-verilog" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
@@ -41379,6 +41679,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-verilog_0_7_2" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.7.2";
+       sha256 = "5344184f2ad3b4474e8aecf57dee0fb2fbebd1b828e4ad3506d5d01a21cc6e25";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-vhdl" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
@@ -41397,6 +41715,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-vhdl_0_7_2" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.7.2";
+       sha256 = "7a6bb775c4a72463d44861b5ab952428af208a24bbea8cc60653b9c89ea8c3b0";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classify" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -42261,6 +42597,108 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clr-bindings" = callPackage
+    ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "clr-bindings";
+       version = "0.1.0.0";
+       sha256 = "41553a590a7ffeb50303dbdae9ab18b79376ffb3d17ae3b418df41fc574012e7";
+       libraryHaskellDepends = [
+         base clr-host clr-marshal clr-typed pipes template-haskell text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-bindings";
+       description = "Glue between clr-host and clr-typed";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "clr-host" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, file-embed
+     , filepath, glib, mono, transformers
+     }:
+     mkDerivation {
+       pname = "clr-host";
+       version = "0.1.0.0";
+       sha256 = "5c7d3e30658ad0d9decde2d5b96c382221e915f2fceeb2e23ae7eb3dd40f91dd";
+       revision = "1";
+       editedCabalFile = "093131d340d6560ccf3b0c951c2f7201e5eb5e15a3937b3d80918fc6b3b4e715";
+       setupHaskellDepends = [
+         base Cabal directory filepath transformers
+       ];
+       libraryHaskellDepends = [ base bytestring file-embed ];
+       librarySystemDepends = [ glib mono ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host";
+       description = "Hosting the Common Language Runtime";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+
+  "clr-inline" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, clr-host, clr-marshal
+     , containers, criterion, directory, extra, filepath, here, hspec
+     , lens, process, template-haskell, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "clr-inline";
+       version = "0.1.0.0";
+       sha256 = "b44491ae737d74306ee8e329dbb2112543c462be4400696f0d918a0398d53339";
+       libraryHaskellDepends = [
+         base bytestring Cabal clr-host clr-marshal containers directory
+         extra filepath here lens process template-haskell temporary text
+         transformers
+       ];
+       testHaskellDepends = [ base hspec text ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell";
+       description = "Quasiquoters for inline C# and F#";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "clr-marshal" = callPackage
+    ({ mkDerivation, base, clr-host, text }:
+     mkDerivation {
+       pname = "clr-marshal";
+       version = "0.1.0.0";
+       sha256 = "530ec72001a71e2de21ec4c00a27d19dabeb5dc63f01d2624ca2928fbb82979d";
+       libraryHaskellDepends = [ base clr-host text ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal";
+       description = "Marshaling for the clr";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "clr-typed" = callPackage
+    ({ mkDerivation, base, clr-marshal, ghc-prim, text, tuple }:
+     mkDerivation {
+       pname = "clr-typed";
+       version = "0.1.0.0";
+       sha256 = "29d9fa9201383e8a74c992df344450d65c8949ffe52204e0a5092248cf43111f";
+       revision = "1";
+       editedCabalFile = "4bd80a1d9a2303e5756db026098cb1238c42c6bbafa595acc51ee4089382da09";
+       libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed";
+       description = "A strongly typed Haskell interface to the CLR type system";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "clr-win-linker" = callPackage
+    ({ mkDerivation, base, directory, pipes, pipes-safe, process }:
+     mkDerivation {
+       pname = "clr-win-linker";
+       version = "0.1.0.0";
+       sha256 = "db90e14d25371eb6865c188fb22859f24000bc99bec22af76547fa43b170e482";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory pipes pipes-safe process
+       ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/utils/clr-win-linker";
+       description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cltw" = callPackage
     ({ mkDerivation, base, curl, mtl, random, tagsoup }:
      mkDerivation {
@@ -42448,8 +42886,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-sections";
-       version = "0.1.0.3";
-       sha256 = "08cf3bb1bf87e7e9685fb24f3204df7023b0c5f0bfd6d16c950cba3507651441";
+       version = "0.2.0.0";
+       sha256 = "8e687cc28d593138c2de00c0d8afa951c969fb2603cafba3985cb34577d03a77";
        libraryHaskellDepends = [
          base base-prelude cmark containers microlens split text
        ];
@@ -44045,8 +44483,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.3.0.0";
-       sha256 = "c2f48c0e6e4b975b65c64988abcd72890bb1ec428a7e6f3212a58cf379cfd820";
+       version = "0.3.1.0";
+       sha256 = "0a61caaa31d80e2b4439ffd3174fee6a3446a6257051d91806b6189ce14b66d6";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens profunctors scientific
@@ -44064,20 +44502,21 @@ self: {
      }) {};
 
   "composite-base" = callPackage
-    ({ mkDerivation, base, hspec, lens, monad-control, mtl, QuickCheck
-     , template-haskell, text, transformers, transformers-base, vinyl
+    ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl
+     , QuickCheck, template-haskell, text, transformers
+     , transformers-base, vinyl
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.3.0.0";
-       sha256 = "48ec59eb4b27cd57be950f32b59ecfca118a597fcc84da0e466a009cfe411372";
+       version = "0.3.1.0";
+       sha256 = "c2c275548f0f566bb4eade400c026fab551fd65ff35f965858c37dc72726c0b6";
        libraryHaskellDepends = [
-         base lens monad-control mtl template-haskell text transformers
-         transformers-base vinyl
+         base exceptions lens monad-control mtl template-haskell text
+         transformers transformers-base vinyl
        ];
        testHaskellDepends = [
-         base hspec lens monad-control mtl QuickCheck template-haskell text
-         transformers transformers-base vinyl
+         base exceptions hspec lens monad-control mtl QuickCheck
+         template-haskell text transformers transformers-base vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Shared utilities for composite-* packages";
@@ -44090,8 +44529,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.3.0.0";
-       sha256 = "548f3bd735ca1aad856f3088d37a6d631e264afa3cbd19a9b2918550f1044fda";
+       version = "0.3.1.0";
+       sha256 = "155d034a59166e1defe5d564a03f864eb9b99cc6c1853460c7ce954940c5e65e";
        libraryHaskellDepends = [
          base composite-base ekg ekg-core lens text vinyl
        ];
@@ -44107,8 +44546,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.3.0.0";
-       sha256 = "cfd8e41e5824044de462aa890051cc3fb283c6417ff35208cec2f5f4618ab251";
+       version = "0.3.1.0";
+       sha256 = "388a609b0d55732fe4b17a155916aa94899b172991c45f9a1ebf713ddd8e1be0";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -45239,6 +45678,8 @@ self: {
        pname = "config-value";
        version = "0.5";
        sha256 = "2a2d825c1f23516c64d5ca6b587951b80be44006c09832177e61cfc0743692fa";
+       revision = "1";
+       editedCabalFile = "03d1de33c56ea5153710ced97a146038c5ec744335db1acb9f3a366fc4a24dc2";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -47660,8 +48101,8 @@ self: {
      }:
      mkDerivation {
        pname = "credentials";
-       version = "0.0.1.1";
-       sha256 = "e9febd40fa2e4c551423ad9d7e323b2d10b1dc0dd56e551612e210f1e16a1e15";
+       version = "0.0.2";
+       sha256 = "cd5701533100e99cd3e74e77d51d39b11de959db5d6a1a450ee891cadf3bc388";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb amazonka-kms base
          bytestring conduit cryptonite exceptions lens memory retry
@@ -47682,10 +48123,8 @@ self: {
      }:
      mkDerivation {
        pname = "credentials-cli";
-       version = "0.0.1.1";
-       sha256 = "9abcaf0cbbb5e523d4ceeadff677844c5af668a5374a78ee5a004101fea90d70";
-       revision = "1";
-       editedCabalFile = "b64b55d3e9904385ed1f18bcf5e60baa7d8e06aeec6f29c8b9b1a9fc62a2f219";
+       version = "0.0.2";
+       sha256 = "d194b8252baec919de4e0f66578db47b28a3cec82bc4ddb68006b5054e627980";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48589,20 +49028,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cryptonite_0_22" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, integer-gmp
-     , memory, tasty, tasty-hunit, tasty-kat, tasty-quickcheck
+  "cryptonite_0_23" = 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.22";
-       sha256 = "4be312a42a12ccd2ca60272ef485664f242c7ed89fa1909ba36a54c5fb6ff5f0";
+       version = "0.23";
+       sha256 = "ee4a1c2cec13f3697a2a35255022fe802b2e29cd836b280702f2495b5f6f0099";
        libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp memory
+         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;
@@ -49110,15 +49553,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cubicbezier_0_6_0_1" = callPackage
+  "cubicbezier_0_6_0_3" = callPackage
     ({ mkDerivation, base, containers, fast-math, integration, matrices
      , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty
      , tasty-hunit, vector, vector-space
      }:
      mkDerivation {
        pname = "cubicbezier";
-       version = "0.6.0.1";
-       sha256 = "13966701c791e61ae75347a6c78c263da9343febac856989500a614eda0635a3";
+       version = "0.6.0.3";
+       sha256 = "565ec57de9962efe8e357becd6d35e07389ef9c8565fb67925ccd5ba9c947315";
        libraryHaskellDepends = [
          base containers fast-math integration matrices microlens
          microlens-mtl microlens-th mtl vector vector-space
@@ -50869,13 +51312,13 @@ self: {
      }) {};
 
   "data-forest" = callPackage
-    ({ mkDerivation, base, doctest, forest }:
+    ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "data-forest";
-       version = "0.1.0.2";
-       sha256 = "01311f85695e8d885298a53f6f1d85ace0b47a0c27dd4eb3d772b418e7baba69";
+       version = "0.1.0.3";
+       sha256 = "d0dfc0b7684d48ef988ccaed3f27b735f71a7beae7fd3803ffb50317422faa44";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest forest ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
@@ -51129,6 +51572,18 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "data-list-zigzag" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-list-zigzag";
+       version = "0.1.1.0";
+       sha256 = "3edc697f83a1a958e42cf19ee31e8d95c24086b36c47b3d80ec8412a79eddcdf";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/erisco/data-list-zigzag";
+       description = "A list but with a balanced enumeration of Cartesian product";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-map-multikey" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -61876,6 +62331,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ether_0_5_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim
+     , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged
+     , tasty, tasty-quickcheck, template-haskell, transformers
+     , transformers-base, transformers-lift, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "ether";
+       version = "0.5.0.0";
+       sha256 = "cee27d3d697de46be906553022e748477bbc60412901ae190d0ab64ad788f27a";
+       libraryHaskellDepends = [
+         base exceptions mmorph monad-control mtl reflection tagged
+         template-haskell transformers transformers-base transformers-lift
+         writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base ghc-prim lens mtl QuickCheck tasty tasty-quickcheck
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq lens mtl transformers
+       ];
+       homepage = "https://int-index.github.io/ether/";
+       description = "Monad transformers and classes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ethereum-analyzer" = callPackage
     ({ mkDerivation, base, bimap, bytestring, containers
      , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl
@@ -62391,6 +62874,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_0_14_0_2" = callPackage
+    ({ mkDerivation, aeson, array, base, cereal, classy-prelude
+     , connection, containers, dns, dotnet-timespan, http-client, mtl
+     , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "0.14.0.2";
+       sha256 = "6681fa07999b6c6ee7445b5244467caf6a1e476501dea8fb6674a3326ce776f3";
+       libraryHaskellDepends = [
+         aeson array base cereal classy-prelude connection containers dns
+         dotnet-timespan http-client mtl protobuf random semigroups stm time
+         unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base classy-prelude connection dotnet-timespan stm tasty
+         tasty-hunit text time uuid
+       ];
+       homepage = "http://github.com/YoEight/eventstore";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every-bit-counts" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -63977,8 +64486,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "5";
-       editedCabalFile = "6d7aa462319fe6e02907bf6f2d017e4bc2e9ad929ad8db4417f015972624f8c0";
+       revision = "6";
+       editedCabalFile = "2190f49533cd4256613bea999deb0a56284447801f994dc50161bd3791285aff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65492,6 +66001,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "finite-typelits_0_1_2_0" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "finite-typelits";
+       version = "0.1.2.0";
+       sha256 = "3c52230d439724357d0c2b817223bb43d3a417e241b99f3ef58ab9dd838b1527";
+       libraryHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/mniip/finite-typelits";
+       description = "A type inhabited by finitely many values, indexed by type-level naturals";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "first-and-last" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -66728,8 +67250,8 @@ self: {
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.1.0.0";
-       sha256 = "94153a2e1aa613e8ab77eaa9fbc4723697b4cb4351f2383bc649290c2cbac495";
+       version = "0.2.0.0";
+       sha256 = "90dfc7b7fdc59d832d13b62a857ba27282b5a24af2affbb7f11be678d6e4e4f9";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring containers
          microlens text text-format
@@ -66973,6 +67495,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "folds_0_7_3" = callPackage
+    ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
+     , cabal-doctest, comonad, constraints, contravariant, data-reify
+     , deepseq, directory, distributive, doctest, filepath, lens, mtl
+     , pointed, profunctors, reflection, semigroupoids, semigroups
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "folds";
+       version = "0.7.3";
+       sha256 = "e7c5cba85f8d7df8aa45503e735a8e9c27e409f5841540b79f087508599c0a09";
+       configureFlags = [ "-f-test-hlint" ];
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base bifunctors comonad constraints contravariant
+         data-reify distributive lens mtl pointed profunctors reflection
+         semigroupoids transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring deepseq directory doctest filepath mtl semigroups
+       ];
+       homepage = "http://github.com/ekmett/folds";
+       description = "Beautiful Folding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "folds-common" = callPackage
     ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck
      }:
@@ -67267,13 +67816,15 @@ self: {
        pname = "forma";
        version = "0.1.0";
        sha256 = "4ae9efb4ca4bc806e8d700ad2532d17a3002b532e5fb05fab7d3582842de5881";
+       revision = "1";
+       editedCabalFile = "48b96ffd6c0e0db34b5eba95f69349a94f72004e5d56b17e486c91850f38fdf1";
        libraryHaskellDepends = [
          aeson base containers data-default-class mtl text
          unordered-containers
        ];
        testHaskellDepends = [ aeson base hspec mtl text ];
        homepage = "https://github.com/mrkkrp/forma";
-       description = "Process forms sent to you in JSON format like a man";
+       description = "Parse and validate forms in JSON format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -67596,13 +68147,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foundation_0_0_8" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.8";
+       sha256 = "0898e294758ba835c3be4693bf7533b7af20a178a925e67009ae5d892abcc9bb";
+       revision = "1";
+       editedCabalFile = "f0b53e59bf5eb4f0c8d7896c8b98940ed5a15aba49b186bb2a5949932a3efd34";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       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
-    ({ mkDerivation, base, bytestring, foundation }:
+    ({ mkDerivation, bytestring, foundation, text }:
      mkDerivation {
        pname = "foundation-edge";
-       version = "0.0.1";
-       sha256 = "8451eff606d689409ba70109a2fc6744ac849c56c0207a47275a4fadcf6ba257";
-       libraryHaskellDepends = [ base bytestring foundation ];
+       version = "0.0.2";
+       sha256 = "e1e4295ebf93bbf2478fe9b1204f4ca15e1bcdd55e0bffae598cd68714e1acb5";
+       libraryHaskellDepends = [ bytestring foundation text ];
        homepage = "https://github.com/haskell-foundation/foundation-edge";
        description = "foundation's edge with the conventional set of packages";
        license = stdenv.lib.licenses.bsd3;
@@ -68270,8 +68842,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "freetype2";
-       version = "0.1.1";
-       sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99";
+       version = "0.1.2";
+       sha256 = "517e80298890e903b03134d7840d3d1a517bfdad53127ed57c2fdd18cbfae302";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -68549,6 +69121,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fsh-csv" = callPackage
+    ({ mkDerivation, base, hint }:
+     mkDerivation {
+       pname = "fsh-csv";
+       version = "0.2.0.0";
+       sha256 = "15b93aff8ad23fd78b471bea83df25d970ec0997310df83e1485e9872fc11bd2";
+       libraryHaskellDepends = [ base hint ];
+       description = "csv parser for fsh";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fsharp" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -68746,17 +69329,17 @@ self: {
      }) {};
 
   "ftphs" = callPackage
-    ({ mkDerivation, base, hslogger, MissingH, mtl, network, parsec
-     , regex-compat
+    ({ mkDerivation, base, bytestring, hslogger, MissingH, mtl, network
+     , parsec, regex-compat
      }:
      mkDerivation {
        pname = "ftphs";
-       version = "1.0.9.1";
-       sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2";
+       version = "1.0.9.2";
+       sha256 = "f90fdbf1c8f633c15e5536167c282ba1c08eca5e44dd790890afee8929d357c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base hslogger MissingH mtl network parsec regex-compat
+         base bytestring hslogger MissingH mtl network parsec regex-compat
        ];
        homepage = "http://software.complete.org/ftphs";
        description = "FTP Client and Server Library";
@@ -69573,13 +70156,14 @@ self: {
      }) {};
 
   "gc" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, hlint
-     , parallel
+    ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
+     , filepath, hlint, parallel
      }:
      mkDerivation {
        pname = "gc";
-       version = "0";
-       sha256 = "0a699181d365bcec3e0da537a595c62ccf6d3a9df8865cb2ac5279421d6e9bcb";
+       version = "0.0.1";
+       sha256 = "61f5a1c4da66d2aef183fd0c79b58b35a0aff7c5bb8b2eba93a15d69430a5f96";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base directory doctest filepath hlint parallel
@@ -70337,12 +70921,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-sop_0_3_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "generics-sop";
+       version = "0.3.0.0";
+       sha256 = "03bcd0c46fdd126496f7b8eec25890a9ee888d09b65adb097501f7b93acf913a";
+       revision = "1";
+       editedCabalFile = "35a799ef954413d448a3e8451725b0b886240591cac1a456322f0253aa55d57e";
+       libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Generic Programming using True Sums of Products";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop-lens" = callPackage
     ({ mkDerivation, base, generics-sop, lens }:
      mkDerivation {
        pname = "generics-sop-lens";
        version = "0.1.2.1";
        sha256 = "4e49d4cc580d45e25e0abdeee12b1191ae75937af1c7ca03333979584a8a525c";
+       revision = "1";
+       editedCabalFile = "ee28830436813f3dd34669dd59d4dac3bb3d52241f6d12b562c2d76e49734d67";
        libraryHaskellDepends = [ base generics-sop lens ];
        homepage = "https://github.com/phadej/generics-sop-lens#readme";
        description = "Lenses for types in generics-sop";
@@ -70361,6 +70962,54 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genesis" = callPackage
+    ({ mkDerivation, base, directory, envparse, file-embed, filepath
+     , hspec, monad-control, monad-logger, monad-persist, persistent
+     , persistent-postgresql, persistent-sqlite, persistent-template
+     , resource-pool, template-haskell, text, text-conversions
+     }:
+     mkDerivation {
+       pname = "genesis";
+       version = "0.0.1.0";
+       sha256 = "4c93cb53fd0b7f8def666984500cbc063279ae501929377efc1dbb485c1e8296";
+       libraryHaskellDepends = [
+         base directory envparse file-embed filepath monad-control
+         monad-logger monad-persist persistent persistent-postgresql
+         persistent-template resource-pool template-haskell text
+         text-conversions
+       ];
+       testHaskellDepends = [
+         base hspec monad-control monad-logger monad-persist
+         persistent-sqlite persistent-template text
+       ];
+       homepage = "https://github.com/cjdev/genesis#readme";
+       description = "Opinionated bootstrapping for Haskell web services";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
+  "genesis-test" = callPackage
+    ({ mkDerivation, base, envparse, genesis, hspec, hspec-expectations
+     , lifted-base, monad-control, monad-logger, monad-persist
+     , persistent-postgresql, persistent-template, text
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "genesis-test";
+       version = "0.0.1.0";
+       sha256 = "427e095a40747725116e08253aed44102e9d7807dfc3de2f2b868c00c0db408b";
+       libraryHaskellDepends = [
+         base genesis hspec hspec-expectations lifted-base monad-control
+         monad-logger monad-persist persistent-postgresql transformers-base
+       ];
+       testHaskellDepends = [
+         base envparse genesis hspec monad-logger monad-persist
+         persistent-template text
+       ];
+       homepage = "https://github.com/cjdev/genesis#readme";
+       description = "Opinionated bootstrapping for Haskell web services";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "genetics" = callPackage
     ({ mkDerivation, base, random-fu }:
      mkDerivation {
@@ -72084,14 +72733,19 @@ self: {
      }) {};
 
   "ghcjs-dom-hello" = callPackage
-    ({ mkDerivation, base, ghcjs-dom, mtl }:
+    ({ mkDerivation, base, ghcjs-dom, jsaddle-warp, jsaddle-webkit2gtk
+     , mtl
+     }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
-       version = "4.0.0.0";
-       sha256 = "c4ce7931a8121f7f3c78df896af8449eeca4fd11abdd90b4fa338fa207da6c6d";
-       isLibrary = false;
+       version = "5.0.0.0";
+       sha256 = "ea5e6392ec9a3e4450e2728cbd444f9b69e8bead6ae69a4b0ed8dcd4d56add6c";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ base ghcjs-dom mtl ];
+       libraryHaskellDepends = [ base ghcjs-dom mtl ];
+       executableHaskellDepends = [
+         base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
+       ];
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -72333,6 +72987,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
+  "gi-atk_2_0_12" = callPackage
+    ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-atk";
+       version = "2.0.12";
+       sha256 = "1326ab0a7aa7ea89f0aeae0f1120692f04f056c891458b56d5cc909b1ef525b4";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ atk ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Atk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) atk;};
+
   "gi-cairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, text, transformers
@@ -72357,6 +73032,31 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
+  "gi-cairo_1_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-cairo";
+       version = "1.0.12";
+       sha256 = "13253ec1aa2ae9a4b57617e43cd54df95d2e6e83d2f3942eee8ccc855d602be0";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
@@ -72379,6 +73079,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gdk_3_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
+     , haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdk";
+       version = "3.0.12";
+       sha256 = "d8185f9e0c5dff01b40e9080ecebe21c3422ec7138c4e3b9721fe82217f02de6";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
+         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gdk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gdkpixbuf" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
@@ -72400,6 +73122,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
+  "gi-gdkpixbuf_2_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkpixbuf";
+       version = "2.0.12";
+       sha256 = "f925cc99ae9b12df1cdc6229526d31854128eacfa53f5dda1abfec9ec979b84f";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GdkPixbuf bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gdk_pixbuf;};
+
   "gi-gio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
@@ -72420,6 +73164,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gio_2_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gio";
+       version = "2.0.12";
+       sha256 = "e64bad35ed0340456bcd0aa41960ad3c695fedd13f4a2ed1f7387fdafd65568d";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gio bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
@@ -72427,8 +73192,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.11";
-       sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2";
+       version = "1.0.12";
+       sha256 = "a8064418b5e7742dea49a935066a617bfeb658788358061c312206768bc97eb9";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi haskell-gi-base
@@ -72462,6 +73227,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-glib_2_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, glib
+     , haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-glib";
+       version = "2.0.12";
+       sha256 = "bd0e08bfaded3279470b510ab010142f490ccfce06cbbaba66e36df524ca6e5d";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       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, text, transformers
@@ -72482,6 +73268,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gobject_2_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+     , haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gobject";
+       version = "2.0.12";
+       sha256 = "82110b303cc3118866e1d9ae455393e36e323125e81df6a48bbfd1fbde53a9a5";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib haskell-gi haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       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
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text
@@ -72489,8 +73296,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.11";
-       sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a";
+       version = "1.0.12";
+       sha256 = "cb662cfe71ee8a88751cfd93fcd20b110eacc6f2f3897edf6d9cf9aa870b2320";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -72511,8 +73318,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.11";
-       sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d";
+       version = "1.0.12";
+       sha256 = "7f5cacdc91c935498c2dfb45ef1a671658022dd83ede1e608301c5c126b22daa";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -72533,8 +73340,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.11";
-       sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577";
+       version = "1.0.12";
+       sha256 = "5837b5dcca567251b5b3f5d36d2c5ad44f9983ef384b9296abfc09d304d2df25";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
@@ -72555,8 +73362,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.11";
-       sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7";
+       version = "1.0.12";
+       sha256 = "ba6febe815fd28b16e9b0234fb58159aede65cf4b84e6f51e98036bc9661296e";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -72593,6 +73400,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk_3_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.14";
+       sha256 = "40746753292322b681792191fda061a761c4e866a3f46a187b33e7164971be60";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gtk-hs" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -72619,8 +73449,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.11";
-       sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7";
+       version = "2.0.12";
+       sha256 = "5d0a2b8fda1e7a3c4654b1de3fcde6f53559fa1b0cccc540456c1c6647c0f829";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
@@ -72642,8 +73472,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.12";
-       sha256 = "b7babfb18749b73f32dab35c464f641381b1ebc333cbdd6fe2167825db45476c";
+       version = "3.0.13";
+       sha256 = "df587a0702afb4c9c00d5bfa6c09f2f90e7047cd07aaaa997b83e4a0f3bfe639";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -72679,14 +73509,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x;};
 
-  "gi-javascriptcore_4_0_11" = callPackage
+  "gi-javascriptcore_4_0_12" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.11";
-       sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066";
+       version = "4.0.12";
+       sha256 = "e3adab3a808651a1408d8a1411b8cef32b75a2d05ce511b2b4c1100eec5597f3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base text
@@ -72707,8 +73537,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.11";
-       sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce";
+       version = "0.7.12";
+       sha256 = "66dc0be0ca776069da0e373b7b61b820e02773ce127b79bbe6740df272768965";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
@@ -72729,8 +73559,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.1";
-       sha256 = "de10141aad3fe918b337743231d86f2dd70e876e6e49de8f4d36ef700d241299";
+       version = "1.0.2";
+       sha256 = "68e356d442415172191a3c60774219238b0b27a28921098e9f755d74b7623a75";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -72770,6 +73600,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
+  "gi-pango_1_0_13" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-pango";
+       version = "1.0.13";
+       sha256 = "f42f189b30358e710bef8d25fdd7563ba0b8262d009506d52761bd320256335b";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo pango ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Pango bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
+
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
@@ -72777,8 +73633,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.12";
-       sha256 = "e24214f43c50ecb1077168298bf48e447ddcb80ee8c8452fc02ef04df971a787";
+       version = "1.0.13";
+       sha256 = "0f9194258b1b822d4bcd89615a4d54689b29a7b9b0a4d4189e352215da65493f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -72803,8 +73659,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.11";
-       sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b";
+       version = "0.18.12";
+       sha256 = "f797b1955e2023a05073cc75f36f4faddb122320a14c884d2c762d046152bf11";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
@@ -72825,8 +73681,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-secret";
-       version = "0.0.1";
-       sha256 = "877f0d508b6bcdd46b2e2ab285de6cd96e687f3085c9b2bb7b23600834b29f9a";
+       version = "0.0.2";
+       sha256 = "ec3fe6061e0dfe73bca0d67ffcfa0b982cea77fdab97587bac69ae74bab7c2a1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -72860,6 +73716,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) libsoup;};
 
+  "gi-soup_2_4_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-soup";
+       version = "2.4.12";
+       sha256 = "275d66016f19bef997dcce9a1dd3bad6b8f7b650243dea8eb57e68a6167b5f12";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ libsoup ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Libsoup bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.gnome2) libsoup;};
+
   "gi-vte" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
@@ -72867,8 +73745,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.13";
-       sha256 = "4dfce5aefb7e2e8daad8be77f3c64580bd5c1b90287513153f668497308c1b40";
+       version = "2.91.14";
+       sha256 = "5a20f82ec924a55f57aca1c05806824d88a791df028f39d7ca28a49470487bf7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -72906,6 +73784,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x;};
 
+  "gi-webkit_3_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
+     , text, transformers, webkitgtk24x
+     }:
+     mkDerivation {
+       pname = "gi-webkit";
+       version = "3.0.12";
+       sha256 = "01d47b73dc867c3b5dd969b9bef9c4a4e998d4899fec5f899ed38aee862e2964";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
+         haskell-gi haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ webkitgtk24x ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "WebKit bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) webkitgtk24x;};
+
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
@@ -72914,8 +73816,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.11";
-       sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b";
+       version = "4.0.12";
+       sha256 = "7f8c3fd5e54ba80edee55b23fa6d200cfb9897353c9366f2ccbfa2f9c81369b0";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -72937,8 +73839,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.11";
-       sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033";
+       version = "4.0.12";
+       sha256 = "513fb09b9d9600551c61de1e458f9c508399b4e9c0b6e1fafd32ceb440edca77";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
@@ -74494,8 +75396,8 @@ self: {
      }:
      mkDerivation {
        pname = "glicko";
-       version = "0.1.1.0";
-       sha256 = "740b5850982ea36f750c137930bf6e070b365618a547a520fcdab34fd4f913e9";
+       version = "0.1.1.1";
+       sha256 = "f10ea912c522e26ef5840534cd18a664e265232f8f34af6c9f8460ab30284ac3";
        libraryHaskellDepends = [
          base containers data-default deepseq lens parallel statistics
        ];
@@ -74542,8 +75444,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.20.3";
-       sha256 = "2c50f79c534a9d350cf956f559041d7d344f5c09586c648ec4284a6093a7aec1";
+       version = "2.20.4";
+       sha256 = "3e110a840f679e968eb965ccba1d5cbc639716ac98d5c953a95ce6e85bfdcbd9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -75159,8 +76061,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.6";
-       sha256 = "029d9ec796ae8cb7a1986676ea85552b3f48ddaa0c92dddb49e406cd3129b79f";
+       version = "0.2.8";
+       sha256 = "47d98848a3c2a13baeaab7ed12a93ced58b97c01c828e5342f73c73a6c181758";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80167,13 +81069,13 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-helpers";
-       version = "0.0.7";
-       sha256 = "671bf6f447083c6a60fb862cd694f3944248167a5291ff58d4f39c9cce1fa433";
+       version = "0.0.9.1";
+       sha256 = "b1017f768a6db5cccadd7f22c778e55657104e6fefd98b20fac9824f43fd9419";
        libraryHaskellDepends = [
          array base gio glib gtk mtl process template-haskell
        ];
        homepage = "http://keera.es/blog/community";
-       description = "A collection of auxiliary operations and widgets related to Gtk";
+       description = "A collection of auxiliary operations and widgets related to Gtk+";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84311,15 +85213,18 @@ self: {
      }) {};
 
   "happy" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, process }:
+    ({ mkDerivation, array, base, Cabal, containers, directory
+     , filepath, mtl, process
+     }:
      mkDerivation {
        pname = "happy";
        version = "1.19.5";
        sha256 = "62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da";
-       revision = "1";
-       editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c";
+       revision = "2";
+       editedCabalFile = "fc70418fedcdcf5e235e0eceeee7eeedf485d3833ab312d148cad74f49da70b7";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
        homepage = "http://www.haskell.org/happy/";
@@ -84437,8 +85342,8 @@ self: {
      }:
      mkDerivation {
        pname = "har";
-       version = "0.3.0";
-       sha256 = "268c183e842194e66a8483cc57c55ccb516d9396ce9d2c16be0495e9b0fbceea";
+       version = "0.4.0";
+       sha256 = "ff37aeb31502a4ca134beb7dfaa148f3b61bec5c0234f88e58c7b2be400e7abc";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text
        ];
@@ -84980,6 +85885,8 @@ self: {
        pname = "hashids";
        version = "1.0.2.3";
        sha256 = "ecd74235e8f729514214715b828bf479701aa4b777e4f104ea07534a30822534";
+       revision = "1";
+       editedCabalFile = "ccdb6eefcfb1a8c0f1e4751e4e469797224f88a59b8e9c725c111b90a6a6e27a";
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
@@ -85200,8 +86107,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskanoid";
-       version = "0.1.5";
-       sha256 = "2a2270b3e941ec942c7d12f641bcf651895f42341514759b1edb77390d205ecc";
+       version = "0.1.5.2";
+       sha256 = "ee866c34cae8021aab930a6f6b5817f7ec47d2089c68c45d4ce556cd39f584c3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89022,18 +89929,16 @@ self: {
      }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
-    ({ mkDerivation, base, blas, HUnit, liblapack, primitive
-     , storable-complex, tasty, tasty-hunit, vector
+    ({ mkDerivation, base, blas, hspec, liblapack, primitive
+     , storable-complex, vector
      }:
      mkDerivation {
        pname = "hblas";
-       version = "0.3.2.1";
-       sha256 = "3e159cc8c98735861edad47cd4da11bd5862bb629601a9bc441960c921ae8215";
-       revision = "2";
-       editedCabalFile = "48b2f43d8ac30594dc0fbcadc4f4a7a478394da7f223bc909aa18bdcadb99d09";
+       version = "0.4.0.0";
+       sha256 = "8bbd167775fd0bd14cbd24fc637de1d6fa4ba98ecf7781391cdae98426366b0a";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ blas liblapack ];
-       testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
+       testHaskellDepends = [ base hspec primitive vector ];
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -89325,8 +90230,8 @@ self: {
     ({ mkDerivation, base, bluetooth, cwiid, unix }:
      mkDerivation {
        pname = "hcwiid";
-       version = "0.0.5";
-       sha256 = "9d249bc8263cb0ad576c64a71bbdd42fb423d2bfb5a2e9cdf449b5d0e64cc136";
+       version = "0.0.6.1";
+       sha256 = "21adb829fed670dd7dcd3c1412b53af6ecd3c85cf23067d13ac77dc2167df4b0";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ bluetooth cwiid ];
        homepage = "https://github.com/ivanperez-keera/hcwiid";
@@ -89808,6 +90713,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "heaps_0_3_4_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
+     , filepath
+     }:
+     mkDerivation {
+       pname = "heaps";
+       version = "0.3.4.1";
+       sha256 = "7c2567095b8459e8cee61df6a3ee3adb67b8f2f5a42422b444c3e3ce271c2ff9";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/heaps/";
+       description = "Asymptotically optimal Brodal/Okasaki heaps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heapsort" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -92529,8 +93451,8 @@ self: {
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "0.5.0.1";
-       sha256 = "0c25984c5713318e00990d0a787fb3d788fe0211273d1f7901a8d590b4d3a700";
+       version = "0.5.0.2";
+       sha256 = "4b2b3ebf5b864ac2770661059330c10d672142b010a2c50137cfa236afe568c5";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite exceptions
          lifted-async lifted-base memory monad-control monad-logger mtl
@@ -92599,6 +93521,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hip_1_5_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
+     , criterion, deepseq, directory, filepath, hspec, JuicyPixels
+     , netpbm, primitive, process, QuickCheck, repa, repa-algorithms
+     , temporary, vector
+     }:
+     mkDerivation {
+       pname = "hip";
+       version = "1.5.3.0";
+       sha256 = "f9c7a34e9fbbb208adcf15d8ea76c44a8a13ec852261f0bb4913a3dfcac74f1e";
+       libraryHaskellDepends = [
+         base bytestring Chart Chart-diagrams colour deepseq directory
+         filepath JuicyPixels netpbm primitive process repa temporary vector
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq repa repa-algorithms vector
+       ];
+       homepage = "https://github.com/lehins/hip";
+       description = "Haskell Image Processing (HIP) Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hipbot" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring
      , either, exceptions, http-client, http-client-tls, http-types, jwt
@@ -95098,6 +96044,8 @@ self: {
        pname = "hookup";
        version = "0.1.0.0";
        sha256 = "0b321b470cb66f8b0d1611cbe26ec6d0c8904f984456bd2fbe292fb2efd8a580";
+       revision = "1";
+       editedCabalFile = "85316f17f206fc4fbff16d40ef7c50029b9abb1f1674298869be468b1d7eb7e3";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
          template-haskell
@@ -96081,6 +97029,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpg" = callPackage
+    ({ mkDerivation, base, random }:
+     mkDerivation {
+       pname = "hpg";
+       version = "0.4";
+       sha256 = "4a6f436fe9dbd5ee5ae2b996c45c60895b8f7adae33e0aae71ab238bdc768710";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base random ];
+       homepage = "https://git.alokat.org/hpg";
+       description = "no";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "hpio" = callPackage
     ({ mkDerivation, async, base, base-compat, bytestring, containers
      , directory, doctest, exceptions, filepath, hlint, hspec, mtl
@@ -97396,8 +98358,8 @@ self: {
     ({ mkDerivation, base, containers, directory, filepath, process }:
      mkDerivation {
        pname = "hsc2hs";
-       version = "0.68.1";
-       sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75";
+       version = "0.68.2";
+       sha256 = "f609707c247c077013fe55e8b2e81ff531a2bc56ac3d962297ec8af2a2d13618";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97889,18 +98851,21 @@ self: {
      }) {};
 
   "hscuid" = callPackage
-    ({ mkDerivation, base, containers, formatting, hostname, random
-     , text, time, transformers, unix
+    ({ mkDerivation, base, containers, criterion, hostname, mwc-random
+     , random, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "hscuid";
-       version = "1.2.0.0";
-       sha256 = "b4b03b2005cc3e6651b2e221ce5dcdf73026b8f6ab175d0f5a8fe6b427ebb505";
+       version = "1.2.0.1";
+       sha256 = "b2c23fb92ccf637e5de07a92168c6647024da821204f877a925ffed1679cc036";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base formatting hostname random text time transformers unix
+         base hostname mwc-random random text time transformers unix
        ];
-       testHaskellDepends = [ base containers ];
-       homepage = "https://github.com/eightyeight/hscuid";
+       executableHaskellDepends = [ base criterion ];
+       testHaskellDepends = [ base containers text ];
+       homepage = "https://github.com/crabmusket/hscuid";
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103760,8 +104725,8 @@ self: {
     ({ mkDerivation, base, blaze-html, deepseq, text }:
      mkDerivation {
        pname = "hyper";
-       version = "0.1.0.0";
-       sha256 = "04c76c0c88f658e9878f8090cc2e1351977128861ce4c03ce52d11c42e44b3da";
+       version = "0.1.0.1";
+       sha256 = "44ab0512d4bf64482a715dea87224bf2a33f81470add489c3fd25bcc878cee4b";
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -103773,8 +104738,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyper-extra";
-       version = "0.1.0.0";
-       sha256 = "1c36de58e0f51cfc3f47c83185c9d08539491d208c3b956f7de1119cd94858c8";
+       version = "0.1.0.1";
+       sha256 = "6cb7b9708597584838ab4fff307d9ddfd96ece44b50e0ffdd0ded18bf1b8cbb9";
        libraryHaskellDepends = [
          base diagrams-lib diagrams-svg hyper svg-builder text
        ];
@@ -103789,8 +104754,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyper-haskell-server";
-       version = "0.1.0.0";
-       sha256 = "dcbd3d4e9b4026d6531fb54041e5ce595cec4094098a902d9e24c8f7b69516b8";
+       version = "0.1.0.1";
+       sha256 = "43b0d770896ca0c38aee876bb23ee03b20009ce7afab4d6b5ca07a99f6e7f290";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103930,6 +104895,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyphenation_0_7" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers
+     , doctest, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hyphenation";
+       version = "0.7";
+       sha256 = "3a61abc2aab369f092141b9d9bd68ded16b3614ac333fb6f486abd399bdb3e50";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring containers unordered-containers zlib
+       ];
+       testHaskellDepends = [
+         base containers doctest unordered-containers
+       ];
+       homepage = "http://github.com/ekmett/hyphenation";
+       description = "Configurable Knuth-Liang hyphenation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hypher" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default, hashable, HTTP, http-conduit, http-types, HUnit
@@ -105004,6 +105990,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ihs" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "ihs";
+       version = "0.1.0.0";
+       sha256 = "8ad33d91faae09309cf0286a26dfb0efbd8e1489e33de9fa44a529b5dfd3179d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base process ];
+       homepage = "https://github.com/minad/ihs";
+       description = "Interpolated Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ihttp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , contstuff, enumerator, netlines, network
@@ -107025,6 +108025,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "intervals_0_8" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
+     , distributive, doctest, filepath, ghc-prim, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "intervals";
+       version = "0.8";
+       sha256 = "6423945feae2c1e0f4113900cac23efb95051bc5e18a8c93966db24fef81e8c4";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "http://github.com/ekmett/intervals";
+       description = "Interval Arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
@@ -107871,8 +108891,8 @@ self: {
        pname = "irc-core";
        version = "2.2.0.1";
        sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a";
-       revision = "1";
-       editedCabalFile = "fd862f303735a1a3c2f7913d5f6834a2711c20aacdabb98515504b8a4de986a6";
+       revision = "2";
+       editedCabalFile = "93130a04995f8cde1b4f4c5a48f08c5ff3d58e040253e365f5f5e2b352e06025";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -108315,6 +109335,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "isotope_0_5_0_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck
+     , template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "isotope";
+       version = "0.5.0.1";
+       sha256 = "eaa619c278872931b6d2db21faa22684f98ffc62e172e4f352f59e8d4df6eb56";
+       libraryHaskellDepends = [
+         base containers megaparsec template-haskell th-lift
+       ];
+       testHaskellDepends = [
+         base containers hspec megaparsec QuickCheck
+       ];
+       homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md";
+       description = "Isotopic masses and relative abundances";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ispositive" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -108575,10 +109615,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory";
-       version = "0.1.0.5";
-       sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158";
-       revision = "1";
-       editedCabalFile = "0fa37aeb8c009a31030e0fe7fbb278907c41909c0f06d74b9942adbf58fc446f";
+       version = "0.1.0.6";
+       sha256 = "8afde83a2fb9277143e56f6b33edfeedc6a69e98662fd7f16c11eb242eb3538d";
        libraryHaskellDepends = [
          array base base-compat containers dlist filepath monadLib pretty
          template-haskell text th-lift
@@ -109757,8 +110795,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.8.3.1";
-       sha256 = "682ade9ea22c8f3b23a928b8da0754c697e36d6b3569590f40953d499f247bdb";
+       version = "0.8.3.2";
+       sha256 = "a49e1a020ccb35c999001aaa6a64e18b80e5bee374b70e33a287f42f2bc7af75";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -109808,8 +110846,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.8.3.0";
-       sha256 = "1749c9ddc02d140378bcac307bcd6ef198551b274f0087ac982509a0e7d2e693";
+       version = "0.8.3.1";
+       sha256 = "21dbf42537c5e385c1391e3189fe650ebfc8199ebd5faf8768d8c6eea2c797fa";
        libraryHaskellDepends = [
          aeson base containers http-types jsaddle stm text time transformers
          wai wai-websockets warp websockets
@@ -109832,8 +110870,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.8.2.2";
-       sha256 = "d9444c5ec1ef4abe74410beddf8a892f97d98d836501dd05169c962a3e108353";
+       version = "0.8.3.1";
+       sha256 = "83cb2c648661f98a1cc39c06ab35d1994999b028bd4fb9aeb0bb15196a32b94d";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -109851,8 +110889,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.3.0";
-       sha256 = "dbd6405844157342707a8a82dd03bf150eb017112b684de8ad9f45537b6e10ba";
+       version = "0.8.3.1";
+       sha256 = "0d7865a538ab29b3986b0d3b268f765f3120be9218ae4077f890fef956238ba8";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -109867,8 +110905,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, jsaddle }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.3.0";
-       sha256 = "007886eaa4cfa3a2c04828398448602eb1bcc697dfba3a890f5f577753ea13f5";
+       version = "0.8.3.2";
+       sha256 = "33952c34b28eb677b2deed60a9ea374e2f20cac45f18df4a63b6c8bd75e1c528";
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -110428,8 +111466,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-sop";
-       version = "0.2.0.2";
-       sha256 = "2ea0c44acc50087b09b399e917780c7d5a9e7e864c29a3b6512baff523db0785";
+       version = "0.2.0.3";
+       sha256 = "3065f11df636f9b72d988247bcc1273de9155255d8b31ed9105929e2ab67c22b";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -112479,8 +113517,8 @@ self: {
      }:
      mkDerivation {
        pname = "knead";
-       version = "0.2.1";
-       sha256 = "0aa766ebd9b72370dd18b1f7e3bef2d67c6575b36d9f47467ab54997bfe88f0d";
+       version = "0.2.2";
+       sha256 = "6ff6641873365a20a4b1e6a20b89f250f1fb822244978af63a14b3527bb57e6e";
        libraryHaskellDepends = [
          base llvm-extra llvm-tf storable-record storable-tuple transformers
          utility-ht
@@ -115671,6 +116709,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens_4_15_2" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , Cabal, cabal-doctest, comonad, containers, contravariant
+     , criterion, deepseq, directory, distributive, doctest, exceptions
+     , filepath, free, generic-deriving, ghc-prim, hashable, hlint
+     , 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, transformers
+     , transformers-compat, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.15.2";
+       sha256 = "5b1556650572ce05cacb7bc32f5f309e0fc468f27c6a9f553e606a841f8cd72a";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring comonad containers
+         contravariant distributive exceptions filepath free ghc-prim
+         hashable kan-extensions mtl parallel profunctors reflection
+         semigroupoids semigroups tagged template-haskell text transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving hlint 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 {
@@ -115704,6 +116782,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-action_0_2_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant
+     , directory, doctest, filepath, lens, mtl, profunctors
+     , semigroupoids, semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "lens-action";
+       version = "0.2.1";
+       sha256 = "7329f50d9d61911cbcd2d4b9501ec946efddc94c7374c0eee430af53135c651d";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base comonad contravariant lens mtl profunctors semigroupoids
+         semigroups transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/lens-action/";
+       description = "Monadic Getters and Folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
      , doctest, filepath, generic-deriving, lens, scientific, semigroups
@@ -115728,6 +116827,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lens-aeson_1_0_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, doctest, generic-deriving, lens, scientific
+     , semigroups, simple-reflect, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "lens-aeson";
+       version = "1.0.1";
+       sha256 = "5dd2aaa608770b13313e5240cf7a03b3b32b40e8a63a65ca0ed13c488f320dbd";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring lens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/lens/lens-aeson/";
+       description = "Law-abiding lenses for aeson";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-datetime" = callPackage
     ({ mkDerivation, base, lens, time }:
      mkDerivation {
@@ -115862,8 +116984,8 @@ self: {
     ({ mkDerivation, base, fclabels, generics-sop, transformers }:
      mkDerivation {
        pname = "lens-sop";
-       version = "0.2.0.1";
-       sha256 = "13a335a49acfef59ab8d39845a5bb174826c342c1705a96caa0c7d1fba6d7966";
+       version = "0.2.0.2";
+       sha256 = "7f6800088634aeb6788c1bc65dcdaeb7f0c8cdaee288a24bf9f946cc59496d99";
        libraryHaskellDepends = [
          base fclabels generics-sop transformers
        ];
@@ -116528,30 +117650,30 @@ self: {
   "liblawless" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, binary
      , boomerang, bytestring, concurrent-machines, containers
-     , containers-unicode-symbols, contravariant, data-default
-     , data-textual, dns, exceptions, filepath, hjsonschema, lens
-     , machines, managed, monad-control, mtl, network, network-ip
-     , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm
-     , stm-containers, temporary, test-framework
-     , test-framework-quickcheck2, test-framework-th, text, text-icu
-     , text-icu-normalized, text-printer, time, transformers, zippers
+     , containers-unicode-symbols, contravariant, data-textual, dns
+     , exceptions, filepath, hjsonschema, lens, machines, managed
+     , monad-control, mtl, network, network-ip, parsers, pathtype
+     , protolude, QuickCheck, random, semigroups, stm, stm-containers
+     , temporary, test-framework, test-framework-quickcheck2
+     , test-framework-th, text, text-icu, text-icu-normalized
+     , text-printer, time, transformers, zippers
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.20.1";
-       sha256 = "df2ce59748a56fb7886109c7c7dd0bdb47eeba41fa3d0aeb0b7d8e7239528924";
+       version = "0.20.2";
+       sha256 = "74c702a79464a99c9eba772dc0545ce24806d8c560379ed22b41353955504e5f";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
-         contravariant data-default data-textual dns exceptions hjsonschema
-         lens machines managed monad-control mtl network network-ip parsers
-         pathtype protolude QuickCheck random semigroups stm stm-containers
-         temporary text text-icu text-icu-normalized text-printer time
-         transformers zippers
+         contravariant data-textual dns exceptions hjsonschema lens machines
+         managed monad-control mtl network network-ip parsers pathtype
+         protolude QuickCheck random semigroups stm stm-containers temporary
+         text text-icu text-icu-normalized text-printer time transformers
+         zippers
        ];
        testHaskellDepends = [
-         aeson base binary bytestring exceptions filepath network QuickCheck
-         semigroups stm temporary test-framework test-framework-quickcheck2
+         aeson base binary bytestring exceptions filepath QuickCheck
+         temporary test-framework test-framework-quickcheck2
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
@@ -117353,6 +118475,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "line_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
+     , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
+     , time, transformers, wai
+     }:
+     mkDerivation {
+       pname = "line";
+       version = "3.0.1";
+       sha256 = "011bab2a638f6409b4db7b2b17a3e7cc649354741fa0aa5bdda293c5ea788239";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptohash-sha256
+         http-conduit http-types scotty text time transformers wai
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptohash-sha256 hspec
+         hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty
+         text time transformers
+       ];
+       homepage = "https://github.com/noraesae/line";
+       description = "Haskell SDK for the LINE API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "line-break" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -117424,6 +118571,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linear_1_20_6" = callPackage
+    ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
+     , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
+     , distributive, doctest, ghc-prim, hashable, HUnit, lens
+     , reflection, semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , transformers, transformers-compat, unordered-containers, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "linear";
+       version = "1.20.6";
+       sha256 = "151531e7961d2d7d198dadebb4b67121b6dcfbffda40fde906f3e46c9e1999f5";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base base-orphans binary bytes cereal containers
+         deepseq distributive ghc-prim hashable lens reflection
+         semigroupoids semigroups tagged template-haskell transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq doctest HUnit lens reflection
+         simple-reflect test-framework test-framework-hunit vector
+       ];
+       homepage = "http://github.com/ekmett/linear/";
+       description = "Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linear-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens, linear }:
      mkDerivation {
@@ -118717,8 +119894,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-extra";
-       version = "0.7.1";
-       sha256 = "02b54ca12c6dbcb24589bbc93819a4857f169b811e15a6d00d05b7e42f1f6505";
+       version = "0.7.2";
+       sha256 = "96dcf825e88f6aff17939c885e5892f42636dc4c5745fbafa8797726c3779fa7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120858,6 +122035,8 @@ self: {
        pname = "lvmlib";
        version = "1.1";
        sha256 = "6f99e1ed437d45ecdbb019185d24bc920f7965f279f3b1cec268d51350c622d3";
+       revision = "1";
+       editedCabalFile = "93202794dad7345f097bd54b57352256cba8998251865d2909d9576d0bc20f2e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121191,6 +122370,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "machines_0_6_2" = callPackage
+    ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
+     , conduit, conduit-combinators, containers, criterion, distributive
+     , doctest, mtl, pipes, pointed, profunctors, semigroupoids
+     , semigroups, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "machines";
+       version = "0.6.2";
+       sha256 = "1c5043b5bc289fc91d8cab90b48a3b807237c2b22719eba08faa62647233645c";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base comonad containers distributive mtl pointed
+         profunctors semigroupoids semigroups transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [
+         base conduit conduit-combinators criterion mtl pipes
+       ];
+       homepage = "http://github.com/ekmett/machines/";
+       description = "Networked stream transducers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-ec2, amazonka-s3
      , amazonka-sts, base, concurrent-machines, containers, exceptions
@@ -121750,13 +122955,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "makefile_1_0_0_1" = callPackage
+  "makefile_1_0_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text
      }:
      mkDerivation {
        pname = "makefile";
-       version = "1.0.0.1";
-       sha256 = "bf30dcdb767e3aa501657dc7bc5338fd015e29573f46b7a24e51e0493a1e5ff1";
+       version = "1.0.0.2";
+       sha256 = "cdfddb98b81632ea1d01611a4237b0650989d9e63a87abb542c5d920125ceca4";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base doctest Glob QuickCheck text
@@ -123771,6 +124976,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "megaparsec_5_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, hspec, hspec-expectations, mtl, QuickCheck
+     , scientific, text, transformers, weigh
+     }:
+     mkDerivation {
+       pname = "megaparsec";
+       version = "5.3.0";
+       sha256 = "3a9bbaae592120f94148777e4e08e23cb279128f3d43b1200b2d7a4a841bee52";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq exceptions mtl QuickCheck
+         scientific text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers exceptions hspec hspec-expectations mtl
+         QuickCheck scientific text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq weigh ];
+       homepage = "https://github.com/mrkkrp/megaparsec";
+       description = "Monadic parser combinators";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "meldable-heap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -124123,6 +125352,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_5" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.5";
+       sha256 = "402012b2b8f6783537f7a24d27244b70a68defffa5dad3fcad89c379d15ba105";
+       libraryHaskellDepends = [
+         base bytestring deepseq foundation ghc-prim
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -126194,6 +127441,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-batcher" = callPackage
+    ({ mkDerivation, base, exceptions }:
+     mkDerivation {
+       pname = "monad-batcher";
+       version = "0.0.0.0";
+       sha256 = "997c3a4221d27a70862837b9090161cbd9f59771e386016d28f9177655f25e7e";
+       libraryHaskellDepends = [ base exceptions ];
+       homepage = "https://github.com/basvandijk/monad-batcher";
+       description = "An applicative monad that batches commands for later more efficient execution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-bool" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -126525,6 +127784,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_23" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.23";
+       sha256 = "02c761293c3f764d94e3ea8a193c28dc1f5da73cd79857a7a510fc8188508962";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -126807,16 +128089,16 @@ self: {
      }) {};
 
   "monad-persist" = callPackage
-    ({ mkDerivation, base, hspec, monad-control, monad-logger, mtl
-     , persistent, persistent-sqlite, persistent-template, text
-     , transformers-base
+    ({ mkDerivation, base, exceptions, hspec, monad-control
+     , monad-logger, mtl, persistent, persistent-sqlite
+     , persistent-template, text, transformers-base
      }:
      mkDerivation {
        pname = "monad-persist";
-       version = "0.0.1.0";
-       sha256 = "389c06f837678593b4cd14348bb0a8774bd6da87be0639ebadc3aca6b830f8c9";
+       version = "0.0.1.2";
+       sha256 = "8dadf91d7ad94b22b36faf946215bb1a691bd24c5f2aa69fee1288a08475dbcc";
        libraryHaskellDepends = [
-         base monad-control monad-logger mtl persistent text
+         base exceptions monad-control monad-logger mtl persistent text
          transformers-base
        ];
        testHaskellDepends = [
@@ -129863,6 +131145,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mwc-random_0_13_6_0" = callPackage
+    ({ mkDerivation, base, math-functions, primitive, time, vector }:
+     mkDerivation {
+       pname = "mwc-random";
+       version = "0.13.6.0";
+       sha256 = "065f334fc13c057eb03ef0b6aa3665ff193609d9bfcad8068bdd260801f44716";
+       libraryHaskellDepends = [
+         base math-functions primitive time vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/bos/mwc-random";
+       description = "Fast, high quality pseudo random number generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mwc-random-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, mwc-random }:
      mkDerivation {
@@ -134150,8 +135448,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask";
-       version = "0.0.3";
-       sha256 = "edca61ca143227ce701d53d6b848c7340b66af4338cbbcfa33c201402e421871";
+       version = "0.0.4";
+       sha256 = "ae9d9b52c84fec8f8604595030eb9dc1be80479523384c3cf354e9953dead247";
        libraryHaskellDepends = [
          adjunctions base distributive protolude QuickCheck singletons
          vector
@@ -134268,8 +135566,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.2.1";
-       sha256 = "d10758496b4e7e51883a05df07c14f39281a87d946ff2300c05ab81a7ee1a9e4";
+       version = "0.2.2";
+       sha256 = "167db8781b3f9c51aec8bc3c69dff62bdb0abe4fdcc7ee1be31ec3ee2dfae8ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139108,7 +140406,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "patat_0_5_1_1" = callPackage
+  "patat_0_5_1_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , bytestring, containers, directory, filepath, highlighting-kate
      , mtl, optparse-applicative, pandoc, terminal-size, text, time
@@ -139116,8 +140414,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.5.1.1";
-       sha256 = "c04ea9a62a9bb24c12cd70f96d98517f8d1d65542a1a6ed0461fc5d00cfbe724";
+       version = "0.5.1.2";
+       sha256 = "79240ce4514b8b947e596b0ad2db31c3a1b3656185505c43914b0940277aa57b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139148,12 +140446,13 @@ self: {
      , accelerate-utility, array, base, bytestring, Cabal, carray
      , cassava, containers, enumset, explicit-exception, fft, filepath
      , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf
-     , non-empty, pqueue, tfp, unordered-containers, utility-ht, vector
+     , non-empty, pqueue, storable-tuple, tfp, unordered-containers
+     , utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.3.0.1";
-       sha256 = "1ebfec911d2a0751d69d6ba9aa8f1c3735d664b56346a6b62aacc304753cbcc5";
+       version = "0.3.1";
+       sha256 = "27c817b68d0d949b6ca8904e6193315ba263e961cf5794a1abbc909007daf1d0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139161,8 +140460,8 @@ self: {
          accelerate-fourier accelerate-io accelerate-utility array base
          bytestring Cabal carray cassava containers enumset
          explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead
-         llvm-extra llvm-tf non-empty pqueue tfp unordered-containers
-         utility-ht vector
+         llvm-extra llvm-tf non-empty pqueue storable-tuple tfp
+         unordered-containers utility-ht vector
        ];
        homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
@@ -139605,6 +140904,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pcgen" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck
+     , random
+     }:
+     mkDerivation {
+       pname = "pcgen";
+       version = "1.0.0";
+       sha256 = "ead380c5661588363e7aa6a01f8f348c174cccb375ef2fb34c14b47edc2a00da";
+       libraryHaskellDepends = [ base random ];
+       testHaskellDepends = [ base hspec QuickCheck random ];
+       benchmarkHaskellDepends = [ base criterion deepseq random ];
+       homepage = "https://github.com/Lokathor/pcgen-hs";
+       description = "A fast, pseudorandom number generator";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "pcre-heavy" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, doctest, Glob
      , pcre-light, semigroups, string-conversions, template-haskell
@@ -141471,17 +142786,17 @@ self: {
      }) {};
 
   "pi-lcd" = callPackage
-    ({ mkDerivation, base, bytestring, clock, text, unix
+    ({ mkDerivation, base, bytestring, clock, deepseq, text, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "pi-lcd";
-       version = "0.1.0.0";
-       sha256 = "afd0dc56b2c3254420b7b3590bca606be9a7d6881cacfab04e5fb2dbe31303d9";
+       version = "0.1.1.0";
+       sha256 = "760360a9548437eae87d6c537fcbb03b4fee3129776bf32ce21c25a3fefc4004";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring clock text unix unordered-containers
+         base bytestring clock deepseq text unix unordered-containers
        ];
        executableHaskellDepends = [ base text ];
        homepage = "https://github.com/ppelleti/pi-lcd";
@@ -144085,6 +145400,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "polyvariadic" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "polyvariadic";
+       version = "0.3.0.0";
+       sha256 = "bf10823ad155ba1c7deaa2076a507cab4c37a78474d544a57bc6ce670ad6068f";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/fgaz/polyvariadic";
+       description = "Creation and application of polyvariadic functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pomodoro" = callPackage
     ({ mkDerivation, base, bytestring, cereal, directory, filepath
      , heredoc, libnotify, network, process, time, unix, wx, wxcore
@@ -144147,8 +145474,8 @@ self: {
      }:
      mkDerivation {
        pname = "pong-server";
-       version = "0.0.4.2";
-       sha256 = "a359d31ed2bca75ff6159b9094d901d60dcb85f291aeb35e96b9c59abca82fe8";
+       version = "0.0.4.4";
+       sha256 = "a47fd49e487ac994489ac27322a0d03e028d605bd2f23b56314ba15809c1cde2";
        libraryHaskellDepends = [
          base bytestring classy-prelude exceptions http-types monad-control
          network
@@ -145122,27 +146449,33 @@ self: {
      }) {};
 
   "postgrest-ws" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hasql, hasql-pool
-     , http-types, jwt, postgresql-libpq, postgrest, string-conversions
-     , text, time, transformers, unix, unordered-containers, wai
+    ({ mkDerivation, aeson, auto-update, base, base64-bytestring
+     , bytestring, containers, either, hasql, hasql-pool, hspec
+     , hspec-wai, hspec-wai-json, http-types, jwt, postgresql-libpq
+     , postgrest, protolude, stm, stm-containers, text, time
+     , transformers, unix, unordered-containers, wai, wai-extra
      , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.1.0.1";
-       sha256 = "50ce5a13c8b7fe1719e61630ae019b9eb3ca4a923a036585c98635f0df1e3dfb";
+       version = "0.1.0.2";
+       sha256 = "52d6e25d7f3823c5395ad8d8b1cc3538e9a410defd0238852e5e8f7d87cfa09c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring hasql-pool http-types postgresql-libpq
-         postgrest string-conversions text time unordered-containers wai
-         wai-websockets websockets
+         aeson base bytestring either hasql hasql-pool http-types jwt
+         postgresql-libpq postgrest protolude stm stm-containers text time
+         unordered-containers wai wai-websockets websockets
        ];
        executableHaskellDepends = [
-         base hasql hasql-pool jwt postgresql-libpq postgrest
-         string-conversions transformers unix warp
+         auto-update base base64-bytestring hasql hasql-pool jwt
+         postgresql-libpq postgrest protolude text time transformers unix
+         warp
+       ];
+       testHaskellDepends = [
+         aeson base containers hasql hasql-pool hspec hspec-wai
+         hspec-wai-json http-types protolude stm wai-extra
        ];
-       testHaskellDepends = [ base ];
        homepage = "https://github.com/diogob/postgrest-ws#readme";
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
@@ -145500,8 +146833,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.32";
-       sha256 = "428d5bd2ad1e3b1564675bf18feea19d82a5b28a2c0623de5f00e49c3eeec04d";
+       version = "0.0.33";
+       sha256 = "385f6224ca22a59034f1b79c8f99d779234f0a04cd5293565e0ed22321e7b24b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146106,8 +147439,8 @@ self: {
     ({ mkDerivation, base, generics-sop, pretty-show }:
      mkDerivation {
        pname = "pretty-sop";
-       version = "0.2.0.1";
-       sha256 = "af2460f06064770371fe9d2762eefad3246adf4f014fe700585a9827b986b14e";
+       version = "0.2.0.2";
+       sha256 = "d64ff28d14360f782dc3ffaec16497015ef9ffc91b2c1cf234274cde9f2d3274";
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -146436,17 +147769,17 @@ self: {
      }) {};
 
   "prizm" = callPackage
-    ({ mkDerivation, base, convertible, HUnit, mono-traversable
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
+    ({ mkDerivation, base, convertible, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
      }:
      mkDerivation {
        pname = "prizm";
-       version = "2.0.1";
-       sha256 = "2f35547b8041c51890cadfd072838140f8ed808491272e77e51b2e90097106ef";
-       libraryHaskellDepends = [ base convertible mono-traversable text ];
+       version = "3.0.0";
+       sha256 = "9bbc4c8781cbc7df4822d7031eb9570e8caf0956979a061b84d89f3884d05283";
+       libraryHaskellDepends = [ base convertible text ];
        testHaskellDepends = [
-         base convertible HUnit mono-traversable QuickCheck test-framework
+         base convertible HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "https://github.com/ixmatus/prizm";
@@ -150446,19 +151779,20 @@ self: {
 
   "rails-session" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
-     , cryptonite, http-types, pbkdf, ruby-marshal, string-conv, tasty
-     , tasty-hspec, vector
+     , cryptonite, filepath, http-types, pbkdf, ruby-marshal
+     , string-conv, tasty, tasty-hspec, transformers, vector
      }:
      mkDerivation {
        pname = "rails-session";
-       version = "0.1.0.0";
-       sha256 = "e897b191410818f2cb2b85985e547b87b250727cf23dc2a7d9effd5c28fdc2da";
+       version = "0.1.1.0";
+       sha256 = "1d9bc6f466f41936d8611273194c62c5bffa43547730a92d019d9b309e1088f8";
        libraryHaskellDepends = [
          base base-compat base64-bytestring bytestring cryptonite http-types
          pbkdf ruby-marshal string-conv vector
        ];
        testHaskellDepends = [
-         base bytestring ruby-marshal tasty tasty-hspec vector
+         base bytestring filepath ruby-marshal tasty tasty-hspec
+         transformers vector
        ];
        homepage = "http://github.com/iconnect/rails-session#readme";
        description = "Decrypt Ruby on Rails sessions in Haskell";
@@ -151698,21 +153032,26 @@ self: {
      }) {};
 
   "rcu" = callPackage
-    ({ mkDerivation, atomic-primops, base, directory, doctest, filepath
-     , hlint, parallel, primitive, stm, transformers
+    ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
+     , containers, criterion, deepseq, doctest, ghc-prim, hlint
+     , optparse-applicative, parallel, primitive, rdtsc, time
+     , transformers
      }:
      mkDerivation {
        pname = "rcu";
-       version = "0.1";
-       sha256 = "06d31a3da492590af81479119ba0f6c5d4ddbf15e8cd78af1cc80a56d34895ed";
+       version = "0.2";
+       sha256 = "e367e86af84e81be215a50036676d7203d9e5eefb6eee9f05ccee0f0fce10845";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         atomic-primops base parallel primitive transformers
+         atomic-primops base ghc-prim parallel primitive transformers
        ];
-       executableHaskellDepends = [ base stm transformers ];
-       testHaskellDepends = [
-         base directory doctest filepath hlint parallel
+       executableHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base doctest hlint parallel ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq ghc-prim optparse-applicative
+         primitive rdtsc time transformers
        ];
        homepage = "http://github.com/ekmett/rcu/";
        description = "Read-Copy-Update for Haskell";
@@ -155503,6 +156842,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "resin" = callPackage
+    ({ mkDerivation, base, ghc-prim, semigroupoids }:
+     mkDerivation {
+       pname = "resin";
+       version = "0.1.0.2";
+       sha256 = "6fddc4a7f236c07f8fa8512ba35704257178322fa47f92e85d972891038a13ee";
+       libraryHaskellDepends = [ base ghc-prim semigroupoids ];
+       homepage = "http://github.com/cartazio/resin";
+       description = "High performance variable binders";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "resistor-cube" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
@@ -157668,8 +159019,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.10";
-       sha256 = "5026d136196d57cb81cf3cb6ac41f7d73224997d75b224ba30beec3ec96c91ad";
+       version = "0.1.11";
+       sha256 = "d058af9c226f2dc4c4cc4adc334327cee55708713298419ed6f70a2e56facf5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158787,24 +160138,25 @@ self: {
 
   "sarsi" = callPackage
     ({ mkDerivation, async, attoparsec, base, binary, bytestring, Cabal
-     , containers, cryptonite, directory, filepath, fsnotify, machines
-     , machines-binary, machines-io, machines-process, msgpack, network
-     , process, stm, text, unordered-containers, vector
+     , containers, cryptonite, data-msgpack, directory, filepath
+     , fsnotify, machines, machines-binary, machines-io
+     , machines-process, network, process, stm, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "sarsi";
-       version = "0.0.3.0";
-       sha256 = "5dce7ea1ce2288c62069f98f3757357b41a0385338edb4e741d9ef59f0243861";
+       version = "0.0.4.0";
+       sha256 = "c9c7327e22b6d42e780ff5c1cf2e4c871ce54ec6a374500ec124213721ad6753";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async attoparsec base binary bytestring containers cryptonite
-         directory filepath fsnotify machines machines-binary machines-io
-         machines-process msgpack network process stm text vector
+         data-msgpack directory filepath fsnotify machines machines-binary
+         machines-io machines-process network process stm text vector
        ];
        executableHaskellDepends = [
-         base binary bytestring Cabal containers directory filepath fsnotify
-         machines machines-binary machines-io machines-process msgpack
+         base binary bytestring Cabal containers data-msgpack directory
+         filepath machines machines-binary machines-io machines-process
          network process text unordered-containers vector
        ];
        homepage = "http://github.com/aloiscochard/sarsi";
@@ -159207,6 +160559,23 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "scalpel_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core
+     , tagsoup, text
+     }:
+     mkDerivation {
+       pname = "scalpel";
+       version = "0.5.1";
+       sha256 = "20df66433570a2ca754f14058a47fb00519d9a75bb822fc3fd1769a83c608b0d";
+       libraryHaskellDepends = [
+         base bytestring curl data-default scalpel-core tagsoup text
+       ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scalpel-core" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
      , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text
@@ -159227,6 +160596,27 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "scalpel-core_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "scalpel-core";
+       version = "0.5.1";
+       sha256 = "8c05b86853b737fbed4144dc9c7bbb7743525c305f9529f59776df97bfe229a9";
+       libraryHaskellDepends = [
+         base bytestring containers data-default fail regex-base regex-tdfa
+         tagsoup text vector
+       ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       benchmarkHaskellDepends = [ base criterion tagsoup text ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scan" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -161856,7 +163246,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-auth-cookie_0_5_0_1" = callPackage
+  "servant-auth-cookie_0_5_0_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , cereal, cookie, criterion, cryptonite, data-default, deepseq
      , exceptions, hspec, http-api-data, http-types, memory, mtl
@@ -161865,8 +163255,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.5.0.1";
-       sha256 = "05933224b1eeb1c3e44e1c01c337fade7c9da864a0ed1727118fd3d9aa10c1ad";
+       version = "0.5.0.2";
+       sha256 = "ce3af5b4b71ae4a8b7c7f740a8dfc6569ca91d02e0ff3e174415d52585176399";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162052,8 +163442,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.2.0";
-       sha256 = "2c9349c10789fccc0b11249305748b7868daa3e1f639b5be8c7c2b075246236c";
+       version = "0.4.2.1";
+       sha256 = "0eefacb5619f27ddcb744c6a18233f9a9d45777310533b1badf63375c20c561b";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -162181,8 +163571,8 @@ self: {
        pname = "servant-client";
        version = "0.10";
        sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa";
-       revision = "1";
-       editedCabalFile = "9863fd0a183528cf4e4db911c074cd97b110781bb382b910089d953e4dd6a685";
+       revision = "2";
+       editedCabalFile = "81423acd420339d6a421d46223f8f70d5772797b3b597d5a9d889c2fffd0bc48";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions generics-sop http-api-data http-client http-client-tls
@@ -164707,8 +166097,8 @@ self: {
      }:
      mkDerivation {
        pname = "shentong";
-       version = "0.3.1";
-       sha256 = "b751f79e565899e36b71c6b31a51adb46fd61899b3cdadbb05631d03514bb523";
+       version = "0.3.2";
+       sha256 = "83e80610da9f11bbc95eddc34c64c81c059db2dc1b03fe781edbbf9b16e32914";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -164805,6 +166195,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shopify" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, bytestring, containers
+     , control-monad-exception, http-conduit, http-types, lifted-base
+     , mtl, resourcet, safe, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shopify";
+       version = "0";
+       sha256 = "b098a87f3773c957b20ecadd5b644d3613ed99ca3b6aa6ae1c2374edc7089a9f";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring bytestring
+         containers control-monad-exception http-conduit http-types
+         lifted-base mtl resourcet safe text time unordered-containers
+         vector
+       ];
+       homepage = "https://oss.xkcd.com/";
+       description = "A haskell API binding for shopify.com";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shortcircuit" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -164882,12 +166293,12 @@ self: {
      }) {};
 
   "show-please" = callPackage
-    ({ mkDerivation, base, mtl, parsec, template-haskell }:
+    ({ mkDerivation, base, mtl, parsec, template-haskell, time }:
      mkDerivation {
        pname = "show-please";
-       version = "0.3";
-       sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e";
-       libraryHaskellDepends = [ base mtl parsec template-haskell ];
+       version = "0.4.2";
+       sha256 = "d4f2087d80e95ac5d56afa6952e54bc7482a5d073b964c8a1db7a481d786d999";
+       libraryHaskellDepends = [ base mtl parsec template-haskell time ];
        homepage = "https://github.com/ddssff/show-please";
        description = "A wrapper type V with improved Show instances";
        license = stdenv.lib.licenses.bsd3;
@@ -165463,8 +166874,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.7.0.2";
-       sha256 = "367158bb1e97fea1bd5f61e9390bb0a50a0ad26ab11c97c16a0fdc495be17f4c";
+       version = "0.8.0.2";
+       sha256 = "5cea737cab099fed0c4c1a19a2defc922e0a9b439b0073b0c2294b5d1afb3a12";
        libraryHaskellDepends = [
          array base exceptions list-t monad-control MonadRandom mtl text
          transformers transformers-base
@@ -170229,6 +171640,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "spiros" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , deepseq, directory, hashable, mtl, process, safe, semigroups
+     , split, stm, text, time, transformers, unordered-containers
+     , vector, vinyl, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "spiros";
+       version = "0.0.0";
+       sha256 = "ceb17a2005efe9151c8c0b40606e6d39063c2331cb941182bbcbb26f18e3491a";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class deepseq directory
+         hashable mtl process safe semigroups split stm text time
+         transformers unordered-containers vector vinyl wl-pprint-text
+       ];
+       homepage = "http://github.com/sboosali/spiros#readme";
+       description = "my custom prelude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "splay" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -170337,6 +171768,8 @@ self: {
        pname = "split";
        version = "0.2.3.1";
        sha256 = "7615b60adee20c19ddafd9d74456e8fe8e4274e2c676a5e858511b664205c688";
+       revision = "1";
+       editedCabalFile = "6089e920a72947806dff273664af651f5f128339fab9fc1d823bfedb102a6ecd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
@@ -172410,6 +173843,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stego-uuid" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, memory, random, uuid
+     }:
+     mkDerivation {
+       pname = "stego-uuid";
+       version = "1.0.0.0";
+       sha256 = "db2f6c0ca28e9207824dfc3d5e2aced3da57022a4585fd968617a8aa9c75edb3";
+       libraryHaskellDepends = [ base bytestring cryptonite memory uuid ];
+       testHaskellDepends = [ base random uuid ];
+       homepage = "https://github.com/dimitri-xyz/stego-uuid#readme";
+       description = "Generator and verifier for steganographic numbers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stemmer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -175234,6 +176681,37 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "swagger2_2_1_4" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
+     , containers, doctest, generics-sop, Glob, hashable, hspec
+     , 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.1.4";
+       sha256 = "85ade8fabae537abf1c8d4d8b2a7226b29f33d4d97dce8cd02104da817647f44";
+       revision = "1";
+       editedCabalFile = "565cb7b9ce116c18c54619bcc16e4fe37f0d39e0e657f673766728c3d45ccae9";
+       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
+       ];
+       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
@@ -176076,6 +177554,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sysinfo" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations }:
+     mkDerivation {
+       pname = "sysinfo";
+       version = "0.1.0.0";
+       sha256 = "5c703bbef63d63690ff7796fb1f9aa254c1b78039d28aa0ed80fef2c3ef7b650";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec hspec-expectations ];
+       homepage = "https://github.com/psibi/sysinfo#readme";
+       description = "Haskell Interface for getting overall system statistics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "system-argv0" = callPackage
     ({ mkDerivation, base, bytestring, system-filepath, text }:
      mkDerivation {
@@ -176175,12 +177666,12 @@ self: {
      }) {};
 
   "system-info" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, process, regex }:
      mkDerivation {
        pname = "system-info";
-       version = "0.1.0.5";
-       sha256 = "aa1e2fec0ceb10b8916422d2e4421e6a6167a283344c7fd2c0fba5fec86f2c45";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.0.7";
+       sha256 = "fd971c2d3ec3e1ac7d4c15bbd88c07104e554f1fe64d77bb957a7f2a2f48445a";
+       libraryHaskellDepends = [ base process regex ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
        description = "Get information about CPUs, memory, etc";
@@ -177094,6 +178585,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tai" = callPackage
+    ({ mkDerivation, base, clock, lens, mtl, parsers, time, trifecta
+     , wreq
+     }:
+     mkDerivation {
+       pname = "tai";
+       version = "0";
+       sha256 = "bcdf41df641b4e4c26dd728e5b27e1b42e687e7a93e4a8db722272056baae7ce";
+       libraryHaskellDepends = [
+         base clock lens mtl parsers time trifecta wreq
+       ];
+       homepage = "https://oss.xkcd.com/";
+       description = "Support library to enable TAI usage on systems with time kept in UTC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tai64" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
      , bytestring, doctest, QuickCheck, text, time, vector
@@ -178478,19 +179985,21 @@ self: {
      }) {};
 
   "tempered" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
-     , process, yaml
+    ({ mkDerivation, base, containers, directory, filepath, mtl
+     , optparse-applicative, parsec, process, yaml
      }:
      mkDerivation {
        pname = "tempered";
-       version = "0.1.0.0";
-       sha256 = "13ac4b688e3f377c30f28c5a7ac272c5619b104963875ae14a3634ae0418bb38";
+       version = "0.2.0";
+       sha256 = "4262c2c8e2a237aa0c04555a77036861f0d6dc858fd38eba90f471a307e9fde4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec process yaml
        ];
-       executableHaskellDepends = [ base containers directory mtl ];
+       executableHaskellDepends = [
+         base containers directory mtl optparse-applicative
+       ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChrisPenner/tempered#readme";
        description = "A dead-simple shell interpolation templating utility";
@@ -179683,13 +181192,13 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-all_0_3_1_0" = callPackage
-    ({ mkDerivation, base, text, text-format, text-show }:
+  "text-all_0_4_0_0" = callPackage
+    ({ mkDerivation, base, text, text-format }:
      mkDerivation {
        pname = "text-all";
-       version = "0.3.1.0";
-       sha256 = "dec7bfb61c30fd263df65caa200954ea8c1947b2c67bcb023d1b071a45336284";
-       libraryHaskellDepends = [ base text text-format text-show ];
+       version = "0.4.0.0";
+       sha256 = "4b9a595a9045aaca5d8381dce3454fc946591d408c018d38908387d71016be46";
+       libraryHaskellDepends = [ base text text-format ];
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
@@ -180146,14 +181655,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text-region_0_2_0_0" = callPackage
+  "text-region_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
      , groups, hspec, lens, text
      }:
      mkDerivation {
        pname = "text-region";
-       version = "0.2.0.0";
-       sha256 = "a8d29fdbd9c185f53daf6b4d02f15336f32e2be4e3e1019549844a4e2023bef0";
+       version = "0.3.0.0";
+       sha256 = "cae9417e0ee0368d0c6e47d8c1a3b00446ae43d997c1d31451b41961dba5c977";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols bytestring groups lens text
        ];
@@ -180638,6 +182147,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "th-abstraction" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.1.0.0";
+       sha256 = "bd412b4243b135a559f8c9fd60bf08212d27f8cb71644d8651136770fb7c2648";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       description = "Nicer interface to reified information about data types";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -181421,22 +182944,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threepenny-gui_0_7_0_2" = callPackage
+  "threepenny-gui_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, filepath, hashable, network-uri, safe
-     , snap-core, snap-server, stm, template-haskell, text, transformers
-     , unordered-containers, vault, vector, websockets, websockets-snap
+     , data-default, deepseq, exceptions, 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.7.0.2";
-       sha256 = "40223fac07d288cc111ffde1674278989300e525d323c10976f5f83a56b28479";
+       version = "0.8.0.0";
+       sha256 = "a1dbab095010005f9b2af9ec6ce9bfc533906bdf3498f90573d21227c1ac93fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
-         filepath hashable network-uri safe snap-core snap-server stm
-         template-haskell text transformers unordered-containers vault
+         exceptions 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";
@@ -181477,12 +183001,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threepenny-gui-flexbox_0_4_1" = callPackage
+  "threepenny-gui-flexbox_0_4_2" = callPackage
     ({ mkDerivation, base, clay, text, threepenny-gui }:
      mkDerivation {
        pname = "threepenny-gui-flexbox";
-       version = "0.4.1";
-       sha256 = "bca8c8b56f419559d3ce2a991737c52e38f4194cb1bdfcc4744e4a4de7fc7467";
+       version = "0.4.2";
+       sha256 = "86862538c0e8448ee7fc9b0b8c47e912587f26db6d1178660d74bf44dca9f0f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base clay text threepenny-gui ];
@@ -181815,8 +183339,8 @@ self: {
     ({ mkDerivation, base, cairo, colour, tidal }:
      mkDerivation {
        pname = "tidal-vis";
-       version = "0.1.8";
-       sha256 = "3cb3fab058e0a2891d33d02adac326ada6558892c0f58467625c44b99f262ac9";
+       version = "0.9.2";
+       sha256 = "890bbe98ebde65b1c23064d7b192294e7596112c1db59de7a5909233f409aaef";
        libraryHaskellDepends = [ base cairo colour tidal ];
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
@@ -182980,8 +184504,8 @@ self: {
        pname = "tls";
        version = "1.3.10";
        sha256 = "9f057d0f40dda5ce8d0f0e0f2a06087be8007c41462c6cab19774538c35e0171";
-       revision = "1";
-       editedCabalFile = "34c1efff5206b28c0e67bbde8ea7d3428aafb572a623b832b08928d5bb72f9be";
+       revision = "2";
+       editedCabalFile = "30f94541fc229715b10e6752cc25671fba874a7564de8ff64df0ce64f427e39c";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring cereal cryptonite
          data-default-class memory mtl network transformers x509 x509-store
@@ -183152,6 +184676,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "todo" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "todo";
+       version = "0.2.0.1";
+       sha256 = "6f30aa83c4552714b609d765cb5f618b4c27d1d272d222f4ebfc8d68d7f45d5d";
+       libraryHaskellDepends = [ base ];
+       description = "A todo bottom";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "todos" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-unicode-symbols
      , containers, data-hash, dates, directory, dyre, filepath, Glob
@@ -184021,6 +185556,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-lift_0_2_0_0" = callPackage
+    ({ mkDerivation, base, transformers, writer-cps-transformers }:
+     mkDerivation {
+       pname = "transformers-lift";
+       version = "0.2.0.0";
+       sha256 = "11d477a62184c19c49fc923bef6f7ef32ca1d69f78dbdbf3c896fbebcdaaaf63";
+       libraryHaskellDepends = [
+         base transformers writer-cps-transformers
+       ];
+       description = "Ad-hoc type classes for lifting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transformers-runnable" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -185168,6 +186717,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_3_3" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , 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.3.3";
+       sha256 = "82a16fd13f9ce3e80f031e5bf6881ef3230939c38f0e9ac57845850a96304d1e";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock 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 ];
+       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
      }:
@@ -185237,21 +186810,21 @@ self: {
 
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
-     , bytestring, composition, criterion, data-default, directory
-     , extra, hspec, hspec-megaparsec, http-client, http-client-tls
-     , http-types, lens, megaparsec, MissingH, optparse-applicative
-     , split, text
+     , bytestring, composition, containers, criterion, data-default
+     , directory, extra, hspec, hspec-megaparsec, http-client
+     , http-client-tls, http-types, lens, megaparsec, MissingH
+     , optparse-applicative, split, text
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.5.3.6";
-       sha256 = "f3f882d1431241e5c0368d4994f675c38e13a4caae95f044e660d472d3633395";
+       version = "0.5.3.8";
+       sha256 = "f15186e421d6ce518c1ef54588e80ceb4ade8474a0095d8d6f7ae53c86d21b72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring composition
-         data-default directory extra http-client http-client-tls http-types
-         lens megaparsec MissingH optparse-applicative split text
+         containers data-default directory extra http-client http-client-tls
+         http-types lens megaparsec MissingH optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -186036,6 +187609,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-indexed-queues" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, doctest
+     , ghc-typelits-natnormalise, pqueue, QuickCheck, random, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "type-indexed-queues";
+       version = "0.2.0.0";
+       sha256 = "e0c12c3453f4851ba10c10bd977aef850a520c707e2f14dbe018d9680fec65d5";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-typelits-natnormalise
+       ];
+       testHaskellDepends = [
+         base containers doctest QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion pqueue random
+       ];
+       homepage = "https://github.com/oisdk/type-indexed-queues";
+       description = "Queues with verified and unverified versions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "type-int" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -188585,8 +190181,8 @@ self: {
      }:
      mkDerivation {
        pname = "unused";
-       version = "0.7.0.0";
-       sha256 = "4eee152fd54f52f1c1ff7b12ff8fa78b0d2c84def118f7be2fa51a0c3d70c68b";
+       version = "0.8.0.0";
+       sha256 = "36ac9a0f84df09bc1ecef9af227bf865651bdaaab981d33dcbcdb701623c48af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189930,6 +191526,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "validated-types" = callPackage
+    ({ mkDerivation, base, refined, text }:
+     mkDerivation {
+       pname = "validated-types";
+       version = "0.1.1";
+       sha256 = "38ed6688064cd318be8bf942be6f1d6fee61fb9727cd58a5fe92454362583d17";
+       libraryHaskellDepends = [ base refined text ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/seanhess/validated-types#readme";
+       description = "Type-level constraints on strings and other input";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "validation" = callPackage
     ({ mkDerivation, base, bifunctors, directory, doctest, filepath
      , lens, mtl, QuickCheck, semigroupoids, semigroups
@@ -192863,6 +194472,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-static-embedded" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, http-types, memory
+     , mime-types, text, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-static-embedded";
+       version = "0.1.0.0";
+       sha256 = "de2c6a0a5174cec2f385080a734f0826aa6d1c4cd761f0c5df789eeb492816ad";
+       libraryHaskellDepends = [
+         base bytestring cryptonite http-types memory mime-types text wai
+         wai-extra
+       ];
+       homepage = "https://github.com/adamse/network-wai-static-embedded#readme";
+       description = "Serve embedded static files as a Wai middleware";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-throttle" = callPackage
     ({ mkDerivation, base, bytestring, containers, hashable, hspec
      , http-types, HUnit, network, stm, token-bucket, transformers, wai
@@ -194701,6 +196327,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "weeder" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, extra, filepath
+     , hashable, process, text, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "weeder";
+       version = "0.1.2";
+       sha256 = "8892b9d8cb683ec19b53701480ab8485a4b1f5a1f96ec2a6cec05a7722f81132";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs extra filepath hashable process text
+         unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/ndmitchell/weeder#readme";
+       description = "Detect dead code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "weigh" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split
      , template-haskell
@@ -194718,6 +196363,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_4" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split
+     , template-haskell, temporary
+     }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.4";
+       sha256 = "2b360ce341a1401be48966648ccaf531f670d23458d557c5ae9c7ca4061cece3";
+       libraryHaskellDepends = [
+         base deepseq mtl process split template-haskell temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -195685,6 +197348,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wordchoice" = callPackage
+    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams
+     , containers, criterion, Glob, lens, optparse-applicative, pandoc
+     , system-filepath, text
+     }:
+     mkDerivation {
+       pname = "wordchoice";
+       version = "0.1.0.3";
+       sha256 = "12f82a80648a91a5188bfa7593eae46e0beba4d4b256412a98dac3308b91d882";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Chart Chart-diagrams containers Glob lens
+         optparse-applicative pandoc system-filepath text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/githubuser/wordchoice#readme";
+       description = "Get word counts and distributions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wordcloud" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -196137,6 +197823,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-mtl_0_1_1_4" = callPackage
+    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-mtl";
+       version = "0.1.1.4";
+       sha256 = "62a3b3b76a5dc0dc6e8b9837afc8c5fc83fb334a034f89fab6a4a544fe204870";
+       libraryHaskellDepends = [
+         base mtl transformers writer-cps-transformers
+       ];
+       homepage = "https://github.com/minad/writer-cps-mtl#readme";
+       description = "MonadWriter orphan instances for writer-cps-transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "writer-cps-transformers" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -196149,6 +197851,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-transformers_0_1_1_3" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "writer-cps-transformers";
+       version = "0.1.1.3";
+       sha256 = "8aa22832fdb413c706a6862b83ad4a4ef8dd61ae8658aca6e5076cf2a5cd4aae";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/minad/writer-cps-transformers#readme";
+       description = "WriteT and RWST monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ws-chans" = callPackage
     ({ mkDerivation, async, base, http-types, HUnit, network
      , QuickCheck, quickcheck-instances, test-framework
@@ -196340,8 +198055,8 @@ self: {
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
        pname = "wx";
-       version = "0.92.2.0";
-       sha256 = "a1d02b17cd336f0c435381c9f2ce74aad2059c56a00c678954089b74065a97fb";
+       version = "0.92.3.0";
+       sha256 = "bdcbabeb1841c61d0fee5ac5c797ee9b825edf97028990c9bd1101855ee28c11";
        libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
@@ -196398,10 +198113,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxc";
-       version = "0.92.2.0";
-       sha256 = "e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191";
-       revision = "1";
-       editedCabalFile = "8ebef4ae5773d0abcb5777dd1f8b9fbf978b6c7ed8b1d88bbcb25594db0c79c2";
+       version = "0.92.3.0";
+       sha256 = "28a27fc51a53b8d2f3042a516fe9b8adfd118675adcdf1a7cf1f9fe2b722ff44";
        setupHaskellDepends = [
          base bytestring Cabal directory filepath process split
        ];
@@ -196409,7 +198122,7 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
-       postInstall = "cp -v dist/build/libwxc.so.0.92.2.0 $out/lib/libwxc.so";
+       postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
@@ -196419,13 +198132,15 @@ self: {
          inherit (pkgs) wxGTK;};
 
   "wxcore" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , filepath, parsec, stm, time, wxc, wxdirect, wxGTK
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, filepath, parsec, process, stm, time, wxc, wxdirect
+     , wxGTK
      }:
      mkDerivation {
        pname = "wxcore";
-       version = "0.92.2.0";
-       sha256 = "76128916c5d5df9cea9fc1e1b3b56d800d87874a431e98fca4427cb41cfe283e";
+       version = "0.92.3.0";
+       sha256 = "e053e1e9fc44f7ae2837c09c07bc1073255950d761643ec15a4a9f19557195e4";
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
@@ -196443,10 +198158,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxdirect";
-       version = "0.92.2.0";
-       sha256 = "2303834061c544f7e32ffd7aaf91e644ee89e178487689f109f06625f0eefd3b";
-       revision = "1";
-       editedCabalFile = "72b1487d63c458854733436e6938a76b709cb5392f155dad8ece7aafb73979a7";
+       version = "0.92.3.0";
+       sha256 = "03c60f604347dcfb1fb8cf65b4d0a487b5c2c868e4896f03ce5edd12d81e367a";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -199537,6 +201250,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-auth-hmac-keccak" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl
+     , persistent, random, shakespeare, text, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-static
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hmac-keccak";
+       version = "0.0.0.2";
+       sha256 = "46799684d4c75dba07f46842ed594385c872fd5a37557b38a9d4f09e3237bb00";
+       libraryHaskellDepends = [
+         aeson base bytestring cryptonite mtl persistent random shakespeare
+         text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
+       ];
+       description = "An account authentication plugin for yesod with encrypted token transfer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-auth-kerberos" = callPackage
     ({ mkDerivation, authenticate-kerberos, base, bytestring
      , shakespeare, text, transformers, yesod-auth, yesod-core
@@ -202406,6 +204136,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3_0_6" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.0.6";
+       sha256 = "8140104a15d2961480c212a1e061a6d1b2af62357930de950e5debedb0abd5b6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit old-time process temporary time
+         unix
+       ];
+       testToolDepends = [ zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
@@ -202496,6 +204252,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zippers_0_2_3" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
+     , lens, profunctors, semigroupoids
+     }:
+     mkDerivation {
+       pname = "zippers";
+       version = "0.2.3";
+       sha256 = "1ba74cb927bce3e62b74861414e55b33160f6bd29313fa779e86b190ed18eb5d";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base lens profunctors semigroupoids ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion lens ];
+       homepage = "http://github.com/ekmett/zippers/";
+       description = "Traversal based zippers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zippo" = callPackage
     ({ mkDerivation, base, mtl, yall }:
      mkDerivation {
@@ -202531,6 +204305,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ziptastic-client_0_3_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, hspec, http-client
+     , http-client-tls, http-types, iso3166-country-codes, servant
+     , servant-client, text, ziptastic-core
+     }:
+     mkDerivation {
+       pname = "ziptastic-client";
+       version = "0.3.0.2";
+       sha256 = "1a22bec1fc6d90a0c33a0a628a8324a93a879a091dfae29f7d9fd8c88b402aab";
+       libraryHaskellDepends = [
+         base base-compat http-client iso3166-country-codes servant
+         servant-client text ziptastic-core
+       ];
+       testHaskellDepends = [
+         base base-compat hspec http-client http-client-tls http-types
+         iso3166-country-codes servant-client
+       ];
+       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
+       description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ziptastic-core" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
      , http-api-data, iso3166-country-codes, servant, text, tz
@@ -202551,6 +204348,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ziptastic-core_0_2_0_2" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
+     , http-api-data, iso3166-country-codes, servant, text, tz
+     }:
+     mkDerivation {
+       pname = "ziptastic-core";
+       version = "0.2.0.2";
+       sha256 = "d3cf39366b03e75460e116da10e0ea27280a18281afa3fab2a54ef0496fe2bc3";
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring http-api-data
+         iso3166-country-codes servant text tz
+       ];
+       testHaskellDepends = [
+         aeson base base-compat here hspec iso3166-country-codes text tz
+       ];
+       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_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {

From 92f53af64d0be1c9a61924b45910c41da7a6d03e Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 30 Apr 2017 03:51:07 +0200
Subject: [PATCH 1688/1744] factorio-demo: init at 0.14.23 (#25265)

---
 pkgs/games/factorio/default.nix | 109 +++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |   2 +
 2 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 4a10015bea8..f0de56b0953 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -6,12 +6,11 @@
 , username ? "" , password ? ""
 }:
 
-assert releaseType == "alpha" || releaseType == "headless";
+assert releaseType == "alpha" || releaseType == "headless" || releaseType == "demo";
 
 with stdenv.lib;
 let
-  version = "0.15.1";
-  isHeadless = releaseType == "headless";
+  version = if releaseType != "demo" then "0.15.1" else "0.14.23";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -24,15 +23,18 @@ let
   authenticatedFetch = callPackage ./fetch.nix { inherit username password; };
 
   fetch = rec {
+    extension = if releaseType != "demo" then "tar.xz" else "tar.gz";
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
+    name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
-      alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
+      headless =           fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
+      demo     =           fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = abort "Factorio 32-bit client is not available for this version.";
+      alpha    = abort "Factorio 32-bit client is not available for this version.";
+      demo     = abort "Factorio 32-bit demo binaries are not available for download.";
     };
   };
 
@@ -95,55 +97,62 @@ let
       platforms = [ "i686-linux" "x86_64-linux" ];
     };
   };
-  headless = base;
-  alpha = base // {
 
-    buildInputs = [ makeWrapper ];
+  releases = rec {
+    headless = base;
+    demo = base // {
 
-    libPath = stdenv.lib.makeLibraryPath [
-      alsaLib
-      libX11
-      libXcursor
-      libXinerama
-      libXrandr
-      libXi
-      mesa_noglu
-    ];
+      buildInputs = [ makeWrapper ];
 
-    installPhase = base.installPhase + ''
-      wrapProgram $out/bin/factorio                                \
-        --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
-        --run "$out/share/factorio/update-config.sh"               \
-        --argv0 "" \
-        --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
+      libPath = stdenv.lib.makeLibraryPath [
+        alsaLib
+        libX11
+        libXcursor
+        libXinerama
+        libXrandr
+        libXi
+        mesa_noglu
+      ];
 
-        # TODO Currently, every time a mod is changed/added/removed using the
-        # modlist, a new derivation will take up the entire footprint of the
-        # client. The only way to avoid this is to remove the mods arg from the
-        # package function. The modsDir derivation will have to be built
-        # separately and have the user specify it in the .factorio config or
-        # right along side it using a symlink into the store I think i will
-        # just remove mods for the client derivation entirely. this is much
-        # cleaner and more useful for headless mode.
+      installPhase = base.installPhase + ''
+        wrapProgram $out/bin/factorio                                \
+          --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
+          --run "$out/share/factorio/update-config.sh"               \
+          --argv0 "" \
+          --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
 
-        # TODO: trying to toggle off a mod will result in read-only-fs-error.
-        # not much we can do about that except warn the user somewhere. In
-        # fact, no exit will be clean, since this error will happen on close
-        # regardless. just prints an ugly stacktrace but seems to be otherwise
-        # harmless, unless maybe the user forgets and tries to use the mod
-        # manager.
+          # TODO Currently, every time a mod is changed/added/removed using the
+          # modlist, a new derivation will take up the entire footprint of the
+          # client. The only way to avoid this is to remove the mods arg from the
+          # package function. The modsDir derivation will have to be built
+          # separately and have the user specify it in the .factorio config or
+          # right along side it using a symlink into the store I think i will
+          # just remove mods for the client derivation entirely. this is much
+          # cleaner and more useful for headless mode.
 
-      install -m0644 <(cat << EOF
-      ${configBaseCfg}
-      EOF
-      ) $out/share/factorio/config-base.cfg
+          # TODO: trying to toggle off a mod will result in read-only-fs-error.
+          # not much we can do about that except warn the user somewhere. In
+          # fact, no exit will be clean, since this error will happen on close
+          # regardless. just prints an ugly stacktrace but seems to be otherwise
+          # harmless, unless maybe the user forgets and tries to use the mod
+          # manager.
 
-      install -m0755 <(cat << EOF
-      ${updateConfigSh}
-      EOF
-      ) $out/share/factorio/update-config.sh
+        install -m0644 <(cat << EOF
+        ${configBaseCfg}
+        EOF
+        ) $out/share/factorio/config-base.cfg
 
-      cp -a doc-html $out/share/factorio
-    '';
+        install -m0755 <(cat << EOF
+        ${updateConfigSh}
+        EOF
+        ) $out/share/factorio/update-config.sh
+      '';
+    };
+    alpha = demo // {
+
+      installPhase = demo.installPhase + ''
+        cp -a doc-html $out/share/factorio
+      '';
+    };
   };
-in stdenv.mkDerivation (if isHeadless then headless else alpha)
+in stdenv.mkDerivation (releases.${releaseType})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba7eaa5009a..cb8fd3f41f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16644,6 +16644,8 @@ with pkgs;
 
   factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
 
+  factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };
+
   factorio-mods = callPackage ../games/factorio/mods.nix { };
 
   factorio-utils = callPackage ../games/factorio/utils.nix { };

From 03f939ebf77d835c5195f8c1134b4c96eacca50d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 30 Apr 2017 13:58:08 +0800
Subject: [PATCH 1689/1744] kirigami2: 1.90.0 -> 2.1.0

Also use a generic builder.
---
 .../libraries/kirigami/default.nix            | 54 +++++++++++++------
 pkgs/development/libraries/kirigami/v2.nix    | 24 ---------
 pkgs/top-level/all-packages.nix               |  6 +--
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/kirigami/v2.nix

diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix
index 66e67e6b853..e24ad8196ee 100644
--- a/pkgs/development/libraries/kirigami/default.nix
+++ b/pkgs/development/libraries/kirigami/default.nix
@@ -1,23 +1,47 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
+, plasma-framework, qtbase
+, qtquickcontrols ? null
+, qtquickcontrols2 ? null }:
 
-stdenv.mkDerivation rec {
+let
   pname = "kirigami";
-  version = "1.1.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-    sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
+  generic = { name, version, sha256, qtqc, broken }:
+  stdenv.mkDerivation rec {
+    inherit name version;
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+      inherit sha256;
+    };
+
+    buildInputs = [ plasma-framework qtbase qtqc ];
+
+    nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
+
+    meta = with stdenv.lib; {
+      license     = licenses.lgpl2;
+      homepage    = http://www.kde.org;
+      maintainers = with maintainers; [ ttuegel peterhoeg ];
+      platforms   = platforms.unix;
+      inherit broken;
+    };
   };
 
-  buildInputs = [ qtbase qtquickcontrols plasma-framework ];
+in {
+  kirigami_1 = generic rec {
+    name    = "${pname}-${version}";
+    version = "1.1.0";
+    sha256  = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
+    qtqc    = qtquickcontrols;
+    broken  = false;
+  };
 
-  nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
-
-  meta = with stdenv.lib; {
-    license = licenses.lgpl2;
-    homepage = http://www.kde.org;
-    maintainers = with maintainers; [ ttuegel peterhoeg ];
-    platforms = platforms.unix;
+  kirigami_2 = generic rec {
+    name    = "${pname}2-${version}";
+    version = "2.1.0";
+    sha256  = "0d79h10jzv9z7xzap4k9vbw6p9as8vdkz3x6xlzx407i9sbzyi77";
+    qtqc    = qtquickcontrols2;
+    broken  = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
 }
diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix
deleted file mode 100644
index 0b332d40329..00000000000
--- a/pkgs/development/libraries/kirigami/v2.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
-
-stdenv.mkDerivation rec {
-  pname = "kirigami";
-  version = "1.90.0";
-  name = "${pname}2-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8";
-  };
-
-  buildInputs = [ qtbase qtquickcontrols2 plasma-framework ];
-
-  nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
-
-  meta = with stdenv.lib; {
-    license = licenses.lgpl2;
-    homepage = http://www.kde.org;
-    maintainers = with maintainers; [ ttuegel peterhoeg ];
-    platforms = platforms.unix;
-    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb8fd3f41f1..727b7d3dc9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,9 +9601,9 @@ with pkgs;
 
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
-    kirigami_1 = callPackage ../development/libraries/kirigami { };
-
-    kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { };
+    inherit (callPackage ../development/libraries/kirigami { })
+      kirigami_1
+      kirigami_2;
 
     kirigami = kirigami_1;
 

From 8b5854e260a556d623442b82575aa3f8a38ede17 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 28 Apr 2017 14:14:49 -0500
Subject: [PATCH 1690/1744] nix-bundle: 0.1.2 -> 0.1.3

---
 pkgs/tools/package-management/nix-bundle/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index b01836e1eb8..e3255afe7fe 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, nix, makeWrapper }:
+{ stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }:
 
 stdenv.mkDerivation rec {
   pname = "nix-bundle";
   name = "${pname}-${version}";
-  version = "0.1.1";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13730rfnqjv1m2mky2g0cq77yzp2j215zrvy3lhpiwgmh97vviih";
+    sha256 = "15r77pchf4s4cdv4lvw2zw1yic78k8p0n2r954qq370vscw30yac";
   };
 
-  buildInputs = [ nix makeWrapper ];
+  # coreutils, gnutar is actually needed by nix for bootstrap
+  buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ];
 
-  binPath = lib.makeBinPath [ nix ];
+  binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f7d6ea92b5..71ceb67e4cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18081,7 +18081,7 @@ with pkgs;
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
-  nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixStable; };
+  nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; };
 
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr

From 9827d5f95cc71cf47eeaec1d1ddf08633e8490cb Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Apr 2017 00:42:11 -0700
Subject: [PATCH 1691/1744] nixos: optional NetworkManager dnsmasq integration

---
 nixos/modules/services/networking/networkmanager.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 220107a2411..0c12b2c1dfd 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -12,6 +12,7 @@ let
   configFile = writeText "NetworkManager.conf" ''
     [main]
     plugins=keyfile
+    dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
 
     [keyfile]
     ${optionalString (config.networking.hostName != "")
@@ -158,6 +159,17 @@ in {
       ethernet.macAddress = macAddressOpt;
       wifi.macAddress = macAddressOpt;
 
+      useDnsmasq = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable NetworkManager's dnsmasq integration. NetworkManager will run
+          dnsmasq as a local caching nameserver, using a "split DNS"
+          configuration if you are connected to a VPN, and then update
+          resolv.conf to point to the local nameserver.
+        '';
+      };
+
       dispatcherScripts = mkOption {
         type = types.listOf (types.submodule {
           options = {

From 4ae18e046307ceb21396cbe70df00c4bba3a2c51 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@gmail.com>
Date: Sun, 30 Apr 2017 11:27:17 +0300
Subject: [PATCH 1692/1744] apitrace: 7.1 -> git (#24829)

After upgrade `qapitrace` have working "Buffers" tab where the data
can be inspected (it was always empty before).

There is no tags after `7.1`, but I think that fixing pretty important
piece of functionality warrants an upgrade to current `master` tip.
---
 pkgs/applications/graphics/apitrace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index a9b2eb1163a..9b1dd4c25ae 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apitrace-${version}";
-  version = "7.1";
+  version = "7.1-363-ge3509be1";
 
   src = fetchFromGitHub {
-    sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a";
-    rev = version;
+    sha256 = "1xbz6gwl7kqjm7jjy5gxkdxzrg93vj1a3l19ara7rni6dii0q136";
+    rev = "e3509be175eda77749abffe051ed0d3eb5d14e72";
     repo = "apitrace";
     owner = "apitrace";
   };

From a4aaf5adfd5f290e17d3960528db55e1ef5fbf13 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Apr 2017 10:29:45 +0200
Subject: [PATCH 1693/1744] pyside: fix on Python 3.x, closes #25328

Pyside requires several tools that do not provide Python modules. They
therefore do not need to be build Python-version dependent and so we
move them out of `python-packages.nix`.

Furthermore, shiboken needs libxml2 and libxslt libraries but not their
Python bindings.
---
 .../python-modules/pyside/apiextractor.nix     |  9 ++++++---
 .../python-modules/pyside/default.nix          |  1 +
 .../python-modules/pyside/generatorrunner.nix  | 13 +++++++++----
 .../python-modules/pyside/shiboken.nix         | 16 ++++++++++------
 .../python-modules/pyside/tools.nix            | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix                |  5 +++++
 pkgs/top-level/python-packages.nix             | 15 ++++++++-------
 7 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index a27a365bb2c..e02f32f223d 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }:
 
-stdenv.mkDerivation {
+# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
+let
+  pythonEnv = python2.withPackages(ps: with ps; [  sphinx ]);
+in stdenv.mkDerivation {
   name = "pyside-apiextractor-0.10.10";
 
   src = fetchurl {
@@ -10,7 +13,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake libxml2 libxslt sphinx qt4 ];
+  buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ];
 
   meta = {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 4aff09b8f8f..009afdd3a03 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,5 +1,6 @@
 { lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
+# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 buildPythonPackage rec {
   name = "pyside-${version}";
   version = "1.2.4";
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 28ea88ad1fa..8ecf2734832 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,7 +1,12 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }:
+{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }:
 
-stdenv.mkDerivation {
-  name = "pyside-generatorrunner-0.6.16";
+# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
+let
+  pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
+in stdenv.mkDerivation rec {
+  pname = "pyside-generatorrunner";
+  version = "0.6.16";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz";
@@ -10,7 +15,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pysideApiextractor sphinx qt4 ];
+  buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ];
 
   meta = {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 8c91b63d0e1..cef78c21550 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,10 +1,14 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
+{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
 
+# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
-stdenv.mkDerivation rec {
-  name = "pyside-shiboken-${version}";
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyside-shiboken";
   version = "1.2.4";
 
+  format = "other";
+
   src = fetchurl {
     url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz";
     sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
@@ -25,9 +29,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "http://www.pyside.org/docs/shiboken/";
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.chaoflow ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index 11f2bd97175..9d02a016e72 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }:
+{ lib, fetchurl, cmake, pyside, qt4, pysideShiboken, buildPythonPackage }:
 
-stdenv.mkDerivation {
-  name = "pyside-tools-0.2.15";
+# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
+buildPythonPackage rec {
+  pname = "pyside-tools";
+  version = "0.2.15";
+  name = "${pname}-${version}";
+  format = "other";
 
   src = fetchurl {
     url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz";
@@ -10,13 +14,13 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pyside python qt4 pysideShiboken ];
+  buildInputs = [ cmake pyside qt4 pysideShiboken ];
 
   meta = {
     description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "http://www.pyside.org";
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.chaoflow ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index feca045ebe1..f3d6104166b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6124,6 +6124,11 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  # These pyside tools do not provide any Python modules and are meant to be here.
+  # See ../development/python-modules/pyside/default.nix for details.
+  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
+  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
+
   svg2tikz = python27Packages.svg2tikz;
 
   pyrex = pyrex095;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92457ae67ab..06f778b7180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -49,8 +49,11 @@ let
       fetchSource = {pname, version, sha256}:
       # Fetch a source tarball.
         let
-          url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-        in pkgs.fetchurl {inherit url sha256;};
+          urls = [
+            "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"
+            "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.zip"
+          ];
+        in pkgs.fetchurl {inherit urls sha256;};
       fetcher = (if format == "wheel" then fetchWheel
         else if format == "setuptools" then fetchSource
         else throw "Unsupported kind ${kind}");
@@ -369,11 +372,9 @@ in {
 
   pyside = callPackage ../development/python-modules/pyside { };
 
-  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
-
-  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
-
-  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
+  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix {
+    inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings.
+  };
 
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 

From dce7ebbd9b130feb877b36e570d07db29908c00c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Apr 2017 10:37:04 +0200
Subject: [PATCH 1694/1744] pythonPackages.basemap: build wheel, fixes #24621

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06f778b7180..96646636e7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29776,11 +29776,6 @@ EOF
       export GEOS_DIR=${pkgs.geos}
     '';
 
-    # The installer does not support the '--old-and-unmanageable' option
-    installPhase = ''
-      ${python.interpreter} setup.py install --prefix $out
-    '';
-
     # The 'check' target is not supported by the `setup.py` script.
     # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`)
     doCheck = false;

From aa044dd105b41c9825de5bd6e00a87f8a1b2a639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Apr 2017 11:20:08 +0200
Subject: [PATCH 1695/1744] efl: wrap the first line

It was >400 chars long!
---
 pkgs/desktops/enlightenment/efl.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index ac64eb5c738..1f1c6dc6a2e 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }:
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
+, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
+, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit
+, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
+, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
+, curl, libinput, systemd
+}:
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";

From 18a7f7d4a5634fd21959d23bbbc1ad2abb9f34b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Apr 2017 11:35:59 +0200
Subject: [PATCH 1696/1744] efl: set $HOME for reverse dependencies

---
 pkgs/desktops/enlightenment/efl.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 1f1c6dc6a2e..32b2fe31a5e 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -3,7 +3,7 @@
 , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
 , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
-, curl, libinput, systemd
+, curl, libinput, systemd, writeText
 }:
 
 stdenv.mkDerivation rec {
@@ -51,9 +51,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./efl-elua.patch ];
 
+  # bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies.
+  setupHook = writeText "setupHook.sh" ''
+    export HOME="$TEMPDIR"
+  '';
+
   preConfigure = ''
     export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
-    export HOME="$TEMPDIR"
+    source "$setupHook"
   '';
 
   postInstall = ''

From d6f602c247313a2eca6efb3309ee6dafc1a80312 Mon Sep 17 00:00:00 2001
From: Changlin Li <mail@changlinli.com>
Date: Sun, 30 Apr 2017 05:36:42 -0400
Subject: [PATCH 1697/1744] RStudio: 0.98.110 -> 1.1.216

This fixes incompatibilities introduced by a new R version in
d16c38a260ef41ae648f994918f491437fb7c75c

It also fixes #25315 as a result.
---
 pkgs/applications/editors/rstudio/default.nix | 53 ++++++++++++++-----
 .../editors/rstudio/r-location.patch          | 13 ++---
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 5fef166e663..f7ede1a8ea5 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl,
-R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper,
+{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl,
+R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc,
 # If you have set up an R wrapper with other packages by following
 # something like https://nixos.org/nixpkgs/manual/#r-packages, RStudio
 # by default not be able to access any of those R packages. In order
@@ -11,18 +11,18 @@ useRPackages ? false
 }:
 
 let
-  version = "0.98.110";
+  version = "1.1.216";
   ginVer = "1.5";
-  gwtVer = "2.5.1";
+  gwtVer = "2.7.0";
 in
 stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
-  buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ];
+  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qmakeHook libuuid unzip ant jdk makeWrapper pandoc ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
-    sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z";
+    sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf";
   };
 
   # Hack RStudio to only use the input R.
@@ -38,14 +38,34 @@ stdenv.mkDerivation rec {
   inherit gwtVer;
   gwtSrc = fetchurl {
     url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
-    sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4";
+    sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda";
   };
 
   hunspellDictionaries = builtins.attrValues hunspellDicts;
 
   mathJaxSrc = fetchurl {
-    url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip;
-    sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal";
+    url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
+    sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
+  };
+
+  rmarkdownSrc = fetchurl {
+    url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip";
+    sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah";
+  };
+
+  rsconnectSrc = fetchurl {
+    url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip";
+    sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p";
+  };
+
+  rstudiolibclang = fetchurl {
+    url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip;
+    sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c";
+  };
+
+  rstudiolibclangheaders = fetchurl {
+    url = https://s3.amazonaws.com/rstudio-buildtools/libclang-builtin-headers.zip;
+    sha256 = "0x4ax186bm3kf098izwmsplckgx1kqzg9iiyzg95rpbqsb4593qb";
   };
 
   preConfigure =
@@ -66,10 +86,19 @@ stdenv.mkDerivation rec {
 	  done
       done
 
-      unzip $mathJaxSrc -d dependencies/common/mathjax
+      unzip $mathJaxSrc -d dependencies/common/mathjax-26
+      unzip $rmarkdownSrc -d dependencies/common/rmarkdown
+      unzip $rsconnectSrc -d dependencies/common/rsconnect
+      mkdir -p dependencies/common/libclang/3.5
+      unzip $rstudiolibclang -d dependencies/common/libclang/3.5
+      mkdir -p dependencies/common/libclang/builtin-headers
+      unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers
+
+      mkdir -p dependencies/common/pandoc
+      cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
     '';
 
-  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ];
+  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmakeHook}/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
     name = name;
@@ -100,7 +129,7 @@ stdenv.mkDerivation rec {
     { description = "Set of integrated tools for the R language";
       homepage = http://www.rstudio.com/;
       license = licenses.agpl3;
-      maintainers = [ maintainers.ehmry ];
+      maintainers = [ maintainers.ehmry maintainers.changlinli ];
       platforms = platforms.linux;
     };
 }
diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch
index a1ec84a5475..24cb6a24697 100644
--- a/pkgs/applications/editors/rstudio/r-location.patch
+++ b/pkgs/applications/editors/rstudio/r-location.patch
@@ -1,18 +1,19 @@
-diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt
---- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp	2013-04-28 10:02:14.000000000 -0400
-+++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp	2015-03-23 15:06:35.533400807 -0400
-@@ -84,9 +84,7 @@
+diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src/cpp/core/CMakeLists.txt
+--- rstudio-1.1.216-old/src/cpp/core/r_util/REnvironmentPosix.cpp	2017-04-30 03:37:26.669418665 -0400
++++ rstudio-1.1.216-new/src/cpp/core/r_util/REnvironmentPosix.cpp	2017-04-30 03:36:33.590726185 -0400
+@@ -87,10 +87,7 @@
  {
     // define potential paths
     std::vector<std::string> rScriptPaths;
 -   rScriptPaths.push_back("/usr/bin/R");
 -   rScriptPaths.push_back("/usr/local/bin/R");
 -   rScriptPaths.push_back("/opt/local/bin/R");
+-   rScriptPaths.push_back("/Library/Frameworks/R.framework/Resources/bin/R");
 +   rScriptPaths.push_back("@R@/bin/R");
     return scanForRScript(rScriptPaths, pErrMsg);
  }
-
-@@ -220,8 +218,7 @@
+ 
+@@ -226,8 +223,7 @@
        // scan in standard locations as a fallback
        std::string scanErrMsg;
        std::vector<std::string> rScriptPaths;

From 878ad1ce6e2582fef11ed73c849b513afaca143e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 6 Apr 2017 16:12:21 +0200
Subject: [PATCH 1698/1744] nixos: add option to lock kernel modules

Adds an option `security.lockKernelModules` that, when enabled, disables
kernel module loading once the system reaches its normal operating state.

The rationale for this over simply setting the sysctl knob is to allow
some legitmate kernel module loading to occur; the naive solution breaks
too much to be useful.

The benefit to the user is to help ensure the integrity of the kernel
runtime: only code loaded as part of normal system initialization will be
available in the kernel for the duration of the boot session.  This helps
prevent injection of malicious code or unexpected loading of legitimate
but normally unused modules that have exploitable bugs (e.g., DCCP use
after free CVE-2017-6074, n_hldc CVE-2017-2636, XFRM framework
CVE-2017-7184, L2TPv3 CVE-2016-10200).

From an aestethic point of view, enabling this option helps make the
configuration more "declarative".

Closes https://github.com/NixOS/nixpkgs/pull/24681
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/security/lock-kernel-modules.nix  | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 nixos/modules/security/lock-kernel-modules.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ff069f48ab..99bc0da2b3a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -116,6 +116,7 @@
   ./security/duosec.nix
   ./security/grsecurity.nix
   ./security/hidepid.nix
+  ./security/lock-kernel-modules.nix
   ./security/oath.nix
   ./security/pam.nix
   ./security/pam_usb.nix
diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix
new file mode 100644
index 00000000000..51994ee76c1
--- /dev/null
+++ b/nixos/modules/security/lock-kernel-modules.nix
@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options = {
+    security.lockKernelModules = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Disable kernel module loading once the system is fully initialised.
+        Module loading is disabled until the next reboot.  Problems caused
+        by delayed module loading can be fixed by adding the module(s) in
+        question to <option>boot.kernelModules</option>.
+      '';
+    };
+  };
+
+  config = mkIf config.security.lockKernelModules {
+    systemd.services.disable-kernel-module-loading = rec {
+      description = "Disable kernel module loading";
+
+      wantedBy = [ config.systemd.defaultUnit ];
+      after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy;
+
+      script = "echo -n 1 > /proc/sys/kernel/modules_disabled";
+
+      unitConfig.ConditionPathIsWritable = "/proc/sys/kernel";
+
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
+    };
+  };
+}

From 6a5a5728ee8225e0e7272de7ad6c63ca5986cb84 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 29 Apr 2017 22:46:20 +0200
Subject: [PATCH 1699/1744] nixos/hardened profile: lock kernel modules

---
 nixos/modules/profiles/hardened.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index a01d974446b..ae0a42e8dee 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -8,6 +8,8 @@ with lib;
 {
   security.hideProcessInformation = mkDefault true;
 
+  security.lockKernelModules = mkDefault true;
+
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [

From 62f2a1c2be9f6308ed21aaeed9aa0afbc3a93fc9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 29 Apr 2017 20:42:02 +0200
Subject: [PATCH 1700/1744] linux_hardened: init

The rationale for this is to have a place to enable hardening features
that are either too invasive or that may be speculative/yet proven to be
worthwhile for general-purpose kernels.
---
 .../linux/kernel/hardened-config.nix          | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 10 ++++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/hardened-config.nix

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
new file mode 100644
index 00000000000..a85725d70e1
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -0,0 +1,54 @@
+# Based on recommendations from:
+# http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project#Recommended_settings
+# https://wiki.gentoo.org/wiki/Hardened/Hardened_Kernel_Project
+#
+# The base kernel is assumed to be at least 4.9 or whatever the toplevel
+# linux_hardened package expression uses.
+#
+# Dangerous features that can be permanently (for the boot session) disabled at
+# boot via sysctl or kernel cmdline are left enabled here, for improved
+# flexibility.
+
+{ stdenv }:
+
+with stdenv.lib;
+
+''
+GCC_PLUGINS y # Enable gcc plugin options
+
+DEBUG_KERNEL y
+DEBUG_RODATA y # Make kernel text & rodata read-only
+DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning
+
+# Additional validation of commonly targetted structures
+DEBUG_CREDENTIALS y
+DEBUG_NOTIFIERS y
+DEBUG_LIST y
+
+HARDENED_USERCOPY y # Bounds check usercopy
+
+# Wipe on free with page_poison=1
+PAGE_POISONING y
+PAGE_POISONING_NO_SANITY y
+PAGE_POISONING_ZERO y
+
+# Stricter /dev/mem
+STRICT_DEVMEM y
+IO_STRICT_DEVMEM y
+
+# Disable various dangerous settings
+ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
+PROC_KCORE n # Exposes kernel text image layout
+INET_DIAG n # Has been used for heap based attacks in the past
+
+${optionalString (stdenv.system == "x86_64-linux") ''
+  DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory
+
+  # Reduce attack surface by disabling various emulations
+  IA32_EMULATION n
+  X86_X32 n
+
+  VMAP_STACK y # Catch kernel stack overflows
+''}
+
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3d6104166b..01a862c6c83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11905,6 +11905,16 @@ with pkgs;
   # Build a kernel for Xen dom0
   linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
+  # Hardened linux
+  linux_hardened = linux_4_9.override {
+    extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
+      inherit stdenv;
+    };
+  };
+
+  linuxPackages_hardened =
+    recurseIntoAttrs (linuxPackagesFor linux_hardened);
+
   # Grsecurity packages
 
   linux_grsec_nixos = kernelPatches.grsecurity_testing;

From 8c98e8ca2fe65add522235e50e2ea506c8d0942b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 01:22:32 +0200
Subject: [PATCH 1701/1744] nixos/hardened profile: use the linux_hardened
 kernel

---
 nixos/modules/profiles/hardened.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index ae0a42e8dee..13084b7f082 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -6,6 +6,8 @@
 with lib;
 
 {
+  boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
+
   security.hideProcessInformation = mkDefault true;
 
   security.lockKernelModules = mkDefault true;
@@ -13,6 +15,9 @@ with lib;
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [
+    # Overwrite free'd memory
+    "page_poison=1"
+
     # Disable legacy virtual syscalls
     "vsyscall=none"
   ];

From ab4fa1cce4c3c536811d8d7ddfcad1a8310cfb90 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 07:16:13 +0200
Subject: [PATCH 1702/1744] tree-wide: prune some dead grsec leaves

The beginning of pruning grsecurity/PaX from the tree.
---
 nixos/tests/grsecurity.nix                    | 46 --------------
 pkgs/build-support/grsecurity/default.nix     | 37 -----------
 .../linux/kernel/grsecurity-nixos-config.nix  | 63 -------------------
 .../linux/kernel/grsecurity-nixos-kmod.patch  | 14 -----
 .../linux/kernel/linux-grsecurity.nix         | 18 ------
 pkgs/os-specific/linux/kernel/patches.nix     | 28 ---------
 pkgs/top-level/all-packages.nix               | 11 +---
 7 files changed, 1 insertion(+), 216 deletions(-)
 delete mode 100644 nixos/tests/grsecurity.nix
 delete mode 100644 pkgs/build-support/grsecurity/default.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-grsecurity.nix

diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
deleted file mode 100644
index d4a419fd0e3..00000000000
--- a/nixos/tests/grsecurity.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Basic test to make sure grsecurity works
-
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "grsecurity";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ copumpkin joachifm ];
-  };
-
-  machine = { config, pkgs, ... }:
-    { security.grsecurity.enable = true;
-      boot.kernel.sysctl."kernel.grsecurity.audit_mount" = 0;
-      boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0;
-      networking.useDHCP = false;
-    };
-
-  testScript = ''
-    subtest "grsec-lock", sub {
-      $machine->succeed("systemctl is-active grsec-lock");
-      $machine->succeed("grep -Fq 1 /proc/sys/kernel/grsecurity/grsec_lock");
-      $machine->fail("echo -n 0 >/proc/sys/kernel/grsecurity/grsec_lock");
-    };
-
-    subtest "paxtest", sub {
-      # TODO: running paxtest blackhat hangs the vm
-      my @pax_mustkill = (
-        "anonmap", "execbss", "execdata", "execheap", "execstack",
-        "mprotanon", "mprotbss", "mprotdata", "mprotheap", "mprotstack",
-      );
-      foreach my $name (@pax_mustkill) {
-        my $paxtest = "${pkgs.paxtest}/lib/paxtest/" . $name;
-        $machine->succeed($paxtest) =~ /Killed/ or die
-      }
-    };
-
-    # tcc -run executes run-time generated code and so allows us to test whether
-    # paxmark actually works (otherwise, the process should be terminated)
-    subtest "tcc", sub {
-      $machine->execute("echo -e '#include <stdio.h>\nint main(void) { puts(\"hello\"); return 0; }' >main.c");
-      $machine->succeed("${pkgs.tinycc}/bin/tcc -run main.c");
-    };
-
-    subtest "RBAC", sub {
-      $machine->succeed("[ -c /dev/grsec ]");
-    };
-  '';
-})
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
deleted file mode 100644
index ccd46e20654..00000000000
--- a/pkgs/build-support/grsecurity/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv
-, lib
-, overrideDerivation
-
-# required for gcc plugins
-, gmp, libmpc, mpfr
-
-# the base kernel
-, kernel
-
-, grsecPatch
-, kernelPatches ? []
-
-, localver ? "-grsec"
-, modDirVersion ? "${kernel.version}${localver}"
-, extraConfig ? ""
-, ...
-} @ args:
-
-assert (kernel.version == grsecPatch.kver);
-
-overrideDerivation (kernel.override {
-  inherit modDirVersion;
-  kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
-  extraConfig = ''
-    GRKERNSEC y
-    PAX y
-    ${extraConfig}
-  '';
-  ignoreConfigErrors = true;
-}) (attrs: {
-  nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
-  preConfigure = ''
-    echo ${localver} >localversion-grsec
-    ${attrs.preConfigure or ""}
-  '';
-})
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
deleted file mode 100644
index ed8942b1066..00000000000
--- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv }:
-
-with stdenv.lib;
-
-''
-# Auto configuration with these constraints will enable most of the
-# important features (RAP, UDEREF, ASLR, memory sanitization).
-GRKERNSEC_CONFIG_AUTO y
-GRKERNSEC_CONFIG_DESKTOP y
-GRKERNSEC_CONFIG_PRIORITY_SECURITY y
-
-# We specify virt guest rather than host here, the latter deselects e.g.,
-# paravirtualization.
-GRKERNSEC_CONFIG_VIRT_GUEST y
-# Note: assumes platform supports CPU-level virtualization (so no pentium 4)
-GRKERNSEC_CONFIG_VIRT_EPT y
-GRKERNSEC_CONFIG_VIRT_KVM y
-
-# PaX control
-PAX_SOFTMODE y
-PAX_PT_PAX_FLAGS y
-PAX_XATTR_PAX_FLAGS y
-PAX_EI_PAX n
-
-PAX_INITIFY y
-
-# The bts instrumentation method is compatible with binary only modules.
-#
-# Note: if platform supports SMEP, we could do without this
-PAX_KERNEXEC_PLUGIN_METHOD_BTS y
-
-# Additional grsec hardening not implied by auto constraints
-GRKERNSEC_IO y
-GRKERNSEC_SYSFS_RESTRICT y
-GRKERNSEC_ROFS y
-
-GRKERNSEC_MODHARDEN y
-
-# Disable protections rendered useless by redistribution
-GRKERNSEC_HIDESYM n
-GRKERNSEC_RANDSTRUCT n
-
-# Disable protections covered by vanilla mechanisms
-GRKERNSEC_DMESG n
-GRKERNSEC_KMEM n
-GRKERNSEC_PROC n
-
-# Disable protections that are inappropriate for a general-purpose kernel
-GRKERNSEC_NO_SIMULT_CONNECT n
-
-# Enable additional audititing
-GRKERNSEC_AUDIT_MOUNT y
-GRKERNSEC_AUDIT_PTRACE y
-GRKERNSEC_FORKFAIL y
-
-# Wishlist: support trusted path execution
-GRKERNSEC_TPE n
-
-GRKERNSEC_SYSCTL y
-GRKERNSEC_SYSCTL_DISTRO y
-# Assume that appropriate sysctls are toggled once the system is up
-GRKERNSEC_SYSCTL_ON n
-''
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch b/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
deleted file mode 100644
index e0430a69c95..00000000000
--- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru a/kernel/kmod.c b/kernel/kmod.c
---- a/kernel/kmod.c	2016-04-21 17:06:09.882281660 +0200
-+++ b/kernel/kmod.c	2016-04-21 17:08:17.458949309 +0200
-@@ -294,7 +294,9 @@
- 	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
- 	     strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
- 	     strncmp(sub_info->path, "/usr/sbin/", 10) && strcmp(sub_info->path, "/bin/false") && 
--	     strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
-+	     strcmp(sub_info->path, "/usr/share/apport/apport") &&
-+       strncmp(sub_info->path, "/nix/store/", 11) &&
-+       strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) {
- 		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
- 		retval = -EPERM;
- 		goto out;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
deleted file mode 100644
index 166836a3275..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.9.24";
-  extraMeta.branch = "4.9";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3031ldw2f6dwkm3z1cn7rw8y4diq57rs3na64nzkw7xw4q74cfpzzp5866vf58y0fsyl8l2vgvwza7cdhxywmmxp7q0q5385jn8nnvd";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ffc193efbf1..1747d34fe11 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -17,26 +17,6 @@ let
         '';
       };
     };
-
-  grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha512 }: rec {
-    name = "grsecurity-${grver}-${kver}-${grrev}";
-
-    # Pass these along to allow the caller to determine compatibility
-    inherit grver kver grrev;
-
-    patch = fetchurl {
-      urls = [
-        "https://grsecurity.net/${grbranch}/${name}.patch"
-        # When updating versions/hashes, ALWAYS use the official
-        # version; we use this mirror only because upstream removes
-        # source files immediately upon releasing a new version ...
-        "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${kver}/${name}.patch"
-      ];
-      inherit sha512;
-    };
-
-    features.grsecurity = true;
-  };
 in
 
 rec {
@@ -107,14 +87,6 @@ rec {
     for more information.
   '';
 
-  # This patch relaxes grsec constraints on the location of usermode helpers,
-  # e.g., modprobe, to allow calling into the Nix store.
-  grsecurity_nixos_kmod =
-    {
-      name  = "grsecurity-nixos-kmod";
-      patch = ./grsecurity-nixos-kmod.patch;
-    };
-
   crc_regression =
     { name = "crc-backport-regression";
       patch = ./crc-regression.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a862c6c83..d9e85032790 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11922,16 +11922,7 @@ with pkgs;
   linuxPackages_grsec_nixos =
     recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos);
 
-  # An unsupported grsec xen guest kernel
-  linux_grsec_server_xen = linux_grsec_nixos.override {
-    extraConfig = ''
-      GRKERNSEC_CONFIG_AUTO y
-      GRKERNSEC_CONFIG_PRIORITY_SECURITY y
-      GRKERNSEC_CONFIG_SERVER y
-      GRKERNSEC_CONFIG_VIRT_GUEST y
-      GRKERNSEC_CONFIG_VIRT_XEN y
-    '';
-  };
+  linux_grsec_server_xen = linux_grsec_nixos;
 
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);

From ffa83edf4a29b21f12eb96d5eb7b63e1ebae7a5f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 08:38:47 +0200
Subject: [PATCH 1703/1744] nixos/tests: add tests for exercising various
 hardening features

This test exercises the linux_hardened kernel along with the various
hardening features (enabled via the hardened profile).

Move hidepid test from misc, so that misc can go back to testing a vanilla
configuration.
---
 nixos/release.nix        |  1 +
 nixos/tests/hardened.nix | 31 +++++++++++++++++++++++++++++++
 nixos/tests/misc.nix     |  9 ---------
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 nixos/tests/hardened.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 1c282bfea4f..aaf23d7ffb7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -248,6 +248,7 @@ in rec {
   tests.gocd-server = callTest tests/gocd-server.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
+  tests.hardened = callTest tests/hardened.nix { };
   tests.hibernate = callTest tests/hibernate.nix {};
   tests.hound = callTest tests/hound.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
new file mode 100644
index 00000000000..389d7ed7ffa
--- /dev/null
+++ b/nixos/tests/hardened.nix
@@ -0,0 +1,31 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "hardened";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ joachifm ];
+  };
+
+  machine =
+    { config, lib, pkgs, ... }:
+    with lib;
+    { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
+      users.users.sybil = { isNormalUser = true; group = "wheel"; };
+      imports = [ ../modules/profiles/hardened.nix ];
+    };
+
+  testScript =
+    ''
+      # Test hidepid
+      subtest "hidepid", sub {
+          $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
+          $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]");
+          $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]");
+      };
+
+      # Test kernel module hardening
+      subtest "lock-modules", sub {
+          $machine->waitForUnit("multi-user.target");
+          # note: this better a be module we normally wouldn't load ...
+          $machine->fail("modprobe dccp");
+      };
+    '';
+})
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 0efa7282368..b926a62194b 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -25,8 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : {
         };
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
       security.sudo = { enable = true; wheelNeedsPassword = false; };
-      security.hideProcessInformation = true;
-      users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
     };
 
   testScript =
@@ -119,12 +117,5 @@ import ./make-test.nix ({ pkgs, ...} : {
       subtest "sudo", sub {
           $machine->succeed("su - sybil -c 'sudo true'");
       };
-
-      # Test hidepid
-      subtest "hidepid", sub {
-          $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
-          $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]");
-          $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]");
-      };
     '';
 })

From 1dd3ba924bb7f2ab254b14dcf794651d486db2ae Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 11:57:12 +0200
Subject: [PATCH 1704/1744] nixos/hardened profile: disable hibernation

Recommended by KSPP
---
 nixos/modules/profiles/hardened.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 13084b7f082..c7f80fe47aa 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -20,6 +20,9 @@ with lib;
 
     # Disable legacy virtual syscalls
     "vsyscall=none"
+
+    # Disable hibernation (allows replacing the running kernel)
+    "nohibernate"
   ];
 
   # Restrict ptrace() usage to processes with a pre-defined relationship

From 71306c71c02f4e3bf7987d08efc4de8cc94f9da3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Apr 2017 12:09:12 +0200
Subject: [PATCH 1705/1744] torbrowser: comment out the warning, as it got
 displayed in irrelevant contexts

---
 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 d9e85032790..f033dd93ab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4226,11 +4226,11 @@ with pkgs;
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
   # added 2017-04-05
-  torbrowser = builtins.trace ''
+  torbrowser = /* builtins.trace ''
     WARNING: torbrowser package was renamed to tor-browser-bundle-bin.
 
     Also, consider using nix-built tor-browser-unwrapped package instead. Read its longDescription.
-  '' tor-browser-bundle-bin;
+  '' */ tor-browser-bundle-bin;
 
   tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
 

From 1bcc8d026cb5e6affa736c2e80ed87db42669c87 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:16:17 +0000
Subject: [PATCH 1706/1744] aniso8601: init at 1.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35bda1de6f3..f9769350ab1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -756,6 +756,24 @@ in {
     };
   };
 
+  aniso8601 = buildPythonPackage rec {
+    name = "aniso8601-${version}";
+    version = "1.2.0";
+ 
+    meta = {
+      description = "Parses ISO 8601 strings.";
+      homepage    = "https://bitbucket.org/nielsenb/aniso8601";
+      license     = licenses.bsd3;
+    };
+ 
+    propagatedBuildInputs = with self; [ dateutil ];
+ 
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/aniso8601/${name}.tar.gz";
+      sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4";
+    };
+  };
+
   asgiref = buildPythonPackage rec {
     name = "asgiref-${version}";
     version = "1.0.0";

From 0f765d7807b6e450304e463c85717ff75b5dc8c8 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:23:00 +0000
Subject: [PATCH 1707/1744] flask-compress: init at 1.3.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9769350ab1..3b13bd0a9cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11514,6 +11514,24 @@ in {
     };
   };
 
+  flask-compress = buildPythonPackage rec {
+    name = "Flask-Compress-${version}";
+    version = "1.3.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz";
+      sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734";
+    };
+
+    propagatedBuildInputs = with self; [ flask ];
+
+    meta = {
+      description = "Compress responses in your Flask app with gzip";
+      homepage = "https://libwilliam.github.io/flask-compress/";
+      license = licenses.mit;
+    };
+  };
+
   flask-cors = buildPythonPackage rec {
     name = "Flask-Cors-${version}";
     version = "2.1.2";

From 3af5b60e2779bdce297f741abc9f4743e40cee8a Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:23:57 +0000
Subject: [PATCH 1708/1744] flask-restful: init at 0.3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b13bd0a9cd..a009918b88b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11622,6 +11622,30 @@ in {
     };
   };
 
+  flask-restful = buildPythonPackage rec {
+    name = "Flask-RESTful-${version}";
+    version = "0.3.5";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz";
+      sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42";
+    };
+
+    # TypeError: Only byte strings can be passed to C code
+    patchPhase = if isPy3k then ''
+      rm tests/test_crypto.py tests/test_paging.py
+    '' else null;
+    buildInputs = with self; [ nose mock blinker ];
+    propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ];
+    PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
+
+    meta = {
+      homepage = "http://flask-restful.readthedocs.io/";
+      description = "REST API building blocks for Flask";
+      license = licenses.bsd3;
+    };
+  };
+
   flask_script = buildPythonPackage rec {
     name = "Flask-Script-${version}";
     version = "2.0.5";

From fc71c626e77c32e65cbba2368eb5fea9467f36d5 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:24:55 +0000
Subject: [PATCH 1709/1744] flask-restplus: init at 0.8.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a009918b88b..0f883520d91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11646,6 +11646,29 @@ in {
     };
   };
 
+  flask-restplus = buildPythonPackage rec {
+    name = "flask-restplus-${version}";
+    # Exactly 0.8.6 is required by flexget
+    version = "0.8.6";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/f/flask-restplus/${name}.tar.gz";
+      sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593";
+    };
+
+    # Requires additional packages.
+    doCheck = false;
+    buildInputs = with self; [ nose blinker tzlocal ];
+    propagatedBuildInputs = with self; [ flask six jsonschema pytz aniso8601 flask-restful ];
+
+    meta = {
+      homepage = "https://github.com/noirbizarre/flask-restplus";
+      description = "Fast, easy and documented API development with Flask";
+      license = licenses.mit;
+    };
+  };
+
   flask_script = buildPythonPackage rec {
     name = "Flask-Script-${version}";
     version = "2.0.5";

From 044b3c93e7c8cf0a9ce744c9df75cb7b6aa2155b Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:26:04 +0000
Subject: [PATCH 1710/1744] rebulk: init at 0.8.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f883520d91..1a87e0193fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12693,6 +12693,27 @@ in {
     };
   };
 
+  rebulk = buildPythonPackage rec {
+    version = "0.8.2";
+    name = "rebulk-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/r/rebulk/${name}.tar.gz";
+      sha256 = "8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a";
+    };
+
+    # Some kind of trickery with imports that doesn't work.
+    doCheck = false;
+    buildInputs = with self; [ pytest pytestrunner ];
+    propagatedBuildInputs = with self; [ six regex ];
+
+    meta = {
+      homepage = "https://github.com/Toilal/rebulk/";
+      license = licenses.mit;
+      description = "Advanced string matching from simple patterns";
+    };
+  };
+
   gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
 
   hawkauthlib = buildPythonPackage rec {

From 4bd86e5c5106e45bfc638f1726a44ecef8547612 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:28:13 +0000
Subject: [PATCH 1711/1744] colorclass: init at 2.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a87e0193fe..a949bffd315 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2510,6 +2510,22 @@ in {
     propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ];
   };
 
+  colorclass = buildPythonPackage rec {
+    version = "2.2.0";
+    name = "colorclass-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/colorclass/${name}.tar.gz";
+      sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b";
+    };
+
+    meta = {
+      homepage = "https://github.com/Robpol86/colorclass";
+      license = licenses.mit;
+      description = "Automatic support for console colors";
+    };
+  };
+
   colorlog = buildPythonPackage rec {
     name = "colorlog-${version}";
     version = "2.6.1";

From 7c250476775006cf09b91800b4bffee9d2467a6d Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:28:51 +0000
Subject: [PATCH 1712/1744] safe: init at 0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a949bffd315..0e56f6d3b2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9689,6 +9689,23 @@ in {
     };
   };
 
+  safe = buildPythonPackage rec {
+    version = "0.4";
+    name = "Safe-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/S/Safe/${name}.tar.gz";
+      sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de";
+    };
+
+    buildInputs = with self; [ nose ];
+    meta = {
+      homepage = "https://github.com/lepture/safe";
+      license = licenses.bsd3;
+      description = "Check password strength";
+    };
+  };
+
   samplerate = buildPythonPackage rec {
     name = "scikits.samplerate-${version}";
     version = "0.3.3";

From 2074d586a96663383122c6f1658b32b75789f989 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:29:59 +0000
Subject: [PATCH 1713/1744] terminaltables: init at 3.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e56f6d3b2a..f8f0fe11262 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25547,6 +25547,22 @@ in {
     };
   };
 
+  terminaltables = buildPythonPackage rec {
+    name = "terminaltables-${version}";
+    version = "3.1.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/t/terminaltables/${name}.tar.gz";
+      sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81";
+    };
+
+    meta = {
+      description = "Display simple tables in terminals";
+      homepage = "https://github.com/Robpol86/terminaltables";
+      license = licenses.mit;
+    };
+  };
+
   keystoneclient = buildPythonPackage rec {
     name = "keystoneclient-${version}";
     version = "1.8.1";

From 19629c48920b086137595a51317123ac0b17f11c Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Sun, 12 Feb 2017 08:13:49 +0000
Subject: [PATCH 1714/1744] zerobin: disable tests because it doesn't have any

It does however contain a copy of cherrypy that doesn't get installed,
which fails tests when it tries to import from cherrypy and gets imports
from the version provided by Nix (which is probably not the same one as
is having its tests run).
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f8f0fe11262..fd4d996d058 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31286,6 +31286,9 @@ EOF
       lockfile
       clize
     ];
+    # zerobin doesn't have any tests, but includes a copy of cherrypy which
+    # can wrongly fail the check phase.
+    doCheck = false;
     meta = {
       description = "A client side encrypted pastebin";
       homepage = "http://0bin.net/";

From 5bd1ea51cbe9a6059de6da3ca25ee9d1f9037226 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:18:37 +0000
Subject: [PATCH 1715/1744] apscheduler: 3.0.4 -> 3.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fd4d996d058..ede79382599 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1240,12 +1240,11 @@ in {
   };
 
   apscheduler = buildPythonPackage rec {
-    name = "APScheduler-3.0.4";
-    disabled = !isPy27;
+    name = "APScheduler-3.3.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/A/APScheduler/${name}.tar.gz";
-      sha256 = "1ljjhn6cv8b1pccsi3mgc887ypi2vim317r9p0zh0amd0bhkk6wb";
+      sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b";
     };
 
     buildInputs = with self; [
@@ -1255,8 +1254,8 @@ in {
       twisted
       mock
       trollius
-      funcsigs
       gevent
+      setuptools_scm
     ];
 
     propagatedBuildInputs = with self; [
@@ -1264,6 +1263,7 @@ in {
       pytz
       tzlocal
       futures
+      funcsigs
     ];
 
     meta = with pkgs.stdenv.lib; {

From 88d78f9d46b8192b44c9b311567ab05ae21d28d8 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:19:33 +0000
Subject: [PATCH 1716/1744] babelfish: 0.5.3 -> 0.5.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ede79382599..85b05fed846 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2067,13 +2067,13 @@ in {
   };
 
   babelfish = buildPythonPackage rec {
-    version = "0.5.3";
+    version = "0.5.5";
     name = "babelfish-${version}";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/babelfish/${name}.tar.gz";
-      sha256 = "0wrw21dyq7v6lbffwvi1ik43d7dhmcv8xvgrrihhiv7ys1rd3gag";
+      sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104";
     };
 
     meta = {

From 53c2f3c52e38aca62a27be1e4af9a66e99f87f96 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Wed, 4 Jan 2017 08:21:43 +0000
Subject: [PATCH 1717/1744] cherrypy: 3.2.2 -> 8.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85b05fed846..5143d2eb968 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3847,15 +3847,17 @@ in {
 
   cherrypy = buildPythonPackage (rec {
     name = "cherrypy-${version}";
-    version = "3.2.2";
+    version = "8.7.0";
 
     src = pkgs.fetchurl {
-      url = "http://download.cherrypy.org/cherrypy/${version}/CherryPy-${version}.tar.gz";
-      sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw";
+      url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz";
+      sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
+    # wsgiserver.ssl_pyopenssl is broken on py3k.
+    doCheck = !isPy3k;
+    buildInputs = with self; [ pytest setuptools_scm pytestrunner ];
+    propagatedBuildInputs = with self; [ six ];
 
     meta = {
       homepage = "http://www.cherrypy.org";

From b6cffb5d582c6940839e0275b841ae801d578545 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Apr 2017 12:45:32 +0200
Subject: [PATCH 1718/1744] pythonPackages: comment explaining what's supposed
 to be in there

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5143d2eb968..ca4b85fd785 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1,3 +1,11 @@
+# This file contains the Python packages set.
+# Each attribute is a Python library or a helper function.
+# Expressions for Python libraries are supposed to be in `pkgs/development/python-modules/<name>/default.nix`.
+# Python packages that do not need to be available for each interpreter version do not belong in this packages set.
+# Examples are Python-based cli tools.
+#
+# For more details, please see the Python section in the Nixpkgs manual.
+
 { pkgs
 , stdenv
 , python

From a513a38066d4b6d594385d4be10aca9841050756 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 30 Apr 2017 21:12:29 +1000
Subject: [PATCH 1719/1744] cpp-hocon: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 90c27083d77..6014c9f4eaf 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-hocon-${version}";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
-    sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87";
+    sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7";
     rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";

From 7dbab8b2ffc254846b36ff3dad55b3a0dd826e90 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 30 Apr 2017 21:12:47 +1000
Subject: [PATCH 1720/1744] leatherman: 0.10.1 -> 0.11.2

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

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index ea092a33637..d45a616606d 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, boost, cmake, curl }:
+{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "0.10.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
-    sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7";
+    sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
   };
 
-  buildInputs = [ boost cmake curl ];
+  buildInputs = [ boost cmake curl ruby ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/puppetlabs/leatherman/;  

From 673ac9506be3ac058f03f4f6c29f443c7af7872a Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 30 Apr 2017 21:13:26 +1000
Subject: [PATCH 1721/1744] facter: 3.6.0 -> 3.6.4

---
 pkgs/tools/system/facter/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 9f97a403159..b66cd7d6112 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.6.0";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
-    sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi";
+    sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e04319607ef..98cb5fab137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -923,7 +923,6 @@ with pkgs;
 
   facter = callPackage ../tools/system/facter {
     boost = boost160;
-    ruby = ruby_2_1;
   };
 
   fasd = callPackage ../tools/misc/fasd { };

From ac0b90f8c78b33525c6bdb9e1386554068cc3489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Apr 2017 13:42:35 +0200
Subject: [PATCH 1722/1744] krita: fixup meta

Nix 1.12 (pre) would complain otherwise.
---
 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 8493ceb7b9f..c82d1565a55 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://krita.org/";
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
   };
 }

From eb4792a03f2206616cdfcf42d476b5cb0254e320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Apr 2017 14:10:30 +0200
Subject: [PATCH 1723/1744] nixos manual: add a note about "nofail" FS option

Close #1858, as I think the points have been well resolved.
---
 nixos/doc/manual/configuration/file-systems.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index d1b324af3f1..ae3d124cd6b 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -35,6 +35,12 @@ or <literal>ext4</literal>, then it’s best to specify
 <option>fsType</option> to ensure that the kernel module is
 available.</para>
 
+<note><para>System startup will fail if any of the filesystems fails to mount,
+dropping you to the emergency shell.
+You can make a mount asynchronous and non-critical by adding
+<literal>options = [ "nofail" ];</literal>.
+</para></note>
+
 <xi:include href="luks-file-systems.xml" />
 
 </chapter>

From 0c4de3c0c9ea3df2a8d4069f9438eb319ba64023 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 30 Apr 2017 08:58:44 -0400
Subject: [PATCH 1724/1744] linux: 4.4.64 -> 4.4.65

---
 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 79018caae5c..bffdf9ac752 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.64";
+  version = "4.4.65";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0rfx3018chv4a486f03yas7fjr5vpqzhfjaa99rs069qid2smhn7";
+    sha256 = "1vdb1804m3x991p3z0apxzsrp3ppdgngbfwj4j2ac062xgsp5x31";
   };
 
   kernelPatches = args.kernelPatches;

From a37c5a806460ab2a7ad71359138689fb13750218 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 30 Apr 2017 10:04:23 -0300
Subject: [PATCH 1725/1744] libmatroska: 1.4.5 -> 1.4.7

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

diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 3b3dee138a5..81fa9011e30 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libebml }:
 
 stdenv.mkDerivation rec {
-  name = "libmatroska-1.4.5";
+  name = "libmatroska-1.4.7";
 
   src = fetchurl {
     url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
-    sha256 = "1g2p2phmhkp86ldd2zqx6q0s33r7d38rsfnr4wmmdr81d6j3y0kr";
+    sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 86fe3e9c6e7fe35f4db20446ce425e9cb8cf5d13 Mon Sep 17 00:00:00 2001
From: Roman Kuznetsov <roman@kuznero.com>
Date: Tue, 25 Apr 2017 23:25:59 +0200
Subject: [PATCH 1726/1744] mono: 4.6.0 -> 4.6.2

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

diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 03ccd776c60..283c34efb32 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
-  version = "4.6.0.182";
-  sha256 = "1sajwl7fqhkcmh697qqjj4z6amzkay7xf7npsvpm10gm071s5qi6";
+  version = "4.6.2.16";
+  sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
 })

From a1678269f93d40f334798fb166956733f528d70d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 14:41:56 +0200
Subject: [PATCH 1727/1744] nixos/hardened profile: disable user namespaces at
 runtime

---
 nixos/modules/profiles/hardened.nix | 12 ++++++++++++
 nixos/tests/hardened.nix            |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index c7f80fe47aa..8bde2e4f498 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -47,4 +47,16 @@ with lib;
 
   # ... or at least apply some hardening to it
   boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true;
+
+  # A recurring problem with user namespaces is that there are
+  # still code paths where the kernel's permission checking logic
+  # fails to account for namespacing, instead permitting a
+  # namespaced process to act outside the namespace with the
+  # same privileges as it would have inside it.  This is particularly
+  # bad in the common case of running as root within the namespace.
+  #
+  # Setting the number of allowed userns to 0 effectively disables
+  # the feature at runtime.  Attempting to create a user namespace
+  # with unshare will then fail with "no space left on device".
+  boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
 }
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 389d7ed7ffa..1d9a9043e03 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -27,5 +27,10 @@ import ./make-test.nix ({ pkgs, ...} : {
           # note: this better a be module we normally wouldn't load ...
           $machine->fail("modprobe dccp");
       };
+
+      # Test userns
+      subtest "userns", sub {
+          $machine->fail("unshare --user");
+      };
     '';
 })

From 56e1133d754e94dfe2a2fe12125c7c997a4dd829 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 30 Apr 2017 14:42:15 +0200
Subject: [PATCH 1728/1744] nixos/lock-kernel-modules: fix typo in unitConfig

I managed to miss this one somehow ... meh
---
 nixos/modules/security/lock-kernel-modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix
index 51994ee76c1..260ec3fc946 100644
--- a/nixos/modules/security/lock-kernel-modules.nix
+++ b/nixos/modules/security/lock-kernel-modules.nix
@@ -25,7 +25,7 @@ with lib;
 
       script = "echo -n 1 > /proc/sys/kernel/modules_disabled";
 
-      unitConfig.ConditionPathIsWritable = "/proc/sys/kernel";
+      unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel";
 
       serviceConfig = {
         Type = "oneshot";

From 57174178c914e729224c28a0fba2498e68075f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Apr 2017 15:56:29 +0200
Subject: [PATCH 1729/1744] lib.makeScope: sync comment after rename in #25285

---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index cf28137cb8a..6d6c0234087 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -167,7 +167,7 @@ rec {
   /* Make a set of packages with a common scope. All packages called
      with the provided `callPackage' will be evaluated with the same
      arguments. Any package in the set may depend on any other. The
-     `override' function allows subsequent modification of the package
+     `overrideScope' function allows subsequent modification of the package
      set in a consistent way, i.e. all packages in the set will be
      called with the overridden packages. The package sets may be
      hierarchical: the packages in the set are called with the scope

From 83129a6eed23007eaf57c515e9c3bc2191646dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 30 Apr 2017 16:54:59 +0200
Subject: [PATCH 1730/1744] qgit: fix meta: maintainer -> maintainers

---
 .../version-management/git-and-tools/qgit/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 5e3532b5643..7da45e2d3f9 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
     description = "Graphical front-end to Git";
-    maintainer = with maintainers; [ peterhoeg ];
+    maintainers = with maintainers; [ peterhoeg ];
     inherit (qtbase.meta) platforms;
   };
 }

From 5628cebcf0bd8f36c7d87b2cfa7b6b07768abc08 Mon Sep 17 00:00:00 2001
From: rht <rhtbot@gmail.com>
Date: Sun, 15 Jan 2017 16:44:52 +0400
Subject: [PATCH 1731/1744] /bin/sh -> ${stdenv.shell}

---
 pkgs/build-support/docker/default.nix     | 2 +-
 pkgs/build-support/release/ant-build.nix  | 2 +-
 pkgs/build-support/vm/windows/default.nix | 1 +
 pkgs/servers/nosql/eventstore/default.nix | 2 +-
 pkgs/servers/xmpp/pyIRCt/default.nix      | 2 +-
 pkgs/servers/xmpp/pyMAILt/default.nix     | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 7f63664dadd..6bc9b7475e1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -82,7 +82,7 @@ rec {
     export PATH=${shadow}/bin:$PATH
     mkdir -p /etc/pam.d
     if [[ ! -f /etc/passwd ]]; then
-      echo "root:x:0:0::/root:/bin/sh" > /etc/passwd
+      echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd
       echo "root:!x:::::::" > /etc/shadow
     fi
     if [[ ! -f /etc/group ]]; then
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index c77db30a81c..5ab24132290 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (
 
       mkdir -p $out/bin
       cat >> $out/bin/${w.name} <<EOF
-      #! /bin/sh
+      #!${stdenv.shell}
       export JAVA_HOME=$jre
       $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
       EOF
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index c668e7569a4..f1575219982 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -1,3 +1,4 @@
+#note: the hardcoded /bin/sh is required for the VM's cygwin shell
 pkgs:
 
 let
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index d58005f7be2..572cfe1f17d 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,lib/eventstore/clusternode}
     cp -r bin/clusternode/* $out/lib/eventstore/clusternode/
     cat > $out/bin/clusternode << EOF
-    #!/bin/sh
+    #!${stdenv.shell}
     exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@"
     EOF
     chmod +x $out/bin/clusternode
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 2a87eeb7cb5..ebdc73aec30 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     sed -e '/configFiles/iimport os' -i config.py
     cp * $out/share/${name}
     cat > $out/bin/pyIRCt <<EOF
-      #! /bin/sh
+      #!${stdenv.shell}
       cd $out/share/${name}
       ./irc.py \"$@\"
     EOF
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index deb8b8ce7d1..aeed7484f82 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sed -e '/configFiles/iimport os' -i config.py
     cp * $out/share/$name
     cat > $out/bin/pyMAILt <<EOF
-      #! /bin/sh
+      #!${stdenv.shell}
       cd $out/share/${name}
       ./mail.py \"$@\"
     EOF

From 7f8c564315ef61b9f4150a4e712c1286146d7c15 Mon Sep 17 00:00:00 2001
From: Clemens Manert <Clemens@Manert.de>
Date: Thu, 2 Mar 2017 17:26:40 +0100
Subject: [PATCH 1732/1744] Upgraded pyfiglet from 0.7.2 -> 0.7.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 143585a8af0..84f1c2380e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20347,11 +20347,11 @@ in {
 
   pyfiglet = buildPythonPackage rec {
     name = "pyfiglet-${version}";
-    version = "0.7.2";
+    version = "0.7.5";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/p/pyfiglet/${name}.tar.gz";
-      sha256 = "0v8a18wvaqnb1jksyv5dc5n6zj0vrkyhz0ivmm8gfwpa0ky6n68y";
+      sha256 = "04jy4182hn5xfs6jf432gxclfj1rhssd7bsf0b4gymrjzkhr8qa4";
     };
 
     doCheck = false;

From 69393414554877388af792da7520fcdd0811aee4 Mon Sep 17 00:00:00 2001
From: Clemens Manert <Clemens@Manert.de>
Date: Thu, 2 Mar 2017 17:56:05 +0100
Subject: [PATCH 1733/1744] termdown: init at 1.11.0

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

diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
new file mode 100644
index 00000000000..631fc08e95e
--- /dev/null
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildPythonApplication,
+click, pyfiglet, dateutil}:
+
+with stdenv.lib;
+
+buildPythonApplication rec {
+
+  name    = "termdown-${version}";
+  version = "1.11.0";
+
+  src = fetchFromGitHub {
+    rev    = "d1e3504e02ad49013595112cb03fbf175822e58d";
+    sha256 = "1i6fxymg52q95n0cbm4imdxh6yvpj3q57yf7w9z5d9pr35cf1iq5";
+    repo   = "termdown";
+    owner  = "trehn";
+  };
+
+  propagatedBuildInputs = [ dateutil click pyfiglet ];
+
+  meta = with stdenv.lib; {
+    description     = "Starts a countdown to or from TIMESPEC";
+    longDescription = "Countdown timer and stopwatch in your terminal";
+    homepage        = https://github.com/trehn/termdown;
+    license         = licenses.gpl3;
+    platforms       = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e613c2f3e75..a51e5d664b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15784,6 +15784,8 @@ with pkgs;
 
   telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
 
+  termdown = (newScope pythonPackages) ../applications/misc/termdown { };
+
   terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
 
   terminator = callPackage ../applications/misc/terminator {

From 9ef3ecb80feb77e4db421de2ecff88bfef50ee2e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 30 Apr 2017 19:59:05 +0200
Subject: [PATCH 1734/1744] farbfeld: 2 -> 3 and use correct license (isc)

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

diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index d14de1938b9..3f309f06630 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "farbfeld-${version}";
-  version = "2";
+  version = "3";
 
   src = fetchgit {
     url = "http://git.suckless.org/farbfeld";
     rev = "refs/tags/${version}";
-    sha256 = "1rj6pqn50v6r7l3j7m872fgynxsh22zx863jg0jzmb4x6wx2m2qv";
+    sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl";
   };
 
   buildInputs = [ libpng libjpeg ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Suckless image format with conversion tools";
-    license = licenses.mit;
+    license = licenses.isc;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
   };

From fdcb4fa4b8d100215c1fa6cb1fc585d7476740c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 30 Apr 2017 19:53:17 +0200
Subject: [PATCH 1735/1744] owncloud-client: unbreak build (qt58 -> qt56)

The build fails due to missing qt linguist tools. That's solved by
adding 'qttools'. But the build fails soon after with missing 'Sql'
module. I didn't manage to solve that, so use Qt 5.6 where it works.

Using libsForQt seems to be the way Qt packages are composed today, so
use that (seems safer).
---
 pkgs/applications/networking/owncloud-client/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                          | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index ccd1b5cfeae..fd7aef1414e 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }:
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ];
+  buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
 
   cmakeFlags = [
     "-UCMAKE_INSTALL_LIBDIR"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a51e5d664b8..3d13173dc5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3358,9 +3358,7 @@ with pkgs;
     owncloud90
     owncloud91;
 
-  owncloud-client = callPackage ../applications/networking/owncloud-client {
-    inherit (libsForQt5) qtkeychain;
-  };
+  owncloud-client = libsForQt56.callPackage ../applications/networking/owncloud-client { };
 
   p2pvc = callPackage ../applications/video/p2pvc {};
 

From 472fbe651f6107aac7e8fdfdb57f8e17a5fc1782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 30 Apr 2017 20:23:51 +0200
Subject: [PATCH 1736/1744] owncloud-client: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index fd7aef1414e..207581ed29b 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "10ah4zmnv4hfi50k59qwk990h1a4g95d3yvxqqrv4x1dv8p2sscf";
+    sha256 = "051rky4rpm73flxxkhfdxqq23ncnk4ixhscbg74w82sa4d93f54k";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];

From 078b7c9f166dd35a0b4772519b6dce094d7eac80 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 30 Apr 2017 11:38:58 -0700
Subject: [PATCH 1737/1744] fzf: 0.16.6 -> 0.16.7

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 6001a785c7a..872a02ed9de 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.6";
+  version = "0.16.7";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0nzjbm40c4w9d0d34s5qnr9jkrh1vkn508xl2lfwfvmnzsnb9xbn";
+    sha256 = "11ka5n7mrm5pb9riah28zyshvfz2svm4wn6fbama39yp6sc01x23";
   };
 
   outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 2f033c5b1c2..289ea9f11ae 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/junegunn/go-shellwords";
-      rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167";
-      sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8";
+      rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
+      sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
     };
   }
   {

From c282de710381c803f09da98a18683ab775902436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 30 Apr 2017 21:02:43 +0200
Subject: [PATCH 1738/1744] nixos/munin: remove duplicated
 /run/current-system/sw/bin path

A side effect of commit ff2117192105c4c356a6ce31514ca93da2e837ff
("Fix references to current-system/sw/sbin"). It changed "sbin" to "bin"
but didn't check for duplicates.
---
 nixos/modules/services/monitoring/munin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index b8c26a5c89b..b26bcba6405 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -34,7 +34,7 @@ let
         cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file)
 
         wrapProgram $file \
-          --set PATH "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" \
+          --set PATH "/run/wrappers/bin:/run/current-system/sw/bin" \
           --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
           --set MUNIN_PLUGSTATE "/var/run/munin"
 
@@ -184,7 +184,7 @@ in
 
         mkdir -p /etc/munin/plugins
         rm -rf /etc/munin/plugins/*
-        PATH="/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
+        PATH="/run/wrappers/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
       '';
       serviceConfig = {
         ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";

From f8b5b85df6885c91f78ff82fad11c6a0f01c2181 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 4 Mar 2017 19:18:04 +0100
Subject: [PATCH 1739/1744] displaycal: init at 3.2.4.0

---
 .../graphics/displaycal/default.nix           | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/graphics/displaycal/default.nix

diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
new file mode 100644
index 00000000000..80d2b290367
--- /dev/null
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -0,0 +1,57 @@
+{buildPythonPackage, stdenv, fetchurl, pkgconfig
+ , libXext, libXxf86vm, libX11, libXrandr, libXinerama
+ , argyllcms, wxPython, numpy
+ }:
+buildPythonPackage {
+  name = "displaycal-3.2.4.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz;
+    sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8";
+  };
+
+  propagatedBuildInputs = [
+    libXext
+    libXxf86vm
+    libX11
+    libXrandr
+    libXinerama
+    argyllcms
+    wxPython
+    numpy
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  preConfigure = ''
+    mkdir dist
+    cp {misc,dist}/DisplayCAL.appdata.xml
+    mkdir -p $out
+    ln -s $out/share/DisplayCAL $out/Resources
+  '';
+
+  # no idea why it looks there - symlink .json lang (everything)
+  postInstall = ''
+    for x in $out/share/DisplayCAL/*; do
+      ln -s $x $out/lib/python2.7/site-packages/DisplayCAL
+    done
+
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix PATH : ${argyllcms}/bin
+    done
+  '';
+
+  meta = {
+    description = "Display Calibration and Characterization powered by Argyll CMS";
+    homepage = http://displaycal.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d13173dc5f..867c35215af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16630,6 +16630,8 @@ with pkgs;
     boost = boost160;
   };
 
+  displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};
+
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
   duckmarines = callPackage ../games/duckmarines { love = love_0_9; };

From 763ed66c244ff972541d108f20697c4ec20a6ecc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Apr 2017 21:11:39 +0200
Subject: [PATCH 1740/1744] bluez5: install gatttool; reported by @husnoo

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 9149f6da033..89734b321fc 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
   # FIXME: Move these into a separate package to prevent Bluez from
   # depending on Python etc.
   postInstall = ''
+    cp ./attrib/gatttool $out/bin/gatttool
     mkdir -p $test/test
     cp -a test $test
     pushd $test/test

From 5c9986e40607b01879987aad099d1978700e7afd Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 30 Apr 2017 12:51:58 -0700
Subject: [PATCH 1741/1744] the_platinum_searcher: 2.1.3 -> 2.1.5

---
 pkgs/tools/text/platinum-searcher/default.nix | 11 +++++++---
 pkgs/tools/text/platinum-searcher/deps.nix    | 20 +++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index 502af44262b..c76ba8ea88d 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "the_platinum_searcher-${version}";
-  version = "2.1.3";
-  rev = "v2.1.3";
+  version = "2.1.5";
+  rev = "v${version}";
 
   goPackagePath = "github.com/monochromegane/the_platinum_searcher";
 
@@ -11,11 +11,16 @@ buildGoPackage rec {
     inherit rev;
     owner = "monochromegane";
     repo = "the_platinum_searcher";
-    sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp";
+    sha256 = "1y7kl3954dimx9hp2bf1vjg1h52hj1v6cm4f5nhrqzwrawp0b6q0";
   };
 
   goDeps = ./deps.nix;
 
+  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    # fixes cycle between $out and $bin
+    install_name_tool -delete_rpath $out/lib $bin/bin/pt
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/monochromegane/the_platinum_searcher;
     description = "A code search tool similar to ack and the_silver_searcher(ag).";
diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix
index da3f3ff1b8a..04fb9bd4be3 100644
--- a/pkgs/tools/text/platinum-searcher/deps.nix
+++ b/pkgs/tools/text/platinum-searcher/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
+      rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
+      sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
     };
   }
   {
@@ -13,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jessevdk/go-flags";
-      rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539";
-      sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
+      rev = "4e64e4a4e2552194cf594243e23aa9baf3b4297e";
+      sha256 = "02x7f1wm8119s27h4dc3a4aw6shydnpnnkvzwg5xm0snn5kb4zxm";
     };
   }
   {
@@ -22,8 +22,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
+      rev = "99064174e013895bbd9b025c31100bd1d9b590ca";
+      sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9";
     };
   }
   {
@@ -31,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e";
-      sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14";
+      rev = "a49bea13b776691cb1b49873e5d8df96ec74831a";
+      sha256 = "1pcmgf88wml6ca8v63nh3nxsfvpzjv3c4qj2w2wkizbil826g7as";
     };
   }
   {
@@ -76,8 +76,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shiena/ansicolor";
-      rev = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b";
-      sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
+      rev = "a422bbe96644373c5753384a59d678f7d261ff10";
+      sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc";
     };
   }
 ]

From d1a4cba04a06dcfe34b0e8bde0f2e8f4cbc32375 Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil_mayhew@users.sourceforge.net>
Date: Thu, 16 Mar 2017 20:27:02 -0600
Subject: [PATCH 1742/1744] citrix-receiver: 13.4.0 -> 13.5.0

---
 .../networking/remote/citrix-receiver/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index c656ff24df8..5b0129be5d0 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -22,7 +22,7 @@
 , alsaLib
 }:
 
-let versionRec = { major = "13"; minor = "4"; patch = "0"; };
+let versionRec = { major = "13"; minor = "5"; patch = "0"; };
 in stdenv.mkDerivation rec {
   name = "citrix-receiver-${version}";
   version = with versionRec; "${major}.${minor}.${patch}";
@@ -31,11 +31,11 @@ in stdenv.mkDerivation rec {
   prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
   src = with versionRec; requireFile rec {
-    name = "${prefixWithBitness}-${version}.10109380.tar.gz";
+    name = "${prefixWithBitness}-${version}.10185126.tar.gz";
     sha256 =
       if stdenv.is64bit
-      then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"
-      else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
+      then "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x"
+      else "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1";
     message = ''
       In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
       the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:

From 70863d5326ab36f1c69147729475f00b406a3bf4 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Sun, 30 Apr 2017 18:34:17 -0300
Subject: [PATCH 1743/1744] ioport: init at 1.2

---
 pkgs/os-specific/linux/ioport/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ioport/default.nix

diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix
new file mode 100644
index 00000000000..8ad84014a1a
--- /dev/null
+++ b/pkgs/os-specific/linux/ioport/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, perl, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "ioport-1.2";
+  src = fetchurl {
+    url = "http://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz";
+    sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z";
+  };
+  buildInputs = [ perl ];
+  meta = with stdenv.lib; {
+    description = "Direct access to I/O ports from the command line";
+    homepage = http://people.redhat.com/rjones/ioport/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.cleverca22 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 618b36b0206..aa67db9757f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -857,6 +857,8 @@ with pkgs;
 
   devmem2 = callPackage ../os-specific/linux/devmem2 { };
 
+  ioport = callPackage ../os-specific/linux/ioport {};
+
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };

From 2b140a795c562b8e6d71a2e555302bdc6ee3e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 30 Apr 2017 19:06:48 -0300
Subject: [PATCH 1744/1744] offlineimap: 7.0.13 -> 7.1.0 (#25342)

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index d585be26e26..70a4bc87b97 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, libxslt, docbook_xml_xslt }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.13";
+  version = "7.1.0";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc";
+    sha256 = "10hxzp2hwkarvmwhw9mxbp9wkbclxwm6n0d7i4xs8r1s94yiffb3";
   };
 
   postPatch = ''